Allow for mixing into enums.

Fixes Bool but role {} and t/spec/S14-roles/mixin.t regressions
rakudo · Oct 3, 2015 · db729c1 · db729c1
1 parent fe41cd7
commit db729c1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/Perl6/Metamodel/BOOTSTRAP.nqp b/src/Perl6/Metamodel/BOOTSTRAP.nqp
@@ -2704,7 +2704,7 @@ BEGIN {
     # class Bool is Int {
     #     has str $!key;
     #     has int $!value;
-    Bool.HOW.set_base_type(Bool, Int);
+    Bool.HOW.add_parent(Bool, Int);
     Bool.HOW.add_attribute(Bool, BOOTSTRAPATTR.new(:name<$!key>, :type(str), :package(Bool)));
     Bool.HOW.add_attribute(Bool, BOOTSTRAPATTR.new(:name<$!value>, :type(int), :package(Bool)));
     Bool.HOW.set_boolification_mode(Bool, 1);

diff --git a/src/Perl6/Metamodel/EnumHOW.nqp b/src/Perl6/Metamodel/EnumHOW.nqp
@@ -10,10 +10,12 @@ class Perl6::Metamodel::EnumHOW
     does Perl6::Metamodel::MethodContainer
     does Perl6::Metamodel::MultiMethodContainer
     does Perl6::Metamodel::RoleContainer
-    does Perl6::Metamodel::BaseType
+    does Perl6::Metamodel::MultipleInheritance
+    does Perl6::Metamodel::C3MRO
     does Perl6::Metamodel::MROBasedMethodDispatch
     does Perl6::Metamodel::MROBasedTypeChecking
     does Perl6::Metamodel::BUILDPLAN
+    does Perl6::Metamodel::Mixins
     does Perl6::Metamodel::BoolificationProtocol
     does Perl6::Metamodel::REPRComposeProtocol
     does Perl6::Metamodel::InvocationProtocol
@@ -50,11 +52,12 @@ class Perl6::Metamodel::EnumHOW
         nqp::findmethod(NQPMu, 'BUILDALL')(nqp::create(self), |%named)
     }
 
-    method new_type(:$name!, :$base_type?) {
+    method new_type(:$name!, :$repr = 'P6opaque', :$base_type?) {
         my $meta := self.new();
-        my $obj  := nqp::settypehll(nqp::newtype($meta, 'P6opaque'), 'perl6');
+        my $obj  := nqp::settypehll(nqp::newtype($meta, $repr), 'perl6');
         $meta.set_name($obj, $name);
-        $meta.set_base_type($meta, $base_type) unless $base_type =:= NQPMu;
+        $meta.add_parent($meta, $base_type) unless $base_type =:= NQPMu;
+        $meta.setup_mixin_cache($obj);
         self.add_stash($obj);
     }