- Modify dart_api.h to be a proper C API.

runtime/vm/dart_api_impl.cc

 // Copyright (c) 2013, 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 "platform/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
@@ skipping 2344 matching lines @@
 
 
 // --- Typed Data ---
 
 
 // Helper method to get the type of a TypedData object.
 static Dart_TypedData_Type GetType(intptr_t class_id) {
   Dart_TypedData_Type type;
   switch (class_id) {
     case kByteDataViewCid :
-      type = kByteData;
+      type = Dart_TypedData_kByteData;
       break;
     case kTypedDataInt8ArrayCid :
     case kTypedDataInt8ArrayViewCid :
     case kExternalTypedDataInt8ArrayCid :
-      type = kInt8;
+      type = Dart_TypedData_kInt8;
       break;
     case kTypedDataUint8ArrayCid :
     case kTypedDataUint8ArrayViewCid :
     case kExternalTypedDataUint8ArrayCid :
-      type = kUint8;
+      type = Dart_TypedData_kUint8;
       break;
     case kTypedDataUint8ClampedArrayCid :
     case kTypedDataUint8ClampedArrayViewCid :
     case kExternalTypedDataUint8ClampedArrayCid :
-      type = kUint8Clamped;
+      type = Dart_TypedData_kUint8Clamped;
       break;
     case kTypedDataInt16ArrayCid :
     case kTypedDataInt16ArrayViewCid :
     case kExternalTypedDataInt16ArrayCid :
-      type = kInt16;
+      type = Dart_TypedData_kInt16;
       break;
     case kTypedDataUint16ArrayCid :
     case kTypedDataUint16ArrayViewCid :
     case kExternalTypedDataUint16ArrayCid :
-      type = kUint16;
+      type = Dart_TypedData_kUint16;
       break;
     case kTypedDataInt32ArrayCid :
     case kTypedDataInt32ArrayViewCid :
     case kExternalTypedDataInt32ArrayCid :
-      type = kInt32;
+      type = Dart_TypedData_kInt32;
       break;
     case kTypedDataUint32ArrayCid :
     case kTypedDataUint32ArrayViewCid :
     case kExternalTypedDataUint32ArrayCid :
-      type = kUint32;
+      type = Dart_TypedData_kUint32;
       break;
     case kTypedDataInt64ArrayCid :
     case kTypedDataInt64ArrayViewCid :
     case kExternalTypedDataInt64ArrayCid :
-      type = kInt64;
+      type = Dart_TypedData_kInt64;
       break;
     case kTypedDataUint64ArrayCid :
     case kTypedDataUint64ArrayViewCid :
     case kExternalTypedDataUint64ArrayCid :
-      type = kUint64;
+      type = Dart_TypedData_kUint64;
       break;
     case kTypedDataFloat32ArrayCid :
     case kTypedDataFloat32ArrayViewCid :
     case kExternalTypedDataFloat32ArrayCid :
-      type = kFloat32;
+      type = Dart_TypedData_kFloat32;
       break;
     case kTypedDataFloat64ArrayCid :
     case kTypedDataFloat64ArrayViewCid :
     case kExternalTypedDataFloat64ArrayCid :
-      type = kFloat64;
+      type = Dart_TypedData_kFloat64;
       break;
     case kTypedDataFloat32x4ArrayCid :
     case kTypedDataFloat32x4ArrayViewCid :
     case kExternalTypedDataFloat32x4ArrayCid :
-      type = kFloat32x4;
+      type = Dart_TypedData_kFloat32x4;
       break;
     default:
-      type = kInvalid;
+      type = Dart_TypedData_kInvalid;
       break;
   }
   return type;
 }
 
 
 DART_EXPORT Dart_TypedData_Type Dart_GetTypeOfTypedData(Dart_Handle object) {
   intptr_t class_id = Api::ClassId(object);
   if (RawObject::IsTypedDataClassId(class_id) ||
       RawObject::IsTypedDataViewClassId(class_id)) {
     return GetType(class_id);
   }
-  return kInvalid;
+  return Dart_TypedData_kInvalid;
 }
 
 
 DART_EXPORT Dart_TypedData_Type Dart_GetTypeOfExternalTypedData(
     Dart_Handle object) {
   intptr_t class_id = Api::ClassId(object);
   if (RawObject::IsExternalTypedDataClassId(class_id) ||
       RawObject::IsTypedDataViewClassId(class_id)) {
     return GetType(class_id);
   }
-  return kInvalid;
+  return Dart_TypedData_kInvalid;
 }
 
 
 static RawObject* GetByteDataConstructor(Isolate* isolate,
                                          const String& constructor_name,
                                          intptr_t num_args) {
   const Library& lib =
       Library::Handle(isolate->object_store()->typed_data_library());
   ASSERT(!lib.IsNull());
   const Class& cls =
@@ skipping 81 matching lines @@
   return Api::NewHandle(isolate, result.raw());
 }
 
 
 DART_EXPORT Dart_Handle Dart_NewTypedData(Dart_TypedData_Type type,
                                           intptr_t length) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   CHECK_CALLBACK_STATE(isolate);
   switch (type) {
-    case kByteData :
+    case Dart_TypedData_kByteData :
       return NewByteData(isolate, length);
-    case kInt8 :
+    case Dart_TypedData_kInt8 :
       return NewTypedData(isolate, kTypedDataInt8ArrayCid, length);
-    case kUint8 :
+    case Dart_TypedData_kUint8 :
       return NewTypedData(isolate, kTypedDataUint8ArrayCid, length);
-    case kUint8Clamped :
+    case Dart_TypedData_kUint8Clamped :
       return NewTypedData(isolate, kTypedDataUint8ClampedArrayCid, length);
-    case kInt16 :
+    case Dart_TypedData_kInt16 :
       return NewTypedData(isolate, kTypedDataInt16ArrayCid, length);
-    case kUint16 :
+    case Dart_TypedData_kUint16 :
       return NewTypedData(isolate, kTypedDataUint16ArrayCid, length);
-    case kInt32 :
+    case Dart_TypedData_kInt32 :
       return NewTypedData(isolate, kTypedDataInt32ArrayCid, length);
-    case kUint32 :
+    case Dart_TypedData_kUint32 :
       return NewTypedData(isolate, kTypedDataUint32ArrayCid, length);
-    case kInt64 :
+    case Dart_TypedData_kInt64 :
       return NewTypedData(isolate, kTypedDataInt64ArrayCid, length);
-    case kUint64 :
+    case Dart_TypedData_kUint64 :
       return NewTypedData(isolate, kTypedDataUint64ArrayCid, length);
-    case kFloat32 :
+    case Dart_TypedData_kFloat32 :
       return NewTypedData(isolate, kTypedDataFloat32ArrayCid,  length);
-    case kFloat64 :
+    case Dart_TypedData_kFloat64 :
       return NewTypedData(isolate, kTypedDataFloat64ArrayCid, length);
-    case kFloat32x4:
+    case Dart_TypedData_kFloat32x4:
       return NewTypedData(isolate, kTypedDataFloat32x4ArrayCid, length);
     default:
       return Api::NewError("%s expects argument 'type' to be of 'TypedData'",
                            CURRENT_FUNC);
   }
   UNREACHABLE();
   return Api::Null();
 }
 
 
 DART_EXPORT Dart_Handle Dart_NewExternalTypedData(
     Dart_TypedData_Type type,
     void* data,
     intptr_t length) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   if (data == NULL && length != 0) {
     RETURN_NULL_ERROR(data);
   }
   CHECK_CALLBACK_STATE(isolate);
   switch (type) {
-    case kByteData:
+    case Dart_TypedData_kByteData:
       return NewExternalByteData(isolate, data, length);
-    case kInt8:
+    case Dart_TypedData_kInt8:
       return NewExternalTypedData(isolate,
                                   kExternalTypedDataInt8ArrayCid,
                                   data,
                                   length);
-    case kUint8:
+    case Dart_TypedData_kUint8:
       return NewExternalTypedData(isolate,
                                   kExternalTypedDataUint8ArrayCid,
                                   data,
                                   length);
-    case kUint8Clamped:
+    case Dart_TypedData_kUint8Clamped:
       return NewExternalTypedData(isolate,
                                   kExternalTypedDataUint8ClampedArrayCid,
                                   data,
                                   length);
-    case kInt16:
+    case Dart_TypedData_kInt16:
       return NewExternalTypedData(isolate,
                                   kExternalTypedDataInt16ArrayCid,
                                   data,
                                   length);
-    case kUint16:
+    case Dart_TypedData_kUint16:
       return NewExternalTypedData(isolate,
                                   kExternalTypedDataUint16ArrayCid,
                                   data,
                                   length);
-    case kInt32:
+    case Dart_TypedData_kInt32:
       return NewExternalTypedData(isolate,
                                   kExternalTypedDataInt32ArrayCid,
                                   data,
                                   length);
-    case kUint32:
+    case Dart_TypedData_kUint32:
       return NewExternalTypedData(isolate,
                                   kExternalTypedDataUint32ArrayCid,
                                   data,
                                   length);
-    case kInt64:
+    case Dart_TypedData_kInt64:
       return NewExternalTypedData(isolate,
                                   kExternalTypedDataInt64ArrayCid,
                                   data,
                                   length);
-    case kUint64:
+    case Dart_TypedData_kUint64:
       return NewExternalTypedData(isolate,
                                   kExternalTypedDataUint64ArrayCid,
                                   data,
                                   length);
-    case kFloat32:
+    case Dart_TypedData_kFloat32:
       return NewExternalTypedData(isolate,
                                   kExternalTypedDataFloat32ArrayCid,
                                   data,
                                   length);
-    case kFloat64:
+    case Dart_TypedData_kFloat64:
       return NewExternalTypedData(isolate,
                                   kExternalTypedDataFloat64ArrayCid,
                                   data,
                                   length);
-    case kFloat32x4:
+    case Dart_TypedData_kFloat32x4:
       return NewExternalTypedData(isolate,
                                   kExternalTypedDataFloat32x4ArrayCid,
                                   data,
                                   length);
     default:
       return Api::NewError("%s expects argument 'type' to be of"
                            " 'external TypedData'", CURRENT_FUNC);
   }
   UNREACHABLE();
   return Api::Null();
@@ skipping 2169 matching lines @@
   }
   {
     NoGCScope no_gc;
     RawObject* raw_obj = obj.raw();
     isolate->heap()->SetPeer(raw_obj, peer);
   }
   return Api::Success();
 }
 
 }  // namespace dart