Merge pull request #470 from Shopify/remove-exception-line

hsbt · web-flow · commit 572c9994648f · 2022-07-15T12:57:27.000+09:00
Stop including the parser source __LINE__ in exceptions
diff --git a/ext/json/ext/generator/generator.c b/ext/json/ext/generator/generator.c
@@ -997,10 +997,10 @@ static void generate_json_float(FBuffer *buffer, VALUE Vstate, JSON_Generator_St
     if (!allow_nan) {
         if (isinf(value)) {
             fbuffer_free(buffer);
-            rb_raise(eGeneratorError, "%u: %"PRIsVALUE" not allowed in JSON", __LINE__, RB_OBJ_STRING(tmp));
+            rb_raise(eGeneratorError, "%"PRIsVALUE" not allowed in JSON", RB_OBJ_STRING(tmp));
         } else if (isnan(value)) {
             fbuffer_free(buffer);
-            rb_raise(eGeneratorError, "%u: %"PRIsVALUE" not allowed in JSON", __LINE__, RB_OBJ_STRING(tmp));
+            rb_raise(eGeneratorError, "%"PRIsVALUE" not allowed in JSON", RB_OBJ_STRING(tmp));
         }
     }
     fbuffer_append_str(buffer, tmp);
diff --git a/ext/json/ext/parser/parser.c b/ext/json/ext/parser/parser.c
@@ -948,7 +948,7 @@ static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *resul
 
 					{p = p - 1; } {p+= 1; cs = 29; goto _out;}
 				} else {
-					rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+					rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p);
 				}
 			}
 			np = JSON_parse_float(json, p, pe, result);
@@ -990,7 +990,7 @@ static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *resul
 			if (json->allow_nan) {
 				*result = CInfinity;
 			} else {
-				rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p - 8);
+				rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p - 8);
 			}
 		}
 
@@ -1002,7 +1002,7 @@ static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *resul
 			if (json->allow_nan) {
 				*result = CNaN;
 			} else {
-				rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p - 2);
+				rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p - 2);
 			}
 		}
 
@@ -2348,7 +2348,7 @@ static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *resul
 	if(cs >= JSON_array_first_final) {
 		return p + 1;
 	} else {
-		rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+		rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p);
 		return NULL;
 	}
 }
@@ -2413,7 +2413,7 @@ static VALUE json_string_unescape(char *string, char *stringEnd, int intern, int
 					}
 					rb_enc_raise(
 					EXC_ENCODING eParserError,
-					"%u: incomplete unicode character escape sequence at '%s'", __LINE__, p
+					"incomplete unicode character escape sequence at '%s'", p
 					);
 				} else {
 					UTF32 ch = unescape_unicode((unsigned char *) ++pe);
@@ -2426,7 +2426,7 @@ static VALUE json_string_unescape(char *string, char *stringEnd, int intern, int
 							}
 							rb_enc_raise(
 							EXC_ENCODING eParserError,
-							"%u: incomplete surrogate pair at '%s'", __LINE__, p
+							"incomplete surrogate pair at '%s'", p
 							);
 						}
 						if (pe[0] == '\\' && pe[1] == 'u') {
@@ -3225,7 +3225,7 @@ static VALUE cParser_parse(VALUE self)
 	if (cs >= JSON_first_final && p == pe) {
 		return result;
 	} else {
-		rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+		rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p);
 		return Qnil;
 	}
 }
diff --git a/ext/json/ext/parser/parser.rl b/ext/json/ext/parser/parser.rl
@@ -222,14 +222,14 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu
         if (json->allow_nan) {
             *result = CNaN;
         } else {
-            rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p - 2);
+            rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p - 2);
         }
     }
     action parse_infinity {
         if (json->allow_nan) {
             *result = CInfinity;
         } else {
-            rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p - 8);
+            rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p - 8);
         }
     }
     action parse_string {
@@ -245,7 +245,7 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu
                 fexec p + 10;
                 fhold; fbreak;
             } else {
-                rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+                rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p);
             }
         }
         np = JSON_parse_float(json, fpc, pe, result);
@@ -447,7 +447,7 @@ static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *resul
     if(cs >= JSON_array_first_final) {
         return p + 1;
     } else {
-        rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+        rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p);
         return NULL;
     }
 }
