fix the fuzz

Author: shashi

src/SymbolicUtils.jl

@@ -13,7 +13,7 @@ include("types.jl")
 
 # Methods on symbolic objects
 using SpecialFunctions, NaNMath
-import IfElse: ifelse  # need to not bring IfElse name in or it will clash
+import IfElse: ifelse  # need to not bring IfElse name in or it will clash with Rewriters.IfElse
 include("methods.jl")
 
 # LinkedList, simplification utilities

src/types.jl

@@ -858,7 +858,13 @@ end
 
 *(a::Pow, b::Mul) = b * a
 
-_merge(f, d, others...; filter=x->false) = _merge!(f, copy(d), others...; filter=filter)
+function copy_similar(d, others)
+    K = promote_type(keytype(d), keytype.(others)...)
+    V = promote_type(valtype(d), valtype.(others)...)
+    Dict{K, V}(d)
+end
+
+_merge(f, d, others...; filter=x->false) = _merge!(f, copy_similar(d, others), others...; filter=filter)
 function _merge!(f, d, others...; filter=x->false)
     acc = d
     for other in others

test/fuzzlib.jl

@@ -1,6 +1,9 @@
 using SymbolicUtils
+using SymbolicUtils: Term
+using SpecialFunctions
 using Test
-using IfElse
+import IfElse: ifelse
+import IfElse
 
 using SymbolicUtils: showraw, Symbolic
 
@@ -102,6 +105,9 @@ function gen_rand_expr(inputs;
                                  min_depth=min_depth,
                                  max_depth=max_depth)
         else
+            @show f
+            @show arity
+            @show args
             rethrow(err)
         end
     end
@@ -115,9 +121,15 @@ function fuzz_test(ntrials, spec, simplify=simplify;kwargs...)
     inputs = Set()
     expr = gen_rand_expr(inputs; spec=spec, kwargs...)
     inputs = collect(inputs)
+    code = try
+        SymbolicUtils.Code.toexpr(expr)
+    catch err
+        @show expr
+        rethrow(err)
+    end
     unsimplifiedstr = """
     function $(tuple(inputs...))
-        $(sprint(io->showraw(io, expr)))
+        $(sprint(io->print(io, code)))
     end
     """