2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b8adc74616..47e85a0d35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul  6 23:13:19 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (opt_call_args): allow trailing comma after assoc
+	  argument e.g. 'foo(bar:1,)'.  fixed #3456
+
 Wed Jul  6 22:11:12 2011  Shota Fukumori  <sorah@tubusu.net>
 
 	* test/cgi/test_cgi_header.rb(test_cgi_header_nph): Validate date in
diff --git a/parse.y b/parse.y
index c3db298e8a..f1663ef21f 100644
--- a/parse.y
+++ b/parse.y
@@ -2426,6 +2426,14 @@ opt_call_args	: none
 			$$ = arg_add_assocs($1, $3);
 		    %*/
 		    }
+		| assocs ','
+		    {
+		    /*%%%*/
+			$$ = NEW_LIST(NEW_HASH($1));
+		    /*%
+			$$ = arg_add_assocs(arg_new(), $1);
+		    %*/
+		    }
 		;
 
 call_args	: command