CWEB - 4.8 release, 2022-06-05.

ascherer · Jun 5, 2022 · 837f017 · 837f017
1 parent 1214dff
commit 837f017
Show file tree

Hide file tree

Showing 26 changed files with 288 additions and 181 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -4,3 +4,4 @@ README.md export-ignore
 my-changes.md export-ignore
 testthings.w export-ignore
 indentation.w export-ignore
+if.w export-ignore
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # This file is part of CWEB.
 # It is distributed WITHOUT ANY WARRANTY, express or implied.
-# Version 4.7 --- February 2022
+# Version 4.8 --- June 2022
 
 # Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth
 
@@ -13,7 +13,7 @@
 # entire resulting derived work is given a different name and distributed
 # under the terms of a permission notice identical to this one.
 
-# 
+#
 # Read the README file, then edit this file to reflect local conditions
 #
 
@@ -50,7 +50,7 @@ TCHANGES=
 WCHANGES=
 
 # We keep debugging info around, for fun, but most users don't need it
-CFLAGS = -g
+CFLAGS = -g # -Wall -Wextra -Wimplicit-fallthrough=2 # check compiler warnings
 #CFLAGS = -O
 LINKFLAGS = -g
 #LINKFLAGS = -s # for smaller (stripped) executables on many UNIX systems
@@ -138,7 +138,7 @@ common.o: common.c
 	$(CC) $(CFLAGS) -DCWEBINPUTS=\"$(CWEBINPUTS)\" -c common.c
 
 ctangle: ctangle.o common.o
