X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2FMKlib_gen.sh;h=66ae295c607cbbed974cc2d4cdff8f357ff460cc;hp=583a349b6bf4f798eb6379f618ba66ea19f1fd61;hb=48c8a4fe456e83238533fb42b36fd5253db22f59;hpb=a8987e73ec254703634802b4f7ee30d3a485524d diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh index 583a349b..66ae295c 100755 --- 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 # -# ($Id: MKlib_gen.sh,v 1.23 2004/02/07 13:31:35 tom Exp $) +# ($Id: MKlib_gen.sh,v 1.43 2011/01/22 19:47:29 tom Exp $) # ############################################################################## -# Copyright (c) 1998-2003,2004 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"), # @@ -39,19 +39,19 @@ # # 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 -# 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 # 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: @@ -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 -I../include" +preprocessor="$1 -DNCURSES_INTERNALS -I../include" AWK="$2" USE="$3" @@ -81,6 +81,8 @@ if test "$USE" = implemented ; then CALL="call_" cat >$ED1 <$ED3 <$ED4 <$ED4 <$ED4 <" + print "" + print "#undef NCURSES_NOMACROS /* _this_ file uses macros */" + print "" print "#include " print "" + print "#undef vw_scanw" + print "#undef vwscanw" + print "" + print "#undef vw_printw" + print "#undef vwprintw" } /^DECLARATIONS/ {start = 1; next;} {if (start) print \$0;} @@ -379,6 +420,7 @@ EOF1 cat >$TMP < +#undef NCURSES_NOMACROS #include DECLARATIONS @@ -389,13 +431,24 @@ sed -n -f $ED1 \ | 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 \ -| sed -e 's/ / /g' -e 's/^ //' \ +| sed \ + -e 's/ / /g' \ + -e 's/^ //' \ + -e 's/_Bool/NCURSES_BOOL/g' \ | $AWK -f $AW2 \ | sed -f $ED3 \ | sed \ -e 's/^.*T_CALLED.*returnCode( \([a-z].*) \));/ return \1;/' \ -e 's/^.*T_CALLED.*returnCode( \((wmove.*) \));/ return \1;/' \ + -e 's/gen_//' \ + -e 's/^[ ]*#/#/' \ + -e '/#ident/d' \ + -e '/#line/d' \ | sed -f $ED4