removed *.notdef

(with small corrections from moritz_)
rakudo · Feb 26, 2011 · c2403f2 · c2403f2
1 parent 6437553
commit c2403f2
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/src/Perl6/Grammar.pm b/src/Perl6/Grammar.pm
@@ -552,7 +552,7 @@ token term:sym<undef> {
     [ <?before [ '(' || \h*<sigil><twigil>?\w ] >
         <.obs('undef as a verb', 'undefine function or assignment of Nil')>
     ]?
-    <.obs('undef as a value', "something more specific:\n\tMu (the \"most undefined\" type object),\n\tan undefined type object such as Int,\n\tNil as an empty list,\n\t*.notdef as a matcher or method,\n\tAny:U as a type constraint\n\tor fail() as a failure return\n\t   ")>
+    <.obs('undef as a value', "something more specific:\n\tMu (the \"most undefined\" type object),\n\tan undefined type object such as Int,\n\tNil as an empty list,\n\t!*.defined as a matcher or method,\n\tAny:U as a type constraint\n\tor fail() as a failure return\n\t   ")>
 }
 
 token term:sym<new> {

diff --git a/src/core/Cool-str.pm b/src/core/Cool-str.pm
@@ -135,7 +135,7 @@ augment class Cool {
                         $c++;
                     } else {
                         my $m = self.index($match-string, $c);
-                        last if $m.notdef; # CHEAT, but the best I can do for now
+                        last unless $m.defined; # CHEAT, but the best I can do for now
                         take self.substr($c, $m - $c);
                         take $match-string if $all;
                         $c = $m + $match-string.chars;

diff --git a/src/core/Int.pm b/src/core/Int.pm
@@ -27,7 +27,7 @@ augment class Int does Real {
     }
 
     method sign(Int $x:) {
-        $x.notdef ?? Mu !! $x <=> 0;
+        $x.defined ?? $x <=> 0 !! Mu;
     }
 
     method gcd(Int $x: Int $y) {

diff --git a/src/core/Mu.pm b/src/core/Mu.pm
@@ -8,7 +8,9 @@ augment class Mu {
         self;
     }
 
-    multi method notdef() { !self.defined; }
+    multi method notdef() {
+        die ".notdef is deprecated, please use negated .defined instead";
+    }
 
     method note() {
         note(self);

diff --git a/src/core/Parcel.pm b/src/core/Parcel.pm
@@ -17,7 +17,7 @@ augment class Parcel does Positional {
 
     multi method ACCEPTS($x) {
         self.elems == 0
-            ?? $x.notdef || ($x ~~ Positional && $x == 0)
+            ?? !$x.defined || ($x ~~ Positional && $x == 0)
             !! self.Seq.ACCEPTS($x)
     }
 }
diff --git a/src/core/Real.pm b/src/core/Real.pm
@@ -71,8 +71,7 @@ role Real does Numeric {
     }
 
     method sign(Real $x:) {
-        $x.notdef ?? Mu
-                    !! ($x ~~ NaN ?? NaN !! $x <=> 0);
+        $x.defined ?? ($x ~~ NaN ?? NaN !! $x <=> 0) !! Mu;
     }
 
     method floor(Real $x:) {