Simple component parser

Author: YingboMa

Project.toml

@@ -28,6 +28,7 @@ LabelledArrays = "2ee39098-c373-598a-b85f-a56591580800"
 Latexify = "23fbe1c1-3f47-55db-b15f-69d7ec21a316"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078"
 MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
 NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
 RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
@@ -46,6 +47,12 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
 UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
 Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 
+[weakdeps]
+DeepDiffs = "ab62b9b5-e342-54a8-a765-a90f495de1a6"
+
+[extensions]
+MTKDeepDiffsExt = "DeepDiffs"
+
 [compat]
 AbstractTrees = "0.3, 0.4"
 ArrayInterface = "6, 7"
@@ -67,6 +74,7 @@ JuliaFormatter = "1"
 JumpProcesses = "9.1"
 LabelledArrays = "1.3"
 Latexify = "0.11, 0.12, 0.13, 0.14, 0.15, 0.16"
+MLStyle = "0.4.17"
 MacroTools = "0.5"
 NaNMath = "0.3, 1"
 RecursiveArrayTools = "2.3"
@@ -84,9 +92,6 @@ UnPack = "0.1, 1.0"
 Unitful = "1.1"
 julia = "1.6"
 
-[extensions]
-MTKDeepDiffsExt = "DeepDiffs"
-
 [extras]
 AmplNLWriter = "7c4d4715-977e-5154-bfe0-e096adeac482"
 BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
@@ -113,6 +118,3 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
 test = ["AmplNLWriter", "BenchmarkTools", "ControlSystemsMTK", "NonlinearSolve", "ForwardDiff", "Ipopt", "Ipopt_jll", "ModelingToolkitStandardLibrary", "Optimization", "OptimizationOptimJL", "OptimizationMOI", "OrdinaryDiffEq", "Random", "ReferenceTests", "SafeTestsets", "StableRNGs", "Statistics", "SteadyStateDiffEq", "Test", "StochasticDiffEq", "Sundials"]
-
-[weakdeps]
-DeepDiffs = "ab62b9b5-e342-54a8-a765-a90f495de1a6"

src/ModelingToolkit.jl

@@ -181,7 +181,7 @@ export JumpProblem, DiscreteProblem
 export NonlinearSystem, OptimizationSystem, ConstraintsSystem
 export alias_elimination, flatten
 export connect, @connector, Connection, Flow, Stream, instream
-export @component
+export @component, @model
 export isinput, isoutput, getbounds, hasbounds, isdisturbance, istunable, getdist, hasdist,
        tunable_parameters, isirreducible, getdescription, hasdescription, isbinaryvar,
        isintegervar

src/systems/connectors.jl

@@ -10,6 +10,98 @@ macro connector(expr)
     esc(component_post_processing(expr, true))
 end
 
+macro connector(name::Symbol, body)
+    esc(connector_macro((@__MODULE__), name, body))
+end
+
+using MLStyle
+function connector_macro(mod, name, body)
+    if !Meta.isexpr(body, :block)
+        err = """
+        connector body must be a block! It should be in the form of
+        ```
+        @connector Pin begin
+            v(t) = 1
+            (i(t) = 1), [connect = Flow]
+        end
+        ```
+        """
+        error(err)
+    end
+    vs = Num[]
+    dict = Dict{Symbol, Any}()
+    for arg in body.args
+        arg isa LineNumberNode && continue
+        push!(vs, Num(parse_variable_def!(dict, mod, arg)))
+    end
+    iv = get(dict, :independent_variable, nothing)
+    if iv ===  nothing
+        error("$name doesn't have a independent variable")
+    end
+    ODESystem(Equation[], iv, vs, []; name)
+end
+
+function parse_variable_def!(dict, mod, arg)
+    MLStyle.@match arg begin
+        ::Symbol => generate_var(arg)
+        Expr(:call, a, b) => generate_var!(dict, a, set_iv!(dict, b))
+        Expr(:(=), a, b) => setdefault(parse_variable_def!(dict, mod, a), parse_default(mod, b))
+        Expr(:tuple, a, b) => set_var_metadata(parse_variable_def!(dict, mod, a), parse_metadata(mod, b))
+        _ => error("$arg cannot be parsed")
+    end
+end
+
+generate_var(a) = Symbolics.variable(a)
+function generate_var!(dict, a, b)
+    iv = generate_var(b)
+    prev_iv = get!(dict, :independent_variable) do
+        iv
+    end
+    @assert isequal(iv, prev_iv)
+    Symbolics.variable(a, T = SymbolicUtils.FnType{Tuple{Real}, Real})(iv)
+end
+function set_iv!(dict, b)
+    prev_b = get!(dict, :independent_variable_name) do
+        b
+    end
+    if prev_b != b
+        error("Conflicting independent variable $prev_b and $b")
+    end
+    b
+end
+function parse_default(mod, a)
+    a = Base.remove_linenums!(deepcopy(a))
+    MLStyle.@match a begin
+        Expr(:block, a) => get_var(mod, a)
+        _ => error("Cannot parse default $a")
+    end
+end
+function parse_metadata(mod, a)
+    MLStyle.@match a begin
+        Expr(:vect, eles...) => map(Base.Fix1(parse_metadata, mod), eles)
+        Expr(:(=), a, b) => Symbolics.option_to_metadata_type(Val(a)) => get_var(mod, b)
+        _ => error("Cannot parse metadata $a")
+    end
+end
+function set_var_metadata(a, ms)
+    for (m, v) in ms
+        a = setmetadata(a, m, v)
+    end
+    a
+end
+function get_var(mod::Module, b)
+    b isa Symbol ? getproperty(mod, b) : b
+end
+macro model(name::Symbol, expr)
+    model_macro(name, expr)
+end
+function model_macro(name, expr)
+    for arg in expr.args
+        arg isa LineNumberNode && continue
+        arg.head == :macrocall && compose
+    end
+end
+
 abstract type AbstractConnectorType end
 struct StreamConnector <: AbstractConnectorType end
 struct RegularConnector <: AbstractConnectorType end