Rename macro DECIMAL to DECIMAL_T to help pgindent; this is already

done for a few other macros in that file, for other reasons.  I also
remove pgindent/README mention of the file.

diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c
index f3c78178e7a3f21cc94ad627926413796c2eb252..40eca64895ebe84a5b7d61c922ddcb18ccd899e1 100644 (file)
--- a/src/backend/tsearch/wparser_def.c
+++ b/src/backend/tsearch/wparser_def.c
@@ -47,7 +47,7 @@
 #define HWORD          17
 #define URLPATH            18
 #define FILEPATH       19
-#define DECIMAL            20
+#define DECIMAL_T      20
 #define SIGNEDINT      21
 #define UNSIGNEDINT        22
 #define XMLENTITY      23
@@ -1150,12 +1150,12 @@ static const TParserStateActionItem actionTPS_InUDecimalFirst[] = {
 };
 
 static const TParserStateActionItem actionTPS_InUDecimal[] = {
-   {p_isEOF, 0, A_BINGO, TPS_Base, DECIMAL, NULL},
+   {p_isEOF, 0, A_BINGO, TPS_Base, DECIMAL_T, NULL},
    {p_isdigit, 0, A_NEXT, TPS_InUDecimal, 0, NULL},
    {p_iseqC, '.', A_PUSH, TPS_InVersionFirst, 0, NULL},
    {p_iseqC, 'e', A_PUSH, TPS_InMantissaFirst, 0, NULL},
    {p_iseqC, 'E', A_PUSH, TPS_InMantissaFirst, 0, NULL},
-   {NULL, 0, A_BINGO, TPS_Base, DECIMAL, NULL}
+   {NULL, 0, A_BINGO, TPS_Base, DECIMAL_T, NULL}
 };
 
 static const TParserStateActionItem actionTPS_InDecimalFirst[] = {
@@ -1165,12 +1165,12 @@ static const TParserStateActionItem actionTPS_InDecimalFirst[] = {
 };
 
 static const TParserStateActionItem actionTPS_InDecimal[] = {
-   {p_isEOF, 0, A_BINGO, TPS_Base, DECIMAL, NULL},
+   {p_isEOF, 0, A_BINGO, TPS_Base, DECIMAL_T, NULL},
    {p_isdigit, 0, A_NEXT, TPS_InDecimal, 0, NULL},
    {p_iseqC, '.', A_PUSH, TPS_InVerVersion, 0, NULL},
    {p_iseqC, 'e', A_PUSH, TPS_InMantissaFirst, 0, NULL},
    {p_iseqC, 'E', A_PUSH, TPS_InMantissaFirst, 0, NULL},
-   {NULL, 0, A_BINGO, TPS_Base, DECIMAL, NULL}
+   {NULL, 0, A_BINGO, TPS_Base, DECIMAL_T, NULL}
 };
 
 static const TParserStateActionItem actionTPS_InVerVersion[] = {
@@ -2006,7 +2006,7 @@ prsd_end(PG_FUNCTION_ARGS)
 #define HLIDSKIP(x)     ( (x)==URL_T || (x)==NUMHWORD || (x)==ASCIIHWORD || (x)==HWORD )
 #define XMLHLIDSKIP(x)  ( (x)==URL_T || (x)==NUMHWORD || (x)==ASCIIHWORD || (x)==HWORD )
 #define NONWORDTOKEN(x) ( (x)==SPACE || HLIDREPLACE(x) || HLIDSKIP(x) )
-#define NOENDTOKEN(x)  ( NONWORDTOKEN(x) || (x)==SCIENTIFIC || (x)==VERSIONNUMBER || (x)==DECIMAL || (x)==SIGNEDINT || (x)==UNSIGNEDINT || TS_IDIGNORE(x) )
+#define NOENDTOKEN(x)  ( NONWORDTOKEN(x) || (x)==SCIENTIFIC || (x)==VERSIONNUMBER || (x)==DECIMAL_T || (x)==SIGNEDINT || (x)==UNSIGNEDINT || TS_IDIGNORE(x) )
 
 typedef struct
 {

diff --git a/src/tools/pgindent/README b/src/tools/pgindent/README
index 0fedfa99ff763e5768adccca9102c072bd3fafe0..8fbf59f5ec86e7544b5a2bacc26681480f1e1981 100644 (file)
--- a/src/tools/pgindent/README
+++ b/src/tools/pgindent/README
@@ -23,8 +23,7 @@ This can format all PostgreSQL *.c and *.h files, but excludes *.y, and
    xargs -n100 pgindent src/tools/pgindent/typedefs.list
 
 5) Remove any files that generate errors and restore their original
-   versions, e.g. ./src/backend/tsearch/wparser_def.c has problems
-   because of a DECIMAL listed as a typedef.
+   versions.
 
 6) Do a full test build: