haiwan
/
jsmn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed typo, added JSMN_STRICT mode

Browse Source
master
Serge A. Zaitsev 13 years ago
parent e395ad562e
commit 41171ecd51
2 changed files with 76 additions and 41 deletions
Show Stats Download Patch File Download Diff File

36
jsmn.c
Unescape View File

@ -40,7 +40,10 @@ static int jsmn_parse_primitive(jsmn_parser *parser, const char *js,
for (; js[parser->pos] != '\0'; parser->pos++) {
switch (js[parser->pos]) {
case '\t' : case '\r' : case '\n' : case ' ' :
#ifndef JSMN_STRICT
/* In strict mode primitive must be followed by "," or "}" or "]" */
case '\t' : case '\r' : case '\n' : case ' ' : case ':':
#endif
case ',' : case ']' : case '}' :
goto found;
}
@ -49,8 +52,8 @@ static int jsmn_parse_primitive(jsmn_parser *parser, const char *js,
return JSMN_ERROR_INVAL;
}
}
/* TODO: CHECK THIS ONLY WHEN IN JSON STRICT MODE */
#if 0
#ifdef JSMN_STRICT
/* In strict mode primitive must be followed by a comma/object/array */
parser->pos = start;
return JSMN_ERROR_PART;
#endif
@ -162,14 +165,6 @@ jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, jsmntok_t *tokens,
}
}
break;
case '-': case '0': case '1' : case '2': case '3' : case '4':
case '5': case '6': case '7' : case '8': case '9':
case 't': case 'f': case 'n' :
r = jsmn_parse_primitive(parser, js, tokens, num_tokens);
if (r < 0) return r;
if (parser->cursize != NULL)
(*parser->cursize)++;
break;
case '\"':
r = jsmn_parse_string(parser, js, tokens, num_tokens);
if (r < 0) return r;
@ -178,8 +173,27 @@ jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, jsmntok_t *tokens,
break;
case '\t' : case '\r' : case '\n' : case ':' : case ',': case ' ':
break;
#ifdef JSMN_STRICT
/* In strict mode primitives are: numbers and booleans */
case '-': case '0': case '1' : case '2': case '3' : case '4':
case '5': case '6': case '7' : case '8': case '9':
case 't': case 'f': case 'n' :
#else
/* In non-strict mode every unquoted value is a primitive */
default:
#endif
r = jsmn_parse_primitive(parser, js, tokens, num_tokens);
if (r < 0) return r;
if (parser->cursize != NULL)
(*parser->cursize)++;
break;
#ifdef JSMN_STRICT
/* Unexpected char in strict mode */
default:
return JSMN_ERROR_INVAL;
#endif
}
}
return JSMN_SUCCESS;

81
jsmn_test.c
Unescape View File

