Fix bugs and add tests

Author: BenLauwens

src/SimJulia.jl

@@ -31,11 +31,11 @@ module SimJulia
   include("operators.jl")
   include("time.jl")
   include("simulation.jl")
-  include("coroutines/utils.jl")
-  include("coroutines/transforms.jl")
-  include("coroutines/macro.jl")
+  include("finitestatemachines/utils.jl")
+  include("finitestatemachines/transforms.jl")
+  include("finitestatemachines/macro.jl")
   include("coroutines.jl")
-  include("processes/base.jl")
+  include("tasks/base.jl")
   include("processes.jl")
   include("resources/base.jl")
   include("resources/containers.jl")

src/coroutines.jl

@@ -75,7 +75,7 @@ function execute{E<:Environment}(ev::AbstractEvent{E}, proc::Coroutine{E})
   end
 end
 
-function interrupt{E<:Environment}(proc::Coroutine{E}, cause::Any=nothing)
+function interrupt(proc::Coroutine, cause::Any=nothing)
   if !iscoroutinedone(proc.fsm)
     remove_callback(proc.resume, proc.target)
     proc.target = Timeout(environment(proc), priority=true, value=InterruptException(proc, cause))

src/coroutines/macro.jl src/finitestatemachines/macro.jlsrc/coroutines/macro.jl renamed to src/finitestatemachines/macro.jl

@@ -84,8 +84,8 @@ function execute{E<:Environment}(ev::AbstractEvent{E}, proc::Process{E})
   end
 end
 
-function interrupt{E<:Environment}(proc::Process{E}, cause::Any=nothing)
-  if !istaskdone(proc.fsm)
+function interrupt(proc::Process, cause::Any=nothing)
+  if !istaskdone(proc.task)
     remove_callback(proc.resume, proc.target)
     proc.target = Timeout(environment(proc), priority=true, value=InterruptException(proc, cause))
     proc.resume = append_callback(execute, proc.target, proc)

src/coroutines/transforms.jl src/finitestatemachines/transforms.jlsrc/coroutines/transforms.jl renamed to src/finitestatemachines/transforms.jl

@@ -1,10 +1,3 @@
-function produce(consumer::Task, values...)
-  ct = current_task()
-  ct.result = length(values)==1 ? values[1] : values
-  Base.schedule_and_wait(consumer)
-  return consumer.result
-end
-
 function produce(v)
   ct = current_task()
   consumer = ct.consumers

src/coroutines/utils.jl src/finitestatemachines/utils.jlsrc/coroutines/utils.jl renamed to src/finitestatemachines/utils.jl

@@ -0,0 +1,31 @@
+using SimJulia
+using Base.Test
+
+expr = :(begin
+  while true
+    @yield return a
+    a, b = b, a+b
+  end
+end)
+
+slots = Dict{Symbol, Type}()
+slots[:a] = Float64
+slots[:b] = Float64
+slots[:c] = Float64
+
+SimJulia.transformVars!(expr, keys(slots))
+
+println(Base.remove_linenums!(expr))
+
+expr =:(begin
+  @yield return 1
+  while true
+    @yield return 2
+    f(@yield return 3)
+    res = @yield return 4
+  end
+end)
+
+@test SimJulia.transformYield!(expr) == 4
+
+println(Base.remove_linenums!(expr))

src/processes.jl

@@ -0,0 +1,61 @@
+using SimJulia
+using Base.Test
+
+expr = :(function my_test(a, b)
+  nothing
+end)
+
+@test SimJulia.getArguments(expr) == Symbol[:my_test,:a,:b]
+
+expr = :(function my_test(a, b) :: Any
+  nothing
+end)
+
+@test SimJulia.getArguments(expr) == Symbol[:my_test,:a,:b]
+
+expr = :(function my_test(a, b::Float64)
+  nothing
+end)
+
+@test SimJulia.getArguments(expr) == Symbol[:my_test,:a,:b]
+
+expr = :(function my_test(a, b=1.0)
+  nothing
+end)
+
+@test SimJulia.getArguments(expr) == Symbol[:my_test,:a,:b]
+
+expr = :(function my_test(a, b::Float64=1.0)
+  nothing
+end)
+
+@test SimJulia.getArguments(expr) == Symbol[:my_test,:a,:b]
+
+expr = :(function my_test(a; b=1.0)
+  nothing
+end)
+
+@test SimJulia.getArguments(expr) == Symbol[:my_test,:a,:b]
+
+expr = :(function my_test(a; b::Float64=1.0)
+  nothing
+end)
+
+@test SimJulia.getArguments(expr) == Symbol[:my_test,:a,:b]
+
+expr = :(function my_test(;a=0.0, b=1.0)
+  nothing
+end)
+
+@test SimJulia.getArguments(expr) == Symbol[:my_test,:a,:b]
+
+expr = :(function my_test(a::Float64, b::Float64)
+  c = a * b
+end)
+
+slots = Dict{Symbol, Type}()
+slots[:a] = Float64
+slots[:b] = Float64
+slots[:c] = Float64
+
+@test SimJulia.getSlots(expr, :my_test) == slots

src/processes/base.jl src/tasks/base.jlsrc/processes/base.jl renamed to src/tasks/base.jl

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