@@ -64,7 +64,7 @@ const ENABLE_HASHCONSING = Ref(true)
6464end
6565
6666@kwdef struct BasicSymbolic{T} <: Symbolic{T}
67- impl :: BasicSymbolicImpl{T}
67+ expr :: BasicSymbolicImpl{T}
6868 metadata:: Metadata = NO_METADATA
6969end
7070
@@ -73,10 +73,10 @@ function SymbolicIndexingInterface.symbolic_type(::Type{<:BasicSymbolic})
7373end
7474
7575function exprtype (x:: BasicSymbolic )
76- exprtype (x. impl )
76+ exprtype (x. expr )
7777end
78- function exprtype (impl :: BasicSymbolicImpl )
79- @compactified impl :: BasicSymbolicImpl begin
78+ function exprtype (expr :: BasicSymbolicImpl )
79+ @compactified expr :: BasicSymbolicImpl begin
8080 Term => TERM
8181 Add => ADD
8282 Mul => MUL
@@ -88,10 +88,10 @@ function exprtype(impl::BasicSymbolicImpl)
8888end
8989
9090function Base. getproperty (x:: BasicSymbolic , sym:: Symbol )
91- if sym === :metadata || sym === :impl
91+ if sym === :metadata || sym === :expr
9292 return getfield (x, sym)
9393 else
94- return getproperty (x. impl , sym)
94+ return getproperty (x. expr , sym)
9595 end
9696end
9797
@@ -113,7 +113,7 @@ function ConstructionBase.setproperties(obj::BasicSymbolic{T}, patch::NamedTuple
113113 nt = getproperties (obj)
114114 nt_new = merge (nt, patch)
115115 # Call outer constructor because hash consing cannot be applied in inner constructor
116- @compactified obj. impl :: BasicSymbolicImpl begin
116+ @compactified obj. expr :: BasicSymbolicImpl begin
117117 Sym => Sym {T} (nt_new. name; nt_new... )
118118 Term => Term {T} (nt_new. f, nt_new. arguments; nt_new... , hash = RefValue (UInt (0 )), hash2 = RefValue (UInt (0 )))
119119 Add => Add (T, nt_new. coeff, nt_new. dict; nt_new... , hash = RefValue (UInt (0 )), hash2 = RefValue (UInt (0 )))
@@ -143,11 +143,11 @@ symtype(x) = typeof(x)
143143
144144# We're returning a function pointer
145145function operation (x:: BasicSymbolic )
146- operation (x. impl )
146+ operation (x. expr )
147147end
148- @inline function operation (impl :: BasicSymbolicImpl )
149- @compactified impl :: BasicSymbolicImpl begin
150- Term => impl . f
148+ @inline function operation (expr :: BasicSymbolicImpl )
149+ @compactified expr :: BasicSymbolicImpl begin
150+ Term => expr . f
151151 Add => (+ )
152152 Mul => (* )
153153 Div => (/ )
161161
162162function TermInterface. sorted_arguments (x:: BasicSymbolic )
163163 args = arguments (x)
164- @compactified x. impl :: BasicSymbolicImpl begin
164+ @compactified x. expr :: BasicSymbolicImpl begin
165165 Add => @goto ADD
166166 Mul => @goto MUL
167167 _ => return args
186186TermInterface. children (x:: BasicSymbolic ) = arguments (x)
187187TermInterface. sorted_children (x:: BasicSymbolic ) = sorted_arguments (x)
188188function TermInterface. arguments (x:: BasicSymbolic )
189- arguments (x. impl )
189+ arguments (x. expr )
190190end
191191function TermInterface. arguments (x:: BasicSymbolicImpl )
192192 @compactified x:: BasicSymbolicImpl begin
@@ -241,7 +241,7 @@ iscall(s::BasicSymbolic) = isexpr(s)
241241
242242@inline function isa_SymType (T:: Val{S} , x) where {S}
243243 if x isa BasicSymbolic
244- Unityper. isa_type_fun (Val (SymbolicUtils. BasicSymbolicImpl), T, x. impl )
244+ Unityper. isa_type_fun (Val (SymbolicUtils. BasicSymbolicImpl), T, x. expr )
245245 elseif x isa BasicSymbolicImpl
246246 Unityper. isa_type_fun (Val (SymbolicUtils. BasicSymbolicImpl), T, x)
247247 else
423423Base. one ( s:: Symbolic ) = one ( symtype (s))
424424Base. zero (s:: Symbolic ) = zero (symtype (s))
425425
426- Base. nameof (s:: BasicSymbolic ) = nameof (s. impl )
426+ Base. nameof (s:: BasicSymbolic ) = nameof (s. expr )
427427function Base. nameof (s:: BasicSymbolicImpl )
428428 if issym (s)
429429 s. name
0 commit comments