ncurses 6.0 - patch 20180120

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

diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
index 4c35b73e50d9fa3edfbebff23aad3254757d7de1..c7877bfcd863d325bc4292fa3c87cff8364cfc37 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
 #
 #
 # 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.60 2017/12/09 22:27:41 tom Exp $)

 #
 ##############################################################################
 #
 ##############################################################################

-# Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2017,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"), #
 #                                                                            #
 # 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
 
 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"
 
 AWK="$2"
 USE="$3"
 


@@ -91,7 +91,7 @@ ED4=sed4_${PID}.sed
 AW1=awk1_${PID}.awk
 AW2=awk2_${PID}.awk
 TMP=gen__${PID}.c
 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
 
 ALL=$USE
 if test "$USE" = implemented ; then


@@ -242,6 +242,9 @@ $0 !~ /^P_/ {
                        break;
                }
        }
                        break;
                }
        }

+       if (using == "implemented") {
+               printf "#undef %s\n", $myfunc;
+       }

        print $0;
        print "{";
        argcount = 1;
        print $0;
        print "{";
        argcount = 1;


@@ -274,6 +277,11 @@ $0 !~ /^P_/ {
                dotrace = 0;
        }
 
                dotrace = 0;
        }
 

+       do_getstr = 0;
+       if ($myfunc ~ /get[n]?str/) {
+               do_getstr = 1;
+       }
+

        call = "@@T((T_CALLED(\""
        args = ""
        comma = ""
        call = "@@T((T_CALLED(\""
        args = ""
        comma = ""


@@ -310,7 +318,11 @@ $0 !~ /^P_/ {
                                call = call "%s"
                        } else if (pointer) {
                                if ( argtype == "char" ) {
                                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 {
                                        comma = comma "_nc_visbuf2(" num ","
                                        pointer = 0;
                                } else {


@@ -360,7 +372,7 @@ $0 !~ /^P_/ {
        call = call ")); "
 
        if (dotrace)
        call = call ")); "
 
        if (dotrace)

-               printf "%s", call
+               printf "%s\n\t@@", call

 
        if (match($0, "^void")) {
                call = ""
 
        if (match($0, "^void")) {
                call = ""


@@ -399,9 +411,10 @@ EOF1
 
 cat >$AW2 <<EOF1
 BEGIN          {
 
 cat >$AW2 <<EOF1
 BEGIN          {

+               printf "/* This file was generated by $0 $USE */\n"
+               print ""

                print "/*"
                print " * DO NOT EDIT THIS FILE BY HAND!"
                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"
                if ( "$USE" == "generated" ) {
                        print " *"
                        print " * This is a file of trivial functions generated from macro"


@@ -450,16 +463,16 @@ END               {
                        for (n = 1; n < start; ++n) {
                                value = calls[n];
                                if ( value !~ /P_POUNDC/ ) {
                        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);
                                        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(/ (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;
                                        printf "\t%s;\n", value;
                                } else {
                                        print value;