fix dot broadcasts in @fwdmodel

marius311 · Sep 9, 2023 · d8dd7c1 · d8dd7c1
1 parent dfe2006
commit d8dd7c1
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/src/simpleppl.jl b/src/simpleppl.jl
@@ -32,12 +32,14 @@ macro fwdmodel(def)
             return :(_vars[$(QuoteNode(var))] = (Base.@isdefined($var) && !ismissing($var) ? $var : ($var = $rhs))) 
         elseif !isexpr(x, :block) && @capture(x, (f_(args__; kwargs__) | f_(args__)))
             kwargs = kwargs == nothing ? () : kwargs
-            if (f isa Symbol) && !(f in maybe_local_var) && isdefined(__module__, f)
-                if is_simpleppl_model(getfield(__module__, f))
-                    return :($f($(Simulate()), _vars, rng, $(args...); $(kwargs...)))
+            if (f isa Symbol) && !startswith(string(f),".")
+                if !(f in maybe_local_var) && isdefined(__module__, f)
+                    if is_simpleppl_model(getfield(__module__, f))
+                        return :($f($(Simulate()), _vars, rng, $(args...); $(kwargs...)))
+                    end
+                else
+                    return :($is_simpleppl_model($f) ? $f($(Simulate()), _vars, rng, $(args...); $(kwargs...)) : $x)
                 end
-            else
-                return :($is_simpleppl_model($f) ? $f($(Simulate()), _vars, rng, $(args...); $(kwargs...)) : $x)
             end
         end
         return x
@@ -58,12 +60,14 @@ macro fwdmodel(def)
             return :($var = $rhs)
         elseif !isexpr(x, :block) && @capture(x, (f_(args__; kwargs__) | f_(args__)))
             kwargs = kwargs == nothing ? () : kwargs
-            if (f isa Symbol) && !(f in maybe_local_var) && isdefined(__module__, f)
-                if is_simpleppl_model(getfield(__module__, f))
-                    return :($f($(Logpdf()), _logpdf, $(args...); $(kwargs...)))
+            if (f isa Symbol) && !startswith(string(f),".")
+                if !(f in maybe_local_var) && isdefined(__module__, f)
+                    if is_simpleppl_model(getfield(__module__, f))
+                        return :($f($(Logpdf()), _logpdf, $(args...); $(kwargs...)))
+                    end
+                else
+                    return :($is_simpleppl_model($f) ? $f($(Logpdf()), _logpdf, $(args...); $(kwargs...)) : $x)
                 end
-            else
-                return :($is_simpleppl_model($f) ? $f($(Logpdf()), _logpdf, $(args...); $(kwargs...)) : $x)
             end
         end
         return x