Add IEx processing to Kernel.CLI

Author: José Valim

bin/elixirc

@@ -24,4 +24,4 @@ readlink_f () {
 
 SELF=$(readlink_f "$0")
 SCRIPT_PATH=$(dirname "$SELF")
-exec "$SCRIPT_PATH"/elixir --compile "$@"
+exec "$SCRIPT_PATH"/elixir +compile "$@"

bin/elixirc.bat

@@ -18,4 +18,4 @@ echo ** Options marked with (*) can be given more than once
 echo ** Options given after -- are passed down to the executed code
 echo ** Options can be passed to the erlang runtime using ELIXIR_ERL_OPTS" >&2
 :run
-call "%~dp0\elixir.bat" --compile %*
+call "%~dp0\elixir.bat" +compile %*

bin/iex

@@ -33,4 +33,4 @@ readlink_f () {
 
 SELF=$(readlink_f "$0")
 SCRIPT_PATH=$(dirname "$SELF")
-ELIXIR_NO_CLI=1 exec "$SCRIPT_PATH"/elixir --no-halt --erl "-user Elixir-IEx-CLI" "$@"
+ELIXIR_NO_CLI=1 exec "$SCRIPT_PATH"/elixir --no-halt --erl "-user Elixir-IEx-CLI" +iex "$@"

bin/iex.bat

@@ -1,2 +1,2 @@
 @echo off
-call "%~dp0\elixir.bat" --no-halt -e "IEx.start" %*
+call "%~dp0\elixir.bat" +iex --no-halt -e "IEx.start" %*

lib/elixir/lib/kernel/cli.ex

@@ -141,7 +141,7 @@ defmodule Kernel.CLI do
     process_shared t, config.update_commands [{:cookie,h}|&1]
   end
 
-  defp process_shared([erl,_|t], config) when erl in ["--erl", "--sname", "--remsh", "--name"] do
+  defp process_shared([erl,_|t], config) when erl in ["--erl", "--sname", "--name"] do
     process_shared t, config
   end
 
@@ -155,10 +155,14 @@ defmodule Kernel.CLI do
     { config, t }
   end
 
-  defp process_argv(["--compile"|t], config) do
+  defp process_argv(["+compile"|t], config) do
     process_compiler t, config
   end
 
+  defp process_argv(["+iex"|t], config) do
+    process_iex t, config
+  end
+
   defp process_argv(["-S",h|t], config) do
     { config.update_commands([{:script,h}|&1]), t }
   end
@@ -212,6 +216,33 @@ defmodule Kernel.CLI do
     { config.update_commands([{:compile,config.compile}|&1]), [] }
   end
 
+  # Process iex options
+
+  defp process_iex(["--"|t], config) do
+    { config, t }
+  end
+
+  defp process_iex([opt,_|t], config) when opt in ["--remsh"] do
+    process_iex t, config
+  end
+
+  defp process_iex(["-S",h|t], config) do
+    { config.update_commands([{:script,h}|&1]), t }
+  end
+
+  defp process_iex([h|t] = list, config) do
+    case h do
+      "-" <> _ ->
+        shared_option? list, config, process_iex(&1, &2)
+      _ ->
+        { config.update_commands([{:file,h}|&1]), t }
+    end
+  end
+
+  defp process_iex([], config) do
+    { config, [] }
+  end
+
   # Process commands
 
   defp process_command({:cookie,h}, _config) do