{
visit_free(data->ov);
data->ov = NULL;
- qobject_decref(data->obj);
+ qobject_unref(data->obj);
data->obj = NULL;
}
g_assert(qnum);
g_assert(qnum_get_try_int(qnum, &val));
g_assert_cmpint(val, ==, -42);
- qobject_decref(qobj);
+ qobject_unref(qobj);
visitor_reset(data);
qdict = qdict_new();
qdict_put_str(qdict, "string", "foo");
qobj = QOBJECT(qdict);
visit_type_any(data->ov, NULL, &qobj, &error_abort);
- qobject_decref(qobj);
+ qobject_unref(qobj);
qdict = qobject_to(QDict, visitor_get(data));
g_assert(qdict);
qnum = qobject_to(QNum, qdict_get(qdict, "integer"));
g_assert(qobject_type(nil) == QTYPE_QNULL);
}
-static void init_native_list(UserDefNativeListUnion *cvalue)
+static void init_list_union(UserDefListUnion *cvalue)
{
int i;
switch (cvalue->type) {
- case USER_DEF_NATIVE_LIST_UNION_KIND_INTEGER: {
+ case USER_DEF_LIST_UNION_KIND_INTEGER: {
intList **list = &cvalue->u.integer.data;
for (i = 0; i < 32; i++) {
*list = g_new0(intList, 1);
}
break;
}
- case USER_DEF_NATIVE_LIST_UNION_KIND_S8: {
+ case USER_DEF_LIST_UNION_KIND_S8: {
int8List **list = &cvalue->u.s8.data;
for (i = 0; i < 32; i++) {
*list = g_new0(int8List, 1);
}
break;
}
- case USER_DEF_NATIVE_LIST_UNION_KIND_S16: {
+ case USER_DEF_LIST_UNION_KIND_S16: {
int16List **list = &cvalue->u.s16.data;
for (i = 0; i < 32; i++) {
*list = g_new0(int16List, 1);
}
break;
}
- case USER_DEF_NATIVE_LIST_UNION_KIND_S32: {
+ case USER_DEF_LIST_UNION_KIND_S32: {
int32List **list = &cvalue->u.s32.data;
for (i = 0; i < 32; i++) {
*list = g_new0(int32List, 1);
}
break;
}
- case USER_DEF_NATIVE_LIST_UNION_KIND_S64: {
+ case USER_DEF_LIST_UNION_KIND_S64: {
int64List **list = &cvalue->u.s64.data;
for (i = 0; i < 32; i++) {
*list = g_new0(int64List, 1);
}
break;
}
- case USER_DEF_NATIVE_LIST_UNION_KIND_U8: {
+ case USER_DEF_LIST_UNION_KIND_U8: {
uint8List **list = &cvalue->u.u8.data;
for (i = 0; i < 32; i++) {
*list = g_new0(uint8List, 1);
}
break;
}
- case USER_DEF_NATIVE_LIST_UNION_KIND_U16: {
+ case USER_DEF_LIST_UNION_KIND_U16: {
uint16List **list = &cvalue->u.u16.data;
for (i = 0; i < 32; i++) {
*list = g_new0(uint16List, 1);
}
break;
}
- case USER_DEF_NATIVE_LIST_UNION_KIND_U32: {
+ case USER_DEF_LIST_UNION_KIND_U32: {
uint32List **list = &cvalue->u.u32.data;
for (i = 0; i < 32; i++) {
*list = g_new0(uint32List, 1);
}
break;
}
- case USER_DEF_NATIVE_LIST_UNION_KIND_U64: {
+ case USER_DEF_LIST_UNION_KIND_U64: {
uint64List **list = &cvalue->u.u64.data;
for (i = 0; i < 32; i++) {
*list = g_new0(uint64List, 1);
}
break;
}
- case USER_DEF_NATIVE_LIST_UNION_KIND_BOOLEAN: {
+ case USER_DEF_LIST_UNION_KIND_BOOLEAN: {
boolList **list = &cvalue->u.boolean.data;
for (i = 0; i < 32; i++) {
*list = g_new0(boolList, 1);
}
break;
}
- case USER_DEF_NATIVE_LIST_UNION_KIND_STRING: {
+ case USER_DEF_LIST_UNION_KIND_STRING: {
strList **list = &cvalue->u.string.data;
for (i = 0; i < 32; i++) {
*list = g_new0(strList, 1);
}
break;
}
- case USER_DEF_NATIVE_LIST_UNION_KIND_NUMBER: {
+ case USER_DEF_LIST_UNION_KIND_NUMBER: {
numberList **list = &cvalue->u.number.data;
for (i = 0; i < 32; i++) {
*list = g_new0(numberList, 1);
}
}
-static void check_native_list(QObject *qobj,
- UserDefNativeListUnionKind kind)
+static void check_list_union(QObject *qobj,
+ UserDefListUnionKind kind)
{
QDict *qdict;
QList *qlist;
qlist = qlist_copy(qobject_to(QList, qdict_get(qdict, "data")));
switch (kind) {
- case USER_DEF_NATIVE_LIST_UNION_KIND_U8:
- case USER_DEF_NATIVE_LIST_UNION_KIND_U16:
- case USER_DEF_NATIVE_LIST_UNION_KIND_U32:
- case USER_DEF_NATIVE_LIST_UNION_KIND_U64:
+ case USER_DEF_LIST_UNION_KIND_U8:
+ case USER_DEF_LIST_UNION_KIND_U16:
+ case USER_DEF_LIST_UNION_KIND_U32:
+ case USER_DEF_LIST_UNION_KIND_U64:
for (i = 0; i < 32; i++) {
QObject *tmp;
QNum *qvalue;
qvalue = qobject_to(QNum, tmp);
g_assert(qnum_get_try_uint(qvalue, &val));
g_assert_cmpint(val, ==, i);
- qobject_decref(qlist_pop(qlist));
+ qobject_unref(qlist_pop(qlist));
}
break;
- case USER_DEF_NATIVE_LIST_UNION_KIND_S8:
- case USER_DEF_NATIVE_LIST_UNION_KIND_S16:
- case USER_DEF_NATIVE_LIST_UNION_KIND_S32:
- case USER_DEF_NATIVE_LIST_UNION_KIND_S64:
+ case USER_DEF_LIST_UNION_KIND_S8:
+ case USER_DEF_LIST_UNION_KIND_S16:
+ case USER_DEF_LIST_UNION_KIND_S32:
+ case USER_DEF_LIST_UNION_KIND_S64:
/*
* All integer elements in JSON arrays get stored into QNums
* when we convert to QObjects, so we can check them all in
* the same fashion, so simply fall through here.
*/
- case USER_DEF_NATIVE_LIST_UNION_KIND_INTEGER:
+ case USER_DEF_LIST_UNION_KIND_INTEGER:
for (i = 0; i < 32; i++) {
QObject *tmp;
QNum *qvalue;
qvalue = qobject_to(QNum, tmp);
g_assert(qnum_get_try_int(qvalue, &val));
g_assert_cmpint(val, ==, i);
- qobject_decref(qlist_pop(qlist));
+ qobject_unref(qlist_pop(qlist));
}
break;
- case USER_DEF_NATIVE_LIST_UNION_KIND_BOOLEAN:
+ case USER_DEF_LIST_UNION_KIND_BOOLEAN:
for (i = 0; i < 32; i++) {
QObject *tmp;
QBool *qvalue;
g_assert(tmp);
qvalue = qobject_to(QBool, tmp);
g_assert_cmpint(qbool_get_bool(qvalue), ==, i % 3 == 0);
- qobject_decref(qlist_pop(qlist));
+ qobject_unref(qlist_pop(qlist));
}
break;
- case USER_DEF_NATIVE_LIST_UNION_KIND_STRING:
+ case USER_DEF_LIST_UNION_KIND_STRING:
for (i = 0; i < 32; i++) {
QObject *tmp;
QString *qvalue;
qvalue = qobject_to(QString, tmp);
sprintf(str, "%d", i);
g_assert_cmpstr(qstring_get_str(qvalue), ==, str);
- qobject_decref(qlist_pop(qlist));
+ qobject_unref(qlist_pop(qlist));
}
break;
- case USER_DEF_NATIVE_LIST_UNION_KIND_NUMBER:
+ case USER_DEF_LIST_UNION_KIND_NUMBER:
for (i = 0; i < 32; i++) {
QObject *tmp;
QNum *qvalue;
g_string_printf(double_actual, "%.6f", qnum_get_double(qvalue));
g_assert_cmpstr(double_actual->str, ==, double_expected->str);
- qobject_decref(qlist_pop(qlist));
+ qobject_unref(qlist_pop(qlist));
g_string_free(double_expected, true);
g_string_free(double_actual, true);
}
default:
g_assert_not_reached();
}
- QDECREF(qlist);
+ qobject_unref(qlist);
}
-static void test_native_list(TestOutputVisitorData *data,
- const void *unused,
- UserDefNativeListUnionKind kind)
+static void test_list_union(TestOutputVisitorData *data,
+ const void *unused,
+ UserDefListUnionKind kind)
{
- UserDefNativeListUnion *cvalue = g_new0(UserDefNativeListUnion, 1);
+ UserDefListUnion *cvalue = g_new0(UserDefListUnion, 1);
QObject *obj;
cvalue->type = kind;
- init_native_list(cvalue);
+ init_list_union(cvalue);
- visit_type_UserDefNativeListUnion(data->ov, NULL, &cvalue, &error_abort);
+ visit_type_UserDefListUnion(data->ov, NULL, &cvalue, &error_abort);
obj = visitor_get(data);
- check_native_list(obj, cvalue->type);
- qapi_free_UserDefNativeListUnion(cvalue);
+ check_list_union(obj, cvalue->type);
+ qapi_free_UserDefListUnion(cvalue);
}
-static void test_visitor_out_native_list_int(TestOutputVisitorData *data,
- const void *unused)
+static void test_visitor_out_list_union_int(TestOutputVisitorData *data,
+ const void *unused)
{
- test_native_list(data, unused, USER_DEF_NATIVE_LIST_UNION_KIND_INTEGER);
+ test_list_union(data, unused, USER_DEF_LIST_UNION_KIND_INTEGER);
}
-static void test_visitor_out_native_list_int8(TestOutputVisitorData *data,
- const void *unused)
+static void test_visitor_out_list_union_int8(TestOutputVisitorData *data,
+ const void *unused)
{
- test_native_list(data, unused, USER_DEF_NATIVE_LIST_UNION_KIND_S8);
+ test_list_union(data, unused, USER_DEF_LIST_UNION_KIND_S8);
}
-static void test_visitor_out_native_list_int16(TestOutputVisitorData *data,
- const void *unused)
+static void test_visitor_out_list_union_int16(TestOutputVisitorData *data,
+ const void *unused)
{
- test_native_list(data, unused, USER_DEF_NATIVE_LIST_UNION_KIND_S16);
+ test_list_union(data, unused, USER_DEF_LIST_UNION_KIND_S16);
}
-static void test_visitor_out_native_list_int32(TestOutputVisitorData *data,
- const void *unused)
+static void test_visitor_out_list_union_int32(TestOutputVisitorData *data,
+ const void *unused)
{
- test_native_list(data, unused, USER_DEF_NATIVE_LIST_UNION_KIND_S32);
+ test_list_union(data, unused, USER_DEF_LIST_UNION_KIND_S32);
}
-static void test_visitor_out_native_list_int64(TestOutputVisitorData *data,
- const void *unused)
+static void test_visitor_out_list_union_int64(TestOutputVisitorData *data,
+ const void *unused)
{
- test_native_list(data, unused, USER_DEF_NATIVE_LIST_UNION_KIND_S64);
+ test_list_union(data, unused, USER_DEF_LIST_UNION_KIND_S64);
}
-static void test_visitor_out_native_list_uint8(TestOutputVisitorData *data,
- const void *unused)
+static void test_visitor_out_list_union_uint8(TestOutputVisitorData *data,
+ const void *unused)
{
- test_native_list(data, unused, USER_DEF_NATIVE_LIST_UNION_KIND_U8);
+ test_list_union(data, unused, USER_DEF_LIST_UNION_KIND_U8);
}
-static void test_visitor_out_native_list_uint16(TestOutputVisitorData *data,
- const void *unused)
+static void test_visitor_out_list_union_uint16(TestOutputVisitorData *data,
+ const void *unused)
{
- test_native_list(data, unused, USER_DEF_NATIVE_LIST_UNION_KIND_U16);
+ test_list_union(data, unused, USER_DEF_LIST_UNION_KIND_U16);
}
-static void test_visitor_out_native_list_uint32(TestOutputVisitorData *data,
- const void *unused)
+static void test_visitor_out_list_union_uint32(TestOutputVisitorData *data,
+ const void *unused)
{
- test_native_list(data, unused, USER_DEF_NATIVE_LIST_UNION_KIND_U32);
+ test_list_union(data, unused, USER_DEF_LIST_UNION_KIND_U32);
}
-static void test_visitor_out_native_list_uint64(TestOutputVisitorData *data,
- const void *unused)
+static void test_visitor_out_list_union_uint64(TestOutputVisitorData *data,
+ const void *unused)
{
- test_native_list(data, unused, USER_DEF_NATIVE_LIST_UNION_KIND_U64);
+ test_list_union(data, unused, USER_DEF_LIST_UNION_KIND_U64);
}
-static void test_visitor_out_native_list_bool(TestOutputVisitorData *data,
- const void *unused)
+static void test_visitor_out_list_union_bool(TestOutputVisitorData *data,
+ const void *unused)
{
- test_native_list(data, unused, USER_DEF_NATIVE_LIST_UNION_KIND_BOOLEAN);
+ test_list_union(data, unused, USER_DEF_LIST_UNION_KIND_BOOLEAN);
}
-static void test_visitor_out_native_list_str(TestOutputVisitorData *data,
- const void *unused)
+static void test_visitor_out_list_union_str(TestOutputVisitorData *data,
+ const void *unused)
{
- test_native_list(data, unused, USER_DEF_NATIVE_LIST_UNION_KIND_STRING);
+ test_list_union(data, unused, USER_DEF_LIST_UNION_KIND_STRING);
}
-static void test_visitor_out_native_list_number(TestOutputVisitorData *data,
- const void *unused)
+static void test_visitor_out_list_union_number(TestOutputVisitorData *data,
+ const void *unused)
{
- test_native_list(data, unused, USER_DEF_NATIVE_LIST_UNION_KIND_NUMBER);
+ test_list_union(data, unused, USER_DEF_LIST_UNION_KIND_NUMBER);
}
static void output_visitor_test_add(const char *testpath,
&out_visitor_data, test_visitor_out_alternate);
output_visitor_test_add("/visitor/output/null",
&out_visitor_data, test_visitor_out_null);
- output_visitor_test_add("/visitor/output/native_list/int",
+ output_visitor_test_add("/visitor/output/list_union/int",
&out_visitor_data,
- test_visitor_out_native_list_int);
- output_visitor_test_add("/visitor/output/native_list/int8",
+ test_visitor_out_list_union_int);
+ output_visitor_test_add("/visitor/output/list_union/int8",
&out_visitor_data,
- test_visitor_out_native_list_int8);
- output_visitor_test_add("/visitor/output/native_list/int16",
+ test_visitor_out_list_union_int8);
+ output_visitor_test_add("/visitor/output/list_union/int16",
&out_visitor_data,
- test_visitor_out_native_list_int16);
- output_visitor_test_add("/visitor/output/native_list/int32",
+ test_visitor_out_list_union_int16);
+ output_visitor_test_add("/visitor/output/list_union/int32",
&out_visitor_data,
- test_visitor_out_native_list_int32);
- output_visitor_test_add("/visitor/output/native_list/int64",
+ test_visitor_out_list_union_int32);
+ output_visitor_test_add("/visitor/output/list_union/int64",
&out_visitor_data,
- test_visitor_out_native_list_int64);
- output_visitor_test_add("/visitor/output/native_list/uint8",
+ test_visitor_out_list_union_int64);
+ output_visitor_test_add("/visitor/output/list_union/uint8",
&out_visitor_data,
- test_visitor_out_native_list_uint8);
- output_visitor_test_add("/visitor/output/native_list/uint16",
+ test_visitor_out_list_union_uint8);
+ output_visitor_test_add("/visitor/output/list_union/uint16",
&out_visitor_data,
- test_visitor_out_native_list_uint16);
- output_visitor_test_add("/visitor/output/native_list/uint32",
+ test_visitor_out_list_union_uint16);
+ output_visitor_test_add("/visitor/output/list_union/uint32",
&out_visitor_data,
- test_visitor_out_native_list_uint32);
- output_visitor_test_add("/visitor/output/native_list/uint64",
+ test_visitor_out_list_union_uint32);
+ output_visitor_test_add("/visitor/output/list_union/uint64",
&out_visitor_data,
- test_visitor_out_native_list_uint64);
- output_visitor_test_add("/visitor/output/native_list/bool",
+ test_visitor_out_list_union_uint64);
+ output_visitor_test_add("/visitor/output/list_union/bool",
&out_visitor_data,
- test_visitor_out_native_list_bool);
- output_visitor_test_add("/visitor/output/native_list/string",
+ test_visitor_out_list_union_bool);
+ output_visitor_test_add("/visitor/output/list_union/string",
&out_visitor_data,
- test_visitor_out_native_list_str);
- output_visitor_test_add("/visitor/output/native_list/number",
+ test_visitor_out_list_union_str);
+ output_visitor_test_add("/visitor/output/list_union/number",
&out_visitor_data,
- test_visitor_out_native_list_number);
+ test_visitor_out_list_union_number);
g_test_run();
projects / mirror_qemu.git / blobdiff