c8h4/postgresql
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Cleanup for new else/comment handling.

Browse source
This commit is contained in:
Bruce Momjian 2007-11-16 01:11:04 +00:00
parent eae7e00f1f
commit 0c2c061eb0
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/backend/utils/mb/conv.c
View file

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conv.c,v 1.64 2007/11/15 23:23:44 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conv.c,v 1.65 2007/11/16 01:11:04 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */

2
src/bin/psql/mbprint.c
View file

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2007, PostgreSQL Global Development Group * Copyright (c) 2000-2007, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.27 2007/11/15 23:23:44 momjian Exp $ * $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.28 2007/11/16 01:11:04 momjian Exp $
* *
* XXX this file does not really belong in psql/. Perhaps move to libpq? * XXX this file does not really belong in psql/. Perhaps move to libpq?
* It also seems that the mbvalidate function is redundant with existing * It also seems that the mbvalidate function is redundant with existing

11
src/tools/pgindent/pgindent
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# $PostgreSQL: pgsql/src/tools/pgindent/pgindent,v 1.94 2007/11/15 23:23:44 momjian Exp $ # $PostgreSQL: pgsql/src/tools/pgindent/pgindent,v 1.95 2007/11/16 01:11:04 momjian Exp $
# Known bugs: # Known bugs:
# #
@ -46,9 +46,10 @@ do
# 'else' followed by a single-line comment, followed by # 'else' followed by a single-line comment, followed by
# a brace on the next line confuses BSD indent, so we push # a brace on the next line confuses BSD indent, so we push
# the comment down to the next line, then later pull it # the comment down to the next line, then later pull it
# back up again. # back up again. Add space before PGMV or indent will add
# it for us.
sed 's;\([} ]\)else[ ]*\(/\*\)\(.*\*/\)[ ]*$;\1else\ sed 's;\([} ]\)else[ ]*\(/\*\)\(.*\*/\)[ ]*$;\1else\
\2PGINDENT_MOVED\3;g' | \2 PGMV\3;g' |
# Indent multi-line after-'else' comment so BSD indent will move it properly. # Indent multi-line after-'else' comment so BSD indent will move it properly.
# We already moved down single-line comments above. Check for '*' to make # We already moved down single-line comments above. Check for '*' to make
@ -2243,10 +2244,10 @@ do
{ {
if (NR != 1) if (NR != 1)
{ {
if ($0 ~ "/\*PGINDENT_MOVED") if ($0 ~ "/\* PGMV")
{ {
# remove tag # remove tag
sub("PGINDENT_MOVED", "", $0); sub(" PGMV", "", $0);
# remove leading whitespace # remove leading whitespace
sub("^[ ]*", "", $0); sub("^[ ]*", "", $0);
# add comment with single tab prefix # add comment with single tab prefix