6969end
7070
7171@kwdef struct BasicSymbolic{T} <: Symbolic{T}
72- impl :: BasicSymbolicImpl{T}
72+ expr :: BasicSymbolicImpl{T}
7373 meta:: Metadata
7474end
7575
@@ -78,10 +78,10 @@ function SymbolicIndexingInterface.symbolic_type(::Type{<:BasicSymbolic})
7878end
7979
8080function exprtype (x:: BasicSymbolic )
81- exprtype (x. impl )
81+ exprtype (x. expr )
8282end
83- function exprtype (impl :: BasicSymbolicImpl )
84- @compactified impl :: BasicSymbolicImpl begin
83+ function exprtype (expr :: BasicSymbolicImpl )
84+ @compactified expr :: BasicSymbolicImpl begin
8585 Term => TERM
8686 Add => ADD
8787 Mul => MUL
@@ -93,10 +93,10 @@ function exprtype(impl::BasicSymbolicImpl)
9393end
9494
9595function Base. getproperty (x:: BasicSymbolic , sym:: Symbol )
96- if sym === :metadata || sym === :impl
96+ if sym === :metadata || sym === :expr
9797 return getfield (x, sym)
9898 else
99- return getproperty (x. impl , sym)
99+ return getproperty (x. expr , sym)
100100 end
101101end
102102
@@ -118,7 +118,7 @@ function ConstructionBase.setproperties(obj::BasicSymbolic{T}, patch::NamedTuple
118118 nt = getproperties (obj)
119119 nt_new = merge (nt, patch)
120120 # Call outer constructor because hash consing cannot be applied in inner constructor
121- @compactified obj. impl :: BasicSymbolicImpl begin
121+ @compactified obj. expr :: BasicSymbolicImpl begin
122122 Sym => Sym {T} (nt_new. name; nt_new... )
123123 Term => Term {T} (nt_new. f, nt_new. arguments; nt_new... , hash = RefValue (UInt (0 )), hash2 = RefValue (UInt (0 )))
124124 Add => Add (T, nt_new. coeff, nt_new. dict; nt_new... , hash = RefValue (UInt (0 )), hash2 = RefValue (UInt (0 )))
@@ -148,11 +148,11 @@ symtype(x) = typeof(x)
148148
149149# We're returning a function pointer
150150function operation (x:: BasicSymbolic )
151- operation (x. impl )
151+ operation (x. expr )
152152end
153- @inline function operation (impl :: BasicSymbolicImpl )
154- @compactified impl :: BasicSymbolicImpl begin
155- Term => impl . f
153+ @inline function operation (expr :: BasicSymbolicImpl )
154+ @compactified expr :: BasicSymbolicImpl begin
155+ Term => expr . f
156156 Add => (+ )
157157 Mul => (* )
158158 Div => (/ )
166166
167167function TermInterface. sorted_arguments (x:: BasicSymbolic )
168168 args = arguments (x)
169- @compactified x. impl :: BasicSymbolicImpl begin
169+ @compactified x. expr :: BasicSymbolicImpl begin
170170 Add => @goto ADD
171171 Mul => @goto MUL
172172 _ => return args
191191TermInterface. children (x:: BasicSymbolic ) = arguments (x)
192192TermInterface. sorted_children (x:: BasicSymbolic ) = sorted_arguments (x)
193193function TermInterface. arguments (x:: BasicSymbolic )
194- arguments (x. impl )
194+ arguments (x. expr )
195195end
196196function TermInterface. arguments (x:: BasicSymbolicImpl )
197197 @compactified x:: BasicSymbolicImpl begin
@@ -246,7 +246,7 @@ iscall(s::BasicSymbolic) = isexpr(s)
246246
247247@inline function isa_SymType (T:: Val{S} , x) where {S}
248248 if x isa BasicSymbolic
249- Unityper. isa_type_fun (Val (SymbolicUtils. BasicSymbolicImpl), T, x. impl )
249+ Unityper. isa_type_fun (Val (SymbolicUtils. BasicSymbolicImpl), T, x. expr )
250250 elseif x isa BasicSymbolicImpl
251251 Unityper. isa_type_fun (Val (SymbolicUtils. BasicSymbolicImpl), T, x)
252252 else
428428Base. one ( s:: Symbolic ) = one ( symtype (s))
429429Base. zero (s:: Symbolic ) = zero (symtype (s))
430430
431- Base. nameof (s:: BasicSymbolic ) = nameof (s. impl )
431+ Base. nameof (s:: BasicSymbolic ) = nameof (s. expr )
432432function Base. nameof (s:: BasicSymbolicImpl )
433433 if issym (s)
434434 s. name
0 commit comments