runtime/vm/snapshot_test.cc - Issue 15689013: - Modify dart_api.h to be a proper C API.

Unified Diff: runtime/vm/snapshot_test.cc

Issue 15689013: - Modify dart_api.h to be a proper C API. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/

Patch Set: Created 7 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: runtime/vm/snapshot_test.cc

===================================================================

--- runtime/vm/snapshot_test.cc (revision 23447)

+++ runtime/vm/snapshot_test.cc (working copy)

@@ -65,33 +65,33 @@

// whether the graphs are equal or not.

static void CompareDartCObjects(Dart_CObject* first, Dart_CObject* second) {

// Return immediately if entering a cycle.

- if (second->type == Dart_CObject::kNumberOfTypes) return;

+ if (second->type == Dart_CObject_kNumberOfTypes) return;

EXPECT_NE(first, second);

EXPECT_EQ(first->type, second->type);

switch (first->type) {

- case Dart_CObject::kNull:

+ case Dart_CObject_kNull:

// Nothing more to compare.

break;

- case Dart_CObject::kBool:

+ case Dart_CObject_kBool:

EXPECT_EQ(first->value.as_bool, second->value.as_bool);

break;

- case Dart_CObject::kInt32:

+ case Dart_CObject_kInt32:

EXPECT_EQ(first->value.as_int32, second->value.as_int32);

break;

- case Dart_CObject::kInt64:

+ case Dart_CObject_kInt64:

EXPECT_EQ(first->value.as_int64, second->value.as_int64);

break;

- case Dart_CObject::kBigint:

+ case Dart_CObject_kBigint:

EXPECT_STREQ(first->value.as_bigint, second->value.as_bigint);

break;

- case Dart_CObject::kDouble:

+ case Dart_CObject_kDouble:

EXPECT_EQ(first->value.as_double, second->value.as_double);

break;

- case Dart_CObject::kString:

+ case Dart_CObject_kString:

EXPECT_STREQ(first->value.as_string, second->value.as_string);

break;

- case Dart_CObject::kTypedData:

+ case Dart_CObject_kTypedData:

EXPECT_EQ(first->value.as_typed_data.length,

second->value.as_typed_data.length);

for (int i = 0; i < first->value.as_typed_data.length; i++) {

@@ -99,10 +99,10 @@

second->value.as_typed_data.values[i]);

}

break;

- case Dart_CObject::kArray:

+ case Dart_CObject_kArray:

// Use invalid type as a visited marker to avoid infinite

// recursion on graphs with cycles.

- second->type = Dart_CObject::kNumberOfTypes;

+ second->type = Dart_CObject_kNumberOfTypes;

EXPECT_EQ(first->value.as_array.length, second->value.as_array.length);

for (int i = 0; i < first->value.as_array.length; i++) {

CompareDartCObjects(first->value.as_array.values[i],

@@ -149,7 +149,7 @@

ApiMessageReader api_reader(buffer, buffer_len, &zone_allocator);

Dart_CObject* root = api_reader.ReadMessage();

EXPECT_NOTNULL(root);

- EXPECT_EQ(Dart_CObject::kNull, root->type);

+ EXPECT_EQ(Dart_CObject_kNull, root->type);

CheckEncodeDecodeMessage(root);

}

@@ -175,7 +175,7 @@

ApiMessageReader api_reader(buffer, buffer_len, &zone_allocator);

Dart_CObject* root = api_reader.ReadMessage();

EXPECT_NOTNULL(root);

- EXPECT_EQ(Dart_CObject::kInt32, root->type);

+ EXPECT_EQ(Dart_CObject_kInt32, root->type);

EXPECT_EQ(smi.Value(), root->value.as_int32);

CheckEncodeDecodeMessage(root);

}

@@ -202,7 +202,7 @@

ApiMessageReader api_reader(buffer, buffer_len, &zone_allocator);

Dart_CObject* root = api_reader.ReadMessage();

EXPECT_NOTNULL(root);

- EXPECT_EQ(Dart_CObject::kInt32, root->type);

+ EXPECT_EQ(Dart_CObject_kInt32, root->type);

EXPECT_EQ(smi.Value(), root->value.as_int32);

CheckEncodeDecodeMessage(root);

}

