Tidy up Numeric and Real.

rakudo · Jun 12, 2010 · e22e80f · e22e80f
1 parent d59da85
commit e22e80f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/src/core/Numeric.pm b/src/core/Numeric.pm
@@ -41,7 +41,7 @@ role Numeric {
         fail "$.WHAT() needs a version of .abs";
     }
 
-    multi method exp(Numeric $exponent: Numeric $base = e) {
+    method exp(Numeric $exponent: Numeric $base = e) {
         note "$.WHAT() needs a version of .exp";
         fail "$.WHAT() needs a version of .exp";
     }
@@ -203,12 +203,12 @@ role Numeric {
     }
 }
 
-multi sub infix:«cmp»(Numeric $a, Numeric $b) { $a <=> $b; }
-
 multi sub postfix:<i>(Numeric $z) {
     $z * 1i;
 }
 
+multi sub infix:«cmp»(Numeric $a, Numeric $b) { $a <=> $b; }
+
 multi sub infix:«<=>»(Numeric $a, Numeric $b) {
     my @a = $a.reals;
     my @b = $b.reals;

diff --git a/src/core/Real.pm b/src/core/Real.pm
@@ -50,19 +50,27 @@ role Real does Numeric {
         $x.Bridge.ln;
     }
 
+    method sqrt(Real $x:) {
+        $x.Bridge.sqrt;
+    }
+
+    method roots(Real $x: Int $n) {
+        $x.Complex.roots($n);
+    }
+
     method sign(Real $x:) {
         $x.notdef ?? Mu
                     !! ($x ~~ NaN ?? NaN !! $x <=> 0);
     }
 
-    method ceiling(Real $x:) {
-        $x.Bridge.ceiling;
-    }
-
     method floor(Real $x:) {
         $x.Bridge.floor;
     }
 
+    method ceiling(Real $x:) {
+        $x.Bridge.ceiling;
+    }
+
     method truncate(Real $x:) {
         $x == 0 ?? 0 !! $x < 0  ?? $x.ceiling !! $x.floor
     }
@@ -71,21 +79,13 @@ role Real does Numeric {
         floor($x / $scale + 0.5) * $scale;
     }
 
-    method unpolar(Real $mag: Real $angle) {
-        Complex.new($mag * $angle.cos(Radians),
-                    $mag * $angle.sin(Radians));
-    }
-
     method cis(Real $angle:) {
         1.unpolar($angle);
     }
 
-    method sqrt(Real $x:) {
-        $x.Bridge.sqrt;
-    }
-
-    method roots(Real $x: Int $n) {
-        $x.Complex.roots($n);
+    method unpolar(Real $mag: Real $angle) {
+        Complex.new($mag * $angle.cos(Radians),
+                    $mag * $angle.sin(Radians));
     }
 
     method sin(Real $x: $base = Radians) {