Prevent certain symbols that are used for both typedefs and variable

names from being added to pgindent's typedef list.  The existance of
them caused weird formatting in the date/type files, and in keywords.c.

Backpatch to 8.1.X.

diff --git a/src/tools/find_typedef b/src/tools/find_typedef
index 5971a51583864222e875409eb76bec5e60bf810a..ff575fefa55483841fddc9ac77981cb3b32afb13 100755 (executable)
--- a/src/tools/find_typedef
+++ b/src/tools/find_typedef
@@ -12,16 +12,23 @@
 # Remember, debugging symbols are your friends.
 #
 
-if [ "$#" -ne 1 -o ! -d "$1" ]
-then   echo "Usage:  $0 postgres_binary_directory" 1>&2
+if [ "$#" -eq 0 -o ! -d "$1" ]
+then   echo "Usage:  $0 postgres_binary_directory [...]" 1>&2
        exit 1
 fi
 
-objdump --stabs "$1"/* |
-grep "LSYM" |
-awk '{print $7}' |
-grep ':t' |
-sed 's/^\([^:]*\).*$/\1/' |
-grep -v ' ' | # some typedefs have spaces, remove them
+for DIR
+do
+       objdump --stabs "$DIR"/* |
+       grep "LSYM" |
+       awk '{print $7}' |
+       grep ':t' |
+       sed 's/^\([^:]*\).*$/\1/' |
+       grep -v ' ' # some typedefs have spaces, remove them
+done |
 sort |
-uniq
+uniq |
+# these are used both for typedefs and variable names
+# so do not include them
+egrep -v '^(date|interval|timestamp|ANY)$' |
+sed 's/\(.*\)/-T\1 \\/'

diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index c9e02c3600a40016bff39bac4fd9097c10f20a86..887189ead68a43613050ba8cd85a5d2560dc1ded 100755 (executable)
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -109,7 +109,6 @@ do
 -TAES_KEY \
 -TAMT \
 -TAMTS \
--TANY \
 -TASN1_BIT_STRING \
 -TASN1_BMPSTRING \
 -TASN1_BOOLEAN \
@@ -1548,7 +1547,6 @@ do
 -Tcontain_var_reference_context \
 -Tcv_flags_t \
 -Tdaddr_t \
--Tdate \
 -Tdatetkn \
 -Tdecimal \
 -Tdeparse_context \
@@ -1620,7 +1618,6 @@ do
 -Tint8 \
 -Tint8_t \
 -Tint8m_t \
--Tinterval \
 -Tintf \
 -TitemIdSort \
 -TitemIdSortData \
@@ -1737,7 +1734,6 @@ do
 -TteReqs \
 -Ttext \
 -Ttime_t \
--Ttimestamp \
 -Ttlist_vinfo \
 -Tts_db_fctx \
 -TuInt \