move real,imag and conj out of monadic, fix test

Author: Suavesito-Olimpiada

src/methods.jl

@@ -4,12 +4,12 @@ import SpecialFunctions: gamma, loggamma, erf, erfc, erfcinv, erfi, erfcx,
                          besselj1, bessely0, bessely1, besselj, bessely, besseli,
                          besselk, hankelh1, hankelh2, polygamma, beta, logbeta
 
-const monadic = [deg2rad, rad2deg, transpose, conj, asind, log1p, acsch,
+const monadic = [deg2rad, rad2deg, transpose, asind, log1p, acsch,
                  acos, asec, acosh, acsc, cscd, log, tand, log10, csch, asinh,
                  abs2, cosh, sin, cos, atan, cospi, cbrt, acosd, acoth, acotd,
                  asecd, exp, acot, sqrt, sind, sinpi, asech, log2, tan, exp10,
                  sech, coth, asin, cotd, cosd, sinh, abs, csc, tanh, secd,
-                 atand, sec, acscd, cot, exp2, expm1, atanh, real, imag, gamma,
+                 atand, sec, acscd, cot, exp2, expm1, atanh, gamma,
                  loggamma, erf, erfc, erfcinv, erfi, erfcx, dawson, digamma,
                  trigamma, invdigamma, polygamma, airyai, airyaiprime, airybi,
                  airybiprime, besselj0, besselj1, bessely0, bessely1]
@@ -97,9 +97,6 @@ promote_symtype(::typeof(rem2pi), T::Type{<:Number}, mode) = T
 Base.rem2pi(x::Symbolic{<:Number}, mode::Base.RoundingMode) = term(rem2pi, x, mode)
 
 for f in monadic
-    if f in [real, imag, conj]
-        continue
-    end
     @eval promote_symtype(::$(typeof(f)), T::Type{<:Number}) = promote_type(T, Real)
     @eval (::$(typeof(f)))(a::Symbolic{<:Number})   = term($f, a)
 end
@@ -111,15 +108,12 @@ for f in [identity, one, zero, *, +, -]
     @eval promote_symtype(::$(typeof(f)), T::Type{<:Number}) = T
 end
 
-# All of these need to be `Sym` to overwrite the function definitions of
-# the L78, that are made with the type `Sym <: Symbolic`
-#   @number_methods(Sym, term(f, a), term(f, a, b), skipbasics)
 promote_symtype(::typeof(Base.real), T::Type{<:Number}) = Real
-Base.real(s::Sym{<:Real}) = s
+Base.real(s::Symbolic{<:Number}) = islike(s, Real) ? s : term(real, s)
 promote_symtype(::typeof(Base.conj), T::Type{<:Number}) = T
-Base.conj(s::Sym{<:Real}) = s
+Base.conj(s::Symbolic{<:Number}) = islike(s, Real) ? s : term(conj, s)
 promote_symtype(::typeof(Base.imag), T::Type{<:Number}) = Real
-Base.imag(s::Sym{<:Real}) = zero(symtype(s))
+Base.imag(s::Symbolic{<:Number}) = islike(s, Real) ? zero(symtype(s)) : term(conj, s)
 
 ## Booleans
 

test/rulesets.jl

@@ -1,5 +1,5 @@
 using Random: shuffle, seed!
-using SymbolicUtils: getdepth, Rewriters
+using SymbolicUtils: getdepth, Rewriters, Term
 
 @testset "Chain, Postwalk and Fixpoint" begin
     @syms w z α::Real β::Real
@@ -18,9 +18,9 @@ end
 
 @testset "Numeric" begin
     @syms a::Integer b c d x::Real y::Number
-    @eqtest simplify(conj(x)) == x
-    @eqtest simplify(real(x)) == x
-    @eqtest simplify(imag(x)) == 0
+    @eqtest simplify(Term{Real}(conj, [x])) == x
+    @eqtest simplify(Term{Real}(real, [x])) == x
+    @eqtest simplify(Term{Real}(imag, [x])) == 0
     @eqtest simplify(x - y) == x + -1*y
     @eqtest simplify(x - sin(y)) == x + -1*sin(y)
     @eqtest simplify(-sin(x)) == -1*sin(x)