[SCM] GNU Autoconf source repository branch, master, updated. v2.62-61-g550a531

[Eric Blake]

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 "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=550a531311a58a3ac7f9274e66e8b9a3540ba2e0

The branch, master has been updated
       via  550a531311a58a3ac7f9274e66e8b9a3540ba2e0 (commit)
      from  8d81fd7f28c1543bc4d0766dc11e18daadfe851b (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 -----------------------------------------------------------------
commit 550a531311a58a3ac7f9274e66e8b9a3540ba2e0
Author: Eric Blake <address@hidden>
Date:   Wed Jul 30 09:45:21 2008 -0600

    Fix bugs in previous version of m4_bpatsubsts.
    
    * lib/m4sugar/foreach.m4 (_m4_bpatsubsts): Don't expand $1, and
    allow concatenation with subsequent text.
    * tests/m4sugar.at (m4@&address@hidden): Enhance test.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 ChangeLog              |    7 +++++++
 lib/m4sugar/foreach.m4 |    6 +++---
 tests/m4sugar.at       |    7 ++++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5f348b3..5ff6e00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-30  Eric Blake  <address@hidden>
+
+       Fix bugs in previous version of m4_bpatsubsts.
+       * lib/m4sugar/foreach.m4 (_m4_bpatsubsts): Don't expand $1, and
+       allow concatenation with subsequent text.
+       * tests/m4sugar.at (m4@&address@hidden): Enhance test.
+
 2008-07-29  Eric Blake  <address@hidden>
 
        Add linear m4_bpatsubsts for m4 1.4.x.
diff --git a/lib/m4sugar/foreach.m4 b/lib/m4sugar/foreach.m4
index 015e0be..3109a8f 100644
--- a/lib/m4sugar/foreach.m4
+++ b/lib/m4sugar/foreach.m4
@@ -137,11 +137,11 @@ m4_define([_m4_case_],
 #   m4_bpatsubst(m4_dquote(_m4_defn([_m4_p])), [$2], [$3]))m4_define([_m4_p],
 #   m4_bpatsubst(m4_dquote(_m4_defn([_m4_p])), [$4], 
[$5]))m4_define([_m4_p],...
 #   m4_bpatsubst(m4_dquote(_m4_defn([_m4_p])), [$m-1], [$m]))m4_unquote(
-#   _m4_defn([_m4_p]))[]_m4_popdef([_m4_p])
+#   _m4_defn([_m4_p])_m4_popdef([_m4_p]))
 m4_define([_m4_bpatsubsts],
 [m4_define([_m4_p], m4_pushdef([_m4_p])[m4_define([_m4_p],
-  [$1])]_m4_for([_m4_p], [3], [$#], [2], [$0_(m4_decr(_m4_p),
-  _m4_p)])[m4_unquote(_m4_defn([_m4_p]))[]_m4_popdef([_m4_p])])_m4_p($@)])
+  ]m4_dquote([$]1)[)]_m4_for([_m4_p], [3], [$#], [2], [$0_(m4_decr(_m4_p),
+  _m4_p)])[m4_unquote(_m4_defn([_m4_p])_m4_popdef([_m4_p]))])_m4_p($@)])
 
 m4_define([_m4_bpatsubsts_],
 [[m4_define([_m4_p],
diff --git a/tests/m4sugar.at b/tests/m4sugar.at
index a1c0bd0..516881e 100644
--- a/tests/m4sugar.at
+++ b/tests/m4sugar.at
@@ -532,14 +532,19 @@ AT_CHECK_M4SUGAR_TEXT(
 m4_bpatsubsts([11], [\(.\)1], [\12])
 m4_bpatsubsts([11], [^..$], [], [1], [2])
 m4_bpatsubsts([11], [\(.\)1], [\12], [1], [3])
-m4_define([a], [oops])m4_define([AB], [good])dnl
+m4_define([a], [oops])m4_define([c], [oops])dnl
+m4_define([AB], [good])m4_define([bc], [good])dnl
 m4_bpatsubsts([abc], [a], [A], [b], [B], [c])
+m4_bpatsubsts([ab], [a])c
+m4_bpatsubsts([ab], [c], [C], [a])c
 m4_bpatsubsts(address@hidden, [\$\*], [$#])
 ]], [[11
 21
 22
 23
 good
+good
+good
 $1$#$@
 ]])
 


hooks/post-receive
--
GNU Autoconf source repository