lib/csys/csys.ex

@@ -1,13 +1,11 @@
 defmodule Scopes.CSys do
   require Logger
-  require Scopes.Util
 
   alias Scopes.Core.Actor
   alias Scopes.Shape
-  alias Scopes.Util
 
   def neuron(scope) do
-    #Logger.info(Util.show [scope])
+    #Logger.info([scope: inspect(scope)])
     Actor.create(fn msg -> process(msg, scope) end)
   end
 
@@ -60,7 +58,7 @@ defmodule Scopes.CSys do
   # send shortcuts
 
   def send_message(rcvr, head, data \\ %{}) do
-    Logger.debug(Util.show [rcvr, head, data])
+    Logger.info rcvr: inspect(rcvr), head: inspect(head), data: inspect(data)
     Actor.send(rcvr, Shape.create(head, data: data))
   end
 

lib/csys/program.ex

@@ -1,11 +1,9 @@
 defmodule Scopes.CSys.Program do
   require Logger
-  require Scopes.Util
 
   alias Scopes.CSys
   alias Scopes.CSys.Environ
   alias Scopes.Shape
-  alias Scopes.Util
 
   defmodule State do
     defstruct [:value, :count, :stage, :prog]
@@ -76,7 +74,7 @@ defmodule Scopes.CSys.Program do
     limit = args[:limit]
     data = Shape.data(msg)
     state = CSys.state(scope)
-    Logger.debug(Util.show [data, state.value, threshold, self()])
+    Logger.info data: data, state_value: state.value, threshold: threshold, self: self()
     value_n = state.value + data.value
     if value_n >= threshold do
       value_out = limit && rem(value_n - 1, limit) + limit || value_n

lib/util.ex

@@ -1,8 +1,9 @@
 defmodule Scopes.Util do
-  defmacro show(fields) do
+
-    names = for f <- fields do Macro.to_string(f) end
+  defmacro fields_info(fields) do
-    quote bind_quoted: [names: names, fields: fields] do
+    names = for {f, _, _} <- fields do f end
-      Enum.zip(names, fields) |> Map.new
+    quote do
+      Enum.zip(unquote(names), unquote(fields))
     end
   end
 end

test/util_test.exs

@@ -6,8 +6,10 @@ defmodule Scopes.UtilTest do
 
   describe "info:" do
     test "fields" do
-      {a, b, c} = {17, 22, 42}
+      a = 17
-      assert %{"a" => 17, "b" => 22, "c" => 42} = Util.show([a, b, c])
+      b = 22
+      c = 42
+      assert [a: 17, b: 22, c: 42] = Util.fields_info([a, b, c])
     end
   end
 end