ncurses 6.1 - patch 20191005
[ncurses.git] / ncurses / base / MKlib_gen.sh
index e7f1f5d99c872f9f9ea66b805653d7a51d5fe3f1..a1587c42445225a7557f9c3f36d3afdc34d7119b 100755 (executable)
@@ -2,10 +2,10 @@
 #
 # MKlib_gen.sh -- generate sources from curses.h macro definitions
 #
-# ($Id: MKlib_gen.sh,v 1.51 2015/08/10 08:56:39 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.62 2018/06/09 19:27:00 tom Exp $)
 #
 ##############################################################################
-# Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2017,2018 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,7 +62,7 @@ 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"
 
@@ -91,7 +91,7 @@ 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
@@ -99,6 +99,7 @@ if test "$USE" = implemented ; then
        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
@@ -177,6 +178,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
@@ -230,7 +232,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";
        }
@@ -241,6 +243,9 @@ $0 !~ /^P_/ {
                        break;
                }
        }
+       if (using == "implemented") {
+               printf "#undef %s\n", $myfunc;
+       }
        print $0;
        print "{";
        argcount = 1;
@@ -273,6 +278,11 @@ $0 !~ /^P_/ {
                dotrace = 0;
        }
 
+       do_getstr = 0;
+       if ($myfunc ~ /get[n]?str/) {
+               do_getstr = 1;
+       }
+
        call = "@@T((T_CALLED(\""
        args = ""
        comma = ""
@@ -309,7 +319,11 @@ $0 !~ /^P_/ {
                                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 {
@@ -359,7 +373,7 @@ $0 !~ /^P_/ {
        call = call ")); "
 
        if (dotrace)
-               printf "%s", call
+               printf "%s\n\t@@", call
 
        if (match($0, "^void")) {
                call = ""
@@ -398,9 +412,10 @@ 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"
@@ -420,11 +435,6 @@ BEGIN              {
                print ""
                print "#include <curses.priv.h>"
                print ""
-               print "#undef vw_scanw"
-               print "#undef vwscanw"
-               print ""
-               print "#undef vw_printw"
-               print "#undef vwprintw"
                }
 /^DECLARATIONS/        {start = 1; next;}
                {
@@ -449,16 +459,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;