please return Nil for no value, not a typeobject

We didn't clarify this till recently, so I assume these are mostly fossils.
rakudo · Dec 3, 2015 · 887c937 · 887c937
1 parent c6cc8a8
commit 887c937
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 37 deletions.
diff --git a/src/Perl6/Metamodel/BOOTSTRAP.nqp b/src/Perl6/Metamodel/BOOTSTRAP.nqp
@@ -1557,7 +1557,7 @@ BEGIN {
     Parameter.HOW.add_method(Parameter, 'WHY', nqp::getstaticcode(sub ($self) {
             my $why := nqp::getattr(nqp::decont($self), Parameter, '$!why');
             if nqp::isnull($why) || !$why {
-                Any
+                Nil
             } else {
                 $why.set_docee($self);
                 $why

diff --git a/src/Perl6/Metamodel/Documenting.nqp b/src/Perl6/Metamodel/Documenting.nqp
@@ -2,7 +2,7 @@ role Perl6::Metamodel::Documenting {
     has $!why;
 
     method WHY() {
-        nqp::isnull($!why) ?? Any !! $!why
+        nqp::isnull($!why) ?? Nil !! $!why
     }
 
     method set_why($why) {

diff --git a/src/core/Any.pm b/src/core/Any.pm
@@ -529,7 +529,7 @@ sub DELETEKEY(Mu \d, str $key) {
         $value;
     }
     else {
-        Mu;
+        Nil;
     }
 } #DELETEKEY
 

diff --git a/src/core/Attribute.pm b/src/core/Attribute.pm
@@ -109,7 +109,7 @@ my class Attribute { # declared in BOOTSTRAP
         }
     }
 
-    method container() is raw { nqp::isnull($!auto_viv_container) ?? Mu !! $!auto_viv_container }
+    method container() is raw { nqp::isnull($!auto_viv_container) ?? Nil !! $!auto_viv_container }
     method has-accessor() { ?$!has_accessor }
     method readonly() { !self.rw }
     method package() { $!package }
@@ -119,7 +119,7 @@ my class Attribute { # declared in BOOTSTRAP
 
     method WHY() {
         if nqp::isnull($!why) {
-            Any
+            Nil
         } else {
             $!why.set_docee(self);
             $!why

diff --git a/src/core/Backtrace.pm b/src/core/Backtrace.pm
@@ -158,7 +158,7 @@ my class Backtrace {
 
             return $idx - 1;
         }
-        Int;
+        Nil;
     }
 
     method outer-caller-idx(Backtrace:D: Int $startidx) {

diff --git a/src/core/Block.pm b/src/core/Block.pm
@@ -324,7 +324,7 @@ my class Block { # declared in BOOTSTRAP
 
     method WHY() {
         if nqp::isnull($!why) {
-            Any
+            Nil
         } else {
             $!why.set_docee(self);
             $!why

diff --git a/src/core/CompUnit/Handle.pm b/src/core/CompUnit/Handle.pm
@@ -22,7 +22,7 @@ class CompUnit::Handle {
             nqp::atkey($module, '&EXPORT');
         }
         else {
-            Callable
+            Nil
         }
     }
 
@@ -37,7 +37,7 @@ class CompUnit::Handle {
                 !! nqp::p6bindattrinvres(nqp::create(Stash), Map, '$!storage', $EXPORT.WHO);
         }
         else {
-            Stash
+            Nil
         }
     }
 
@@ -53,7 +53,7 @@ class CompUnit::Handle {
                 !! nqp::p6bindattrinvres(nqp::create(Stash), Map, '$!storage', $who);
         }
         else {
-            Stash
+            Nil
         }
     }
 
@@ -63,10 +63,10 @@ class CompUnit::Handle {
     method globalish-package() { # returns Stash {
         if nqp::defined($!module_ctx) {
             my $lexpad := nqp::ctxlexpad($!module_ctx);
-            nqp::isnull(nqp::atkey($lexpad, 'GLOBALish')) ?? Stash !! nqp::atkey($lexpad, 'GLOBALish')
+            nqp::isnull(nqp::atkey($lexpad, 'GLOBALish')) ?? Nil !! nqp::atkey($lexpad, 'GLOBALish')
         }
         else {
-            Stash
+            Nil
         }
     }
 

diff --git a/src/core/Hash.pm b/src/core/Hash.pm
@@ -87,7 +87,7 @@ my class Hash { # declared in BOOTSTRAP
     method keyof () { Any }
     method of() {
         my $d := $!descriptor;
-        nqp::isnull($d) ?? Nil !! $d.of;
+        nqp::isnull($d) ?? Mu !! $d.of;
     }
     method default() {
         my $d := $!descriptor;

diff --git a/src/core/IO/Socket/INET.pm b/src/core/IO/Socket/INET.pm
@@ -108,7 +108,7 @@ my class IO::Socket::INET does IO::Socket {
             $line
         }
         else {
-            Str
+            Nil
         }
     }
 

diff --git a/src/core/Iterable.pm b/src/core/Iterable.pm
@@ -131,9 +131,7 @@ my role Iterable {
                 $!source.push-exactly($work.input, $items)
             }
 
-            method process-buffer(HyperWorkBuffer:D $work) {
-                Mu
-            }
+            method process-buffer(HyperWorkBuffer:D $work --> Nil) { }
 
             method configuration() { $!configuration }
         }.new(self.iterator, $configuration));

diff --git a/src/core/Map.pm b/src/core/Map.pm
@@ -178,7 +178,7 @@ my class Map does Iterable does Associative { # declared in BOOTSTRAP
         my str $skey = nqp::unbox_s(key.Str);
         nqp::defined($!storage) && nqp::existskey($!storage, $skey)
           ?? nqp::atkey($!storage, $skey)
-          !! Any
+          !! Nil
     }
 
     method STORE(\to_store) {

diff --git a/src/core/Pod.pm b/src/core/Pod.pm
@@ -78,8 +78,8 @@ my class Pod::Block::Declarator is Pod::Block {
         }
     }
 
-    method leading  { @!leading  ?? @!leading.join(' ')  !! Any }
-    method trailing { @!trailing ?? @!trailing.join(' ') !! Any }
+    method leading  { @!leading  ?? @!leading.join(' ')  !! Nil }
+    method trailing { @!trailing ?? @!trailing.join(' ') !! Nil }
 
     method _add_leading($addition) {
         @!leading.push: ~$addition;

diff --git a/src/core/PseudoStash.pm b/src/core/PseudoStash.pm
@@ -162,8 +162,8 @@ my class PseudoStash is Map {
             my Mu $store := nqp::getattr(self, Map, '$!storage');
             my Mu $res := nqp::existskey($store, $nkey) ??
                             nqp::atkey($store, $nkey) !!
-                            Any;
-            if !($res =:= Any) && nqp::bitand_i($!mode, REQUIRE_DYNAMIC) {
+                            Nil;
+            if !($res =:= Nil) && nqp::bitand_i($!mode, REQUIRE_DYNAMIC) {
                 if try !$res.VAR.dynamic {
                     X::Caller::NotDynamic.new(
                         symbol => $key,
@@ -176,13 +176,13 @@ my class PseudoStash is Map {
             my $found := nqp::getlexreldyn(
                 nqp::getattr(self, PseudoStash, '$!ctx'),
                 $nkey);
-            nqp::isnull($found) ?? Any !! $found
+            nqp::isnull($found) ?? Nil !! $found
         }
         else { # STATIC_CHAIN
             my $found := nqp::getlexrel(
                 nqp::getattr(self, PseudoStash, '$!ctx'),
                 $nkey);
-            nqp::isnull($found) ?? Any !! $found
+            nqp::isnull($found) ?? Nil !! $found
         }
     }
 

diff --git a/src/core/Range.pm b/src/core/Range.pm
@@ -340,15 +340,15 @@ my class Range is Cool does Iterable does Positional {
               !! self.list.roll(*)
         }
         else {
-            Any xx *
+            Nil xx *
         }
     }
     multi method roll(Range:D:) {
         if $!is-int {
             my $elems = $!max - $!excludes-max - $!min - $!excludes-min + 1;
             $elems > 0
               ?? $!min + $!excludes-min + nqp::rand_I(nqp::decont($elems),Int)
-              !! Any
+              !! Nil
         }
         else {
             self.list.roll
@@ -382,7 +382,7 @@ my class Range is Cool does Iterable does Positional {
               !! self.list.roll($todo)
         }
         else {
-            Any xx $todo
+            Nil xx $todo
         }
     }
 
@@ -438,7 +438,7 @@ my class Range is Cool does Iterable does Positional {
               !! self.list.pick($todo)
         }
         else {
-            Any xx $todo
+            Nil xx $todo
         }
     }
 

diff --git a/src/core/Routine.pm b/src/core/Routine.pm
@@ -58,9 +58,7 @@ my class Routine { # declared in BOOTSTRAP
         $perl
     }
 
-    method soft() {
-        Mu
-    }
+    method soft( --> Nil ) { }
 
     method wrap(&wrapper) {
         my class WrapHandle {

diff --git a/src/core/Str.pm b/src/core/Str.pm
@@ -1396,7 +1396,7 @@ my class Str does Stringy { # declared in BOOTSTRAP
     multi method encode(Str:D $encoding = 'utf8', Bool:D :$replacement) {
         self.encode($encoding, :replacement($replacement
             ?? ($encoding ~~ m:i/^utf/ ?? "\x[FFFD]" !! "?" )
-            !! Str
+            !! Nil
         ));
     }
     multi method encode(Str:D $encoding = 'utf8', Str :$replacement) {
@@ -1889,9 +1889,9 @@ my class Str does Stringy { # declared in BOOTSTRAP
     multi method ord(Str:D:) returns Int {
         nqp::chars($!value)
           ?? nqp::p6box_i(nqp::ord($!value))
-          !! Int;
+          !! Nil;
     }
-    multi method ord(Str:U:) returns Int { Int }
+    multi method ord(Str:U: --> Nil) { }
 }
 
 
@@ -2225,22 +2225,22 @@ multi sub uniprop(Int:D $code, Stringy:D $propname = "GeneralCategory") {
 
 proto sub uniprop-int(|) {*}
 multi sub uniprop-int(Str:D $str, Stringy:D $propname) {
-    $str ?? uniprop-int($str.ord, $propname) !! Str }
+    $str ?? uniprop-int($str.ord, $propname) !! Nil }
 multi sub uniprop-int(Int:D $code, Stringy:D $propname) {
     nqp::getuniprop_int($code,Rakudo::Internals.PROPCODE($propname));
 }
 
 proto sub uniprop-bool(|) {*}
 multi sub uniprop-bool(Str:D $str, Stringy:D $propname) {
-    $str ?? uniprop-bool($str.ord, $propname) !! Str
+    $str ?? uniprop-bool($str.ord, $propname) !! Nil
 }
 multi sub uniprop-bool(Int:D $code, Stringy:D $propname) {
     so nqp::getuniprop_bool($code,Rakudo::Internals.PROPCODE($propname));
 }
 
 proto sub uniprop-str(|) {*}
 multi sub uniprop-str(Str:D $str, Stringy:D $propname) {
-    $str ?? uniprop-str($str.ord, $propname) !! Str
+    $str ?? uniprop-str($str.ord, $propname) !! Nil
 }
 multi sub uniprop-str(Int:D $code, Stringy:D $propname) {
     nqp::getuniprop_str($code,Rakudo::Internals.PROPCODE($propname));