Restore AllOf and AnyOf operators

Author: hdavid16

src/SimJulia.jl

@@ -14,7 +14,7 @@ module SimJulia
   export AbstractEvent, Environment, value, state, environment
   export Event, succeed, fail, @callback, remove_callback
   export timeout
-  export Operator, (&), (|)
+  export Operator, (&), (|), AllOf, AnyOf
   export @resumable, @yield
   export AbstractProcess, Simulation, run, now, active_process, StopSimulation
   export Process, @process, interrupt

src/operators.jl

@@ -54,3 +54,11 @@ end
 function (|)(ev1::AbstractEvent, ev2::AbstractEvent)
   Operator(eval_or, ev1, ev2)
 end
+
+function AllOf(events...)
+  Operator(eval_and,events...)
+end
+
+function AnyOf(events...)
+  Operator(eval_or,events...)
+end

test/operators.jl

@@ -43,3 +43,33 @@ ev1 = timeout(sim)
 ev2 = timeout(sim)
 @callback or_callback(ev1 | ev2)
 run(sim)
+
+sim = Simulation()
+ev1 = timeout(sim, 1)
+ev2 = Event(sim)
+ev3 = timeout(sim, 2)
+@callback and_callback(AllOf(ev1, ev2, ev3))
+@callback or_callback_succeed(AnyOf(ev1, ev2, ev3), ev2)
+run(sim)
+
+sim = Simulation()
+ev1 = timeout(sim, 1, value=TestException())
+ev2 = Event(sim)
+ev3 = Event(sim)
+@callback or_callback_fail(AnyOf(ev1, ev2, ev3), ev2)
+@callback and_callback(AllOf(ev1, ev2, ev3))
+run(sim)
+
+sim = Simulation()
+ev1 = timeout(sim)
+ev2 = timeout(sim, value=TestException())
+ev3 = timeout(sim)
+@callback or_callback(AnyOf(ev1, ev2, ev3))
+run(sim)
+
+sim = Simulation()
+ev1 = timeout(sim)
+ev2 = timeout(sim)
+ev3 = timeout(sim)
+@callback or_callback(AnyOf(ev1, ev2, ev3))
+run(sim)