Bring our parsing of array and hash subscripting in line with STD. Th…

…is also unbreaks zen slices.
rakudo · Apr 15, 2010 · 78faa0c · 78faa0c
1 parent 5fd0669
commit 78faa0c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
@@ -2180,13 +2180,15 @@ method postfixish($/) {
 }
 
 method postcircumfix:sym<[ ]>($/) {
-    make PAST::Op.new( $<EXPR>.ast, :name('!postcircumfix:<[ ]>'),
-                       :pasttype('call'), :node($/) );
+    my $past := PAST::Op.new( :name('!postcircumfix:<[ ]>'), :pasttype('call'), :node($/) );
+    if $<semilist><statement> { $past.push($<semilist>.ast); }
+    make $past;
 }
 
 method postcircumfix:sym<{ }>($/) {
-    make PAST::Op.new( $<EXPR>.ast, :name('!postcircumfix:<{ }>'),
-                       :pasttype('call'), :node($/) );
+    my $past := PAST::Op.new( :name('!postcircumfix:<{ }>'), :pasttype('call'), :node($/) );
+    if $<semilist><statement> { $past.push($<semilist>.ast); }
+    make $past;
 }
 
 method postcircumfix:sym<ang>($/) {

diff --git a/src/Perl6/Grammar.pm b/src/Perl6/Grammar.pm
@@ -1550,13 +1550,13 @@ token dottyopish {
 
 token postcircumfix:sym<[ ]> {
     :my $*QSIGIL := '';
-    '[' ~ ']' [ <.ws> <EXPR> ]
+    '[' ~ ']' [ <.ws> <semilist> ]
     <O('%methodcall')>
 }
 
 token postcircumfix:sym<{ }> {
     :my $*QSIGIL := '';
-    '{' ~ '}' [ <.ws> <EXPR> ]
+    '{' ~ '}' [ <.ws> <semilist> ]
     <O('%methodcall')>
 }