Skip to content

add default keyword constructor for immutables #6122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 22 additions & 17 deletions src/julia-syntax.scm
Original file line number Diff line number Diff line change
Expand Up @@ -759,24 +759,29 @@
(map (lambda (x) (gensy)) field-names)
field-names))

(define (default-inner-ctors name field-names field-types gen-specific? locs)
(let* ((field-names (safe-field-names field-names field-types))
(define (default-inner-ctors name field-names field-types locs gen-specific? mutable?)
(let* ((arg-names (safe-field-names field-names field-types))
(any-ctor
;; definition with Any for all arguments
`(function (call ,name ,@field-names)
(block
,@locs
(call new ,@field-names)))))
(if (and gen-specific? (any (lambda (t) (not (eq? t 'Any))) field-types))
(list
;; definition with field types for all arguments
`(function (call ,name
,@(map make-decl field-names field-types))
(block
,@locs
(call new ,@field-names)))
any-ctor)
(list any-ctor))))
`(function (call ,name ,@arg-names)
(block ,@locs (call new ,@arg-names))))
(ctors (if (and gen-specific? (any (lambda (t) (not (eq? t 'Any))) field-types))
(list
;; definition with field types for all arguments
`(function (call ,name ,@(map make-decl arg-names field-types))
(block ,@locs (call new ,@arg-names)))
any-ctor)
(list any-ctor))))
(if (and (not mutable?)
(length> field-names 1)
(eq? arg-names field-names))
(let ((g (gensy)))
(cons `(function (call ,name
(parameters ,@(map (lambda (k) `(kw ,k (|.| ,g ',k))) field-names))
(|::| ,g ,name))
(block ,@locs (call new ,@field-names)))
ctors))
ctors)))

(define (default-outer-ctor name field-names field-types params bounds locs)
(let ((field-names (safe-field-names field-names field-types)))
Expand Down Expand Up @@ -916,7 +921,7 @@
(field-names (map decl-var fields))
(field-types (map decl-type fields))
(defs2 (if (null? defs)
(default-inner-ctors name field-names field-types (null? params) locs)
(default-inner-ctors name field-names field-types locs (null? params) mut)
defs))
(min-initialized (min (ctors-min-initialized defs) (length fields))))
(for-each (lambda (v)
Expand Down
16 changes: 16 additions & 0 deletions test/core.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3060,3 +3060,19 @@ end
Base.convert(::Type{Foo11874},x::Int) = float(x)

@test_throws TypeError bar11874(1)

# issue #5333
immutable I5333
a::Int
b::Int
end
type T5333
a::Int
b::Int
end
let i = I5333(1,2), t = T5333(1,2)
@test I5333(i;b=3) === I5333(1,3)
@test I5333(i;a=3) === I5333(3,2)
@test_throws MethodError T5333(t;a=3)
@test_throws MethodError T5333(t;b=3)
end