@@ -242,14 +242,14 @@

// range covers most of the 32-bit range and values outside that

// range are also represented as mints.

#if defined(ARCH_IS_64_BIT)

- EXPECT_EQ(Dart_CObject::kInt64, mint_cobject->type);

+ EXPECT_EQ(Dart_CObject_kInt64, mint_cobject->type);

EXPECT_EQ(value, mint_cobject->value.as_int64);

#else

if (kMinInt32 < value && value < kMaxInt32) {

- EXPECT_EQ(Dart_CObject::kInt32, mint_cobject->type);

+ EXPECT_EQ(Dart_CObject_kInt32, mint_cobject->type);

EXPECT_EQ(value, mint_cobject->value.as_int32);

} else {

- EXPECT_EQ(Dart_CObject::kInt64, mint_cobject->type);

+ EXPECT_EQ(Dart_CObject_kInt64, mint_cobject->type);

EXPECT_EQ(value, mint_cobject->value.as_int64);

}

#endif

@@ -297,7 +297,7 @@

ApiMessageReader api_reader(buffer, buffer_len, &zone_allocator);

Dart_CObject* root = api_reader.ReadMessage();

EXPECT_NOTNULL(root);

- EXPECT_EQ(Dart_CObject::kDouble, root->type);

+ EXPECT_EQ(Dart_CObject_kDouble, root->type);

EXPECT_EQ(dbl.value(), root->value.as_double);

CheckEncodeDecodeMessage(root);

}

@@ -326,7 +326,7 @@

ApiMessageReader api_reader(buffer, buffer_len, &zone_allocator);

Dart_CObject* root = api_reader.ReadMessage();

EXPECT_NOTNULL(root);

- EXPECT_EQ(Dart_CObject::kBool, root->type);

+ EXPECT_EQ(Dart_CObject_kBool, root->type);

EXPECT_EQ(true, root->value.as_bool);

CheckEncodeDecodeMessage(root);

}

@@ -353,7 +353,7 @@

ApiMessageReader api_reader(buffer, buffer_len, &zone_allocator);

Dart_CObject* root = api_reader.ReadMessage();

EXPECT_NOTNULL(root);

- EXPECT_EQ(Dart_CObject::kBool, root->type);

+ EXPECT_EQ(Dart_CObject_kBool, root->type);

EXPECT_EQ(false, root->value.as_bool);

CheckEncodeDecodeMessage(root);

}

@@ -392,7 +392,7 @@

Dart_CObject* root = api_reader.ReadMessage();

// Bigint not supported.

EXPECT_NOTNULL(root);

- EXPECT_EQ(Dart_CObject::kBigint, root->type);

+ EXPECT_EQ(Dart_CObject_kBigint, root->type);

EXPECT_STREQ("270FFFFFFFFFFFFFD8F0", root->value.as_bigint);

CheckEncodeDecodeMessage(root);

}

@@ -434,7 +434,7 @@

Bigint& bigint = Bigint::Handle();

bigint ^= BigintOperations::NewFromCString(bigint_value);

Dart_CObject* bigint_cobject = SerializeAndDeserializeBigint(bigint);

- EXPECT_EQ(Dart_CObject::kBigint, bigint_cobject->type);

+ EXPECT_EQ(Dart_CObject_kBigint, bigint_cobject->type);

if (bigint_value[0] == '0') {

EXPECT_STREQ(bigint_value + 2, bigint_cobject->value.as_bigint);

} else {

@@ -520,7 +520,7 @@

ApiNativeScope scope;

ApiMessageReader api_reader(buffer, buffer_len, &zone_allocator);

Dart_CObject* root = api_reader.ReadMessage();

- EXPECT_EQ(Dart_CObject::kString, root->type);

+ EXPECT_EQ(Dart_CObject_kString, root->type);

EXPECT_STREQ(cstr, root->value.as_string);

CheckEncodeDecodeMessage(root);

}

@@ -568,11 +568,11 @@

ApiNativeScope scope;

ApiMessageReader api_reader(buffer, buffer_len, &zone_allocator);

Dart_CObject* root = api_reader.ReadMessage();

- EXPECT_EQ(Dart_CObject::kArray, root->type);

