ncurses 5.6 - patch 20070901

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

diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
index 583a349b6bf4f798eb6379f618ba66ea19f1fd61..b5b07140b55fb364e56f910de224d400f305fa51 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.23 2004/02/07 13:31:35 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.29 2007/08/18 13:17:14 tom Exp $)

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

-# Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2006,2007 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"), #


@@ -39,14 +39,14 @@
 #
 # This script accepts a file of prototypes on standard input.  It discards
 # any that don't have a `generated' comment attached. It then parses each
 #
 # This script accepts a file of prototypes on standard input.  It discards
 # any that don't have a `generated' comment attached. It then parses each

-# prototype (relying on the fact that none of the macros take function 
+# prototype (relying on the fact that none of the macros take function

 # pointer or array arguments) and generates C source from it.
 #
 # Here is what the pipeline stages are doing:
 #
 # 1. sed: extract prototypes of generated functions
 # 2. sed: decorate prototypes with generated arguments a1. a2,...z
 # pointer or array arguments) and generates C source from it.
 #
 # Here is what the pipeline stages are doing:
 #
 # 1. sed: extract prototypes of generated functions
 # 2. sed: decorate prototypes with generated arguments a1. a2,...z

-# 3. awk: generate the calls with args matching the formals 
+# 3. awk: generate the calls with args matching the formals

 # 4. sed: prefix function names in prototypes so the preprocessor won't expand
 #         them.
 # 5. cpp: macro-expand the file so the macro calls turn into C calls
 # 4. sed: prefix function names in prototypes so the preprocessor won't expand
 #         them.
 # 5. cpp: macro-expand the file so the macro calls turn into C calls


@@ -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 -I../include"
+preprocessor="$1 -DNCURSES_INTERNALS -I../include"

 AWK="$2"
 USE="$3"
 
 AWK="$2"
 USE="$3"
 


@@ -257,13 +257,17 @@ $0 !~ /^P_/ {
        comma = ""
        num = 0;
        pointer = 0;
        comma = ""
        num = 0;
        pointer = 0;

+       va_list = 0;
+       varargs = 0;

        argtype = ""
        for (i = myfunc; i <= NF; i++) {
                ch = $i;
                if ( ch == "*" )
                        pointer = 1;
                else if ( ch == "va_list" )
        argtype = ""
        for (i = myfunc; i <= NF; i++) {
                ch = $i;
                if ( ch == "*" )
                        pointer = 1;
                else if ( ch == "va_list" )

-                       pointer = 1;
+                       va_list = 1;
+               else if ( ch == "..." )
+                       varargs = 1;

                else if ( ch == "char" )
                        argtype = "char";
                else if ( ch == "int" )
                else if ( ch == "char" )
                        argtype = "char";
                else if ( ch == "int" )


@@ -276,7 +280,11 @@ $0 !~ /^P_/ {
                        argtype = "attr";
 
                if ( ch == "," || ch == ")" ) {
                        argtype = "attr";
 
                if ( ch == "," || ch == ")" ) {

-                       if (pointer) {
+                       if (va_list) {
+                               call = call "%s"
+                       } else if (varargs) {
+                               call = call "%s"
+                       } else if (pointer) {

                                if ( argtype == "char" ) {
                                        call = call "%s"
                                        comma = comma "_nc_visbuf2(" num ","
                                if ( argtype == "char" ) {
                                        call = call "%s"
                                        comma = comma "_nc_visbuf2(" num ","


@@ -295,10 +303,17 @@ $0 !~ /^P_/ {
                                        comma = comma "(long)"
                                }
                        }
                                        comma = comma "(long)"
                                }
                        }

-                       if (ch == ",")
+                       if (ch == ",") {

                                args = args comma "a" ++num;
                                args = args comma "a" ++num;

-                       else if ( argcount != 0 && $check != "..." )
-                               args = args comma "z"
+                       } else if ( argcount != 0 ) {
+                               if ( va_list ) {
+                                       args = args comma "\"va_list\""
+                               } else if ( varargs ) {
+                                       args = args comma "\"...\""
+                               } else {
+                                       args = args comma "z"
+                               }
+                       }

                        call = call ch
                        if (pointer == 0 && argcount != 0 && argtype != "" )
                                args = args ")"
                        call = call ch
                        if (pointer == 0 && argcount != 0 && argtype != "" )
                                args = args ")"


@@ -365,6 +380,7 @@ BEGIN               {
                        print " * pull most of the rest of the library into your link image."
                }
                print " */"
                        print " * pull most of the rest of the library into your link image."
                }
                print " */"

+               print "#define NCURSES_ATTR_T int"

                print "#include <curses.priv.h>"
                print ""
                }
                print "#include <curses.priv.h>"
                print ""
                }


@@ -379,6 +395,7 @@ EOF1
 
 cat >$TMP <<EOF
 #include <ncurses_cfg.h>
 
 cat >$TMP <<EOF
 #include <ncurses_cfg.h>

+#undef NCURSES_NOMACROS

 #include <curses.h>
 
 DECLARATIONS
 #include <curses.h>
 
 DECLARATIONS


@@ -389,10 +406,17 @@ sed -n -f $ED1 \
 | sed -e 's/NCURSES_EXPORT(\(.*\)) \(.*\) (\(.*\))/\1 \2(\3)/' \
 | sed -f $ED2 \
 | $AWK -f $AW1 using=$USE \
 | 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
+| 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 \
 
 $preprocessor $TMP 2>/dev/null \

-| sed -e 's/  / /g' -e 's/^ //' \
+| sed \
+       -e 's/  / /g' \
+       -e 's/^ //' \
+       -e 's/^_Bool/bool/' \

 | $AWK -f $AW2 \
 | sed -f $ED3 \
 | sed \
 | $AWK -f $AW2 \
 | sed -f $ED3 \
 | sed \