Merge pull request #368 from JuliaSymbolics/ale/lower_to_mt

Move generic term rewriting features to Metatheory.jl

Author: shashi

.gitignore

@@ -3,3 +3,5 @@
 *.jl.mem
 Manifest.toml
 /docs/build/
+benchmark/tune.json
+

Project.toml

@@ -15,6 +15,7 @@ DynamicPolynomials = "7c1d4256-1411-5781-91ec-d7bc3513ac07"
 IfElse = "615f187c-cbe4-4ef1-ba3b-2fcf58d6d173"
 LabelledArrays = "2ee39098-c373-598a-b85f-a56591580800"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+Metatheory = "e9d8d322-4543-424a-9be4-0cc815abe26c"
 MultivariatePolynomials = "102ac46a-7ee4-5c85-9060-abc95bfdeaa3"
 NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
 Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
@@ -35,12 +36,13 @@ DocStringExtensions = "0.8"
 DynamicPolynomials = "0.3"
 IfElse = "0.1"
 LabelledArrays = "1.5"
+Metatheory = "1.0"
 MultivariatePolynomials = "0.3"
 NaNMath = "0.3"
 Setfield = "0.7, 0.8"
 SpecialFunctions = "0.10, 1.0"
 StaticArrays = "0.12, 1.0"
-TermInterface = "0.1.8"
+TermInterface = "0.2.1"
 TimerOutputs = "0.5"
 julia = "1.3"
 

benchmark/benchmarks.jl

@@ -1,5 +1,6 @@
 using BenchmarkTools, SymbolicUtils
-using SymbolicUtils: is_literal_number
+using SymbolicUtils: is_literal_number, @rule
+using Metatheory
 
 using Random
 

src/SymbolicUtils.jl

@@ -8,6 +8,9 @@ export @syms, term, showraw, hasmetadata, getmetadata, setmetadata
 
 using TermInterface
 using TermInterface: node_count
+using Metatheory
+using Metatheory.Rules
+using Metatheory.Rewriters
 
 # Sym, Term,
 # Add, Mul and Pow
@@ -30,25 +33,18 @@ include("utils.jl")
 export Rewriters
 
 # A library for composing together expr -> expr functions
-include("rewriters.jl")
-
-using .Rewriters
 
 using Combinatorics: permutations, combinations
 export @rule, @acrule, RuleSet
 
 # Rule type and @rule macro
 include("rule.jl")
 
-# Matching a Rule
-include("matchers.jl")
-
 # Convert to an efficient multi-variate polynomial representation
 import MultivariatePolynomials
 const MP = MultivariatePolynomials
 import DynamicPolynomials
 export expand
-include("abstractalgebra.jl")
 include("polyform.jl")
 
 # Term ordering

src/abstractalgebra.jl

@@ -1,6 +1,7 @@
 module Code
 
 using StaticArrays, LabelledArrays, SparseArrays, LinearAlgebra
+using TermInterface
 
 export toexpr, Assignment, (←), Let, Func, DestructuredArgs, LiteralExpr,
        SetArray, MakeArray, MakeSparseArray, MakeTuple, AtIndex,