Use NAMESPACE_SEPARATOR

Author: YingboMa

src/systems/abstractsystem.jl

@@ -366,7 +366,7 @@ function SymbolicIndexingInterface.is_variable(sys::AbstractSystem, sym::Symbol)
     end
     return any(isequal(sym), getname.(variable_symbols(sys))) ||
            count('.', string(sym)) == 1 &&
-           count(isequal(sym), Symbol.(nameof(sys), :., getname.(variable_symbols(sys)))) ==
+           count(isequal(sym), Symbol.(nameof(sys), NAMESPACE_SEPARATOR, getname.(variable_symbols(sys)))) ==
            1
 end
 
@@ -401,7 +401,7 @@ function SymbolicIndexingInterface.variable_index(sys::AbstractSystem, sym::Symb
         return idx
     elseif count('.', string(sym)) == 1
         return findfirst(isequal(sym),
-            Symbol.(nameof(sys), :., getname.(variable_symbols(sys))))
+            Symbol.(nameof(sys), NAMESPACE_SEPARATOR, getname.(variable_symbols(sys))))
     end
     return nothing
 end
@@ -433,7 +433,7 @@ function SymbolicIndexingInterface.is_parameter(sys::AbstractSystem, sym::Symbol
     return any(isequal(sym), getname.(parameter_symbols(sys))) ||
            count('.', string(sym)) == 1 &&
            count(isequal(sym),
-        Symbol.(nameof(sys), :., getname.(parameter_symbols(sys)))) == 1
+        Symbol.(nameof(sys), NAMESPACE_SEPARATOR, getname.(parameter_symbols(sys)))) == 1
 end
 
 function SymbolicIndexingInterface.parameter_index(sys::AbstractSystem, sym)
@@ -468,7 +468,7 @@ function SymbolicIndexingInterface.parameter_index(sys::AbstractSystem, sym::Sym
         return idx
     elseif count('.', string(sym)) == 1
         return findfirst(isequal(sym),
-            Symbol.(nameof(sys), :., getname.(parameter_symbols(sys))))
+            Symbol.(nameof(sys), NAMESPACE_SEPARATOR, getname.(parameter_symbols(sys))))
     end
     return nothing
 end
@@ -889,7 +889,7 @@ function renamespace(sys, x)
     elseif x isa AbstractSystem
         rename(x, renamespace(sys, nameof(x)))
     else
-        Symbol(getname(sys), :., x)
+        Symbol(getname(sys), NAMESPACE_SEPARATOR, x)
     end
 end
 
@@ -1251,7 +1251,7 @@ function round_trip_eq(eq::Equation, var2name)
             strs = split(string(nameof(sys)), ".")
             s = Symbol(strs[1])
             for st in strs[2:end]
-                s = Expr(:., s, Meta.quot(Symbol(st)))
+                s = Expr(NAMESPACE_SEPARATOR, s, Meta.quot(Symbol(st)))
             end
             push!(call.args, s)
         end
@@ -1669,7 +1669,7 @@ end
 
 function _config(expr, namespace)
     cn = Base.Fix2(_config, namespace)
-    if Meta.isexpr(expr, :.)
+    if Meta.isexpr(expr, NAMESPACE_SEPARATOR)
         return :($getproperty($(map(cn, expr.args)...); namespace = $namespace))
     elseif Meta.isexpr(expr, :function)
         def = splitdef(expr)

src/systems/model_parsing.jl

@@ -956,7 +956,7 @@ function _parse_components!(body, kwargs)
             arg.args[2] = b
             expr = :(@named $arg)
             push!(comp_names, a)
-            if (isa(b.args[1], Symbol) || Meta.isexpr(b.args[1], :.))
+            if (isa(b.args[1], Symbol) || Meta.isexpr(b.args[1], NAMESPACE_SEPARATOR))
                 push!(comps, [a, b.args[1]])
             end
         end