Merge pull request #318 from probcomp/20200927-marcoct-fixsml

20200927 marcoct fixsml

Author: marcoct

src/dsl/static.jl

@@ -185,16 +185,9 @@ end
 
 "Parse a return line and add corresponding return node."
 function parse_return_line!(stmts, bindings, expr)
-    if isa(expr, Symbol)
-        if !haskey(bindings, expr)
-            error("Tried to return $expr, which is not a locally bound variable")
-        end
-        node = bindings[expr]
-    else
-        name, typ = gensym("return"), QuoteNode(Any)
-        node = parse_julia_expr!(stmts, bindings, name, expr, typ)
-        bindings[name] = node
-    end
+    name, typ = gensym("return"), QuoteNode(Any)
+    node = parse_julia_expr!(stmts, bindings, name, expr, typ)
+    bindings[name] = node
     push!(stmts, :(set_return_node!(builder, $(esc(node)))))
     return Expr(:return, expr)
 end

test/dsl/dsl.jl

@@ -1,3 +1,3 @@
 include("macros.jl")
-# include("dynamic_dsl.jl")
-# include("static_dsl.jl")
+include("dynamic_dsl.jl")
+include("static_dsl.jl")

test/dsl/static_dsl.jl

@@ -500,6 +500,18 @@ load_generated_functions()
 
 end
 
+@testset "'return nothing'" begin
+
+@gen (static) function foo()
+    return nothing
+end
+
+load_generated_functions()
+
+@test foo() == nothing
+
+end
+
 @testset "getindex(trace)" begin
 
 @gen (static) function bar(r)