Revise getopt.m4

1 files changed, 177 insertions, 63 deletions

diff --git a/build-aux/getopt.m4 b/build-aux/getopt.m4
index 93d81df..85e930e 100644
--- a/build-aux/getopt.m4
+++ b/build-aux/getopt.m4
@@ -1,5 +1,5 @@
 dnl This file is part of grecs
-dnl Copyright (C) 2007-2016 Sergey Poznyakoff
+dnl Copyright (C) 2007-2018 Sergey Poznyakoff
 dnl
 dnl Grecs is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -17,6 +17,27 @@ divert(-1)
 changequote([<,>])
 changecom(/*,*/)
 
+dnl Diversion channels
+define([<__DIV_OPTKEYS__>],1)dnl        option keys
+define([<__DIV_OPTDECL__>],2)dnl        struct option declarations
+define([<__DIV_HELPDECL__>],3)dnl       grecs_opthelp declarations
+define([<__DIV_SWITCH__>],4)dnl         switch statement body
+define([<__DIV_STATIC__>],5)dnl         module static data
+
+dnl Special macros that can be set during expansion
+pushdef([<__GETOPT_DEFINED__>])
+pushdef([<__OPTIONS_END_DEFINED__>])
+pushdef([<__GETOPT_LASTOPT_LABEL__>])
+
+define([<__GETOPT_LONG_TAG>])
+define([<__GETOPT_SHORT_TAG>])
+
+define([<WITH_DIVERSION>],[<ifelse([<$#>],0,[<[<$0>]>],[<dnl
+pushdef([<__GETOPT_DIVERSION__>],divnum)dnl
+divert([<$1>])$2dnl
+divert(__GETOPT_DIVERSION__)dnl
+popdef([<__GETOPT_DIVERSION__>])>])>])
+
 dnl _getopt_mangle_option(NAME)
 dnl ---------------------------
 dnl Convert NAME to a valid m4 identifier, by replacing invalid characters
@@ -33,7 +54,7 @@ define([<_getopt_set_option>],
              [<_getopt_mangle_option(\1),[<\2>]>]))>])>])
 
 dnl _getopt_get_option(NAME[,DEFAULT])
-dnl ------------------------------
+dnl ----------------------------------
 define([<_getopt_get_option>],
   [<_getopt_if_option_set($1,[<indir(_getopt_mangle_option($1))>],[<$2>])>])
   
@@ -44,7 +65,7 @@ define([<_getopt_if_option_set>],
   [<ifdef(_getopt_mangle_option([<$1>]),[<$2>],[<$3>])>])
 
 dnl _getopt_if_option_null(NAME,IF-NULL,IF-NOT-NULL)
-dnl ---------------------------------------------
+dnl ------------------------------------------------
 dnl Check if option NAME is set.
 define([<_getopt_if_option_null>],
   [<ifelse(indir(_getopt_mangle_option([<$1>])),,[<$2>],[<$3>])>])
@@ -61,7 +82,7 @@ define([<_getopt_option_switch>],
                              [<_getopt_option_switch(shift(shift($@)))>])>])>])
 
 dnl _getopt_if_option_val(NAME,val,IF-TRUE,IF-FALSE)
-dnl ---------------------------------------------
+dnl ------------------------------------------------
 dnl Check if option NAME is set.
 define([<_getopt_if_option_val>],
   [<ifelse(_getopt_get_option([<$1>]),[<$2>],[<$3>],[<$4>])>])
@@ -89,34 +110,39 @@ define([<_getopt_set_options>],
        _getopt_set_options(shift($@))>])>])
 
 dnl __getopt_format_authors(name[,name...])
-dnl ------------------------------
+dnl ---------------------------------------
 define([<__getopt_format_authors>],dnl
         [<ifelse([<$1>],,NULL,[<"$1",
 __getopt_format_authors(shift($@))>])>])
        
 dnl __getopt_upcase(ARGS...)
+dnl ------------------------
 dnl Concatenate and convert ARGS to upper case.
 dnl
 define([<__getopt_upcase>], [<translit([<$*>], [<a-z>], [<A-Z>])>])
 
 dnl __getopt_concat(ARGS...)
