From 1888cd2706bfa17257e66f7a9f7df7c62048fd8f Mon Sep 17 00:00:00 2001
From: Jeff Bezanson <jeff.bezanson@gmail.com>
Date: Wed, 16 Oct 2013 20:33:47 -0400
Subject: [PATCH] fix a further bug in keyword args in macros caused by
 4801de69755a9f5586ac5c0538e3122368d490f7

---
 src/julia-syntax.scm | 50 +++++++++++++++++++++++++++-----------------
 test/keywordargs.jl  |  9 ++++++++
 2 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/src/julia-syntax.scm b/src/julia-syntax.scm
index 8a35da45485d3..c1d48ca7ccb30 100644
--- a/src/julia-syntax.scm
+++ b/src/julia-syntax.scm
@@ -2968,7 +2968,7 @@ So far only the second case can actually occur.
   (if (symbol? e) e
       (cadr e)))
 
-(define (resolve-expansion-vars-with-new-env x env m inkw)
+(define (resolve-expansion-vars-with-new-env x env m inarg)
   (resolve-expansion-vars-
    x
    (append!
@@ -2976,9 +2976,9 @@ So far only the second case can actually occur.
 	      (not (assq (car x) env)))
 	    (pair-with-gensyms (vars-introduced-by x)))
     env)
-   m inkw))
+   m inarg))
 
-(define (resolve-expansion-vars- e env m inkw)
+(define (resolve-expansion-vars- e env m inarg)
   (cond ((or (eq? e 'true) (eq? e 'false) (eq? e 'end))
 	 e)
 	((symbol? e)
@@ -2993,47 +2993,59 @@ So far only the second case can actually occur.
 	   ((escape) (cadr e))
 	   ((macrocall)
 	    `(macrocall ,.(map (lambda (x)
-				 (resolve-expansion-vars- x env m inkw))
+				 (resolve-expansion-vars- x env m inarg))
 			       (cdr e))))
 	   ((type)
-	    `(type ,(cadr e) ,(resolve-expansion-vars- (caddr e) env m inkw)
+	    `(type ,(cadr e) ,(resolve-expansion-vars- (caddr e) env m inarg)
 		   ;; type has special behavior: identifiers inside are
 		   ;; field names, not expressions.
 		   ,(map (lambda (x)
 			   (cond ((atom? x) x)
 				 ((and (pair? x) (eq? (car x) '|::|))
 				  `(|::| ,(cadr x)
-				    ,(resolve-expansion-vars- (caddr x) env m inkw)))
+				    ,(resolve-expansion-vars- (caddr x) env m inarg)))
 				 (else
-				  (resolve-expansion-vars-with-new-env x env m inkw))))
+				  (resolve-expansion-vars-with-new-env x env m inarg))))
 			 (cadddr e))))
 
 	   ((parameters)
 	    (cons 'parameters
 		  (map (lambda (x)
-			 ;; in keyword arg A=B, don't transform "A"
-			 (resolve-expansion-vars- x env m #t))
+			 (resolve-expansion-vars- x env m #f))
 		       (cdr e))))
 
+	   ((= function)
+	    (if (and (pair? (cadr e)) (eq? (caadr e) 'call))
+		;; in (kw x 1) inside an arglist, the x isn't actually a kwarg
+		`(,(car e) (call ,(resolve-expansion-vars- (cadadr e) env m inarg)
+				 ,@(map (lambda (x)
+					  (resolve-expansion-vars- x env m #t))
+					(cddr (cadr e))))
+		  ,(resolve-expansion-vars- (caddr e) env m inarg))
+		`(,(car e) ,@(map (lambda (x)
+				    (resolve-expansion-vars- x env m inarg))
+				  (cdr e)))))
+
 	   ((kw)
 	    (if (and (pair? (cadr e))
 		     (eq? (caadr e) '|::|))
 		`(kw (|::|
-		      ,(if inkw
-			   (cadr (cadr e))
-			   (resolve-expansion-vars- (cadr (cadr e)) env m inkw))
-		      ,(resolve-expansion-vars- (caddr (cadr e)) env m inkw))
-		     ,(resolve-expansion-vars- (caddr e) env m inkw))
-		`(kw ,(if inkw
-			  (cadr e)
-			  (resolve-expansion-vars- (cadr e) env m inkw))
-		     ,(resolve-expansion-vars- (caddr e) env m inkw))))
+		      ,(if inarg
+			   (resolve-expansion-vars- (cadr (cadr e)) env m inarg)
+			   ;; in keyword arg A=B, don't transform "A"
+			   (cadr (cadr e)))
+		      ,(resolve-expansion-vars- (caddr (cadr e)) env m inarg))
+		     ,(resolve-expansion-vars- (caddr e) env m inarg))
+		`(kw ,(if inarg
+			  (resolve-expansion-vars- (cadr e) env m inarg)
+			  (cadr e))
+		     ,(resolve-expansion-vars- (caddr e) env m inarg))))
 
 	   ;; todo: trycatch
 	   (else
 	    (cons (car e)
 		  (map (lambda (x)
-			 (resolve-expansion-vars-with-new-env x env m inkw))
+			 (resolve-expansion-vars-with-new-env x env m inarg))
 		       (cdr e))))))))
 
 ;; decl-var that also identifies f in f()=...
diff --git a/test/keywordargs.jl b/test/keywordargs.jl
index 1aeeb452f531a..c3b0d5fe107ec 100644
--- a/test/keywordargs.jl
+++ b/test/keywordargs.jl
@@ -126,3 +126,12 @@ end
 @test test4538_2() == 1
 @test_throws test4538_2(2)
 @test test4538_2(x=2) == 2
+
+f4538_3(;x=1) = x
+macro TEST4538_3()
+    quote
+        x = 2
+        f4538_3(x=3)
+    end
+end
+@test (@TEST4538_3) == 3