Cleanup produce and coroutine transform

Author: BenLauwens

src/finitestatemachines/transforms.jl

@@ -3,7 +3,7 @@ function transformVars!(expr::Expr, symbols::Base.KeyIterator{Dict{Symbol,Type}}
     if expr.head == :kw && i == 1
 
     elseif expr.head == Symbol(".") && i == 2
-      
+
     elseif isa(expr.args[i], Symbol) && in(expr.args[i], symbols)
       expr.args[i] = :(_fsm.$(expr.args[i]))
     elseif isa(expr.args[i], Expr)
@@ -55,7 +55,6 @@ function transformYield!(expr::Expr, n::UInt8=0x00, super::Expr=:(), line_no::In
     if isa(arg, Expr)
       if arg.head == :try
         n = transformTry!(arg.args[1], n, super, line_no, expr, i)
-        println("hi")
       elseif arg.head == :line
         line_no = i+1
         super = expr

src/tasks/base.jl

@@ -8,9 +8,9 @@ end
 produce(v...) = produce(v)
 
 function consume(producer::Task, values...)
-  istaskdone(producer) && return wait(producer)
+  istaskdone(producer) && return producer.value
   ct = current_task()
   ct.result = length(values)==1 ? values[1] : values
   producer.consumers = ct
-  producer.state == :runnable ? Base.schedule_and_wait(producer) : wait()
+  Base.schedule_and_wait(producer)
 end

test/runtests.jl

@@ -4,6 +4,7 @@ testpath(f) = joinpath(dirname(@__FILE__), f)
 for test_file in [
   "finitestatemachines/test_transforms.jl",
   "finitestatemachines/test_utils.jl",
+  "tasks/test_produce_consume.jl",
   "test_base.jl",
   "test_events.jl",
   "test_operators.jl",

test/tasks/test_produce_consume.jl

@@ -0,0 +1,22 @@
+using SimJulia
+
+function fibonnaci(sim::Simulation)
+  a = 0.0
+  b = 1.0
+  for i = 1:10
+    println("Fibonnaci value equals ", a, " at time ", now(sim))
+    yield(Timeout(sim, 1.0))
+    a, b = b, a+b
+  end
+  a
+end
+
+function wait_for_process(sim::Simulation, process::Process)
+  val = yield(process)
+  println("Fibonnaci ended with ", val, " at time ", now(sim))
+end
+
+sim = Simulation()
+fib = @Process fibonnaci(sim)
+wait = @Process wait_for_process(sim, fib)
+run(sim)

test/test_coroutines.jl

@@ -17,7 +17,6 @@ end
 @stateful function test_process_exception(sim::Simulation, ev::AbstractEvent)
   try
     value = @yield return ev
-    println("hi")
   catch
     println("$value has been thrown")
   end