Move Abstraction role out of builtins and into core setting. This mea…

…ns we no longer have any roles defined in the builtins.
rakudo · Jul 4, 2010 · 31ebce5 · 31ebce5
1 parent f4209ee
commit 31ebce5
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 45 deletions.
diff --git a/build/Makefile.in b/build/Makefile.in
@@ -100,7 +100,6 @@ BUILTINS_PIR = \
   src/metamodel/GrammarHOW.pir \
   src/builtins/Role.pir \
   src/builtins/ConcreteRole.pir \
-  src/builtins/Abstraction.pir \
   src/builtins/Positional.pir \
   src/builtins/Iterable.pir \
   src/builtins/Iterator.pir \
@@ -171,6 +170,7 @@ CORE_SOURCES = \
   src/core/Positional.pm \
   src/core/Associative.pm \
   src/core/Callable.pm \
+  src/core/Abstraction.pm \
   src/core/traits.pm \
   src/core/metaops.pm \
   src/core/operators.pm \

diff --git a/src/builtins/Abstraction.pir b/src/builtins/Abstraction.pir
diff --git a/src/builtins/Bool.pir b/src/builtins/Bool.pir
@@ -20,8 +20,7 @@ symbols for C<Bool::True> and C<Bool::False>.
 .sub 'onload' :anon :init :load
     .local pmc p6meta, boolproto, abstraction
     p6meta = get_hll_global ['Mu'], '$!P6META'
-    abstraction = get_hll_global 'Abstraction'
-    boolproto = p6meta.'new_class'('Bool', 'parent'=>'parrot;Boolean Cool', 'does_role'=>abstraction)
+    boolproto = p6meta.'new_class'('Bool', 'parent'=>'parrot;Boolean Cool')
 
     $P0 = boolproto.'new'()
     $P0 = 0

diff --git a/src/core/Abstraction.pm b/src/core/Abstraction.pm
@@ -0,0 +1 @@
+role Abstraction { }
diff --git a/src/core/Bool.pm b/src/core/Bool.pm
@@ -1,4 +1,4 @@
-augment class Bool {
+augment class Bool does Abstraction {
     method Bool { self }
     method ACCEPTS($topic) { self }
 

diff --git a/src/glue/role.pir b/src/glue/role.pir
@@ -76,6 +76,7 @@ and so forth.
     Method = get_hll_global 'Method'
     $I0 = isa Method, 'NameSpace'
     unless $I0 goto method_check_done
+    die "Attempt to create role when Method not defined"
     null Method
   method_check_done:
     meths = parrotrole.'methods'()