@@ -512,7 +512,7 @@ static VALUE json_string_unescape(char *string, char *stringEnd, int intern, int
                       }
                       rb_enc_raise(
                         EXC_ENCODING eParserError,
-                        "%u: incomplete unicode character escape sequence at '%s'", __LINE__, p
+                        "incomplete unicode character escape sequence at '%s'", p
                       );
                     } else {
                         UTF32 ch = unescape_unicode((unsigned char *) ++pe);
@@ -525,7 +525,7 @@ static VALUE json_string_unescape(char *string, char *stringEnd, int intern, int
                               }
                               rb_enc_raise(
                                 EXC_ENCODING eParserError,
-                                "%u: incomplete surrogate pair at '%s'", __LINE__, p
+                                "incomplete surrogate pair at '%s'", p
                                 );
                             }
                             if (pe[0] == '\\' && pe[1] == 'u') {
@@ -864,7 +864,7 @@ static VALUE cParser_parse(VALUE self)
   if (cs >= JSON_first_final && p == pe) {
     return result;
   } else {
-    rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+    rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p);
     return Qnil;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -997,10 +997,10 @@ static void generate_json_float(FBuffer *buffer, VALUE Vstate, JSON_Generator_St`
`997`	`997`	`if (!allow_nan) {`
`998`	`998`	`if (isinf(value)) {`
`999`	`999`	`fbuffer_free(buffer);`
`1000`		`- rb_raise(eGeneratorError, "%u: %"PRIsVALUE" not allowed in JSON", __LINE__, RB_OBJ_STRING(tmp));`
	`1000`	`+ rb_raise(eGeneratorError, "%"PRIsVALUE" not allowed in JSON", RB_OBJ_STRING(tmp));`
`1001`	`1001`	`} else if (isnan(value)) {`
`1002`	`1002`	`fbuffer_free(buffer);`
`1003`		`- rb_raise(eGeneratorError, "%u: %"PRIsVALUE" not allowed in JSON", __LINE__, RB_OBJ_STRING(tmp));`
	`1003`	`+ rb_raise(eGeneratorError, "%"PRIsVALUE" not allowed in JSON", RB_OBJ_STRING(tmp));`
`1004`	`1004`	`}`
`1005`	`1005`	`}`
`1006`	`1006`	`fbuffer_append_str(buffer, tmp);`
Original file line number	Diff line number	Diff line change
`@@ -948,7 +948,7 @@ static char JSON_parse_value(JSON_Parser json, char p, char pe, VALUE *resul`
`948`	`948`
`949`	`949`	`{p = p - 1; } {p+= 1; cs = 29; goto _out;}`
`950`	`950`	`} else {`
`951`		`- rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);`
	`951`	`+ rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p);`
`952`	`952`	`}`
`953`	`953`	`}`
`954`	`954`	`np = JSON_parse_float(json, p, pe, result);`
`@@ -990,7 +990,7 @@ static char JSON_parse_value(JSON_Parser json, char p, char pe, VALUE *resul`
`990`	`990`	`if (json->allow_nan) {`
`991`	`991`	`*result = CInfinity;`
`992`	`992`	`} else {`
`993`		`- rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p - 8);`
	`993`	`+ rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p - 8);`
`994`	`994`	`}`
`995`	`995`	`}`
`996`	`996`
`@@ -1002,7 +1002,7 @@ static char JSON_parse_value(JSON_Parser json, char p, char pe, VALUE *resul`
`1002`	`1002`	`if (json->allow_nan) {`
`1003`	`1003`	`*result = CNaN;`
`1004`	`1004`	`} else {`
`1005`		`- rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p - 2);`
	`1005`	`+ rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p - 2);`
`1006`	`1006`	`}`
`1007`	`1007`	`}`
`1008`	`1008`
`@@ -2348,7 +2348,7 @@ static char JSON_parse_array(JSON_Parser json, char p, char pe, VALUE *resul`
`2348`	`2348`	`if(cs >= JSON_array_first_final) {`
`2349`	`2349`	`return p + 1;`
`2350`	`2350`	`} else {`
`2351`		`- rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);`
	`2351`	`+ rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p);`
`2352`	`2352`	`return NULL;`
`2353`	`2353`	`}`
`2354`	`2354`	`}`
`@@ -2413,7 +2413,7 @@ static VALUE json_string_unescape(char string, char stringEnd, int intern, int`
`2413`	`2413`	`}`
`2414`	`2414`	`rb_enc_raise(`
`2415`	`2415`	`EXC_ENCODING eParserError,`
`2416`		`- "%u: incomplete unicode character escape sequence at '%s'", __LINE__, p`
	`2416`	`+ "incomplete unicode character escape sequence at '%s'", p`
`2417`	`2417`	`);`
`2418`	`2418`	`} else {`
`2419`	`2419`	`UTF32 ch = unescape_unicode((unsigned char *) ++pe);`
`@@ -2426,7 +2426,7 @@ static VALUE json_string_unescape(char string, char stringEnd, int intern, int`
`2426`	`2426`	`}`
`2427`	`2427`	`rb_enc_raise(`
`2428`	`2428`	`EXC_ENCODING eParserError,`
`2429`		`- "%u: incomplete surrogate pair at '%s'", __LINE__, p`
	`2429`	`+ "incomplete surrogate pair at '%s'", p`
`2430`	`2430`	`);`
`2431`	`2431`	`}`
`2432`	`2432`	`if (pe[0] == '\\' && pe[1] == 'u') {`
`@@ -3225,7 +3225,7 @@ static VALUE cParser_parse(VALUE self)`
`3225`	`3225`	`if (cs >= JSON_first_final && p == pe) {`
`3226`	`3226`	`return result;`
`3227`	`3227`	`} else {`
`3228`		`- rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);`
	`3228`	`+ rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p);`
`3229`	`3229`	`return Qnil;`
`3230`	`3230`	`}`
`3231`	`3231`	`}`
Original file line number	Diff line number	Diff line change
`@@ -222,14 +222,14 @@ static char JSON_parse_object(JSON_Parser json, char p, char pe, VALUE *resu`
`222`	`222`	`if (json->allow_nan) {`
`223`	`223`	`*result = CNaN;`
`224`	`224`	`} else {`
`225`		`- rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p - 2);`
	`225`	`+ rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p - 2);`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`	`action parse_infinity {`
