fix #9948, scoping bug in keyword arg defaults

JuliaLang · Jul 22, 2016 · 75b026d · 75b026d
1 parent 21f28c9
commit 75b026d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/julia-syntax.scm b/src/julia-syntax.scm
@@ -424,7 +424,8 @@
  ,@lno
  ,@(if (not ordered-defaults)
  '()
- (map make-assignment keynames vals))
+ (append! (map (lambda (kwname) `(local ,kwname)) keynames)
+ (map make-assignment keynames vals)))
  ;; call mangled(vals..., [rest_kw ,]pargs..., [vararg]...)
  (return (call ,mangled
  ,@(if ordered-defaults keynames vals)
@@ -466,6 +467,7 @@
  `(block
  ;; initialize keyword args to their defaults, or set a flag telling
  ;; whether this keyword needs to be set.
+ ,@(map (lambda (kwname) `(local ,kwname)) keynames)
  ,@(map (lambda (name dflt flag)
  (if (const-default? dflt)
  `(= ,name ,dflt)

diff --git a/test/keywordargs.jl b/test/keywordargs.jl
@@ -198,3 +198,16 @@ end
 @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)
+
+# issue #9948
+f9948, getx9948 = let
+ x = 3
+ h(;x=x) = x
+ getx() = x
+ h, getx
+end
+@test_throws UndefVarError f9948()
+@test getx9948() == 3
+@test f9948(x=5) == 5
+@test_throws UndefVarError f9948()
+@test getx9948() == 3