fix: fix model parsing error

Author: vyudu

src/systems/callbacks.jl

@@ -263,6 +263,7 @@ function make_affect(affect::Vector{Equation}; discrete_parameters = Any[],
         @warn "No independent variable specified. Defaulting to t_nounits."
     end
 
+    discrete_parameters isa AbstractVector || (discrete_parameters = [discrete_parameters])
     for p in discrete_parameters
         occursin(unwrap(iv), unwrap(p)) ||
             error("Non-time dependent parameter $p passed in as a discrete. Must be declared as @parameters $p(t).")

src/systems/diffeqs/odesystem.jl

@@ -313,8 +313,6 @@ function ODESystem(deqs::AbstractVector{<:Equation}, iv, dvs, ps;
 
     alg_eqs = filter(eq -> eq.lhs isa Union{Symbolic, Number} && !is_diff_equation(eq),
         deqs)
-    @show continuous_events
-    @show discrete_events
     cont_callbacks = to_cb_vector(SymbolicContinuousCallback.(
         continuous_events; alg_eqs, iv))
     disc_callbacks = to_cb_vector(SymbolicDiscreteCallback.(discrete_events; alg_eqs, iv))

src/systems/jumps/jumpsystem.jl

@@ -216,7 +216,7 @@ function JumpSystem(eqs, iv, unknowns, ps;
     JumpSystem{typeof(ap)}(Threads.atomic_add!(SYSTEM_COUNT, UInt(1)),
         ap, iv′, us′, ps′, var_to_name, observed, name, description, systems,
         defaults, guesses, initializesystem, initialization_eqs, connector_type,
-        cont_callbacks, disc_callbacks,
+        disc_callbacks,
         parameter_dependencies, metadata, gui_metadata, checks = checks)
 end
 

src/systems/model_parsing.jl

@@ -127,24 +127,24 @@ function _model_macro(mod, name, expr, isconnector)
     isconnector && push!(exprs.args,
         :($Setfield.@set!(var"#___sys___".connector_type=$connector_type(var"#___sys___"))))
 
-    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=[$(d_evt_exs...)])))
+    if !isempty(d_evts) || !isempty(c_evts)
+        push!(exprs.args, :(alg_eqs = $(alg_equations)(var"#___sys___")))
+        !isempty(d_evts) && begin
+            d_exprs = [:($(SymbolicDiscreteCallback)(
+                           $(evt.args[1]); iv = $iv, alg_eqs, $(evt.args[2])...))
+                       for evt in d_evts]
+            push!(exprs.args,
+                :($Setfield.@set!(var"#___sys___".discrete_events=[$(d_exprs...)])))
+        end
 
-    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))
+        !isempty(c_evts) && begin
+            c_exprs = [:($(SymbolicContinuousCallback)(
+                           $(evt.args[1]); iv = $iv, alg_eqs, $(evt.args[2])...))
+                       for evt in c_evts]
+            push!(exprs.args,
+                :($Setfield.@set!(var"#___sys___".continuous_events=[$(c_exprs...)])))
+        end
     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)
@@ -1135,7 +1135,7 @@ function parse_continuous_events!(c_evts, dict, body)
     Base.remove_linenums!(body)
     for line in body.args
         if length(line.args) == 3 && line.args[1] == :(=>)
-            push!(c_evts, :(($line,)))
+            push!(c_evts, :(($line, ())))
         elseif length(line.args) == 2
             event = line.args[1]
             kwargs = parse_event_kwargs(line.args[2])
@@ -1152,7 +1152,7 @@ function parse_discrete_events!(d_evts, dict, body)
     Base.remove_linenums!(body)
     for line in body.args
         if length(line.args) == 3 && line.args[1] == :(=>)
-            push!(d_evts, :(($line,)))
+            push!(d_evts, :(($line, ())))
         elseif length(line.args) == 2
             event = line.args[1]
             kwargs = parse_event_kwargs(line.args[2])
@@ -1169,7 +1169,7 @@ function parse_event_kwargs(disc_expr)
     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)
+        push!(kwargs.args, :($(QuoteNode(arg.args[1])) => $(arg.args[2])))
     end
     kwargs
 end