revert names

SciML · Aug 21, 2024 · 6219aff · 6219aff
1 parent 3d983f9
commit 6219aff
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/dsl.jl b/src/dsl.jl
@@ -150,7 +150,7 @@ macro reaction_network(name::Expr, ex::Expr)
         MacroTools.striplines(ex); name = :($(esc(name.args[1])))))))
 end
 
-macro reaction_network(ex::Expr)
+macro reaction_network(ex::Expr)    
     ex = MacroTools.striplines(ex)
 
     # no name but equations: @reaction_network begin ... end ...
@@ -388,17 +388,18 @@ function make_reaction_system(ex::Expr; name = :(gensym(:ReactionSystem)))
         $comps
         $diffexpr
 
-        spatial_ivs = $sivs
+        sivs_vec = $sivs
         rx_eq_vec = $rxexprs
         vars = setdiff(union($spssym, $varssym, $compssym), $obs_syms)
-        observed = $observed_eqs
-        continuous_events = $continuous_events_expr
-        discrete_events = $discrete_events_expr
+        obseqs = $observed_eqs
+        cevents = $continuous_events_expr
+        devents = $discrete_events_expr
 
         remake_ReactionSystem_internal(
             make_ReactionSystem_internal(
-                rx_eq_vec, $tiv, vars, $pssym; name = $name, spatial_ivs, observed,
-                continuous_events, discrete_events,
+                rx_eq_vec, $tiv, vars, $pssym;
+                name = $name, spatial_ivs = sivs_vec, observed = obseqs,
+                continuous_events = cevents, discrete_events = devents,
                 combinatoric_ratelaws = $combinatoric_ratelaws);
             default_reaction_metadata = $default_reaction_metadata)
     end