Skip to content

Commit a08dc16

Browse files
bmomjianbmomjian
committed
New pgindent.
1 parent 111b80c commit a08dc16

File tree

4 files changed

+63
-13
lines changed

4 files changed

+63
-13
lines changed

‎src/backend/optimizer/plan/initsplan.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.16 1998/08/09 04:17:38 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.17 1998/08/09 04:59:03 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -172,7 +172,7 @@ add_clause_to_rels(Query *root, List *clause)
172172
/*
173173
* Retrieve all relids and vars contained within the clause.
174174
*/
175-
clause_relids_vars((Node *) clause, &relids, &vars);
175+
clause_get_relids_vars((Node *) clause, &relids, &vars);
176176

177177

178178
clauseinfo->clause = (Expr *) clause;

‎src/backend/optimizer/util/clauses.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.18 1998/08/07 05:02:22 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.19 1998/08/09 04:59:06 momjian Exp $
1111
*
1212
* HISTORY
1313
* AUTHOR DATE MAJOR EVENT
@@ -352,7 +352,7 @@ pull_constant_clauses(List *quals, List **constantQual)
352352
*
353353
*/
354354
void
355-
clause_relids_vars(Node *clause, List **relids, List **vars)
355+
clause_get_relids_vars(Node *clause, List **relids, List **vars)
356356
{
357357
List *clvars = pull_var_clause(clause);
358358
List *var_list = NIL;

‎src/include/optimizer/clauses.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: clauses.h,v 1.10 1998/02/26 04:42:13 momjian Exp $
9+
* $Id: clauses.h,v 1.11 1998/08/09 04:59:08 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -35,7 +35,7 @@ extern bool and_clause(Node *clause);
3535
extern Expr *make_andclause(List *andclauses);
3636

3737
extern List *pull_constant_clauses(List *quals, List **constantQual);
38-
extern void clause_relids_vars(Node *clause, List **relids, List **vars);
38+
extern void clause_get_relids_vars(Node *clause, List **relids, List **vars);
3939
extern int NumRelids(Node *clause);
4040
extern bool contains_not(Node *clause);
4141
extern bool join_clause_p(Node *clause);

‎src/tools/pgindent/pgindent

Lines changed: 57 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@ for FILE
2626
do
2727
cat $FILE |
2828
sed 's;/\* *---;/*---X_X;g' |
29+
# workaround for indent bug with 'else' handling
2930
sed 's;\([} ]\)else[ ]*\(/\*.*\)$;\1else\
30-
\2;g' | # workaround for indent bug
31+
\2;g' |
3132
detab -t4 -qc |
32-
sed 's;^DATA(.*$;/*&*/;' >/tmp/$$a # protect backslashes in DATA()
33+
# protect backslashes in DATA()
34+
sed 's;^DATA(.*$;/*&*/;' >/tmp/$$a
3335

3436
# We get the list of typedef's from /src/tools/find_typedef
3537
indent -bad -bap -bc -bl -d0 -cdb -nce -nfc1 -di12 -i4 -l75 \
@@ -792,12 +794,17 @@ do
792794
cat /tmp/$$a |
793795
sed 's;^/\*\(DATA(.*\)\*/$;\1;' |
794796
sed 's;/\*---X_X;/* ---;g' |
795-
sed 's;^static[ ][ ]*;static ;g' | # workaround indent bug
797+
# workaround indent bug
798+
sed 's;^static[ ][ ]*;static ;g' |
796799
sed 's;^}[ ][ ]*/\*;} /*;' |
797800
detab -t8 -qc |
798801
entab -t4 -qc |
799-
sed 's;^\([A-Za-z_][^ ]*\)[ ][ ]*\*$;\1 *;' | # move trailing * in function return type
800-
awk ' { line3 = $0; /* remove un-needed braces around single statements */
802+
# move trailing * in function return type
803+
sed 's;^\([A-Za-z_][^ ]*\)[ ][ ]*\*$;\1 *;' |
804+
# remove un-needed braces around single statements
805+
awk '
806+
{
807+
line3 = $0;
801808
if (skips > 0)
802809
skips--;
803810
if (line1 ~ " *{$" &&
@@ -823,9 +830,52 @@ do
823830
if (skips <= 2)
824831
print line2;
825832
}' |
833+
# Move prototype names to the same line as return type. Useful for ctags.
834+
# Indent should do this, but it does not. It formats prototypes just
835+
# like real functions.
836+
awk ' BEGIN {paren_level = 0}
837+
{
838+
if ($0 ~ /^[a-zA-Z_][a-zA-Z_0-9]*[^\(]*$/)
839+
{
840+
saved_len = 0;
841+
saved_lines[++saved_len] = $0;
842+
if ((getline saved_lines[++saved_len]) == 0)
843+
print saved_lines[1];
844+
else
845+
if (saved_lines[saved_len] !~ /^[a-zA-Z_][a-zA-Z_0-9]*\(/ ||
846+
saved_lines[saved_len] ~ /^[a-zA-Z_][a-zA-Z_0-9]*\(.*\)$/ ||
847+
saved_lines[saved_len] ~ /^[a-zA-Z_][a-zA-Z_0-9]*\(.*\);$/)
848+
{
849+
print saved_lines[1];
850+
print saved_lines[2];
851+
}
852+
else
853+
{
854+
while (1)
855+
{
856+
if ((getline saved_lines[++saved_len]) == 0)
857+
break;
858+
if (saved_lines[saved_len] ~ /\);?$/ ||
859+
saved_lines[saved_len] ~ /^[^ ]/ ||
860+
saved_lines[saved_len] ~ /^$/)
861+
break;
862+
}
863+
for (i=1; i <= saved_len; i++)
864+
{
865+
if (i == 1 && saved_lines[saved_len] ~ /\);$/)
866+
{
867+
printf "%s", saved_lines[i];
868+
if (substr(saved_lines[i], length(saved_lines[i]),1) != "*")
869+
printf " ";
870+
}
871+
else print saved_lines[i];
872+
}
873+
}
874+
}
875+
else print $0;
876+
}' |
826877
cat >/tmp/$$ && cat /tmp/$$ >$FILE
827878
done
828879

829-
# The 'for' loop makes these backup files useless
830-
# so delete them
880+
# The 'for' loop makes these backup files useless so delete them
831881
rm -f *a.BAK

0 commit comments

Comments
 (0)