diff --git a/lib/csys/csys.ex b/lib/csys/csys.ex index 94250b8..fafcaef 100644 --- a/lib/csys/csys.ex +++ b/lib/csys/csys.ex @@ -15,16 +15,17 @@ defmodule Scopes.CSys do send(env, msg) end - def std_proc(msg, {state, syns, env}) do - case msg do - {:parent} -> - syn = synapse(self(), fn x -> x end) - new = Actor.create(neuron(&std_proc/2, {nil, [syn], env})) - # Actor.become(&std_proc/2, {state, syns, env}) - send(env, {:created, new}) + def forward(msg, {_state, syns, _env}) do + for s <- syns, do: s.(msg) + end - msg -> - echo(msg, {state, syns, env}) - end + def std_proc({:parent}, {_state, _syns, env}) do + syn = synapse(self(), &Function.identity/1) + new = Actor.create(neuron(&std_proc/2, {nil, [syn], env})) + send(env, {:created, new}) + end + + def std_proc(msg, scope) do + if forward(msg, scope) === [], do: echo(msg, scope) end end diff --git a/test/csys_test.exs b/test/csys_test.exs index 7c81032..1df6fae 100644 --- a/test/csys_test.exs +++ b/test/csys_test.exs @@ -1,6 +1,7 @@ defmodule Scopes.CSysTest do use ExUnit.Case, async: true @moduletag timeout: 5000 + alias Scopes.Core.Actor alias Scopes.CSys @@ -10,13 +11,11 @@ defmodule Scopes.CSysTest do Actor.send(zero, "Hello Zero!") assert_receive "Hello Zero!" Actor.send(zero, {:parent}) - - receive do - {:created, new} -> Actor.send(new, "Hello New!") - end - + assert_receive {:created, new} + Actor.send(new, "Hello New!") assert_receive "Hello New!" - :timer.sleep(50) + #assert_receive "Hello New!" + Process.sleep(50) # Actor.stop(zero) refute_received msg, "unhandled message(s): #{inspect(msg)}" end