mirror of
https://gitlab.com/qemu-project/qemu.git
synced 2024-11-09 19:20:56 +03:00
json: Make JSONToken opaque outside json-parser.c
Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20180823164025.12553-52-armbru@redhat.com>
This commit is contained in:
parent
a2731e08ee
commit
abe7c2067c
@ -15,7 +15,11 @@
|
||||
#define QEMU_JSON_PARSER_H
|
||||
|
||||
#include "qemu-common.h"
|
||||
#include "qapi/qmp/json-lexer.h"
|
||||
|
||||
typedef struct JSONToken JSONToken;
|
||||
|
||||
JSONToken *json_token(JSONTokenType type, int x, int y, GString *tokstr);
|
||||
QObject *json_parser_parse(GQueue *tokens, va_list *ap, Error **errp);
|
||||
|
||||
#endif
|
||||
|
@ -16,13 +16,6 @@
|
||||
|
||||
#include "qapi/qmp/json-lexer.h"
|
||||
|
||||
typedef struct JSONToken {
|
||||
int type;
|
||||
int x;
|
||||
int y;
|
||||
char str[];
|
||||
} JSONToken;
|
||||
|
||||
typedef struct JSONMessageParser
|
||||
{
|
||||
void (*emit)(void *opaque, QObject *json, Error *err);
|
||||
|
@ -26,6 +26,13 @@
|
||||
#include "qapi/qmp/json-lexer.h"
|
||||
#include "qapi/qmp/json-streamer.h"
|
||||
|
||||
struct JSONToken {
|
||||
JSONTokenType type;
|
||||
int x;
|
||||
int y;
|
||||
char str[];
|
||||
};
|
||||
|
||||
typedef struct JSONParserContext
|
||||
{
|
||||
Error *err;
|
||||
@ -538,6 +545,18 @@ static QObject *parse_value(JSONParserContext *ctxt, va_list *ap)
|
||||
}
|
||||
}
|
||||
|
||||
JSONToken *json_token(JSONTokenType type, int x, int y, GString *tokstr)
|
||||
{
|
||||
JSONToken *token = g_malloc(sizeof(JSONToken) + tokstr->len + 1);
|
||||
|
||||
token->type = type;
|
||||
memcpy(token->str, tokstr->str, tokstr->len);
|
||||
token->str[tokstr->len] = 0;
|
||||
token->x = x;
|
||||
token->y = y;
|
||||
return token;
|
||||
}
|
||||
|
||||
QObject *json_parser_parse(GQueue *tokens, va_list *ap, Error **errp)
|
||||
{
|
||||
JSONParserContext ctxt = { .buf = tokens };
|
||||
|
@ -82,13 +82,7 @@ void json_message_process_token(JSONLexer *lexer, GString *input,
|
||||
goto out_emit;
|
||||
}
|
||||
|
||||
token = g_malloc(sizeof(JSONToken) + input->len + 1);
|
||||
token->type = type;
|
||||
memcpy(token->str, input->str, input->len);
|
||||
token->str[input->len] = 0;
|
||||
token->x = x;
|
||||
token->y = y;
|
||||
|
||||
token = json_token(type, x, y, input);
|
||||
parser->token_size += input->len;
|
||||
|
||||
g_queue_push_tail(&parser->tokens, token);
|
||||
|
Loading…
Reference in New Issue
Block a user