texlive[67906] Build/source/texk/web2c: [CWEB] Move 'print_stats'
commits+ascherer at tug.org
commits+ascherer at tug.org
Sun Aug 13 14:49:54 CEST 2023
Revision: 67906
http://tug.org/svn/texlive?view=revision&revision=67906
Author: ascherer
Date: 2023-08-13 14:49:53 +0200 (Sun, 13 Aug 2023)
Log Message:
-----------
[CWEB] Move 'print_stats' prototype in common.h.
It is used in 'wrap_up'.
Also, add a comment for 'cb_show_banner'.
Modified Paths:
--------------
trunk/Build/source/texk/web2c/ctangleboot.cin
trunk/Build/source/texk/web2c/cwebboot.cin
trunk/Build/source/texk/web2c/cwebdir/ChangeLog
trunk/Build/source/texk/web2c/cwebdir/comm-w2c.h
trunk/Build/source/texk/web2c/cwebdir/common.c
trunk/Build/source/texk/web2c/cwebdir/common.h
trunk/Build/source/texk/web2c/cwebdir/ctangle.c
Modified: trunk/Build/source/texk/web2c/ctangleboot.cin
===================================================================
--- trunk/Build/source/texk/web2c/ctangleboot.cin 2023-08-12 23:46:30 UTC (rev 67905)
+++ trunk/Build/source/texk/web2c/ctangleboot.cin 2023-08-13 12:49:53 UTC (rev 67906)
@@ -2,7 +2,7 @@
#line 66 "cwebdir/ctangle.w"
/*5:*/
-#line 60 "cwebdir/comm-w2c.h"
+#line 57 "cwebdir/comm-w2c.h"
#include <ctype.h>
#include <kpathsea/simpletypes.h>
@@ -15,15 +15,15 @@
#ifndef HAVE_GETTEXT
#define HAVE_GETTEXT 0
#endif
-#line 72 "cwebdir/comm-w2c.h"
+#line 69 "cwebdir/comm-w2c.h"
#if HAVE_GETTEXT
#include <libintl.h>
#else
-#line 76 "cwebdir/comm-w2c.h"
+#line 73 "cwebdir/comm-w2c.h"
#define gettext(a) a
#endif
-#line 78 "cwebdir/comm-w2c.h"
+#line 75 "cwebdir/comm-w2c.h"
/*:5*/
#line 67 "cwebdir/ctangle.w"
@@ -188,7 +188,7 @@
extern int phase;
/*:3*//*6:*/
-#line 100 "cwebdir/comm-w2c.h"
+#line 97 "cwebdir/comm-w2c.h"
extern char section_text[];
extern char*section_text_end;
@@ -196,7 +196,7 @@
extern char*id_loc;
/*:6*//*7:*/
-#line 118 "cwebdir/comm-w2c.h"
+#line 115 "cwebdir/comm-w2c.h"
extern char buffer[];
extern char*buffer_end;
@@ -204,7 +204,7 @@
extern char*limit;
/*:7*//*8:*/
-#line 135 "cwebdir/comm-w2c.h"
+#line 132 "cwebdir/comm-w2c.h"
extern int include_depth;
extern FILE*file[];
@@ -221,7 +221,7 @@
extern boolean web_file_open;
/*:8*//*10:*/
-#line 156 "cwebdir/comm-w2c.h"
+#line 153 "cwebdir/comm-w2c.h"
extern sixteen_bits section_count;
extern boolean changed_section[];
@@ -229,7 +229,7 @@
extern boolean print_where;
/*:10*//*11:*/
-#line 171 "cwebdir/comm-w2c.h"
+#line 168 "cwebdir/comm-w2c.h"
typedef struct name_info{
char*byte_start;
@@ -254,12 +254,12 @@
extern hash_pointer h;
/*:11*//*13:*/
-#line 216 "cwebdir/comm-w2c.h"
+#line 213 "cwebdir/comm-w2c.h"
extern int history;
/*:13*//*15:*/
-#line 233 "cwebdir/comm-w2c.h"
+#line 234 "cwebdir/comm-w2c.h"
extern int argc;
extern char**argv;
@@ -272,7 +272,7 @@
extern const char*use_language;
/*:15*//*16:*/
-#line 249 "cwebdir/comm-w2c.h"
+#line 250 "cwebdir/comm-w2c.h"
extern FILE*C_file;
extern FILE*tex_file;
@@ -393,12 +393,9 @@
#line 43 "cwebdir/comm-w2c.h"
extern void common_init(void);
-extern void cb_show_banner(void);
-extern void print_stats(void);
-
/*:4*//*9:*/
-#line 150 "cwebdir/comm-w2c.h"
+#line 147 "cwebdir/comm-w2c.h"
extern boolean get_line(void);
extern void check_complete(void);
@@ -405,7 +402,7 @@
extern void reset_input(void);
/*:9*//*12:*/
-#line 194 "cwebdir/comm-w2c.h"
+#line 191 "cwebdir/comm-w2c.h"
extern name_pointer id_lookup(const char*,const char*,eight_bits);
@@ -419,7 +416,7 @@
extern void init_node(name_pointer);
/*:12*//*14:*/
-#line 219 "cwebdir/comm-w2c.h"
+#line 216 "cwebdir/comm-w2c.h"
extern int wrap_up(void);
extern void err_print(const char*);
@@ -426,6 +423,10 @@
extern void fatal(const char*,const char*);
extern void overflow(const char*);
+extern void cb_show_banner(void);
+
+extern void print_stats(void);
+
/*:14*//*30:*/
#line 242 "cwebdir/ctangle.w"
static void store_two_bytes(sixteen_bits);
Modified: trunk/Build/source/texk/web2c/cwebboot.cin
===================================================================
--- trunk/Build/source/texk/web2c/cwebboot.cin 2023-08-12 23:46:30 UTC (rev 67905)
+++ trunk/Build/source/texk/web2c/cwebboot.cin 2023-08-13 12:49:53 UTC (rev 67906)
@@ -2,7 +2,7 @@
#line 62 "cwebdir/common.w"
/*4:*/
-#line 60 "cwebdir/comm-w2c.h"
+#line 57 "cwebdir/comm-w2c.h"
#include <ctype.h>
#include <kpathsea/simpletypes.h>
@@ -15,15 +15,15 @@
#ifndef HAVE_GETTEXT
#define HAVE_GETTEXT 0
#endif
-#line 72 "cwebdir/comm-w2c.h"
+#line 69 "cwebdir/comm-w2c.h"
#if HAVE_GETTEXT
#include <libintl.h>
#else
-#line 76 "cwebdir/comm-w2c.h"
+#line 73 "cwebdir/comm-w2c.h"
#define gettext(a) a
#endif
-#line 78 "cwebdir/comm-w2c.h"
+#line 75 "cwebdir/comm-w2c.h"
/*:4*//*91:*/
#line 738 "cwebdir/comm-w2c.ch"
@@ -190,7 +190,7 @@
extern int phase;
/*:2*//*5:*/
-#line 100 "cwebdir/comm-w2c.h"
+#line 97 "cwebdir/comm-w2c.h"
extern char section_text[];
extern char*section_text_end;
@@ -198,7 +198,7 @@
extern char*id_loc;
/*:5*//*6:*/
-#line 118 "cwebdir/comm-w2c.h"
+#line 115 "cwebdir/comm-w2c.h"
extern char buffer[];
extern char*buffer_end;
@@ -206,7 +206,7 @@
extern char*limit;
/*:6*//*7:*/
-#line 135 "cwebdir/comm-w2c.h"
+#line 132 "cwebdir/comm-w2c.h"
extern int include_depth;
extern FILE*file[];
@@ -223,7 +223,7 @@
extern boolean web_file_open;
/*:7*//*9:*/
-#line 156 "cwebdir/comm-w2c.h"
+#line 153 "cwebdir/comm-w2c.h"
extern sixteen_bits section_count;
extern boolean changed_section[];
@@ -231,7 +231,7 @@
extern boolean print_where;
/*:9*//*10:*/
-#line 171 "cwebdir/comm-w2c.h"
+#line 168 "cwebdir/comm-w2c.h"
typedef struct name_info{
char*byte_start;
@@ -256,12 +256,12 @@
extern hash_pointer h;
/*:10*//*12:*/
-#line 216 "cwebdir/comm-w2c.h"
+#line 213 "cwebdir/comm-w2c.h"
extern int history;
/*:12*//*14:*/
-#line 233 "cwebdir/comm-w2c.h"
+#line 234 "cwebdir/comm-w2c.h"
extern int argc;
extern char**argv;
@@ -274,7 +274,7 @@
extern const char*use_language;
/*:14*//*15:*/
-#line 249 "cwebdir/comm-w2c.h"
+#line 250 "cwebdir/comm-w2c.h"
extern FILE*C_file;
extern FILE*tex_file;
@@ -425,12 +425,9 @@
#line 43 "cwebdir/comm-w2c.h"
extern void common_init(void);
-extern void cb_show_banner(void);
-extern void print_stats(void);
-
/*:3*//*8:*/
-#line 150 "cwebdir/comm-w2c.h"
+#line 147 "cwebdir/comm-w2c.h"
extern boolean get_line(void);
extern void check_complete(void);
@@ -437,7 +434,7 @@
extern void reset_input(void);
/*:8*//*11:*/
-#line 194 "cwebdir/comm-w2c.h"
+#line 191 "cwebdir/comm-w2c.h"
extern name_pointer id_lookup(const char*,const char*,eight_bits);
@@ -451,7 +448,7 @@
extern void init_node(name_pointer);
/*:11*//*13:*/
-#line 219 "cwebdir/comm-w2c.h"
+#line 216 "cwebdir/comm-w2c.h"
extern int wrap_up(void);
extern void err_print(const char*);
@@ -458,6 +455,10 @@
extern void fatal(const char*,const char*);
extern void overflow(const char*);
+extern void cb_show_banner(void);
+
+extern void print_stats(void);
+
/*:13*//*24:*/
#line 176 "cwebdir/common.w"
static boolean input_ln(FILE*);
Modified: trunk/Build/source/texk/web2c/cwebdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ChangeLog 2023-08-12 23:46:30 UTC (rev 67905)
+++ trunk/Build/source/texk/web2c/cwebdir/ChangeLog 2023-08-13 12:49:53 UTC (rev 67906)
@@ -1,3 +1,10 @@
+2023-08-13 Andreas Scherer <https://ascherer.github.io>
+
+ * comm-w2c.h,
+ * common.c,
+ * common.h,
+ * ctangle.c: Move 'print_stats' prototype in common.h.
+
2023-08-11 Andreas Scherer <https://ascherer.github.io>
* ctwill-mini.ch,
Modified: trunk/Build/source/texk/web2c/cwebdir/comm-w2c.h
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/comm-w2c.h 2023-08-12 23:46:30 UTC (rev 67905)
+++ trunk/Build/source/texk/web2c/cwebdir/comm-w2c.h 2023-08-13 12:49:53 UTC (rev 67906)
@@ -42,9 +42,6 @@
@ The procedure that gets everything rolling:
@<Predecl...@>=
extern void common_init(void);@/
-extern void cb_show_banner(void);
-@#
-extern void print_stats(void); /* defined in \.{ctangle.w} and \.{cweave.w} */
@ You may have noticed that almost all \.{"strings"} in the \.{CWEB} sources
are placed in the context of the `|_|'~macro. This is just a shortcut for the
@@ -221,6 +218,10 @@
extern void err_print(const char *); /* print error message and context */
extern void fatal(const char *,const char *); /* issue error message and die */
extern void overflow(const char *); /* succumb because a table has overflowed */
+@#
+extern void cb_show_banner(void); /* copy |banner| back to \.{common.w} */
+@#
+extern void print_stats(void); /* defined in \.{ctangle.w} and \.{cweave.w} */
@ Code related to command line arguments:
@d show_banner flags['b'] /* should the banner line be printed? */
Modified: trunk/Build/source/texk/web2c/cwebdir/common.c
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/common.c 2023-08-12 23:46:30 UTC (rev 67905)
+++ trunk/Build/source/texk/web2c/cwebdir/common.c 2023-08-13 12:49:53 UTC (rev 67906)
@@ -2,7 +2,7 @@
#line 62 "common.w"
/*4:*/
-#line 49 "common.h"
+#line 48 "common.h"
#include <ctype.h>
#include <stdbool.h>
@@ -135,7 +135,7 @@
extern int phase;
/*:2*//*5:*/
-#line 79 "common.h"
+#line 78 "common.h"
extern char section_text[];
extern char*section_text_end;
@@ -143,7 +143,7 @@
extern char*id_loc;
/*:5*//*6:*/
-#line 97 "common.h"
+#line 96 "common.h"
extern char buffer[];
extern char*buffer_end;
@@ -151,7 +151,7 @@
extern char*limit;
/*:6*//*7:*/
-#line 114 "common.h"
+#line 113 "common.h"
extern int include_depth;
extern FILE*file[];
@@ -167,7 +167,7 @@
extern boolean web_file_open;
/*:7*//*9:*/
-#line 134 "common.h"
+#line 133 "common.h"
extern sixteen_bits section_count;
extern boolean changed_section[];
@@ -175,7 +175,7 @@
extern boolean print_where;
/*:9*//*10:*/
-#line 149 "common.h"
+#line 148 "common.h"
typedef struct name_info{
char*byte_start;
@@ -200,12 +200,12 @@
extern hash_pointer h;
/*:10*//*12:*/
-#line 194 "common.h"
+#line 193 "common.h"
extern int history;
/*:12*//*14:*/
-#line 210 "common.h"
+#line 211 "common.h"
extern int argc;
extern char**argv;
@@ -216,7 +216,7 @@
extern boolean flags[];
/*:14*//*15:*/
-#line 224 "common.h"
+#line 225 "common.h"
extern FILE*C_file;
extern FILE*tex_file;
@@ -338,10 +338,9 @@
#line 43 "common.h"
extern void common_init(void);
-extern void print_stats(void);
/*:3*//*8:*/
-#line 128 "common.h"
+#line 127 "common.h"
extern boolean get_line(void);
extern void check_complete(void);
@@ -348,7 +347,7 @@
extern void reset_input(void);
/*:8*//*11:*/
-#line 172 "common.h"
+#line 171 "common.h"
extern name_pointer id_lookup(const char*,const char*,eight_bits);
@@ -362,7 +361,7 @@
extern void init_node(name_pointer);
/*:11*//*13:*/
-#line 197 "common.h"
+#line 196 "common.h"
extern int wrap_up(void);
extern void err_print(const char*);
@@ -369,6 +368,8 @@
extern void fatal(const char*,const char*);
extern void overflow(const char*);
+extern void print_stats(void);
+
/*:13*//*24:*/
#line 176 "common.w"
static boolean input_ln(FILE*);
Modified: trunk/Build/source/texk/web2c/cwebdir/common.h
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/common.h 2023-08-12 23:46:30 UTC (rev 67905)
+++ trunk/Build/source/texk/web2c/cwebdir/common.h 2023-08-13 12:49:53 UTC (rev 67906)
@@ -42,7 +42,6 @@
@ The procedure that gets everything rolling:
@<Predecl...@>=
extern void common_init(void);@/
-extern void print_stats(void); /* defined in \.{ctangle.w} and \.{cweave.w} */
@ Interface to the standard \CEE/ library:
@@ -199,6 +198,8 @@
extern void err_print(const char *); /* print error message and context */
extern void fatal(const char *,const char *); /* issue error message and die */
extern void overflow(const char *); /* succumb because a table has overflowed */
+@#
+extern void print_stats(void); /* defined in \.{ctangle.w} and \.{cweave.w} */
@ Code related to command line arguments:
@d show_banner flags['b'] /* should the banner line be printed? */
Modified: trunk/Build/source/texk/web2c/cwebdir/ctangle.c
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctangle.c 2023-08-12 23:46:30 UTC (rev 67905)
+++ trunk/Build/source/texk/web2c/cwebdir/ctangle.c 2023-08-13 12:49:53 UTC (rev 67906)
@@ -2,7 +2,7 @@
#line 66 "ctangle.w"
/*5:*/
-#line 49 "common.h"
+#line 48 "common.h"
#include <ctype.h>
#include <stdbool.h>
@@ -168,7 +168,7 @@
extern int phase;
/*:3*//*6:*/
-#line 79 "common.h"
+#line 78 "common.h"
extern char section_text[];
extern char*section_text_end;
@@ -176,7 +176,7 @@
extern char*id_loc;
/*:6*//*7:*/
-#line 97 "common.h"
+#line 96 "common.h"
extern char buffer[];
extern char*buffer_end;
@@ -184,7 +184,7 @@
extern char*limit;
/*:7*//*8:*/
-#line 114 "common.h"
+#line 113 "common.h"
extern int include_depth;
extern FILE*file[];
@@ -200,7 +200,7 @@
extern boolean web_file_open;
/*:8*//*10:*/
-#line 134 "common.h"
+#line 133 "common.h"
extern sixteen_bits section_count;
extern boolean changed_section[];
@@ -208,7 +208,7 @@
extern boolean print_where;
/*:10*//*11:*/
-#line 149 "common.h"
+#line 148 "common.h"
typedef struct name_info{
char*byte_start;
@@ -233,12 +233,12 @@
extern hash_pointer h;
/*:11*//*13:*/
-#line 194 "common.h"
+#line 193 "common.h"
extern int history;
/*:13*//*15:*/
-#line 210 "common.h"
+#line 211 "common.h"
extern int argc;
extern char**argv;
@@ -249,7 +249,7 @@
extern boolean flags[];
/*:15*//*16:*/
-#line 224 "common.h"
+#line 225 "common.h"
extern FILE*C_file;
extern FILE*tex_file;
@@ -363,10 +363,9 @@
#line 43 "common.h"
extern void common_init(void);
-extern void print_stats(void);
/*:4*//*9:*/
-#line 128 "common.h"
+#line 127 "common.h"
extern boolean get_line(void);
extern void check_complete(void);
@@ -373,7 +372,7 @@
extern void reset_input(void);
/*:9*//*12:*/
-#line 172 "common.h"
+#line 171 "common.h"
extern name_pointer id_lookup(const char*,const char*,eight_bits);
@@ -387,7 +386,7 @@
extern void init_node(name_pointer);
/*:12*//*14:*/
-#line 197 "common.h"
+#line 196 "common.h"
extern int wrap_up(void);
extern void err_print(const char*);
@@ -394,6 +393,8 @@
extern void fatal(const char*,const char*);
extern void overflow(const char*);
+extern void print_stats(void);
+
/*:14*//*30:*/
#line 242 "ctangle.w"
static void store_two_bytes(sixteen_bits);
More information about the tex-live-commits
mailing list.