Correct ++ pattern matching implementation. Temp fix for travis CI build

bryanjos · bryanjos · commit 9375656db8e0 · 2017-06-03T03:57:58.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,20 @@
 sudo: false
-language: elixir
-elixir:
-  - 1.4.2
+language: erlang
+#language: elixir
+#elixir:
+#  - 1.5.0
 otp_release:
-  - 19.0
+  - 20.0-rc1
 env:
   - TRAVIS_NODE_VERSION="7"
 install:
   - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
   - npm install -g yarn
   - yarn
+before_script:
+  - wget http://s3.hex.pm/builds/elixir/master.zip
+  - unzip -d elixir master.zip
+  - export PATH=$(pwd)/elixir/bin:${PATH}
 script:
   - mix local.hex --force
   - mix local.rebar --force
diff --git a/lib/elixir_script/next/passes/translate/forms/pattern.ex b/lib/elixir_script/next/passes/translate/forms/pattern.ex
@@ -105,6 +105,10 @@ defmodule ElixirScript.Translate.Forms.Pattern do
     { [PM.head_tail(hd(head_patterns), hd(tail_patterns))], params }  
   end
 
+  defp process_pattern({{:., _, [:erlang, :++]}, context, [head, tail]}, state) do
+    process_pattern({:|, context, [head, tail]}, state)
+  end
+
   defp process_pattern({:%{}, _, props}, state) do
     properties = Enum.map(props, fn({key, value}) ->
       {pattern, params} = process_pattern(value, state)
@@ -144,18 +148,6 @@ defmodule ElixirScript.Translate.Forms.Pattern do
     { [PM.bitstring_match(elements)], params }
   end
 
-  defp process_pattern([{:|, _, [head, tail]}], state) do
-    { head_patterns, head_params } = process_pattern(head, state)
-    { tail_patterns, tail_params } = process_pattern(tail, state)
-    params = head_params ++ tail_params
-
-    { [PM.head_tail(hd(head_patterns), hd(tail_patterns))], params }
-  end
-
-  defp process_pattern({{:., _, [:erlang, :++]}, _, [prefix, value]}, state) do
-    { [PM.starts_with(prefix)], [Form.compile!(value, state)] }    
-  end
-
   defp process_pattern({:<>, _, [prefix, value]}, state) do
     { [PM.starts_with(prefix)], [Form.compile!(value, state)] }
   end
diff --git a/lib/elixir_script/translator/state.ex b/lib/elixir_script/translator/state.ex
@@ -30,6 +30,8 @@ defmodule ElixirScript.Translator.State do
       rescue
         FunctionClauseError ->
           acc
+        ArgumentError ->
+          acc
       end
     end)
   end
diff --git a/test/cli_test.exs b/test/cli_test.exs
@@ -1,8 +1,8 @@
 defmodule ElixirScript.CLI.Test do
   use ExUnit.Case
 
-  test "parse_args -e expands to elixir" do
-    {_, args} = ElixirScript.CLI.parse_args(["1 + 1", "-e"])
-    assert args == [elixir: true]
+  test "parse_args -js-module includes js module" do
+    {_, args} = ElixirScript.CLI.parse_args(["Example", "--js-module", "React:react"])
+    assert args == [js_module: "React:react"]
   end
 end
diff --git a/test/next/passes/translate/forms/remote_test.exs b/test/next/passes/translate/forms/remote_test.exs
@@ -8,7 +8,7 @@ defmodule ElixirScript.Translate.Forms.Remote.Test do
     state = %{function: {:each, nil}, module: Enum, vars: %{:_ => 0, "entry" => 0, "enumerable" => 0, "fun" => 0}}
 
     {js_ast, _} = Remote.compile(ast, state)
-    assert js_ast == J.identifier("fun")
+    assert js_ast == J.identifier("fun0")
   end
 
 end
