ncurses 6.0 - patch 20170325

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

diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
index c4319bf09f181bea993d2c5bf6e76611afdbf8ce..1552711966ef1131e0e5cd8232e6188175544779 100755 (executable)
--- a/ncurses/base/MKlib_gen.sh
+++ b/ncurses/base/MKlib_gen.sh
@@ -2,10 +2,10 @@
 #
 # MKlib_gen.sh -- generate sources from curses.h macro definitions
 #
-# ($Id: MKlib_gen.sh,v 1.42 2011/01/01 22:06:52 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.56 2017/01/07 16:02:47 tom Exp $)
 #
 ##############################################################################
-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -62,10 +62,27 @@ if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
 if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 if test "${LC_COLLATE+set}"  = set; then LC_COLLATE=C;  export LC_COLLATE;  fi
 
-preprocessor="$1 -DNCURSES_INTERNALS -I../include"
+preprocessor="$1 -DNCURSES_WATTR_MACROS -DNCURSES_INTERNALS -I../include"
 AWK="$2"
 USE="$3"
 
+# A patch discussed here:
+#      https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
+# introduces spurious #line markers into the preprocessor output.  The result
+# appears in gcc 5.0 and (with modification) in 5.1, making it necessary to
+# determine if we are using gcc, and if so, what version because the proposed
+# solution uses a nonstandard option.
+PRG=`echo "$1" | $AWK '{ sub(/^[       ]*/,""); sub(/[         ].*$/, ""); print; }' || exit 0`
+FSF=`"$PRG" --version 2>/dev/null || exit 0 | fgrep "Free Software Foundation" | head -n 1`
+ALL=`"$PRG" -dumpversion 2>/dev/null || exit 0`
+ONE=`echo "$ALL" | sed -e 's/\..*$//'`
+if test -n "$FSF" && test -n "$ALL" && test -n "$ONE" ; then
+       if test $ONE -ge 5 ; then
+               echo ".. adding -P option to work around $PRG $ALL" >&2
+               preprocessor="$preprocessor -P"
+       fi
+fi
+
 PID=$$
 ED1=sed1_${PID}.sed
 ED2=sed2_${PID}.sed
@@ -160,6 +177,7 @@ EOF3
 if test "$USE" = generated ; then
 cat >$ED4 <<EOF
        s/^\(.*\) \(.*\) (\(.*\))\$/NCURSES_EXPORT(\1) (\2) (\3)/
+       /attr_[sg]et.* z)/s,z),z GCC_UNUSED),
 EOF
 else
 cat >$ED4 <<EOF
@@ -213,7 +231,7 @@ $0 !~ /^P_/ {
        } else if ( $first == "bool" || $first == "NCURSES_BOOL" ) {
                returnType = "Bool";
        } else if ( $second == "*" ) {
-               returnType = "Ptr";
+               returnType = ($1 == "NCURSES_CONST") ? "CPtr" : "Ptr";
        } else {
                returnType = "Code";
        }
@@ -381,9 +399,10 @@ EOF1
 
 cat >$AW2 <<EOF1
 BEGIN          {
+               printf "/* This file was generated by $0 */\n"
+               print ""
                print "/*"
                print " * DO NOT EDIT THIS FILE BY HAND!"
-               printf " * It is generated by $0 %s.\n", "$USE"
                if ( "$USE" == "generated" ) {
                        print " *"
                        print " * This is a file of trivial functions generated from macro"
@@ -410,10 +429,45 @@ BEGIN             {
                print "#undef vwprintw"
                }
 /^DECLARATIONS/        {start = 1; next;}
-               {if (start) print \$0;}
+               {
+               if (start) {
+                       if ( "$USE" == "generated" ) {
+                               print \$0;
+                       } else if ( \$0 ~ /^[{}]?\$/ ) {
+                               print \$0;
+                       } else if ( \$0 ~ /;/ ) {
+                               print \$0;
+                       } else {
+                               calls[start] = \$0;
+                               print \$0;
+                               start++;
+                       }
+               }
+               }
 END            {
                if ( "$USE" != "generated" ) {
-                       print "int main(void) { return 0; }"
+                       print "int main(void)"
+                       print "{"
+                       for (n = 1; n < start; ++n) {
+                               value = calls[n];
+                               if ( value !~ /P_POUNDC/ ) {
+                                       gsub(/[ \t]+/," ",value);
+                                       sub(/^[0-9a-zA-Z_]+ /,"",value);
+                                       sub(/^\* /,"",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[0-9]|z) /, " 0 ", value);
+                                       gsub(/ int[ \t]*[(][^)]+[)][(][^)]+[)]/, "0", value);
+                                       printf "\t%s;\n", value;
+                               } else {
+                                       print value;
+                               }
+                       }
+                       print " return 0;"
+                       print "}"
                }
                }
 EOF1
@@ -422,6 +476,8 @@ cat >$TMP <<EOF
 #include <ncurses_cfg.h>
 #undef NCURSES_NOMACROS
 #include <curses.h>
+#include <term.h>
+#include <unctrl.h>
 
 DECLARATIONS