+dnl ------------------------    
 dnl Concatenate arguments, inserting ", " between each pair of them.
 dnl
 define([<__getopt_concat>],[<ifelse([<$#>],1,[<$1>],[<$1, __getopt_concat(shift($@))>])>])
 
 dnl __getopt_flushleft(ARGS...)
+dnl ---------------------------
 dnl Concatenate ARGS and remove any leading whitespace
 dnl
 define([<__getopt_flushleft>],
  [<patsubst([<__getopt_concat($*)>], [<^[       ]+>])>])
 
 dnl __getopt_chop(ARGS...)
+dnl ----------------------
 dnl Concatenate ARGS and remove any trailing whitespace
 dnl
 define([<__getopt_chop>],
  [<patsubst([<$*>], [<[ ]+$>])>])
 
 dnl __getopt_escape(ARGS...)
+dnl ------------------------
 dnl Concatenate ARGS and escape any occurrences of double-quotes with
 dnl backslashes.
 dnl
@@ -124,6 +150,7 @@ define([<__getopt_escape>],
 [<patsubst([<__getopt_concat($*)>],[<[\"]>],[<\\\&>])>])
 
 dnl __getopt_prep(ARG)
+dnl ------------------
 dnl Prepare ARG for including in C strings: replace newlines and any 
 dnl preceding and following whitespace by a single space character, remove
 dnl leading whitespace, and escape double-quotes.
@@ -133,46 +160,56 @@ define([<__getopt_prep>],
 +[      ]*>],[< >])))>])
 
 dnl __GETOPT_SHORT_OPTS
+dnl -------------------
 dnl Accumulator for the 3rd argument of getopt_long
 dnl
 define([<__GETOPT_SHORT_OPTS>],[<_getopt_if_option_set([<nopermute>],+)>])
 
 dnl GROUP(STRING)
+dnl -------------
 dnl Begin a named group of options
 dnl
-define([<GROUP>],[<dnl
-divert(3)
+define([<GROUP>],[<ifelse([<$#>],0,[<[<$0>]>],[<dnl
+WITH_DIVERSION(__DIV_HELPDECL__,[<dnl
         { NULL, NULL, 0, N_("__getopt_prep([<$1>])") },
-divert(-1)>])
+>])>])>])       
 
 # __getopt_quote(args) - convert args to single-quoted string
-define([<__getopt_quote>], [<ifelse([<$#>], [<0>], [<>], [<[<$*>]>])>])
-define([<__getopt_dquote>], [<[<$@>]>])
+define([<__getopt_quote>], [<ifelse([<$*>], [<>], [<>], [<[<$*>]>])>])
+define([<__getopt_dquote>], [<ifelse([<$*>], [<>], [<>], [<[<$@>]>])>])
+
+# __getopt_ifempty(LIST, IF-TRUE [, IF-FALSE])
+# --------------------------------------------
+# Expands to IF-TRUE if LIST is not empty, otherwise to IF-FALSE.
+#
+define([<__getopt_ifempty>], [<ifelse([<$1>],[<>],[<$2>],[<$3>])>])
 
 define([<__GATHER_OPTIONS>],[<
 pushdef([<__GETOPT_KEY>],ifelse([<$2>],,[<OPTION_>]__getopt_upcase(patsubst($1,-,_)),'$2'))
 ifelse([<$2>],,[<
-divert(1)
+WITH_DIVERSION(__DIV_OPTKEYS__,[<dnl
         __GETOPT_KEY,
-divert(-1)
->])
+>])>])
 define([<__GETOPT_SELECTOR>],ifdef([<__GETOPT_SELECTOR>],__GETOPT_SELECTOR) case __GETOPT_KEY:)
 ifelse([<$1>],,,[<
-divert(2)
+WITH_DIVERSION(__DIV_OPTDECL__,[<dnl
         { "$1", __GETOPT_ARGTYPE, 0, __GETOPT_KEY },
-divert(-1)>])
+>])>])
 dnl
 define([<__GETOPT_SHORT_OPTS>],__getopt_dquote(__GETOPT_SHORT_OPTS[<>]dnl
 ifelse([<$2>],,,[<$2>]ifelse(__GETOPT_ARGTYPE,[<no_argument>],,__GETOPT_ARGTYPE,[<required_argument>],:,__GETOPT_ARGTYPE,[<optional_argument>],::))))
 dnl
 ifelse([<$1>],,,dnl
-[<define([<__GETOPT_LONG_TAG>],ifelse(__GETOPT_LONG_TAG,,[<--$1>],[<__GETOPT_LONG_TAG; --$1>]))>])
+[<define([<__GETOPT_LONG_TAG>],
+__getopt_ifempty(__getopt_quote(__GETOPT_LONG_TAG),__getopt_dquote(__getopt_dquote(--$1)),[<__getopt_quote(__getopt_dquote(__GETOPT_LONG_TAG), __getopt_dquote([< --$1>]))>]))>])
 ifelse([<$2>],,,dnl
-[<define([<__GETOPT_SHORT_TAG>],ifelse(__GETOPT_SHORT_TAG,,[<-$2>],[<__GETOPT_SHORT_TAG; -$2>]))>])
+[<define([<__GETOPT_SHORT_TAG>],
+__getopt_ifempty(__getopt_quote(__GETOPT_SHORT_TAG),__getopt_dquote(__getopt_dquote(-$2)),[<__getopt_quote(__getopt_dquote(__GETOPT_SHORT_TAG), __getopt_dquote([< -$2>]))>]))>])
 popdef([<__GETOPT_KEY>])
 >])
 
 dnl OPTION(long-opt, short-opt, [arg], [descr])
+dnl -------------------------------------------
 dnl Introduce a command line option. Arguments:
 dnl   long-opt     Long option.
 dnl   short-opt    Short option (a single char)
@@ -189,7 +226,7 @@ dnl