Define get_name function

Author: bowenszhu

src/types.jl

@@ -64,6 +64,10 @@ function exprtype(x::BasicSymbolic)
     end
 end
 
+function get_name(x::BasicSymbolic)
+    x.impl.name
+end
+
 # Same but different error messages
 @noinline error_on_type() = error("Internal error: unreachable reached!")
 @noinline error_sym() = error("Sym doesn't have a operation or arguments!")
@@ -308,7 +312,13 @@ end
 Base.one( s::Symbolic) = one( symtype(s))
 Base.zero(s::Symbolic) = zero(symtype(s))
 
-Base.nameof(s::BasicSymbolic) = issym(s) ? s.impl.name : error("None Sym BasicSymbolic doesn't have a name")
+function Base.nameof(s::BasicSymbolic)
+    if issym(s)
+        get_name(s)
+    else
+        error("None Sym BasicSymbolic doesn't have a name")
+    end
+end
 
 ## This is much faster than hash of an array of Any
 hashvec(xs, z) = foldr(hash, xs, init=z)
@@ -986,7 +996,7 @@ showraw(t) = showraw(stdout, t)
 
 function Base.show(io::IO, v::BasicSymbolic)
     @match v.impl begin
-        Sym(_...) => Base.show_unquoted(io, v.impl.name)
+        Sym(_...) => Base.show_unquoted(io, get_name(v))
         Const(_...) => print(io, v.impl.val)
         _ => show_term(io, v)
     end

test/basics.jl

@@ -1,4 +1,4 @@
-using SymbolicUtils: Symbolic, FnType, symtype, operation, arguments, issym, isterm, BasicSymbolic, term
+using SymbolicUtils: Symbolic, FnType, symtype, operation, arguments, issym, isterm, BasicSymbolic, term, get_name
 using SymbolicUtils
 using IfElse: ifelse
 using Setfield
@@ -9,17 +9,17 @@ using Test
         @syms a b::Float64 f(::Real) g(p, h(q::Real))::Int 
 
         @test issym(a) && symtype(a) == Number
-        @test a.impl.name === :a
+        @test get_name(a) === :a
 
         @test issym(b) && symtype(b) == Float64
         @test nameof(b) === :b
 
         @test issym(f)
-        @test f.impl.name === :f
+        @test get_name(f) === :f
         @test symtype(f) == FnType{Tuple{Real}, Number, Nothing}
 
         @test issym(g)
-        @test g.impl.name === :g
+        @test get_name(g) === :g
         @test symtype(g) == FnType{Tuple{Number, FnType{Tuple{Real}, Number, Nothing}}, Int, Nothing}
 
         @test isterm(f(b))
@@ -37,14 +37,14 @@ using Test
 
         @syms (f::typeof(max))(::Real, ::AbstractFloat)::Number a::Real
         @test issym(f)
-        @test f.impl.name == :f
+        @test get_name(f) == :f
         @test symtype(f) == FnType{Tuple{Real, AbstractFloat}, Number, typeof(max)}
         @test isterm(f(a, b))
         @test symtype(f(a, b)) == Number
 
         @syms g(p, (h::typeof(identity))(q::Real)::Number)::Number
         @test issym(g)
-        @test g.impl.name == :g
+        @test get_name(g) == :g
         @test symtype(g) == FnType{Tuple{Number, FnType{Tuple{Real}, Number, typeof(identity)}}, Number, Nothing}
         @test_throws "not a subtype of" g(a, f)
         @syms (f::typeof(identity))(::Real)::Number

test/types.jl

@@ -1,4 +1,4 @@
-using SymbolicUtils: Symbolic, BasicSymbolic, _Sym, _Term, _Const, _Add
+using SymbolicUtils: Symbolic, BasicSymbolic, _Sym, _Term, _Const, _Add, get_name
 
 @testset "Expronicon generated constructors" begin
     s1 = Sym(:abc)
@@ -112,11 +112,11 @@ end
         @test typeof(s1) == BasicSymbolic{Int64}
         @test s1.metadata == SymbolicUtils.NO_METADATA
         @test s1.hash[] == SymbolicUtils.EMPTY_HASH
-        @test s1.impl.name == :x
+        @test get_name(s1) == :x
         @test typeof(s2) == BasicSymbolic{Float64}
         @test s2.metadata == SymbolicUtils.NO_METADATA
         @test s2.hash[] == SymbolicUtils.EMPTY_HASH
-        @test s2.impl.name == :y
+        @test get_name(s2) == :y
     end
     @testset "Term" begin
         s1 = _Sym(Float64, :x)