opal · May 5, 2015
diff --git a/Diff for: ‎CHANGELOG.md
+3 b/Diff for: ‎CHANGELOG.md
+3
diff --git a/Diff for: ‎lib/opal/parser/grammar.rb
+2,221-2,196 b/Diff for: ‎lib/opal/parser/grammar.rb
+2,221-2,196
diff --git a/Diff for: ‎lib/opal/parser/grammar.y
+22-7 b/Diff for: ‎lib/opal/parser/grammar.y
+22-7
diff --git a/Diff for: ‎spec/lib/parser/call_spec.rb
+10 b/Diff for: ‎spec/lib/parser/call_spec.rb
+10
@@ -1,5 +1,8 @@
 ## edge (upcoming 0.8.0)
 
+*   Parser: Allow trailing comma in paren arglists, after normal args as
+    well as assoc args.
+
 *   Parser: Fix parsing of parens following divide operator without a
     space.
 
 
@@ -607,23 +607,38 @@ rule
                       result = [s(:hash, *val[0])]
                     }
 
-      paren_args: tLPAREN2 none tRPAREN
-                    {
-                      result = []
-                    }
-                | tLPAREN2 call_args opt_nl tRPAREN
+      paren_args: tLPAREN2 opt_call_args rparen
                     {
                       result = val[1]
                     }
-                | tLPAREN2 block_call opt_nl tRPAREN
-                | tLPAREN2 args tCOMMA block_call opt_nl tRPAREN
+
+          rparen: opt_nl tRPAREN
 
   opt_paren_args: none
                     {
                       result = []
                     }
                 | paren_args
 
+   opt_call_args: none
+                    {
+                      result = []
+                    }
+                | call_args
+                | args tCOMMA
+                    {
+                      result = val[0]
+                    }
+                | args tCOMMA assocs tCOMMA
+                    {
+                      result = val[0]
+                      result << new_hash(nil, val[2], nil)
+                    }
+                | assocs tCOMMA
+                    {
+                      result = [new_hash(nil, val[0], nil)]
+                    }
+
        call_args: command
                     {
                       result = [val[0]]
 
@@ -153,3 +153,13 @@
     parsed('1-(2)').should == [:call, [:int, 1], '-'.to_sym, [:arglist, [:paren, [:int, 2]]]]
   end
 end
+
+describe 'Calls with trailing comma' do
+  it 'parses correctly' do
+    parsed('foo(1,)').should == [:call, nil, :foo, [:arglist, [:int, 1]]]
+    parsed('foo(1, 2,)').should == [:call, nil, :foo, [:arglist, [:int, 1], [:int, 2]]]
+
+    parsed('foo(a: 100,)').should == [:call, nil, :foo, [:arglist,
+      [:hash, [:sym, :a], [:int, 100]]]]
+  end
+end