texlive[54908] Build/source/texk/web2c/tiedir: [TIE] Editorial

[commits+ascherer at tug.org]

Revision: 54908
          http://tug.org/svn/texlive?view=revision&revision=54908
Author:   ascherer
Date:     2020-04-27 17:10:54 +0200 (Mon, 27 Apr 2020)
Log Message:
-----------
[TIE] Editorial modifications for tie.w.

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/tiedir/ChangeLog
    trunk/Build/source/texk/web2c/tiedir/tie-w2c.ch

Modified: trunk/Build/source/texk/web2c/tiedir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/tiedir/ChangeLog	2020-04-27 14:41:41 UTC (rev 54907)
+++ trunk/Build/source/texk/web2c/tiedir/ChangeLog	2020-04-27 15:10:54 UTC (rev 54908)
@@ -1,3 +1,7 @@
+2020-04-27  Andreas Scherer  <https://ascherer.github.io>
+
+	* tie-w2c.ch: Editorial modifications for ctie.w.
+
 2020-04-26  Andreas Scherer  <https://ascherer.github.io>
 
 	* tie-w2c.ch: Fix several typos in tie.w.

Modified: trunk/Build/source/texk/web2c/tiedir/tie-w2c.ch
===================================================================
--- trunk/Build/source/texk/web2c/tiedir/tie-w2c.ch	2020-04-27 14:41:41 UTC (rev 54907)
+++ trunk/Build/source/texk/web2c/tiedir/tie-w2c.ch	2020-04-27 15:10:54 UTC (rev 54908)
@@ -46,12 +46,66 @@
 #include <stdio.h>
 @y
 #include "cpascal.h"
-#include <stdio.h>
 #include <kpathsea/kpathsea.h>
 /* Also redefine |usage| to avoid clash with function from lib. */
 #define usage tieusage
 @z
 
+Section 16: Remove redundant #include directives.
+
+ at x l.483
+This should cause no trouble in any \Cl\ program.
+@^system dependencies@>
+
+@<Global |#include|s@>=
+#ifdef __STDC__
+#include <stdlib.h>
+#else
+#include <malloc.h>
+#endif
+ at y
+This should cause no trouble in any \Cl\ program.
+The \.{kpathsea} include files handle the definition of |malloc()|,
+too.
+@^system dependencies@>
+ at z
+
+Sections 18 and 19: use enum as requested in tie.w
+
+ at x l.530
+#define search 0
+#define test 1
+#define reading 2
+#define ignore 3
+typedef int in_file_modes; /* should be |enum(search,test,reading,ignore)| */
+#define unknown 0
+#define master 1
+#define chf 2
+typedef int file_types; /* should be |enum(unknown,master,chf)| */
+ at y
+typedef enum {
+    search,
+    test,
+    reading,
+    ignore } in_file_modes;
+typedef enum {
+    unknown,
+    master,
+    chf } file_types;
+ at z
+
+ at x l.548
+#define normal 0
+#define pre 1
+#define post 2
+typedef int out_md_type; /* should be |enum(normal,pre,post)| */
+ at y
+typedef enum {
+    normal,
+    pre,
+    post } out_md_type;
+ at z
+
 @x l.617
 void get_line(i)
 	file_index i;
@@ -144,6 +198,26 @@
 a line to write and |test_input| is set to |none|.
 @z
 
+Section 48: fix indentation of nested loop.
+
+ at x l.1044
+if (prod_chf==chf) {
+  loop @+ {
+    @<Test for normal, |break| when done@>@;
+    @<Test for pre, |break| when done@>@;
+    @<Test for post, |break| when done@>@;
+  }
+} else
+ at y
+if (prod_chf==chf)
+  loop @+ {
+    @<Test for normal, |break| when done@>@;
+    @<Test for pre, |break| when done@>@;
+    @<Test for post, |break| when done@>@;
+  }
+else
+ at z
+
 @x
 void usage()
 {