Merge from master

bryanjos · bryanjos · commit 39c212e438b3 · 2017-08-26T19:29:22.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,4 @@ stdlib_state.bin
 test/app/build
 .vscode
 cover
+/priv
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Reimplement `String.split_at/2` to make sure Unicode library isn't compiled
 
+### Fixed
+- Make sure not to add underscores to erlang functions
+- Make sure any variable names that are javascript keywords are handled properly
+
 ## [0.30.0] - 2017-08-15
 
 ### Added
diff --git a/lib/elixir_script/passes/translate/form.ex b/lib/elixir_script/passes/translate/form.ex
@@ -9,6 +9,39 @@ defmodule ElixirScript.Translate.Form do
   alias ElixirScript.Translate.Clause
   require Logger
 
+  @js_reserved_words [
+    :break,
+    :case,
+    :class,
+    :const,
+    :continue,
+    :debugger,
+    :default,
+    :delete,
+    :do,
+    :else,
+    :export,
+    :extends,
+    :finally,
+    :function,
+    :if,
+    :import,
+    :in,
+    :instanceof,
+    :new,
+    :return,
+    :super,
+    :switch,
+    :throw,
+    :try,
+    :typeof,
+    :var,
+    :void,
+    :while,
+    :with,
+    :yield
+  ]
+
   def compile!(ast, state) do
     {js_ast, _} = compile(ast, state)
 
@@ -369,10 +402,10 @@ defmodule ElixirScript.Translate.Form do
     end
   end
 
-  def compile({:default, meta, _}, state) do
+  def compile({var, meta, _}, state) when var in @js_reserved_words do
     counter = Pattern.get_counter(meta)
 
-    var = :__default__
+    var = String.to_atom("__#{var}__")
     var = Pattern.get_variable_name(to_string(var) <> counter, state)
     { ElixirScript.Translate.Identifier.make_identifier(var), state }
   end
diff --git a/lib/elixir_script/passes/translate/forms/for.ex b/lib/elixir_script/passes/translate/forms/for.ex
@@ -2,7 +2,11 @@ defmodule ElixirScript.Translate.Forms.For do
   @moduledoc false
 
   alias ESTree.Tools.Builder, as: JS
+<<<<<<< HEAD
   alias ElixirScript.Translate.{Form, Clause, Identifier, Helpers}
+=======
+  alias ElixirScript.Translate.{Form, Clause, Helpers, Identifier}
+>>>>>>> master
   alias ElixirScript.Translate.Forms.Pattern
 
  def compile({:for, _, generators}, state) do
@@ -23,7 +27,12 @@ defmodule ElixirScript.Translate.Forms.For do
       [JS.array_expression(args.patterns), fun, filter]
     )
 
+<<<<<<< HEAD
     members = ["Elixir", "Collectable", "__load"]
+=======
+    members = ["Elixir", "Collectable" , "__load"]
+
+>>>>>>> master
     collectable = Helpers.call(
       Identifier.make_namespace_members(members),
       [JS.identifier("Elixir")]
diff --git a/lib/elixir_script/passes/translate/forms/remote.ex b/lib/elixir_script/passes/translate/forms/remote.ex
@@ -57,7 +57,7 @@ defmodule ElixirScript.Translate.Forms.Remote do
   def compile({:., _, [module, function]}, state) when module in @erlang_modules do
     ast = J.member_expression(
       Helpers.core_module(module),
-      ElixirScript.Translate.Identifier.make_function_name(function)
+      J.identifier(function)
     )
 
     { ast, state }
diff --git a/package.json b/package.json
@@ -24,7 +24,11 @@
   "license": "MIT",
   "dependencies": {
     "erlang-types": "^1.0.1",
+<<<<<<< HEAD
     "tailored": "^2.7.1"
+=======
+    "tailored": "^2.7.2"
+>>>>>>> master
   },
   "devDependencies": {
     "ava": "^0.21.0",
diff --git a/priv/build/iife/ElixirScript.Core.js b/priv/build/iife/ElixirScript.Core.js
diff --git a/yarn.lock b/yarn.lock

-Original file line number
+Diff line change
 test/app/build
 .vscode
 cover
 +/priv
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ defmodule ElixirScript.Translate.Forms.Remote do`
`57`	`57`	`def compile({:., _, [module, function]}, state) when module in @erlang_modules do`
`58`	`58`	`ast = J.member_expression(`
`59`	`59`	`Helpers.core_module(module),`
`60`		`- ElixirScript.Translate.Identifier.make_function_name(function)`
	`60`	`+ J.identifier(function)`
`61`	`61`	`)`
`62`	`62`
`63`	`63`	`{ ast, state }`