summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2005-11-15 14:45:10 +0000
committerBruce Momjian2005-11-15 14:45:10 +0000
commit62fb1d6028b7c648b11ae19aeb213b370887eb68 (patch)
tree7c138f8535afafea74b4ff2ea93b5a3288d97100
parent02c43ffbecfc9baef7e44e27e792af2d6739dcd9 (diff)
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.
-rwxr-xr-xsrc/tools/find_typedef3
-rwxr-xr-xsrc/tools/pgindent/pgindent4
2 files changed, 3 insertions, 4 deletions
diff --git a/src/tools/find_typedef b/src/tools/find_typedef
index 22239c659d0..ff575fefa55 100755
--- a/src/tools/find_typedef
+++ b/src/tools/find_typedef
@@ -28,4 +28,7 @@ do
done |
sort |
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 c9e02c3600a..887189ead68 100755
--- 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 \