Merge pull request #18865 from JuliaLang/jb/fix18845

fix #18845, call with 0 keyword args splatted after `;`
JuliaLang · Oct 10, 2016 · 214db15 · 214db15
2 parents b8f98a0 + 04b4970
commit 214db15
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/julia-syntax.scm b/src/julia-syntax.scm
@@ -1924,7 +1924,11 @@
                   (expand-forms
                    (receive
                     (kws args) (separate kwarg? (cdddr e))
-                    (lower-kw-call f (append kws (cdr (caddr e))) args))))
+                    (let ((kws (append kws (cdr (caddr e)))))
+                      (if (null? kws)
+                          ;; empty parameters block; issue #18845
+                          `(call ,f ,@args)
+                          (lower-kw-call f kws args))))))
                  ((any kwarg? (cddr e))
                   ;; (call f ... (kw a b) ...)
                   (expand-forms

diff --git a/test/keywordargs.jl b/test/keywordargs.jl
@@ -99,6 +99,12 @@ extravagant_args(x,y=0,rest...;color="blue",kw...) =
 
 # passing empty kw container to function with no kwargs
 @test sin(1.0) == sin(1.0; Dict()...)
+# issue #18845
+@test (@eval sin(1.0; $([]...))) == sin(1.0)
+f18845() = 2
+@test f18845(;) == 2
+@test f18845(; []...) == 2
+@test (@eval f18845(; $([]...))) == 2
 
 # passing junk kw container
 @test_throws BoundsError extravagant_args(1; Any[[]]...)