Make ~/, round, ceil, floor, truncate return ints. Remove toInt.

tests/language/arithmetic_test.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 // Dart test program to test arithmetic operations.
 
 library arithmetic_test;
 import 'dart:math';
 
 class ArithmeticTest {
 
@@ skipping 12 matching lines @@
       return false;
     } on FormatException catch (e) {
       return true;
     }
   }
 
   static bool toIntThrowsFormatException(String str) {
     // No exception allowed for parse double.
     double d = double.parse(str);
     try {
-      var a = d.toInt();
+      var a = d.truncate();
       return false;
     } on FormatException catch (e) {
       return true;
     }
   }
 
   static runOne() {
     var a = 22;
     var b = 4;
     // Smi & smi.
@@ skipping 10 matching lines @@
       a = -(1 << i);
       b = -1;
       Expect.equals(1 << i, a ~/ b);
     }
     a = 22;
     b = 4.0;
     // Smi & double.
     Expect.equals(26.0, a + b);
     Expect.equals(18.0, a - b);
     Expect.equals(88.0, a * b);
-    Expect.equals(5.0, a ~/ b);
+    Expect.equals(5, a ~/ b);
     Expect.equals(5.5, a / b);
     Expect.equals(2.0, a % b);
     Expect.equals(2.0, a.remainder(b));
     a = 22.0;
     b = 4;
     // Double & smi.
     Expect.equals(26.0, a + b);
     Expect.equals(18.0, a - b);
     Expect.equals(88.0, a * b);
-    Expect.equals(5.0, a ~/ b);
+    Expect.equals(5, a ~/ b);
     Expect.equals(5.5, a / b);
     Expect.equals(2.0, a % b);
     Expect.equals(2.0, a.remainder(b));
     a = 22.0;
     b = 4.0;
     // Double & double.
     Expect.equals(26.0, a + b);
     Expect.equals(18.0, a - b);
     Expect.equals(88.0, a * b);
-    Expect.equals(5.0, a ~/ b);
+    Expect.equals(5, a ~/ b);
     Expect.equals(5.5, a / b);
     Expect.equals(2.0, a % b);
     Expect.equals(2.0, a.remainder(b));
 
     // Special int operations.
     Expect.equals(2, (2).floor());
     Expect.equals(2, (2).ceil());
     Expect.equals(2, (2).round());
     Expect.equals(2, (2).truncate());
 
@@ skipping 104 matching lines @@
 
     // -- ceil --.
     // Smi.
     Expect.equals(0, (0).ceil());
     Expect.equals(1, (1).ceil());
     Expect.equals(-1, (-1).ceil());
     // Big.
     Expect.equals(big, big.ceil());
     Expect.equals(-big, (-big).ceil());
     // Double.
-    Expect.equals(0.0, (0.0).ceil());
+    Expect.equals(0, (0.0).ceil());
     Expect.equals(false, (0.0).ceil().isNegative);
-    Expect.equals(1.0, (0.1).ceil());
-    Expect.equals(-0.0, (-0.0).ceil());
-    Expect.equals(-0.0, (-0.3).ceil());
-    // TODO(srdjan): enable the following tests once isNegative works.
-    // Expect.equals(true, (-0.0).ceil().isNegative);
-    // Expect.equals(true, (-0.3).ceil().isNegative);
-    Expect.equals(3.0, (2.1).ceil());
-    Expect.equals(-2.0, (-2.1).ceil());
+    Expect.equals(1, (0.1).ceil());
+    Expect.equals(0, (-0.0).ceil());
+    Expect.equals(0, (-0.3).ceil());
+    Expect.isTrue((-0.0).ceil() is int);
+    Expect.isTrue((-0.3).ceil() is int);
+    Expect.equals(3, (2.1).ceil());
+    Expect.equals(-2, (-2.1).ceil());
 
     // -- floor --.
     // Smi.
     Expect.equals(0, (0).floor());
     Expect.equals(1, (1).floor());
     Expect.equals(-1, (-1).floor());
     // Big.
     Expect.equals(big, big.floor());
     Expect.equals(-big, (-big).floor());
     // Double.
