From: Eric Blake <ebb9@byu.net>
Date: Mon, 14 Sep 2009 12:58:51 +0000 (-0600)
Subject: Quote result of m4_toupper and m4_tolower.
X-Git-Tag: v2.65~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b22fb3155ac0d04daa57951f1a1fe4c36162e9b;p=thirdparty%2Fautoconf.git

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 <ebb9@byu.net>
---

diff --git a/ChangeLog b/ChangeLog
index 93a5bc89..d128e2ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-09-14  Eric Blake  <ebb9@byu.net>
+
+	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  <Ralf.Wildenhues@gmx.de>
 
 	DJGPP fix: remove both conftest and conftest.exe.
diff --git a/NEWS b/NEWS
index 262be0c1..01bc0941 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 4a96e347..28312f76 100644
--- a/THANKS
+++ b/THANKS
@@ -325,6 +325,7 @@ Russ Boylan                 ross@biostat.ucsf.edu
 Ryuji Abe                   raeva@t3.rim.or.jp
 Sam Sexton                  Sam.Sexton@reuters.com
 Sam Sirlin                  sam@kalessin.jpl.nasa.gov
+Sam Steingold               sds@gnu.org
 Sam Varshavchik             mrsam@courier-mta.com
 Sander Niemeijer            niemeijer@science-and-technology.nl
 santilín                    listas@gestiong.org
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 2c164b55..33218fd8 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 7bc72b6e..2e53ea37 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 87c303f6..d37681b2 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.  ##
 ## --------------- ##