Fix list with keywords expansion

The list `[1, 2, three: :four]` now correctly expands
to `[1, 2, {:three, :four}]`.

Author: José Valim

CHANGELOG.md

@@ -9,6 +9,7 @@
 * Bug fixes
   * [Atom] Inspect `:...` and `:foo@bar` without quoting
   * [File] Respect source directories terminating with "/" in `File.cp_r/3` with the same semantics as Unix
+  * [Keyword] The list `[1, 2, three: :four]` now correctly expands to `[1, 2, {:three, :four}]`
   * [Kernel] Ensure undefined `@attributes` shows proper stacktrace in warnings
   * [Kernel] Guarantee nullary funs/macros are allowed in guards
   * [Process] Ensure monitoring functions are inlined by the compiler

lib/elixir/src/elixir_parser.yrl

@@ -10,16 +10,16 @@ Nonterminals
   open_bracket close_bracket
   open_curly close_curly
   open_bit close_bit
-  container_comma_expr_base container_comma_expr container_arg container_args
-  call_args_parens_comma_expr call_args_parens parens_call
+  container_args_base container_args
+  call_args_parens_base call_args_parens parens_call
   call_args_no_parens_one call_args_no_parens_expr call_args_no_parens_comma_expr
   call_args_no_parens_all call_args_no_parens_many call_args_no_parens_many_strict
   stab stab_eol stab_expr stab_maybe_expr stab_parens_many
   kw_eol kw_expr kw_comma kw
   call_args_no_parens_kw_expr call_args_no_parens_kw_comma call_args_no_parens_kw
   dot_op dot_alias dot_identifier dot_op_identifier dot_do_identifier
   dot_paren_identifier dot_bracket_identifier
-  var list bit_string tuple
+  var list list_args bit_string tuple
   do_block fn_eol do_eol end_eol block_eol block_item block_list
   .
 
@@ -396,27 +396,22 @@ container_expr -> matched_expr : '$1'.
 container_expr -> unmatched_expr : '$1'.
 container_expr -> no_parens_expr : throw_no_parens_many_strict('$1').
 
-container_comma_expr_base -> container_expr ',' : ['$1'].
-container_comma_expr_base -> container_comma_expr_base container_expr ',' : ['$2'|'$1'].
+container_args_base -> container_expr : ['$1'].
+container_args_base -> container_args_base ',' container_expr : ['$3'|'$1'].
 
-container_comma_expr -> container_expr : ['$1'].
-container_comma_expr -> kw : ['$1'].
-container_comma_expr -> container_comma_expr_base : '$1'.
-container_comma_expr -> container_comma_expr_base container_expr : ['$2'|'$1'].
-container_comma_expr -> container_comma_expr_base kw : ['$2'|'$1'].
+container_args -> kw : ['$1'].
+container_args -> container_args_base : lists:reverse('$1').
+container_args -> container_args_base ',' : lists:reverse('$1').
+container_args -> container_args_base ',' kw : lists:reverse(['$3'|'$1']).
 
-container_arg  -> container_expr : '$1'.
-container_arg  -> container_expr ',' : '$1'.
-container_args -> container_comma_expr : lists:reverse('$1').
-
-call_args_parens_comma_expr -> container_expr : ['$1'].
-call_args_parens_comma_expr -> call_args_parens_comma_expr ',' container_expr : ['$3'|'$1'].
+call_args_parens_base -> container_expr : ['$1'].
+call_args_parens_base -> call_args_parens_base ',' container_expr : ['$3'|'$1'].
 
 call_args_parens -> empty_paren : [].
 call_args_parens -> open_paren no_parens_expr close_paren : ['$2'].
 call_args_parens -> open_paren kw close_paren : ['$2'].
-call_args_parens -> open_paren call_args_parens_comma_expr close_paren : lists:reverse('$2').
-call_args_parens -> open_paren call_args_parens_comma_expr ',' kw close_paren : lists:reverse(['$4'|'$2']).
+call_args_parens -> open_paren call_args_parens_base close_paren : lists:reverse('$2').
+call_args_parens -> open_paren call_args_parens_base ',' kw close_paren : lists:reverse(['$4'|'$2']).
 
 % KV
 
@@ -426,6 +421,7 @@ kw_eol  -> kw_identifier eol : '$1'.
 kw_expr -> kw_eol container_expr : { ?exprs('$1'),'$2' }.
 kw_comma -> kw_expr ',' : ['$1'].
 kw_comma -> kw_comma kw_expr ',' : ['$2'|'$1'].
+
 kw -> kw_expr : ['$1'].
 kw -> kw_comma : lists:reverse('$1').
 kw -> kw_comma kw_expr : lists:reverse(['$2'|'$1']).
@@ -437,16 +433,18 @@ call_args_no_parens_kw -> call_args_no_parens_kw_comma : '$1'.
 
 % Lists
 
+list_args -> kw : '$1'.
+list_args -> container_args_base : lists:reverse('$1').
+list_args -> container_args_base ',' : lists:reverse('$1').
+list_args -> container_args_base ',' kw : lists:reverse('$1') ++ '$3'.
+
 list -> open_bracket ']' : { [], ?line('$1') }.
-list -> open_bracket kw close_bracket : { '$2', ?line('$1') }.
-list -> open_bracket container_arg close_bracket : { ['$2'], ?line('$1') }.
-list -> open_bracket container_expr ',' container_args close_bracket : { ['$2'|'$4'], ?line('$1') }.
+list -> open_bracket list_args close_bracket : { '$2', ?line('$1') }.
 
 % Tuple
 
 tuple -> open_curly '}' : build_tuple('$1', []).
-tuple -> open_curly container_arg close_curly : build_tuple('$1', ['$2']).
-tuple -> open_curly container_expr ',' container_args close_curly :  build_tuple('$1', ['$2'|'$4']).
+tuple -> open_curly container_args close_curly :  build_tuple('$1', '$2').
 
 % Bitstrings
 

lib/elixir/test/elixir/keyword_test.exs

@@ -7,6 +7,7 @@ defmodule KeywordTest do
     assert [B: 1] == [{ :B, 1 }]
     assert [foo?: :bar] == [{:foo?, :bar}]
     assert [||: 2, +: 1] == [{:||, 2}, {:+, 1}]
+    assert [1, 2, three: :four] == [1, 2, { :three, :four }]
   end
 
   test :ambiguity do

lib/elixir/test/elixir/tuple_test.exs

@@ -11,6 +11,11 @@ defmodule TupleTest do
     assert set_elem({ :a, :b, :c }, 1, :d) == { :a, :d, :c }
   end
 
+  test :keywords do
+    assert { 1, 2, three: :four } == { 1, 2, [three: :four] }
+    assert { one: :two } == { [one: :two] }
+  end
+
   test :optional_comma do
     assert { 1 } == { 1, }
     assert { 1, 2, 3 } == { 1, 2, 3, }