texlive[67770] Build/source/texk/web2c: [CWEB] Straighten

[commits+ascherer at tug.org]

Revision: 67770
          http://tug.org/svn/texlive?view=revision&revision=67770
Author:   ascherer
Date:     2023-07-30 14:49:13 +0200 (Sun, 30 Jul 2023)
Log Message:
-----------
[CWEB] Straighten 'byte_start' arithmetic."

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/ctangleboot.cin
    trunk/Build/source/texk/web2c/cwebboot.cin
    trunk/Build/source/texk/web2c/cwebdir/common.c
    trunk/Build/source/texk/web2c/cwebdir/common.w
    trunk/Build/source/texk/web2c/cwebdir/ctangle.c
    trunk/Build/source/texk/web2c/cwebdir/ctangle.w
    trunk/Build/source/texk/web2c/cwebdir/cweave.w

Modified: trunk/Build/source/texk/web2c/ctangleboot.cin
===================================================================
--- trunk/Build/source/texk/web2c/ctangleboot.cin	2023-07-30 09:36:47 UTC (rev 67769)
+++ trunk/Build/source/texk/web2c/ctangleboot.cin	2023-07-30 12:49:13 UTC (rev 67770)
@@ -1069,7 +1069,7 @@
 out_char(
 eight_bits cur_char)
 {
-char*j,*k;
+char*j;
 restart:
 switch(cur_char){
 case'\n':if(protect&&out_state!=verbatim)C_putc(' ');
@@ -1081,8 +1081,8 @@
 #line 703 "cwebdir/ctangle.w"
 case identifier:
 if(out_state==num_or_id)C_putc(' ');
-for(j= (cur_val+name_dir)->byte_start,k= (cur_val+name_dir+1)->byte_start;
-j<k;j++)
+for(j= (cur_val+name_dir)->byte_start;
+j<(cur_val+name_dir+1)->byte_start;j++)
 #line 212 "cwebdir/ctang-w2c.ch"
 if(ishigh(*j)){
 
@@ -1118,8 +1118,8 @@
 
 cur_val= (int)(*cur_byte++-0200)*0400;
 cur_val+= *cur_byte++;
-for(j= (cur_val+name_dir)->byte_start,k= (cur_val+name_dir+1)->byte_start;
-j<k;j++){
+for(j= (cur_val+name_dir)->byte_start;
+j<(cur_val+name_dir+1)->byte_start;j++){
 if(*j=='\\'||*j=='"')C_putc('\\');
 C_putc(*j);
 }

Modified: trunk/Build/source/texk/web2c/cwebboot.cin
===================================================================
--- trunk/Build/source/texk/web2c/cwebboot.cin	2023-07-30 09:36:47 UTC (rev 67769)
+++ trunk/Build/source/texk/web2c/cwebboot.cin	2023-07-30 12:49:13 UTC (rev 67770)
@@ -1292,7 +1292,7 @@
 *pfirst= first+(ptrdiff_t)(ss-s);
 return extension;
 }else return equal;
-else return(q->byte_start==(q+1)->byte_start)?equal:prefix;
+else return length(q)==0?equal:prefix;
 case extension:
 if(!ispref)return bad_extension;
 first+= ss-s;

Modified: trunk/Build/source/texk/web2c/cwebdir/common.c
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/common.c	2023-07-30 09:36:47 UTC (rev 67769)
+++ trunk/Build/source/texk/web2c/cwebdir/common.c	2023-07-30 12:49:13 UTC (rev 67770)
@@ -1069,7 +1069,7 @@
 *pfirst= first+(ptrdiff_t)(ss-s);
 return extension;
 }else return equal;
-else return(q->byte_start==(q+1)->byte_start)?equal:prefix;
+else return length(q)==0?equal:prefix;
 case extension:
 if(!ispref)return bad_extension;
 first+= ss-s;

Modified: trunk/Build/source/texk/web2c/cwebdir/common.w
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/common.w	2023-07-30 09:36:47 UTC (rev 67769)
+++ trunk/Build/source/texk/web2c/cwebdir/common.w	2023-07-30 12:49:13 UTC (rev 67770)
@@ -977,7 +977,7 @@
           *pfirst=first+(ptrdiff_t)(ss-s);
           return extension; /* null extension */
         } else return equal;
-      else return (q->byte_start==(q+1)->byte_start)? equal: prefix;
+      else return length(q)==0? equal: prefix;
     case extension:
       if (!ispref) return bad_extension;
       first += ss-s;

Modified: trunk/Build/source/texk/web2c/cwebdir/ctangle.c
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctangle.c	2023-07-30 09:36:47 UTC (rev 67769)
+++ trunk/Build/source/texk/web2c/cwebdir/ctangle.c	2023-07-30 12:49:13 UTC (rev 67770)
@@ -777,7 +777,7 @@
 out_char(
 eight_bits cur_char)
 {
-char*j,*k;
+char*j;
 restart:
 switch(cur_char){
 case'\n':if(protect&&out_state!=verbatim)C_putc(' ');
@@ -788,8 +788,8 @@
 
 case identifier:
 if(out_state==num_or_id)C_putc(' ');
-for(j= (cur_val+name_dir)->byte_start,k= (cur_val+name_dir+1)->byte_start;
-j<k;j++)
+for(j= (cur_val+name_dir)->byte_start;
+j<(cur_val+name_dir+1)->byte_start;j++)
 if((eight_bits)(*j)<0200)C_putc(*j);
 
 else C_printf("%s",translit[(eight_bits)(*j)-0200]);
@@ -816,8 +816,8 @@
 
 cur_val= (int)(*cur_byte++-0200)*0400;
 cur_val+= *cur_byte++;
-for(j= (cur_val+name_dir)->byte_start,k= (cur_val+name_dir+1)->byte_start;
-j<k;j++){
+for(j= (cur_val+name_dir)->byte_start;
+j<(cur_val+name_dir+1)->byte_start;j++){
 if(*j=='\\'||*j=='"')C_putc('\\');
 C_putc(*j);
 }

Modified: trunk/Build/source/texk/web2c/cwebdir/ctangle.w
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctangle.w	2023-07-30 09:36:47 UTC (rev 67769)
+++ trunk/Build/source/texk/web2c/cwebdir/ctangle.w	2023-07-30 12:49:13 UTC (rev 67770)
@@ -636,7 +636,7 @@
 out_char(
 eight_bits cur_char)
 {
-  char *j, *k; /* pointer into |byte_mem| */
+  char *j; /* pointer into |byte_mem| */
 restart:
     switch (cur_char) {
       case '\n': if (protect && out_state!=verbatim) C_putc(' ');
@@ -702,8 +702,8 @@
 @ @<Case of an identifier@>=@t\1\quad@>
 case identifier:
   if (out_state==num_or_id) C_putc(' ');
-  for (j=(cur_val+name_dir)->byte_start, k=(cur_val+name_dir+1)->byte_start;
-       j<k; j++)
+  for (j=(cur_val+name_dir)->byte_start;
+       j<(cur_val+name_dir+1)->byte_start; j++)
     if ((eight_bits)(*j)<0200) C_putc(*j);
 @^high-bit character handling@>
     else C_printf("%s",translit[(eight_bits)(*j)-0200]);
@@ -725,8 +725,8 @@
 @:line}{\.{\#line}@>
     cur_val=(int)(*cur_byte++-0200)*0400;
     cur_val+=*cur_byte++; /* points to the file name */
-    for (j=(cur_val+name_dir)->byte_start, k=(cur_val+name_dir+1)->byte_start;
-         j<k; j++) {
+    for (j=(cur_val+name_dir)->byte_start;
+         j<(cur_val+name_dir+1)->byte_start; j++) {
       if (*j=='\\' || *j=='"') C_putc('\\');
       C_putc(*j);
     }

Modified: trunk/Build/source/texk/web2c/cwebdir/cweave.w
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/cweave.w	2023-07-30 09:36:47 UTC (rev 67769)
+++ trunk/Build/source/texk/web2c/cwebdir/cweave.w	2023-07-30 12:49:13 UTC (rev 67770)
@@ -1496,9 +1496,9 @@
 name_pointer p,
 boolean quote_xalpha)
 {
-  char *k, *k_end=(p+1)->byte_start; /* pointers into |byte_mem| */
+  char *k; /* pointer into |byte_mem| */
   out('{');
-  for (k=p->byte_start; k<k_end; k++) {
+  for (k=p->byte_start; k<(p+1)->byte_start; k++) {
     if (isxalpha(*k) && quote_xalpha) out('\\');
 @.\\\$@>
 @.\\\_@>