Fix diamond role composition.

rakudo · Sep 21, 2011 · a26660d · a26660d
1 parent 3b1fe55
commit a26660d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/Perl6/Metamodel/BOOTSTRAP.pm b/src/Perl6/Metamodel/BOOTSTRAP.pm
@@ -430,6 +430,10 @@ Code.HOW.add_method(Code, 'dispatcher', sub ($self) {
         pir::getattribute__PPPs(pir::perl6_decontainerize__PP($self),
             Code, '$!dispatcher')
     });
+Code.HOW.add_method(Code, 'id', sub ($self) {
+        pir::getattribute__PPPs(pir::perl6_decontainerize__PP($self),
+            Code, '$!do').start_offs()
+    });
 pir::perl6_set_type_code__vP(Code);
 
 # Need to actually run the code block. Also need this available before we finish

diff --git a/src/Perl6/Metamodel/RoleToRoleApplier.pm b/src/Perl6/Metamodel/RoleToRoleApplier.pm
@@ -32,6 +32,9 @@ my class RoleToRoleApplier {
                     if $meth =:= $_ {
                         $found := 1;
                     }
+                    elsif pir::can($meth, 'id') && pir::can($_, 'id') {
+                        $found := $meth.id == $_.id;
+                    }
                 }
                 unless $found {
                     @meth_list.push($meth);