fix #5

Author: thautwarm

src/JuliaVariables.jl

@@ -318,7 +318,13 @@ function solve(ana, ex, ctx_flag::CtxFlag = CtxFlag())
                 Expr(:tuple, args...)
             end
 # keyword arguments for tuples or calls
-        Expr(:kw, k::Symbol, v) => Expr(:kw, k, solve(ana, v, ctx_flag + :rhs))
+        Expr(:kw, k::Symbol, v) =>
+            begin
+                if ctx_flag.default_scope == Arg()
+                    solve(ana, k, ctx_flag)
+                end
+                Expr(:kw, k, solve(ana, v, ctx_flag + :rhs))
+            end
 # broadcasting symbols
         Expr(:call, f :: Symbol, args...) &&
             if length(args) in (1, 2) && is_broadcast_sym(f)

test/runtests.jl

@@ -1,6 +1,7 @@
 using JuliaVariables
 using Test
 using NameResolution
+using MLStyle
 
 rmlines = JuliaVariables.rmlines
 JuliaVariables.@quick_lambda begin
@@ -62,5 +63,23 @@ JuliaVariables.@quick_lambda begin
 
     a = solve(:(2 .^ [2, 3]))
     @test eval(a) == [4, 8]
+
+    a = solve(:(function z(x, k=1)
+                   x + 20 + a + k
+               end
+    ))
+    @test haskey(a.scope.bounds, :k)
+
+    a = solve(:(function z(x, k=1)
+                   (k=k, )
+               end
+    ))
+    @test haskey(a.scope.bounds, :k)
+
+    @test @when :(k=$_, )  = a.func.args[2].args[2] begin
+        true
+    @otherwise
+        false
+    end
 end
 end