Changeset 16859

Timestamp:

07/06/07 19:46:08 (17 months ago)

Author:

lwall

Message:

[STD] distinguish statement list from context-sensitive semi list syntactically

Files:

• src/perl6/Perl-6.0.0-STD.pm (modified) (6 diffs)

src/perl6/Perl-6.0.0-STD.pm

@@ -377 +377 @@
 # we might be embedded in something else.
 rule comp_unit (:$begin_compunit is context = 1) {
-    <semilist>
+    <statementlist>
     [ <$+unitstop> || <panic: Can't understand next input--giving up> ]
     {*}
@@ -397 +397 @@
 token block {
     '{'
-    <semilist>
+    <statementlist>
     [ '}' || <panic: Missing right brace> ]
     [
@@ -419 +419 @@
 }
 
+# statement semantics
+rule statementlist {
+    <statement>*
+    {*}
+}
+
+# embedded semis, context-dependent semantics
 rule semilist {
     <statement>*
@@ -874 +881 @@
 
 token postcircumfix:sym<( )> (--> Methodcall)
-    { '(' <semilist> ')' {*} }                                      #= ( )
+    { '(' <semilist> ')' {*} }                                  #= ( )
 
 token postcircumfix:sym<[ ]> (--> Methodcall)
-    { '[' <semilist> ']' {*} }                                      #= [ ]
+    { '[' <semilist> ']' {*} }                                  #= [ ]
 
 token postcircumfix:sym<{ }> (--> Methodcall)
-    { '{' <semilist> '}' {*} }                                      #= { }
+    { '{' <semilist> '}' {*} }                                  #= { }
 
 token postcircumfix:sym«< >» (--> Methodcall)
@@ -911 +918 @@
     {*}
 }
-
-token circumfix:sym<( )> { '(' <semilist> ')' {*} }            #= ( )
-token circumfix:sym<[ ]> { '[' <semilist> ']' {*} }            #= [ ]
-
-token circumfix:sym«< >»   { '<'  <anglewords '>'> '>'  {*} } #'#= < >
-token circumfix:sym«<< >>» { '<<' <shellwords '>>'> '>>' {*} }#'#= << >>
-token circumfix:sym<« »>   { '«'  <shellwords '»'> '»'  {*} }   #= « »
 
 token anglewords($stop) {
@@ -1874 +1874 @@
 
 token circumfix:sigil ( --> Term)
-    { <sym <sigil>> $<sym>:='(' <semilist> $<sym>:=')' {*} }        #= $( ) 
+    { <sym <sigil>> $<sym>:='(' <semilist> $<sym>:=')' {*} }    #= $( ) 
 
 token circumfix:typecast ( --> Term)
-    { <sym <typename>> $<sym>:='(' <semilist> $<sym>:=')' {*} }     #= Type( ) 
+    { <sym <typename>> $<sym>:='(' <semilist> $<sym>:=')' {*} } #= Type( ) 
 
 token circumfix:sym<( )> ( --> Term)
-    { '(' <semilist> ')'  {*} }                                     #= ( )
-
-token postcircumfix:sym<( )> ( --> Term)
-    { '(' <semilist> ')'  {*} }                                     #= ( )
+    { '(' <statementlist> ')'  {*} }                            #= ( )
+
+token circumfix:sym<[ ]> ( --> Term)
+    { '[' <statementlist> ']' {*} }                             #= [ ]
+
+token circumfix:sym«< >» ( --> Term)
+    { '<'  <anglewords '>'> '>'  {*} }                        #'#= < >
+token circumfix:sym«<< >>» ( --> Term)
+    { '<<' <shellwords '>>'> '>>' {*} }                       #'#= << >>
+token circumfix:sym<« »> ( --> Term)
+    { '«'  <shellwords '»'> '»'  {*} }                          #= « »
 
 ## methodcall