Commit75c5705

committed

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

Typedef name should be both unique and non-intersect with variable namesacross all the sources. That makes both pg_indent and debuggers happy.Discussion:https://postgr.es/m/23865.1552936099%40sss.pgh.pa.us

1 parent590a870 commit75c5705Copy full SHA for 75c5705

File tree

-9

lines changed

-9

lines changed

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -282,20 +282,20 @@ jsonpath_yyerror(JsonPathParseResult *result, const char message)`
`282`	`282`	`}`
`283`	`283`	`}`
`284`	`284`
`285`		`-typedefstructkeyword`
	`285`	`+typedefstructJsonPathKeyword`
`286`	`286`	`{`
`287`	`287`	`int16len;`
`288`	`288`	`boollowercase;`
`289`	`289`	`intval;`
`290`		`-constchar*keyword;`
`291`		`-}keyword;`
	`290`	`+constchar*keyword;`
	`291`	`+}JsonPathKeyword;`
`292`	`292`
`293`	`293`	`/*`
`294`	`294`	`* Array of key words should be sorted by length and then`
`295`	`295`	`* alphabetical order`
`296`	`296`	`*/`
`297`	`297`
`298`		`-staticconstkeyword keywords[] = {`
	`298`	`+staticconstJsonPathKeyword keywords[] = {`
`299`	`299`	`{2,false,IS_P,"is"},`
`300`	`300`	`{2,false,TO_P,"to"},`
`301`	`301`	`{3,false,ABS_P,"abs"},`
`@@ -322,11 +322,11 @@ static const keyword keywords[] = {`
`322`	`322`	`staticint`
`323`	`323`	`checkSpecialVal()`
`324`	`324`	`{`
`325`		`-intres = IDENT_P;`
`326`		`-intdiff;`
`327`		`-constkeyword *StopLow = keywords,`
`328`		`- *StopHigh = keywords +lengthof(keywords),`
`329`		`- *StopMiddle;`
	`325`	`+intres = IDENT_P;`
	`326`	`+intdiff;`
	`327`	`+constJsonPathKeyword *StopLow = keywords,`
	`328`	`+ *StopHigh = keywords +lengthof(keywords),`
	`329`	`+ *StopMiddle;`
`330`	`330`
`331`	`331`	`if (scanstring.len > keywords[lengthof(keywords) -1].len)`
`332`	`332`	`return res;`

Comments

(0)