ncurses 6.2 - patch 20200912
[ncurses.git] / ncurses / base / MKlib_gen.sh
index c3b2435ba62e573579ce78d5fd4857d1ab7ac002..3829eff8eecb0a89007c96b11965c88b2bf6db57 100755 (executable)
@@ -2,10 +2,11 @@
 #
 # MKlib_gen.sh -- generate sources from curses.h macro definitions
 #
-# ($Id: MKlib_gen.sh,v 1.28 2007/03/10 17:15:33 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.68 2020/08/23 00:02:29 tom Exp $)
 #
 ##############################################################################
-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
+# Copyright 2018,2020 Thomas E. Dickey                                       #
+# Copyright 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"), #
@@ -51,7 +52,7 @@
 #         them.
 # 5. cpp: macro-expand the file so the macro calls turn into C calls
 # 6. awk: strip the expansion junk off the front and add the new header
-# 7. sed: squeeze spaces, strip off gen_ prefix, create needed #undef
+# 7. sed: squeeze spaces, strip off gen_ prefix.
 #
 
 # keep the editing independent of locale:
@@ -62,10 +63,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/[^0-9].*$//'`
+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
@@ -74,13 +92,15 @@ ED4=sed4_${PID}.sed
 AW1=awk1_${PID}.awk
 AW2=awk2_${PID}.awk
 TMP=gen__${PID}.c
-trap "rm -f $ED1 $ED2 $ED3 $ED4 $AW1 $AW2 $TMP" 0 1 2 5 15
+trap "rm -f $ED1 $ED2 $ED3 $ED4 $AW1 $AW2 $TMP" 0 1 2 3 15
 
 ALL=$USE
 if test "$USE" = implemented ; then
-       CALL="call_"
        cat >$ED1 <<EOF1
 /^extern.*implemented/{
+       h
+       s/GCC_DEPRECATED([^)]*)//
+       s/NCURSES_SP_NAME(\([^)]*\))/NCURSES_SP_NAME___\1/
        h
        s/^.*implemented:\([^   *]*\).*/P_POUNDCif_USE_\1_SUPPORT/p
        g
@@ -98,7 +118,6 @@ if test "$USE" = implemented ; then
 }
 EOF1
 else
-       CALL=""
        cat >$ED1 <<EOF1
 /^extern.*${ALL}/{
        h
@@ -151,14 +170,14 @@ cat >$ED3 <<EOF3
        s/( /(/g
        s/ )/)/g
        s/ gen_/ /
-       s/^M_/#undef /
-       s/^[    ]*%[    ]*%[    ]*/     /
+       s/^[    ]*@[    ]*@[    ]*/     /
 :done
 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
@@ -169,6 +188,7 @@ cat >$ED4 <<EOF
        g
        s/^\(.*\) \(.*\) (\(.*\))\$/\1 call_\2 (\3)/
        }
+s/\([^_]\)NCURSES_SP_NAME___\([a-zA-Z][a-zA-Z_]*\)/\1NCURSES_SP_NAME(\2)/g
 EOF
 fi
 
@@ -198,18 +218,20 @@ $0 !~ /^P_/ {
                }
        }
        second = first + 1;
+       returnCast = "";
        if ( $first == "chtype" ) {
-               returnType = "Char";
+               returnType = "Chtype";
        } else if ( $first == "SCREEN" ) {
                returnType = "SP";
        } else if ( $first == "WINDOW" ) {
                returnType = "Win";
        } else if ( $first == "attr_t" || $second == "attrset" || $second == "standout" || $second == "standend" || $second == "wattrset" || $second == "wstandout" || $second == "wstandend" ) {
-               returnType = "Attr";
+               returnType = "IntAttr";
+               returnCast = "(attr_t)";
        } else if ( $first == "bool" || $first == "NCURSES_BOOL" ) {
                returnType = "Bool";
        } else if ( $second == "*" ) {
-               returnType = "Ptr";
+               returnType = ($1 == "NCURSES_CONST") ? "CPtr" : "Ptr";
        } else {
                returnType = "Code";
        }
@@ -220,8 +242,8 @@ $0 !~ /^P_/ {
                        break;
                }
        }
