X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2FMKlib_gen.sh;h=a984e8545effaaa701a7cabae42217a8a935b2e1;hp=c3b2435ba62e573579ce78d5fd4857d1ab7ac002;hb=1f21085964c1dcb515970035e43b7f25ac2cfdf6;hpb=0be808514502f3149b379d036ab3a83cbb4d4c02

diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
index c3b2435b..a984e854 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.28 2007/03/10 17:15:33 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.34 2008/08/30 19:20:50 tom Exp $)
 #
 ##############################################################################
-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2007,2008 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"), #
@@ -152,7 +152,7 @@ cat >$ED3 <<EOF3
 	s/ )/)/g
 	s/ gen_/ /
 	s/^M_/#undef /
-	s/^[ 	]*%[ 	]*%[ 	]*/	/
+	s/^[ 	]*@[ 	]*@[ 	]*/	/
 :done
 EOF3
 
@@ -252,7 +252,7 @@ $0 !~ /^P_/ {
 		dotrace = 0;
 	}
 
-	call = "%%T((T_CALLED(\""
+	call = "@@T((T_CALLED(\""
 	args = ""
 	comma = ""
 	num = 0;
@@ -338,7 +338,7 @@ $0 !~ /^P_/ {
 	else if (dotrace)
 		call = sprintf("return%s( ", returnType);
 	else
-		call = "%%return ";
+		call = "@@return ";
 
 	call = call $myfunc "(";
 	for (i = 1; i < argcount; i++) {
@@ -358,7 +358,7 @@ $0 !~ /^P_/ {
 	print call ";"
 
 	if (match($0, "^void"))
-		print "%%returnVoid;"
+		print "@@returnVoid;"
 	print "}";
 }
 EOF1
@@ -406,16 +406,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/^ //' \
-	-e 's/^_Bool/bool/' \
+	-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