Tidy Int and Rat.

src/core/Int.pm

@@ -33,9 +33,10 @@ augment class Int does Real {
     our Num method Num() {
         pir::box__PN(pir::set__NP(self));
     }
+}
 
-    # Next has been moved to Rat.pm for the moment.
-    # our Rat multi method Rat() { Rat.new(self, 1); }
+our multi sub prefix:<->(Int $a) {
+    upgrade_to_num_if_needed(pir::neg__NN($a))
 }
 
 our multi sub infix:<+>(Int $a, Int $b) {
@@ -69,7 +70,3 @@ our multi sub infix:<**>(Int $a, Int $b) {
         pir::pow__NNN($a, $b)
     }
 }
-
-our multi sub prefix:<->(Int $a) {
-    upgrade_to_num_if_needed(pir::neg__NN($a))
-}

src/core/Rat.pm

@@ -19,6 +19,8 @@ class Rat is Cool does Real {
         self.bless(*, :numerator($numerator), :denominator($denominator));
     }
 
+    multi method nude() { $.numerator, $.denominator; }
+
     multi method ACCEPTS($other) {
         self.Num.ACCEPTS($other);
     }
@@ -39,8 +41,6 @@ class Rat is Cool does Real {
                            !! $!numerator.Num / $!denominator.Num;
     }
 
-    multi method nude() { $.numerator, $.denominator; }
-
     method succ {
         Rat.new($!numerator + $!denominator, $!denominator);
     }
@@ -50,6 +50,10 @@ class Rat is Cool does Real {
     }
 }
 
+multi sub prefix:<->(Rat $a) {
+    Rat.new(-$a.numerator, $a.denominator);
+}
+
 multi sub infix:<+>(Rat $a, Rat $b) {
     my $gcd = pir::gcd__iii($a.denominator, $b.denominator);
     ($a.numerator * ($b.denominator div $gcd) + $b.numerator * ($a.denominator div $gcd))
@@ -78,10 +82,6 @@ multi sub infix:<->(Int $a, Rat $b) {
     ($a * $b.denominator - $b.numerator) / $b.denominator;
 }
 
-multi sub prefix:<->(Rat $a) {
-    Rat.new(-$a.numerator, $a.denominator);
-}
-
 multi sub infix:<*>(Rat $a, Rat $b) {
     ($a.numerator * $b.numerator) / ($a.denominator * $b.denominator);
 }