|
1 | 1 | #!/bin/sh |
2 | 2 |
|
3 | | -# $PostgreSQL: pgsql/src/tools/pgindent/pgindent,v 1.89 2006/10/04 00:02:10 momjian Exp $ |
| 3 | +# $PostgreSQL: pgsql/src/tools/pgindent/pgindent,v 1.90 2006/12/27 23:03:52 momjian Exp $ |
4 | 4 |
|
5 | 5 | # Known bugs: |
6 | 6 | # |
|
40 | 40 | # mark some comments for special treatment later |
41 | 41 | sed's;/\* *---;/*---X_X;g'| |
42 | 42 | # workaround for indent bug with 'else' handling |
43 | | -# indent comment so BSD indent will move it |
44 | | -sed's;\([} ]\)else[ ]*\(/\*.*\)$;\1else\ |
45 | | - \2;g'| |
| 43 | +# trim trailing space after single-line after-'else' comment |
| 44 | +# so next test can be done easily |
| 45 | +sed's;\([} ]\)else[ ]*\(/\*.*\*/\)[ ]*$;\1else\2;g'| |
| 46 | +# indent multi-line after-'else' comment so BSD indent will move it properly |
| 47 | +sed's;\([} ]\)else[ ]*\(/\*.*[^\*][^/]\)$;\1else\ |
| 48 | + \2;g'| |
46 | 49 | detab -t4 -qc| |
47 | 50 | # work around bug where function that defines no local variables misindents |
48 | 51 | # switch() case lines and line after #else. Do not do for struct/enum. |
@@ -1890,9 +1893,12 @@ do |
1890 | 1893 | sed's;^/\* Open extern \"C\" \*/$;{;'| |
1891 | 1894 | sed's;^/\* Close extern \"C\" \*/$;};'| |
1892 | 1895 | sed's;/\*---X_X;/* ---;g'| |
1893 | | -# workaround indent bug |
| 1896 | +# workaround indent bug for 'static' |
1894 | 1897 | sed's;^static[ ][ ]*;static ;g'| |
| 1898 | +# remove too much indenting after closing brace |
1895 | 1899 | sed's;^}[ ]*;};'| |
| 1900 | +# indent single-line after-'else' comment by only one tab |
| 1901 | +sed's;\([} ]\)else[ ]*\(/\*.*\*/\)[ ]*$;\1else\2;g'| |
1896 | 1902 | # pull in #endif comments |
1897 | 1903 | sed's;^#endif[ ][ ]*/\*;#endif /*;'| |
1898 | 1904 | # work around #else indenting next line if #ifdef defines variables at top |
|