diff options
author | Josh Haberman <jhaberman@gmail.com> | 2015-05-08 17:03:20 -0700 |
---|---|---|
committer | Josh Haberman <jhaberman@gmail.com> | 2015-05-08 17:03:20 -0700 |
commit | fa10302a502de38a66ed921eeeacb4107e9572a2 (patch) | |
tree | 5ed1bca20a889458c431da37c701aae131e15c4a /upb/json | |
parent | 3bd691a4975b2267ff04611507e766a7f9f87e83 (diff) | |
parent | bd7ea8c6f1854aa37b7792c6f23334ffc0fd94ff (diff) |
Merge from open-source development.
Diffstat (limited to 'upb/json')
-rw-r--r-- | upb/json/parser.c | 17 | ||||
-rw-r--r-- | upb/json/parser.rl | 9 | ||||
-rw-r--r-- | upb/json/printer.c | 2 |
3 files changed, 20 insertions, 8 deletions
diff --git a/upb/json/parser.c b/upb/json/parser.c index 4f4a96e..f4f5628 100644 --- a/upb/json/parser.c +++ b/upb/json/parser.c @@ -1201,8 +1201,6 @@ static const char _json_trans_actions[] = { }; static const int json_start = 1; -static const int json_first_final = 56; -static const int json_error = 0; static const int json_en_number_machine = 10; static const int json_en_string_machine = 19; @@ -1230,7 +1228,7 @@ size_t parse(void *closure, const void *hd, const char *buf, size_t size, capture_resume(parser, buf); -#line 1234 "upb/json/parser.c" +#line 1232 "upb/json/parser.c" { int _klen; unsigned int _trans; @@ -1416,7 +1414,7 @@ _match: #line 1148 "upb/json/parser.rl" { p--; {cs = stack[--top]; goto _again;} } break; -#line 1420 "upb/json/parser.c" +#line 1418 "upb/json/parser.c" } } @@ -1448,6 +1446,13 @@ error: bool end(void *closure, const void *hd) { UPB_UNUSED(closure); UPB_UNUSED(hd); + + // Prevent compile warning on unused static constants. + UPB_UNUSED(json_start); + UPB_UNUSED(json_en_number_machine); + UPB_UNUSED(json_en_string_machine); + UPB_UNUSED(json_en_value_machine); + UPB_UNUSED(json_en_main); return true; } @@ -1461,13 +1466,13 @@ static void json_parser_reset(upb_json_parser *p) { int top; // Emit Ragel initialization of the parser. -#line 1465 "upb/json/parser.c" +#line 1470 "upb/json/parser.c" { cs = json_start; top = 0; } -#line 1204 "upb/json/parser.rl" +#line 1211 "upb/json/parser.rl" p->current_state = cs; p->parser_top = top; accumulate_clear(p); diff --git a/upb/json/parser.rl b/upb/json/parser.rl index 3a400ea..81d1514 100644 --- a/upb/json/parser.rl +++ b/upb/json/parser.rl @@ -1150,7 +1150,7 @@ static void end_object(upb_json_parser *p) { main := ws object ws; }%% -%% write data; +%% write data noerror nofinal; size_t parse(void *closure, const void *hd, const char *buf, size_t size, const upb_bufhandle *handle) { @@ -1188,6 +1188,13 @@ error: bool end(void *closure, const void *hd) { UPB_UNUSED(closure); UPB_UNUSED(hd); + + // Prevent compile warning on unused static constants. + UPB_UNUSED(json_start); + UPB_UNUSED(json_en_number_machine); + UPB_UNUSED(json_en_string_machine); + UPB_UNUSED(json_en_value_machine); + UPB_UNUSED(json_en_main); return true; } diff --git a/upb/json/printer.c b/upb/json/printer.c index 132736c..539f83a 100644 --- a/upb/json/printer.c +++ b/upb/json/printer.c @@ -183,7 +183,7 @@ static bool putkey(void *closure, const void *handler_data) { return true; } -#define CHKFMT(val) if ((val) == -1) return false; +#define CHKFMT(val) if ((val) == (size_t)-1) return false; #define CHK(val) if (!(val)) return false; #define TYPE_HANDLERS(type, fmt_func) \ |