[BREAKING] feat: update to SymbolicUtils@4

Project.toml

@@ -22,9 +22,11 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 LogExpFunctions = "2ab3a3ac-af41-5b50-aa03-7779005ae688"
 MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
+Moshi = "2e0e35c7-a2e4-4343-998d-7ef72827ed2d"
 NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
 OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
 PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
+Preferences = "21216c6a-2e73-6563-6e65-726566657250"
 Primes = "27ebfcd6-29c5-5fa9-bf4b-fb8fc14df3ae"
 RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
@@ -84,12 +86,14 @@ Latexify = "0.16"
 LogExpFunctions = "0.3"
 Lux = "1"
 MacroTools = "0.5"
+Moshi = "0.3.7"
 NaNMath = "1"
 Nemo = "0.46, 0.47, 0.48, 0.49, 0.52"
 OffsetArrays = "1.15.0"
 PkgBenchmark = "0.2"
 PreallocationTools = "0.4"
 PrecompileTools = "1"
+Preferences = "1.5.0"
 Primes = "0.5"
 RecipesBase = "1.1"
 Reexport = "1"

src/Symbolics.jl

@@ -26,9 +26,10 @@ import DomainSets: Domain, DomainSets
 using TermInterface
 import TermInterface: maketerm, iscall, operation, arguments, metadata
 
-import SymbolicUtils: Term, Add, Mul, Pow, Sym, Div, BasicSymbolic,
-FnType, @rule, Rewriters, substitute, symtype,
-promote_symtype, isadd, ismul, ispow, isterm, issym, isdiv
+import SymbolicUtils: Term, Add, Mul, Sym, Div, BasicSymbolic, Const,
+    FnType, @rule, Rewriters, substitute, symtype, shape, unwrap, unwrap_const,
+    promote_symtype, isadd, ismul, ispow, isterm, issym, isdiv, BSImpl, scalarize,
+    Operator
 
 using SymbolicUtils.Code
 
@@ -54,6 +55,23 @@ RuntimeGeneratedFunctions.init(@__MODULE__)
 
 import SciMLPublic: @public
 
+using Moshi.Match: @match
+
+import Preferences: @load_preference
+
+const DEFAULT_VARTYPE_PREF = @load_preference("vartype", "SymReal")
+const VartypeT = @static if DEFAULT_VARTYPE_PREF == "SymReal"
+    SymReal
+elseif DEFAULT_VARTYPE_PREF == "SafeReal"
+    SafeReal
+elseif DEFAULT_VARTYPE_PREF == "TreeReal"
+    TreeReal
+else
+    error("""
+    Invalid vartype preference: $DEFAULT_VARTYPE_PREF. Must be one of "SymReal", \
+    "SafeReal" or "TreeReal".
+    """)
+end
 # re-export
 
 export simplify, substitute
@@ -177,7 +195,7 @@ export limit
 
 # Hacks to make wrappers "nicer"
 const NumberTypes = Union{AbstractFloat,Integer,Complex{<:AbstractFloat},Complex{<:Integer}}
-(::Type{T})(x::SymbolicUtils.Symbolic) where {T<:NumberTypes} = throw(ArgumentError("Cannot convert Sym to $T since Sym is symbolic and $T is concrete. Use `substitute` to replace the symbolic unwraps."))
+(::Type{T})(x::SymbolicUtils.BasicSymbolic) where {T<:NumberTypes} = throw(ArgumentError("Cannot convert Sym to $T since Sym is symbolic and $T is concrete. Use `substitute` to replace the symbolic unwraps."))
 for T in [Num, Complex{Num}]
     @eval begin
         #(::Type{S})(x::$T) where {S<:Union{NumberTypes,AbstractArray}} = S(Symbolics.unwrap(x))::S
@@ -196,9 +214,7 @@ for T in [Num, Complex{Num}]
         SymbolicUtils.hasmetadata(x::$T, t) = SymbolicUtils.hasmetadata(unwrap(x), t)
 
         Broadcast.broadcastable(x::$T) = x
-    end
-    for S in [:(Symbolic{<:FnType}), :CallWithMetadata]
-        @eval (f::$S)(x::$T, y...) = wrap(f(unwrap(x), unwrap.(y)...))
+        SymbolicUtils.scalarize(x::$T) = scalarize(unwrap(x))
     end
 end
 
@@ -545,7 +561,7 @@ include("inverse.jl")
 export rootfunction, left_continuous_function, right_continuous_function, @register_discontinuity
 include("discontinuities.jl")
 
-@public Arr, CallWithMetadata, NAMESPACE_SEPARATOR, Unknown, VariableDefaultValue, VariableSource
+@public Arr, NAMESPACE_SEPARATOR, Unknown, VariableDefaultValue, VariableSource
 @public _parse_vars, derivative, gradient, jacobian, sparsejacobian, hessian, sparsehessian
 @public get_variables, get_variables!, get_differential_vars, getparent, option_to_metadata_type, scalarize, shape
 @public unwrap, variable, wrap