fix: compat with older SymbolicUtils

Author: MilesCranmer

Project.toml

@@ -1,7 +1,7 @@
 name = "DynamicExpressions"
 uuid = "a40a106e-89c9-4ca8-8020-a735e8728b6b"
 authors = ["MilesCranmer <miles.cranmer@gmail.com>"]
-version = "0.19.2"
+version = "0.19.3"
 
 [deps]
 ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"

ext/DynamicExpressionsSymbolicUtilsExt.jl

@@ -12,6 +12,12 @@ import DynamicExpressions: AbstractExpression, get_tree, get_operators
 const SYMBOLIC_UTILS_TYPES = Union{<:Number,SymbolicUtils.Symbolic{<:Number}}
 const SUPPORTED_OPS = (cos, sin, exp, cot, tan, csc, sec, +, -, *, /)
 
+@static if isdefined(SymbolicUtils, :iscall)
+    iscall(x) = SymbolicUtils.iscall(x)
+else
+    iscall(x) = SymbolicUtils.istree(x)
+end
+
 macro return_on_false(flag, retval)
     :(
         if !$(esc(flag))
@@ -21,7 +27,7 @@ macro return_on_false(flag, retval)
 end
 
 function is_valid(x::SymbolicUtils.Symbolic)
-    return if SymbolicUtils.iscall(x)
+    return if iscall(x)
         all(is_valid.([SymbolicUtils.operation(x); SymbolicUtils.arguments(x)]))
     else
         true
@@ -140,7 +146,7 @@ function Base.convert(
     variable_names::Union{Array{String,1},Nothing}=nothing,
 ) where {N<:AbstractExpressionNode}
     variable_names = deprecate_varmap(variable_names, nothing, :convert)
-    if !SymbolicUtils.iscall(expr)
+    if !iscall(expr)
         variable_names === nothing && return constructorof(N)(String(expr.name))
         return constructorof(N)(String(expr.name), variable_names)
     end
@@ -234,7 +240,7 @@ function multiply_powers(eqn::Number)::Tuple{SYMBOLIC_UTILS_TYPES,Bool}
 end
 
 function multiply_powers(eqn::SymbolicUtils.Symbolic)::Tuple{SYMBOLIC_UTILS_TYPES,Bool}
-    if !SymbolicUtils.iscall(eqn)
+    if !iscall(eqn)
         return eqn, true
     end
     op = SymbolicUtils.operation(eqn)