gawk-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] gawk branch, gawk-5.3-stable, updated. gawk-4.1.0-5513-ga5ce4f44


From: Arnold Robbins
Subject: [SCM] gawk branch, gawk-5.3-stable, updated. gawk-4.1.0-5513-ga5ce4f44
Date: Sat, 17 Aug 2024 14:28:25 -0400 (EDT)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, gawk-5.3-stable has been updated
       via  a5ce4f44f1df111e88611b8a732a3144d11b0698 (commit)
      from  81d8fb04d93026a5b933439db964e1251bbeab68 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=a5ce4f44f1df111e88611b8a732a3144d11b0698

commit a5ce4f44f1df111e88611b8a732a3144d11b0698
Author: Arnold D. Robbins <arnold@skeeve.com>
Date:   Sat Aug 17 21:27:56 2024 +0300

    Fix pc/GenMakefileTst.awk.

diff --git a/pc/ChangeLog b/pc/ChangeLog
index 7ad4039b..95758271 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,8 @@
+2024-08-17         Arnold D. Robbins     <arnold@skeeve.com>
+
+       * GenMakefileTst.awk: Adjust code so that multiple lines can
+       have $(CMP) and get changed to $(TESTOUTCMP).
+
 2024-08-12         Arnold D. Robbins     <arnold@skeeve.com>
 
        * Makefile.tst: Regenerated after adding new test.
diff --git a/pc/GenMakefileTst.awk b/pc/GenMakefileTst.awk
index 1e40b1ba..68cff7ac 100644
--- a/pc/GenMakefileTst.awk
+++ b/pc/GenMakefileTst.awk
@@ -55,6 +55,7 @@ in_recipe && /^\t/ {
 # End of collected recipe, print it out
 in_recipe && /(^[^\t])|(^$)/ {
        in_recipe = 0
+       fix_recipe_for_cmp(name)
        print_recipe()
 
        print
@@ -82,14 +83,26 @@ function substitutions(test, string)
        gsub(/-F\//, "-F$(SLASH)", string)
        gsub(/=@\//, "=@$(SLASH)", string)
 
-       if (string ~ /\$\(CMP\)/ && test in testoutcmp) {
-               gsub(/\$\(CMP\)/, "$(TESTOUTCMP)", string)
-               delete testoutcmp[test]
-       }
-
        return string
 }
 
+# fix_recipe_for_cmp --- fix $(CMP) in all lines of a recipe
+
+function fix_recipe_for_cmp(test,      i, string)
+{
+       if (! (test in testoutcmp))
+               return
+
+       for (i in recipe_lines) {
+               string = recipe_lines[i]
+               if (string ~ /\$\(CMP\)/ && test in testoutcmp) {
+                       gsub(/\$\(CMP\)/, "$(TESTOUTCMP)", string)
+                       recipe_lines[i] = string
+               }
+       }
+       delete testoutcmp[test]
+}
+
 # print_recipe --- print out the recipe
 
 function print_recipe(         i, start)

-----------------------------------------------------------------------

Summary of changes:
 pc/ChangeLog          |  5 +++++
 pc/GenMakefileTst.awk | 23 ++++++++++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
gawk



reply via email to

[Prev in Thread] Current Thread [Next in Thread]