`229`	`229`	`if (json->allow_nan) {`
`230`	`230`	`*result = CInfinity;`
`231`	`231`	`} else {`
`232`		`- rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p - 8);`
	`232`	`+ rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p - 8);`
`233`	`233`	`}`
`234`	`234`	`}`
`235`	`235`	`action parse_string {`
`@@ -245,7 +245,7 @@ static char JSON_parse_object(JSON_Parser json, char p, char pe, VALUE *resu`
`245`	`245`	`fexec p + 10;`
`246`	`246`	`fhold; fbreak;`
`247`	`247`	`} else {`
`248`		`- rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);`
	`248`	`+ rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p);`
`249`	`249`	`}`
`250`	`250`	`}`
`251`	`251`	`np = JSON_parse_float(json, fpc, pe, result);`
`@@ -447,7 +447,7 @@ static char JSON_parse_array(JSON_Parser json, char p, char pe, VALUE *resul`
`447`	`447`	`if(cs >= JSON_array_first_final) {`
`448`	`448`	`return p + 1;`
`449`	`449`	`} else {`
`450`		`- rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);`
	`450`	`+ rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p);`
`451`	`451`	`return NULL;`
`452`	`452`	`}`
`453`	`453`	`}`
`@@ -512,7 +512,7 @@ static VALUE json_string_unescape(char string, char stringEnd, int intern, int`
`512`	`512`	`}`
`513`	`513`	`rb_enc_raise(`
`514`	`514`	`EXC_ENCODING eParserError,`
`515`		`- "%u: incomplete unicode character escape sequence at '%s'", __LINE__, p`
	`515`	`+ "incomplete unicode character escape sequence at '%s'", p`
`516`	`516`	`);`
`517`	`517`	`} else {`
`518`	`518`	`UTF32 ch = unescape_unicode((unsigned char *) ++pe);`
`@@ -525,7 +525,7 @@ static VALUE json_string_unescape(char string, char stringEnd, int intern, int`
`525`	`525`	`}`
`526`	`526`	`rb_enc_raise(`
`527`	`527`	`EXC_ENCODING eParserError,`
`528`		`- "%u: incomplete surrogate pair at '%s'", __LINE__, p`
	`528`	`+ "incomplete surrogate pair at '%s'", p`
`529`	`529`	`);`
`530`	`530`	`}`
`531`	`531`	`if (pe[0] == '\\' && pe[1] == 'u') {`
`@@ -864,7 +864,7 @@ static VALUE cParser_parse(VALUE self)`
`864`	`864`	`if (cs >= JSON_first_final && p == pe) {`
`865`	`865`	`return result;`
`866`	`866`	`} else {`
`867`		`- rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);`
	`867`	`+ rb_enc_raise(EXC_ENCODING eParserError, "unexpected token at '%s'", p);`
`868`	`868`	`return Qnil;`
`869`	`869`	`}`
`870`	`870`	`}`