Fixed issues with protocols and agents and defgen defined functions

bryanjos · bryanjos · commit b68db3e665a8 · 2016-11-17T09:19:45.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.23.2] - Unreleased
+
+### Fixed
+- Agent not functioning properly. Now uses internal store instead of making a process and using that to put data in store
+- Protocol incorrectly handling strings
+- `defgen` and `defgenp` functions not being recognized by Elixir compiler.
+
+
 ## [0.23.1] - 2016-11-16
 
 ### Fixed
diff --git a/lib/elixir_script/passes/consolidate_protocols.ex b/lib/elixir_script/passes/consolidate_protocols.ex
@@ -1,5 +1,5 @@
 defmodule ElixirScript.Passes.ConsolidateProtocols do
-  @moduledoc false    
+  @moduledoc false
   alias ESTree.Tools.Builder, as: JS
   alias ElixirScript.Translator.Utils
   alias ElixirScript.ModuleSystems
diff --git a/lib/elixir_script/passes/find_modules.ex b/lib/elixir_script/passes/find_modules.ex
@@ -1,5 +1,5 @@
 defmodule ElixirScript.Passes.FindModules do
-  @moduledoc false  
+  @moduledoc false
   alias ElixirScript.Translator.Utils
   alias ElixirScript.Translator.State
 
@@ -27,14 +27,14 @@ defmodule ElixirScript.Passes.FindModules do
 
   defp get_defmodules({:defimpl, _, [ the_alias, [for: {:__aliases__, _, type_name} = type],  [do: {:__block__, context, spec}] ]} = ast, state, _) do
     {:__aliases__, _, original_name} = Utils.name_to_quoted(State.get_module_name(the_alias))
-    name = original_name ++ [DefImpl] ++ type_name
+    name = original_name ++ [DefImpl] ++ [Elixir] ++ type_name
     s =  %{name:  Utils.quoted_to_name({:__aliases__, [], name}), type: :impl, for: type, ast: {:__block__, context, spec}, implements: Utils.quoted_to_name({:__aliases__, [], original_name}) }
     { ast, state ++ [s] }
   end
 
   defp get_defmodules({:defimpl, _, [ the_alias, [for: {:__aliases__, _, type_name} = type],  [do: spec] ]} = ast, state, _) do
     {:__aliases__, _, original_name} = Utils.name_to_quoted(State.get_module_name(the_alias))
-    name = original_name ++ [DefImpl] ++ type_name
+    name = original_name ++ [DefImpl] ++ [Elixir] ++ type_name
     s =  %{name:  Utils.quoted_to_name({:__aliases__, [], name}), type: :impl, for: type, ast: {:__block__, [], [spec]}, implements: Utils.quoted_to_name({:__aliases__, [], original_name}) }
     { ast, state ++ [s] }
   end
diff --git a/lib/elixir_script/passes/java_script_name.ex b/lib/elixir_script/passes/java_script_name.ex
@@ -1,5 +1,5 @@
 defmodule ElixirScript.Passes.JavaScriptName do
-  @moduledoc false    
+  @moduledoc false
   alias ElixirScript.Translator.Utils
 
   def execute(compiler_data, _) do
diff --git a/lib/elixir_script/prelude/agent.ex b/lib/elixir_script/prelude/agent.ex
@@ -1,51 +1,53 @@
 defmodule ElixirScript.Agent do
-    @moduledoc false
+  @moduledoc false
+  require JS
 
   def start(fun, options \\ []) do
-    pid = spawn(fn() -> Process.sleep(:infinity) end)
+    pid = JS.new Elixir.Core.PID, []
 
-    if Elixir.Keyword.has_key?(options, :name) do
-      Process.register(pid, Elixir.Keyword.get(options, :name))
+    name = if Elixir.Keyword.has_key?(options, :name) do
+      Elixir.Keyword.get(options, :name)
+    else
+      nil
     end
 
-    Elixir.Core.Store.create(pid, fun.())
+    Elixir.Core.Store.create(pid, fun.(), name)
     { :ok, pid }
   end
 
   def start_link(fun, options \\ []) do
-    pid = spawn_link(fn() -> Process.sleep(:infinity) end)
+    pid = JS.new Elixir.Core.PID, []
 
-    if Elixir.Keyword.has_key?(options, :name) do
-      Process.register(pid, Elixir.Keyword.get(options, :name))
+    name = if Elixir.Keyword.has_key?(options, :name) do
+      Elixir.Keyword.get(options, :name)
+    else
+      nil
     end
 
-    Elixir.Core.Store.create(pid, fun.())
+    Elixir.Core.Store.create(pid, fun.(), name)
     { :ok, pid }
   end
 
   def stop(agent) do
-    Process.exit(agent)
+    Elixir.Core.Store.remove(agent)
     :ok
   end
 
   def update(agent, fun) do
-    pid = Elixir.Core.processes.pidof(agent)
-    current_state = Elixir.Core.Store.read(pid)
-    Elixir.Core.Store.update(pid, fun.(current_state))
+    current_state = Elixir.Core.Store.read(agent)
+    Elixir.Core.Store.update(agent, fun.(current_state))
     :ok
   end
 
   def get(agent, fun) do
