summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHironobu Yamashita <h.y.acetaminophen@gmail.com>2021-08-06 14:04:42 +0000
committerHironobu Yamashita <h.y.acetaminophen@gmail.com>2021-08-06 14:04:42 +0000
commite122cb47e19c1acbb7028e30a2769e045781160d (patch)
treeffe7032c02d30381e1ac9969fa7a8012ab1ebdee
parenta3379c8b1ed1a50e1507c42c2ed872b5ff1f0226 (diff)
otps: apply patch from W32TeX to avoid MSVC compiler error
git-svn-id: svn://tug.org/texlive/trunk@60175 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/otps/ChangeLog8
-rw-r--r--Build/source/texk/web2c/otps/otp-lexer.c2
-rw-r--r--Build/source/texk/web2c/otps/otp-lexer.l2
-rw-r--r--Build/source/texk/web2c/otps/otp-parser.c6
-rw-r--r--Build/source/texk/web2c/otps/otp-parser.h4
-rw-r--r--Build/source/texk/web2c/otps/otp-parser.y4
6 files changed, 17 insertions, 9 deletions
diff --git a/Build/source/texk/web2c/otps/ChangeLog b/Build/source/texk/web2c/otps/ChangeLog
index c501d6ff747..a7d4ef8524c 100644
--- a/Build/source/texk/web2c/otps/ChangeLog
+++ b/Build/source/texk/web2c/otps/ChangeLog
@@ -1,3 +1,11 @@
+2021-08-06 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * Avoid MSVC compiler errors (adapted from W32TeX patch).
+ - otp-parser.c(118) : error C2365: 'INPUT' :
+ redefinition; previous definition was 'Typedef'
+ - otp-parser.c(118) : error C2086: 'yytokentype INPUT' :
+ redefinition
+
2015-07-07 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Better dependencies for 'make check'.
diff --git a/Build/source/texk/web2c/otps/otp-lexer.c b/Build/source/texk/web2c/otps/otp-lexer.c
index 4f838a68a00..767eced8c60 100644
--- a/Build/source/texk/web2c/otps/otp-lexer.c
+++ b/Build/source/texk/web2c/otps/otp-lexer.c
@@ -1004,7 +1004,7 @@ return(LEFTARROW);
case 12:
YY_RULE_SETUP
#line 123 "../../../../texk/web2c/otps/otp-lexer.l"
-return(INPUT);
+return(MYINPUT);
YY_BREAK
case 13:
YY_RULE_SETUP
diff --git a/Build/source/texk/web2c/otps/otp-lexer.l b/Build/source/texk/web2c/otps/otp-lexer.l
index 6f4905c5f95..a36b9f02eed 100644
--- a/Build/source/texk/web2c/otps/otp-lexer.l
+++ b/Build/source/texk/web2c/otps/otp-lexer.l
@@ -120,7 +120,7 @@ string \"([^\"]|\"\")*\"
}
=> return(RIGHTARROW);
"<"= return(LEFTARROW);
-input: return(INPUT);
+input: return(MYINPUT);
output: return(OUTPUT);
aliases: return(ALIASES);
states: return(STATES);
diff --git a/Build/source/texk/web2c/otps/otp-parser.c b/Build/source/texk/web2c/otps/otp-parser.c
index 9190a00a275..c00c15b9ede 100644
--- a/Build/source/texk/web2c/otps/otp-parser.c
+++ b/Build/source/texk/web2c/otps/otp-parser.c
@@ -115,7 +115,7 @@ extern int yydebug;
STRING = 260,
LEFTARROW = 261,
RIGHTARROW = 262,
- INPUT = 263,
+ MYINPUT = 263,
OUTPUT = 264,
ALIASES = 265,
STATES = 266,
@@ -135,7 +135,7 @@ extern int yydebug;
#define STRING 260
#define LEFTARROW 261
#define RIGHTARROW 262
-#define INPUT 263
+#define MYINPUT 263
#define OUTPUT 264
#define ALIASES 265
#define STATES 266
@@ -481,7 +481,7 @@ static const yytype_uint16 yyrline[] =
static const char *const yytname[] =
{
"$end", "error", "$undefined", "NUMBER", "ID", "STRING", "LEFTARROW",
- "RIGHTARROW", "INPUT", "OUTPUT", "ALIASES", "STATES", "TABLES",
+ "RIGHTARROW", "MYINPUT", "OUTPUT", "ALIASES", "STATES", "TABLES",
"EXPRESSIONS", "PUSH", "POP", "DIV", "MOD", "BEG", "END", "'+'", "'-'",
"'*'", "';'", "'['", "']'", "'='", "'{'", "'}'", "','", "'<'", "'>'",
"'.'", "'^'", "'('", "')'", "'|'", "'\\\\'", "'$'", "'#'", "$accept",
diff --git a/Build/source/texk/web2c/otps/otp-parser.h b/Build/source/texk/web2c/otps/otp-parser.h
index fe67aedb5a4..e21f8c12a16 100644
--- a/Build/source/texk/web2c/otps/otp-parser.h
+++ b/Build/source/texk/web2c/otps/otp-parser.h
@@ -50,7 +50,7 @@ extern int yydebug;
STRING = 260,
LEFTARROW = 261,
RIGHTARROW = 262,
- INPUT = 263,
+ MYINPUT = 263,
OUTPUT = 264,
ALIASES = 265,
STATES = 266,
@@ -70,7 +70,7 @@ extern int yydebug;
#define STRING 260
#define LEFTARROW 261
#define RIGHTARROW 262
-#define INPUT 263
+#define MYINPUT 263
#define OUTPUT 264
#define ALIASES 265
#define STATES 266
diff --git a/Build/source/texk/web2c/otps/otp-parser.y b/Build/source/texk/web2c/otps/otp-parser.y
index 468b0557930..7d2af1e43ef 100644
--- a/Build/source/texk/web2c/otps/otp-parser.y
+++ b/Build/source/texk/web2c/otps/otp-parser.y
@@ -40,7 +40,7 @@ fprintf(stderr, "line %d: %s\n", line_number, msg);
%token STRING
%token LEFTARROW
%token RIGHTARROW
-%token INPUT
+%token MYINPUT
%token OUTPUT
%token ALIASES
%token STATES
@@ -70,7 +70,7 @@ File :
Input :
/* Empty */
{ input_bytes=2; }
- | INPUT NUMBER ';'
+ | MYINPUT NUMBER ';'
{ input_bytes=$2.yint; }
;