+ EXPECT_EQ(Dart_CObject_kArray, root->type);

EXPECT_EQ(kArrayLength, root->value.as_array.length);

for (int i = 0; i < kArrayLength; i++) {

Dart_CObject* element = root->value.as_array.values[i];

- EXPECT_EQ(Dart_CObject::kInt32, element->type);

+ EXPECT_EQ(Dart_CObject_kInt32, element->type);

EXPECT_EQ(i, element->value.as_int32);

}

CheckEncodeDecodeMessage(root);

@@ -601,7 +601,7 @@

ApiNativeScope scope;

ApiMessageReader api_reader(buffer, buffer_len, &zone_allocator);

Dart_CObject* root = api_reader.ReadMessage();

- EXPECT_EQ(Dart_CObject::kArray, root->type);

+ EXPECT_EQ(Dart_CObject_kArray, root->type);

EXPECT_EQ(kArrayLength, root->value.as_array.length);

EXPECT(root->value.as_array.values == NULL);

CheckEncodeDecodeMessage(root);

@@ -634,7 +634,7 @@

ApiNativeScope scope;

ApiMessageReader api_reader(buffer, buffer_len, &zone_allocator);

Dart_CObject* root = api_reader.ReadMessage();

- EXPECT_EQ(Dart_CObject::kTypedData, root->type);

+ EXPECT_EQ(Dart_CObject_kTypedData, root->type);

EXPECT_EQ(kTypedDataLength, root->value.as_typed_data.length);

for (int i = 0; i < kTypedDataLength; i++) {

EXPECT(root->value.as_typed_data.values[i] == i);

@@ -743,8 +743,8 @@

ApiNativeScope scope;

ApiMessageReader api_reader(buffer, buffer_len, &zone_allocator);

Dart_CObject* root = api_reader.ReadMessage();

- EXPECT_EQ(Dart_CObject::kTypedData, root->type);

- EXPECT_EQ(Dart_CObject::kUint8Array, root->value.as_typed_data.type);

+ EXPECT_EQ(Dart_CObject_kTypedData, root->type);

+ EXPECT_EQ(Dart_TypedData_kUint8, root->value.as_typed_data.type);

EXPECT_EQ(kTypedDataLength, root->value.as_typed_data.length);

EXPECT(root->value.as_typed_data.values == NULL);

CheckEncodeDecodeMessage(root);

@@ -1239,11 +1239,11 @@

ApiNativeScope scope;

ApiMessageReader api_reader(buffer, writer.BytesWritten(), &zone_allocator);

Dart_CObject* root = api_reader.ReadMessage();

- EXPECT_EQ(Dart_CObject::kArray, root->type);

+ EXPECT_EQ(Dart_CObject_kArray, root->type);

EXPECT_EQ(kArrayLength, root->value.as_array.length);

for (int i = 0; i < kArrayLength; i++) {

Dart_CObject* element = root->value.as_array.values[i];

- EXPECT_EQ(Dart_CObject::kInt32, element->type);

+ EXPECT_EQ(Dart_CObject_kInt32, element->type);

EXPECT_EQ(i + 1, element->value.as_int32);

}

CheckEncodeDecodeMessage(root);

@@ -1285,7 +1285,7 @@

ApiMessageReader api_reader(buffer, buffer_len, &zone_allocator);

Dart_CObject* root = api_reader.ReadMessage();

EXPECT_NOTNULL(root);

- EXPECT_EQ(Dart_CObject::kString, root->type);

+ EXPECT_EQ(Dart_CObject_kString, root->type);

EXPECT_STREQ(expected, root->value.as_string);

CheckEncodeDecodeMessage(root);

}

@@ -1305,7 +1305,7 @@

ApiMessageReader api_reader(buffer, buffer_len, &zone_allocator);

Dart_CObject* root = api_reader.ReadMessage();

EXPECT_NOTNULL(root);

- EXPECT_EQ(Dart_CObject::kUnsupported, root->type);

+ EXPECT_EQ(Dart_CObject_kUnsupported, root->type);

}

@@ -1415,7 +1415,7 @@

ApiMessageReader api_reader(buffer, buffer_len, &zone_allocator);

Dart_CObject* root = api_reader.ReadMessage();

