Commit d6fda1b0 authored by Bruce Momjian's avatar Bruce Momjian

Better guard token used by pgindent.

parent 5f0bf6cb
#!/bin/sh #!/bin/sh
# $PostgreSQL: pgsql/src/tools/pgindent/pgindent,v 1.95 2007/11/16 01:11:04 momjian Exp $ # $PostgreSQL: pgsql/src/tools/pgindent/pgindent,v 1.96 2007/11/16 01:25:15 momjian Exp $
# Known bugs: # Known bugs:
# #
...@@ -46,10 +46,10 @@ do ...@@ -46,10 +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. Add space before PGMV or indent will add # back up again. Add space before _PGMV or indent will add
# it for us. # it for us.
sed 's;\([} ]\)else[ ]*\(/\*\)\(.*\*/\)[ ]*$;\1else\ sed 's;\([} ]\)else[ ]*\(/\*\)\(.*\*/\)[ ]*$;\1else\
\2 PGMV\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
...@@ -2244,10 +2244,10 @@ do ...@@ -2244,10 +2244,10 @@ do
{ {
if (NR != 1) if (NR != 1)
{ {
if ($0 ~ "/\* PGMV") if ($0 ~ "/\* _PGMV")
{ {
# remove tag # remove tag
sub(" PGMV", "", $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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment