Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit97116ca

Browse files
committed
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 alsoremove pgindent/README mention of the file.
1 parentcedd651 commit97116ca

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

‎src/backend/tsearch/wparser_def.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
#defineHWORD17
4848
#defineURLPATH18
4949
#defineFILEPATH19
50-
#defineDECIMAL20
50+
#defineDECIMAL_T20
5151
#defineSIGNEDINT21
5252
#defineUNSIGNEDINT22
5353
#defineXMLENTITY23
@@ -1150,12 +1150,12 @@ static const TParserStateActionItem actionTPS_InUDecimalFirst[] = {
11501150
};
11511151

11521152
staticconstTParserStateActionItemactionTPS_InUDecimal[]= {
1153-
{p_isEOF,0,A_BINGO,TPS_Base,DECIMAL,NULL},
1153+
{p_isEOF,0,A_BINGO,TPS_Base,DECIMAL_T,NULL},
11541154
{p_isdigit,0,A_NEXT,TPS_InUDecimal,0,NULL},
11551155
{p_iseqC,'.',A_PUSH,TPS_InVersionFirst,0,NULL},
11561156
{p_iseqC,'e',A_PUSH,TPS_InMantissaFirst,0,NULL},
11571157
{p_iseqC,'E',A_PUSH,TPS_InMantissaFirst,0,NULL},
1158-
{NULL,0,A_BINGO,TPS_Base,DECIMAL,NULL}
1158+
{NULL,0,A_BINGO,TPS_Base,DECIMAL_T,NULL}
11591159
};
11601160

11611161
staticconstTParserStateActionItemactionTPS_InDecimalFirst[]= {
@@ -1165,12 +1165,12 @@ static const TParserStateActionItem actionTPS_InDecimalFirst[] = {
11651165
};
11661166

11671167
staticconstTParserStateActionItemactionTPS_InDecimal[]= {
1168-
{p_isEOF,0,A_BINGO,TPS_Base,DECIMAL,NULL},
1168+
{p_isEOF,0,A_BINGO,TPS_Base,DECIMAL_T,NULL},
11691169
{p_isdigit,0,A_NEXT,TPS_InDecimal,0,NULL},
11701170
{p_iseqC,'.',A_PUSH,TPS_InVerVersion,0,NULL},
11711171
{p_iseqC,'e',A_PUSH,TPS_InMantissaFirst,0,NULL},
11721172
{p_iseqC,'E',A_PUSH,TPS_InMantissaFirst,0,NULL},
1173-
{NULL,0,A_BINGO,TPS_Base,DECIMAL,NULL}
1173+
{NULL,0,A_BINGO,TPS_Base,DECIMAL_T,NULL}
11741174
};
11751175

11761176
staticconstTParserStateActionItemactionTPS_InVerVersion[]= {
@@ -2006,7 +2006,7 @@ prsd_end(PG_FUNCTION_ARGS)
20062006
#defineHLIDSKIP(x) ( (x)==URL_T || (x)==NUMHWORD || (x)==ASCIIHWORD || (x)==HWORD )
20072007
#defineXMLHLIDSKIP(x) ( (x)==URL_T || (x)==NUMHWORD || (x)==ASCIIHWORD || (x)==HWORD )
20082008
#defineNONWORDTOKEN(x) ( (x)==SPACE || HLIDREPLACE(x) || HLIDSKIP(x) )
2009-
#defineNOENDTOKEN(x)( NONWORDTOKEN(x) || (x)==SCIENTIFIC || (x)==VERSIONNUMBER || (x)==DECIMAL || (x)==SIGNEDINT || (x)==UNSIGNEDINT || TS_IDIGNORE(x) )
2009+
#defineNOENDTOKEN(x)( NONWORDTOKEN(x) || (x)==SCIENTIFIC || (x)==VERSIONNUMBER || (x)==DECIMAL_T || (x)==SIGNEDINT || (x)==UNSIGNEDINT || TS_IDIGNORE(x) )
20102010

20112011
typedefstruct
20122012
{

‎src/tools/pgindent/README

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ This can format all PostgreSQL *.c and *.h files, but excludes *.y, and
2323
xargs -n100 pgindent src/tools/pgindent/typedefs.list
2424

2525
5) Remove any files that generate errors and restore their original
26-
versions, e.g. ./src/backend/tsearch/wparser_def.c has problems
27-
because of a DECIMAL listed as a typedef.
26+
versions.
2827

2928
6) Do a full test build:
3029

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp