NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit530e69e

committed

Allow cpluspluscheck to pass by renaming variable

Use of a C++ keyword as a function name caused problemsReported-by: Álvaro Herrera

1 parentb998655 commit530e69eCopy full SHA for 530e69e

File tree

2 files changed

-8

lines changed

src
- backend/parser
  - parse_clause.c
- include/parser
  - parse_clause.h

2 files changed

-8

lines changed

`‎src/backend/parser/parse_clause.c`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1108,7 +1108,7 @@ Node *`
`1108`	`1108`	`transformFromClauseItem(ParseStatepstate,Noden,`
`1109`	`1109`	`RangeTblEntry*top_rte,inttop_rti,`
`1110`	`1110`	`RangeTblEntry*right_rte,intright_rti,`
`1111`		`-List**namespace)`
	`1111`	`+List**fnamespace)`
`1112`	`1112`	`{`
`1113`	`1113`	`if (IsA(n,RangeVar))`
`1114`	`1114`	`{`
`@@ -1130,7 +1130,7 @@ transformFromClauseItem(ParseState pstate, Node n,`
`1130`	`1130`	`Assert(rte==rt_fetch(rtindex,pstate->p_rtable));`
`1131`	`1131`	`*top_rte=rte;`
`1132`	`1132`	`*top_rti=rtindex;`
`1133`		`-*namespace=list_make1(makeDefaultNSItem(rte));`
	`1133`	`+*fnamespace=list_make1(makeDefaultNSItem(rte));`
`1134`	`1134`	`rtr=makeNode(RangeTblRef);`
`1135`	`1135`	`rtr->rtindex=rtindex;`
`1136`	`1136`	`return (Node*)rtr;`
`@@ -1148,7 +1148,7 @@ transformFromClauseItem(ParseState pstate, Node n,`
`1148`	`1148`	`Assert(rte==rt_fetch(rtindex,pstate->p_rtable));`
`1149`	`1149`	`*top_rte=rte;`
`1150`	`1150`	`*top_rti=rtindex;`
`1151`		`-*namespace=list_make1(makeDefaultNSItem(rte));`
	`1151`	`+*fnamespace=list_make1(makeDefaultNSItem(rte));`
`1152`	`1152`	`rtr=makeNode(RangeTblRef);`
`1153`	`1153`	`rtr->rtindex=rtindex;`
`1154`	`1154`	`return (Node*)rtr;`
`@@ -1166,7 +1166,7 @@ transformFromClauseItem(ParseState pstate, Node n,`
`1166`	`1166`	`Assert(rte==rt_fetch(rtindex,pstate->p_rtable));`
`1167`	`1167`	`*top_rte=rte;`
`1168`	`1168`	`*top_rti=rtindex;`
`1169`		`-*namespace=list_make1(makeDefaultNSItem(rte));`
	`1169`	`+*fnamespace=list_make1(makeDefaultNSItem(rte));`
`1170`	`1170`	`rtr=makeNode(RangeTblRef);`
`1171`	`1171`	`rtr->rtindex=rtindex;`
`1172`	`1172`	`return (Node*)rtr;`
`@@ -1184,7 +1184,7 @@ transformFromClauseItem(ParseState pstate, Node n,`
`1184`	`1184`	`Assert(rte==rt_fetch(rtindex,pstate->p_rtable));`
`1185`	`1185`	`*top_rte=rte;`
`1186`	`1186`	`*top_rti=rtindex;`
`1187`		`-*namespace=list_make1(makeDefaultNSItem(rte));`
	`1187`	`+*fnamespace=list_make1(makeDefaultNSItem(rte));`
`1188`	`1188`	`rtr=makeNode(RangeTblRef);`
`1189`	`1189`	`rtr->rtindex=rtindex;`
`1190`	`1190`	`return (Node*)rtr;`
`@@ -1199,7 +1199,7 @@ transformFromClauseItem(ParseState pstate, Node n,`
`1199`	`1199`
`1200`	`1200`	`/* Recursively transform the contained relation */`
`1201`	`1201`	`rel=transformFromClauseItem(pstate,rts->relation,`
`1202`		`-top_rte,top_rti,NULL,NULL,namespace);`
	`1202`	`+top_rte,top_rti,NULL,NULL,fnamespace);`
`1203`	`1203`	`/* Currently, grammar could only return a RangeVar as contained rel */`
`1204`	`1204`	`rtr=castNode(RangeTblRef,rel);`
`1205`	`1205`	`rte=rt_fetch(rtr->rtindex,pstate->p_rtable);`
`@@ -1558,7 +1558,7 @@ transformFromClauseItem(ParseState pstate, Node n,`
`1558`	`1558`	`* The join RTE itself is always made visible for unqualified column`
`1559`	`1559`	`* names. It's visible as a relation name only if it has an alias.`
`1560`	`1560`	`*/`
`1561`		`-*namespace=lappend(my_namespace,`
	`1561`	`+*fnamespace=lappend(my_namespace,`
`1562`	`1562`	`makeNamespaceItem(rte,`
`1563`	`1563`	`(j->alias!=NULL),`
`1564`	`1564`	`true,`

`‎src/include/parser/parse_clause.h`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ extern bool interpretOidsOption(List *defList, bool allowOids);`
`23`	`23`	`externNodetransformFromClauseItem(ParseStatepstate,Node*n,`
`24`	`24`	`RangeTblEntry*top_rte,inttop_rti,`
`25`	`25`	`RangeTblEntry*right_rte,intright_rti,`
`26`		`-List**namespace);`
	`26`	`+List**fnamespace);`
`27`	`27`	`externNodetransformWhereClause(ParseStatepstate,Node*clause,`
`28`	`28`	`ParseExprKindexprKind,constchar*constructName);`
`29`	`29`	`externNodetransformLimitClause(ParseStatepstate,Node*clause,`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit530e69e

File tree

2 files changed

2 files changed

`‎src/backend/parser/parse_clause.c`

`‎src/include/parser/parse_clause.h`

0 commit comments