EXPECT_NOTNULL(root);

- EXPECT_EQ(Dart_CObject::kInt32, root->type);

+ EXPECT_EQ(Dart_CObject_kInt32, root->type);

EXPECT_EQ(42, root->value.as_int32);

CheckEncodeDecodeMessage(root);

}

@@ -1433,7 +1433,7 @@

ApiMessageReader api_reader(buffer, buffer_len, &zone_allocator);

Dart_CObject* root = api_reader.ReadMessage();

EXPECT_NOTNULL(root);

- EXPECT_EQ(Dart_CObject::kBigint, root->type);

+ EXPECT_EQ(Dart_CObject_kBigint, root->type);

EXPECT_STREQ("-424242424242424242424242424242424242",

root->value.as_bigint);

CheckEncodeDecodeMessage(root);

@@ -1496,10 +1496,10 @@

ApiNativeScope scope;

Dart_CObject* root = GetDeserializedDartMessage(lib, "getList");

EXPECT_NOTNULL(root);

- EXPECT_EQ(Dart_CObject::kArray, root->type);

+ EXPECT_EQ(Dart_CObject_kArray, root->type);

EXPECT_EQ(kArrayLength, root->value.as_array.length);

for (int i = 0; i < kArrayLength; i++) {

- EXPECT_EQ(Dart_CObject::kNull, root->value.as_array.values[i]->type);

+ EXPECT_EQ(Dart_CObject_kNull, root->value.as_array.values[i]->type);

}

CheckEncodeDecodeMessage(root);

}

@@ -1508,10 +1508,10 @@

ApiNativeScope scope;

Dart_CObject* root = GetDeserializedDartMessage(lib, "getIntList");

EXPECT_NOTNULL(root);

- EXPECT_EQ(Dart_CObject::kArray, root->type);

+ EXPECT_EQ(Dart_CObject_kArray, root->type);

EXPECT_EQ(kArrayLength, root->value.as_array.length);

for (int i = 0; i < kArrayLength; i++) {

- EXPECT_EQ(Dart_CObject::kInt32, root->value.as_array.values[i]->type);

+ EXPECT_EQ(Dart_CObject_kInt32, root->value.as_array.values[i]->type);

EXPECT_EQ(i, root->value.as_array.values[i]->value.as_int32);

}

CheckEncodeDecodeMessage(root);

@@ -1521,10 +1521,10 @@

ApiNativeScope scope;

Dart_CObject* root = GetDeserializedDartMessage(lib, "getStringList");

EXPECT_NOTNULL(root);

- EXPECT_EQ(Dart_CObject::kArray, root->type);

+ EXPECT_EQ(Dart_CObject_kArray, root->type);

EXPECT_EQ(kArrayLength, root->value.as_array.length);

