[Firebird-checkins] SF.net SVN: firebird:[58066] firebird/trunk

[<asf...@us...>]

Revision: 58066
          http://sourceforge.net/p/firebird/code/58066
Author:   asfernandes
Date:     2013-05-13 01:49:34 +0000 (Mon, 13 May 2013)
Log Message:
-----------
Changed package routines syntax to not need (nor accept) a semi-colon after "END".

Modified Paths:
--------------
    firebird/trunk/examples/package/fbout-body.sql
    firebird/trunk/src/dsql/parse.y

Modified: firebird/trunk/examples/package/fbout-body.sql
===================================================================
--- firebird/trunk/examples/package/fbout-body.sql	2013-05-13 01:48:57 UTC (rev 58065)
+++ firebird/trunk/examples/package/fbout-body.sql	2013-05-13 01:49:34 UTC (rev 58066)
@@ -30,13 +30,13 @@
 	as
 	begin
 		rdb$set_context('USER_SESSION', 'fb$out.enabled', '1');
-	end;
+	end
 
 	procedure disable
 	as
 	begin
 		rdb$set_context('USER_SESSION', 'fb$out.enabled', null);
-	end;
+	end
 
 	procedure put_line (line fb$out_type)
 	as
@@ -49,14 +49,14 @@
 					values (next value for fb$out_seq, :line);
 			end
 		end
-	end;
+	end
 
 	procedure clear
 	as
 	begin
 		in autonomous transaction do
 			delete from fb$out_table;
-	end;
+	end
 
 	procedure get_lines returns (lines fb$out_type)
 	as
@@ -77,7 +77,7 @@
 		end
 
 		execute procedure clear;
-	end;
+	end
 end!
 
 

Modified: firebird/trunk/src/dsql/parse.y
===================================================================
--- firebird/trunk/src/dsql/parse.y	2013-05-13 01:48:57 UTC (rev 58065)
+++ firebird/trunk/src/dsql/parse.y	2013-05-13 01:49:34 UTC (rev 58066)
@@ -2403,8 +2403,7 @@
 
 %type <packageItems> package_body_items_opt
 package_body_items_opt
-	:
-		{ $$ = newNode<Array<CreateAlterPackageNode::Item> >(); }
+	: /* nothing */			{ $$ = newNode<Array<CreateAlterPackageNode::Item> >(); }
 	| package_body_items
 	;
 
@@ -2424,9 +2423,9 @@
 
 %type <packageItem> package_body_item
 package_body_item
-	: FUNCTION function_clause ';'
+	: FUNCTION function_clause
 		{ $$ = CreateAlterPackageNode::Item::create($2); }
-	| PROCEDURE procedure_clause ';'
+	| PROCEDURE procedure_clause
 		{ $$ = CreateAlterPackageNode::Item::create($2); }
 	;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.