fix: fix model parsing for events

Author: vyudu

src/systems/callbacks.jl

@@ -255,7 +255,7 @@ make_affect(affect::Tuple; kwargs...) = FunctionalAffect(affect...)
 make_affect(affect::NamedTuple; kwargs...) = FunctionalAffect(; affect...)
 make_affect(affect::Affect; kwargs...) = affect
 
-function make_affect(affect::Vector{Equation}; discrete_parameters::AbstractVector = Any[],
+function make_affect(affect::Vector{Equation}; discrete_parameters = Any[],
         iv = nothing, alg_eqs::Vector{Equation} = Equation[])
     isempty(affect) && return nothing
     isempty(alg_eqs) &&

src/systems/model_parsing.jl

@@ -127,15 +127,23 @@ function _model_macro(mod, name, expr, isconnector)
     isconnector && push!(exprs.args,
         :($Setfield.@set!(var"#___sys___".connector_type=$connector_type(var"#___sys___"))))
 
-    !isempty(c_evts) && push!(exprs.args,
-        :($Setfield.@set!(var"#___sys___".continuous_events=$SymbolicContinuousCallback.([
-            $(c_evts...)
-        ]))))
+    push!(exprs.args, :(alg_eqs = $(alg_equations)(var"#___sys___")))
+    d_evt_exs = map(d_evts) do evt
+        length(evt.args) == 2 ? 
+        :($SymbolicDiscreteCallback($(evt.args[1]); iv = $iv, alg_eqs, $(evt.args[2]...))) :
+        :($SymbolicDiscreteCallback($(evt.args[1]); iv = $iv, alg_eqs))
+    end
 
     !isempty(d_evts) && push!(exprs.args,
-        :($Setfield.@set!(var"#___sys___".discrete_events=$SymbolicDiscreteCallback.([
-            $(d_evts...)
-        ]))))
+        :($Setfield.@set!(var"#___sys___".discrete_events=[$(d_evt_exs...)])))
+
+    c_evt_exs = map(c_evts) do evt
+        length(evt.args) == 2 ? 
+        :($SymbolicContinuousCallback($(evt.args[1]); iv = $iv, alg_eqs, $(evt.args[2]...))) :
+        :($SymbolicContinuousCallback($(evt.args[1]); iv = $iv, alg_eqs))
+    end
+    !isempty(c_evts) && push!(exprs.args,
+        :($Setfield.@set!(var"#___sys___".continuous_events=[$(c_evt_exs...)])))
 
     f = if length(where_types) == 0
         :($(Symbol(:__, name, :__))(; name, $(kwargs...)) = $exprs)
@@ -1124,21 +1132,47 @@ end
 function parse_continuous_events!(c_evts, dict, body)
     dict[:continuous_events] = []
     Base.remove_linenums!(body)
-    for arg in body.args
-        push!(c_evts, arg)
+    for line in body.args
+        if length(line.args) == 3 && line.args[1] == :(=>) 
+            push!(c_evts, :(($line,)))
+        elseif length(line.args) == 2 
+            event = line.args[1]
+            kwargs = parse_event_kwargs(line.args[2])
+            push!(c_evts, :(($event, $kwargs)))
+        else
+            error("Malformed continuous event $line.")
+        end
         push!(dict[:continuous_events], readable_code.(c_evts)...)
     end
 end
 
 function parse_discrete_events!(d_evts, dict, body)
     dict[:discrete_events] = []
     Base.remove_linenums!(body)
-    for arg in body.args
-        push!(d_evts, arg)
+    for line in body.args
+        if length(line.args) == 3 && line.args[1] == :(=>) 
+            push!(d_evts, :(($line,)))
+        elseif length(line.args) == 2 
+            event = line.args[1]
+            kwargs = parse_event_kwargs(line.args[2])
+            push!(d_evts, :(($event, $kwargs)))
+        else
+            error("Malformed discrete event $line.")
+        end
         push!(dict[:discrete_events], readable_code.(d_evts)...)
     end
 end
 
+function parse_event_kwargs(disc_expr)
+    kwargs = :([])
+    for arg in disc_expr.args
+        (arg.head != :(=)) && error("Malformed event kwarg $arg.")
+        (arg.args[1] isa Symbol) || error("Invalid keyword argument name $(arg.args[1]).")
+        push!(kwargs.args, arg)
+    end
+    kwargs
+end
+
 function parse_icon!(body::String, dict, icon, mod)
     icon_dir = get(ENV, "MTK_ICONS_DIR", joinpath(DEPOT_PATH[1], "mtk_icons"))
     dict[:icon] = icon[] = if isfile(body)

test/symbolic_events.jl

@@ -1213,7 +1213,7 @@ end
             D(x) ~ -k * x
         end
         @discrete_events begin
-            (t == 1.0) => [k ~ 1.0]#, discrete_parameters = [k]
+            (t == 1.0) => [k ~ 1.0], [discrete_parameters = k]
         end
     end
     @mtkbuild decay = DECAY()