fixed predicates with defslots

Author: Bumblebee00

src/matchers.jl

@@ -184,7 +184,7 @@ function term_matcher_constructor(term, acSets)
 
                 for inds in acSets(eachindex(data_args), length(data_args))
                     candidate = Term{T}(f, @views data_args[inds])
-                    
+
                     result = loop(candidate, bindings, matchers)                
                     result !== nothing && return success(result,1)
                 end

src/rule.jl

@@ -82,7 +82,7 @@ function makeDefSlot(s::Expr, keys, op)
 
     push!(keys, name)
     tmp = defaultValOfCall(op)
-    :(DefSlot($(QuoteNode(name)), $(esc(s.args[2])), $(esc(op))), $(esc(tmp)))
+    :(DefSlot($(QuoteNode(name)), $(esc(s.args[2])), $(esc(op)), $(esc(tmp))))
 end
 
 

test/rewrite.jl

@@ -108,6 +108,12 @@ end
     @test r_mixmix(exp(x)*sin(1+x+x^2)*2) === (2, 1, x)
     @test r_mixmix(exp(x)*sin(x+x^2)*2) === (2, 0, x)
     @test r_mixmix(exp(x)*sin(x+x^2)) === (1, 0, x)
+
+    r_predicate = @rule ~x + (~!m::(var->isa(var, Int))) => (~x, ~m)
+    @test r_predicate(x+2) === (x, 2)
+    @test r_predicate(x+2.0) !== (x, 2.0)
+    # Note: r_predicate(x+2.0) doesnt return nothing, but (x+2.0, 0)
+    # becasue of the defslot
 end
 
 @testset "power matcher with negative exponent" begin