Fixed bug which made it so prefix was never using @generated (#256)

Does what the title says!

Author: torfjelde

Project.toml

@@ -1,6 +1,6 @@
 name = "DynamicPPL"
 uuid = "366bfd00-2699-11ea-058f-f148b4cae6d8"
-version = "0.11.0"
+version = "0.11.1"
 
 [deps]
 AbstractMCMC = "80f14c24-f653-4e6a-9b94-39d6b0f70001"

src/context_implementations.jl

@@ -236,8 +236,7 @@ function dot_assume(
     @assert length(dist) == size(var, 1)
     r = get_and_set_val!(rng, vi, vns, dist, spl)
     lp = sum(Bijectors.logpdf_with_trans(dist, r, istrans(vi, vns[1])))
-    var .= r
-    return var, lp
+    return r, lp
 end
 function dot_assume(
     rng,
@@ -250,8 +249,7 @@ function dot_assume(
     r = get_and_set_val!(rng, vi, vns, dists, spl)
     # Make sure `r` is not a matrix for multivariate distributions
     lp = sum(Bijectors.logpdf_with_trans.(dists, r, istrans(vi, vns[1])))
-    var .= r
-    return var, lp
+    return r, lp
 end
 function dot_assume(rng, spl::Sampler, ::Any, ::AbstractArray{<:VarName}, ::Any, ::Any)
     return error(

src/contexts.jl

@@ -66,7 +66,7 @@ function PrefixContext{PrefixInner}(
     ctx::PrefixContext{PrefixOuter}
 ) where {PrefixInner,PrefixOuter}
     if @generated
-        :(PrefixContext{$(QuoteNode(Symbol(PrefixOuter, _prefix_seperator, PrefixInner)))}(
+        :(PrefixContext{$(QuoteNode(Symbol(PrefixOuter, PREFIX_SEPARATOR, PrefixInner)))}(
             ctx.ctx
         ))
     else
@@ -76,7 +76,7 @@ end
 
 function prefix(::PrefixContext{Prefix}, vn::VarName{Sym}) where {Prefix,Sym}
     if @generated
-        return :(VarName{$(QuoteNode(Symbol(Prefix, _prefix_seperator, Sym)))}(vn.indexing))
+        return :(VarName{$(QuoteNode(Symbol(Prefix, PREFIX_SEPARATOR, Sym)))}(vn.indexing))
     else
         VarName{Symbol(Prefix, PREFIX_SEPARATOR, Sym)}(vn.indexing)
     end

test/contexts.jl

@@ -0,0 +1,22 @@
+@testset "contexts.jl" begin
+    @testset "PrefixContext" begin
+        ctx = @inferred PrefixContext{:f}(
+            PrefixContext{:e}(
+                PrefixContext{:d}(
+                    PrefixContext{:c}(
+                        PrefixContext{:b}(PrefixContext{:a}(DefaultContext()))
+                    ),
+                ),
+            ),
+        )
+        vn = VarName{:x}()
+        vn_prefixed = @inferred DynamicPPL.prefix(ctx, vn)
+        @test DynamicPPL.getsym(vn_prefixed) == Symbol("a.b.c.d.e.f.x")
+        @test vn_prefixed.indexing === vn.indexing
+
+        vn = VarName{:x}((1,))
+        vn_prefixed = @inferred DynamicPPL.prefix(ctx, vn)
+        @test DynamicPPL.getsym(vn_prefixed) == Symbol("a.b.c.d.e.f.x")
+        @test vn_prefixed.indexing === vn.indexing
+    end
+end

test/runtests.jl

@@ -39,6 +39,7 @@ include("test_util.jl")
             include("prob_macro.jl")
             include("independence.jl")
             include("distribution_wrappers.jl")
+            include("contexts.jl")
             include("context_implementations.jl")
 
             include("threadsafe.jl")