diff options
Diffstat (limited to 'ncurses/base/MKlib_gen.sh')
| -rwxr-xr-x | ncurses/base/MKlib_gen.sh | 83 |
1 files changed, 50 insertions, 33 deletions
diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh index b91398c..5a3770e 100755 --- a/ncurses/base/MKlib_gen.sh +++ b/ncurses/base/MKlib_gen.sh @@ -2,10 +2,11 @@ # # MKlib_gen.sh -- generate sources from curses.h macro definitions # -# ($Id: MKlib_gen.sh,v 1.47 2014/12/06 18:56:25 tom Exp $) +# ($Id: MKlib_gen.sh,v 1.63 2020/02/02 23:34:34 tom Exp $) # ############################################################################## -# Copyright (c) 1998-2011,2014 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"), # @@ -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/\..*$//'` +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,7 +92,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 @@ -82,6 +100,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 @@ -160,6 +179,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 @@ -213,7 +233,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"; } @@ -224,6 +244,9 @@ $0 !~ /^P_/ { break; } } + if (using == "implemented") { + printf "#undef %s\n", $myfunc; + } print $0; print "{"; argcount = 1; @@ -256,6 +279,11 @@ $0 !~ /^P_/ { dotrace = 0; } + do_getstr = 0; + if ($myfunc ~ /get[n]?str/) { + do_getstr = 1; + } + call = "@@T((T_CALLED(\"" args = "" comma = "" @@ -292,7 +320,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 { @@ -342,7 +374,7 @@ $0 !~ /^P_/ { call = call ")); " if (dotrace) - printf "%s", call + printf "%s\n\t@@", call if (match($0, "^void")) { call = "" @@ -381,9 +413,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" @@ -403,11 +436,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;} { @@ -432,16 +460,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; @@ -474,22 +502,11 @@ sed -n -f $ED1 \ -e 's/gen_$//' \ -e 's/ / /g' >>$TMP -cat >$ED1 <<EOF -s/ / /g -s/^ // -s/ $// -s/P_NCURSES_BOOL/NCURSES_BOOL/g -EOF - -# A patch discussed here: -# https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html -# introduces spurious #line markers. Work around that by ignoring the system's -# attempt to define "bool" and using our own symbol here. -sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2 -cat $ED2 >$TMP - $preprocessor $TMP 2>/dev/null \ -| sed -f $ED1 \ +| sed \ + -e 's/ / /g' \ + -e 's/^ //' \ + -e 's/_Bool/NCURSES_BOOL/g' \ | $AWK -f $AW2 \ | sed -f $ED3 \ | sed \ |