-    Expect.equals(0.0, (0.0).floor());
-    Expect.equals(0.0, (0.1).floor());
-    Expect.equals(false, (0.0).floor().isNegative);
-    Expect.equals(false, (0.1).floor().isNegative);
-    Expect.equals(-0.0, (-0.0).floor());
-    // TODO(srdjan): enable the following tests once isNegative works.
-    // Expect.equals(true, (-0.0).floor().isNegative);
-    Expect.equals(-1.0, (-0.1).floor());
-    Expect.equals(2.0, (2.1).floor());
-    Expect.equals(-3.0, (-2.1).floor());
+    Expect.equals(0, (0.0).floor());
+    Expect.equals(0, (0.1).floor());
+    Expect.isTrue((0.0).floor() is int);
+    Expect.isTrue((0.1).floor() is int);
+    Expect.equals(0, (-0.0).floor());
+    Expect.isTrue((-0.0).floor() is int);
+    Expect.equals(-1, (-0.1).floor());
+    Expect.equals(2, (2.1).floor());
+    Expect.equals(-3, (-2.1).floor());
 
     // -- truncate --.
     // Smi.
     Expect.equals(0, (0).truncate());
     Expect.equals(1, (1).truncate());
     Expect.equals(-1, (-1).truncate());
     // Big.
     Expect.equals(big, big.truncate());
     Expect.equals(-big, (-big).truncate());
     // Double.
-    Expect.equals(0.0, (0.0).truncate());
-    Expect.equals(0.0, (0.1).truncate());
-    Expect.equals(false, (0.0).truncate().isNegative);
-    Expect.equals(false, (0.1).truncate().isNegative);
-    Expect.equals(-0.0, (-0.0).truncate());
-    Expect.equals(-0.0, (-0.3).truncate());
-    // TODO(srdjan): enable the following tests once isNegative works.
-    // Expect.equals(true, (-0.0).truncate().isNegative);
-    // Expect.equals(true, (-0.3).truncate().isNegative);
-    Expect.equals(2.0, (2.1).truncate());
-    Expect.equals(-2.0, (-2.1).truncate());
+    Expect.equals(0, (0.0).truncate());
+    Expect.equals(0, (0.1).truncate());
+    Expect.isTrue((0.0).truncate() is int);
+    Expect.isTrue((0.1).truncate() is int);
+    Expect.equals(0, (-0.0).truncate());
+    Expect.equals(0, (-0.3).truncate());
+    Expect.isTrue((-0.0).truncate() is int);
+    Expect.isTrue((-0.3).truncate() is int);
+    Expect.equals(2, (2.1).truncate());
+    Expect.equals(-2, (-2.1).truncate());
 
-    double b1 = (1234567890123.0).truncate();
-    double b2 = (1234567890124.0).truncate();
+    int b1 = (1234567890123.0).truncate();
+    int b2 = (1234567890124.0).truncate();
     Expect.equals(b2, b1 + 1.0);
 
     // -- round --.
     // Smi.
     Expect.equals(0, (0).round());
     Expect.equals(1, (1).round());
     Expect.equals(-1, (-1).round());
     // Big.
     Expect.equals(big, big.round());
     Expect.equals(-big, (-big).round());
     // Double.
-    Expect.equals(3.0, (2.6).round());
-    Expect.equals(-3.0, (-2.6).round());
-    Expect.equals(0.0, (0.0).round());
-    Expect.equals(0.0, (0.1).round());
-    Expect.equals(false, (0.0).round().isNegative);
-    Expect.equals(false, (0.1).round().isNegative);
-    Expect.equals(-0.0, (-0.0).round());
-    Expect.equals(-0.0, (-0.3).round());
-    Expect.equals(2.0, (2.1).round());
-    Expect.equals(-2.0, (-2.1).round());
-    Expect.equals(1.0, (0.5).round());
-    // TODO(floitsch): enable or adapt test, once we reached conclusion on
-    // b/4539188.
-    // Expect.equals(-0.0, (-0.5).round());
-    // TODO(srdjan): enable the following tests once isNegative works.
-    // Expect.equals(true, (-0.0).round().isNegative);
-    // Expect.equals(true, (-0.3).round().isNegative);
-    // Expect.equals(true, (-0.5).round().isNegative);
-    Expect.equals(2.0, (1.5).round());
-    // TODO(floitsch): enable or adapt test, once we reached conclusion on
-    // b/4539188.
-    // Expect.equals(-1.0, (-1.5).round());
-    Expect.equals(1.0, (0.99).round());
+    Expect.equals(3, (2.6).round());
+    Expect.equals(-3, (-2.6).round());
+    Expect.equals(0, (0.0).round());
+    Expect.equals(0, (0.1).round());
+    Expect.isFalse((0.0).round().isNegative);
+    Expect.isFalse((0.1).round().isNegative);
+    Expect.equals(0, (-0.0).round());
+    Expect.equals(0, (-0.3).round());
+    Expect.equals(2, (2.1).round());
+    Expect.equals(-2, (-2.1).round());
+    Expect.equals(1, (0.5).round());
+    Expect.isTrue((-0.0).round() is int);
+    Expect.isTrue((-0.3).round() is int);
+    Expect.isTrue((-0.5).round() is int);
+    Expect.equals(2, (1.5).round());
+    Expect.equals(-2, (-1.5).round());
+    Expect.equals(1, (0.99).round());
 
     // -- toInt --.
     // Smi.
