The trailing semicolon in a plpgsql function definition is now optional.

tglsfdc · tglsfdc · commit cdd914686394 · 2001-09-26T21:35:28.000Z
Per gripe 9/26.
diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y
@@ -4,7 +4,7 @@
  *						  procedural language
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.24 2001/07/12 17:42:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.25 2001/09/26 21:35:28 tgl Exp $
  *
  *	  This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -210,11 +210,11 @@ static	PLpgSQL_expr	*make_tupret_expr(PLpgSQL_row *row);
 
 %%
 
-pl_function		: T_FUNCTION comp_optsect pl_block
+pl_function		: T_FUNCTION comp_optsect pl_block opt_semi
 					{
 						yylval.program = (PLpgSQL_stmt_block *)$3;
 					}
-				| T_TRIGGER comp_optsect pl_block
+				| T_TRIGGER comp_optsect pl_block opt_semi
 					{
 						yylval.program = (PLpgSQL_stmt_block *)$3;
 					}
@@ -234,7 +234,11 @@ comp_option		: O_OPTION O_DUMP
 					}
 				;
 
-pl_block		: decl_sect K_BEGIN lno proc_sect K_END ';'
+opt_semi		:
+				| ';'
+				;
+
+pl_block		: decl_sect K_BEGIN lno proc_sect K_END
 					{
 						PLpgSQL_stmt_block *new;
 
@@ -704,7 +708,7 @@ proc_stmts		: proc_stmts proc_stmt
 						}
 				;
 
-proc_stmt		: pl_block
+proc_stmt		: pl_block ';'
 						{ $$ = $1; }
 				| stmt_assign
 						{ $$ = $1; }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* procedural language`
`5`	`5`	`*`
`6`	`6`	`* IDENTIFICATION`
`7`		`- * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.24 2001/07/12 17:42:07 momjian Exp $`
	`7`	`+ * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.25 2001/09/26 21:35:28 tgl Exp $`
`8`	`8`	`*`
`9`	`9`	`* This software is copyrighted by Jan Wieck - Hamburg.`
`10`	`10`	`*`
`@@ -210,11 +210,11 @@ static PLpgSQL_expr make_tupret_expr(PLpgSQL_row row);`
`210`	`210`
`211`	`211`	`%%`
`212`	`212`
`213`		`-pl_function : T_FUNCTION comp_optsect pl_block`
	`213`	`+pl_function : T_FUNCTION comp_optsect pl_block opt_semi`
`214`	`214`	`{`
`215`	`215`	`yylval.program = (PLpgSQL_stmt_block *)$3;`
`216`	`216`	`}`
`217`		`- \| T_TRIGGER comp_optsect pl_block`
	`217`	`+ \| T_TRIGGER comp_optsect pl_block opt_semi`
`218`	`218`	`{`
`219`	`219`	`yylval.program = (PLpgSQL_stmt_block *)$3;`
`220`	`220`	`}`
`@@ -234,7 +234,11 @@ comp_option : O_OPTION O_DUMP`
`234`	`234`	`}`
`235`	`235`	`;`
`236`	`236`
`237`		`-pl_block : decl_sect K_BEGIN lno proc_sect K_END ';'`
	`237`	`+opt_semi :`
	`238`	`+ \| ';'`
	`239`	`+ ;`
	`240`	`+`
	`241`	`+pl_block : decl_sect K_BEGIN lno proc_sect K_END`
`238`	`242`	`{`
`239`	`243`	`PLpgSQL_stmt_block *new;`
`240`	`244`
`@@ -704,7 +708,7 @@ proc_stmts : proc_stmts proc_stmt`
`704`	`708`	`}`
`705`	`709`	`;`
`706`	`710`
`707`		`-proc_stmt : pl_block`
	`711`	`+proc_stmt : pl_block ';'`
`708`	`712`	`{ $$ = $1; }`
`709`	`713`	`\| stmt_assign`
`710`	`714`	`{ $$ = $1; }`