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

portability: use INT_LITERAL instead of INT because MSVC defines INT

Browse Source 
It is defined as a typedef, not a macro.
https://lists.gnu.org/r/bison-patches/2020-08/msg00001.html

* src/parse-gram.y, src/scan-gram.l: here.
This commit is contained in:
Maarten De Braekeleer
2020-08-01 20:22:28 +02:00
committed by Akim Demaille
parent 977e19840d
commit 8cf098415e
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
THANKS
View File

@@ -110,6 +110,7 @@ Lars Wendler polynomial-c@gentoo.org
László Várady laszlo.varady93@gmail.com László Várady laszlo.varady93@gmail.com
Laurent Mascherpa laurent.mascherpa@epita.fr Laurent Mascherpa laurent.mascherpa@epita.fr
Lie Yan lie.yan@kaust.edu.sa Lie Yan lie.yan@kaust.edu.sa
Maarten De Braekeleer maarten.debraekeleer@gmail.com
Magnus Fromreide magfr@lysator.liu.se Magnus Fromreide magfr@lysator.liu.se
Marc Autret autret_m@epita.fr Marc Autret autret_m@epita.fr
Marc Mendiola mmendiol@usc.edu Marc Mendiola mmendiol@usc.edu

14
src/parse-gram.y
View File

@@ -249,7 +249,7 @@
%printer { fprintf (yyo, "%%%s", $$); } PERCENT_FLAG %printer { fprintf (yyo, "%%%s", $$); } PERCENT_FLAG
%printer { fprintf (yyo, "<%s>", $$); } TAG tag %printer { fprintf (yyo, "<%s>", $$); } TAG tag
%token <int> INT _("integer literal") %token <int> INT_LITERAL _("integer literal")
%printer { fprintf (yyo, "%d", $$); } <int> %printer { fprintf (yyo, "%d", $$); } <int>
%type <symbol*> id id_colon string_as_id symbol token_decl token_decl_for_prec %type <symbol*> id id_colon string_as_id symbol token_decl token_decl_for_prec
@@ -342,8 +342,8 @@ prologue_declaration:
| "%defines" { defines_flag = true; } | "%defines" { defines_flag = true; }
| "%defines" STRING { handle_defines ($2); } | "%defines" STRING { handle_defines ($2); }
| "%error-verbose" { handle_error_verbose (&@$, $1); } | "%error-verbose" { handle_error_verbose (&@$, $1); }
| "%expect" INT { expected_sr_conflicts = $2; } | "%expect" INT_LITERAL { expected_sr_conflicts = $2; }
| "%expect-rr" INT { expected_rr_conflicts = $2; } | "%expect-rr" INT_LITERAL { expected_rr_conflicts = $2; }
| "%file-prefix" STRING { handle_file_prefix (&@$, &@1, $1, $2); } | "%file-prefix" STRING { handle_file_prefix (&@$, &@1, $1, $2); }
| "%glr-parser" | "%glr-parser"
{ {
@@ -561,7 +561,7 @@ token_decl:
%type <int> int.opt; %type <int> int.opt;
int.opt: int.opt:
%empty { $$ = -1; } %empty { $$ = -1; }
| INT | INT_LITERAL
; ;
%type <symbol*> alias; %type <symbol*> alias;
@@ -703,13 +703,13 @@ rhs:
{ grammar_current_rule_empty_set (@2); } { grammar_current_rule_empty_set (@2); }
| rhs "%prec" symbol | rhs "%prec" symbol
{ grammar_current_rule_prec_set ($3, @3); } { grammar_current_rule_prec_set ($3, @3); }
| rhs "%dprec" INT | rhs "%dprec" INT_LITERAL
{ grammar_current_rule_dprec_set ($3, @3); } { grammar_current_rule_dprec_set ($3, @3); }
| rhs "%merge" TAG | rhs "%merge" TAG
{ grammar_current_rule_merge_set ($3, @3); } { grammar_current_rule_merge_set ($3, @3); }
| rhs "%expect" INT | rhs "%expect" INT_LITERAL
{ grammar_current_rule_expect_sr ($3, @3); } { grammar_current_rule_expect_sr ($3, @3); }
| rhs "%expect-rr" INT | rhs "%expect-rr" INT_LITERAL
{ grammar_current_rule_expect_rr ($3, @3); } { grammar_current_rule_expect_rr ($3, @3); }
; ;

10
src/scan-gram.l
View File

@@ -322,8 +322,8 @@ eqopt ({sp}=)?
BEGIN SC_AFTER_IDENTIFIER; BEGIN SC_AFTER_IDENTIFIER;
} }
{int} RETURN_VALUE (INT, scan_integer (yytext, 10, *loc)); {int} RETURN_VALUE (INT_LITERAL, scan_integer (yytext, 10, *loc));
{xint} RETURN_VALUE (INT, scan_integer (yytext, 16, *loc)); {xint} RETURN_VALUE (INT_LITERAL, scan_integer (yytext, 16, *loc));
/* Identifiers may not start with a digit. Yet, don't silently /* Identifiers may not start with a digit. Yet, don't silently
accept "1FOO" as "1 FOO". */ accept "1FOO" as "1 FOO". */
@@ -934,9 +934,9 @@ convert_ucn_to_byte (char const *ucn)
} }
/*---------------------------------------------------------------------. /*----------------------------------------------------------------------------.
| Handle '#line INT( "FILE")?\n'. ARGS has already skipped '#line '. | | Handle '#line INT_LITERAL( "FILE")?\n'. ARGS has already skipped '#line '. |
`---------------------------------------------------------------------*/ `----------------------------------------------------------------------------*/
static void static void
handle_syncline (char *args, location loc) handle_syncline (char *args, location loc)