Fix different targets

Author: YingboMa

src/build_function.jl

@@ -479,7 +479,7 @@ function numbered_expr(O::Union{Term,Sym},args...;varordering = args[1],offset =
 		end
 	end
   end
-  return Expr(:call, O isa Sym ? nameof(O) : tosymbol(O.op),
+  return Expr(:call, O isa Sym ? tosymbol(O, escape=false) : Symbol(O.op),
          [numbered_expr(x,args...;offset=offset,lhsname=lhsname,
                         rhsnames=rhsnames,varordering=varordering) for x in O.args]...)
 end
@@ -489,7 +489,7 @@ function numbered_expr(de::ModelingToolkit.Equation,args...;varordering = args[1
 
     varordering = value.(args[1])
     var = var_from_nested_derivative(de.lhs)[1]
-    i = findfirst(x->isequal(tosymbol(x isa Sym ? x : x.op), tosymbol(var)),varordering)
+    i = findfirst(x->isequal(tosymbol(x isa Sym ? x : x.op, escape=false), tosymbol(var, escape=false)),varordering)
     :($lhsname[$(i+offset)] = $(numbered_expr(de.rhs,args...;offset=offset,
 											  varordering = varordering,
 											  lhsname = lhsname,

src/systems/diffeqs/abstractodesystem.jl

@@ -72,7 +72,15 @@ Base.Symbol(x::Union{Num,Symbolic}) = tosymbol(x)
 tosymbol(x; kwargs...) = x
 tosymbol(x::Sym; kwargs...) = nameof(x)
 tosymbol(t::Num; kwargs...) = tosymbol(value(t); kwargs...)
-function tosymbol(t::Term; states=nothing)
+
+"""
+    tosymbol(x::Union{Num,Symbolic}; states=nothing, escape=true) -> Symbol
+
+Convert `x` to a symbol. `states` are the states of a system, and `escape`
+means if the target has escapes like `val"y⦗t⦘"`. If `escape` then it will only
+output `y` instead of `y⦗t⦘`.
+"""
+function tosymbol(t::Term; states=nothing, escape=true)
     if t.op isa Sym
         if states !== nothing && !(any(isequal(t), states))
             return nameof(t.op)
@@ -91,7 +99,7 @@ function tosymbol(t::Term; states=nothing)
         @goto err
     end
 
-    return Symbol(op, "⦗", join(args, ", "), "⦘")
+    return escape ? Symbol(op, "⦗", join(args, ", "), "⦘") : op
     @label err
     error("Cannot convert $t to a symbol")
 end