ncurses 6.0 - patch 20160709

[ncurses.git] / ncurses / base / MKlib_gen.sh

diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
index 4c35b73e50d9fa3edfbebff23aad3254757d7de1..a25176f8ae4b91d90be02a741f17aa4404ba5b57 100755 (executable)
--- a/ncurses/base/MKlib_gen.sh
+++ b/ncurses/base/MKlib_gen.sh
@@ -2,7 +2,7 @@
 #
 # MKlib_gen.sh -- generate sources from curses.h macro definitions
 #
-# ($Id: MKlib_gen.sh,v 1.53 2016/06/25 22:08:12 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.54 2016/07/09 21:43:05 tom Exp $)
 #
 ##############################################################################
 # Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.                #
@@ -450,16 +450,16 @@ END               {
                        for (n = 1; n < start; ++n) {
                                value = calls[n];
                                if ( value !~ /P_POUNDC/ ) {
-                                       gsub(/[[:blank:]]+/," ",value);
-                                       sub(/^[[:alnum:]_]+ /,"",value);
+                                       gsub(/[ \t]+/," ",value);
+                                       sub(/^[0-9a-zA-Z_]+ /,"",value);
                                        sub(/^\* /,"",value);
-                                       gsub(/[[:alnum:]_]+ \* /,"",value);
+                                       gsub(/[0-9a-zA-Z_]+ \* /,"",value);
                                        gsub(/ (const) /," ",value);
                                        gsub(/ (int|short|attr_t|chtype|wchar_t|NCURSES_BOOL|NCURSES_OUTC|NCURSES_OUTC_sp|va_list) /," ",value);
                                        gsub(/ void /,"",value);
                                        sub(/^/,"call_",value);
-                                       gsub(/ (a[[:digit:]]|z) /, " 0 ", value);
-                                       gsub(/ int[[:blank:]]*[(][^)]+[)][(][^)]+[)]/, "0", value);
+                                       gsub(/ (a[0-9]|z) /, " 0 ", value);
+                                       gsub(/ int[ \t]*[(][^)]+[)][(][^)]+[)]/, "0", value);
                                        printf "\t%s;\n", value;
                                } else {
                                        print value;