index 7dc13c83ffb98346049a61019e3efa798b8a4eda..d3fe1b4d84ee74df943bc539685a36d9b473fcbf 100755 (executable)
#!/bin/sh
-# $PostgreSQL: pgsql/src/tools/pgindent/pgindent,v 1.89 2006年10月04日 00:02:10 momjian Exp $
+# $PostgreSQL: pgsql/src/tools/pgindent/pgindent,v 1.90 2006年12月27日 23:03:52 momjian Exp $
# Known bugs:
#
# mark some comments for special treatment later
sed 's;/\* *---;/*---X_X;g' |
# workaround for indent bug with 'else' handling
-# indent comment so BSD indent will move it
- sed 's;\([} ]\)else[ ]*\(/\*.*\)$;1円else\
- 2円;g' |
+# trim trailing space after single-line after-'else' comment
+# so next test can be done easily
+ sed 's;\([} ]\)else[ ]*\(/\*.*\*/\)[ ]*$;1円else 2円;g' |
+# indent multi-line after-'else' comment so BSD indent will move it properly
+ sed 's;\([} ]\)else[ ]*\(/\*.*[^\*][^/]\)$;1円else\
+ 2円;g' |
detab -t4 -qc |
# work around bug where function that defines no local variables misindents
# switch() case lines and line after #else. Do not do for struct/enum.
sed 's;^/\* Open extern \"C\" \*/$;{;' |
sed 's;^/\* Close extern \"C\" \*/$;};' |
sed 's;/\*---X_X;/* ---;g' |
-# workaround indent bug
+# workaround indent bug for 'static'
sed 's;^static[ ][ ]*;static ;g' |
+# remove too much indenting after closing brace
sed 's;^} [ ]*;} ;' |
+# indent single-line after-'else' comment by only one tab
+ sed 's;\([} ]\)else[ ]*\(/\*.*\*/\)[ ]*$;1円else 2円;g' |
# pull in #endif comments
sed 's;^#endif[ ][ ]*/\*;#endif /*;' |
# work around #else indenting next line if #ifdef defines variables at top