summaryrefslogtreecommitdiff
path: root/src/backend/tsearch/wparser_def.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2011-02-06 10:46:15 -0500
committerBruce Momjian <bruce@momjian.us>2011-02-06 10:48:17 -0500
commit97116ca4170b974d734cea364789c389b30e6ce1 (patch)
treea3b7895eef0e44e2e3d1c138bd4e34363d36f31b /src/backend/tsearch/wparser_def.c
parentcedd6515ba68f46dd7e75a65d4c98330ced0ba7a (diff)
downloadpostgresql-97116ca4170b974d734cea364789c389b30e6ce1.tar.gz
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.
Diffstat (limited to 'src/backend/tsearch/wparser_def.c')
-rw-r--r--src/backend/tsearch/wparser_def.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c
index f3c78178e7..40eca64895 100644
--- 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
{