Sync update: haberman@'s internal changes.

2 files changed, 31 insertions, 23 deletions

diff --git a/upb/json/parser.c b/upb/json/parser.c
index 9a331e4..2687713 100644
--- a/upb/json/parser.c
+++ b/upb/json/parser.c
@@ -48,13 +48,13 @@ static upb_selector_t getsel(upb_json_parser *p) {
       p, upb_handlers_getprimitivehandlertype(p->top->f));
 }
 
-static void start_member(upb_json_parser *p, const char *ptr) {
+static void start_member(upb_json_parser *p) {
   assert(!p->top->f);
   assert(!p->accumulated);
   p->accumulated_len = 0;
 }
 
-static bool end_member(upb_json_parser *p, const char *ptr) {
+static bool end_member(upb_json_parser *p) {
   // TODO(haberman): support keys that span buffers or have escape sequences.
   assert(!p->top->f);
   assert(p->accumulated);
@@ -307,7 +307,7 @@ static bool end_text(upb_json_parser *p, const char *ptr) {
   return true;
 }
 
-static bool start_stringval(upb_json_parser *p, const char *ptr) {
+static bool start_stringval(upb_json_parser *p) {
   assert(p->top->f);
 
   if (!upb_fielddef_isstring(p->top->f)) {
@@ -329,7 +329,7 @@ static bool start_stringval(upb_json_parser *p, const char *ptr) {
   return true;
 }
 
-static void end_stringval(upb_json_parser *p, const char *ptr) {
+static void end_stringval(upb_json_parser *p) {
   p->top--;
   upb_selector_t sel = getsel_for_handlertype(p, UPB_HANDLER_ENDSTR);
   upb_sink_endstr(&p->top->sink, sel);
@@ -441,7 +441,7 @@ static void start_hex(upb_json_parser *p, const char *ptr) {
 
 static void hex(upb_json_parser *p, const char *end) {
   const char *start = p->text_begin;
-  assert(end - start == 4);
+  UPB_ASSERT_VAR(end, end - start == 4);
   uint16_t codepoint =
       (hexdigit(start[0]) << 12) |
       (hexdigit(start[1]) << 8) |
@@ -639,6 +639,8 @@ static const int json_en_main = 1;
 
 size_t parse(void *closure, const void *hd, const char *buf, size_t size,
              const upb_bufhandle *handle) {
+  UPB_UNUSED(hd);
+  UPB_UNUSED(handle);
   upb_json_parser *parser = closure;
 
   // Variables used by Ragel's generated code.
@@ -650,7 +652,7 @@ size_t parse(void *closure, const void *hd, const char *buf, size_t size,
   const char *pe = buf + size;
 
   
-#line 654 "upb/json/parser.c"
+#line 656 "upb/json/parser.c"
 	{
 	int _klen;
 	unsigned int _trans;
@@ -766,11 +768,11 @@ _match:
 	break;
 	case 10:
 #line 519 "upb/json/parser.rl"
-	{ start_member(parser, p); }
+	{ start_member(parser); }
 	break;
 	case 11:
 #line 520 "upb/json/parser.rl"
-	{ CHECK_RETURN_TOP(end_member(parser, p)); }
+	{ CHECK_RETURN_TOP(end_member(parser)); }
 	break;
 	case 12:
 #line 523 "upb/json/parser.rl"
@@ -802,11 +804,11 @@ _match:
 	break;
 	case 19:
 #line 550 "upb/json/parser.rl"
-	{ CHECK_RETURN_TOP(start_stringval(parser, p)); }
+	{ CHECK_RETURN_TOP(start_stringval(parser)); }
 	break;
 	case 20:
 #line 551 "upb/json/parser.rl"
-	{ end_stringval(parser, p); }
+	{ end_stringval(parser); }
 	break;
 	case 21:
 #line 553 "upb/json/parser.rl"
@@ -832,7 +834,7 @@ _match:
 #line 565 "upb/json/parser.rl"
 	{ p--; {cs = stack[--top]; goto _again;} }
 	break;
-#line 836 "upb/json/parser.c"
+#line 838 "upb/json/parser.c"
 		}
 	}
 
@@ -845,7 +847,7 @@ _again:
 	_out: {}
 	}
 
-#line 585 "upb/json/parser.rl"
+#line 587 "upb/json/parser.rl"
 
   if (p != pe) {
     upb_status_seterrf(parser->status, "Parse error at %s\n", p);
@@ -860,6 +862,8 @@ error:
 }
 
 bool end(void *closure, const void *hd) {
+  UPB_UNUSED(closure);
+  UPB_UNUSED(hd);
   return true;
 }
 
@@ -884,13 +888,13 @@ void upb_json_parser_reset(upb_json_parser *p) {
   int top;
   // Emit Ragel initialization of the parser.
   
-#line 888 "upb/json/parser.c"
+#line 892 "upb/json/parser.c"
 	{
 	cs = json_start;
 	top = 0;
 	}
 
-#line 623 "upb/json/parser.rl"
+#line 627 "upb/json/parser.rl"
   p->current_state = cs;
   p->parser_top = top;
   p->text_begin = NULL;
diff --git a/upb/json/parser.rl b/upb/json/parser.rl
index f5e1634..92a1566 100644
--- a/upb/json/parser.rl
+++ b/upb/json/parser.rl
@@ -46,13 +46,13 @@ static upb_selector_t getsel(upb_json_parser *p) {
       p, upb_handlers_getprimitivehandlertype(p->top->f));
 }
 
-static void start_member(upb_json_parser *p, const char *ptr) {
+static void start_member(upb_json_parser *p) {
   assert(!p->top->f);
   assert(!p->accumulated);
   p->accumulated_len = 0;
 }
 
-static bool end_member(upb_json_parser *p, const char *ptr) {
+static bool end_member(upb_json_parser *p) {
   // TODO(haberman): support keys that span buffers or have escape sequences.
   assert(!p->top->f);
   assert(p->accumulated);
@@ -305,7 +305,7 @@ static bool end_text(upb_json_parser *p, const char *ptr) {
   return true;
 }
 
-static bool start_stringval(upb_json_parser *p, const char *ptr) {
+static bool start_stringval(upb_json_parser *p) {
   assert(p->top->f);
 
   if (!upb_fielddef_isstring(p->top->f)) {
@@ -327,7 +327,7 @@ static bool start_stringval(upb_json_parser *p, const char *ptr) {
   return true;
 }
 
-static void end_stringval(upb_json_parser *p, const char *ptr) {
+static void end_stringval(upb_json_parser *p) {
   p->top--;
   upb_selector_t sel = getsel_for_handlertype(p, UPB_HANDLER_ENDSTR);
   upb_sink_endstr(&p->top->sink, sel);
@@ -439,7 +439,7 @@ static void start_hex(upb_json_parser *p, const char *ptr) {
 
 static void hex(upb_json_parser *p, const char *end) {
   const char *start = p->text_begin;
-  assert(end - start == 4);
+  UPB_ASSERT_VAR(end, end - start == 4);
   uint16_t codepoint =
       (hexdigit(start[0]) << 12) |
       (hexdigit(start[1]) << 8) |
@@ -516,8 +516,8 @@ static void hex(upb_json_parser *p, const char *end) {
   member =
     ws
     string
-      >{ start_member(parser, p); }
-      %{ CHECK_RETURN_TOP(end_member(parser, p)); }
+      >{ start_member(parser); }
+      %{ CHECK_RETURN_TOP(end_member(parser)); }
     ws ":" ws
     value2
       %{ clear_member(parser); }
@@ -547,8 +547,8 @@ static void hex(upb_json_parser *p, const char *end) {
       >{ start_number(parser, p); }
       %{ end_number(parser, p); }
     | string
-      >{ CHECK_RETURN_TOP(start_stringval(parser, p)); }
-      %{ end_stringval(parser, p); }
+      >{ CHECK_RETURN_TOP(start_stringval(parser)); }
+      %{ end_stringval(parser); }
     | "true"
       %{ CHECK_RETURN_TOP(putbool(parser, true)); }
     | "false"
@@ -571,6 +571,8 @@ static void hex(upb_json_parser *p, const char *end) {
 
 size_t parse(void *closure, const void *hd, const char *buf, size_t size,
              const upb_bufhandle *handle) {
+  UPB_UNUSED(hd);
+  UPB_UNUSED(handle);
   upb_json_parser *parser = closure;
 
   // Variables used by Ragel's generated code.
@@ -596,6 +598,8 @@ error:
 }
 
 bool end(void *closure, const void *hd) {
+  UPB_UNUSED(closure);
+  UPB_UNUSED(hd);
   return true;
 }