Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

An array of objects was not correctly parsed. Parser returned -1. #3

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

An array of objects was not correctly parsed. Parser returned -1. #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a93a5c
An array of objects was not correctly parsed. Parser returned -1.
wolfgangimig Dec 12, 2024
ef05122
DEBUG_TRACE off
wolfgangimig Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 36 additions & 11 deletions src/mu_json.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ typedef struct {
int char_pos; // position of char being parsed
int state; // parser state
mu_json_err_t error; // error status
mu_json_token_t *current_token; // wi: currently parsed token
} parser_t;

// *****************************************************************************
Expand Down Expand Up @@ -406,11 +407,21 @@ static inline void set_is_last(mu_json_token_t *token) {
}

/**
* @brief "Top of Stack": Return the most recently allocated token or NULL if
* none have been allocated.
* @brief Return the current token to work on.
*
* @see set_current_token
*/
static mu_json_token_t *tos(parser_t *parser);

/**
* @brief Set the current token to parse.
*
* While parsing an object or array, the current token is the last one allocated.
* After finishing an object or array, the current token is the object/array itself.
* So parsing continues after this object/array.
*/
static void set_current_token(parser_t *parser, mu_json_token_t *token);

/**
* @brief return a new state depending on several factors.
*
Expand Down Expand Up @@ -622,6 +633,8 @@ static int parse(mu_json_token_t *token_store, size_t max_tokens,
parser.state = GO;
parser.error = MU_JSON_ERR_NONE;

parser.current_token = NULL; // wi

bool eos = false;
uint8_t ch;
int char_class;
Expand Down Expand Up @@ -726,12 +739,14 @@ static int parse(mu_json_token_t *token_store, size_t max_tokens,
// TOS is not an object. Close TOS and container.
finish_token(&parser, token, false);
mu_json_token_t *container = mu_json_token_parent(token);
finish_token(&parser, container, true);
finish_token(&parser, container, true);
set_current_token(&parser, container); // wi
} else if (token_is_sealed(token)) {
// TOS is an object that's already been sealed. Finish
// container.
mu_json_token_t *container = mu_json_token_parent(token);
finish_token(&parser, container, true);
finish_token(&parser, container, true);
set_current_token(&parser, container); // wi
} else {
// TOS is an empty object. Finish it.
finish_token(&parser, token, true);
Expand All @@ -748,12 +763,14 @@ static int parse(mu_json_token_t *token_store, size_t max_tokens,
// TOS is not an object. Close TOS and container.
finish_token(&parser, token, false);
mu_json_token_t *container = mu_json_token_parent(token);
finish_token(&parser, container, true);
finish_token(&parser, container, true);
set_current_token(&parser, container); // wi
} else if (token_is_sealed(token)) {
// TOS is an object that's already been sealed. Finish
// container.
mu_json_token_t *container = mu_json_token_parent(token);
finish_token(&parser, container, true);
finish_token(&parser, container, true);
set_current_token(&parser, container); // wi
} else {
// TOS is an empty object. Finish it.
finish_token(&parser, token, true);
Expand Down Expand Up @@ -842,10 +859,10 @@ static int parse(mu_json_token_t *token_store, size_t max_tokens,
TRACE_PRINTF("\nendgame: final state != OK");
retval = MU_JSON_ERR_BAD_FORMAT;
} else {
mu_json_token_t *token = tos(&parser);
if (token) {
set_is_last(tos(&parser)); // mark last token as such
finish_token(&parser, mu_json_token_root(tos(&parser)), false);
mu_json_token_t *last_token = parser.token_count ? &parser.tokens[parser.token_count-1] : NULL; // wi
if (last_token) {
set_is_last(last_token); // mark last token as such
finish_token(&parser, mu_json_token_root(last_token), false);
}
TRACE_PRINTF("\nendgame: success");
retval = parser.token_count;
Expand Down Expand Up @@ -877,6 +894,9 @@ static bool begin_token(parser_t *parser, mu_json_token_type_t type) {
}
mu_json_token_t *token = &parser->tokens[parser->token_count++];
memset(token, 0, sizeof(mu_json_token_t));

parser->current_token = token; // wi

// Since we haven't parsed to the end of this token yet, initialize the
// token's string to start at char_pos and extend to the end of the input
// string. This will get adjusted in a call to finish_token() [q.v.].
Expand Down Expand Up @@ -920,10 +940,15 @@ static mu_json_token_t *tos(parser_t *parser) {
if (parser->token_count == 0) {
return NULL;
} else {
return &parser->tokens[parser->token_count - 1];
//return &parser->tokens[parser->token_count - 1]; // wi
return parser->current_token;
}
}

static void set_current_token(parser_t *parser, mu_json_token_t *token) { // wi
parser->current_token = token;
}

static int select_state(mu_json_token_t *token, int not_in_container,
int in_array, int in_object_key, int in_object_value) {
mu_json_token_t *container = mu_json_token_parent(token);
Expand Down