mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve pgindent processing of comment after 'else'.

Browse Source 
Improve comment of pg_dump Win32 link workaround.
This commit is contained in:
Bruce Momjian 2004-10-07 13:45:51 +00:00
parent 4e28b08e53
commit 8a28f50f8a
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bin/pg_dump/Makefile
View File

@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California # Portions Copyright (c) 1994, Regents of the University of California
# #
# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.56 2004/10/05 19:30:23 momjian Exp $ # $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.57 2004/10/07 13:45:48 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -22,7 +22,8 @@ OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \
EXTRA_OBJS = $(top_builddir)/src/backend/parser/keywords.o EXTRA_OBJS = $(top_builddir)/src/backend/parser/keywords.o
# not sure why MinGW needs this but it prevents a link failure # Not sure why MinGW needs this but it prevents a link failure
# of duplicate definitions for pg_tolower(). 2004-10-06
ifeq ($(PORTNAME), win32) ifeq ($(PORTNAME), win32)
EXTRA_OBJS += $(top_builddir)/src/port/exec.o EXTRA_OBJS += $(top_builddir)/src/port/exec.o
endif endif

6
src/tools/pgindent/pgindent
View File

@ -38,8 +38,10 @@ do
# mark some comments for special treatment later # mark some comments for special treatment later
sed 's;/\* *---;/*---X_X;g' | sed 's;/\* *---;/*---X_X;g' |
# workaround for indent bug with 'else' handling # workaround for indent bug with 'else' handling
sed 's;\([} ]\)else\([ ]*\)\(/\*.*\)$;\1else\ sed 's;\([ ]*\)else[ ]*\(/\*.*\)$;\1else\
\2\3;g' | \1\2;g' |
sed 's;\([ ]*\)\(}[ ]\)else[ ]*\(/\*.*\)$;\1\2else\
\1\3;g' |
detab -t4 -qc | detab -t4 -qc |
# work around bug where function that defines no local variables misindents # work around bug where function that defines no local variables misindents
# switch() case lines and line after #else. Do not do for struct/enum. # switch() case lines and line after #else. Do not do for struct/enum.