-    Expect.equals(0, (0).toInt());
-    Expect.equals(1, (1).toInt());
-    Expect.equals(-1, (-1).toInt());
+    Expect.equals(0, (0).truncate());
+    Expect.equals(1, (1).truncate());
+    Expect.equals(-1, (-1).truncate());
     // Type checks.
-    { int i = (0).toInt(); }
-    { int i = (1).toInt(); }
-    { int i = (-1).toInt(); }
+    { int i = (0).truncate(); }
+    { int i = (1).truncate(); }
+    { int i = (-1).truncate(); }
     // Big.
-    Expect.equals(big, big.toInt());
-    Expect.equals(-big, (-big).toInt());
-    { int i = big.toInt(); }
-    { int i = (-big).toInt(); }
+    Expect.equals(big, big.truncate());
+    Expect.equals(-big, (-big).truncate());
+    { int i = big.truncate(); }
+    { int i = (-big).truncate(); }
     // Double.
-    Expect.equals(1234567890123, (1234567890123.0).toInt());
-    Expect.equals(-1234567890123, (-1234567890123.0).toInt());
-    { int i = (1234567890123.0).toInt(); }
-    { int i = (-1234567890123.0).toInt(); }
+    Expect.equals(1234567890123, (1234567890123.0).truncate());
+    Expect.equals(-1234567890123, (-1234567890123.0).truncate());
+    { int i = (1234567890123.0).truncate(); }
+    { int i = (-1234567890123.0).truncate(); }
     // 32bit Smi border cases.
-    Expect.equals(-1073741824, (-1073741824.0).toInt());
-    Expect.equals(-1073741825, (-1073741825.0).toInt());
-    Expect.equals(1073741823, (1073741823.0).toInt());
-    Expect.equals(1073741824, (1073741824.0).toInt());
+    Expect.equals(-1073741824, (-1073741824.0).truncate());
+    Expect.equals(-1073741825, (-1073741825.0).truncate());
+    Expect.equals(1073741823, (1073741823.0).truncate());
+    Expect.equals(1073741824, (1073741824.0).truncate());
 
-    { int i = (-1073741824.0).toInt(); }
-    { int i = (-1073741825.0).toInt(); }
-    { int i = (1073741823.0).toInt(); }
-    { int i = (1073741824.0).toInt(); }
+    { int i = (-1073741824.0).truncate(); }
+    { int i = (-1073741825.0).truncate(); }
+    { int i = (1073741823.0).truncate(); }
+    { int i = (1073741824.0).truncate(); }
 
     // -- toDouble --.
     // Smi.
     Expect.equals(0.0, (0).toDouble());
     Expect.equals(1.0, (1).toDouble());
     Expect.equals(-1.0, (-1).toDouble());
     // Type checks.
     { double d = (0).toDouble(); }
     { double d = (1).toDouble(); }
     { double d = (-1).toDouble(); }
     // Big.
-    Expect.equals(big, big.toInt());
-    Expect.equals(-big, (-big).toInt());
-    { int i = big.toInt(); }
-    { int i = (-big).toInt(); }
+    Expect.equals(big, big.truncate());
+    Expect.equals(-big, (-big).truncate());
+    { int i = big.truncate(); }
+    { int i = (-big).truncate(); }
 
     // Math functions.
     Expect.equals(2.0, sqrt(4.0));
     Expect.approxEquals(1.0, sin(3.14159265 / 2.0));
     Expect.approxEquals(-1.0, cos(3.14159265));
 
     Expect.equals(12, int.parse("12"));
     Expect.equals(-12, int.parse("-12"));
     Expect.equals(12345678901234567890,
                   int.parse("12345678901234567890"));
@@ skipping 72 matching lines @@
     for (int i = 0; i < 1500; i++) {
       runOne();
       testSmiDivDeopt();
     }
   }
 }
 
 main() {
   ArithmeticTest.testMain();
 }