]> ncurses.scripts.mit.edu Git - ncurses.git/blobdiff - ncurses/base/MKlib_gen.sh
projects / ncurses.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ncurses 5.8 - patch 20110307
[ncurses.git] / ncurses / base / MKlib_gen.sh
diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
index 4f3d38e3bd3fe2418a736a541f748a5d33f8aeed..66ae295c607cbbed974cc2d4cdff8f357ff460cc 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.36 2009/10/24 20:34:05 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.43 2011/01/22 19:47:29 tom Exp $)
 #
 ##############################################################################
 #
 ##############################################################################
-# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2010,2011 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"), #
@@ -51,7 +51,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
 #         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:
 #
 
 # keep the editing independent of locale:
@@ -81,6 +81,8 @@ if test "$USE" = implemented ; then
        CALL="call_"
        cat >$ED1 <<EOF1
 /^extern.*implemented/{
        CALL="call_"
        cat >$ED1 <<EOF1
 /^extern.*implemented/{
+       h
+       s/NCURSES_SP_NAME(\([^)]*\))/NCURSES_SP_NAME___\1/
        h
        s/^.*implemented:\([^   *]*\).*/P_POUNDCif_USE_\1_SUPPORT/p
        g
        h
        s/^.*implemented:\([^   *]*\).*/P_POUNDCif_USE_\1_SUPPORT/p
        g
@@ -151,14 +153,13 @@ cat >$ED3 <<EOF3
        s/( /(/g
        s/ )/)/g
        s/ gen_/ /
        s/( /(/g
        s/ )/)/g
        s/ gen_/ /
-       s/^M_/#undef /
        s/^[    ]*@[    ]*@[    ]*/     /
 :done
 EOF3
 
 if test "$USE" = generated ; then
 cat >$ED4 <<EOF
        s/^[    ]*@[    ]*@[    ]*/     /
 :done
 EOF3
 
 if test "$USE" = generated ; then
 cat >$ED4 <<EOF
-       s/^\(.*\) \(.*\) (\(.*\))\$/NCURSES_EXPORT(\1) \2 (\3)/
+       s/^\(.*\) \(.*\) (\(.*\))\$/NCURSES_EXPORT(\1) (\2) (\3)/
 EOF
 else
 cat >$ED4 <<EOF
 EOF
 else
 cat >$ED4 <<EOF
@@ -169,6 +170,7 @@ cat >$ED4 <<EOF
        g
        s/^\(.*\) \(.*\) (\(.*\))\$/\1 call_\2 (\3)/
        }
        g
        s/^\(.*\) \(.*\) (\(.*\))\$/\1 call_\2 (\3)/
        }
+s/\([^_]\)NCURSES_SP_NAME___\([a-zA-Z][a-zA-Z_]*\)/\1NCURSES_SP_NAME(\2)/g
 EOF
 fi
 
 EOF
 fi
 
@@ -198,6 +200,7 @@ $0 !~ /^P_/ {
                }
        }
        second = first + 1;
                }
        }
        second = first + 1;
+       returnCast = "";
        if ( $first == "chtype" ) {
                returnType = "Chtype";
        } else if ( $first == "SCREEN" ) {
        if ( $first == "chtype" ) {
                returnType = "Chtype";
        } else if ( $first == "SCREEN" ) {
@@ -205,7 +208,8 @@ $0 !~ /^P_/ {
        } else if ( $first == "WINDOW" ) {
                returnType = "Win";
        } else if ( $first == "attr_t" || $second == "attrset" || $second == "standout" || $second == "standend" || $second == "wattrset" || $second == "wstandout" || $second == "wstandend" ) {
        } 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 == "*" ) {
        } else if ( $first == "bool" || $first == "NCURSES_BOOL" ) {
                returnType = "Bool";
        } else if ( $second == "*" ) {
@@ -220,9 +224,6 @@ $0 !~ /^P_/ {
                        break;
                }
        }
                        break;
                }
        }
-       if (using == "generated") {
-               print "M_" $myfunc
-       }
        print $0;
        print "{";
        argcount = 1;
        print $0;
        print "{";
        argcount = 1;
