Fixed broken javascript tests. Added specs for translate functions.

bryanjos · bryanjos · commit da359cd563f6 · 2016-01-05T21:38:05.000-06:00
diff --git a/lib/elixir_script/prelude/macro/env.ex b/lib/elixir_script/prelude/macro/env.ex
@@ -1,4 +1,22 @@
 defmodule ElixirScript.Macro.Env do
+  @type t :: %ElixirScript.Macro.Env{ 
+    module: atom,
+    file: binary,
+    line: non_neg_integer,
+    function: { atom, non_neg_integer } | nil,
+    context: :match | :guard | nil,
+    aliases: [{atom, atom}],
+    requires: [atom],
+    functions: [{atom, [{ atom, non_neg_integer }]}],
+    macros: [{atom, [{ atom, non_neg_integer }]}],
+    macro_aliases: [{atom, {integer, atom}}],
+    context_modules: [atom],
+    vars: [{atom, atom | non_neg_integer}],
+    export_vars: [{atom, atom | non_neg_integer}] | nil,
+    lexical_tracker: nil,
+    caller: t | nil
+  }
+
   defstruct [
     module: nil,
     file: nil,
diff --git a/lib/elixir_script/translator.ex b/lib/elixir_script/translator.ex
@@ -1,6 +1,6 @@
 defmodule ElixirScript.Translator do
   @moduledoc """
-  Translates the given Elixir AST into JavaScript AST
+  Translates Elixir AST into JavaScript AST
   """
   alias ElixirScript.Translator.Primitive
   alias ElixirScript.Translator.Expression
@@ -25,12 +25,20 @@ defmodule ElixirScript.Translator do
 
 
   @doc """
-  Translates Elixir AST to JavaScript AST
+  Translates the given Elixir AST to JavaScript AST. The given `env` is a `ElixirScript.Macro.Env`
+  used to track the variables, imports, aliases, and scopes like `Macro.Env`. The JavaScript AST and
+  the an updated `ElixirScript.Macro.Env` is returned
   """
+  @spec translate(term, ElixirScript.Macro.Env.t) :: { ESTree.Node.t,  ElixirScript.Macro.Env.t }
   def translate(ast, env) do
     do_translate(ast, env)
   end
 
+
+  @doc """
+  Same as `translate/2`, but returns only the JavaScript AST
+  """
+  @spec translate!(term, ElixirScript.Macro.Env.t) :: ESTree.Node.t
   def translate!(ast, env) do
     { js_ast, _ } = translate(ast, env)
     js_ast
diff --git a/priv/Elixir.js b/priv/Elixir.js
diff --git a/src/javascript/lib/core/functions.js b/src/javascript/lib/core/functions.js
@@ -1,4 +1,4 @@
-import { PID, Tuple, Integer, Float } from './primitives';
+import { Tuple } from './primitives';
 import BitString from './bit_string';
 import Patterns from './patterns';
 
diff --git a/src/javascript/tests/bit_string.spec.js b/src/javascript/tests/bit_string.spec.js
@@ -1,5 +1,4 @@
 var BitString = require('../lib/core').BitString;
-var SpecialForms = require('../lib/core').SpecialForms;
 var Patterns = require('../lib/core').Patterns;
 var expect = require('chai').expect;
 
@@ -11,19 +10,19 @@ describe('BitString', function(){
 
   describe('creation', function(){
     it('create properly', function(){
-      let bs = SpecialForms.bitstring(BitString.integer(1));
+      let bs = new BitString(BitString.integer(1));
       expect(is_match(bs.value, [1])).to.equal(true);
 
-      bs = SpecialForms.bitstring(BitString.binary("foo"));
+      bs = new BitString(BitString.binary("foo"));
       expect(is_match(bs.value, [102, 111, 111])).to.equal(true);
 
-      bs = SpecialForms.bitstring(BitString.integer(0), BitString.binary("foo"));
+      bs = new BitString(BitString.integer(0), BitString.binary("foo"));
       expect(is_match(bs.value, [0, 102, 111, 111])).to.equal(true);
 
-      bs = SpecialForms.bitstring(BitString.float(3.14));
+      bs = new BitString(BitString.float(3.14));
       expect(is_match(bs.value, [64, 9, 30, 184, 81, 235, 133, 31])).to.equal(true);
 
-      bs = SpecialForms.bitstring(BitString.signed(BitString.integer(-100)));
+      bs = new BitString(BitString.signed(BitString.integer(-100)));
       expect(is_match(bs.value, [156])).to.equal(true);
     });
   });
diff --git a/src/javascript/tests/case.spec.js b/src/javascript/tests/case.spec.js
@@ -1,5 +1,6 @@
 var Patterns = require("../lib/core/patterns");
 var Enum = require('../lib/enum');
+var Tuple = require('../lib/core').Tuple;
 var SpecialForms = require('../lib/core').SpecialForms;
 var expect = require('chai').expect;
 
@@ -9,7 +10,7 @@ describe('case', () => {
   it('case', () => {
     let clauses = [
       Patterns.make_case(
-        [SpecialForms.tuple(Symbol.for("selector"), Patterns.variable(), Patterns.variable())],
+        [new Tuple(Symbol.for("selector"), Patterns.variable(), Patterns.variable())],
         function(i, value){ return value; },
         function(i){ return Kernel.is_integer(i); }
       ),
diff --git a/src/javascript/tests/special_forms.spec.js b/src/javascript/tests/special_forms.spec.js
@@ -5,7 +5,7 @@ describe('SpecialForms', function(){
 
   describe('map_update', function(){
     it('creates new object', function(){
-      const foo = SpecialForms.map({foo: "bar", fizz: "buzz"});
+      const foo = Object.freeze({foo: "bar", fizz: "buzz"});
       const bar = SpecialForms.map_update(foo, {baz: "bar", fizz: "fizzbuzz"});
 
       expect(foo instanceof Object).to.equal(bar instanceof Object);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { PID, Tuple, Integer, Float } from './primitives';`
	`1`	`+import { Tuple } from './primitives';`
`2`	`2`	`import BitString from './bit_string';`
`3`	`3`	`import Patterns from './patterns';`
`4`	`4`