adjust

Author: a

Project.toml

@@ -1,7 +1,7 @@
 name = "SymbolicUtils"
 uuid = "d1185830-fcd6-423d-90d6-eec64667417b"
 authors = ["Shashi Gowda"]
-version = "1.5.1"
+version = "1.6.0"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"

src/inspect.jl

@@ -27,7 +27,7 @@ function AbstractTrees.nodevalue(x::BasicSymbolic)
 end
 
 function AbstractTrees.children(x::Symbolic)
-    isexpr(x) ? children(x) : ()
+    isexpr(x) ? arguments(x) : ()
 end
 
 """

src/polyform.jl

@@ -184,8 +184,8 @@ function similarterm(::PolyForm, f::Union{typeof(*), typeof(+), typeof(^)},
     f(args...)
 end
 
-head(x::PolyForm) = MP.nterms(x.p) == 1 ? (*) : (+)
-operation(x::PolyForm) = head(x)
+head(::PolyForm) = PolyForm
+operation(x::PolyForm) = MP.nterms(x.p) == 1 ? (*) : (+)
 
 function arguments(x::PolyForm{T}) where {T}
 
@@ -231,6 +231,7 @@ function arguments(x::PolyForm{T}) where {T}
                  PolyForm{T}(t, x.pvar2sym, x.sym2term, nothing)) for t in ts]
     end
 end
+children(x::PolyForm) = [operation(x); arguments(x)]
 
 Base.show(io::IO, x::PolyForm) = show_term(io, x)
 

src/types.jl

@@ -102,7 +102,7 @@ symtype(x::Number) = typeof(x)
 @inline symtype(::Symbolic{T}) where T = T
 
 # We're returning a function pointer
-@inline function head(x::BasicSymbolic)
+@inline function operation(x::BasicSymbolic)
     @compactified x::BasicSymbolic begin
         Term => x.f
         Add  => (+)
@@ -113,7 +113,7 @@ symtype(x::Number) = typeof(x)
         _    => error_on_type()
     end
 end
-@inline operation(x) = head(x)
+@inline head(x::BasicSymbolic) = BasicSymbolic
 
 function arguments(x::BasicSymbolic)
     args = unsorted_arguments(x)
@@ -136,7 +136,7 @@ function arguments(x::BasicSymbolic)
     end
     return args
 end
-children(x::BasicSymbolic) = arguments(x)
+children(x::BasicSymbolic) = [operation(x); arguments(x)]
 function unsorted_arguments(x::BasicSymbolic)
     @compactified x::BasicSymbolic begin
         Term => return x.arguments

src/utils.jl

@@ -222,8 +222,8 @@ macro matchable(expr)
         SymbolicUtils.iscall(::$name) = true
         SymbolicUtils.head(::$name) = $name
         SymbolicUtils.operation(::$name) = $name
-        SymbolicUtils.children(x::$name) = getfield.((x,), ($(QuoteNode.(fields)...),))
-        SymbolicUtils.arguments(x::$name) = SymbolicUtils.children(x)
+        SymbolicUtils.arguments(x::$name) = getfield.((x,), ($(QuoteNode.(fields)...),))
+        SymbolicUtils.children(x::$name) = [SymbolicUtils.operation(x); SymbolicUtils.children(x)]
         Base.length(x::$name) = $(length(fields) + 1)
         SymbolicUtils.similarterm(x::$name, f, args, type; kw...) = f(args...)
     end |> esc