slightly cut down lowered code for kwcall

Conflicts: src/julia-syntax.scm
JuliaLang · Oct 20, 2014 · 6290d34 · 6290d34
1 parent c848545
commit 6290d34
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/julia-syntax.scm b/src/julia-syntax.scm
@@ -1489,10 +1489,13 @@
 			      `(block (= (tuple ,k ,v) ,rk)
 				      ,push-expr))))
 		      restkeys))
-	     (if (call (top isempty) ,container)
-		 (call ,f ,@pa)
-		 (call (top kwcall) ,f ,(length keys) ,@keyargs
-		       ,container ,@pa))))))))
+	     ,(let ((kw-call `(call (top kwcall) ,f ,(length keys) ,@keyargs
+				    ,container ,@pa)))
+		(if (not (null? keys))
+		    kw-call
+		    `(if (call (top isempty) ,container)
+			 (call ,f ,@pa)
+			 ,kw-call)))))))))
 
 (define (expand-transposed-op e ops)
   (let ((a (caddr e))