Interop with SymbolicUtils

Project.toml

@@ -10,7 +10,6 @@ Catlab = "134e5e36-593f-5add-ad60-77f754baafbe"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
 MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
-Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"
 StructEquality = "6ec83bb0-ed9f-11e9-3b4c-2b04cb4e219c"
 SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
 Unicode = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"

src/symbolictheoryutils.jl

@@ -6,8 +6,9 @@
 function rules end
 export rules
 
+# TODO: Probable piracy here
 function promote_symtype(f::ComposedFunction, args)
     promote_symtype(f.outer, promote_symtype(f.inner, args))
 end
 
 @active PatBlock(e) begin
@@ -76,7 +77,7 @@
     ph = @λ begin
         Expr(:call, foo, Expr(:(::), vars..., theory)) => (foo, vars, theory)
         Expr(:(::), Expr(:call, foo, vars...), theory) => (foo, vars, theory)
         _ => error("$head")
     end
     (f, types, Theory) = ph(head)
 
@@ -102,9 +103,9 @@
     argclaus = [:($a::Symbolic) for a in argnames]
     push!(result.args, quote
         @nospecialize
         function $f($(argclaus...))
             s = promote_symtype($f, $(argnames...))
             SymbolicUtils.Term{s}($f, Any[$(argnames...)])
         end
         export $f
     end)
@@ -112,20 +113,20 @@
     # if there are rewriting rules, add a method which accepts the function symbol and its arity (to prevent shadowing on operators like `-`)
     if !isempty(rulecalls)
         push!(result.args, quote
             function rules(::typeof($f), ::Val{$arity})
                 [($(rulecalls...))]
             end
         end)
     end
 
     # we want to feed symtype the generics
     push!(result.args, quote
         function SymbolicUtils.promote_symtype(::typeof($f),
                 $(sort_types...)) where {$(sort_constraints...)}
             $block
         end
         function SymbolicUtils.promote_symtype(::typeof($f), args::Vararg{Symbolic, $arity})
             promote_symtype($f, symtype.(args)...)
         end
     end)
 
@@ -157,10 +158,10 @@
                 Base.nameof(::typeof($alias), s) = Symbol("$alias")
             end))
     end
     result
 end
 export @alias
 
 alias(x) = error("$x has no aliases")
 export alias
 

test/aqua.jl

@@ -1,5 +1,5 @@
 using Aqua, DiagrammaticEquations
 @testset "Code quality (Aqua.jl)" begin
     # TODO: fix ambiguities
-    Aqua.test_all(DiagrammaticEquations, ambiguities=false, undefined_exports=false)
+    Aqua.test_all(DiagrammaticEquations, ambiguities=false, undefined_exports=false, piracies=false)
 end