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

style: clean up the scanner and parser

Browse Source 
* src/scan-gram.l: Formatting changes.
Add "missing" assertion for symmetry.
* src/parse-gram.y: Formatting changes.
This commit is contained in:
Akim Demaille
2018-11-10 12:55:27 +01:00
parent a91873a1b9
commit be737c3dd6
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/parse-gram.y
View File

@@ -592,10 +592,10 @@ rules_or_grammar_declaration:
rules: rules:
id_colon named_ref.opt { current_lhs ($1, @1, $2); } rhses.1 id_colon named_ref.opt { current_lhs ($1, @1, $2); } rhses.1
{ {
/* Free the current lhs. */ /* Free the current lhs. */
current_lhs (0, @1, 0); current_lhs (0, @1, 0);
} }
; ;
rhses.1: rhses.1:

11
src/scan-gram.l
View File

@@ -591,10 +591,11 @@ eqopt ([[:space:]]*=)?
<SC_ESCAPED_STRING,SC_ESCAPED_CHARACTER> <SC_ESCAPED_STRING,SC_ESCAPED_CHARACTER>
{ {
\\[0-7]{1,3} { \\[0-7]{1,3} {
verify (UCHAR_MAX < ULONG_MAX);
unsigned long c = strtoul (yytext + 1, NULL, 8); unsigned long c = strtoul (yytext + 1, NULL, 8);
if (!c || UCHAR_MAX < c) if (!c || UCHAR_MAX < c)
complain (loc, complaint, _("invalid number after \\-escape: %s"), complain (loc, complaint, _("invalid number after \\-escape: %s"),
yytext+1); yytext+1);
else else
obstack_1grow (&obstack_for_string, c); obstack_1grow (&obstack_for_string, c);
} }
@@ -604,7 +605,7 @@ eqopt ([[:space:]]*=)?
unsigned long c = strtoul (yytext + 2, NULL, 16); unsigned long c = strtoul (yytext + 2, NULL, 16);
if (!c || UCHAR_MAX < c) if (!c || UCHAR_MAX < c)
complain (loc, complaint, _("invalid number after \\-escape: %s"), complain (loc, complaint, _("invalid number after \\-escape: %s"),
yytext+1); yytext+1);
else else
obstack_1grow (&obstack_for_string, c); obstack_1grow (&obstack_for_string, c);
} }
@@ -624,7 +625,7 @@ eqopt ([[:space:]]*=)?
int c = convert_ucn_to_byte (yytext); int c = convert_ucn_to_byte (yytext);
if (c <= 0) if (c <= 0)
complain (loc, complaint, _("invalid number after \\-escape: %s"), complain (loc, complaint, _("invalid number after \\-escape: %s"),
yytext+1); yytext+1);
else else
obstack_1grow (&obstack_for_string, c); obstack_1grow (&obstack_for_string, c);
} }
@@ -636,7 +637,7 @@ eqopt ([[:space:]]*=)?
else else
p = quotearg_style_mem (escape_quoting_style, p, 1); p = quotearg_style_mem (escape_quoting_style, p, 1);
complain (loc, complaint, _("invalid character after \\-escape: %s"), complain (loc, complaint, _("invalid character after \\-escape: %s"),
p); p);
} }
} }
@@ -853,7 +854,7 @@ scan_integer (char const *number, int base, location loc)
if (INT_MAX < num) if (INT_MAX < num)
{ {
complain (&loc, complaint, _("integer out of range: %s"), complain (&loc, complaint, _("integer out of range: %s"),
quote (number)); quote (number));
num = INT_MAX; num = INT_MAX;
} }