From ae1cc9f03fb60ee3ab686642ac7faa4279bbcfc4 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 25 Aug 2010 16:22:45 -0600 Subject: [PATCH] m4sh: reduce size of AS_VAR_TEST_SET * lib/m4sugar/m4sh.m4 (AS_VAR_TEST_SET): Make more compact. Signed-off-by: Eric Blake --- ChangeLog | 3 +++ lib/m4sugar/m4sh.m4 | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe403cda..dbb2fbfd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2010-08-25 Eric Blake + m4sh: reduce size of AS_VAR_TEST_SET + * lib/m4sugar/m4sh.m4 (AS_VAR_TEST_SET): Make more compact. + tests: improve some shell assumption testing * tests/m4sh.at (Functions Support, Functions and return Support) (Negated classes in globbing): Update comments. diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4 index 6b1c1ead..facd70d9 100644 --- a/lib/m4sugar/m4sh.m4 +++ b/lib/m4sugar/m4sh.m4 @@ -2063,13 +2063,13 @@ m4_define([AS_VAR_SET_IF], # AS_VAR_TEST_SET(VARIABLE) # ------------------------- -# Expands into the `test' expression which is true if VARIABLE +# Expands into an expression which is true if VARIABLE # is set. Polymorphic. m4_define([AS_VAR_TEST_SET], [AS_LITERAL_WORD_IF([$1], - [test "${$1+set}" = set], - [{ as_var=$1; eval "test \"\${$as_var+set}\" = set"; }], - [eval "test \"\${$1+set}\"" = set])]) + [${$1+:} false], + [{ as_var=$1; eval \${$as_var+:} false; }], + [eval \${$1+:} false])]) ## -------------------- ## -- 2.47.2