Add an interface for retrieving the value of unsigned 64-bit integers.

runtime/vm/dart_api_impl.cc

 // Copyright (c) 2011, 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 "include/dart_api.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart.h"
@@ skipping 936 matching lines @@
 DART_EXPORT bool Dart_IsInteger(Dart_Handle object) {
   DARTSCOPE(Isolate::Current());
   const Object& obj = Object::Handle(Api::UnwrapHandle(object));
   return obj.IsInteger();
 }
 
 
 DART_EXPORT Dart_Handle Dart_IntegerFitsIntoInt64(Dart_Handle integer,
                                                   bool* fits) {
   DARTSCOPE(Isolate::Current());
   const Object& obj = Object::Handle(Api::UnwrapHandle(integer));

[cshapiro, 2011/12/08 22:50:50]

Done here as well.

   if (obj.IsSmi() || obj.IsMint()) {
     *fits = true;
     return Api::Success();
   } else if (obj.IsBigint()) {
 #if defined(DEBUG)
     Bigint& bigint = Bigint::Handle();
     bigint ^= obj.raw();
     ASSERT(!BigintOperations::FitsIntoInt64(bigint));
 #endif
     *fits = false;
     return Api::Success();
   }
   return Api::Error("Object is not a Integer");
 }
 
 
+DART_EXPORT Dart_Handle Dart_IntegerFitsIntoUint64(Dart_Handle integer,
+                                                   bool* fits) {
+  DARTSCOPE(Isolate::Current());
+  const Object& obj = Object::Handle(Api::UnwrapHandle(integer));

[turnidge, 2011/12/08 18:26:25]

I've been doing things a new way.  Sorry I didn't notice this in earlier
reviews.  There is a new UnwrapBlahHandle that is helpful:

const Integer& obj = Integer::Handle(Api::UnwrapIntegerHandle(integer);
if (obj.isNull()) {
  RETURN_TYPE_ERROR(integer, Integer);
}

This will check for null and for non-integers and give a standard error message.

[cshapiro, 2011/12/08 22:50:50]

Done.

I will put together a separate change for Dart_BooleanValue and
Dart_DoubleValue.

+  if (obj.IsSmi() || obj.IsMint()) {
+    Integer& integer = Integer::Handle();
+    integer ^= obj.raw();
+    if (integer.IsNegative()) {
+      *fits = false;
+    } else {
+      *fits = true;
+    }
+    return Api::Success();
+  } else if (obj.IsBigint()) {
+    Bigint& bigint = Bigint::Handle();
+    bigint ^= obj.raw();
+    *fits = BigintOperations::FitsIntoUint64(bigint);
+    return Api::Success();
+  }
+  return Api::Error("Object is not a Integer");
+}
+
+
 DART_EXPORT Dart_Handle Dart_NewInteger(int64_t value) {
   DARTSCOPE(Isolate::Current());
   const Integer& obj = Integer::Handle(Integer::New(value));
   return Api::NewLocalHandle(obj);
 }
 
 
 DART_EXPORT Dart_Handle Dart_NewIntegerFromHexCString(const char* str) {
   DARTSCOPE(Isolate::Current());
   const String& str_obj = String::Handle(String::New(str));
   const Integer& obj = Integer::Handle(Integer::New(str_obj));
   return Api::NewLocalHandle(obj);
 }
 
 
-DART_EXPORT Dart_Handle Dart_IntegerValue(Dart_Handle integer, int64_t* value) {
+DART_EXPORT Dart_Handle Dart_IntegerToInt64(Dart_Handle integer,
+                                            int64_t* value) {
   DARTSCOPE(Isolate::Current());
   const Object& obj = Object::Handle(Api::UnwrapHandle(integer));

[turnidge, 2011/12/08 18:26:25]

Do you mind changing this to use UnwrapIntegerHandle?

[cshapiro, 2011/12/08 22:50:50]

Done.

   if (obj.IsSmi() || obj.IsMint()) {
     Integer& integer = Integer::Handle();
     integer ^= obj.raw();
     *value = integer.AsInt64Value();
     return Api::Success();
   }
   if (obj.IsBigint()) {
     Bigint& bigint = Bigint::Handle();
     bigint ^= obj.raw();
     if (BigintOperations::FitsIntoInt64(bigint)) {
       *value = BigintOperations::ToInt64(bigint);
       return Api::Success();
     } else {
       return Api::Error("Integer too big to fit in int64_t");

[turnidge, 2011/12/08 18:26:25]

Now that I have printf args to Api::Error, I am trying to put the function name
first.  Also, is "too big" the right message?  Maybe even something like this:

return Api::Error("%s: parameter 'integer' has value '%s' which does not fit
into the range of an int64_t.", CURRENT_FUNC, obj.ToCString());

I realize this is an existing problem...

[cshapiro, 2011/12/08 22:50:50]

Done.

     }
   }
   return Api::Error("Object is not a Integer");
 }
 
 
-DART_EXPORT Dart_Handle Dart_IntegerValueHexCString(Dart_Handle integer,
-                                                    const char** value) {
+DART_EXPORT Dart_Handle Dart_IntegerToUint64(Dart_Handle integer,
+                                             uint64_t* value) {
+  DARTSCOPE(Isolate::Current());
+  const Object& obj = Object::Handle(Api::UnwrapHandle(integer));

[turnidge, 2011/12/08 18:26:25]

UnwrapIntegerHandle here too?

[cshapiro, 2011/12/08 22:50:50]

Done.

+  if (obj.IsSmi() || obj.IsMint()) {
+    Integer& integer = Integer::Handle();
+    integer ^= obj.raw();
+    if (integer.IsNegative()) {
+      return Api::Error("Integer too small to fit in uint64_t");

[turnidge, 2011/12/08 18:26:25]

Fixup error message as suggested for IntegerToInt64 above.

[cshapiro, 2011/12/08 22:50:50]

Done.  I have created a single call to error with a descriptive message.

+    }
+    integer ^= obj.raw();
+    *value = integer.AsInt64Value();
+    return Api::Success();
+  }
+  if (obj.IsBigint()) {
+    Bigint& bigint = Bigint::Handle();
+    bigint ^= obj.raw();
+    if (BigintOperations::FitsIntoUint64(bigint)) {
+      *value = BigintOperations::ToUint64(bigint);
+      return Api::Success();
+    } else {
+      return Api::Error("Integer too big to fit in uint64_t");

[turnidge, 2011/12/08 18:26:25]

Fixup error message as above.

[cshapiro, 2011/12/08 22:50:50]

Done.

+    }
+  }
+  return Api::Error("Object is not a Integer");
+}
+
+
+DART_EXPORT Dart_Handle Dart_IntegerToHexCString(Dart_Handle integer,
+                                                 const char** value) {
   DARTSCOPE(Isolate::Current());
   const Object& obj = Object::Handle(Api::UnwrapHandle(integer));

[turnidge, 2011/12/08 18:26:25]

UnwrapIntegerHandle here too?

[cshapiro, 2011/12/08 22:50:50]

Done.

   Bigint& bigint = Bigint::Handle();
   if (obj.IsSmi() || obj.IsMint()) {
     Integer& integer = Integer::Handle();
     integer ^= obj.raw();
     bigint ^= BigintOperations::NewFromInt64(integer.AsInt64Value());
     *value = BigintOperations::ToHexCString(bigint, &Api::Allocate);
     return Api::Success();
   }
   if (obj.IsBigint()) {
     bigint ^= obj.raw();
@@ skipping 1448 matching lines @@
     }
     delete debug_region;
   } else {
     *buffer = NULL;
     *buffer_size = 0;
   }
 }
 
 
 }  // namespace dart