Fixed error when printing combinators.

Author: ztangent

src/dynamic/dynamic.jl

@@ -19,9 +19,6 @@ struct DynamicDSLFunction{T} <: GenerativeFunction{T,DynamicDSLTrace}
     accepts_output_grad::Bool
 end
 
-Base.nameof(gen_fn::DynamicDSLFunction) =
-    nameof(gen_fn.julia_function)
-
 function DynamicDSLFunction(arg_types::Vector{Type},
                      arg_defaults::Vector{Union{Some{Any},Nothing}},
                      julia_function::Function,

src/static_ir/print_ir.jl

@@ -23,11 +23,14 @@ end
 
 function print_ir(io::IO, node::GenerativeFunctionCallNode)
     inputs = join((string(i.name) for i in node.inputs), ", ")
-    gen_fn_name = nameof(node.generative_function)
+    gen_fn_name = ir_name(node.generative_function)
     print(io, "$(node.name) = @trace($(gen_fn_name)($inputs), :$(node.addr))")
 end
 
 function print_ir(io::IO, node::RandomChoiceNode)
     inputs = join((string(i.name) for i in node.inputs), ", ")
     print(io, "$(node.name) = @trace($(node.dist)($inputs), :$(node.addr))")
 end
+
+ir_name(fn::GenerativeFunction) = nameof(typeof(fn))
+ir_name(fn::DynamicDSLFunction) = nameof(fn.julia_function)

src/static_ir/static_ir.jl

@@ -27,9 +27,6 @@ Most generative function interface methods are generated from the intermediate r
 """
 abstract type StaticIRGenerativeFunction{T,U} <: GenerativeFunction{T,U} end
 
-Base.nameof(gen_fn::StaticIRGenerativeFunction) =
-    nameof(type_of(gen_fn))
-
 function get_ir end
 function get_gen_fn_type end
 function get_options end