Parse traits before handling the block open, so we can look for some …

…that affect the compile. Also, attatch them to the package so PAST node so we can look for those we care about later.
rakudo · Jun 29, 2009 · 3c2e872 · 3c2e872
1 parent 6c7e546
commit 3c2e872
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/parser/actions.pm b/src/parser/actions.pm
@@ -1423,10 +1423,14 @@ method package_declarator($/, $key) {
     my $sym := ~$<sym>;
     my $past;
     if $key eq 'open' {
+        # Start of a package. Create a block and mark it as a package declaration.
         our $?BLOCK_OPEN;
         $?BLOCK_OPEN := PAST::Block.new( PAST::Stmts.new(), :node($/) );
         $?BLOCK_OPEN<pkgdecl> := $sym;
         @?PKGDECL.unshift( $sym );
+
+        # Attach traits list to it.
+        $?BLOCK_OPEN<traits> := $<traits>;
     }
     elsif $key eq 'package_def' {
         make $<package_def>.ast;

diff --git a/src/parser/grammar.pg b/src/parser/grammar.pg
@@ -702,8 +702,8 @@ rule package_def {
             match.'add_type'($S0)
         }}
     ]?
-    {*}                                                  #= open
     <trait>*
+    {*}                                                  #= open
     [
     | <block> {*}                                        #= block
     | <?{{ $P0 = get_global '$begin_compunit'