diff options
| -rw-r--r-- | Build/source/texk/web2c/cwebdir/ChangeLog | 8 | ||||
| -rw-r--r-- | Build/source/texk/web2c/cwebdir/Makefile | 4 | ||||
| -rw-r--r-- | Build/source/texk/web2c/cwebdir/ctwill-w2c.ch | 2 | ||||
| -rw-r--r-- | Build/source/texk/web2c/cwebdir/cweave.w | 2 | ||||
| -rw-r--r-- | Build/source/texk/web2c/cwebdir/prod-cweave.w | 5 | ||||
| -rw-r--r-- | Build/source/texk/web2c/cwebdir/prod.w | 7 |
6 files changed, 15 insertions, 13 deletions
diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog index 2443dec7ef9..d54b5361dc4 100644 --- a/Build/source/texk/web2c/cwebdir/ChangeLog +++ b/Build/source/texk/web2c/cwebdir/ChangeLog @@ -1,3 +1,11 @@ +2022-05-23 Andreas Scherer <https://ascherer.github.io> + + * Makefile, + * ctwill-w2c.ch, + * cweave.w, + * prod-cweave.w, + * prod.w: Fix production rule 117 similar to rule 35. + 2022-05-03 Andreas Scherer <https://ascherer.github.io> * cweave.w, diff --git a/Build/source/texk/web2c/cwebdir/Makefile b/Build/source/texk/web2c/cwebdir/Makefile index d3bc422059b..e3df1dcd1a6 100644 --- a/Build/source/texk/web2c/cwebdir/Makefile +++ b/Build/source/texk/web2c/cwebdir/Makefile @@ -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 # @@ -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/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch b/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch index b7166e6a9c9..7532d541100 100644 --- a/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch +++ b/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch @@ -834,7 +834,7 @@ if ((cat1==int_like || cat1==cast) && (cat2==comma || cat2==semi)) else if (cat1==int_like) { big_app1_insert(pp,' '); reduce(pp,2,typedef_like,0,116); } -else if (cat1==exp && cat2!=lpar && cat2!=exp && cat2!=cast) { +else if (cat1==exp && cat2!=lpar && cat2!=lbrack && cat2!=exp && cat2!=cast) { make_underlined(pp+1); make_reserved(pp+1); big_app1_insert(pp,' '); reduce(pp,2,typedef_like,0,117); } diff --git a/Build/source/texk/web2c/cwebdir/cweave.w b/Build/source/texk/web2c/cwebdir/cweave.w index 0bbcd6f2e8e..5a8e0eaca65 100644 --- a/Build/source/texk/web2c/cwebdir/cweave.w +++ b/Build/source/texk/web2c/cwebdir/cweave.w @@ -3093,7 +3093,7 @@ if ((cat1==int_like || cat1==cast) && (cat2==comma || cat2==semi)) else if (cat1==int_like) { big_app1_insert(pp,' '); reduce(pp,2,typedef_like,0,116); } -else if (cat1==exp && cat2!=lpar && cat2!=exp && cat2!=cast) { +else if (cat1==exp && cat2!=lpar && cat2!=lbrack && cat2!=exp && cat2!=cast) { make_underlined(pp+1); make_reserved(pp+1); big_app1_insert(pp,' '); reduce(pp,2,typedef_like,0,117); } diff --git a/Build/source/texk/web2c/cwebdir/prod-cweave.w b/Build/source/texk/web2c/cwebdir/prod-cweave.w index 00cf8866dd8..972e686a668 100644 --- a/Build/source/texk/web2c/cwebdir/prod-cweave.w +++ b/Build/source/texk/web2c/cwebdir/prod-cweave.w @@ -333,7 +333,7 @@ We use \\{in}, \\{out}, \\{back}, \\{bsp}, and \\{din} as shorthands for Rules 1, 38, 52, and 73: The \\{din}s and \\{out}s are suppressed if \.{CWEAVE} has been invoked with the \.{-i} option. -Rule 35: The |exp| must not be immediately followed by |lpar|, |lbrack|, +Rules 35, 117: The |exp| must not be immediately followed by |lpar|, |lbrack|, |exp|, or~|cast|. Rule 41: The |big_force| becomes |force| if \.{CWEAVE} has been invoked with the @@ -361,9 +361,6 @@ must not be immediately followed by a |binop|. Rule 114: The |operator_like| must not be immediately followed by |raw_ubin|. -Rule 117: The |exp| must not be immediately followed by |lpar|, |exp|, -or |cast|. - Rule 123: The mathness of the |colon| or |base| changes to `yes'. Rules 153, 154: |make_reserved| is called only if \.{CWEAVE} has been invoked diff --git a/Build/source/texk/web2c/cwebdir/prod.w b/Build/source/texk/web2c/cwebdir/prod.w index e8d4a335725..73365e01c0a 100644 --- a/Build/source/texk/web2c/cwebdir/prod.w +++ b/Build/source/texk/web2c/cwebdir/prod.w @@ -265,7 +265,7 @@ We use \\{in}, \\{out}, \\{back}, \\{bsp}, and \\{din} as shorthands for \+& |typedef_like| |comma| & |typedef_like| \hfill $TC\.\ $ & \&{typedef} \&{int} \&x,\cr \+& |typedef_like| |semi| & |decl| & \&{typedef} \&{int} $\&x,\&y$;\cr -\+& |typedef_like| |ubinop| \alt |cast| |ubinop| & +\+& |typedef_like| |ubinop| \alt |cast| |ubinop| & |typedef_like| \alt |cast| |ubinop| \hfill \alt $C=\.\{U\.\}C$ $U_2=\.\{U_1\.\}U_2$ \unskip & \&{typedef} |*|{}|*|(\&{CPtr})\cr @@ -329,7 +329,7 @@ We use \\{in}, \\{out}, \\{back}, \\{bsp}, and \\{din} as shorthands for \parindent=0pt \dag{\bf Notes} \yskip -Rule 35: The |exp| must not be immediately followed by |lpar|, |lbrack|, +Rules 35, 117: The |exp| must not be immediately followed by |lpar|, |lbrack|, |exp|, or~|cast|. Rule 48: The |exp| or |int_like| must not be immediately followed by |base|. @@ -352,9 +352,6 @@ must not be immediately followed by a |binop|. Rule 114: The |operator_like| must not be immediately followed by |raw_ubin|. -Rule 117: The |exp| must not be immediately followed by |lpar|, |exp|, -or |cast|. - Rule 123: The mathness of the |colon| or |base| changes to `yes'. Rules 153, 154: |make_reserved| is called only if \.{CWEAVE} has been invoked |