Fix Sym constructions

Author: bowenszhu

src/Symbolics.jl

@@ -28,9 +28,8 @@ import DomainSets: Domain
 using TermInterface
 import TermInterface: maketerm, iscall, operation, arguments, metadata
 
-import SymbolicUtils: Term, Add, Mul, Pow, Sym, Div, BasicSymbolic,
-FnType, @rule, Rewriters, substitute, symtype,
-promote_symtype, isadd, ismul, ispow, isterm, issym, isdiv, _Sym
+import SymbolicUtils: BasicSymbolic, FnType, @rule, Rewriters, substitute, symtype,
+                      promote_symtype, isadd, ismul, ispow, isterm, issym, isdiv, _Sym
 
 using SymbolicUtils.Code
 

src/arrays.jl

@@ -1047,7 +1047,7 @@ function get_inputs(x::ArrayOp)
 end
 
 function similar_arrayvar(ex, name)
-    Sym{symtype(ex)}(name) #TODO: shape?
+    _Sym(symtype(ex), name) #TODO: shape?
 end
 
 function reset_to_one(range)
@@ -1056,7 +1056,7 @@ function reset_to_one(range)
 end
 
 function reset_sym(i)
-    Sym{Int}(Symbol(nameof(i), "′"))
+    _Sym(Int, Symbol(nameof(i), "′"))
 end
 
 function inplace_expr(x::ArrayOp, outsym = :_out, intermediates = nothing)

src/build_function.jl

@@ -310,7 +310,7 @@ function _build_function(target::JuliaTarget, rhss::AbstractArray, args...;
         oop_expr = wrap_code[1](oop_expr)
     end
 
-    out = Sym{Any}(:ˍ₋out)
+    out = _Sym(Any, :ˍ₋out)
     ip_body = if iip
         postprocess_fbody(set_array(parallel,
                                     dargs,
@@ -553,13 +553,13 @@ _set_array(out, outputidxs, rhs, checkbounds, skipzeros, cse) = rhs
 function vars_to_pairs(name,vs::Union{Tuple, AbstractArray}, symsdict=Dict())
     vs_names = tosymbol.(vs)
     for (v,k) in zip(vs_names, vs)
-        symsdict[k] = Sym{symtype(k)}(v)
+        symsdict[k] = _Sym(symtype(k), v)
     end
     exs = [:($name[$i]) for (i, u) ∈ enumerate(vs)]
     vs_names,exs
 end
 function vars_to_pairs(name,vs, symsdict)
-    symsdict[vs] = Sym{symtype(vs)}(tosymbol(vs))
+    symsdict[vs] = _Sym(symtype(vs), tosymbol(vs))
     [tosymbol(vs)], [name]
 end
 

src/complex.jl

@@ -48,7 +48,7 @@ function Base.show(io::IO, a::Complex{Num})
         return print(io, arguments(rr)[1])
     end
 
-    i = Sym{Real}(:im)
+    i = _Sym(Real, :im)
     show(io, real(a) + i * imag(a))
 end
 

src/utils.jl

@@ -132,7 +132,7 @@ function diff2term(O, O_metadata::Union{Dict, Nothing, Base.ImmutableDict}=nothi
         elseif oldop == getindex
             args = arguments(O)
             opname = string(tosymbol(args[1]), "[", map(tosymbol, args[2:end])..., "]")
-            return Sym{symtype(O)}(Symbol(opname, d_separator, ds))
+            return _Sym(symtype(O), Symbol(opname, d_separator, ds))
         elseif oldop isa Function
             return nothing
         else
@@ -227,7 +227,7 @@ function makesubscripts(n)
     map(1:n) do i
         repeats = ceil(Int, i / m)
         c = set[(i-1) % m + 1]
-        Sym{Int}(Symbol(join([c for _ in 1:repeats], "")))
+        _Sym(Int, Symbol(join([c for _ in 1:repeats], "")))
     end
 end
 

src/variable.jl

@@ -159,9 +159,9 @@ function construct_dep_array_vars(macroname, lhs, type, call_args, indices, val,
     ndim = :($length(($(indices...),)))
     vname = !isruntime ? Meta.quot(lhs) : lhs
     if call_args[1] == :..
-        ex = :($CallWithMetadata($Sym{$FnType{Tuple, Array{$type, $ndim}}}($vname)))
+        ex = :($CallWithMetadata($_Sym($FnType{Tuple, Array{$type, $ndim}}, $vname)))
     else
-        ex = :($Sym{$FnType{Tuple, Array{$type, $ndim}}}($vname)(map($unwrap, ($(call_args...),))...))
+        ex = :($_Sym($FnType{Tuple, Array{$type, $ndim}}, $vname)(map($unwrap, ($(call_args...),))...))
     end
     ex = :($setmetadata($ex, $ArrayShapeCtx, ($(indices...),)))
 
@@ -281,17 +281,17 @@ function _construct_array_vars(macroname, var_name, type, call_args, val, prop,
 
     need_scalarize = false
     expr = if call_args === nothing
-        ex = :($Sym{Array{$type, $ndim}}($var_name))
+        ex = :($_Sym(Array{$type, $ndim}, $var_name))
         :($setmetadata($ex, $ArrayShapeCtx, ($(indices...),)))
     elseif !isempty(call_args) && call_args[end] == :..
         need_scalarize = true
-        ex = :($Sym{Array{$FnType{Tuple, $type}, $ndim}}($var_name))
+        ex = :($_Sym(Array{$FnType{Tuple, $type}, $ndim}, $var_name))
         ex = :($setmetadata($ex, $ArrayShapeCtx, ($(indices...),)))
         :($map($CallWithMetadata, $ex))
     else
         # [(R -> R)(R) ....]
         need_scalarize = true
-        ex = :($Sym{Array{$FnType{Tuple, $type}, $ndim}}($var_name))
+        ex = :($_Sym(Array{$FnType{Tuple, $type}, $ndim}, $var_name))
         ex = :($setmetadata($ex, $ArrayShapeCtx, ($(indices...),)))
         :($map($CallWith(($(call_args...),)), $ex))
     end

test/arrays.jl

@@ -22,8 +22,8 @@ Symbolics.option_to_metadata_type(::Val{:test_meta}) = TestMetaT
     B = A[3:5]
     @test axes(B) == (Slice(1:3),)
 
-    i = Sym{Int}(:i)
-    j = Sym{Int}(:j)
+    i = _Sym(Int, :i)
+    j = _Sym(Int, :j)
     @test symtype(X[i, j]) == Real
     @test symtype(X[1, j]) == Real
 

test/overloads.jl

@@ -11,8 +11,8 @@ vars = @variables t $a $b(t) $c(t)[1:3]
 @test b === :value_b
 @test c === :value_c
 @test isequal(vars[1], t)
-@test isequal(vars[2], Num(Sym{Real}(a)))
-@test isequal(vars[3], Num(Sym{FnType{Tuple{Any},Real}}(b)(value(t))))
+@test isequal(vars[2], Num(_Sym(Real, a)))
+@test isequal(vars[3], Num(_Sym(FnType{Tuple{Any},Real}, b)(value(t))))
 
 vars = @variables a,b,c,d,e,f,g,h,i
 @test isequal(vars, [a,b,c,d,e,f,g,h,i])