X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=misc%2Fncu-indent;h=95ed4334ce7c5f999cde54e96b0b43b11d28eb64;hp=1e1c7fffaeb20dfa0bb7d203126c990bde13f448;hb=d96f3e9b8a422f6daa2101d4d165801421312aa0;hpb=027ae42953e3186daed8f3882da73de48291b606

diff --git a/misc/ncu-indent b/misc/ncu-indent
index 1e1c7fff..95ed4334 100755
--- a/misc/ncu-indent
+++ b/misc/ncu-indent
@@ -1,6 +1,6 @@
 #!/bin/sh
 #****************************************************************************
-#* Copyright (c) 2001-2005,2006 Thomas E. Dickey                            *
+#* Copyright (c) 2001-2009,2010 Thomas E. Dickey                            *
 #*                                                                          *
 #* Permission is hereby granted, free of charge, to any person obtaining a  *
 #* copy of this software and associated documentation files (the            *
@@ -26,7 +26,7 @@
 #* sale, use or other dealings in this Software without prior written       *
 #* authorization.                                                           *
 #****************************************************************************/
-# $Id: ncu-indent,v 1.16 2006/02/18 17:02:22 tom Exp $
+# $Id: ncu-indent,v 1.21 2010/07/24 11:25:18 tom Exp $
 NOOP=no
 OPTS='
 --blank-lines-after-procedures
@@ -44,6 +44,8 @@ OPTS='
 --swallow-optional-blank-lines
 --tab-size8
 
+-T NCURSES_SP_ARGx
+-T NCURSES_SP_DCLx
 -T NCURSES_EXPORT_VAR
 -T NCURSES_INLINE
 -T SCREEN
@@ -87,22 +89,28 @@ do
 		rm -f "$save" "$test"
 		mv "$name" "$save"
 		sed \
+			-e '/EMPTY_MODULE(/s/)$/);/' \
+			-e 's,\(MODULEID(\),//\1,' \
 			-e '/MODULE_ID(/s/)$/);/' \
-			-e 's,\<GCC_NORETURN;,;//GCC_NORETURN;,' \
-			-e 's,\<GCC_PRINTFLIKE(,;//GCC_PRINTFLIKE(,' \
-			-e 's,\<GCC_SCANFLIKE(,;//GCC_SCANFLIKE(,' \
-			-e 's,\(\<NCURSES_EXPORT_VAR\>\),//\1,' \
+			-e 's,\<GCC_NORETURN\(.*\);,;//GCC_NORETURN\1,' \
+			-e 's,\<GCC_PRINTFLIKE(\(.*\);,;//GCC_PRINTFLIKE(\1,' \
+			-e 's,\<GCC_SCANFLIKE(\(.*\);,;//GCC_SCANFLIKE(\1,' \
+			-e 's,\(\<NCURSES_EXPORT_VAR\>.*;\),//\1,' \
 			"$save" >"$test"
 		cp "$test" "$name"
 		chmod u+w "$name"
 		# ${INDENT_PROG-indent} --version
 		${INDENT_PROG-indent} -npro $OPTS "$name"
 		sed \
+			-e '/EMPTY_MODULE(/s/);$/)/' \
+			-e 's,//\(MODULEID(\),\1,' \
 			-e '/MODULE_ID(/s/);$/)/' \
-			-e 's,;[ 	]*//GCC_NORETURN;, GCC_NORETURN;,' \
-			-e 's,;[ 	]*//GCC_PRINTFLIKE(, GCC_PRINTFLIKE(,' \
-			-e 's,;[ 	]*//GCC_SCANFLIKE(, GCC_SCANFLIKE(,' \
-			-e 's,//\(\<NCURSES_EXPORT_VAR\>\),\1,' \
+			-e 's,;[ 	]*//GCC_NORETURN\(.*\);, GCC_NORETURN\1;,' \
+			-e 's,;[ 	]*//GCC_PRINTFLIKE(\(.*\);, GCC_PRINTFLIKE(\1;,' \
+			-e 's,;[ 	]*//GCC_SCANFLIKE(\(.*\);, GCC_SCANFLIKE(\1;,' \
+			-e 's,;[	]*//\(.*\), \1;,' \
+			-e 's,[ 	][	]*\<GCC_, GCC_,g' \
+			-e 's,//\(\<NCURSES_EXPORT_VAR\>[ ]*\),\1,' \
 			"$name" >"$test"
 		mv "$test" "$name"
 		rm -f "${name}~"