rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-09-30 13:31:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename typedef in jsonpath_scan.l from "keyword" to "JsonPathKeyword"

Browse Source 
Typedef name should be both unique and non-intersect with variable names
across all the sources.  That makes both pg_indent and debuggers happy.

Discussion: https://postgr.es/m/23865.1552936099%40sss.pgh.pa.us
This commit is contained in:
Alexander Korotkov 2019-03-19 13:34:16 +03:00
parent 590a87025b
commit 75c57058b0
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/backend/utils/adt/jsonpath_scan.l
View File

@ -282,20 +282,20 @@ jsonpath_yyerror(JsonPathParseResult **result, const char *message)
} }
} }
typedef struct keyword typedef struct JsonPathKeyword
{ {
int16 len; int16 len;
bool lowercase; bool lowercase;
int val; int val;
const char *keyword; const char *keyword;
} keyword; } JsonPathKeyword;
/* /*
* Array of key words should be sorted by length and then * Array of key words should be sorted by length and then
* alphabetical order * alphabetical order
*/ */
static const keyword keywords[] = { static const JsonPathKeyword keywords[] = {
{ 2, false, IS_P, "is"}, { 2, false, IS_P, "is"},
{ 2, false, TO_P, "to"}, { 2, false, TO_P, "to"},
{ 3, false, ABS_P, "abs"}, { 3, false, ABS_P, "abs"},
@ -322,11 +322,11 @@ static const keyword keywords[] = {
static int static int
checkSpecialVal() checkSpecialVal()
{ {
int res = IDENT_P; int res = IDENT_P;
int diff; int diff;
const keyword *StopLow = keywords, const JsonPathKeyword *StopLow = keywords,
*StopHigh = keywords + lengthof(keywords), *StopHigh = keywords + lengthof(keywords),
*StopMiddle; *StopMiddle;
if (scanstring.len > keywords[lengthof(keywords) - 1].len) if (scanstring.len > keywords[lengthof(keywords) - 1].len)
return res; return res;