Try to do use actually at BEGIN-ish time, and fix up routine traits s…

…o they can see a block's signature.
rakudo · Mar 2, 2010 · 6867a56 · 6867a56
1 parent e3f183e
commit 6867a56
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
@@ -336,7 +336,7 @@ method statement_control:sym<use>($/) {
             );
         }
         else {
-            @BLOCK[0][0].unshift(
+            @BLOCK[0].loadinit.unshift(
                 PAST::Op.new( :name('!use'), ~$<module_name>, :node($/) )
             );
         }
@@ -848,7 +848,7 @@ method routine_def($/) {
     $signature.set_default_parameter_type('Any');
     my $sig_setup_block := add_signature($past, $signature, 1);
     if $<trait> {
-        emit_routine_traits($past, $<trait>, 'Sub');
+        emit_routine_traits($past, $<trait>, 'Sub', $sig_setup_block);
     }
     if $<deflongname> {
         # Set name.
@@ -937,9 +937,6 @@ method method_def($/) {
     my $past := $<blockoid>.ast;
     $past.blocktype('declaration');
     $past.control('return_pir');
-    if $<trait> {
-        emit_routine_traits($past, $<trait>, $*METHODTYPE);
-    }
 
     # Get signature - or create - and sort out invocant handling.
     if pir::defined__IP($past<placeholder_sig>) {
@@ -963,6 +960,11 @@ method method_def($/) {
     $past[0].unshift(PAST::Var.new( :name('self'), :scope('lexical'), :isdecl(1), :viviself(sigiltype('$')) ));
     $past.symbol('self', :scope('lexical'));
 
+    # Emit traits.
+    if $<trait> {
+        emit_routine_traits($past, $<trait>, $*METHODTYPE, $sig_setup_block);
+    }
+
     # Method container.
     if $<longname> {
         # Set up us the name.
@@ -2073,11 +2075,11 @@ sub has_compiler_trait_with_val($trait_list, $name, $value) {
 
 
 # Emits routine traits into the loadinit for the routine.
-sub emit_routine_traits($routine, @trait_list, $type) {
+sub emit_routine_traits($routine, @trait_list, $type,  $sig_setup_block) {
     $routine.loadinit.push(PAST::Op.new(
         :pasttype('bind'),
         PAST::Var.new( :name('trait_subject'), :scope('register'), :isdecl(1) ),
-        create_code_object(PAST::Var.new( :name('block'), :scope('register') ), $type, 0, '')
+        create_code_object(PAST::Var.new( :name('block'), :scope('register') ), $type, 0,  $sig_setup_block)
     ));
     for @trait_list {
         my $ast := $_.ast;