Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-14 23:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use more accurate diagnostics, e.g.

Browse Source 
"integer out of range" rather than "invalid value".
This commit is contained in:
Paul Eggert
2002-11-06 07:01:06 +00:00
parent 886a425c6f
commit 98f2caaa5f
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/scan-gram.l
View File

@@ -274,7 +274,7 @@ splice (\\[ \f\t\v]*\n)*
num = strtoul (yytext, 0, 10); num = strtoul (yytext, 0, 10);
if (INT_MAX < num || errno) if (INT_MAX < num || errno)
{ {
complain_at (*yylloc, _("invalid value: %s"), quote (yytext)); complain_at (*yylloc, _("integer out of range: %s"), quote (yytext));
num = INT_MAX; num = INT_MAX;
} }
yylval->integer = num; yylval->integer = num;
@@ -435,7 +435,7 @@ splice (\\[ \f\t\v]*\n)*
[^\'\\]+ YY_OBS_GROW; [^\'\\]+ YY_OBS_GROW;
<<EOF>> { <<EOF>> {
complain_at (*yylloc, _("unexpected end of file in a character")); complain_at (*yylloc, _("unexpected end of file in a character literal"));
assert (yy_top_state () == INITIAL); assert (yy_top_state () == INITIAL);
YY_OBS_FINISH; YY_OBS_FINISH;
yylval->string = last_string; yylval->string = last_string;
@@ -455,7 +455,8 @@ splice (\\[ \f\t\v]*\n)*
unsigned long c = strtoul (yytext + 1, 0, 8); unsigned long c = strtoul (yytext + 1, 0, 8);
if (UCHAR_MAX < c) if (UCHAR_MAX < c)
{ {
complain_at (*yylloc, _("invalid escape: %s"), quote (yytext)); complain_at (*yylloc, _("invalid escape sequence: %s"),
quote (yytext));
YY_STEP; YY_STEP;
} }
else else
@@ -468,7 +469,8 @@ splice (\\[ \f\t\v]*\n)*
c = strtoul (yytext + 2, 0, 16); c = strtoul (yytext + 2, 0, 16);
if (UCHAR_MAX < c || errno) if (UCHAR_MAX < c || errno)
{ {
complain_at (*yylloc, _("invalid escape: %s"), quote (yytext)); complain_at (*yylloc, _("invalid escape sequence: %s"),
quote (yytext));
YY_STEP; YY_STEP;
} }
else else
@@ -487,14 +489,16 @@ splice (\\[ \f\t\v]*\n)*
int c = convert_ucn_to_byte (yytext); int c = convert_ucn_to_byte (yytext);
if (c < 0) if (c < 0)
{ {
complain_at (*yylloc, _("invalid escape: %s"), quote (yytext)); complain_at (*yylloc, _("invalid escape sequence: %s"),
quote (yytext));
YY_STEP; YY_STEP;
} }
else else
obstack_1grow (&string_obstack, c); obstack_1grow (&string_obstack, c);
} }
\\(.|\n) { \\(.|\n) {
complain_at (*yylloc, _("unrecognized escape: %s"), quote (yytext)); complain_at (*yylloc, _("unrecognized escape sequence: %s"),
quote (yytext));
YY_OBS_GROW; YY_OBS_GROW;
} }
/* FLex wants this rule, in case of a `\<<EOF>>'. */ /* FLex wants this rule, in case of a `\<<EOF>>'. */
@@ -522,7 +526,7 @@ splice (\\[ \f\t\v]*\n)*
\\ YY_OBS_GROW; \\ YY_OBS_GROW;
<<EOF>> { <<EOF>> {
complain_at (*yylloc, _("unexpected end of file in a character")); complain_at (*yylloc, _("unexpected end of file in a character literal"));
assert (yy_top_state () != INITIAL); assert (yy_top_state () != INITIAL);
yy_pop_state (); yy_pop_state ();
} }
@@ -609,7 +613,7 @@ splice (\\[ \f\t\v]*\n)*
[^\"$%\'/<@\[\]\{\}]+|[$%/<@]|"<"{splice}"<" YY_OBS_GROW; [^\"$%\'/<@\[\]\{\}]+|[$%/<@]|"<"{splice}"<" YY_OBS_GROW;
<<EOF>> { <<EOF>> {
complain_at (*yylloc, _("unexpected end of file in a braced code")); complain_at (*yylloc, _("unexpected end of file in `{ ... }'"));
yy_pop_state (); yy_pop_state ();
YY_OBS_FINISH; YY_OBS_FINISH;
yylval->string = last_string; yylval->string = last_string;
@@ -636,7 +640,7 @@ splice (\\[ \f\t\v]*\n)*
"%" YY_OBS_GROW; "%" YY_OBS_GROW;
<<EOF>> { <<EOF>> {
complain_at (*yylloc, _("unexpected end of file in a prologue")); complain_at (*yylloc, _("unexpected end of file in `%%{ ... %%}'"));
yy_pop_state (); yy_pop_state ();
YY_OBS_FINISH; YY_OBS_FINISH;
yylval->string = last_string; yylval->string = last_string;
@@ -723,7 +727,7 @@ handle_action_dollar (char *text, location_t location)
rule_length, n, type_name); rule_length, n, type_name);
} }
else else
complain_at (location, _("invalid value: %s"), quote (text)); complain_at (location, _("integer out of range: %s"), quote (text));
} }
} }
@@ -795,7 +799,7 @@ handle_action_at (char *text, location_t location)
rule_length, n); rule_length, n);
} }
else else
complain_at (location, _("invalid value: %s"), quote (text)); complain_at (location, _("integer out of range: %s"), quote (text));
} }
} }