diff options
| author | Maarten De Braekeleer <maarten.debraekeleer@gmail.com> | 2020-08-01 20:22:28 +0200 |
|---|---|---|
| committer | Akim Demaille <akim.demaille@gmail.com> | 2020-08-02 08:32:30 +0200 |
| commit | 8cf098415ed269282f8d59999222ddae83e7ac3c (patch) | |
| tree | e8393d0955d2e35a11fc5bfb83973da37e1c5fbc | |
| parent | 977e19840d085d09ed454ca8aae1b62b9351034a (diff) | |
| download | bison-8cf098415ed269282f8d59999222ddae83e7ac3c.tar.gz | |
portability: use INT_LITERAL instead of INT because MSVC defines INT
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.
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | src/parse-gram.y | 14 | ||||
| -rw-r--r-- | src/scan-gram.l | 10 |
3 files changed, 13 insertions, 12 deletions
@@ -110,6 +110,7 @@ Lars Wendler polynomial-c@gentoo.org László Várady laszlo.varady93@gmail.com Laurent Mascherpa laurent.mascherpa@epita.fr Lie Yan lie.yan@kaust.edu.sa +Maarten De Braekeleer maarten.debraekeleer@gmail.com Magnus Fromreide magfr@lysator.liu.se Marc Autret autret_m@epita.fr Marc Mendiola mmendiol@usc.edu diff --git a/src/parse-gram.y b/src/parse-gram.y index 269f776e..351da393 100644 --- a/src/parse-gram.y +++ b/src/parse-gram.y @@ -249,7 +249,7 @@ %printer { fprintf (yyo, "%%%s", $$); } PERCENT_FLAG %printer { fprintf (yyo, "<%s>", $$); } TAG tag -%token <int> INT _("integer literal") +%token <int> INT_LITERAL _("integer literal") %printer { fprintf (yyo, "%d", $$); } <int> %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" STRING { handle_defines ($2); } | "%error-verbose" { handle_error_verbose (&@$, $1); } -| "%expect" INT { expected_sr_conflicts = $2; } -| "%expect-rr" INT { expected_rr_conflicts = $2; } +| "%expect" INT_LITERAL { expected_sr_conflicts = $2; } +| "%expect-rr" INT_LITERAL { expected_rr_conflicts = $2; } | "%file-prefix" STRING { handle_file_prefix (&@$, &@1, $1, $2); } | "%glr-parser" { @@ -561,7 +561,7 @@ token_decl: %type <int> int.opt; int.opt: %empty { $$ = -1; } -| INT +| INT_LITERAL ; %type <symbol*> alias; @@ -703,13 +703,13 @@ rhs: { grammar_current_rule_empty_set (@2); } | rhs "%prec" symbol { grammar_current_rule_prec_set ($3, @3); } -| rhs "%dprec" INT +| rhs "%dprec" INT_LITERAL { grammar_current_rule_dprec_set ($3, @3); } | rhs "%merge" TAG { grammar_current_rule_merge_set ($3, @3); } -| rhs "%expect" INT +| rhs "%expect" INT_LITERAL { grammar_current_rule_expect_sr ($3, @3); } -| rhs "%expect-rr" INT +| rhs "%expect-rr" INT_LITERAL { grammar_current_rule_expect_rr ($3, @3); } ; diff --git a/src/scan-gram.l b/src/scan-gram.l index ad2904ce..bd367fa5 100644 --- a/src/scan-gram.l +++ b/src/scan-gram.l @@ -322,8 +322,8 @@ eqopt ({sp}=)? BEGIN SC_AFTER_IDENTIFIER; } - {int} RETURN_VALUE (INT, scan_integer (yytext, 10, *loc)); - {xint} RETURN_VALUE (INT, scan_integer (yytext, 16, *loc)); + {int} RETURN_VALUE (INT_LITERAL, scan_integer (yytext, 10, *loc)); + {xint} RETURN_VALUE (INT_LITERAL, scan_integer (yytext, 16, *loc)); /* Identifiers may not start with a digit. Yet, don't silently 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 handle_syncline (char *args, location loc) |