summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorMartin Ruckert <martin.ruckert@hm.edu>2022-02-24 10:33:40 +0000
committerMartin Ruckert <martin.ruckert@hm.edu>2022-02-24 10:33:40 +0000
commitbb6a64f69f4b088779a5e097be545cc350a45ea3 (patch)
tree578c70772ee643b37bd6d9fc3a9f454b4da12db3 /Build
parent488b982c472440d95303f6cd94b310addc3c8334 (diff)
Fixing undefined int yydebug if compiling without -DDEBUG
git-svn-id: svn://tug.org/texlive/trunk@62160 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/hitexdir/hiformat.hntbin1113719 -> 1113717 bytes
-rw-r--r--Build/source/texk/web2c/hitexdir/hiformat.pdfbin1255422 -> 1255630 bytes
-rw-r--r--Build/source/texk/web2c/hitexdir/hiformat.w18
-rw-r--r--Build/source/texk/web2c/hitexdir/hilexer.c4
-rw-r--r--Build/source/texk/web2c/hitexdir/hiparser.c4
-rw-r--r--Build/source/texk/web2c/hitexdir/hiparser.h2
6 files changed, 13 insertions, 15 deletions
diff --git a/Build/source/texk/web2c/hitexdir/hiformat.hnt b/Build/source/texk/web2c/hitexdir/hiformat.hnt
index 6fa0799623a..ba0c2339c25 100644
--- a/Build/source/texk/web2c/hitexdir/hiformat.hnt
+++ b/Build/source/texk/web2c/hitexdir/hiformat.hnt
Binary files differ
diff --git a/Build/source/texk/web2c/hitexdir/hiformat.pdf b/Build/source/texk/web2c/hitexdir/hiformat.pdf
index d1db970c63f..2529196d9cd 100644
--- a/Build/source/texk/web2c/hitexdir/hiformat.pdf
+++ b/Build/source/texk/web2c/hitexdir/hiformat.pdf
Binary files differ
diff --git a/Build/source/texk/web2c/hitexdir/hiformat.w b/Build/source/texk/web2c/hitexdir/hiformat.w
index 67754a09d49..5d82c5c6502 100644
--- a/Build/source/texk/web2c/hitexdir/hiformat.w
+++ b/Build/source/texk/web2c/hitexdir/hiformat.w
@@ -47,9 +47,9 @@
\def\setrevision$#1: #2 ${\gdef\lastrevision{#2}}
-\setrevision$Revision: 2690 $
+\setrevision$Revision: 2696 $
\def\setdate$#1(#2) ${\gdef\lastdate{#2}}
-\setdate$Date: 2022-02-22 16:40:16 +0100 (Tue, 22 Feb 2022) $
+\setdate$Date: 2022-02-24 10:59:11 +0100 (Thu, 24 Feb 2022) $
\null
@@ -9219,8 +9219,7 @@ should go while the other files are opened.
It inherits its name from the input file name.
@<open the log file@> =
-#ifdef DEBUG
- if (option_log)
+if (option_log)
{
strcat(stem_name,".log");
hlog=freopen(stem_name,"w",stderr);
@@ -9230,11 +9229,8 @@ It inherits its name from the input file name.
}
stem_name[stem_length]=0;
}
- else
- hlog=stderr;
-#else
- hlog=stderr;
-#endif
+else
+ hlog=stderr;
@
Once we have established logging, we can try to open the other files.
@@ -9322,7 +9318,7 @@ For portability, we first define the output specifier for expressions of type |s
#ifdef DEBUG
#define @[DBG(FLAGS,...)@] ((debugflags & (FLAGS))?LOG(__VA_ARGS__):0)
#else
-#define @[DBG(FLAGS,...)@] 0
+#define @[DBG(FLAGS,...)@] (void)0
#endif
#define @[DBGTAG(A,P)@] @[DBG(DBGTAGS,@["tag [%s,%d] at " SIZE_F "\n"@],@|NAME(A),INFO(A),(P)-hstart)@]
@@ -10826,6 +10822,8 @@ extern int yylex(void);
#include "hierror.h"
#include "hiformat.h"
#include "hiput.h"
+
+@<enable bison debugging@>@;
#include "hiparser.h"
extern void yyset_debug(int lex_debug);
diff --git a/Build/source/texk/web2c/hitexdir/hilexer.c b/Build/source/texk/web2c/hitexdir/hilexer.c
index 281d296ae77..1e264d3b3de 100644
--- a/Build/source/texk/web2c/hitexdir/hilexer.c
+++ b/Build/source/texk/web2c/hitexdir/hilexer.c
@@ -849,7 +849,7 @@ char *yytext;
#line 1 "lexer.l"
#line 2 "lexer.l"
/*519:*/
- #line 10726 "format.w"
+ #line 10722 "format.w"
#include "hibasetypes.h"
#include "hierror.h"
@@ -985,7 +985,7 @@ float64_t xtof(char*x)
}
/*:61*/
int yywrap(void){
- #line 10737 "format.w"
+ #line 10733 "format.w"
return 1;}
#ifdef _MSC_VER
#pragma warning( disable : 4267)
diff --git a/Build/source/texk/web2c/hitexdir/hiparser.c b/Build/source/texk/web2c/hitexdir/hiparser.c
index b9e74f55a17..5d98be98dc4 100644
--- a/Build/source/texk/web2c/hitexdir/hiparser.c
+++ b/Build/source/texk/web2c/hitexdir/hiparser.c
@@ -69,7 +69,7 @@
/* First part of user prologue. */
#line 2 "parser.y"
- #line 10767 "format.w"
+ #line 10763 "format.w"
#include "hibasetypes.h"
#include <string.h>
@@ -132,7 +132,7 @@ void check_param_def(Ref*df)
extern int yylineno;
int yyerror(const char*msg)
{
- #line 9341 "format.w"
+ #line 9337 "format.w"
QUIT(" in line %d %s",yylineno,msg);
return 0;
}
diff --git a/Build/source/texk/web2c/hitexdir/hiparser.h b/Build/source/texk/web2c/hitexdir/hiparser.h
index 9fcc5e54f97..153535ca2a6 100644
--- a/Build/source/texk/web2c/hitexdir/hiparser.h
+++ b/Build/source/texk/web2c/hitexdir/hiparser.h
@@ -149,7 +149,7 @@ union YYSTYPE
{
#line 79 "parser.y"
- #line 10792 "format.w"
+ #line 10788 "format.w"
uint32_t u; int32_t i; char *s; float64_t f; Glyph c;
Dimen d;Stretch st;Xdimen xd;Kern kt;
Rule r;Glue g;Image x;