diff options
Diffstat (limited to 'upb/json')
-rw-r--r-- | upb/json/parser.c | 409 | ||||
-rw-r--r-- | upb/json/parser.rl | 145 |
2 files changed, 362 insertions, 192 deletions
diff --git a/upb/json/parser.c b/upb/json/parser.c index b8b832e..db7f14f 100644 --- a/upb/json/parser.c +++ b/upb/json/parser.c @@ -21,9 +21,6 @@ ** - handling of keys/escape-sequences/etc that span input buffers. */ -/* Need to define _XOPEN_SOURCE before any include to make strptime work. */ -#define _XOPEN_SOURCE 700 - #include <ctype.h> #include <errno.h> #include <float.h> @@ -1533,47 +1530,100 @@ static bool end_duration_base(upb_json_parser *p, const char *ptr) { return true; } -static void start_timestamp_base(upb_json_parser *p, const char *ptr) { +static int parse_timestamp_number(upb_json_parser *p) { + size_t len; + const char *buf; + char *end; + int val; + + /* atoi() and friends unfortunately do not support specifying the length of + * the input string, so we need to force a copy into a NULL-terminated buffer. */ + multipart_text(p, "\0", 1, false); + + buf = accumulate_getptr(p, &len); + val = atoi(buf); + multipart_end(p); + multipart_startaccum(p); + + return val; +} + +static void start_year(upb_json_parser *p, const char *ptr) { capture_begin(p, ptr); } -#define UPB_TIMESTAMP_BASE_SIZE 19 +static bool end_year(upb_json_parser *p, const char *ptr) { + if (!capture_end(p, ptr)) { + return false; + } + p->tm.tm_year = parse_timestamp_number(p) - 1900; + return true; +} -static bool end_timestamp_base(upb_json_parser *p, const char *ptr) { - size_t len; - const char *buf; - /* 3 for GMT and 1 for ending 0 */ - char timestamp_buf[UPB_TIMESTAMP_BASE_SIZE + 4]; +static void start_month(upb_json_parser *p, const char *ptr) { + capture_begin(p, ptr); +} +static bool end_month(upb_json_parser *p, const char *ptr) { if (!capture_end(p, ptr)) { return false; } + p->tm.tm_mon = parse_timestamp_number(p) - 1; + return true; +} - buf = accumulate_getptr(p, &len); - UPB_ASSERT(len == UPB_TIMESTAMP_BASE_SIZE); - memcpy(timestamp_buf, buf, UPB_TIMESTAMP_BASE_SIZE); - memcpy(timestamp_buf + UPB_TIMESTAMP_BASE_SIZE, "GMT", 3); - timestamp_buf[UPB_TIMESTAMP_BASE_SIZE + 3] = 0; +static void start_day(upb_json_parser *p, const char *ptr) { + capture_begin(p, ptr); +} -#if defined __MINGW32__ || defined __MINGW64__ - upb_status_seterrf(p->status, - "error parsing timestamp: mingw doesn't support strptime"); - return false; -#else - /* Parse seconds */ - if (strptime(timestamp_buf, "%FT%H:%M:%S%Z", &p->tm) == NULL) { - upb_status_seterrf(p->status, "error parsing timestamp: %s", buf); +static bool end_day(upb_json_parser *p, const char *ptr) { + if (!capture_end(p, ptr)) { return false; } -#endif + p->tm.tm_mday = parse_timestamp_number(p); + return true; +} - /* Clean up buffer */ - multipart_end(p); - multipart_startaccum(p); +static void start_hour(upb_json_parser *p, const char *ptr) { + capture_begin(p, ptr); +} + +static bool end_hour(upb_json_parser *p, const char *ptr) { + if (!capture_end(p, ptr)) { + return false; + } + p->tm.tm_hour = parse_timestamp_number(p); + return true; +} + +static void start_minute(upb_json_parser *p, const char *ptr) { + capture_begin(p, ptr); +} + +static bool end_minute(upb_json_parser *p, const char *ptr) { + if (!capture_end(p, ptr)) { + return false; + } + p->tm.tm_min = parse_timestamp_number(p); + return true; +} + +static void start_second(upb_json_parser *p, const char *ptr) { + capture_begin(p, ptr); +} +static bool end_second(upb_json_parser *p, const char *ptr) { + if (!capture_end(p, ptr)) { + return false; + } + p->tm.tm_sec = parse_timestamp_number(p); return true; } +static void start_timestamp_base(upb_json_parser *p) { + memset(&p->tm, 0, sizeof(struct tm)); +} + static void start_timestamp_fraction(upb_json_parser *p, const char *ptr) { capture_begin(p, ptr); } @@ -2494,27 +2544,30 @@ static bool does_fieldmask_end(upb_json_parser *p) { * final state once, when the closing '"' is seen. */ -#line 2676 "upb/json/parser.rl" +#line 2749 "upb/json/parser.rl" -#line 2502 "upb/json/parser.c" +#line 2552 "upb/json/parser.c" static const char _json_actions[] = { 0, 1, 0, 1, 1, 1, 3, 1, 4, 1, 6, 1, 7, 1, 8, 1, - 9, 1, 10, 1, 11, 1, 12, 1, - 13, 1, 24, 1, 26, 1, 28, 1, - 29, 1, 31, 1, 32, 1, 33, 1, - 35, 1, 37, 1, 38, 1, 39, 1, - 40, 1, 42, 1, 43, 2, 4, 9, - 2, 5, 6, 2, 7, 3, 2, 7, - 9, 2, 14, 15, 2, 16, 17, 2, - 18, 19, 2, 21, 23, 2, 22, 20, - 2, 27, 25, 2, 29, 31, 2, 34, - 2, 2, 35, 43, 2, 36, 25, 2, - 38, 43, 2, 39, 43, 2, 40, 43, - 2, 41, 30, 2, 42, 43, 3, 21, - 23, 24, 4, 14, 15, 16, 17 + 9, 1, 11, 1, 12, 1, 13, 1, + 14, 1, 15, 1, 16, 1, 17, 1, + 18, 1, 19, 1, 20, 1, 22, 1, + 23, 1, 24, 1, 35, 1, 37, 1, + 39, 1, 40, 1, 42, 1, 43, 1, + 44, 1, 46, 1, 48, 1, 49, 1, + 50, 1, 51, 1, 53, 1, 54, 2, + 4, 9, 2, 5, 6, 2, 7, 3, + 2, 7, 9, 2, 21, 26, 2, 25, + 10, 2, 27, 28, 2, 29, 30, 2, + 32, 34, 2, 33, 31, 2, 38, 36, + 2, 40, 42, 2, 45, 2, 2, 46, + 54, 2, 47, 36, 2, 49, 54, 2, + 50, 54, 2, 51, 54, 2, 52, 41, + 2, 53, 54, 3, 32, 34, 35, 4, + 21, 26, 27, 28 }; static const short _json_key_offsets[] = { @@ -2698,30 +2751,30 @@ static const char _json_trans_targs[] = { 106 }; -static const char _json_trans_actions[] = { - 0, 0, 92, 86, 35, 0, 0, 0, - 104, 41, 27, 0, 37, 0, 0, 0, +static const unsigned char _json_trans_actions[] = { + 0, 0, 113, 107, 53, 0, 0, 0, + 125, 59, 45, 0, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 80, 33, 29, 0, 0, 27, - 31, 31, 83, 0, 0, 0, 0, 0, + 0, 0, 101, 51, 47, 0, 0, 45, + 49, 49, 104, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 5, 15, - 0, 0, 53, 7, 13, 0, 56, 9, - 9, 9, 59, 62, 11, 17, 17, 17, - 0, 0, 0, 19, 0, 21, 23, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 114, 65, 114, 0, 0, 0, 0, - 0, 71, 0, 68, 68, 77, 25, 0, - 110, 74, 92, 86, 35, 0, 0, 0, - 104, 41, 51, 89, 27, 0, 37, 0, - 0, 0, 0, 0, 0, 98, 0, 0, - 0, 101, 0, 0, 0, 95, 0, 80, - 33, 29, 0, 0, 27, 31, 31, 83, - 0, 0, 107, 0, 39, 45, 47, 43, - 49 + 0, 0, 71, 7, 13, 0, 74, 9, + 9, 9, 77, 80, 11, 37, 37, 37, + 0, 0, 0, 39, 0, 41, 86, 0, + 0, 0, 17, 19, 0, 21, 23, 0, + 25, 27, 0, 29, 31, 0, 33, 35, + 0, 135, 83, 135, 0, 0, 0, 0, + 0, 92, 0, 89, 89, 98, 43, 0, + 131, 95, 113, 107, 53, 0, 0, 0, + 125, 59, 69, 110, 45, 0, 55, 0, + 0, 0, 0, 0, 0, 119, 0, 0, + 0, 122, 0, 0, 0, 116, 0, 101, + 51, 47, 0, 0, 45, 49, 49, 104, + 0, 0, 128, 0, 57, 63, 65, 61, + 67 }; -static const char _json_eof_actions[] = { +static const unsigned char _json_eof_actions[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2735,7 +2788,7 @@ static const char _json_eof_actions[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 39, 45, 47, 43, 49, + 0, 0, 0, 57, 63, 65, 61, 67, 0, 0, 0, 0, 0, 0 }; @@ -2750,7 +2803,7 @@ static const int json_en_value_machine = 78; static const int json_en_main = 1; -#line 2679 "upb/json/parser.rl" +#line 2752 "upb/json/parser.rl" size_t parse(void *closure, const void *hd, const char *buf, size_t size, const upb_bufhandle *handle) { @@ -2773,7 +2826,7 @@ size_t parse(void *closure, const void *hd, const char *buf, size_t size, capture_resume(parser, buf); -#line 2777 "upb/json/parser.c" +#line 2830 "upb/json/parser.c" { int _klen; unsigned int _trans; @@ -2848,103 +2901,147 @@ _match: switch ( *_acts++ ) { case 1: -#line 2507 "upb/json/parser.rl" +#line 2557 "upb/json/parser.rl" { p--; {cs = stack[--top]; goto _again;} } break; case 2: -#line 2509 "upb/json/parser.rl" +#line 2559 "upb/json/parser.rl" { p--; {stack[top++] = cs; cs = 23;goto _again;} } break; case 3: -#line 2513 "upb/json/parser.rl" +#line 2563 "upb/json/parser.rl" { start_text(parser, p); } break; case 4: -#line 2514 "upb/json/parser.rl" +#line 2564 "upb/json/parser.rl" { CHECK_RETURN_TOP(end_text(parser, p)); } break; case 5: -#line 2520 "upb/json/parser.rl" +#line 2570 "upb/json/parser.rl" { start_hex(parser); } break; case 6: -#line 2521 "upb/json/parser.rl" +#line 2571 "upb/json/parser.rl" { hexdigit(parser, p); } break; case 7: -#line 2522 "upb/json/parser.rl" +#line 2572 "upb/json/parser.rl" { CHECK_RETURN_TOP(end_hex(parser)); } break; case 8: -#line 2528 "upb/json/parser.rl" +#line 2578 "upb/json/parser.rl" { CHECK_RETURN_TOP(escape(parser, p)); } break; case 9: -#line 2534 "upb/json/parser.rl" +#line 2584 "upb/json/parser.rl" { p--; {cs = stack[--top]; goto _again;} } break; case 10: -#line 2546 "upb/json/parser.rl" - { start_duration_base(parser, p); } +#line 2589 "upb/json/parser.rl" + { start_year(parser, p); } break; case 11: -#line 2547 "upb/json/parser.rl" - { CHECK_RETURN_TOP(end_duration_base(parser, p)); } +#line 2590 "upb/json/parser.rl" + { CHECK_RETURN_TOP(end_year(parser, p)); } break; case 12: -#line 2549 "upb/json/parser.rl" - { p--; {cs = stack[--top]; goto _again;} } +#line 2594 "upb/json/parser.rl" + { start_month(parser, p); } break; case 13: -#line 2554 "upb/json/parser.rl" - { start_timestamp_base(parser, p); } +#line 2595 "upb/json/parser.rl" + { CHECK_RETURN_TOP(end_month(parser, p)); } break; case 14: -#line 2555 "upb/json/parser.rl" - { CHECK_RETURN_TOP(end_timestamp_base(parser, p)); } +#line 2599 "upb/json/parser.rl" + { start_day(parser, p); } break; case 15: -#line 2557 "upb/json/parser.rl" - { start_timestamp_fraction(parser, p); } +#line 2600 "upb/json/parser.rl" + { CHECK_RETURN_TOP(end_day(parser, p)); } break; case 16: -#line 2558 "upb/json/parser.rl" - { CHECK_RETURN_TOP(end_timestamp_fraction(parser, p)); } +#line 2604 "upb/json/parser.rl" + { start_hour(parser, p); } break; case 17: -#line 2560 "upb/json/parser.rl" - { start_timestamp_zone(parser, p); } +#line 2605 "upb/json/parser.rl" + { CHECK_RETURN_TOP(end_hour(parser, p)); } break; case 18: -#line 2561 "upb/json/parser.rl" - { CHECK_RETURN_TOP(end_timestamp_zone(parser, p)); } +#line 2609 "upb/json/parser.rl" + { start_minute(parser, p); } break; case 19: -#line 2563 "upb/json/parser.rl" - { p--; {cs = stack[--top]; goto _again;} } +#line 2610 "upb/json/parser.rl" + { CHECK_RETURN_TOP(end_minute(parser, p)); } break; case 20: -#line 2568 "upb/json/parser.rl" - { start_fieldmask_path_text(parser, p); } +#line 2614 "upb/json/parser.rl" + { start_second(parser, p); } break; case 21: -#line 2569 "upb/json/parser.rl" - { end_fieldmask_path_text(parser, p); } +#line 2615 "upb/json/parser.rl" + { CHECK_RETURN_TOP(end_second(parser, p)); } break; case 22: -#line 2574 "upb/json/parser.rl" - { start_fieldmask_path(parser); } +#line 2620 "upb/json/parser.rl" + { start_duration_base(parser, p); } break; case 23: -#line 2575 "upb/json/parser.rl" - { end_fieldmask_path(parser); } +#line 2621 "upb/json/parser.rl" + { CHECK_RETURN_TOP(end_duration_base(parser, p)); } break; case 24: -#line 2581 "upb/json/parser.rl" +#line 2623 "upb/json/parser.rl" { p--; {cs = stack[--top]; goto _again;} } break; case 25: -#line 2586 "upb/json/parser.rl" +#line 2628 "upb/json/parser.rl" + { start_timestamp_base(parser); } + break; + case 26: +#line 2630 "upb/json/parser.rl" + { start_timestamp_fraction(parser, p); } + break; + case 27: +#line 2631 "upb/json/parser.rl" + { CHECK_RETURN_TOP(end_timestamp_fraction(parser, p)); } + break; + case 28: +#line 2633 "upb/json/parser.rl" + { start_timestamp_zone(parser, p); } + break; + case 29: +#line 2634 "upb/json/parser.rl" + { CHECK_RETURN_TOP(end_timestamp_zone(parser, p)); } + break; + case 30: +#line 2636 "upb/json/parser.rl" + { p--; {cs = stack[--top]; goto _again;} } + break; + case 31: +#line 2641 "upb/json/parser.rl" + { start_fieldmask_path_text(parser, p); } + break; + case 32: +#line 2642 "upb/json/parser.rl" + { end_fieldmask_path_text(parser, p); } + break; + case 33: +#line 2647 "upb/json/parser.rl" + { start_fieldmask_path(parser); } + break; + case 34: +#line 2648 "upb/json/parser.rl" + { end_fieldmask_path(parser); } + break; + case 35: +#line 2654 "upb/json/parser.rl" + { p--; {cs = stack[--top]; goto _again;} } + break; + case 36: +#line 2659 "upb/json/parser.rl" { if (is_wellknown_msg(parser, UPB_WELLKNOWN_TIMESTAMP)) { {stack[top++] = cs; cs = 47;goto _again;} @@ -2957,12 +3054,12 @@ _match: } } break; - case 26: -#line 2599 "upb/json/parser.rl" + case 37: +#line 2672 "upb/json/parser.rl" { p--; {stack[top++] = cs; cs = 78;goto _again;} } break; - case 27: -#line 2604 "upb/json/parser.rl" + case 38: +#line 2677 "upb/json/parser.rl" { if (is_wellknown_msg(parser, UPB_WELLKNOWN_ANY)) { start_any_member(parser, p); @@ -2971,12 +3068,12 @@ _match: } } break; - case 28: -#line 2611 "upb/json/parser.rl" + case 39: +#line 2684 "upb/json/parser.rl" { CHECK_RETURN_TOP(end_membername(parser)); } break; - case 29: -#line 2614 "upb/json/parser.rl" + case 40: +#line 2687 "upb/json/parser.rl" { if (is_wellknown_msg(parser, UPB_WELLKNOWN_ANY)) { end_any_member(parser, p); @@ -2985,8 +3082,8 @@ _match: } } break; - case 30: -#line 2625 "upb/json/parser.rl" + case 41: +#line 2698 "upb/json/parser.rl" { if (is_wellknown_msg(parser, UPB_WELLKNOWN_ANY)) { start_any_object(parser, p); @@ -2995,8 +3092,8 @@ _match: } } break; - case 31: -#line 2634 "upb/json/parser.rl" + case 42: +#line 2707 "upb/json/parser.rl" { if (is_wellknown_msg(parser, UPB_WELLKNOWN_ANY)) { CHECK_RETURN_TOP(end_any_object(parser, p)); @@ -3005,55 +3102,55 @@ _match: } } break; - case 32: -#line 2646 "upb/json/parser.rl" + case 43: +#line 2719 "upb/json/parser.rl" { CHECK_RETURN_TOP(start_array(parser)); } break; - case 33: -#line 2650 "upb/json/parser.rl" + case 44: +#line 2723 "upb/json/parser.rl" { end_array(parser); } break; - case 34: -#line 2655 "upb/json/parser.rl" + case 45: +#line 2728 "upb/json/parser.rl" { CHECK_RETURN_TOP(start_number(parser, p)); } break; - case 35: -#line 2656 "upb/json/parser.rl" + case 46: +#line 2729 "upb/json/parser.rl" { CHECK_RETURN_TOP(end_number(parser, p)); } break; - case 36: -#line 2658 "upb/json/parser.rl" + case 47: +#line 2731 "upb/json/parser.rl" { CHECK_RETURN_TOP(start_stringval(parser)); } break; - case 37: -#line 2659 "upb/json/parser.rl" + case 48: +#line 2732 "upb/json/parser.rl" { CHECK_RETURN_TOP(end_stringval(parser)); } break; - case 38: -#line 2661 "upb/json/parser.rl" + case 49: +#line 2734 "upb/json/parser.rl" { CHECK_RETURN_TOP(end_bool(parser, true)); } break; - case 39: -#line 2663 "upb/json/parser.rl" + case 50: +#line 2736 "upb/json/parser.rl" { CHECK_RETURN_TOP(end_bool(parser, false)); } break; - case 40: -#line 2665 "upb/json/parser.rl" + case 51: +#line 2738 "upb/json/parser.rl" { CHECK_RETURN_TOP(end_null(parser)); } break; - case 41: -#line 2667 "upb/json/parser.rl" + case 52: +#line 2740 "upb/json/parser.rl" { CHECK_RETURN_TOP(start_subobject_full(parser)); } break; - case 42: -#line 2668 "upb/json/parser.rl" + case 53: +#line 2741 "upb/json/parser.rl" { end_subobject_full(parser); } break; - case 43: -#line 2673 "upb/json/parser.rl" + case 54: +#line 2746 "upb/json/parser.rl" { p--; {cs = stack[--top]; goto _again;} } break; -#line 3057 "upb/json/parser.c" +#line 3154 "upb/json/parser.c" } } @@ -3070,32 +3167,32 @@ _again: while ( __nacts-- > 0 ) { switch ( *__acts++ ) { case 0: -#line 2505 "upb/json/parser.rl" +#line 2555 "upb/json/parser.rl" { p--; {cs = stack[--top]; if ( p == pe ) goto _test_eof; goto _again;} } break; - case 35: -#line 2656 "upb/json/parser.rl" + case 46: +#line 2729 "upb/json/parser.rl" { CHECK_RETURN_TOP(end_number(parser, p)); } break; - case 38: -#line 2661 "upb/json/parser.rl" + case 49: +#line 2734 "upb/json/parser.rl" { CHECK_RETURN_TOP(end_bool(parser, true)); } break; - case 39: -#line 2663 "upb/json/parser.rl" + case 50: +#line 2736 "upb/json/parser.rl" { CHECK_RETURN_TOP(end_bool(parser, false)); } break; - case 40: -#line 2665 "upb/json/parser.rl" + case 51: +#line 2738 "upb/json/parser.rl" { CHECK_RETURN_TOP(end_null(parser)); } break; - case 42: -#line 2668 "upb/json/parser.rl" + case 53: +#line 2741 "upb/json/parser.rl" { end_subobject_full(parser); } break; -#line 3099 "upb/json/parser.c" +#line 3196 "upb/json/parser.c" } } } @@ -3103,7 +3200,7 @@ goto _again;} } _out: {} } -#line 2701 "upb/json/parser.rl" +#line 2774 "upb/json/parser.rl" if (p != pe) { upb_status_seterrf(parser->status, "Parse error at '%.*s'\n", pe - p, p); @@ -3146,13 +3243,13 @@ static void json_parser_reset(upb_json_parser *p) { /* Emit Ragel initialization of the parser. */ -#line 3150 "upb/json/parser.c" +#line 3247 "upb/json/parser.c" { cs = json_start; top = 0; } -#line 2743 "upb/json/parser.rl" +#line 2816 "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 23e61b7..e7c456a 100644 --- a/upb/json/parser.rl +++ b/upb/json/parser.rl @@ -19,9 +19,6 @@ ** - handling of keys/escape-sequences/etc that span input buffers. */ -/* Need to define _XOPEN_SOURCE before any include to make strptime work. */ -#define _XOPEN_SOURCE 700 - #include <ctype.h> #include <errno.h> #include <float.h> @@ -1531,47 +1528,100 @@ static bool end_duration_base(upb_json_parser *p, const char *ptr) { return true; } -static void start_timestamp_base(upb_json_parser *p, const char *ptr) { +static int parse_timestamp_number(upb_json_parser *p) { + size_t len; + const char *buf; + char *end; + int val; + + /* atoi() and friends unfortunately do not support specifying the length of + * the input string, so we need to force a copy into a NULL-terminated buffer. */ + multipart_text(p, "\0", 1, false); + + buf = accumulate_getptr(p, &len); + val = atoi(buf); + multipart_end(p); + multipart_startaccum(p); + + return val; +} + +static void start_year(upb_json_parser *p, const char *ptr) { capture_begin(p, ptr); } -#define UPB_TIMESTAMP_BASE_SIZE 19 +static bool end_year(upb_json_parser *p, const char *ptr) { + if (!capture_end(p, ptr)) { + return false; + } + p->tm.tm_year = parse_timestamp_number(p) - 1900; + return true; +} -static bool end_timestamp_base(upb_json_parser *p, const char *ptr) { - size_t len; - const char *buf; - /* 3 for GMT and 1 for ending 0 */ - char timestamp_buf[UPB_TIMESTAMP_BASE_SIZE + 4]; +static void start_month(upb_json_parser *p, const char *ptr) { + capture_begin(p, ptr); +} +static bool end_month(upb_json_parser *p, const char *ptr) { if (!capture_end(p, ptr)) { return false; } + p->tm.tm_mon = parse_timestamp_number(p) - 1; + return true; +} - buf = accumulate_getptr(p, &len); - UPB_ASSERT(len == UPB_TIMESTAMP_BASE_SIZE); - memcpy(timestamp_buf, buf, UPB_TIMESTAMP_BASE_SIZE); - memcpy(timestamp_buf + UPB_TIMESTAMP_BASE_SIZE, "GMT", 3); - timestamp_buf[UPB_TIMESTAMP_BASE_SIZE + 3] = 0; +static void start_day(upb_json_parser *p, const char *ptr) { + capture_begin(p, ptr); +} -#if defined __MINGW32__ || defined __MINGW64__ - upb_status_seterrf(p->status, - "error parsing timestamp: mingw doesn't support strptime"); - return false; -#else - /* Parse seconds */ - if (strptime(timestamp_buf, "%FT%H:%M:%S%Z", &p->tm) == NULL) { - upb_status_seterrf(p->status, "error parsing timestamp: %s", buf); +static bool end_day(upb_json_parser *p, const char *ptr) { + if (!capture_end(p, ptr)) { return false; } -#endif + p->tm.tm_mday = parse_timestamp_number(p); + return true; +} - /* Clean up buffer */ - multipart_end(p); - multipart_startaccum(p); +static void start_hour(upb_json_parser *p, const char *ptr) { + capture_begin(p, ptr); +} +static bool end_hour(upb_json_parser *p, const char *ptr) { + if (!capture_end(p, ptr)) { + return false; + } + p->tm.tm_hour = parse_timestamp_number(p); return true; } +static void start_minute(upb_json_parser *p, const char *ptr) { + capture_begin(p, ptr); +} + +static bool end_minute(upb_json_parser *p, const char *ptr) { + if (!capture_end(p, ptr)) { + return false; + } + p->tm.tm_min = parse_timestamp_number(p); + return true; +} + +static void start_second(upb_json_parser *p, const char *ptr) { + capture_begin(p, ptr); +} + +static bool end_second(upb_json_parser *p, const char *ptr) { + if (!capture_end(p, ptr)) { + return false; + } + p->tm.tm_sec = parse_timestamp_number(p); + return true; +} + +static void start_timestamp_base(upb_json_parser *p) { + memset(&p->tm, 0, sizeof(struct tm)); +} + static void start_timestamp_fraction(upb_json_parser *p, const char *ptr) { capture_begin(p, ptr); } @@ -2534,12 +2584,36 @@ static bool does_fieldmask_end(upb_json_parser *p) { @{ fhold; fret; } ; - year = digit digit digit digit; - month = digit digit; - day = digit digit; - hour = digit digit; - minute = digit digit; - second = digit digit; + year = + (digit digit digit digit) + >{ start_year(parser, p); } + %{ CHECK_RETURN_TOP(end_year(parser, p)); } + ; + month = + (digit digit) + >{ start_month(parser, p); } + %{ CHECK_RETURN_TOP(end_month(parser, p)); } + ; + day = + (digit digit) + >{ start_day(parser, p); } + %{ CHECK_RETURN_TOP(end_day(parser, p)); } + ; + hour = + (digit digit) + >{ start_hour(parser, p); } + %{ CHECK_RETURN_TOP(end_hour(parser, p)); } + ; + minute = + (digit digit) + >{ start_minute(parser, p); } + %{ CHECK_RETURN_TOP(end_minute(parser, p)); } + ; + second = + (digit digit) + >{ start_second(parser, p); } + %{ CHECK_RETURN_TOP(end_second(parser, p)); } + ; duration_machine := ("-"? integer decimal?) @@ -2551,12 +2625,11 @@ static bool does_fieldmask_end(upb_json_parser *p) { timestamp_machine := (year "-" month "-" day "T" hour ":" minute ":" second) - >{ start_timestamp_base(parser, p); } - %{ CHECK_RETURN_TOP(end_timestamp_base(parser, p)); } + >{ start_timestamp_base(parser); } ("." digit+)? >{ start_timestamp_fraction(parser, p); } %{ CHECK_RETURN_TOP(end_timestamp_fraction(parser, p)); } - ([+\-] hour ":00" | "Z") + ([+\-] digit digit ":00" | "Z") >{ start_timestamp_zone(parser, p); } %{ CHECK_RETURN_TOP(end_timestamp_zone(parser, p)); } '"' |