Merge branch 'master' into track_modules_used

bryanjos · bryanjos · commit eb76a3cda1a5 · 2017-09-28T20:24:38.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.31.1] - 2017-09-27
+### Fixed
+- Compiler error when `receive` is used as variable name
+
+
 ## [0.31.0] - 2017-09-24
 ### Added
 - [Compiler will now accept a path to Elixir Files to compile](https://github.com/elixirscript/elixirscript/issues/420)
diff --git a/lib/elixir_script/passes/find_used_modules.ex b/lib/elixir_script/passes/find_used_modules.ex
@@ -213,7 +213,7 @@ defmodule ElixirScript.FindUsedModules do
     end)
   end
 
-  defp walk({:receive, _context, blocks}, state) do
+  defp walk({:receive, _context, blocks}, state) when is_list(blocks) do
     do_block = Keyword.get(blocks, :do)
     after_block = Keyword.get(blocks, :after, nil)
 
diff --git a/mix.exs b/mix.exs
@@ -4,7 +4,7 @@ defmodule ElixirScript.Mixfile do
   def project do
     [
       app: :elixir_script,
-      version: "0.31.0",
+      version: "0.31.1",
       elixir: "~> 1.5",
       elixirc_paths: elixirc_paths(Mix.env),
       deps: deps(),
diff --git a/test/cli_test.exs b/test/cli_test.exs
@@ -10,7 +10,7 @@ defmodule ElixirScript.CLI.Test do
   test "process help" do
     assert capture_io(fn ->
       ElixirScript.CLI.process(:help)
-    end) =~ "usage: elixirscript <module> [options]"
+    end) =~ "usage: elixirscript <module | path> [options]"
   end
 
   test "process version" do
@@ -22,7 +22,7 @@ defmodule ElixirScript.CLI.Test do
   test "process unknown" do
     assert capture_io(fn ->
       ElixirScript.CLI.process({"", [unknown: ""]})
-    end) =~ "usage: elixirscript <module> [options]"
+    end) =~ "usage: elixirscript <module | path> [options]"
   end
 
   test "process input" do

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ defmodule ElixirScript.Mixfile do`
`4`	`4`	`def project do`
`5`	`5`	`[`
`6`	`6`	`app: :elixir_script,`
`7`		`- version: "0.31.0",`
	`7`	`+ version: "0.31.1",`
`8`	`8`	`elixir: "~> 1.5",`
`9`	`9`	`elixirc_paths: elixirc_paths(Mix.env),`
`10`	`10`	`deps: deps(),`