qlit: move qlit from check-qjson to qobject/ (28035bcd) · Commits · SUMMER2020 / students / proj-2021291

include/qapi/qmp/qlit.h

0 → 100644

+49 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright IBM, Corp. 2009
		* Copyright (c) 2013, 2015, 2017 Red Hat Inc.
		*
		* Authors:
		* Anthony Liguori <aliguori@us.ibm.com>
		* Markus Armbruster <armbru@redhat.com>
		* Marc-André Lureau <marcandre.lureau@redhat.com>
		*
		* This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
		* See the COPYING.LIB file in the top-level directory.
		*
		*/
		#ifndef QLIT_H
		#define QLIT_H

		#include "qapi-types.h"
		#include "qobject.h"

		typedef struct LiteralQDictEntry LiteralQDictEntry;
		typedef struct LiteralQObject LiteralQObject;

		struct LiteralQObject {
		int type;
		union {
		int64_t qnum;
		const char *qstr;
		LiteralQDictEntry *qdict;
		LiteralQObject *qlist;
		} value;
		};

		struct LiteralQDictEntry {
		const char *key;
		LiteralQObject value;
		};

		#define QLIT_QNUM(val) \
		(LiteralQObject){.type = QTYPE_QNUM, .value.qnum = (val)}
		#define QLIT_QSTR(val) \
		(LiteralQObject){.type = QTYPE_QSTRING, .value.qstr = (val)}
		#define QLIT_QDICT(val) \
		(LiteralQObject){.type = QTYPE_QDICT, .value.qdict = (val)}
		#define QLIT_QLIST(val) \
		(LiteralQObject){.type = QTYPE_QLIST, .value.qlist = (val)}

		int compare_litqobj_to_qobj(LiteralQObject lhs, QObject rhs);

		#endif /* QLIT_H */

qobject/Makefile.objs

+1 −1

util-obj-y = qnull.o qnum.o qstring.o qdict.o qlist.o qbool.o

util-obj-y = qnull.o qnum.o qstring.o qdict.o qlist.o qbool.o qlit.o

util-obj-y += qjson.o qobject.o json-lexer.o json-streamer.o json-parser.o

qobject/qlit.c

0 → 100644

+89 −0

Original line number	Diff line number	Diff line
		/*
		* QLit literal qobject
		*
		* Copyright IBM, Corp. 2009
		* Copyright (c) 2013, 2015, 2017 Red Hat Inc.
		*
		* Authors:
		* Anthony Liguori <aliguori@us.ibm.com>
		* Markus Armbruster <armbru@redhat.com>
		* Marc-André Lureau <marcandre.lureau@redhat.com>
		*
		* This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
		* See the COPYING.LIB file in the top-level directory.
		*/

		#include "qemu/osdep.h"

		#include "qapi/qmp/qlit.h"
		#include "qapi/qmp/types.h"

		typedef struct QListCompareHelper {
		int index;
		LiteralQObject *objs;
		int result;
		} QListCompareHelper;

		static void compare_helper(QObject obj, void opaque)
		{
		QListCompareHelper *helper = opaque;

		if (helper->result == 0) {
		return;
		}

		if (helper->objs[helper->index].type == QTYPE_NONE) {
		helper->result = 0;
		return;
		}

		helper->result =
		compare_litqobj_to_qobj(&helper->objs[helper->index++], obj);
		}

		int compare_litqobj_to_qobj(LiteralQObject lhs, QObject rhs)
		{
		int64_t val;

		if (!rhs \|\| lhs->type != qobject_type(rhs)) {
		return 0;
		}

		switch (lhs->type) {
		case QTYPE_QNUM:
		g_assert(qnum_get_try_int(qobject_to_qnum(rhs), &val));
		return lhs->value.qnum == val;
		case QTYPE_QSTRING:
		return (strcmp(lhs->value.qstr,
		qstring_get_str(qobject_to_qstring(rhs))) == 0);
		case QTYPE_QDICT: {
		int i;

		for (i = 0; lhs->value.qdict[i].key; i++) {
		QObject *obj = qdict_get(qobject_to_qdict(rhs),
		lhs->value.qdict[i].key);

		if (!compare_litqobj_to_qobj(&lhs->value.qdict[i].value, obj)) {
		return 0;
		}
		}

		return 1;
		}
		case QTYPE_QLIST: {
		QListCompareHelper helper;

		helper.index = 0;
		helper.objs = lhs->value.qlist;
		helper.result = 1;

		qlist_iter(qobject_to_qlist(rhs), compare_helper, &helper);

		return helper.result;
		}
		default:
		break;
		}

		return 0;
		}

