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

style: introduce parse_positional_ref

Browse Source 
* src/scan-code.l: here.
This commit is contained in:
Akim Demaille
2020-07-05 15:53:42 +02:00
parent aac79ca103
commit bad4fc09a7
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/scan-code.l
View File

@@ -401,6 +401,23 @@ show_sub_messages (warnings warning,
points to LHS ($$) of the current rule or midrule. */ points to LHS ($$) of the current rule or midrule. */
#define LHS_REF (INT_MIN + 1) #define LHS_REF (INT_MIN + 1)
/* Parse a positional reference in RULE. */
static long
parse_positional_ref (char *cp, int rule_length,
char *text, const location *text_loc)
{
long num = strtol (cp, &cp, 10);
if (1 - INT_MAX + rule_length <= num && num <= rule_length)
return num;
else
{
complain (text_loc, complaint, _("integer out of range: %s"),
quote (text));
return INVALID_REF;
}
}
/* Parse named or positional reference. In case of positional /* Parse named or positional reference. In case of positional
references, can return negative values for $-n "deep" stack references, can return negative values for $-n "deep" stack
accesses. */ accesses. */
@@ -412,18 +429,8 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
if ('$' == *cp) if ('$' == *cp)
return LHS_REF; return LHS_REF;
if (c_isdigit (*cp) || (*cp == '-' && c_isdigit (* (cp + 1)))) if (c_isdigit (*cp) || (*cp == '-' && c_isdigit (cp[1])))
{ return parse_positional_ref (cp, rule_length, text, text_loc);
long num = strtol (cp, &cp, 10);
if (1 - INT_MAX + rule_length <= num && num <= rule_length)
return num;
else
{
complain (text_loc, complaint, _("integer out of range: %s"),
quote (text));
return INVALID_REF;
}
}
bool const explicit_bracketing = *cp == '['; bool const explicit_bracketing = *cp == '[';
@@ -585,7 +592,7 @@ fetch_type_name (char *cp, char const **type_name,
/*------------------------------------------------------------------. /*------------------------------------------------------------------.
| TEXT is pointing to a wannabee semantic value (i.e., a '$'). | | TEXT is pointing to a wannabee semantic value (i.e., a '$'). |
| | | |
| Possible inputs: $[<TYPENAME>]($|integer) | | Possible inputs: $[<TYPENAME>]($|INTEGER) |
| | | |
| Output to OBSTACK_FOR_STRING a reference to this semantic value. | | Output to OBSTACK_FOR_STRING a reference to this semantic value. |
`------------------------------------------------------------------*/ `------------------------------------------------------------------*/