@@ -247,6 +248,9 @@ $0 !~ /^P_/ {
        if ($myfunc ~ /ripoffline/) {
                dotrace = 0;
                argcount = 2;
        if ($myfunc ~ /ripoffline/) {
                dotrace = 0;
                argcount = 2;
+               if ($myfunc ~ /NCURSES_SP_NAME/) {
+                       argcount = 3;
+               }
        }
        if ($myfunc ~ /wunctrl/) {
                dotrace = 0;
        }
        if ($myfunc ~ /wunctrl/) {
                dotrace = 0;
@@ -262,24 +266,26 @@ $0 !~ /^P_/ {
        argtype = ""
        for (i = myfunc; i <= NF; i++) {
                ch = $i;
        argtype = ""
        for (i = myfunc; i <= NF; i++) {
                ch = $i;
-               if ( ch == "*" )
+               if ( ch == "*" ) {
                        pointer = 1;
                        pointer = 1;
-               else if ( ch == "va_list" )
+               } else if ( ch == "va_list" ) {
                        va_list = 1;
                        va_list = 1;
-               else if ( ch == "..." )
+               } else if ( ch == "..." ) {
                        varargs = 1;
                        varargs = 1;
-               else if ( ch == "char" )
+               } else if ( ch == "char" ) {
                        argtype = "char";
                        argtype = "char";
-               else if ( ch == "int" )
+               } else if ( ch == "int" ) {
                        argtype = "int";
                        argtype = "int";
-               else if ( ch == "short" )
+               } else if ( ch == "short" ) {
                        argtype = "short";
                        argtype = "short";
-               else if ( ch == "chtype" )
+               } else if ( ch == "chtype" ) {
                        argtype = "chtype";
                        argtype = "chtype";
-               else if ( ch == "attr_t" || ch == "NCURSES_ATTR_T" )
+               } else if ( ch == "attr_t" || ch == "NCURSES_ATTR_T" ) {
                        argtype = "attr";
                        argtype = "attr";
+               }
 
                if ( ch == "," || ch == ")" ) {
 
                if ( ch == "," || ch == ")" ) {
+                       argcast = "";
                        if (va_list) {
                                call = call "%s"
                        } else if (varargs) {
                        if (va_list) {
                                call = call "%s"
                        } else if (varargs) {
@@ -300,6 +306,9 @@ $0 !~ /^P_/ {
                                } else if ( argtype != "" ) {
                                        call = call "%s"
                                        comma = comma "_trace" argtype "2(" num ","
                                } else if ( argtype != "" ) {
                                        call = call "%s"
                                        comma = comma "_trace" argtype "2(" num ","
+                                       if (argtype == "attr") {
+                                               argcast = "(chtype)";
+                                       }
                                } else {
                                        call = call "%#lx"
                                        comma = comma "(long)"
                                } else {
                                        call = call "%#lx"
                                        comma = comma "(long)"
@@ -313,7 +322,7 @@ $0 !~ /^P_/ {
                                } else if ( varargs ) {
                                        args = args comma "\"...\""
                                } else {
                                } else if ( varargs ) {
                                        args = args comma "\"...\""
                                } else {
-                                       args = args comma "z"
+                                       args = args comma argcast "z"
                                }
                        }
                        call = call ch
                                }
                        }
                        call = call ch
@@ -324,7 +333,7 @@ $0 !~ /^P_/ {
                        pointer = 0;
                        argtype = ""
                }
                        pointer = 0;
                        argtype = ""
                }
-               if ( i == 2 || ch == "(" )
+               if ( i == myfunc || ch == "(" )
                        call = call ch
        }
        call = call "\")"
                        call = call ch
        }
        call = call "\")"
@@ -335,12 +344,16 @@ $0 !~ /^P_/ {
        if (dotrace)
                printf "%s", call
 
        if (dotrace)
                printf "%s", call
 
-       if (match($0, "^void"))
+       if (match($0, "^void")) {
                call = ""
                call = ""
-       else if (dotrace)
+       } else if (dotrace) {
                call = sprintf("return%s( ", returnType);
                call = sprintf("return%s( ", returnType);
-       else
+               if (returnCast != "") {
+                       call = call returnCast;
+               }
+       } else {
                call = "@@return ";
                call = "@@return ";
+       }
 
        call = call $myfunc "(";
        for (i = 1; i < argcount; i++) {
 
        call = call $myfunc "(";
        for (i = 1; i < argcount; i++) {
@@ -355,8 +368,9 @@ $0 !~ /^P_/ {
        }
        if (!match($0, "^void"))
                call = call ") ";
        }
        if (!match($0, "^void"))
                call = call ") ";
-       if (dotrace)
+       if (dotrace) {
                call = call ")";
                call = call ")";
+       }
        print call ";"
 
        if (match($0, "^void"))
        print call ";"
 
        if (match($0, "^void"))
@@ -383,8 +397,17 @@ BEGIN              {
                }
                print " */"
                print "#define NCURSES_ATTR_T int"
                }
                print " */"
                print "#define NCURSES_ATTR_T int"
+               print "#include <ncurses_cfg.h>"
+               print ""
+               print "#undef NCURSES_NOMACROS  /* _this_ file uses macros */"
+               print ""
                print "#include <curses.priv.h>"
                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;}
                {if (start) print \$0;}
                }
 /^DECLARATIONS/        {start = 1; next;}
                {if (start) print \$0;}
ncurses, with patches starting at ncurses-5.6; new users should use https://github.com/ThomasDickey/ncurses-snapshots/