Fix new implementation of structs with protocol implementations

bryanjos · bryanjos · commit 6a285df26016 · 2017-04-07T01:03:23.000-05:00
diff --git a/lib/elixir_script/translator.ex b/lib/elixir_script/translator.ex
@@ -621,6 +621,21 @@ defmodule ElixirScript.Translator do
     { js_ast, env }
   end
 
+  defp do_translate({:raise, _, [{:__aliases__, _, _} = alias_info]}, env) do
+    module = case create_module_name(alias_info, env) do
+        {module, _} ->
+          module
+        module ->
+          module
+      end
+
+    {call, _} = Call.make_module_function_call(module, :__struct__, [], env)
+
+    js_ast = JS.throw_statement(call)
+
+    { js_ast, env }
+  end
+
   defp do_translate({:raise, _, [message]}, env) do
     js_ast = JS.throw_statement(
       JS.object_expression(
diff --git a/lib/elixir_script/translator/kernel/defimpl.ex b/lib/elixir_script/translator/kernel/defimpl.ex
@@ -131,7 +131,7 @@ defmodule ElixirScript.Translator.Defimpl do
           module
       end
 
-    ElixirScript.Translator.translate!(module)
+    ElixirScript.Translator.translate!(module, env)
   end
 
 end
diff --git a/src/javascript/lib/core/protocol.js b/src/javascript/lib/core/protocol.js
@@ -61,7 +61,7 @@ class Protocol {
     ) {
       return this.registry.has(thing);
     } else if (thing[Symbol.for('__struct__')]) {
-      return this.registry.has(Symbol.for('__struct__'));
+      return this.registry.has(thing[Symbol.for('__struct__')]);
     }
 
     return this.registry.has(thing.constructor);
diff --git a/test/app/spec/exception.spec.js b/test/app/spec/exception.spec.js
@@ -30,22 +30,10 @@ describe('Exception', () => {
     const User = Elixir.load(Elixir.User);
     const ArgumentError = Elixir.load(Elixir.ElixirScript.ArgumentError);
 
-    expect(User.throw_something()).to.throw(ArgumentError.__struct__());
-
-    let struct = User.__struct__();
-
-    expect(Object.getOwnPropertySymbols(struct)).to.eql([
-      Symbol.for('__struct__'),
-      Symbol.for('first'),
-      Symbol.for('last'),
-    ]);
-
-    expect(struct[Symbol.for('__struct__')]).to.eql(Symbol.for('Elixir.User'));
-    expect(struct[Symbol.for('first')]).to.eql(null);
-    expect(struct[Symbol.for('last')]).to.eql(null);
-
-    struct = User.__struct__({ [Symbol.for('first')]: 'John' });
-
-    expect(struct[Symbol.for('first')]).to.eql('John');
+    try {
+      User.throw_something();
+    } catch (e) {
+      expect(e[Symbol.for('message')]).to.eql('argument error');
+    }
   });
 });
diff --git a/test/app/spec/struct.spec.js b/test/app/spec/struct.spec.js
@@ -21,4 +21,16 @@ describe('Struct', () => {
 
     expect(struct[Symbol.for('first')]).to.eql('John');
   });
+
+  it('Protocol', () => {
+    const User = Elixir.load(Elixir.User);
+    const StringChars = Elixir.load(Elixir.ElixirScript.String.Chars);
+
+    const struct = User.__struct__({
+      [Symbol.for('first')]: 'John',
+      [Symbol.for('last')]: 'Doe',
+    });
+
+    expect(StringChars.to_string(struct)).to.eql('JohnDoe');
+  });
 });
diff --git a/test/app/src/user.ex b/test/app/src/user.ex
@@ -4,4 +4,14 @@ defmodule User do
   def throw_something() do
     raise ArgumentError
   end
+end
+
+defimpl String.Chars, for: User do
+  def to_string(nil) do
+    ""
+  end
+
+  def to_string(user) do
+    user.first <> user.last
+  end
 end

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class Protocol {`
`61`	`61`	`) {`
`62`	`62`	`return this.registry.has(thing);`
`63`	`63`	`} else if (thing[Symbol.for('__struct__')]) {`
`64`		`- return this.registry.has(Symbol.for('__struct__'));`
	`64`	`+ return this.registry.has(thing[Symbol.for('__struct__')]);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`return this.registry.has(thing.constructor);`