-       if (using == "generated") {
-               print "M_" $myfunc
+       if (using == "implemented") {
+               printf "#undef %s\n", $myfunc;
        }
        print $0;
        print "{";
@@ -247,12 +269,20 @@ $0 !~ /^P_/ {
        if ($myfunc ~ /ripoffline/) {
                dotrace = 0;
                argcount = 2;
+               if ($myfunc ~ /NCURSES_SP_NAME/) {
+                       argcount = 3;
+               }
        }
        if ($myfunc ~ /wunctrl/) {
                dotrace = 0;
        }
 
-       call = "%%T((T_CALLED(\""
+       do_getstr = 0;
+       if ($myfunc ~ /get[n]?str/) {
+               do_getstr = 1;
+       }
+
+       call = "@@T((T_CALLED(\""
        args = ""
        comma = ""
        num = 0;
@@ -262,35 +292,43 @@ $0 !~ /^P_/ {
        argtype = ""
        for (i = myfunc; i <= NF; i++) {
                ch = $i;
-               if ( ch == "*" )
+               if ( ch == "*" ) {
                        pointer = 1;
-               else if ( ch == "va_list" )
+               } else if ( ch == "va_list" ) {
                        va_list = 1;
-               else if ( ch == "..." )
+               } else if ( ch == "..." ) {
                        varargs = 1;
-               else if ( ch == "char" )
+               } else if ( ch == "char" ) {
                        argtype = "char";
-               else if ( ch == "int" )
+               } else if ( ch == "int" ) {
                        argtype = "int";
-               else if ( ch == "short" )
+               } else if ( ch == "short" ) {
                        argtype = "short";
-               else if ( ch == "chtype" )
+               } else if ( ch == "chtype" ) {
                        argtype = "chtype";
-               else if ( ch == "attr_t" || ch == "NCURSES_ATTR_T" )
+               } else if ( ch == "attr_t" || ch == "NCURSES_ATTR_T" ) {
                        argtype = "attr";
+               }
 
                if ( ch == "," || ch == ")" ) {
+                       argcast = "";
                        if (va_list) {
                                call = call "%s"
                        } else if (varargs) {
                                call = call "%s"
                        } else if (pointer) {
                                if ( argtype == "char" ) {
-                                       call = call "%s"
+                                       if (do_getstr) {
+                                               call = call "%p"
+                                       } else {
+                                               call = call "%s"
+                                       }
                                        comma = comma "_nc_visbuf2(" num ","
                                        pointer = 0;
-                               } else
+                               } else {
                                        call = call "%p"
+                                       comma = comma "(const void *)"
+                               }
                        } else if (argcount != 0) {
                                if ( argtype == "int" || argtype == "short" ) {
                                        call = call "%d"
@@ -298,6 +336,9 @@ $0 !~ /^P_/ {
                                } else if ( argtype != "" ) {
                                        call = call "%s"
                                        comma = comma "_trace" argtype "2(" num ","
+                                       if (argtype == "attr") {
+                                               argcast = "(chtype)";
+                                       }
                                } else {
                                        call = call "%#lx"
                                        comma = comma "(long)"
@@ -311,7 +352,7 @@ $0 !~ /^P_/ {
                                } else if ( varargs ) {
                                        args = args comma "\"...\""
                                } else {
-                                       args = args comma "z"
+                                       args = args comma argcast "z"
                                }
                        }
                        call = call ch
@@ -322,7 +363,7 @@ $0 !~ /^P_/ {
                        pointer = 0;
                        argtype = ""
                }
-               if ( i == 2 || ch == "(" )
+               if ( i == myfunc || ch == "(" )
                        call = call ch
        }
        call = call "\")"
@@ -331,14 +372,18 @@ $0 !~ /^P_/ {
        call = call ")); "
 
        if (dotrace)
-               printf "%s", call
+               printf "%s\n\t@@", call
 
-       if (match($0, "^void"))
+       if (match($0, "^void")) {
                call = ""
-       else if (dotrace)
+       } else if (dotrace) {
                call = sprintf("return%s( ", returnType);
-       else
-               call = "%%return ";
+               if (returnCast != "") {
+                       call = call returnCast;
+               }
+       } else {
+               call = "@@return ";
+       }
 
        call = call $myfunc "(";
        for (i = 1; i < argcount; i++) {
@@ -353,21 +398,23 @@ $0 !~ /^P_/ {
        }
        if (!match($0, "^void"))
                call = call ") ";
-       if (dotrace)
+       if (dotrace) {
                call = call ")";
+       }
        print call ";"
 
        if (match($0, "^void"))
-               print "%%returnVoid;"
+               print "@@returnVoid;"
        print "}";
 }
 EOF1
 
 cat >$AW2 <<EOF1
 BEGIN          {
+               printf "/* This file was generated by $0 $USE */\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"
@@ -381,14 +428,54 @@ BEGIN             {
                }
                print " */"
                print "#define NCURSES_ATTR_T int"
+               print "#include <ncurses_cfg.h>"
+               print ""
+               print "#undef NCURSES_NOMACROS  /* _this_ file uses macros */"
+               print "#define NCURSES_NOMACROS 1"
+               print ""
                print "#include <curses.priv.h>"
                print ""
                }
 /^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
@@ -397,6 +484,8 @@ cat >$TMP <<EOF
 #include <ncurses_cfg.h>
 #undef NCURSES_NOMACROS
 #include <curses.h>
+#include <term.h>
+#include <unctrl.h>
 
 DECLARATIONS
 
@@ -405,17 +494,25 @@ EOF
 sed -n -f $ED1 \
 | sed -e 's/NCURSES_EXPORT(\(.*\)) \(.*\) (\(.*\))/\1 \2(\3)/' \
 | sed -f $ED2 \
-| $AWK -f $AW1 using=$USE \
-| sed -e 's/^\([a-z_][a-z_]*[ *]*\)/\1 gen_/' -e 's/  / /g' >>$TMP
+| "$AWK" -f $AW1 using="$USE" \
+| sed \
+       -e 's/ [ ]*$//g' \
+       -e 's/^\([a-zA-Z_][a-zA-Z_]*[ *]*\)/\1 gen_/' \
+       -e 's/gen_$//' \
+       -e 's/  / /g' >>$TMP
 
 $preprocessor $TMP 2>/dev/null \
 | sed \
        -e 's/  / /g' \
        -e 's/^ //' \
-       -e 's/^_Bool/bool/' \
-| $AWK -f $AW2 \
+       -e 's/_Bool/NCURSES_BOOL/g' \
+| "$AWK" -f $AW2 \
 | sed -f $ED3 \
 | sed \
        -e 's/^.*T_CALLED.*returnCode( \([a-z].*) \));/ return \1;/' \
        -e 's/^.*T_CALLED.*returnCode( \((wmove.*) \));/        return \1;/' \
+       -e 's/gen_//' \
+       -e 's/^[        ]*#/#/' \
+       -e '/#ident/d' \
+       -e '/#line/d' \
 | sed -f $ED4