lib/core/actor.ex

@@ -3,13 +3,13 @@ defmodule Scopes.Core.Actor do
 
   defp loop(bhv) do
     receive do
-      {:become, bhv_n} -> loop(bhv_n)
       msg ->
         Logger.debug([msg: inspect(msg)])
         case msg do
           {:message, msg} ->
             bhv.(msg)
             loop(bhv)
+          {:become, bhv_n} -> loop(bhv_n)
           {:register, reg, name, value} -> 
             Registry.register(reg, name, value)
             loop(bhv)
@@ -19,13 +19,11 @@ defmodule Scopes.Core.Actor do
   end
 
   def create(bhv) do
-    #spawn_link(fn -> loop(bhv) end)
+    spawn_link(fn -> loop(bhv) end)
-    spawn(fn -> loop(bhv) end)
   end
 
   def create(bhv, reg, name, value \\ []) do
-    #spawn_link(fn -> 
+    spawn_link(fn -> 
-    spawn(fn -> 
       Registry.register(reg, name, value)
       loop(bhv) end)
   end

lib/core/core.ex

@@ -56,13 +56,6 @@ defmodule Scopes.Core do
     fn msg -> if List.starts_with?(Shape.head(msg), pat), do: msg end
   end
 
-  def filter_address(pat) do
-    fn msg ->
-      [dom, _act | rest] = Shape.head(msg)
-      if List.starts_with?([dom | rest], pat), do: msg
-    end
-  end
-
   def data_only(), do: filter_head([:csys, :data])
 
   # send shortcuts

lib/core/environ.ex

@@ -23,7 +23,7 @@ defmodule Scopes.Core.Environ do
     env_scope = {%State{init_seq: init_seq}, proc_env, [], self()}
     env = Core.neuron(env_scope)
     Actor.register(env, cells(), {:env, :c00})
-    msg = Shape.create([:csys, :zero], data: %{addr: {:csys, :c00, "0-0"}})
+    msg = Shape.create([:csys, :zero], data: %{addr: [:csys, :c00, "0-0"]})
     scope = {state, proc, [], env}
     Core.create(msg, scope)
     #{:ok, env}
@@ -33,18 +33,18 @@ defmodule Scopes.Core.Environ do
   def proc_env(msg, scope = {state, _proc, _syns, env}) do
     case Shape.head(msg) do
       {:exec, func} -> func.(state)
-      [:csys, :created | _rest] -> process_created(msg, scope)
+      [:csys, :created | _rest] -> process_creation(msg, scope)
       _ -> send(env, msg) # forward message to application
     end
   end
 
-  def process_created(msg, {state, proc, syns, env}) do
+  def process_creation(msg, {state, proc, syns, env}) do
     data = Shape.data(msg)
     new = data.new
     addr = data[:addr]
     cells = if addr do
-      Actor.register(new, cells(), addr)
+      [dom, cat, item] = addr
-      {dom, cat, item} = addr
+      # update (or create and register) proxy cell
       Map.update(state.cells, {dom, cat}, %{item => new}, 
         fn x -> Map.put(x, item, new) end)
     else
@@ -55,8 +55,7 @@ defmodule Scopes.Core.Environ do
     Core.update({state1, proc, syns, env})
     if step do
       Process.sleep(1)
-      #step.(state1)
+      step.(state1)
-      step.()
     end
   end
 
@@ -73,19 +72,9 @@ defmodule Scopes.Core.Environ do
     end
   end
 
-  def send_message(addr, head, data) do
-    rcvr =  get_cell(addr)
-    Core.send_message(rcvr, head, data)
-  end
-
-  def connect(addr = {dom, _cat, _item}, target, op \\ []) do
-    send_message(addr, [dom, :connect],
-      %{target: get_cell(target), op: op})
-  end
-
   # accessing cell registry via state.cells
 
-  def get_cell(state, {dom, cat, item}) do
+  def get_cell(state, [dom, cat, item]) do
     get_in(state.cells, [{dom, cat}, item])
   end
 
@@ -94,7 +83,7 @@ defmodule Scopes.Core.Environ do
     Core.send_message(cell, head, data)
   end
 
-  def connect_state(state, addr, target, op \\ []) do
+  def connect(state, addr, target, op \\ []) do
     send_message(state, addr, ~w(csys connect)a,
       %{target: get_cell(state, target), op: op})
   end

lib/core/program.ex

@@ -121,28 +121,28 @@ defmodule Scopes.Core.Program do
   # demo init sequences
  
   def init_seq_b1() do 
-    zero = {:csys, :c00, "0-0"}
+    zero = [:csys, :c00, "0-0"]
-    one = {:csys, :s01, "1-0"}
+    one = [:csys, :s01, "1-0"]
-    two = {:csys, :c00, "1-1"}
+    two = [:csys, :c00, "1-1"]
-    three = {:csys, :s01, "1-1"}
+    three = [:csys, :s01, "1-1"]
     [ 
-      fn -> Environ.send_message(zero, ~w(csys create)a, 
+      &Environ.send_message(&1, zero, ~w(csys create)a, 
-        %{op: [Core.data_only(), negate()], addr: one, dir: :pred}) end,
+        %{op: [Core.data_only(), negate()], addr: one, dir: :pred}),
-      fn -> Environ.send_message(one, ~w(csys create)a, 
+      &Environ.send_message(&1, one, ~w(csys create)a, 
-        %{op: Core.data_only(), addr: two, dir: :succ}) end,
+        %{op: Core.data_only(), addr: two, dir: :succ}),
-      fn -> Environ.send_message(two, ~w(csys create)a, 
+      &Environ.send_message(&1, two, ~w(csys create)a, 
-        %{addr: three, dir: :pred}) end,
+        %{addr: three, dir: :pred}),
-      fn -> Environ.connect(three, zero) end
+      &Environ.connect(&1, three, zero)
     ]
   end
 
   def init_recursive_1() do 
-    zero = {:csys, :c00, "0-0"}
+    zero = [:csys, :c00, "0-0"]
     [
-      fn -> Environ.send_message(zero, ~w(csys create)a, %{dir: :succ}) end,
+      &Environ.send_message(&1, zero, ~w(csys create)a, %{dir: :succ}),
-      fn -> Environ.send_message(zero, ~w(csys create)a,
+      &Environ.send_message(&1, zero, ~w(csys create)a,
-        %{addr: {:csys, :s01, "1-1"}, dir: :pred}) end,
+        %{addr: [:csys, :s01, "1-1"], dir: :pred}),
-      fn -> Environ.connect(zero, zero, negate()) end
+      &Environ.connect(&1, zero, zero, negate())
     ]
   end
 end

test/core/core_test.exs

@@ -18,28 +18,28 @@ defmodule Scopes.CoreTest do
   describe "core-basic:" do
     test "minimal-b1" do
       Environ.setup(Program.prepare_basic(), Program.init_seq_b1())
-      Process.sleep(5)
+      Process.sleep(10)
       env = Environ.get_cell({:env, :c00})
-      Environ.forward_value(env, {:csys, :c00, "0-0"}, 0)
+      Environ.forward_value(env, [:csys, :c00, "0-0"], 0)
       assert 0 = receive_data().value
-      Environ.forward_value(env, {:csys, :s01, "1-0"}, 1)
+      Environ.forward_value(env, [:csys, :s01, "1-0"], 1)
       assert receive_data().value == 1
       #assert receive_data().value in [-1, 1]
-      Environ.forward_value(env, {:csys, :s01, "1-1"}, 3)
+      Environ.forward_value(env, [:csys, :s01, "1-1"], 3)
       assert receive_data().value in [2, 3]
       assert receive_data().value in [2, 3]
-      refute_receive msg, 5, "unhandled message(s): #{inspect(msg)}"
+      refute_receive msg, 10, "unhandled message(s): #{inspect(msg)}"
     end
 
     test "recursive-1" do
       Environ.setup(Program.prepare_basic(), Program.init_recursive_1())
-      Process.sleep(5)
+      Process.sleep(10)
       env = Environ.get_cell({:env, :c00})
-      Environ.forward_value(env, {:csys, :s01, "1-1"}, 42)
+      Environ.forward_value(env, [:csys, :s01, "1-1"], 42)
       assert receive_data().value == 42
-      Environ.forward_value(env, {:csys, :s01, "1-1"}, 47)
+      Environ.forward_value(env, [:csys, :s01, "1-1"], 47)
       assert receive_data().value == 5
-      refute_receive msg, 5, "unhandled message(s): #{inspect(msg)}"
+      refute_receive msg, 10, "unhandled message(s): #{inspect(msg)}"
     end
   end
 end