Fix separator in m4_stack_foreach_sep.

* lib/m4sugar/m4sugar.m4 (_m4_stack_reverse): Separate separator
from prefix.
* tests/m4sugar.at (m4@&t@_stack): Enhance test.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index c1d367a6f1326763eff31e8b7417d70789b9cc7b..369433c0f243ed41df65607f1d864713822531c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-18  Eric Blake  <ebb9@byu.net>
+
+       Fix separator in m4_stack_foreach_sep.
+       * lib/m4sugar/m4sugar.m4 (_m4_stack_reverse): Separate separator
+       from prefix.
+       * tests/m4sugar.at (m4@&t@_stack): Enhance test.
+
 2008-12-18  Eric Blake  <ebb9@byu.net>
 
        Mention limitation of M4 1.4.x on builtin tokens.

diff --git a/lib/m4sugar/m4sugar.m4 b/lib/m4sugar/m4sugar.m4
index fe6af4fb5d22a9442597b2637b55df7ab06b5f57..6ca825ff4301ea3aa9d63c189a515f23b4750319 100644 (file)
--- a/lib/m4sugar/m4sugar.m4
+++ b/lib/m4sugar/m4sugar.m4
@@ -1293,7 +1293,7 @@ m4_define([m4_stack_foreach_sep_lifo],
 # swapped copy.
 m4_define([_m4_stack_reverse],
 [m4_ifdef([$1], [m4_pushdef([$2],
-  _m4_defn([$1]))$3[]_m4_popdef([$1])$0([$1], [$2], [$4$3])])])
+  _m4_defn([$1]))$3[]_m4_popdef([$1])$0([$1], [$2], [$4[]$3])])])
 
 
 

diff --git a/tests/m4sugar.at b/tests/m4sugar.at
index 8a538f0ad709cdad67649d94faf8131226c1367a..a876588aece2f32c0ba70878c48b71c7bab637f6 100644 (file)
--- a/tests/m4sugar.at
+++ b/tests/m4sugar.at
@@ -60,7 +60,8 @@ m4_copy([abc], [foo])dnl
 m4_stack_foreach([foo], [m4_n])
 m4_stack_foreach_lifo([foo], [m4_n])
 m4_stack_foreach_sep([abc], [ m4_index([abcdefghijkl],], [)])
-m4_stack_foreach_sep_lifo([abc], [<], [>], [:])
+m4_define([colon], [:])dnl
+m4_stack_foreach_sep_lifo([abc], [<], [>], [colon])
 m4_pushdef([xyz], [123])dnl
 m4_pushdef([xyz], [456])dnl
 m4_define([doit], [[$1](m4_stack_foreach_sep([xyz], [m4_dquote(], [)], [,]))