ncurses 5.7 - patch 20100724

[ncurses.git] / misc / ncu-indent

diff --git a/misc/ncu-indent b/misc/ncu-indent
index 862a108a3b3185cc9c59b0c371f49abe73ff7f41..95ed4334ce7c5f999cde54e96b0b43b11d28eb64 100755 (executable)
--- a/misc/ncu-indent
+++ b/misc/ncu-indent
@@ -1,6 +1,6 @@
 #!/bin/sh
 #****************************************************************************
-#* Copyright (c) 2001-2006,2008 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.17 2008/08/03 15:46:44 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
@@ -88,11 +90,12 @@ do
                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"
@@ -100,11 +103,14 @@ do
                ${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}~"