-	$(CC) $(LINKFLAGS) -o ctangle ctangle.o common.o 
+	$(CC) $(LINKFLAGS) -o ctangle ctangle.o common.o
 
 ctangle.c: ctangle.w $(TCHANGES) common.h
 	$(CTANGLE) ctangle $(TCHANGES)

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# cweb 4.7
+# cweb 4.8
 
 people have been accumulating several decades of experience with
 [cweb](http://www-cs-faculty.stanford.edu/~uno/cweb.html), and we know that
@@ -10,18 +10,20 @@ devote full time to
 
 however, further significant developments, including versions that don himself
 does not maintain, are ongoing. all of the really current news about cweb is,
-in fact, now to be found in this cweb development project. Check out the
+in fact, now to be found in this cweb development project; check out the
 details in the
 [releases description](https://github.com/ascherer/cweb/releases).
 
+you can either compile these sources as directed in the
+[readme file](README) or stick the recent version “cweb-4.8” into my
+[cwebbin](https://github.com/ascherer/cwebbin), which introduces convenient
+extensions and prepares cweb for inclusion in the “tex live” distribution.
+
 # software archæology
 
 besides for further development, this ‘project’ is used as an – obviously
 incomplete – repository of original release versions of levy/knuth
-[cweb](http://www-cs-faculty.stanford.edu/~uno/cweb.html). you can either
-compile these sources directly or stick the recent version “cweb-4.7” into my
-[cwebbin](https://github.com/ascherer/cwebbin), which introduces convenient
-extensions and prepares cweb for inclusion in the “tex live” distribution.
+[cweb](http://www-cs-faculty.stanford.edu/~uno/cweb.html).
 
 ## call for help
 

diff --git a/comm-mac.ch b/comm-mac.ch
@@ -4,9 +4,9 @@ No changes to CTANGLE or CWEAVE are needed.
 (Contributed 13 Oct 2000 by [email protected]; slightly edited by Don Knuth)
 
 @x in limbo, change the title page document to specify Mac version
-  \centerline{(Version 4.7)}
+  \centerline{(Version 4.8)}
 @y
-  \centerline{(Version 4.7 for MacOS)}
+  \centerline{(Version 4.8 for MacOS)}
 @z
 
 @x section 23: Make input_ln accept \n, \r, \n\r, or \r\n as line endings

diff --git a/comm-ql.ch b/comm-ql.ch
@@ -10,24 +10,24 @@ ex <dev_>cc;'-v -h -c -=500000 -DCWEBINPUTS=flp2_ common_c'
 @x
 \def\v{\char'174} % vertical (|) in typewriter font
 
-\def\title{Common code for CTANGLE and CWEAVE (Version 4.7)}
+\def\title{Common code for CTANGLE and CWEAVE (Version 4.8)}
 \def\topofcontents{\null\vfill
   \centerline{\titlefont Common code for {\ttitlefont CTANGLE} and
     {\ttitlefont CWEAVE}}
   \vskip 15pt
-  \centerline{(Version 4.7)}
+  \centerline{(Version 4.8)}
   \vfill}
 \def\botofcontents{\vfill
 \noindent
 @y
 \def\v{\char'174} % vertical (|) in typewriter font
 
-\def\title{Common code for CTANGLE and CWEAVE (QL Version 4.7)}
+\def\title{Common code for CTANGLE and CWEAVE (QL Version 4.8)}
 \def\topofcontents{\null\vfill
   \centerline{\titlefont Common code for {\ttitlefont CTANGLE} and
     {\ttitlefont CWEAVE}}
   \vskip 15pt
-  \centerline{(Version 4.7)}
+  \centerline{(Version 4.8)}
   \vfill}
 \def\botofcontents{\vfill
 \noindent

diff --git a/common.c b/common.c
@@ -732,8 +732,10 @@ else{
 if((l= strlen(CWEBINPUTS))> max_file_name_length-2)too_long();
 strcpy(temp_file_name,CWEBINPUTS);
 #else
-l= 0;
+#line 474 "common.w"
+ l= 0;
 #endif 
+#line 476 "common.w"
 }
 if(l> 0){
 if(k+l+2>=cur_file_name_end)too_long();
@@ -1015,7 +1017,7 @@ print_section_name(r);
 err_print(">");
 }
 else if(name_len<prefix_length(r))set_prefix_length(r,name_len);
-
+/* fall through */
 case equal:break;
 case extension:if(!ispref||first<=last)
 extend_section_name(r,first,last+1,ispref);

diff --git a/common.h b/common.h
@@ -2,7 +2,7 @@
 % This program by Silvio Levy and Donald E. Knuth
 % is based on a program by Knuth.
 % It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.7 --- February 2022 (works also with later versions)
+% Version 4.8 --- June 2022 (works also with later versions)
 
 % Copyright (C) 1987,1990,1993 Silvio Levy and Donald E. Knuth
 

diff --git a/common.w b/common.w
@@ -2,7 +2,7 @@
 % This program by Silvio Levy and Donald E. Knuth
 % is based on a program by Knuth.
 % It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.7 --- February 2022
+% Version 4.8 --- June 2022
 
 % Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth
 
@@ -22,12 +22,12 @@
 
 \def\v{\char'174} % vertical (|) in typewriter font
 
-\def\title{Common code for CTANGLE and CWEAVE (Version 4.7)}
+\def\title{Common code for CTANGLE and CWEAVE (Version 4.8)}
 \def\topofcontents{\null\vfill
   \centerline{\titlefont Common code for {\ttitlefont CTANGLE} and
     {\ttitlefont CWEAVE}}
   \vskip 15pt
-  \centerline{(Version 4.7)}
+  \centerline{(Version 4.8)}
   \vfill}
 \def\botofcontents{\vfill
 \noindent
@@ -66,8 +66,8 @@ The file begins with a few basic definitions.
 @<Global variables@>@/
 @<Predeclaration of procedures@>
 
-@ The details will be filled in due course.  The interface of this module
-is included first.  It is also used by the main programs.
+@ The details will be filled in due course.  The interface |"common.h"| of this
+\.{COMMON} module is included first.  It is also used by the main programs.
 
 @i common.h
 
@@ -919,7 +919,7 @@ switch(section_name_cmp(&first,name_len,r)) {
       err_print(">");
     }
     else if (name_len<prefix_length(r)) set_prefix_length(r,name_len);
-    /* fall through */
+    @=/* fall through */@>@;
   case equal: break;
   case extension: if (!ispref || first<=last)
         extend_section_name(r,first,last+1,ispref);

diff --git a/ctang-bs.ch b/ctang-bs.ch
@@ -17,12 +17,12 @@ by using "huge" pointers.
 The ``banner line'' defined here should be changed whenever \.{CTANGLE}
 is modified.
 
-@d banner "This is CTANGLE (Version 4.7)"
+@d banner "This is CTANGLE (Version 4.8)"
 @y
 The ``banner line'' defined here should be changed whenever \.{CTANGLE}
 is modified.
 
-@d banner "This is CTANGLE (Version 4.7pc/big)"
+@d banner "This is CTANGLE (Version 4.8pc/big)"
 @z
 
 

diff --git a/ctang-pc.ch b/ctang-pc.ch
@@ -9,9 +9,9 @@ that allows >64K arrays. If you need lots of bytes and toks, try the
 alternate change files with -bs suffix instead of -pc.
 
 @x section 1
-@d banner "This is CTANGLE (Version 4.7)"
+@d banner "This is CTANGLE (Version 4.8)"
 @y
-@d banner "This is CTANGLE (Version 4.7pc)"
+@d banner "This is CTANGLE (Version 4.8pc)"
 @z
 @x section 17
 @d max_bytes 100000 /* the number of bytes in identifiers,

diff --git a/ctang-ql.ch b/ctang-ql.ch
@@ -7,15 +7,15 @@ ex <dev_>cc;"-v -h -c -=500000 ctangle_c"
 
 
 @x
-\def\title{CTANGLE (Version 4.7)}
+\def\title{CTANGLE (Version 4.8)}
 @y
-\def\title{CTANGLE (QL Version 4.7)}
+\def\title{CTANGLE (QL Version 4.8)}
 @z
 
 @x section 1
-@d banner "This is CTANGLE (Version 4.7)"
+@d banner "This is CTANGLE (Version 4.8)"
 @y
-@d banner "This is CTANGLE (QL Version 4.7)"
+@d banner "This is CTANGLE (QL Version 4.8)"
 @z
 
 @x

diff --git a/ctang-vms.ch b/ctang-vms.ch
@@ -10,9 +10,9 @@ created:
 (these changes not necessary for initial bootstrapping)
 
 @x section 1 (01-FEB-1992 ST)
-@d banner "This is CTANGLE (Version 4.7)"
+@d banner "This is CTANGLE (Version 4.8)"
 @y
-@d banner "This is CTANGLE (VAX/VMS Version 4.7)"
+@d banner "This is CTANGLE (VAX/VMS Version 4.8)"
 @z
 
 @x section 4 (01-FEB-1992 ST)

diff --git a/ctang-w32.ch b/ctang-w32.ch
@@ -4,9 +4,9 @@ This is the change file for CWEB's CTANGLE under Win32
 Changes necessary for compiling with Borland C/C++
 
 @x section 1
-@d banner "This is CTANGLE (Version 4.7)"
+@d banner "This is CTANGLE (Version 4.8)"
 @y
-@d banner "This is CTANGLE (Version 4.7win32)"
+@d banner "This is CTANGLE (Version 4.8win32)"
 @z
 
 @x