-    pid = Elixir.Core.processes.pidof(agent)
-    current_state = Elixir.Core.Store.read(pid)
+    current_state = Elixir.Core.Store.read(agent)
     fun.(current_state)
   end
 
   def get_and_update(agent, fun) do
-    pid = Elixir.Core.processes.pidof(agent)
-    current_state = Elixir.Core.Store.read(pid)
+    current_state = Elixir.Core.Store.read(agent)
     {val, new_state} = fun.(current_state)
-    Elixir.Core.Store.update(pid, new_state)
+    Elixir.Core.Store.update(agent, new_state)
     val
   end
 
diff --git a/lib/elixir_script/prelude/js.ex b/lib/elixir_script/prelude/js.ex
@@ -78,12 +78,18 @@ defmodule JS do
   defgen and defgenp are currently the only ways to use process in Elixirscript right now.
   """
   defmacro defgen(call, expr \\ nil) do
+    quote do
+      def unquote(call), unquote(expr)
+    end
   end
 
   @doc """
   Defines a private generator. This is compiled into a generator function in JavaScript.
   """
   defmacro defgenp(call, expr \\ nil) do
+    quote do
+      defp unquote(call), unquote(expr)
+    end
   end
 
   @doc """
diff --git a/lib/elixir_script/prelude/process.ex b/lib/elixir_script/prelude/process.ex
@@ -57,7 +57,7 @@ defmodule ElixirScript.Process do
   end
 
   def register(pid, name) when is_atom(name) do
-    Elixir.Core.processes.register(pid, name)
+    Elixir.Core.processes.register(name, pid)
   end
 
   def registered() do
diff --git a/mix.exs b/mix.exs
@@ -4,7 +4,7 @@ defmodule ElixirScript.Mixfile do
   def project do
     [
       app: :elixir_script,
-      version: "0.23.1",
+      version: "0.23.2-dev",
       elixir: "~> 1.0",
       escript: escript_config,
       deps: deps,
diff --git a/src/javascript/lib/core/functions.js b/src/javascript/lib/core/functions.js
@@ -392,6 +392,10 @@ function maps_from_list(list){
   return Object.freeze(m);
 }
 
+function* sleep_forever(){
+  yield* Core.processes.sleep(Symbol("infinity"));
+}
+
 export default {
   call_property,
   apply,
@@ -430,5 +434,6 @@ export default {
   duplicate,
   mapfoldl,
   filtermap,
-  maps_fold
+  maps_fold,
+  sleep_forever
 };
diff --git a/src/javascript/lib/core/protocol.js b/src/javascript/lib/core/protocol.js
@@ -20,6 +20,8 @@ class Protocol{
           fun = this.registry.get(Core.Integer)[funName];
         }else if(typeof thing === "number" && !Number.isInteger(thing) && this.hasImplementation(Core.Float)){
           fun = this.registry.get(Core.Float)[funName];
+        }else if(typeof thing === "string" && this.hasImplementation(Core.BitString)){
+          fun = this.registry.get(Core.BitString)[funName];
         }else if(this.hasImplementation(thing)){
           fun = this.registry.get(thing.constructor)[funName];
         }else if(this.fallback){
@@ -45,7 +47,7 @@ class Protocol{
   }
 
   hasImplementation(thing) {
-    if (thing === Core.Integer || thing === Core.Float){
+    if (thing === Core.Integer || thing === Core.Float || Core.BitString){
       return this.registry.has(thing);
     }
 
diff --git a/src/javascript/lib/core/store.js b/src/javascript/lib/core/store.js
@@ -1,19 +1,42 @@
 let store = new Map();
+let names = new Map();
+
+function get_key(key){
+  let real_key = key;
+
+  if(names.has(key)){
+    real_key = names.get(key);
+  }
+
+  if(store.has(real_key)){
+    return real_key
+  }
+
+  return new Error('Key Not Found');
+}
+
+function create(key, value, name = null){
+
+  if(name != null){
+    names.set(name, key);
+  }
 
-function create(key, value){
   store.set(key, value);
 }
 
 function update(key, value){
-  store.set(key, value);
+  let real_key = get_key(key);
+  store.set(real_key, value);
 }
 
 function read(key){
-  return store.get(key);
+  let real_key = get_key(key);
+  return store.get(real_key);
 }
 
 function remove(key){
-  return store.delete(key);
+  let real_key = get_key(key);
+  return store.delete(real_key);
 }
 
 export default {

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ defmodule ElixirScript.Mixfile do`
`4`	`4`	`def project do`
`5`	`5`	`[`
`6`	`6`	`app: :elixir_script,`
`7`		`- version: "0.23.1",`
	`7`	`+ version: "0.23.2-dev",`
`8`	`8`	`elixir: "~> 1.0",`
`9`	`9`	`escript: escript_config,`
`10`	`10`	`deps: deps,`