Skip to content

Commit 17408e8

Browse files
committed
Rename BasicSymbolicImpl field from impl to expr
[skip ci]
1 parent 2ab70b3 commit 17408e8

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

src/types.jl

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ const ENABLE_HASHCONSING = Ref(true)
6464
end
6565

6666
@kwdef struct BasicSymbolic{T} <: Symbolic{T}
67-
impl::BasicSymbolicImpl{T}
67+
expr::BasicSymbolicImpl{T}
6868
metadata::Metadata = NO_METADATA
6969
end
7070

@@ -73,10 +73,10 @@ function SymbolicIndexingInterface.symbolic_type(::Type{<:BasicSymbolic})
7373
end
7474

7575
function exprtype(x::BasicSymbolic)
76-
exprtype(x.impl)
76+
exprtype(x.expr)
7777
end
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)
8888
end
8989

9090
function 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
9696
end
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
145145
function operation(x::BasicSymbolic)
146-
operation(x.impl)
146+
operation(x.expr)
147147
end
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 => (/)
@@ -161,7 +161,7 @@ end
161161

162162
function 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
@@ -186,7 +186,7 @@ end
186186
TermInterface.children(x::BasicSymbolic) = arguments(x)
187187
TermInterface.sorted_children(x::BasicSymbolic) = sorted_arguments(x)
188188
function TermInterface.arguments(x::BasicSymbolic)
189-
arguments(x.impl)
189+
arguments(x.expr)
190190
end
191191
function 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
@@ -423,7 +423,7 @@ end
423423
Base.one( s::Symbolic) = one( symtype(s))
424424
Base.zero(s::Symbolic) = zero(symtype(s))
425425

426-
Base.nameof(s::BasicSymbolic) = nameof(s.impl)
426+
Base.nameof(s::BasicSymbolic) = nameof(s.expr)
427427
function Base.nameof(s::BasicSymbolicImpl)
428428
if issym(s)
429429
s.name

0 commit comments

Comments
 (0)