rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Bruce Momjian 2011-02-06 10:46:15 -05:00
parent cedd6515ba
commit 97116ca417
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/tsearch/wparser_def.c
View File

@ -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
{

3
src/tools/pgindent/README
View File

@ -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: