Commite5fe2e8

committed

Recognize RETURN QUERY via a textual test, so that QUERY doesn't need to be

a plpgsql keyword. This avoids springing a new reserved word on plpgsqlprogrammers.For consistency, handle RETURN NEXT the same way.

1 parent4521207 commite5fe2e8Copy full SHA for e5fe2e8

File tree

+12

-8

lines changed

+12

-8

lines changed

Lines changed: 11 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.105 2007/07/25 04:19:08 neilc Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.106 2007/11/09 23:58:32 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -181,14 +181,12 @@ staticvoid check_labels(const char *start_label,`
`181`	`181`	`%tokenK_LOG`
`182`	`182`	`%tokenK_LOOP`
`183`	`183`	`%tokenK_MOVE`
`184`		`-%tokenK_NEXT`
`185`	`184`	`%tokenK_NOSCROLL`
`186`	`185`	`%tokenK_NOT`
`187`	`186`	`%tokenK_NOTICE`
`188`	`187`	`%tokenK_NULL`
`189`	`188`	`%tokenK_OPEN`
`190`	`189`	`%tokenK_OR`
`191`		`-%tokenK_QUERY`
`192`	`190`	`%tokenK_PERFORM`
`193`	`191`	`%tokenK_ROW_COUNT`
`194`	`192`	`%tokenK_RAISE`
`@@ -1169,11 +1167,19 @@ stmt_return: K_RETURN lno`
`1169`	`1167`	`inttok;`
`1170`	`1168`
`1171`	`1169`	`tok =yylex();`
`1172`		`-if (tok == K_NEXT)`
	`1170`	`+if (tok ==0)`
	`1171`	`+yyerror("unexpected end of function definition");`
	`1172`	`+`
	`1173`	`+/*`
	`1174`	`+ * To avoid making NEXT and QUERY effectively be`
	`1175`	`+ * reserved words within plpgsql, recognize them`
	`1176`	`+ * via yytext.`
	`1177`	`+*/`
	`1178`	`+if (pg_strcasecmp(yytext,"next") ==0)`
`1173`	`1179`	`{`
`1174`	`1180`	`$$ = make_return_next_stmt($2);`
`1175`	`1181`	`}`
`1176`		`-elseif (tok==K_QUERY)`
	`1182`	`+elseif (pg_strcasecmp(yytext,"query")==0)`
`1177`	`1183`	`{`
`1178`	`1184`	`$$ = make_return_query_stmt($2);`
`1179`	`1185`	`}`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/pl/plpgsql/src/scan.l,v 1.58 2007/07/25 04:19:09 neilc Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/pl/plpgsql/src/scan.l,v 1.59 2007/11/09 23:58:32 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -143,15 +143,13 @@ is{ return K_IS;}`
`143`	`143`	`log{return K_LOG;}`
`144`	`144`	`loop{return K_LOOP;}`
`145`	`145`	`move{return K_MOVE;}`
`146`		`-next{return K_NEXT;}`
`147`	`146`	`no{space}+scroll {return K_NOSCROLL;}`
`148`	`147`	`not{return K_NOT;}`
`149`	`148`	`notice{return K_NOTICE;}`
`150`	`149`	`null{return K_NULL;}`
`151`	`150`	`open{return K_OPEN;}`
`152`	`151`	`or{return K_OR;}`
`153`	`152`	`perform{return K_PERFORM;}`
`154`		`-query{return K_QUERY;}`
`155`	`153`	`raise{return K_RAISE;}`
`156`	`154`	`rename{return K_RENAME;}`
`157`	`155`	`result_oid{return K_RESULT_OID;}`

Comments

(0)