Fix allowing for multiple input. Fix struct module references

bryanjos · bryanjos · commit f1850eadc195 · 2016-12-28T16:55:34.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,9 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [0.24.0] - Unreleased
 
+### Added
+- Implement `sigil_r` and `Regex` module
+
 ### Fixed
 - CLI now allows a comma-separated or space-separated list of paths
-- Implement `sigil_r` and `Regex` module
+- Struct not properly referenced
 
 ## [0.23.3] - 2016-11-18
 
diff --git a/lib/elixir_script.ex b/lib/elixir_script.ex
@@ -52,8 +52,13 @@ defmodule ElixirScript do
   @spec compile(binary, Map.t) :: [binary | {binary, binary} | :ok]
   def compile(elixir_code, opts \\ %{}) do
     elixir_code
-    |> Code.string_to_quoted!
-    |> compile_quoted(opts)
+    |> List.wrap
+    |> Enum.map(fn(x) ->
+      x
+      |> Code.string_to_quoted!
+      |> compile_quoted(opts)
+    end)
+    |> List.flatten
   end
 
   @doc """
diff --git a/lib/elixir_script/cli.ex b/lib/elixir_script/cli.ex
@@ -6,7 +6,7 @@ defmodule ElixirScript.CLI do
   @switches [
     output: :binary, elixir: :boolean,
     help: :boolean, core_path: :binary,
-    full_build: :boolean, version: :boolean, 
+    full_build: :boolean, version: :boolean,
     watch: :boolean
   ]
 
@@ -21,13 +21,19 @@ defmodule ElixirScript.CLI do
   end
 
   def parse_args(args) do
-    parse = OptionParser.parse(args, switches: @switches, aliases: @aliases)
-
-    case parse do
-      { [help: true] , _ , _ } -> :help
-      { [version: true] , _ , _ } -> :version
-      { options , [input], _ } -> { input, options }
-      _ -> :help
+    { options, input, errors } = OptionParser.parse(args, switches: @switches, aliases: @aliases)
+
+    cond do
+      length(errors) > 0 ->
+        :help
+      Keyword.get(options, :help, false) ->
+        :help
+      Keyword.get(options, :version, false) ->
+        :version
+      length(input) == 0 ->
+        :help
+      true ->
+        { input, options }
     end
 
   end
@@ -80,8 +86,9 @@ defmodule ElixirScript.CLI do
         ElixirScript.compile(input, compile_opts)
       _ ->
         input = input
-        |> String.split([" ", ","], trim: true)
-        
+        |> Enum.map(fn(x) -> String.split(x, [" ", ","], trim: true) end)
+        |> List.flatten
+
         ElixirScript.compile_path(input, compile_opts)
 
         if watch do
diff --git a/lib/elixir_script/translator/kernel/special_forms/struct.ex b/lib/elixir_script/translator/kernel/special_forms/struct.ex
@@ -13,6 +13,7 @@ defmodule ElixirScript.Translator.Struct do
     if ElixirScript.Translator.LexicalScope.get_module_name(env, candiate_module_name) in ElixirScript.Translator.State.list_module_names() do
       name = ElixirScript.Translator.LexicalScope.get_module_name(env, candiate_module_name)
       ident = JS.identifier(Utils.name_to_js_name(name))
+      ElixirScript.Translator.State.add_module_reference(env.module, name)
       JS.member_expression(ident, ident)
 
     else
diff --git a/lib/elixir_script/watcher.ex b/lib/elixir_script/watcher.ex
@@ -41,7 +41,9 @@ defmodule ElixirScript.Watcher do
       "." <> _ ->
         false
       _ ->
-       path == Path.absname(Path.join([state[:input], file]))
+        Enum.any?(List.wrap(state[:input]), fn(x) ->
+          path == Path.absname(Path.join([x, file]))
+        end)
     end
   end
 end
