tweak process events

Author: isaacsas

src/structural_transformation/codegen.jl

@@ -1,7 +1,6 @@
 using LinearAlgebra
 
-using ModelingToolkit: isdifferenceeq, has_continuous_events, generate_rootfinding_callback,
-                       generate_difference_cb, merge_cb
+using ModelingToolkit: isdifferenceeq, has_continuous_events, process_events
 
 const MAX_INLINE_NLSOLVE_SIZE = 8
 

src/systems/callbacks.jl

@@ -317,7 +317,5 @@ function process_events(sys; callback = nothing, has_difference = false, kwargs.
     end
     difference_cb = has_difference ? generate_difference_cb(sys; kwargs...) : nothing
 
-    cb = merge_cb(contin_cb, discrete_cb)
-    cb = merge_cb(cb, difference_cb)
-    merge_cb(cb, callback)
+    foldl(merge_cb, (contin_cb, discrete_cb, difference_cb, callback))
 end

test/runtests.jl

@@ -39,7 +39,7 @@ println("Last test requires gcc available in the path!")
 @testset "Serialization" begin include("serialization.jl") end
 @safetestset "print_tree" begin include("print_tree.jl") end
 @safetestset "error_handling" begin include("error_handling.jl") end
-@safetestset "root_equations" begin include("root_equations.jl") end
+@safetestset "Callbacks" begin include("root_equations.jl") end
 @safetestset "state_selection" begin include("state_selection.jl") end
 @safetestset "Modelingtoolkitize Test" begin include("modelingtoolkitize.jl") end
 @safetestset "ControlSystem Test" begin include("controlsystem.jl") end