@ -32,7 +32,7 @@ static void test(int (*func)(void), const char *name) {
&& (t).end == tok_end \
&& (t).type == (tok_type))
#define TOKEN_STIRNG(js, t, s) \
#define TOKEN_STRING(js, t, s) \
(strncmp(js+(t).start, s, (t).end - (t).start) == 0 \
&& strlen(s) == (t).end - (t).start)
@ -56,9 +56,9 @@ int test_simple() {
check(TOKEN_EQ(tokens[1], 2, 3, JSMN_STRING));
check(TOKEN_EQ(tokens[2], 6, 7, JSMN_PRIMITIVE));
check(TOKEN_STIRNG(js, tokens[0], js));
check(TOKEN_STIRNG(js, tokens[1], "a"));
check(TOKEN_STIRNG(js, tokens[2], "0"));
check(TOKEN_STRING(js, tokens[0], js));
check(TOKEN_STRING(js, tokens[1], "a"));
check(TOKEN_STRING(js, tokens[2], "0"));
return 0;
}
@ -74,40 +74,40 @@ int test_primitive() {
r = jsmn_parse(&p, js, tok, 10);
check(r == JSMN_SUCCESS && tok[0].type == JSMN_STRING
&& tok[1].type == JSMN_PRIMITIVE);
check(TOKEN_STIRNG(js, tok[0], "boolVar"));
check(TOKEN_STIRNG(js, tok[1], "true"));
check(TOKEN_STRING(js, tok[0], "boolVar"));
check(TOKEN_STRING(js, tok[1], "true"));
js = "\"boolVar\" : false";
jsmn_init(&p);
r = jsmn_parse(&p, js, tok, 10);
check(r == JSMN_SUCCESS && tok[0].type == JSMN_STRING
&& tok[1].type == JSMN_PRIMITIVE);
check(TOKEN_STIRNG(js, tok[0], "boolVar"));
check(TOKEN_STIRNG(js, tok[1], "false"));
check(TOKEN_STRING(js, tok[0], "boolVar"));
check(TOKEN_STRING(js, tok[1], "false"));
js = "\"intVar\" : 12345";
jsmn_init(&p);
r = jsmn_parse(&p, js, tok, 10);
check(r == JSMN_SUCCESS && tok[0].type == JSMN_STRING
&& tok[1].type == JSMN_PRIMITIVE);
check(TOKEN_STIRNG(js, tok[0], "intVar"));
check(TOKEN_STIRNG(js, tok[1], "12345"));
check(TOKEN_STRING(js, tok[0], "intVar"));
check(TOKEN_STRING(js, tok[1], "12345"));
js = "\"floatVar\" : 12.345";
jsmn_init(&p);
r = jsmn_parse(&p, js, tok, 10);
check(r == JSMN_SUCCESS && tok[0].type == JSMN_STRING
&& tok[1].type == JSMN_PRIMITIVE);
check(TOKEN_STIRNG(js, tok[0], "floatVar"));
check(TOKEN_STIRNG(js, tok[1], "12.345"));
check(TOKEN_STRING(js, tok[0], "floatVar"));
check(TOKEN_STRING(js, tok[1], "12.345"));
js = "\"nullVar\" : null";
jsmn_init(&p);
r = jsmn_parse(&p, js, tok, 10);
check(r == JSMN_SUCCESS && tok[0].type == JSMN_STRING
&& tok[1].type == JSMN_PRIMITIVE);
check(TOKEN_STIRNG(js, tok[0], "nullVar"));
check(TOKEN_STIRNG(js, tok[1], "null"));
check(TOKEN_STRING(js, tok[0], "nullVar"));
check(TOKEN_STRING(js, tok[1], "null"));
return 0;
}
@ -123,24 +123,24 @@ int test_string() {
r = jsmn_parse(&p, js, tok, 10);
check(r == JSMN_SUCCESS && tok[0].type == JSMN_STRING
&& tok[1].type == JSMN_STRING);
check(TOKEN_STIRNG(js, tok[0], "strVar"));
check(TOKEN_STIRNG(js, tok[1], "hello world"));
check(TOKEN_STRING(js, tok[0], "strVar"));
check(TOKEN_STRING(js, tok[1], "hello world"));
js = "\"strVar\" : \"escapes: \\/\\r\\n\\t\\b\\f\\\"\\\\\"";
jsmn_init(&p);
r = jsmn_parse(&p, js, tok, 10);
check(r == JSMN_SUCCESS && tok[0].type == JSMN_STRING
&& tok[1].type == JSMN_STRING);
check(TOKEN_STIRNG(js, tok[0], "strVar"));
check(TOKEN_STIRNG(js, tok[1], "escapes: \\/\\r\\n\\t\\b\\f\\\"\\\\"));
check(TOKEN_STRING(js, tok[0], "strVar"));
check(TOKEN_STRING(js, tok[1], "escapes: \\/\\r\\n\\t\\b\\f\\\"\\\\"));
js = "\"strVar\" : \"\"";
jsmn_init(&p);
r = jsmn_parse(&p, js, tok, 10);
check(r == JSMN_SUCCESS && tok[0].type == JSMN_STRING
&& tok[1].type == JSMN_STRING);
check(TOKEN_STIRNG(js, tok[0], "strVar"));
check(TOKEN_STIRNG(js, tok[1], ""));
check(TOKEN_STRING(js, tok[0], "strVar"));
check(TOKEN_STRING(js, tok[1], ""));
return 0;
}
@ -155,42 +155,63 @@ int test_partial_string() {
js = "\"x\": \"va";
r = jsmn_parse(&p, js, tok, 10);
check(r == JSMN_ERROR_PART && tok[0].type == JSMN_STRING);
check(TOKEN_STIRNG(js, tok[0], "x"));
check(TOKEN_STRING(js, tok[0], "x"));
check(TOKEN_EQ(tok[1], -1, -1, 0));
js = "\"x\": \"valu";
r = jsmn_parse(&p, js, tok, 10);
check(r == JSMN_ERROR_PART && tok[0].type == JSMN_STRING);
check(TOKEN_STIRNG(js, tok[0], "x"));
check(TOKEN_STRING(js, tok[0], "x"));
check(TOKEN_EQ(tok[1], -1, -1, 0));
js = "\"x\": \"value\"";
r = jsmn_parse(&p, js, tok, 10);
check(r == JSMN_SUCCESS && tok[0].type == JSMN_STRING
&& tok[1].type == JSMN_STRING);
check(TOKEN_STIRNG(js, tok[0], "x"));
check(TOKEN_STIRNG(js, tok[1], "value"));
check(TOKEN_STRING(js, tok[0], "x"));
check(TOKEN_STRING(js, tok[1], "value"));
js = "\"x\": \"value\", \"y\": \"value y\"";
r = jsmn_parse(&p, js, tok, 10);
check(r == JSMN_SUCCESS && tok[0].type == JSMN_STRING
&& tok[1].type == JSMN_STRING && tok[2].type == JSMN_STRING
&& tok[3].type == JSMN_STRING);
check(TOKEN_STIRNG(js, tok[0], "x"));
check(TOKEN_STIRNG(js, tok[1], "value"));
check(TOKEN_STIRNG(js, tok[2], "y"));
check(TOKEN_STIRNG(js, tok[3], "value y"));
check(TOKEN_STRING(js, tok[0], "x"));
check(TOKEN_STRING(js, tok[1], "value"));
check(TOKEN_STRING(js, tok[2], "y"));
check(TOKEN_STRING(js, tok[3], "value y"));
return 0;
}
int test_unquoted_keys() {
#ifndef JSMN_STRICT
int r;
jsmn_parser p;
jsmntok_t tok[10];
const char *js;
jsmn_init(&p);
js = "key1: \"value\"\nkey2 : 123";
r = jsmn_parse(&p, js, tok, 10);
check(r == JSMN_SUCCESS && tok[0].type == JSMN_PRIMITIVE
&& tok[1].type == JSMN_STRING && tok[2].type == JSMN_PRIMITIVE
&& tok[3].type == JSMN_PRIMITIVE);
check(TOKEN_STRING(js, tok[0], "key1"));
check(TOKEN_STRING(js, tok[1], "value"));
check(TOKEN_STRING(js, tok[2], "key2"));
check(TOKEN_STRING(js, tok[3], "123"));
#endif
return 0;
}
int main() {
#if 0
test(test_simple, "general test for a simple JSON string");
test(test_primitive, "test primitive JSON data types");
test(test_string, "test string JSON data types");
#endif
test(test_partial_string, "test partial JSON string parsing");
test(test_unquoted_keys, "test unquoted keys (like in JavaScript)");
printf("\nPASSED: %d\nFAILED: %d\n", test_passed, test_failed);
return 0;
}

Write Preview
Loading…
Cancel
Save