Merge pull request #96 from JuliaSymbolics/fix-binarization

Fix binarization type inconsistency bug issue #95

src/ematch_compiler.jl

@@ -4,7 +4,7 @@ module EMatchCompiler
 
 using AutoHashEquals
 using TermInterface
-using Metatheory: alwaystrue, binarize
+using Metatheory: alwaystrue, binarize, binarize_rec
 using Metatheory.Patterns
 
 abstract type Instruction end 
@@ -103,8 +103,6 @@ export Fail
 
 
 function compile_ground!(reg, p::PatTerm, prog)
-    p = binarize(p)
-
     if haskey(prog.ground_terms, p)
         # push!(prog.instructions, CheckClassEq(reg, prog.ground_terms[p]))
         return nothing
@@ -146,8 +144,6 @@ end
 # =============================================
 
 function compile_pat!(reg, p::PatTerm, prog)
-    p = binarize(p)
-
     if haskey(prog.ground_terms, p)
         push!(prog.instructions, CheckClassEq(reg, prog.ground_terms[p]))
         return nothing
@@ -203,15 +199,15 @@ function compile_pat!(reg, p::Any, prog)
         push!(prog.instructions, CheckClassEq(reg, prog.ground_terms[p]))
         return nothing
     end
-    @error "This shouldn't be printed. Report an issue for ematching literals"
+    @error "This shouldn't be printed. Report an issue for ematching literals" p 
 end
 
 
 #= ====================================================================================== =#
 
 # EXPECTS INDEXES OF PATTERN VARIABLES TO BE ALREADY POPULATED
 function compile_pat(p)
-    p = binarize(p)
+    p = binarize_rec(p)
     pvars = patvars(p)
     nvars = length(pvars)
 

src/utils.jl

@@ -14,6 +14,25 @@ function binarize(e::T) where {T}
     return e
 end 
 
+"""
+Recursive version of binarize
+"""
+function binarize_rec(e::T) where {T}
+    !istree(e) && return e
+    head = exprhead(e)
+    op = operation(e)
+    args = map(binarize_rec, arguments(e))
+    meta = metadata(e)
+    if head == :call
+        if op ∈ binarize_ops && arity(e) > 2
+            return foldl((x,y) -> similarterm(T, op, [x,y], symtype(e); metadata=meta, exprhead=head), args)
+        end
+    end
+    return similarterm(T, op, args, symtype(e); metadata=meta, exprhead=head)
+end 
+
+
+
 const binarize_ops = [:(+), :(*), (+), (*)]
 
 function cleanast(e::Expr)