Twiddle to make roles work again. Kinda defers a tricky problem for later, mind...

Author: jnthn

src/NQP/Actions.pm

@@ -442,7 +442,16 @@ method package_def($/) {
         $past.blocktype('declaration');
         $past.unshift(PAST::Var.new( :name('$?CLASS'), :scope('parameter') ));
         $past.symbol('$?CLASS', :scope('lexical'));
-        $*PACKAGE-SETUP[0][0][1].push(PAST::Val.new( :value($past), :named('body_block') ));
+        $*PACKAGE-SETUP.push(PAST::Op.new(
+            :pasttype('callmethod'), :name('set_body_block'),
+            PAST::Op.new(
+                # XXX nqpop get_how
+                :pirop('get_how PP'),
+                PAST::Var.new( :name('type_obj'), :scope('register') )
+            ),
+            PAST::Var.new( :name('type_obj'), :scope('register') ),
+            PAST::Val.new( :value($past) )
+        ));
     }
     else {
         $past.blocktype('immediate');

src/metamodel/how/NQPParametricRoleHOW.pm

@@ -32,23 +32,26 @@ knowhow NQPParametricRoleHOW {
     ##
 
     # Creates a new instance of this meta-class.
-    method new(:$name!, :$body_block!) {
+    method new(:$name!) {
         my $obj := pir::repr_instance_of__PP(self);
-        $obj.BUILD(:name($name), :body_block($body_block));
+        $obj.BUILD(:name($name));
         $obj
     }
 
-    method BUILD(:$name!, :$body_block!) {
+    method BUILD(:$name!) {
         $!name := $name;
-        $!body_block := $body_block;
     }
 
     # Create a new meta-class instance, and then a new type object
     # to go with it, and return that.
-    method new_type(:$body_block!, :$name = '<anon>', :$repr = 'P6opaque') {
-        my $metarole := self.new(:name($name), :body_block($body_block));
+    method new_type(:$name = '<anon>', :$repr = 'P6opaque') {
+        my $metarole := self.new(:name($name));
         pir::repr_type_object_for__PPS($metarole, $repr);
     }
+    
+    method set_body_block($obj, $body_block) {
+        $!body_block := $body_block;
+    }
 
     method add_method($obj, $name, $code_obj) {
         if %!methods{$name} {