shell function style [was: [PATCH] use shell function for AS_BASENAME...]

[Eric Blake]

Eric Blake <ebb9 <at> byu.net> writes:

> Meanwhile, let's settle on a consistent style: right now, m4sh uses
> 
> func () {
>   body
> }
> 
> but autotest uses
> 
> func()
> {
>   body
> }
> 
> I somewhat prefer the latter (it is more like GNU Coding Standards for C), so 
> unless anyone complains, I'll commit a followup patch that changes the m4sh 
> formatting to match autotest.

I've pushed this, to match autotest:

From: Eric Blake <address@hidden>
Date: Mon, 13 Oct 2008 08:50:25 -0600
Subject: [PATCH] Use consistent shell function style.

* lib/m4sugar/m4sh.m4 (_AS_PREPARE, AS_REQUIRE_SHELL_FN)
(_AS_SHELL_FN_WORK): Imitate GNU Coding Standards for C
functions.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog           |    7 +++++++
 lib/m4sugar/m4sh.m4 |   21 ++++++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 795ba04..418aff6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-13  Eric Blake  <address@hidden>
+
+       Use consistent shell function style.
+       * lib/m4sugar/m4sh.m4 (_AS_PREPARE, AS_REQUIRE_SHELL_FN)
+       (_AS_SHELL_FN_WORK): Imitate GNU Coding Standards for C
+       functions.
+
 2008-10-13  Paolo Bonzini  <address@hidden>
 
        * lib/m4sugar/m4sh.m4 (_AS_LINENO_PREPARE): Place names of
diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index aa5669b..2e6b2f2 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -256,7 +256,8 @@ fi
 # there are so many _AS_PREPARE_* below, and that's also why it is
 # important not to forget some: config.status needs them.
 m4_defun([_AS_PREPARE],
-[as_func_mkdir_p() {
+[as_func_mkdir_p ()
+{
   _AS_MKDIR_P
 }
 
@@ -348,7 +349,8 @@ m4_define([AS_REQUIRE],
 #
 m4_define([AS_REQUIRE_SHELL_FN],
 [_AS_DETECT_REQUIRED([_AS_SHELL_FN_WORK])dnl
-AS_REQUIRE([AS_SHELL_FN_$1], [m4_provide([AS_SHELL_FN_$1])$1() {
+AS_REQUIRE([AS_SHELL_FN_$1], [m4_provide([AS_SHELL_FN_$1])$1 ()
+{
 $2
 }], m4_default_quoted([$3], [M4SH-INIT-FN]))])
 
@@ -372,19 +374,24 @@ _ASEOF
 # This is a spy to detect "in the wild" shells that do not support shell
 # functions correctly.  It is based on the m4sh.at Autotest testcases.
 m4_define([_AS_SHELL_FN_WORK],
-[as_func_return () {
+[as_func_return ()
+{
   (exit [$]1)
 }
-as_func_success () {
+as_func_success ()
+{
   as_func_return 0
 }
-as_func_failure () {
+as_func_failure ()
+{
   as_func_return 1
 }
-as_func_ret_success () {
+as_func_ret_success ()
+{
   return 0
 }
-as_func_ret_failure () {
+as_func_ret_failure ()
+{
   return 1
 }
 
-- 
1.6.0.2