Make some static helpers into member functions.

runtime/lib/integers.cc

 // 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.
 
 #include "vm/bootstrap_natives.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/dart_entry.h"
 #include "vm/exceptions.h"
 #include "vm/native_entry.h"
@@ skipping 42 matching lines @@
       case Token::kBIT_AND:
         return Integer::New(a & b);
       case Token::kBIT_OR:
         return Integer::New(a | b);
       case Token::kBIT_XOR:
         return Integer::New(a ^ b);
       default:
         UNIMPLEMENTED();
     }
   } else {
-    Bigint& op1 = Bigint::Handle(Bigint::AsBigint(op1_int));
-    Bigint& op2 = Bigint::Handle(Bigint::AsBigint(op2_int));
+    Bigint& op1 = Bigint::Handle(op1_int.AsBigint());
+    Bigint& op2 = Bigint::Handle(op2_int.AsBigint());
     switch (kind) {
       case Token::kBIT_AND:
         return BigintOperations::BitAnd(op1, op2);
       case Token::kBIT_OR:
         return BigintOperations::BitOr(op1, op2);
       case Token::kBIT_XOR:
         return BigintOperations::BitXor(op1, op2);
       default:
         UNIMPLEMENTED();
     }
@@ skipping 24 matching lines @@
   const Integer& right = Integer::CheckedHandle(arguments->At(0));
   GET_NATIVE_ARGUMENT(Integer, left, arguments->At(1));
   ASSERT(CheckInteger(right));
   ASSERT(CheckInteger(left));
   if (FLAG_trace_intrinsified_natives) {
     OS::Print("Integer_bitAndFromInteger %s & %s\n",
         right.ToCString(), left.ToCString());
   }
   Integer& result = Integer::Handle(
       IntegerBitOperation(Token::kBIT_AND, left, right));
-  return Integer::AsInteger(result);
+  return result.AsInteger();
 }
 
 
 DEFINE_NATIVE_ENTRY(Integer_bitOrFromInteger, 2) {
   const Integer& right = Integer::CheckedHandle(arguments->At(0));
   GET_NATIVE_ARGUMENT(Integer, left, arguments->At(1));
   ASSERT(CheckInteger(right));
   ASSERT(CheckInteger(left));
   if (FLAG_trace_intrinsified_natives) {
     OS::Print("Integer_bitOrFromInteger %s | %s\n",
         left.ToCString(), right.ToCString());
   }
   Integer& result = Integer::Handle(
       IntegerBitOperation(Token::kBIT_OR, left, right));
-  return Integer::AsInteger(result);
+  return result.AsInteger();
 }
 
 
 DEFINE_NATIVE_ENTRY(Integer_bitXorFromInteger, 2) {
   const Integer& right = Integer::CheckedHandle(arguments->At(0));
   GET_NATIVE_ARGUMENT(Integer, left, arguments->At(1));
   ASSERT(CheckInteger(right));
   ASSERT(CheckInteger(left));
   if (FLAG_trace_intrinsified_natives) {
     OS::Print("Integer_bitXorFromInteger %s ^ %s\n",
         left.ToCString(), right.ToCString());
   }
   Integer& result = Integer::Handle(
       IntegerBitOperation(Token::kBIT_XOR, left, right));
-  return Integer::AsInteger(result);
+  return result.AsInteger();
 }
 
 
 DEFINE_NATIVE_ENTRY(Integer_addFromInteger, 2) {
   const Integer& right_int = Integer::CheckedHandle(arguments->At(0));
   GET_NATIVE_ARGUMENT(Integer, left_int, arguments->At(1));
   ASSERT(CheckInteger(right_int));
   ASSERT(CheckInteger(left_int));
   if (FLAG_trace_intrinsified_natives) {
     OS::Print("Integer_addFromInteger %s + %s\n",
         left_int.ToCString(), right_int.ToCString());
   }
-  return Integer::BinaryOp(Token::kADD, left_int, right_int);
+  return left_int.BinaryOp(Token::kADD, right_int);
 }
 
 
 DEFINE_NATIVE_ENTRY(Integer_subFromInteger, 2) {
   const Integer& right_int = Integer::CheckedHandle(arguments->At(0));
   GET_NATIVE_ARGUMENT(Integer, left_int, arguments->At(1));
   ASSERT(CheckInteger(right_int));
   ASSERT(CheckInteger(left_int));
   if (FLAG_trace_intrinsified_natives) {
     OS::Print("Integer_subFromInteger %s - %s\n",
         left_int.ToCString(), right_int.ToCString());
   }
-  return Integer::BinaryOp(Token::kSUB, left_int, right_int);
+  return left_int.BinaryOp(Token::kSUB, right_int);
 }
 
 
 DEFINE_NATIVE_ENTRY(Integer_mulFromInteger, 2) {
   const Integer& right_int = Integer::CheckedHandle(arguments->At(0));
   GET_NATIVE_ARGUMENT(Integer, left_int, arguments->At(1));
   ASSERT(CheckInteger(right_int));
   ASSERT(CheckInteger(left_int));
   if (FLAG_trace_intrinsified_natives) {
     OS::Print("Integer_mulFromInteger %s * %s\n",
         left_int.ToCString(), right_int.ToCString());
   }
-  return Integer::BinaryOp(Token::kMUL, left_int, right_int);
+  return left_int.BinaryOp(Token::kMUL, right_int);
 }
 
 
 DEFINE_NATIVE_ENTRY(Integer_truncDivFromInteger, 2) {
   const Integer& right_int = Integer::CheckedHandle(arguments->At(0));
   GET_NATIVE_ARGUMENT(Integer, left_int, arguments->At(1));
   ASSERT(CheckInteger(right_int));
   ASSERT(CheckInteger(left_int));
   ASSERT(!right_int.IsZero());
-  return Integer::BinaryOp(Token::kTRUNCDIV, left_int, right_int);
+  return left_int.BinaryOp(Token::kTRUNCDIV, right_int);
 }
 
 
 DEFINE_NATIVE_ENTRY(Integer_moduloFromInteger, 2) {
   const Integer& right_int = Integer::CheckedHandle(arguments->At(0));
   GET_NATIVE_ARGUMENT(Integer, left_int, arguments->At(1));
   ASSERT(CheckInteger(right_int));
   ASSERT(CheckInteger(right_int));
   if (FLAG_trace_intrinsified_natives) {
     OS::Print("Integer_moduloFromInteger %s mod %s\n",
         left_int.ToCString(), right_int.ToCString());
   }
   if (right_int.IsZero()) {
     // Should have been caught before calling into runtime.
     UNIMPLEMENTED();
   }
-  return Integer::BinaryOp(Token::kMOD, left_int, right_int);
+  return left_int.BinaryOp(Token::kMOD, right_int);
 }
 
 
 DEFINE_NATIVE_ENTRY(Integer_greaterThanFromInteger, 2) {
   const Integer& right = Integer::CheckedHandle(arguments->At(0));
   GET_NATIVE_ARGUMENT(Integer, left, arguments->At(1));
   ASSERT(CheckInteger(right));
   ASSERT(CheckInteger(left));
   if (FLAG_trace_intrinsified_natives) {
     OS::Print("Integer_greaterThanFromInteger %s > %s\n",
@@ skipping 37 matching lines @@
   switch (kind) {
     case Token::kSHL: {
       if ((left_value == 0) || (right_value == 0)) {
         return left.raw();
       }
       { // Check for overflow.
         int cnt = HighestBit(left_value);
         if ((cnt + right_value) >= Smi::kBits) {
           if ((cnt + right_value) >= Mint::kBits) {
             return BigintOperations::ShiftLeft(
-                Bigint::Handle(Bigint::AsBigint(left)), right_value);
+                Bigint::Handle(left.AsBigint()), right_value);
           } else {
             int64_t left_64 = left_value;
             return Integer::New(left_64 << right_value);
           }
         }
       }
       result = left_value << right_value;
       break;
     }
     case Token::kSHR: {
@@ skipping 56 matching lines @@
 }
 
 
 DEFINE_NATIVE_ENTRY(Smi_shrFromInt, 2) {
   const Smi& amount = Smi::CheckedHandle(arguments->At(0));
   GET_NATIVE_ARGUMENT(Integer, value, arguments->At(1));
   ASSERT(CheckInteger(amount));
   ASSERT(CheckInteger(value));
   Integer& result = Integer::Handle(
       ShiftOperationHelper(Token::kSHR, value, amount));
-  return Integer::AsInteger(result);
+  return result.AsInteger();
 }
 
 
 
 DEFINE_NATIVE_ENTRY(Smi_shlFromInt, 2) {
   const Smi& amount = Smi::CheckedHandle(arguments->At(0));
   GET_NATIVE_ARGUMENT(Integer, value, arguments->At(1));
   ASSERT(CheckInteger(amount));
   ASSERT(CheckInteger(value));
   if (FLAG_trace_intrinsified_natives) {
     OS::Print("Smi_shlFromInt: %s << %s\n",
         value.ToCString(), amount.ToCString());
   }
   Integer& result = Integer::Handle(
       ShiftOperationHelper(Token::kSHL, value, amount));
-  return Integer::AsInteger(result);
+  return result.AsInteger();
 }
 
 
 DEFINE_NATIVE_ENTRY(Smi_bitNegate, 1) {
   const Smi& operand = Smi::CheckedHandle(arguments->At(0));
   if (FLAG_trace_intrinsified_natives) {
     OS::Print("Smi_bitNegate: %s\n", operand.ToCString());
   }
   intptr_t result = ~operand.Value();
   ASSERT(Smi::IsValid(result));
@@ skipping 12 matching lines @@
   return Integer::New(result);
 }
 
 // Bigint natives.
 
 DEFINE_NATIVE_ENTRY(Bigint_bitNegate, 1) {
   const Bigint& value = Bigint::CheckedHandle(arguments->At(0));
   const Bigint& result = Bigint::Handle(BigintOperations::BitNot(value));
   ASSERT(CheckInteger(value));
   ASSERT(CheckInteger(result));
-  return Integer::AsInteger(result);
+  return result.AsInteger();
 }
 
 }  // namespace dart