Enhance support for crony role composition; this probably doesn't get…

… us all the way, but what little exists of S12-role/crony.t at least now passes.
rakudo · Feb 4, 2009 · c8d8b2d · c8d8b2d
1 parent 0c50158
commit c8d8b2d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/src/builtins/guts.pir b/src/builtins/guts.pir
@@ -512,11 +512,37 @@ and creating the protoobjects.
 .end
 
 
+=item !meta_compose(Role metarole)
+
+Composes roles.
+
+=cut
+
+.sub '!meta_compose' :multi(['Role'])
+    .param pmc metarole
+
+    # Parrot handles composing methods into roles, but we need to handle the
+    # attribute composition ourselves.
+    .local pmc roles, roles_it
+    roles = getprop '@!roles', metarole
+    if null roles goto roles_it_loop_end
+    roles_it = iter roles
+  roles_it_loop:
+    unless roles_it goto roles_it_loop_end
+    $P0 = shift roles_it
+    metarole.'add_role'($P0)
+    '!compose_role_attributes'(metarole, $P0)
+    goto roles_it_loop
+  roles_it_loop_end:
+
+    .return (metarole)
+.end
+
+
 =item !meta_compose()
 
 Default meta composer -- does nothing.
 
-
 =cut
 
 .sub '!meta_compose' :multi()

diff --git a/src/parser/actions.pm b/src/parser/actions.pm
@@ -1660,6 +1660,7 @@ method package_def($/, $key) {
         #  PIR here to do it rather than doing a call, since we need to call
         #  new_closure from the correct scope.
         $block[0].push(PAST::Op.new(:inline(
+                '    "!meta_compose"(%0)',
                 '    .local pmc orig_role, meths, meth_iter',
                 '    orig_role = getprop "$!orig_role", %0',
                 '    meths = orig_role."methods"()',