Merge pull request #882 from SciML/myb/propname

Overload `propertynames` and add `@nonamespace`

Author: YingboMa

src/ModelingToolkit.jl

@@ -176,6 +176,6 @@ export simplify, substitute
 export build_function
 export modelingtoolkitize
 export @variables, @parameters
-export @named
+export @named, @nonamespace
 
 end # module

src/systems/abstractsystem.jl

@@ -185,7 +185,28 @@ end
 
 rename(x::AbstractSystem, name) = @set x.name = name
 
-function Base.getproperty(sys::AbstractSystem, name::Symbol)
+function Base.propertynames(sys::AbstractSystem; private=false)
+    if private
+        return fieldnames(typeof(sys))
+    else
+        names = Symbol[]
+        for s in get_systems(sys)
+            push!(names, getname(s))
+        end
+        has_states(sys) && for s in get_states(sys)
+            push!(names, getname(s))
+        end
+        has_ps(sys) && for s in get_ps(sys)
+            push!(names, getname(s))
+        end
+        has_observed(sys) && for s in get_observed(sys)
+            push!(names, getname(s.lhs))
+        end
+        return names
+    end
+end
+
+function Base.getproperty(sys::AbstractSystem, name::Symbol; namespace=true)
     sysname = nameof(sys)
     systems = get_systems(sys)
     if isdefined(sys, name)
@@ -194,30 +215,30 @@ function Base.getproperty(sys::AbstractSystem, name::Symbol)
     elseif !isempty(systems)
         i = findfirst(x->nameof(x)==name,systems)
         if i !== nothing
-            return rename(systems[i],renamespace(sysname,name))
+            return namespace ? rename(systems[i],renamespace(sysname,name)) : systems[i]
         end
     end
 
     sts = get_states(sys)
     i = findfirst(x->getname(x) == name, sts)
 
     if i !== nothing
-        return rename(sts[i],renamespace(sysname,name))
+        return namespace ? rename(sts[i],renamespace(sysname,name)) : sts[i]
     end
 
     if has_ps(sys)
         ps = get_ps(sys)
         i = findfirst(x->getname(x) == name,ps)
         if i !== nothing
-            return rename(ps[i],renamespace(sysname,name))
+            return namespace ? rename(ps[i],renamespace(sysname,name)) : ps[i]
         end
     end
 
     if has_observed(sys)
         obs = get_observed(sys)
         i = findfirst(x->getname(x.lhs)==name,obs)
         if i !== nothing
-            return rename(obs[i].lhs,renamespace(sysname,name))
+            return namespace ? rename(obs[i].lhs,renamespace(sysname,name)) : obs[i]
         end
     end
 
@@ -469,10 +490,35 @@ function _named(expr)
     :($name = $call)
 end
 
+"""
+$(SIGNATURES)
+
+Rewrite `@named y = foo(x)` to `y = foo(x; name=:y)`.
+"""
 macro named(expr)
     esc(_named(expr))
 end
 
+function _nonamespace(expr)
+    if Meta.isexpr(expr, :.)
+        return :($getproperty($(map(_nonamespace, expr.args)...); namespace=false))
+    elseif expr isa Expr && !isempty(expr.args)
+        return Expr(expr.head, map(_nonamespace, expr.args)...)
+    else
+        expr
+    end
+end
+
+"""
+$(SIGNATURES)
+
+Rewrite `@nonamespace a.b.c` to
+`getproperty(getproperty(a, :b; namespace = false), :c; namespace = false)`.
+"""
+macro nonamespace(expr)
+    esc(_nonamespace(expr))
+end
+
 """
 $(SIGNATURES)
 

test/reduction.jl

@@ -74,6 +74,8 @@ connected = ODESystem([s ~ a + lorenz1.x
                        lorenz2.y ~ s
                        lorenz1.F ~ lorenz2.u
                        lorenz2.F ~ lorenz1.u],t,systems=[lorenz1,lorenz2])
+@test length(Base.propertynames(connected)) == 10
+@test isequal((@nonamespace connected.lorenz1.x), x)
 
 # Reduced Flattened System