matz

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 9 insertions, 0 deletions

diff --git a/parse.y b/parse.y
index 460e05508f..615519a908 100644
--- a/parse.y
+++ b/parse.y
@@ -862,6 +862,14 @@ aref_args	: none
 			value_expr($4);
 			$$ = arg_concat($1, $4);
 		    }
+		| assocs
+		    {
+			$$ = NEW_LIST(NEW_HASH($1));
+		    }
+		| assocs ','
+		    {
+			$$ = NEW_LIST(NEW_HASH($1));
+		    }
 		| tSTAR arg opt_nl
 		    {
 			value_expr($2);
@@ -3381,6 +3389,7 @@ yylex()
 	    tokadd(c);
 	    tokfix();
 	    yylval.id = rb_intern(tok());
+	    /* xxx shouldn't check if valid option variable */
 	    return tGVAR;
 
 	  case '&':		/* $&: last match */