Move Callable role out of builtins and into core setting.

rakudo · Jul 4, 2010 · f4209ee · f4209ee
1 parent 7b6444c
commit f4209ee
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 107 deletions.
diff --git a/build/Makefile.in b/build/Makefile.in
@@ -118,7 +118,6 @@ BUILTINS_PIR = \
   src/builtins/Str.pir \
   src/builtins/Enum.pir \
   src/builtins/Pair.pir \
-  src/builtins/Callable.pir \
   src/builtins/Code.pir \
   src/builtins/Block.pir \
   src/builtins/Routine.pir \
@@ -169,6 +168,9 @@ CHEATS_PIR = \
   src/cheats/parrot/register.pir \
 
 CORE_SOURCES = \
+  src/core/Positional.pm \
+  src/core/Associative.pm \
+  src/core/Callable.pm \
   src/core/traits.pm \
   src/core/metaops.pm \
   src/core/operators.pm \
@@ -177,13 +179,12 @@ CORE_SOURCES = \
   src/cheats/trait-export.pm \
   src/cheats/num.pm \
   src/cheats/eval.pm \
-  src/core/Positional.pm \
-  src/core/Associative.pm \
   src/core/Mu.pm \
   src/core/Bool.pm \
   src/core/Parcel.pm \
   src/core/Any.pm \
   src/core/Any-list.pm \
+  src/core/Code.pm \
   src/core/Cool.pm \
   src/core/Cool-num.pm \
   src/core/Cool-str.pm \

diff --git a/src/builtins/Callable.pir b/src/builtins/Callable.pir
diff --git a/src/builtins/Code.pir b/src/builtins/Code.pir
@@ -16,8 +16,7 @@ for executable objects.
 .sub 'onload' :anon :load :init
     .local pmc p6meta, codeproto
     p6meta = get_hll_global ['Mu'], '$!P6META'
-    $P0 = get_hll_global 'Callable'
-    codeproto = p6meta.'new_class'('Code', 'parent'=>'Cool', 'attr'=>'$!do $!multi', 'does_role'=>$P0)
+    codeproto = p6meta.'new_class'('Code', 'parent'=>'Cool', 'attr'=>'$!do $!multi')
     $P1 = new ['Role']
     $P1.'name'('invokable')
     p6meta.'compose_role'(codeproto, $P1)

diff --git a/src/core/Callable.pm b/src/core/Callable.pm
@@ -0,0 +1,4 @@
+role Callable[::T = Mu] {
+    method of() { T }
+    method returns() { T }
+}
diff --git a/src/core/Code.pm b/src/core/Code.pm
@@ -0,0 +1 @@
+augment class Code does Callable { }