[SCM] GNU Autoconf source repository branch, master, updated. v2.64-44-g6b22fb3
"Eric Blake" <[email protected]>
| Newsgroups | gmane.comp.sysutils.autoconf.cvs |
|---|---|
| Message-ID | <[email protected]> |
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=6b22fb3155ac0d04daa57951f1a1fe4c36162e9b
The branch, master has been updated
via 6b22fb3155ac0d04daa57951f1a1fe4c36162e9b (commit)
from ceff70a2584db560f42e59c289813ba6f9aa1047 (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 6b22fb3155ac0d04daa57951f1a1fe4c36162e9b
Author: Eric Blake <[email protected]>
Date: Mon Sep 14 06:58:51 2009 -0600
Quote result of m4_toupper and m4_tolower.
* lib/m4sugar/m4sugar.m4 (m4_tolower, m4_toupper): Quote result.
* lib/autotest/general.m4 (AT_KEYWORDS): Adjust caller.
* tests/m4sugar.at (m4@&t@_toupper and m4@&t@_tolower): New test.
* NEWS: Document this.
* THANKS: Update.
Reported by Sam Steingold.
Signed-off-by: Eric Blake <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 10 ++++++++++
NEWS | 3 +++
THANKS | 1 +
lib/autotest/general.m4 | 4 ++--
lib/m4sugar/m4sugar.m4 | 8 ++++----
tests/m4sugar.at | 37 +++++++++++++++++++++++++++++++++++++
6 files changed, 57 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 93a5bc8..d128e2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-09-14 Eric Blake <[email protected]>
+
+ Quote result of m4_toupper and m4_tolower.
+ * lib/m4sugar/m4sugar.m4 (m4_tolower, m4_toupper): Quote result.
+ * lib/autotest/general.m4 (AT_KEYWORDS): Adjust caller.
+ * tests/m4sugar.at (m4@&t@_toupper and m4@&t@_tolower): New test.
+ * NEWS: Document this.
+ * THANKS: Update.
+ Reported by Sam Steingold.
+
2009-09-14 Ralf Wildenhues <[email protected]>
DJGPP fix: remove both conftest and conftest.exe.
diff --git a/NEWS b/NEWS
index 262be0c..01bc094 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,9 @@ GNU Autoconf NEWS - User visible changes.
** The following documented autotest macros are new:
AT_CHECK_EUNIT
+** The following m4sugar macros now quote their expansion:
+ m4_toupper m4_tolower
+
** The `$tmp' temporary directory used in config.status is documented for
public use now.
diff --git a/THANKS b/THANKS
index 4a96e34..28312f7 100644
--- a/THANKS
+++ b/THANKS
@@ -325,6 +325,7 @@ Russ Boylan [email protected]
Ryuji Abe [email protected]
Sam Sexton [email protected]
Sam Sirlin [email protected]
+Sam Steingold [email protected]
Sam Varshavchik [email protected]
Sander Niemeijer [email protected]
santilín [email protected]
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 2c164b5..33218fd 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -1814,8 +1814,8 @@ m4_case([$1],
# Since the -k option is case-insensitive, the list is stored in lower case
# to avoid duplicates that differ only by case.
_AT_DEFINE_SETUP([AT_KEYWORDS],
-[m4_append_uniq_w([AT_keywords], m4_tolower(m4_dquote(_m4_expand([$1
-]))))])
+[m4_append_uniq_w([AT_keywords], m4_tolower(_m4_expand([$1
+])))])
# AT_CAPTURE_FILE(FILE)
diff --git a/lib/m4sugar/m4sugar.m4 b/lib/m4sugar/m4sugar.m4
index 7bc72b6..2e53ea3 100644
--- a/lib/m4sugar/m4sugar.m4
+++ b/lib/m4sugar/m4sugar.m4
@@ -2266,11 +2266,11 @@ m4_defn([m4_re_string])dnl
#
# Rather than expand the m4_defn each time, we inline them up front.
m4_define([m4_tolower],
-[m4_translit([$1], ]m4_dquote(m4_defn([m4_cr_LETTERS]))[,
- ]m4_dquote(m4_defn([m4_cr_letters]))[)])
+[m4_translit([[$1]], ]m4_dquote(m4_defn([m4_cr_LETTERS]))[,
+ ]m4_dquote(m4_defn([m4_cr_letters]))[)])
m4_define([m4_toupper],
-[m4_translit([$1], ]m4_dquote(m4_defn([m4_cr_letters]))[,
- ]m4_dquote(m4_defn([m4_cr_LETTERS]))[)])
+[m4_translit([[$1]], ]m4_dquote(m4_defn([m4_cr_letters]))[,
+ ]m4_dquote(m4_defn([m4_cr_LETTERS]))[)])
# m4_split(STRING, [REGEXP])
diff --git a/tests/m4sugar.at b/tests/m4sugar.at
index 87c303f..d37681b 100644
--- a/tests/m4sugar.at
+++ b/tests/m4sugar.at
@@ -1292,6 +1292,43 @@ AB
AT_CLEANUP
+## ------------------------ ##
+## m4_toupper, m4_tolower. ##
+## ------------------------ ##
+
+AT_SETUP([m4@&t@_toupper and m4@&t@_tolower])
+
+AT_CHECK_M4SUGAR_TEXT(
+[[m4_define([abc], [hI])m4_define([ABC], [Hi])
+m4_toupper(abc aBc ABC)
+m4_tolower(abc aBc ABC)
+m4_toupper([abc aBc ABC])
+m4_tolower([abc aBc ABC])
+m4_echo(m4_toupper(abc aBc ABC))
+m4_echo(m4_tolower(abc aBc ABC))
+m4_echo(m4_toupper([abc aBc ABC]))
+m4_echo(m4_tolower([abc aBc ABC]))
+m4_do(m4_toupper(abc aBc ABC))
+m4_do(m4_tolower(abc aBc ABC))
+m4_do(m4_toupper([abc aBc ABC]))
+m4_do(m4_tolower([abc aBc ABC]))
+]], [[
+HI ABC HI
+hi abc hi
+ABC ABC ABC
+abc abc abc
+HI ABC HI
+hi abc hi
+ABC ABC ABC
+abc abc abc
+HI Hi HI
+hi hI hi
+Hi Hi Hi
+hI hI hI
+]])
+
+AT_CLEANUP
+
## --------------- ##
## m4_bpatsubsts. ##
## --------------- ##
hooks/post-receive
--
GNU Autoconf source repository