fix unintentional change to parsing assignments inside tuples

src/julia-parser.scm

@@ -1599,6 +1599,9 @@
  (else
  (parse-matrix s first closer #f))))))))))
 
+(define (kw-to-= e) (if (kwarg? e) (cons '= (cdr e)) e))
+(define (=-to-kw e) (if (assignment? e) (cons 'kw (cdr e)) e))
+
 ;; translate nested (parameters ...) expressions to a statement block if possible
 ;; this allows us to first parse tuples using parse-arglist
 (define (parameters-to-block e)
@@ -1615,9 +1618,7 @@
  (cons (car snd) rec)))
  #f)))
  (else #f))
- (list (if (kwarg? e)
- (cons '= (cdr e))
- e))))
+ (list (kw-to-= e))))
 
 ;; convert an arglist to a tuple or block expr
 ;; leading-semi? means we saw (; ...)
@@ -1634,8 +1635,8 @@
  (and (null? first) (null? args) (not comma?)
  `(block)) ;; this case is (;)
  (if (and (pair? args) (pair? (car args)) (eq? (caar args) 'parameters))
- `(tuple ,(car args) ,@first ,@(cdr args))
- `(tuple ,@first ,@args)))))
+ `(tuple ,(car args) ,@first ,@(map kw-to-= (cdr args)))
+ `(tuple ,@first ,@(map kw-to-= args))))))
 
 (define (not-eof-2 c)
  (if (eof-object? c)

src/julia-syntax.scm

@@ -965,7 +965,7 @@
  (body (caddr e)))
  (let ((argl (if (pair? a)
  (if (eq? (car a) 'tuple)
- (cdr a)
+ (map =-to-kw (cdr a))
  (if (eq? (car a) 'block)
  (cond ((length= a 1) '())
  ((length= a 2) (list (cadr a)))
@@ -975,7 +975,7 @@
  `((parameters ,(caddr a)) ,(cadr a))))
  (else
  (error "more than one semicolon in argument list")))
- (list a)))
+ (list (=-to-kw a))))
  (list a)))
  ;; TODO: always use a specific special name like #anon# or _, then ignore
  ;; this as a local variable name.

test/keywordargs.jl

@@ -193,3 +193,8 @@ let f = (x;a=1,b=2)->(x, a, b)
  @test f(0,b=88) === (0, 1, 88)
  @test_throws ErrorException f(0,z=1)
 end
+@test ((a=2)->10a)(3) == 30
+@test ((a=2)->10a)() == 20
+@test ((a=1,b=2)->(a,b))() == (1,2)
+@test ((a=1,b=2)->(a,b))(5) == (5,2)
+@test ((a=1,b=2)->(a,b))(5,6) == (5,6)

test/parse.jl

@@ -169,6 +169,7 @@ macro f(args...) end; @f ""
 @test parse("(x,;y=1)") == Expr(:tuple, Expr(:parameters, Expr(:kw, :y, 1)), :x)
 @test parse("(x,a;y=1)") == Expr(:tuple, Expr(:parameters, Expr(:kw, :y, 1)), :x, :a)
 @test parse("(x,a;y=1,z=2)") == Expr(:tuple, Expr(:parameters, Expr(:kw,:y,1), Expr(:kw,:z,2)), :x, :a)
+@test parse("(a=1, b=2)") == Expr(:tuple, Expr(:(=), :a, 1), Expr(:(=), :b, 2))
 
 # integer parsing
 @test is(parse(Int32,"0",36),Int32(0))