tests/check-qjson.c

+1 −95

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		#include "qapi/error.h"
		#include "qapi/qmp/types.h"
		#include "qapi/qmp/qjson.h"
		#include "qapi/qmp/qlit.h"
		#include "qemu-common.h"

		static void escaped_string(void)
		@@ -1059,101 +1060,6 @@ static void keyword_literal(void)
		QDECREF(null);
		}

		typedef struct LiteralQDictEntry LiteralQDictEntry;
		typedef struct LiteralQObject LiteralQObject;

		struct LiteralQObject
		{
		int type;
		union {
		int64_t qnum;
		const char *qstr;
		LiteralQDictEntry *qdict;
		LiteralQObject *qlist;
		} value;
		};

		struct LiteralQDictEntry
		{
		const char *key;
		LiteralQObject value;
		};

		#define QLIT_QNUM(val) (LiteralQObject){.type = QTYPE_QNUM, .value.qnum = (val)}
		#define QLIT_QSTR(val) (LiteralQObject){.type = QTYPE_QSTRING, .value.qstr = (val)}
		#define QLIT_QDICT(val) (LiteralQObject){.type = QTYPE_QDICT, .value.qdict = (val)}
		#define QLIT_QLIST(val) (LiteralQObject){.type = QTYPE_QLIST, .value.qlist = (val)}

		typedef struct QListCompareHelper
		{
		int index;
		LiteralQObject *objs;
		int result;
		} QListCompareHelper;

		static int compare_litqobj_to_qobj(LiteralQObject lhs, QObject rhs);

		static void compare_helper(QObject obj, void opaque)
		{
		QListCompareHelper *helper = opaque;

		if (helper->result == 0) {
		return;
		}

		if (helper->objs[helper->index].type == QTYPE_NONE) {
		helper->result = 0;
		return;
		}

		helper->result = compare_litqobj_to_qobj(&helper->objs[helper->index++], obj);
		}

		static int compare_litqobj_to_qobj(LiteralQObject lhs, QObject rhs)
		{
		int64_t val;

		if (!rhs \|\| lhs->type != qobject_type(rhs)) {
		return 0;
		}

		switch (lhs->type) {
		case QTYPE_QNUM:
		g_assert(qnum_get_try_int(qobject_to_qnum(rhs), &val));
		return lhs->value.qnum == val;
		case QTYPE_QSTRING:
		return (strcmp(lhs->value.qstr, qstring_get_str(qobject_to_qstring(rhs))) == 0);
		case QTYPE_QDICT: {
		int i;

		for (i = 0; lhs->value.qdict[i].key; i++) {
		QObject *obj = qdict_get(qobject_to_qdict(rhs), lhs->value.qdict[i].key);

		if (!compare_litqobj_to_qobj(&lhs->value.qdict[i].value, obj)) {
		return 0;
		}
		}

		return 1;
		}
		case QTYPE_QLIST: {
		QListCompareHelper helper;

		helper.index = 0;
		helper.objs = lhs->value.qlist;
		helper.result = 1;

		qlist_iter(qobject_to_qlist(rhs), compare_helper, &helper);

		return helper.result;
		}
		default:
		break;
		}

		return 0;
		}

		static void simple_dict(void)
		{
		int i;