Merge branch 'master' into context_independence

Author: phipsgabler

Project.toml

@@ -1,7 +1,7 @@
 name = "DynamicPPL"
 uuid = "366bfd00-2699-11ea-058f-f148b4cae6d8"
 authors = ["mohamed82008 <[email protected]>"]
-version = "0.4.1"
+version = "0.4.2"
 
 [deps]
 AbstractMCMC = "80f14c24-f653-4e6a-9b94-39d6b0f70001"
@@ -11,7 +11,7 @@ MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
 
 [compat]
 AbstractMCMC = "0.4, 0.5"
-Bijectors = "0.5.2"
+Bijectors = "0.5.2, 0.6"
 Distributions = "0.22"
 MacroTools = "0.5.1"
 julia = "1"

src/compiler.jl

@@ -479,9 +479,8 @@ function build_output(model_info)
             end
         end)
     end
-    return esc(quote
-        # Allows passing arguments as kwargs
-        $outer_function(;$(args...)) = $outer_function($(arg_syms...))
+
+    ex = quote
         function $outer_function($(args...))
             function $inner_function(
                 $vi::DynamicPPL.VarInfo,
@@ -496,7 +495,17 @@ function build_output(model_info)
             return DynamicPPL.Model($inner_function, $args_nt, $model_gen_constructor)
         end
         $model_gen = $model_gen_constructor
-    end)
+    end
+
+    if !isempty(args)
+        ex = quote
+            $ex
+            # Allows passing arguments as kwargs
+            $outer_function(;$(args...)) = $outer_function($(arg_syms...))
+        end
+    end
+
+    return esc(ex)
 end
 
 # A hack for NamedTuple type specialization