tokens array items are now being initialized during allocation, removed redundant code that significantly slowed down the parser

master
Serge A. Zaitsev 12 years ago
parent e542dea54e
commit 974133db85

@ -7,14 +7,14 @@
*/ */
static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser, static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser,
jsmntok_t *tokens, size_t num_tokens) { jsmntok_t *tokens, size_t num_tokens) {
unsigned int i; jsmntok_t *tok;
for (i = parser->toknext; i < num_tokens; i++) { if (parser->toknext >= num_tokens) {
if (tokens[i].start == -1 && tokens[i].end == -1) { return NULL;
parser->toknext = i + 1;
return &tokens[i];
}
} }
return NULL; tok = &tokens[parser->toknext++];
tok->start = tok->end = -1;
tok->size = 0;
return tok;
} }
/** /**
@ -128,11 +128,6 @@ jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, jsmntok_t *tokens,
unsigned int tokindex; unsigned int tokindex;
jsmntok_t *token; jsmntok_t *token;
/* initialize the rest of tokens (they could be reallocated) */
for (tokindex = parser->toknext; tokindex < num_tokens; tokindex++) {
jsmn_fill_token(&tokens[tokindex], JSMN_PRIMITIVE, -1, -1);
}
for (; js[parser->pos] != '\0'; parser->pos++) { for (; js[parser->pos] != '\0'; parser->pos++) {
char c; char c;
jsmntype_t type; jsmntype_t type;

@ -156,13 +156,13 @@ int test_partial_string() {
r = jsmn_parse(&p, js, tok, 10); r = jsmn_parse(&p, js, tok, 10);
check(r == JSMN_ERROR_PART && tok[0].type == JSMN_STRING); check(r == JSMN_ERROR_PART && tok[0].type == JSMN_STRING);
check(TOKEN_STRING(js, tok[0], "x")); check(TOKEN_STRING(js, tok[0], "x"));
check(TOKEN_EQ(tok[1], -1, -1, 0)); check(p.toknext == 1);
js = "\"x\": \"valu"; js = "\"x\": \"valu";
r = jsmn_parse(&p, js, tok, 10); r = jsmn_parse(&p, js, tok, 10);
check(r == JSMN_ERROR_PART && tok[0].type == JSMN_STRING); check(r == JSMN_ERROR_PART && tok[0].type == JSMN_STRING);
check(TOKEN_STRING(js, tok[0], "x")); check(TOKEN_STRING(js, tok[0], "x"));
check(TOKEN_EQ(tok[1], -1, -1, 0)); check(p.toknext == 1);
js = "\"x\": \"value\""; js = "\"x\": \"value\"";
r = jsmn_parse(&p, js, tok, 10); r = jsmn_parse(&p, js, tok, 10);

Loading…
Cancel
Save