Skip to content
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.

Sign up for GitHub

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

fix f.(args...) with splatting #17307

Merged
merged 1 commit into from
Jul 7, 2016
Merged

fix f.(args...) with splatting #17307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/julia-syntax.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1562,13 +1562,13 @@

'|.|
(lambda (e) ; e = (|.| f x)
(let ((f (expand-forms (cadr e)))
(x (expand-forms (caddr e))))
(let ((f (cadr e))
(x (caddr e)))
(if (or (eq? (car x) 'quote) (eq? (car x) 'inert) (eq? (car x) '$))
`(call (core getfield) ,f ,x)
`(call (core getfield) ,(expand-forms f) ,(expand-forms x))
; otherwise, came from f.(args...) --> broadcast(f, args...),
; where x = (call (top tuple) args...) at this point:
`(call broadcast ,f ,@(cddr x)))))
; where x = (tuple args...) at this point:
(expand-forms `(call broadcast ,f ,@(cdr x))))))

'|<:| syntactic-op-to-call
'|>:| syntactic-op-to-call
Expand Down
5 changes: 5 additions & 0 deletions test/broadcast.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,3 +213,8 @@ end
@test Base.promote_op(+, Bool) === Int
@test isa(broadcast(+, true), Array{Int,0})
@test Base.promote_op(Float64, Bool) === Float64

# issue #17304
let foo = [[1,2,3],[4,5,6],[7,8,9]]
@test max.(foo...) == broadcast(max, foo...) == [7,8,9]
end