move Num.ACCEPTS to the setting, and make Complex ~~ Num a bit smarter

rakudo · Sep 30, 2009 · 1cd0864 · 1cd0864
1 parent e25aaba
commit 1cd0864
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/src/classes/Num.pir b/src/classes/Num.pir
@@ -50,23 +50,6 @@ Num - Perl 6 numbers
     .return ($I0)
 .end
 
-
-=item ACCEPTS()
-
-=cut
-
-.sub 'ACCEPTS' :method
-    .param num topic
-    $S0 = self
-    if $S0 == 'NaN' goto test_nan
-    .tailcall 'infix:=='(topic, self)
-  test_nan:
-    $S0 = topic
-    $I0 = iseq $S0, 'NaN'
-    .tailcall 'prefix:?'($I0)
-.end
-
-
 =item succ and pred
 
 Increment and Decrement Methods

diff --git a/src/setting/Num.pm b/src/setting/Num.pm
@@ -1,4 +1,18 @@
 class Num is also {
+    multi method ACCEPTS($other) {
+        if self eq 'NaN' {
+            $other eq 'NaN';
+        } else {
+            $other == self;
+        }
+    }
+    multi method ACCEPTS(Complex $other) {
+        if self eq 'NaN' {
+            $other.re eq 'NaN' || $other.im eq 'NaN';
+        } else {
+            $other.im == 0 && $other.re == self;
+        }
+    }
     multi method Complex() {
         Complex.new(self, 0);
     }
@@ -316,3 +330,5 @@ class Num is also {
         Complex.new(self * $angle.cos("radians"), self * $angle.sin("radians"));
     }
 }
+
+# vim: ft=perl6