for (int i = 0; i < kArrayLength; i++) {

- EXPECT_EQ(Dart_CObject::kString, root->value.as_array.values[i]->type);

+ EXPECT_EQ(Dart_CObject_kString, root->value.as_array.values[i]->type);

char buffer[3];

snprintf(buffer, sizeof(buffer), "%d", i);

EXPECT_STREQ(buffer, root->value.as_array.values[i]->value.as_string);

@@ -1535,21 +1535,21 @@

ApiNativeScope scope;

Dart_CObject* root = GetDeserializedDartMessage(lib, "getMixedList");

EXPECT_NOTNULL(root);

- EXPECT_EQ(Dart_CObject::kArray, root->type);

+ EXPECT_EQ(Dart_CObject_kArray, root->type);

EXPECT_EQ(kArrayLength, root->value.as_array.length);

- EXPECT_EQ(Dart_CObject::kInt32, root->value.as_array.values[0]->type);

+ EXPECT_EQ(Dart_CObject_kInt32, root->value.as_array.values[0]->type);

EXPECT_EQ(0, root->value.as_array.values[0]->value.as_int32);

- EXPECT_EQ(Dart_CObject::kString, root->value.as_array.values[1]->type);

+ EXPECT_EQ(Dart_CObject_kString, root->value.as_array.values[1]->type);

EXPECT_STREQ("1", root->value.as_array.values[1]->value.as_string);

- EXPECT_EQ(Dart_CObject::kDouble, root->value.as_array.values[2]->type);

+ EXPECT_EQ(Dart_CObject_kDouble, root->value.as_array.values[2]->type);

EXPECT_EQ(2.2, root->value.as_array.values[2]->value.as_double);

- EXPECT_EQ(Dart_CObject::kBool, root->value.as_array.values[3]->type);

+ EXPECT_EQ(Dart_CObject_kBool, root->value.as_array.values[3]->type);

EXPECT_EQ(true, root->value.as_array.values[3]->value.as_bool);

for (int i = 0; i < kArrayLength; i++) {

if (i > 3) {

- EXPECT_EQ(Dart_CObject::kNull, root->value.as_array.values[i]->type);

+ EXPECT_EQ(Dart_CObject_kNull, root->value.as_array.values[i]->type);

}

@@ -1614,10 +1614,10 @@

ApiNativeScope scope;

Dart_CObject* root = GetDeserializedDartMessage(lib, "getList");

EXPECT_NOTNULL(root);

- EXPECT_EQ(Dart_CObject::kArray, root->type);

+ EXPECT_EQ(Dart_CObject_kArray, root->type);

EXPECT_EQ(kArrayLength, root->value.as_array.length);

for (int i = 0; i < kArrayLength; i++) {

- EXPECT_EQ(Dart_CObject::kNull, root->value.as_array.values[i]->type);

+ EXPECT_EQ(Dart_CObject_kNull, root->value.as_array.values[i]->type);

}

CheckEncodeDecodeMessage(root);

}

@@ -1626,10 +1626,10 @@

ApiNativeScope scope;

Dart_CObject* root = GetDeserializedDartMessage(lib, "getIntList");

EXPECT_NOTNULL(root);

- EXPECT_EQ(Dart_CObject::kArray, root->type);

+ EXPECT_EQ(Dart_CObject_kArray, root->type);

EXPECT_EQ(kArrayLength, root->value.as_array.length);

for (int i = 0; i < kArrayLength; i++) {

- EXPECT_EQ(Dart_CObject::kInt32, root->value.as_array.values[i]->type);

+ EXPECT_EQ(Dart_CObject_kInt32, root->value.as_array.values[i]->type);

EXPECT_EQ(i, root->value.as_array.values[i]->value.as_int32);

}

CheckEncodeDecodeMessage(root);

@@ -1639,10 +1639,10 @@

ApiNativeScope scope;

Dart_CObject* root = GetDeserializedDartMessage(lib, "getStringList");

EXPECT_NOTNULL(root);

- EXPECT_EQ(Dart_CObject::kArray, root->type);

+ EXPECT_EQ(Dart_CObject_kArray, root->type);

EXPECT_EQ(kArrayLength, root->value.as_array.length);

for (int i = 0; i < kArrayLength; i++) {

- EXPECT_EQ(Dart_CObject::kString, root->value.as_array.values[i]->type);

+ EXPECT_EQ(Dart_CObject_kString, root->value.as_array.values[i]->type);

char buffer[3];

snprintf(buffer, sizeof(buffer), "%d", i);

EXPECT_STREQ(buffer, root->value.as_array.values[i]->value.as_string);

@@ -1653,14 +1653,14 @@

ApiNativeScope scope;

Dart_CObject* root = GetDeserializedDartMessage(lib, "getListList");

EXPECT_NOTNULL(root);

- EXPECT_EQ(Dart_CObject::kArray, root->type);

+ EXPECT_EQ(Dart_CObject_kArray, root->type);

EXPECT_EQ(kArrayLength, root->value.as_array.length);

for (int i = 0; i < kArrayLength; i++) {

Dart_CObject* element = root->value.as_array.values[i];

- EXPECT_EQ(Dart_CObject::kArray, element->type);

+ EXPECT_EQ(Dart_CObject_kArray, element->type);

EXPECT_EQ(i, element->value.as_array.length);

for (int j = 0; j < i; j++) {

- EXPECT_EQ(Dart_CObject::kInt32,

+ EXPECT_EQ(Dart_CObject_kInt32,

element->value.as_array.values[j]->type);

EXPECT_EQ(j, element->value.as_array.values[j]->value.as_int32);

}

@@ -1671,21 +1671,21 @@