Changeset 5385

Timestamp:

07/11/05 03:51:05 (3 years ago)

Author:

mugwump

svk:copy_cache_prev:

7349

Message:

Add a few more tests to rounding tests, and make tests pass by adding to Prelude.pm

Files:

• src/perl6/Prelude.pm (modified) (2 diffs)
• t/builtins/math/rounders.t (modified) (2 diffs)

src/perl6/Prelude.pm

@@ -1 +1 @@
 module Prelude-0.0.1;
 
+#use Test;
 use v6;
 
@@ -232 +233 @@
 }
 
+multi sub Num::round_gen(Int $n, Code $corner) returns Int { $n }
+multi sub Num::round_gen(Num $n, Code $corner) returns Int {
+    if (int($n) == $n) {
+        return int($n);
+    } else {
+        return $corner($n);
+    }
+}
+
+sub Num::do_round($n) { ($n < 0) ?? int( $n - 0.5) :: int( $n + 0.5); }
+sub Num::round { Num::round_gen($^n, &Num::do_round) }
+
+sub Num::truncate { int($^n) }
+&Num::trunc ::= &Num::truncate;
+
+sub Num::do_ceil($n) { ($n < 0) ?? (-int(-$n)) :: int($n + 1) }
+sub Num::ceiling { Num::round_gen($^n, &Num::do_ceil) }
+&Num::ceil ::= &Num::ceiling;
+
+sub Num::do_floor($n) { ($n < 0) ?? (-int(1-$n)) :: int($n) }
+sub Num::floor { Num::round_gen($^n, &Num::do_floor) }
+
 sub *sprintf ($fmt,*@args) {
     my $flen = $fmt.chars;

t/builtins/math/rounders.t

@@ -4 +4 @@
 use Test;
 
-plan 28;
+plan 36;
 
 =pod
@@ -13 +13 @@
 
 my %tests =
-    ( ceil  => [ [ 1.5, 2 ], [ 2, 2 ], [ 1.4999, 2 ],
-                 [ -0.1, 0 ], [ -1, -1 ], [ -0.9, 0 ],
-                 [ -0.5, 0 ] ],
+    ( ceiling => [ [ 1.5, 2 ], [ 2, 2 ], [ 1.4999, 2 ],
+                 [ -0.1, 0 ], [ -1, -1 ], [ -5.9, -5 ],
+                 [ -0.5, 0 ], [ -0.499, 0 ], [ -5.499, -5 ] ],
       floor => [ [ 1.5, 1 ], [ 2, 2 ], [ 1.4999, 1 ],
-                 [ -0.1, -1 ], [ -1, -1 ], [ -0.9, -1 ],
-                 [ -0.5, -1 ] ],
+                 [ -0.1, -1 ], [ -1, -1 ], [ -5.9, -6 ],
+                 [ -0.5, -1 ], [ -0.499, -1 ], [ -5.499, -6 ]  ],
       round => [ [ 1.5, 2 ], [ 2, 2 ], [ 1.4999, 1 ],
-                 [ -0.1, 0 ], [ -1, -1 ], [ -0.9, -1 ],
-                 [ -0.5, -1 ] ],
-      trunc => [ [ 1.5, 1 ], [ 2, 2 ], [ 1.4999, 1 ],
-                 [ -0.1, 0 ], [ -1, -1 ], [ -0.9, 0 ],
-                 [ -0.5, 0 ] ],
+                 [ -0.1, 0 ], [ -1, -1 ], [ -5.9, -6 ],
+                 [ -0.5, -1 ], [ -0.499, 0 ], [ -5.499, -5 ]  ],
+      truncate => [ [ 1.5, 1 ], [ 2, 2 ], [ 1.4999, 1 ],
+                 [ -0.1, 0 ], [ -1, -1 ], [ -5.9, -5 ],
+                 [ -0.5, 0 ], [ -0.499, 0 ], [ -5.499, -5 ]  ],
     );