pl/pgsql: END verbosity

diff -c -r --new-file pgsql/doc/src/sgml/plpgsql.sgml pgsql.01/doc/src/sgml/plpgsql.sgml
*** pgsql/doc/src/sgml/plpgsql.sgml	2005-06-24 13:10:33.000000000 +0200
--- pgsql.01/doc/src/sgml/plpgsql.sgml	2005-06-25 15:29:27.000000000 +0200
***************
*** 456,462 ****
      <replaceable>declarations</replaceable> </optional>
  BEGIN
      <replaceable>statements</replaceable>
! END;
  </synopsis>
      </para>
  
--- 456,462 ----
      <replaceable>declarations</replaceable> </optional>
  BEGIN
      <replaceable>statements</replaceable>
! END <optional> &lt;&lt;<replaceable>label</replaceable>&gt;&gt; </optional>;
  </synopsis>
      </para>
  
***************
*** 1792,1798 ****
  <optional>&lt;&lt;<replaceable>label</replaceable>&gt;&gt;</optional>
  LOOP
      <replaceable>statements</replaceable>
! END LOOP;
  </synopsis>
  
       <para>
--- 1792,1798 ----
  <optional>&lt;&lt;<replaceable>label</replaceable>&gt;&gt;</optional>
  LOOP
      <replaceable>statements</replaceable>
! END LOOP <optional>&lt;&lt;<replaceable>label</replaceable>&gt;&gt;</optional>;
  </synopsis>
  
       <para>
***************
*** 1923,1929 ****
  <optional>&lt;&lt;<replaceable>label</replaceable>&gt;&gt;</optional>
  WHILE <replaceable>expression</replaceable> LOOP
      <replaceable>statements</replaceable>
! END LOOP;
  </synopsis>
  
         <para>
--- 1923,1929 ----
  <optional>&lt;&lt;<replaceable>label</replaceable>&gt;&gt;</optional>
  WHILE <replaceable>expression</replaceable> LOOP
      <replaceable>statements</replaceable>
! END LOOP <optional>&lt;&lt;<replaceable>label</replaceable>&gt;&gt;</optional>;
  </synopsis>
  
         <para>
***************
*** 2000,2006 ****
  <optional>&lt;&lt;<replaceable>label</replaceable>&gt;&gt;</optional>
  FOR <replaceable>record_or_row</replaceable> IN <replaceable>query</replaceable> LOOP
      <replaceable>statements</replaceable>
! END LOOP;
  </synopsis>
       The record or row variable is successively assigned each row
       resulting from the <replaceable>query</replaceable> (which must be a
--- 2000,2006 ----
  <optional>&lt;&lt;<replaceable>label</replaceable>&gt;&gt;</optional>
  FOR <replaceable>record_or_row</replaceable> IN <replaceable>query</replaceable> LOOP
      <replaceable>statements</replaceable>
! END LOOP <optional>&lt;&lt;<replaceable>label</replaceable>&gt;&gt;</optional>;
  </synopsis>
       The record or row variable is successively assigned each row
       resulting from the <replaceable>query</replaceable> (which must be a
***************
*** 2039,2045 ****
  <optional>&lt;&lt;<replaceable>label</replaceable>&gt;&gt;</optional>
  FOR <replaceable>record_or_row</replaceable> IN EXECUTE <replaceable>text_expression</replaceable> LOOP 
      <replaceable>statements</replaceable>
! END LOOP;
  </synopsis>
       This is like the previous form, except that the source
       <command>SELECT</command> statement is specified as a string
--- 2039,2045 ----
  <optional>&lt;&lt;<replaceable>label</replaceable>&gt;&gt;</optional>
  FOR <replaceable>record_or_row</replaceable> IN EXECUTE <replaceable>text_expression</replaceable> LOOP 
      <replaceable>statements</replaceable>
! END LOOP <optional>&lt;&lt;<replaceable>label</replaceable>&gt;&gt;</optional>;
  </synopsis>
       This is like the previous form, except that the source
       <command>SELECT</command> statement is specified as a string
diff -c -r --new-file pgsql/src/pl/plpgsql/src/gram.y pgsql.01/src/pl/plpgsql/src/gram.y
*** pgsql/src/pl/plpgsql/src/gram.y	2005-06-24 13:11:25.000000000 +0200
--- pgsql.01/src/pl/plpgsql/src/gram.y	2005-06-25 15:21:22.000000000 +0200
***************
*** 56,61 ****
--- 56,62 ----
  											   PLpgSQL_datum *initial_datum);
  static	void			 check_sql_expr(const char *stmt);
  static	void			 plpgsql_sql_error_callback(void *arg);
+ static void 		check_labels(char *lbl, char *elbl, int lno);
  
  %}
  
***************
*** 81,86 ****
--- 82,93 ----
  			int  n_initvars;
  			int  *initvarnos;
  		}						declhdr;
+ 		struct 
+ 		{
+ 			char *label;
+ 			int lineno;
+ 			List *list;
+ 		}						loop_body;
  		List					*list;
  		PLpgSQL_type			*dtype;
  		PLpgSQL_datum			*scalar;	/* a VAR, RECFIELD, or TRIGARG */
***************
*** 122,129 ****
  %type <str>		opt_lblname opt_label
  %type <str>		opt_exitlabel
  %type <str>		execsql_start
  
! %type <list>	proc_sect proc_stmts stmt_else loop_body
  %type <stmt>	proc_stmt pl_block
  %type <stmt>	stmt_assign stmt_if stmt_loop stmt_while stmt_exit
  %type <stmt>	stmt_return stmt_return_next stmt_raise stmt_execsql
--- 129,138 ----
  %type <str>		opt_lblname opt_label
  %type <str>		opt_exitlabel
  %type <str>		execsql_start
+ %type <str>		opt_lbltext opt_endlabel
  
! %type <list>	proc_sect proc_stmts stmt_else
! %type <loop_body> loop_body
  %type <stmt>	proc_stmt pl_block
  %type <stmt>	stmt_assign stmt_if stmt_loop stmt_while stmt_exit
  %type <stmt>	stmt_return stmt_return_next stmt_raise stmt_execsql
***************
*** 248,257 ****
  				| ';'
  				;
  
! pl_block		: decl_sect K_BEGIN lno proc_sect exception_sect K_END
  					{
  						PLpgSQL_stmt_block *new;
  
  						new = palloc0(sizeof(PLpgSQL_stmt_block));
  
  						new->cmd_type	= PLPGSQL_STMT_BLOCK;
--- 257,268 ----
  				| ';'
  				;
  
! pl_block		: decl_sect K_BEGIN lno proc_sect exception_sect K_END opt_endlabel
  					{
  						PLpgSQL_stmt_block *new;
  
+ 						check_labels($1.label, $7, $3);
+ 						
  						new = palloc0(sizeof(PLpgSQL_stmt_block));
  
  						new->cmd_type	= PLPGSQL_STMT_BLOCK;
***************
*** 788,802 ****
  						new->cmd_type = PLPGSQL_STMT_LOOP;
  						new->lineno   = $3;
  						new->label	  = $1;
! 						new->body	  = $4;
! 
  						plpgsql_ns_pop();
  
  						$$ = (PLpgSQL_stmt *)new;
  					}
  				;
  
! stmt_while		: opt_label K_WHILE lno expr_until_loop loop_body
  					{
  						PLpgSQL_stmt_while *new;
  
--- 799,814 ----
  						new->cmd_type = PLPGSQL_STMT_LOOP;
  						new->lineno   = $3;
  						new->label	  = $1;
! 						new->body	  = $4.list;
! 						
! 						check_labels($1, $4.label, $4.lineno);
  						plpgsql_ns_pop();
  
  						$$ = (PLpgSQL_stmt *)new;
  					}
  				;
  
! stmt_while		: opt_label K_WHILE lno expr_until_loop loop_body 
  					{
  						PLpgSQL_stmt_while *new;
  
***************
*** 805,812 ****
  						new->lineno   = $3;
  						new->label	  = $1;
  						new->cond	  = $4;
! 						new->body	  = $5;
  
  						plpgsql_ns_pop();
  
  						$$ = (PLpgSQL_stmt *)new;
--- 817,826 ----
  						new->lineno   = $3;
  						new->label	  = $1;
  						new->cond	  = $4;
! 						new->body	  = $5.list;
  
+ 						check_labels($1, $5.label, $5.lineno);
+ 							
  						plpgsql_ns_pop();
  
  						$$ = (PLpgSQL_stmt *)new;
***************
*** 822,828 ****
  
  							new = (PLpgSQL_stmt_fori *) $3;
  							new->label	  = $1;
! 							new->body	  = $4;
  							$$ = (PLpgSQL_stmt *) new;
  						}
  						else if ($3->cmd_type == PLPGSQL_STMT_FORS)
--- 836,842 ----
  
  							new = (PLpgSQL_stmt_fori *) $3;
  							new->label	  = $1;
! 							new->body	  = $4.list;
  							$$ = (PLpgSQL_stmt *) new;
  						}
  						else if ($3->cmd_type == PLPGSQL_STMT_FORS)
***************
*** 831,837 ****
  
  							new = (PLpgSQL_stmt_fors *) $3;
  							new->label	  = $1;
! 							new->body	  = $4;
  							$$ = (PLpgSQL_stmt *) new;
  						}
  						else
--- 845,851 ----
  
  							new = (PLpgSQL_stmt_fors *) $3;
  							new->label	  = $1;
! 							new->body	  = $4.list;
  							$$ = (PLpgSQL_stmt *) new;
  						}
  						else
***************
*** 841,851 ****
  							Assert($3->cmd_type == PLPGSQL_STMT_DYNFORS);
  							new = (PLpgSQL_stmt_dynfors *) $3;
  							new->label	  = $1;
! 							new->body	  = $4;
  							$$ = (PLpgSQL_stmt *) new;
  						}
  
  						/* close namespace started in opt_label */
  						plpgsql_ns_pop();
  					}
  				;
--- 855,866 ----
  							Assert($3->cmd_type == PLPGSQL_STMT_DYNFORS);
  							new = (PLpgSQL_stmt_dynfors *) $3;
  							new->label	  = $1;
! 							new->body	  = $4.list;
  							$$ = (PLpgSQL_stmt *) new;
  						}
  
  						/* close namespace started in opt_label */
+ 						check_labels($1, $4.label, $4.lineno);
  						plpgsql_ns_pop();
  					}
  				;
***************
*** 1245,1252 ****
  					}
  				;
  
! loop_body		: proc_sect K_END K_LOOP ';'
! 					{ $$ = $1; }
  				;
  
  stmt_execsql	: execsql_start lno
--- 1260,1271 ----
  					}
  				;
  
! loop_body		: proc_sect lno K_END K_LOOP opt_endlabel ';'
! 					{ 
! 						$$.list = $1;
! 						$$.lineno = $2; 
! 						$$.label = $5;	
! 					}
  				;
  
  stmt_execsql	: execsql_start lno
***************
*** 1608,1621 ****
  					}
  				;
  
  opt_exitlabel	:
  					{ $$ = NULL; }
  				| T_LABEL
  					{
- 						char	*name;
- 
- 						plpgsql_convert_ident(yytext, &name, 1);
- 						$$ = name;
  					}
  				| T_WORD
  					{
--- 1627,1645 ----
  					}
  				;
  
+ opt_endlabel :				
+ 					{
+ 						$$ = NULL;
+ 					}
+ 				|  '<' '<' opt_lbltext '>' '>'
+ 					{
+ 						$$ = $3;
+ 					}
+ 				;
  opt_exitlabel	:
  					{ $$ = NULL; }
  				| T_LABEL
  					{
  					}
  				| T_WORD
  					{
***************
*** 1623,1628 ****
--- 1647,1662 ----
  						yyerror("no such label");
  					}
  				;
+ opt_lbltext :			T_LABEL
+ 					{
+ 						char * name;
+ 						plpgsql_convert_ident(yytext, &name, 1);
+ 						$$ = name;
+ 					}
+ 				| T_WORD
+ 					{
+ 						yyerror("no such label");
+ 					}
  
  opt_exitcond	: ';'
  					{ $$ = NULL; }
***************
*** 1630,1635 ****
--- 1664,1671 ----
  					{ $$ = $2; }
  				;
  
+ 
+ 
  opt_lblname		: T_WORD
  					{
  						char	*name;
***************
*** 2210,2213 ****
--- 2246,2267 ----
  	errposition(0);
  }
  
+ static void 
+ check_labels(char *lbl, char *elbl, int lno)
+ {
+ 	if (elbl)
+ 	{
+ 		if (lbl == NULL)
+ 		{
+ 			plpgsql_error_lineno = lno;
+ 			yyerror("Can't to specify end label without begin label.");
+ 		}
+ 		if (strcmp(lbl, elbl) != 0)
+ 		{
+ 			plpgsql_error_lineno = lno;
+ 			yyerror("End label is defferent block/loop label");
+ 		}
+ 	}
+ }
+ 
  #include "pl_scan.c"
diff -c -r --new-file pgsql/src/test/regress/expected/plpgsql.out pgsql.01/src/test/regress/expected/plpgsql.out
*** pgsql/src/test/regress/expected/plpgsql.out	2005-06-24 13:11:38.000000000 +0200
--- pgsql.01/src/test/regress/expected/plpgsql.out	2005-06-25 15:23:17.000000000 +0200
***************
*** 2666,2668 ****
--- 2666,2711 ----
  drop function continue_test2();
  drop function continue_test3();
  drop table conttesttbl;
+ -- verbose end block and end loop
+ create function vfoo() returns void as $$
+ <<blbl>>
+ begin
+   <<flbl1>>
+   for _i in 1 .. 10 loop
+     exit flbl1;
+   end loop <<flbl1>>;
+   <<flbl2>>
+   for _i in 1 .. 10 loop
+     exit flbl2;
+   end loop;
+ end <<blbl>>;
+ $$ language plpgsql;  
+ CREATE FUNCTION
+ create function vfoo2() returns void as $$
+ <<blbl>>
+ begin
+   for _i in 1 .. 10 loop
+     exit;
+   end loop <<flbl1>>;
+   <<flbl2>>
+   for _i in 1 .. 10 loop
+     exit flbl2;
+   end loop <<flbl3>>;
+ end <<blbl>>;
+ $$ language plpgsql;  
+ ERROR:  no such label at or near "flbl1" at character 107
+ LINE 6:   end loop <<flbl1>>;
+                      ^
+ select vfoo();
+  vfoo 
+ ------
+  
+ (1 row)
+ 
+ select fvoo2();
+ ERROR:  function fvoo2() does not exist
+ HINT:  No function matches the given name and argument types. You may need to add explicit type casts.
+ drop function vfoo();
+ DROP FUNCTION
+ drop function vfoo2();
+ ERROR:  function vfoo2() does not exist
diff -c -r --new-file pgsql/src/test/regress/sql/plpgsql.sql pgsql.01/src/test/regress/sql/plpgsql.sql
*** pgsql/src/test/regress/sql/plpgsql.sql	2005-06-24 13:11:35.000000000 +0200
--- pgsql.01/src/test/regress/sql/plpgsql.sql	2005-06-25 14:10:30.000000000 +0200
***************
*** 2232,2234 ****
--- 2232,2268 ----
  drop function continue_test2();
  drop function continue_test3();
  drop table conttesttbl;
+ 
+ -- verbose end block and end loop
+ create function vfoo() returns void as $$
+ <<blbl>>
+ begin
+   <<flbl1>>
+   for _i in 1 .. 10 loop
+     exit flbl1;
+   end loop <<flbl1>>;
+   <<flbl2>>
+   for _i in 1 .. 10 loop
+     exit flbl2;
+   end loop;
+ end <<blbl>>;
+ $$ language plpgsql;  
+ 
+ create function vfoo2() returns void as $$
+ <<blbl>>
+ begin
+   for _i in 1 .. 10 loop
+     exit;
+   end loop <<flbl1>>;
+   <<flbl2>>
+   for _i in 1 .. 10 loop
+     exit flbl2;
+   end loop <<flbl3>>;
+ end <<blbl>>;
+ $$ language plpgsql;  
+ 
+ select vfoo();
+ select fvoo2();
+ 
+ drop function vfoo();
+ drop function vfoo2();

diff -c -r --new-file pgsql.01/doc/src/sgml/plpgsql.sgml pgsql.02/doc/src/sgml/plpgsql.sgml
*** pgsql.01/doc/src/sgml/plpgsql.sgml	2005-06-25 15:29:27.000000000 +0200
--- pgsql.02/doc/src/sgml/plpgsql.sgml	2005-06-25 21:56:24.000000000 +0200
***************
*** 2116,2122 ****
      <para>
       The <replaceable>condition</replaceable> names can be any of those
       shown in <xref linkend="errcodes-appendix">.  A category name matches
!      any error within its category.
       The special condition name <literal>OTHERS</>
       matches every error type except <literal>QUERY_CANCELED</>.
       (It is possible, but often unwise, to trap
--- 2116,2124 ----
      <para>
       The <replaceable>condition</replaceable> names can be any of those
       shown in <xref linkend="errcodes-appendix">.  A category name matches
!      any error within its category. You can use exception variable as
!      condition name. Exception variable is declared with type 
!      <literal>EXCEPTION</literal>
       The special condition name <literal>OTHERS</>
       matches every error type except <literal>QUERY_CANCELED</>.
       (It is possible, but often unwise, to trap
***************
*** 2570,2576 ****
      raise errors.
  
  <synopsis>
! RAISE <replaceable class="parameter">level</replaceable> '<replaceable class="parameter">format</replaceable>' <optional>, <replaceable class="parameter">expression</replaceable> <optional>, ...</optional></optional>;
  </synopsis>
  
      Possible levels are <literal>DEBUG</literal>,
--- 2572,2579 ----
      raise errors.
  
  <synopsis>
! RAISE <replaceable class="parameter">level</replaceable> 
! <optional>system exception|exception variable</optional> '<replaceable class="parameter">format</replaceable>' <optional>, <replaceable class="parameter">expression</replaceable> <optional>, ...</optional></optional>;
  </synopsis>
  
      Possible levels are <literal>DEBUG</literal>,
***************
*** 2587,2592 ****
--- 2590,2599 ----
      variables. See <xref linkend="runtime-config"> for more
      information.
     </para>
+     
+    <para>
+    You can specify any system exception or any user exception.
+    </para>
  
     <para>
      Inside the format string, <literal>%</literal> is replaced by the
diff -c -r --new-file pgsql.01/src/pl/plpgsql/src/gram.y pgsql.02/src/pl/plpgsql/src/gram.y
*** pgsql.01/src/pl/plpgsql/src/gram.y	2005-06-25 15:21:22.000000000 +0200
--- pgsql.02/src/pl/plpgsql/src/gram.y	2005-06-25 19:57:42.000000000 +0200
***************
*** 39,44 ****
--- 39,45 ----
  #include "plpgsql.h"
  
  #include "parser/parser.h"
+ #include "utils/elog.h"
  
  static PLpgSQL_expr		*read_sql_construct(int until,
  											int until2,
***************
*** 78,83 ****
--- 79,90 ----
  		}						forvariable;
  		struct
  		{
+ 			bool nospec;
+ 			int sqlstate;
+ 			char *refname;
+ 		}						opt_excptspec;
+ 		struct
+ 		{
  			char *label;
  			int  n_initvars;
  			int  *initvarnos;
***************
*** 103,108 ****
--- 110,116 ----
  		PLpgSQL_exception_block	*exception_block;
  		PLpgSQL_nsitem			*nsitem;
  		PLpgSQL_diag_item		*diagitem;
+ 		PLpgSQL_usrexcpt		*usrexcpt;
  }
  
  %type <declhdr> decl_sect
***************
*** 115,125 ****
--- 123,135 ----
  %type <list>	decl_cursor_arglist
  %type <nsitem>	decl_aliasitem
  %type <str>		decl_stmts decl_stmt
+ %type <str>	decl_defsqlstate
  
  %type <expr>	expr_until_semi expr_until_rightbracket
  %type <expr>	expr_until_then expr_until_loop
  %type <expr>	opt_exitcond
  
+ 
  %type <ival>	assign_var cursor_variable
  %type <var>		cursor_varptr
  %type <variable>	decl_cursor_arg
***************
*** 144,150 ****
  %type <exception_block> exception_sect
  %type <exception>	proc_exception
  %type <condition>	proc_conditions
! 
  
  %type <ival>	raise_level
  %type <str>		raise_msg
--- 154,161 ----
  %type <exception_block> exception_sect
  %type <exception>	proc_exception
  %type <condition>	proc_conditions
! %type <opt_excptspec>	opt_excptspec
! %type <str>	excpt_name
  
  %type <ival>	raise_level
  %type <str>		raise_msg
***************
*** 223,228 ****
--- 234,240 ----
  %token	T_LABEL
  %token	T_WORD
  %token	T_ERROR
+ %token  T_EXCEPTION
  
  %token	O_OPTION
  %token	O_DUMP
***************
*** 332,338 ****
  						PLpgSQL_variable	*var;
  
  						var = plpgsql_build_variable($1.name, $1.lineno,
! 													 $3, true);
  						if ($2)
  						{
  							if (var->dtype == PLPGSQL_DTYPE_VAR)
--- 344,351 ----
  						PLpgSQL_variable	*var;
  
  						var = plpgsql_build_variable($1.name, $1.lineno,
! 							
! 												 $3, true);
  						if ($2)
  						{
  							if (var->dtype == PLPGSQL_DTYPE_VAR)
***************
*** 361,366 ****
--- 374,408 ----
  										 errmsg("default value for row or record variable is not supported")));
  						}
  					}
+ 				| decl_varname K_EXCEPTION decl_defsqlstate
+ 					{
+ 						PLpgSQL_usrexcpt *ue;
+ 						PLpgSQL_type *dtype;
+ 						
+ 						dtype = (PLpgSQL_type *) palloc(sizeof(PLpgSQL_type));
+         					dtype->typname = "exception";
+         					dtype->ttype = PLPGSQL_TTYPE_EXCEPTION;
+     
+ 						
+ 						ue = (PLpgSQL_usrexcpt *) plpgsql_build_variable($1.name, $1.lineno,
+ 												 dtype, true);
+ 						if ($3)
+ 						{
+ 							if (strlen($3) != 5)
+ 								yyerror("Sqlstate has five chars");
+ 
+                                                 	if (strncmp($3,"U0",2) == 0)
+                                                         	ereport(ERROR,
+                             					    (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+                             					    errmsg("Invalid class for SQLSTATE value '%s' for user's exception.", $3),
+                             					    errhint("Class 'U0' is reserved for default values user's exceptions.")));
+  							                                                        
+                                                 	ue->sqlstate = MAKE_SQLSTATE($3[0],$3[1],$3[2],$3[3],$3[4]);
+ 						} else
+ 							ue->sqlstate = plpgsql_newUsrExceptions();
+ 						
+ 						pfree(dtype);
+ 					}
  				| decl_varname K_ALIAS K_FOR decl_aliasitem ';'
  					{
  						plpgsql_ns_additem($4->itemtype,
***************
*** 563,568 ****
--- 605,626 ----
  				| K_DEFAULT
  				;
  
+ decl_defsqlstate	: ';'
+ 					{ $$ = NULL; }
+ 				| decl_defkey
+ 					{
+ 					    if (yylex() != T_STRING)
+                                                     ereport(ERROR,
+                                                         (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+                                                          errmsg("Default value for exception type have to be string constant")));
+ 					    $$ = plpgsql_get_string_value();
+ 					    if (yylex() != ';')
+ 						    yyerror("syntax error");
+ 					    
+ 					}
+ 				;
+ 				
+ 
  proc_sect		:
  					{
  						$$ = NIL;
***************
*** 1185,1191 ****
  					}
  				;
  
! stmt_raise		: K_RAISE lno raise_level raise_msg
  					{
  						PLpgSQL_stmt_raise		*new;
  						int	tok;
--- 1243,1249 ----
  					}
  				;
  
! stmt_raise		: K_RAISE lno raise_level opt_excptspec raise_msg
  					{
  						PLpgSQL_stmt_raise		*new;
  						int	tok;
***************
*** 1195,1203 ****
  						new->cmd_type	= PLPGSQL_STMT_RAISE;
  						new->lineno		= $2;
  						new->elog_level = $3;
! 						new->message	= $4;
  						new->params		= NIL;
  
  						tok = yylex();
  
  						/*
--- 1253,1273 ----
  						new->cmd_type	= PLPGSQL_STMT_RAISE;
  						new->lineno		= $2;
  						new->elog_level = $3;
! 						new->message	= $5;
  						new->params		= NIL;
  
+                                                 if ($4.nospec == false)
+                                                 {
+                                                     new->sqlstate = $4.sqlstate;
+                                                     new->refname = $4.refname;
+                                                 }
+                                                 else
+ 						{
+                                                     new->sqlstate = (new->elog_level >= ERROR)?ERRCODE_RAISE_EXCEPTION:0;
+ 						    new->refname = NULL;
+ 						}
+ 
+ 
  						tok = yylex();
  
  						/*
***************
*** 1260,1265 ****
--- 1330,1358 ----
  					}
  				;
  
+ opt_excptspec          : T_EXCEPTION
+                                         {
+                                                 $$.nospec = false;
+                                                 $$.sqlstate = yylval.usrexcpt->sqlstate;
+                                                 $$.refname = yylval.usrexcpt->refname;
+                                         }
+                         | T_WORD
+                                         {
+ 
+                                                 PLpgSQL_condition *c = plpgsql_parse_err_condition(yytext);
+                                                 if (c->sqlerrstate == 0) /* others */
+                                                         yyerror("You have to use exception's variable or system exception");
+ 
+                                                 $$.nospec = false;
+                                                 $$.sqlstate = c->sqlerrstate;
+                                                 $$.refname = c->condname;
+                                         }
+                         | /* EMPTY */
+                                         {
+                                                 $$.nospec = true;
+                                         }
+ 
+ 
  loop_body		: proc_sect lno K_END K_LOOP opt_endlabel ';'
  					{ 
  						$$.list = $1;
***************
*** 1583,1589 ****
  					}
  				;
  
! proc_conditions	: proc_conditions K_OR opt_lblname
  						{
  							PLpgSQL_condition	*old;
  
--- 1676,1682 ----
  					}
  				;
  
! proc_conditions	: proc_conditions K_OR excpt_name
  						{
  							PLpgSQL_condition	*old;
  
***************
*** 1593,1604 ****
  
  							$$ = $1;
  						}
! 				| opt_lblname
  						{
  							$$ = plpgsql_parse_err_condition($1);
  						}
  				;
  
  expr_until_semi :
  					{ $$ = plpgsql_read_expression(';', ";"); }
  				;
--- 1686,1711 ----
  
  							$$ = $1;
  						}
! 				| excpt_name
  						{
  							$$ = plpgsql_parse_err_condition($1);
  						}
  				;
  
+ excpt_name:			T_WORD	
+ 						{
+ 							char	*name;
+ 
+ 							plpgsql_convert_ident(yytext, &name, 1);
+ 							$$ = name;
+ 						}
+ 				| T_EXCEPTION
+ 						{
+ 							$$ = yylval.usrexcpt->refname;
+ 						}
+ 				;
+ 			    
+ 
  expr_until_semi :
  					{ $$ = plpgsql_read_expression(';', ";"); }
  				;
diff -c -r --new-file pgsql.01/src/pl/plpgsql/src/pl_comp.c pgsql.02/src/pl/plpgsql/src/pl_comp.c
*** pgsql.01/src/pl/plpgsql/src/pl_comp.c	2005-06-24 13:11:25.000000000 +0200
--- pgsql.02/src/pl/plpgsql/src/pl_comp.c	2005-06-25 20:03:14.000000000 +0200
***************
*** 80,85 ****
--- 80,87 ----
  bool		plpgsql_DumpExecTree = false;
  bool		plpgsql_check_syntax = false;
  
+ int     plpgsql_user_excpt;
+ 
  PLpgSQL_function *plpgsql_curr_compile;
  
  /* A context appropriate for short-term allocs during compilation */
***************
*** 315,320 ****
--- 317,324 ----
  	/* This is short-lived, so needn't allocate in function's cxt */
  	plpgsql_Datums = palloc(sizeof(PLpgSQL_datum *) * datums_alloc);
  	datums_last = 0;
+ 	
+ 	plpgsql_user_excpt = 0;
  
  	/*
  	 * Do extra syntax checks when validating the function
***************
*** 904,910 ****
  			case PLPGSQL_NSTYPE_ROW:
  				plpgsql_yylval.row = (PLpgSQL_row *) (plpgsql_Datums[nse->itemno]);
  				return T_ROW;
! 
  			default:
  				return T_ERROR;
  		}
--- 908,918 ----
  			case PLPGSQL_NSTYPE_ROW:
  				plpgsql_yylval.row = (PLpgSQL_row *) (plpgsql_Datums[nse->itemno]);
  				return T_ROW;
! 				
! 			case PLPGSQL_NSTYPE_EXCEPTION:
! 				plpgsql_yylval.usrexcpt = (PLpgSQL_usrexcpt *) (plpgsql_Datums[nse->itemno]);
! 				return T_EXCEPTION;
! 				
  			default:
  				return T_ERROR;
  		}
***************
*** 1626,1631 ****
--- 1634,1658 ----
  				result = (PLpgSQL_variable *) rec;
  				break;
  			}
+                 case PLPGSQL_TTYPE_EXCEPTION:
+                         {
+                             /* Exception pseudo type */
+                             PLpgSQL_usrexcpt *excpt;
+ 
+                             excpt = palloc0(sizeof(PLpgSQL_usrexcpt));
+                             excpt->dtype = PLPGSQL_DTYPE_EXCEPTION;
+                             excpt->refname = pstrdup(refname);
+                             excpt->lineno = lineno;
+ 
+                             plpgsql_adddatum((PLpgSQL_datum *) excpt);
+                             if (add2namespace)
+                                     plpgsql_ns_additem(PLPGSQL_NSTYPE_EXCEPTION,
+                                                                     excpt->eno,
+                                                                     refname);
+                             result = (PLpgSQL_variable *) excpt;
+                             break;
+                         }
+ 
  		case PLPGSQL_TTYPE_PSEUDO:
  			ereport(ERROR,
  					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
***************
*** 1893,1898 ****
--- 1920,1928 ----
  	PLpgSQL_condition *new;
  	PLpgSQL_condition *prev;
  
+         PLpgSQL_nsitem *nse;
+         char       *cp[1];
+ 
  	/*
  	 * XXX Eventually we will want to look for user-defined exception
  	 * names here.
***************
*** 1924,1929 ****
--- 1954,1986 ----
  		}
  	}
  
+         if (!prev)
+         {
+             /* Do case conversion and word separation */
+             plpgsql_convert_ident(condname, cp, 1);
+ 
+             /*
+             * Do a lookup on the compiler's namestack
+             */
+             nse = plpgsql_ns_lookup(cp[0], NULL);
+ 
+             if (nse != NULL)
+             {
+                 PLpgSQL_usrexcpt *excpt = (PLpgSQL_usrexcpt *) (plpgsql_Datums[nse->itemno]);
+                 if (nse->itemtype == PLPGSQL_NSTYPE_EXCEPTION)
+                 {
+                     new = palloc(sizeof(PLpgSQL_condition));
+                     new->sqlerrstate = excpt->sqlstate;
+                     new->condname = condname;
+                     new->next = prev;
+                     prev = new;
+                 }
+             }
+             pfree(cp[0]);
+         }
+ 
+ 
+ 
  	if (!prev)
  		ereport(ERROR,
  				(errcode(ERRCODE_UNDEFINED_OBJECT),
***************
*** 2177,2179 ****
--- 2234,2251 ----
  	if (hentry == NULL)
  		elog(WARNING, "trying to delete function that does not exist");
  }
+ 
+ #define MAX_USER_EXCPT 999
+ 
+ int
+ plpgsql_newUsrExceptions(void)
+ {
+     char rs[4];
+ 
+     if (plpgsql_user_excpt == MAX_USER_EXCPT)
+             ereport(ERROR,
+                                 (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+                                  errmsg("Too much user's exception")));
+     sprintf(rs,"%03d", ++plpgsql_user_excpt);
+     return MAKE_SQLSTATE('U','0', rs[0],rs[1],rs[2]);
+ }
diff -c -r --new-file pgsql.01/src/pl/plpgsql/src/pl_exec.c pgsql.02/src/pl/plpgsql/src/pl_exec.c
*** pgsql.01/src/pl/plpgsql/src/pl_exec.c	2005-06-24 13:11:25.000000000 +0200
--- pgsql.02/src/pl/plpgsql/src/pl_exec.c	2005-06-25 19:36:02.000000000 +0200
***************
*** 722,727 ****
--- 722,730 ----
  			 */
  			result = datum;
  			break;
+ 		case PLPGSQL_DTYPE_EXCEPTION:
+ 			result = NULL;
+ 			break;
  
  		default:
  			elog(ERROR, "unrecognized dtype: %d", datum->dtype);
***************
*** 825,830 ****
--- 828,834 ----
  
  			case PLPGSQL_DTYPE_RECFIELD:
  			case PLPGSQL_DTYPE_ARRAYELEM:
+ 			case PLPGSQL_DTYPE_EXCEPTION:
  				break;
  
  			default:
***************
*** 2061,2069 ****
  	 */
  	estate->err_text = raise_skip_msg;	/* suppress traceback of raise */
  
! 	ereport(stmt->elog_level,
! 	 ((stmt->elog_level >= ERROR) ? errcode(ERRCODE_RAISE_EXCEPTION) : 0,
! 	  errmsg_internal("%s", plpgsql_dstring_get(&ds))));
  
  	estate->err_text = NULL;	/* un-suppress... */
  
--- 2065,2081 ----
  	 */
  	estate->err_text = raise_skip_msg;	/* suppress traceback of raise */
  
! 
!         if (stmt->refname != NULL)
!             ereport(stmt->elog_level,           /* User's exception */
!                 (errcode(stmt->sqlstate),
!                  errdetail("User's exception/notice - sqlstate: '%s', name: '%s'", unpack_sql_state(stmt->sqlstate), stmt->refname),
! 		 errhint("from RAISE stmt on line %d", stmt->lineno),
!                     errmsg_internal("%s", plpgsql_dstring_get(&ds))));
!         else
!             ereport(stmt->elog_level,
!                 (errcode(stmt->sqlstate), 
!                     errmsg_internal("%s", plpgsql_dstring_get(&ds))));
  
  	estate->err_text = NULL;	/* un-suppress... */
  
diff -c -r --new-file pgsql.01/src/pl/plpgsql/src/plpgsql.h pgsql.02/src/pl/plpgsql/src/plpgsql.h
*** pgsql.01/src/pl/plpgsql/src/plpgsql.h	2005-06-24 13:11:25.000000000 +0200
--- pgsql.02/src/pl/plpgsql/src/plpgsql.h	2005-06-25 19:27:28.000000000 +0200
***************
*** 58,64 ****
  	PLPGSQL_NSTYPE_LABEL,
  	PLPGSQL_NSTYPE_VAR,
  	PLPGSQL_NSTYPE_ROW,
! 	PLPGSQL_NSTYPE_REC
  };
  
  /* ----------
--- 58,65 ----
  	PLPGSQL_NSTYPE_LABEL,
  	PLPGSQL_NSTYPE_VAR,
  	PLPGSQL_NSTYPE_ROW,
! 	PLPGSQL_NSTYPE_REC,
! 	PLPGSQL_NSTYPE_EXCEPTION
  };
  
  /* ----------
***************
*** 73,79 ****
  	PLPGSQL_DTYPE_RECFIELD,
  	PLPGSQL_DTYPE_ARRAYELEM,
  	PLPGSQL_DTYPE_EXPR,
! 	PLPGSQL_DTYPE_TRIGARG
  };
  
  /* ----------
--- 74,81 ----
  	PLPGSQL_DTYPE_RECFIELD,
  	PLPGSQL_DTYPE_ARRAYELEM,
  	PLPGSQL_DTYPE_EXPR,
! 	PLPGSQL_DTYPE_TRIGARG,
! 	PLPGSQL_DTYPE_EXCEPTION
  };
  
  /* ----------
***************
*** 85,91 ****
  	PLPGSQL_TTYPE_SCALAR,		/* scalar types and domains */
  	PLPGSQL_TTYPE_ROW,			/* composite types */
  	PLPGSQL_TTYPE_REC,			/* RECORD pseudotype */
! 	PLPGSQL_TTYPE_PSEUDO		/* other pseudotypes */
  };
  
  /* ----------
--- 87,94 ----
  	PLPGSQL_TTYPE_SCALAR,		/* scalar types and domains */
  	PLPGSQL_TTYPE_ROW,			/* composite types */
  	PLPGSQL_TTYPE_REC,			/* RECORD pseudotype */
! 	PLPGSQL_TTYPE_PSEUDO,		/* other pseudotypes */
! 	PLPGSQL_TTYPE_EXCEPTION
  };
  
  /* ----------
***************
*** 190,195 ****
--- 193,207 ----
  	int			lineno;
  } PLpgSQL_variable;
  
+ typedef struct
+ {
+ 	int			dtype;				/* Exception variable */
+ 	int			eno;
+ 	char 	*refname;
+ 	int 	lineno;
+ 	int	sqlstate;
+ } PLpgSQL_usrexcpt;
+ 
  typedef struct PLpgSQL_expr
  {								/* SQL Query to plan and execute	*/
  	int			dtype;
***************
*** 516,521 ****
--- 528,535 ----
  	int			cmd_type;
  	int			lineno;
  	int			elog_level;
+ 	int			sqlstate;
+ 	char	   *refname;
  	char	   *message;
  	List	   *params;			/* list of expressions */
  } PLpgSQL_stmt_raise;
***************
*** 688,693 ****
--- 702,709 ----
  extern int	plpgsql_add_initdatums(int **varnos);
  extern void plpgsql_HashTableInit(void);
  extern void plpgsql_compile_error_callback(void *arg);
+ extern int plpgsql_newUsrExceptions(void);
+ 
  
  /* ----------
   * Functions in pl_handler.c
diff -c -r --new-file pgsql.01/src/test/regress/expected/plpgsql.out pgsql.02/src/test/regress/expected/plpgsql.out
*** pgsql.01/src/test/regress/expected/plpgsql.out	2005-06-25 15:23:17.000000000 +0200
--- pgsql.02/src/test/regress/expected/plpgsql.out	2005-06-25 20:34:05.000000000 +0200
***************
*** 2709,2711 ****
--- 2709,2770 ----
  DROP FUNCTION
  drop function vfoo2();
  ERROR:  function vfoo2() does not exist
+ 
+ -- user's exception
+ create function innerfx() returns integer as $$
+ declare my_excpt exception = 'U0001';
+ begin -- using msgtext as one param of exception
+   raise exception my_excpt '%', CURRENT_TIMESTAMP;
+   return 1;
+ end $$ language plpgsql;
+ ERROR:  Invalid class for SQLSTATE value 'U0001' for user's exception.
+ HINT:  Class 'U0' is reserved for default values user's exceptions.
+ CONTEXT:  compile of PL/pgSQL function "innerfx" near line 1
+ create function innerfx() returns integer as $$
+ declare my_excpt exception = 'U1001';
+ begin -- using msgtext as one param of exception
+   raise exception my_excpt '%', 100.34::numeric;
+   return 1;
+ end $$ language plpgsql;
+ CREATE FUNCTION
+ create function outerfx() returns integer as $$
+ declare 
+   my_excpt exception = 'U1001';
+   alias_div_by_zero exception = '22012';
+   my_excpt_def_sqlstate exception;
+ begin
+   begin
+     raise exception my_excpt_def_sqlstate 'foo';
+   exception when my_excpt_def_sqlstate then
+     raise notice '01 catch: %, %', sqlstate, sqlerrm;
+   end;
+   begin
+     raise notice '%', innerfx();
+   exception when my_excpt then
+     raise notice '02 catch: %, %', sqlstate, sqlerrm::numeric;
+   end;
+   begin
+     raise exception alias_div_by_zero 'testing';
+   exception when division_by_zero then
+     raise notice 'Divison by zero: %, %', sqlstate, sqlerrm;
+   end;
+   return 1;
+ end; $$ language plpgsql;
+ CREATE FUNCTION
+ select innerfx();
+ ERROR:  100.34
+ DETAIL:  User's exception/notice - sqlstate: 'U1001', name: 'my_excpt'
+ HINT:  from RAISE stmt on line 3
+ select outerfx();
+ NOTICE:  01 catch: U0001, foo
+ NOTICE:  02 catch: U1001, 100.34
+ NOTICE:  Divison by zero: 22012, testing
+  outerfx 
+ ---------
+        1
+ (1 row)
+ 
+ drop function outerfx();
+ DROP FUNCTION
+ drop function innerfx();
+ DROP FUNCTION
diff -c -r --new-file pgsql.01/src/test/regress/sql/plpgsql.sql pgsql.02/src/test/regress/sql/plpgsql.sql
*** pgsql.01/src/test/regress/sql/plpgsql.sql	2005-06-25 14:10:30.000000000 +0200
--- pgsql.02/src/test/regress/sql/plpgsql.sql	2005-06-25 20:32:59.000000000 +0200
***************
*** 2266,2268 ****
--- 2266,2314 ----
  
  drop function vfoo();
  drop function vfoo2();
+ 
+ -- user's exception
+ create function innerfx() returns integer as $$
+ declare my_excpt exception = 'U0001';
+ begin -- using msgtext as one param of exception
+   raise exception my_excpt '%', CURRENT_TIMESTAMP;
+   return 1;
+ end $$ language plpgsql;
+ 
+ 
+ create function innerfx() returns integer as $$
+ declare my_excpt exception = 'U1001';
+ begin -- using msgtext as one param of exception
+   raise exception my_excpt '%', 100.34::numeric;
+   return 1;
+ end $$ language plpgsql;
+ 
+ create function outerfx() returns integer as $$
+ declare 
+   my_excpt exception = 'U1001';
+   alias_div_by_zero exception = '22012';
+   my_excpt_def_sqlstate exception;
+ begin
+   begin
+     raise exception my_excpt_def_sqlstate 'foo';
+   exception when my_excpt_def_sqlstate then
+     raise notice '01 catch: %, %', sqlstate, sqlerrm;
+   end;
+   begin
+     raise notice '%', innerfx();
+   exception when my_excpt then
+     raise notice '02 catch: %, %', sqlstate, sqlerrm::numeric;
+   end;
+   begin
+     raise exception alias_div_by_zero 'testing';
+   exception when division_by_zero then
+     raise notice 'Divison by zero: %, %', sqlstate, sqlerrm;
+   end;
+   return 1;
+ end; $$ language plpgsql;
+ 
+ select innerfx();
+ select outerfx();
+ 
+ drop function outerfx();
+ drop function innerfx();

Index: doc/src/sgml/plpgsql.sgml
===================================================================
RCS file: /Users/neilc/local/cvs/pgsql/doc/src/sgml/plpgsql.sgml,v
retrieving revision 1.74
diff -c -r1.74 plpgsql.sgml
*** doc/src/sgml/plpgsql.sgml	22 Jun 2005 01:35:02 -0000	1.74
--- doc/src/sgml/plpgsql.sgml	1 Jul 2005 11:43:36 -0000
***************
*** 456,462 ****
      <replaceable>declarations</replaceable> </optional>
  BEGIN
      <replaceable>statements</replaceable>
! END;
  </synopsis>
      </para>
  
--- 456,462 ----
      <replaceable>declarations</replaceable> </optional>
  BEGIN
      <replaceable>statements</replaceable>
! END <optional> <replaceable>label</replaceable> </optional>;
  </synopsis>
      </para>
  
***************
*** 1789,1806 ****
       <title><literal>LOOP</></title>
  
  <synopsis>
! <optional>&lt;&lt;<replaceable>label</replaceable>&gt;&gt;</optional>
  LOOP
      <replaceable>statements</replaceable>
! END LOOP;
  </synopsis>
  
       <para>
!       <literal>LOOP</> defines an unconditional loop that is repeated indefinitely
!       until terminated by an <literal>EXIT</> or <command>RETURN</command>
!       statement.  The optional label can be used by <literal>EXIT</> statements in
!       nested loops to specify which level of nesting should be
!       terminated.
       </para>
      </sect3>
  
--- 1789,1807 ----
       <title><literal>LOOP</></title>
  
  <synopsis>
! <optional> &lt;&lt;<replaceable>label</replaceable>&gt;&gt; </optional>
  LOOP
      <replaceable>statements</replaceable>
! END LOOP <optional> <replaceable>label</replaceable> </optional>;
  </synopsis>
  
       <para>
!       <literal>LOOP</> defines an unconditional loop that is repeated
!       indefinitely until terminated by an <literal>EXIT</> or
!       <command>RETURN</command> statement.  The optional
!       <replaceable>label</replaceable> can be used by <literal>EXIT</>
!       and <literal>CONTINUE</literal> statements in nested loops to
!       specify which loop the statement should be applied to.
       </para>
      </sect3>
  
***************
*** 1920,1929 ****
       </indexterm>
  
  <synopsis>
! <optional>&lt;&lt;<replaceable>label</replaceable>&gt;&gt;</optional>
  WHILE <replaceable>expression</replaceable> LOOP
      <replaceable>statements</replaceable>
! END LOOP;
  </synopsis>
  
         <para>
--- 1921,1930 ----
       </indexterm>
  
  <synopsis>
! <optional> &lt;&lt;<replaceable>label</replaceable>&gt;&gt; </optional>
  WHILE <replaceable>expression</replaceable> LOOP
      <replaceable>statements</replaceable>
! END LOOP <optional> <replaceable>label</replaceable> </optional>;
  </synopsis>
  
         <para>
***************
*** 1951,1960 ****
        <title><literal>FOR</> (integer variant)</title>
  
  <synopsis>
! <optional>&lt;&lt;<replaceable>label</replaceable>&gt;&gt;</optional>
  FOR <replaceable>name</replaceable> IN <optional> REVERSE </optional> <replaceable>expression</replaceable> .. <replaceable>expression</replaceable> LOOP
      <replaceable>statements</replaceable>
! END LOOP;
  </synopsis>
  
         <para>
--- 1952,1961 ----
        <title><literal>FOR</> (integer variant)</title>
  
  <synopsis>
! <optional> &lt;&lt;<replaceable>label</replaceable>&gt;&gt; </optional>
  FOR <replaceable>name</replaceable> IN <optional> REVERSE </optional> <replaceable>expression</replaceable> .. <replaceable>expression</replaceable> LOOP
      <replaceable>statements</replaceable>
! END LOOP <optional> <replaceable>labal</replaceable> </optional>;
  </synopsis>
  
         <para>
***************
*** 1997,2006 ****
       the results of a query and manipulate that data
       accordingly. The syntax is:
  <synopsis>
! <optional>&lt;&lt;<replaceable>label</replaceable>&gt;&gt;</optional>
  FOR <replaceable>record_or_row</replaceable> IN <replaceable>query</replaceable> LOOP
      <replaceable>statements</replaceable>
! END LOOP;
  </synopsis>
       The record or row variable is successively assigned each row
       resulting from the <replaceable>query</replaceable> (which must be a
--- 1998,2007 ----
       the results of a query and manipulate that data
       accordingly. The syntax is:
  <synopsis>
! <optional> &lt;&lt;<replaceable>label</replaceable>&gt;&gt; </optional>
  FOR <replaceable>record_or_row</replaceable> IN <replaceable>query</replaceable> LOOP
      <replaceable>statements</replaceable>
! END LOOP <optional> <replaceable>label</replaceable> </optional>;
  </synopsis>
       The record or row variable is successively assigned each row
       resulting from the <replaceable>query</replaceable> (which must be a
***************
*** 2036,2045 ****
       The <literal>FOR-IN-EXECUTE</> statement is another way to iterate over
       rows:
  <synopsis>
! <optional>&lt;&lt;<replaceable>label</replaceable>&gt;&gt;</optional>
  FOR <replaceable>record_or_row</replaceable> IN EXECUTE <replaceable>text_expression</replaceable> LOOP 
      <replaceable>statements</replaceable>
! END LOOP;
  </synopsis>
       This is like the previous form, except that the source
       <command>SELECT</command> statement is specified as a string
--- 2037,2046 ----
       The <literal>FOR-IN-EXECUTE</> statement is another way to iterate over
       rows:
  <synopsis>
! <optional> &lt;&lt;<replaceable>label</replaceable>&gt;&gt; </optional>
  FOR <replaceable>record_or_row</replaceable> IN EXECUTE <replaceable>text_expression</replaceable> LOOP 
      <replaceable>statements</replaceable>
! END LOOP <optional> <replaceable>label</replaceable> </optional>;
  </synopsis>
       This is like the previous form, except that the source
       <command>SELECT</command> statement is specified as a string
Index: src/pl/plpgsql/src/gram.y
===================================================================
RCS file: /Users/neilc/local/cvs/pgsql/src/pl/plpgsql/src/gram.y,v
retrieving revision 1.77
diff -c -r1.77 gram.y
*** src/pl/plpgsql/src/gram.y	22 Jun 2005 01:35:02 -0000	1.77
--- src/pl/plpgsql/src/gram.y	1 Jul 2005 12:08:45 -0000
***************
*** 56,61 ****
--- 56,63 ----
  											   PLpgSQL_datum *initial_datum);
  static	void			 check_sql_expr(const char *stmt);
  static	void			 plpgsql_sql_error_callback(void *arg);
+ static	void			 check_labels(const char *start_label,
+ 									  const char *end_label);
  
  %}
  
***************
*** 69,75 ****
  			int  lineno;
  		}						varname;
  		struct
! 		{    
  			char *name;
  			int  lineno;
  			PLpgSQL_rec     *rec;
--- 71,77 ----
  			int  lineno;
  		}						varname;
  		struct
! 		{
  			char *name;
  			int  lineno;
  			PLpgSQL_rec     *rec;
***************
*** 81,86 ****
--- 83,93 ----
  			int  n_initvars;
  			int  *initvarnos;
  		}						declhdr;
+ 		struct
+ 		{
+ 			char *end_label;
+ 			List *stmts;
+ 		}						loop_body;
  		List					*list;
  		PLpgSQL_type			*dtype;
  		PLpgSQL_datum			*scalar;	/* a VAR, RECFIELD, or TRIGARG */
***************
*** 119,129 ****
  %type <forvariable>	for_variable
  %type <stmt>	for_control
  
! %type <str>		opt_lblname opt_label
! %type <str>		opt_exitlabel
  %type <str>		execsql_start
  
! %type <list>	proc_sect proc_stmts stmt_else loop_body
  %type <stmt>	proc_stmt pl_block
  %type <stmt>	stmt_assign stmt_if stmt_loop stmt_while stmt_exit
  %type <stmt>	stmt_return stmt_return_next stmt_raise stmt_execsql
--- 126,136 ----
  %type <forvariable>	for_variable
  %type <stmt>	for_control
  
! %type <str>		opt_lblname opt_block_label opt_label
  %type <str>		execsql_start
  
! %type <list>	proc_sect proc_stmts stmt_else
! %type <loop_body>	loop_body
  %type <stmt>	proc_stmt pl_block
  %type <stmt>	stmt_assign stmt_if stmt_loop stmt_while stmt_exit
  %type <stmt>	stmt_return stmt_return_next stmt_raise stmt_execsql
***************
*** 248,257 ****
  				| ';'
  				;
  
! pl_block		: decl_sect K_BEGIN lno proc_sect exception_sect K_END
  					{
  						PLpgSQL_stmt_block *new;
  
  						new = palloc0(sizeof(PLpgSQL_stmt_block));
  
  						new->cmd_type	= PLPGSQL_STMT_BLOCK;
--- 255,266 ----
  				| ';'
  				;
  
! pl_block		: decl_sect K_BEGIN lno proc_sect exception_sect K_END opt_label
  					{
  						PLpgSQL_stmt_block *new;
  
+ 						check_labels($1.label, $7);
+ 
  						new = palloc0(sizeof(PLpgSQL_stmt_block));
  
  						new->cmd_type	= PLPGSQL_STMT_BLOCK;
***************
*** 269,275 ****
  				;
  
  
! decl_sect		: opt_label
  					{
  						plpgsql_ns_setlocal(false);
  						$$.label	  = $1;
--- 278,284 ----
  				;
  
  
! decl_sect		: opt_block_label
  					{
  						plpgsql_ns_setlocal(false);
  						$$.label	  = $1;
***************
*** 277,283 ****
  						$$.initvarnos = NULL;
  						plpgsql_add_initdatums(NULL);
  					}
! 				| opt_label decl_start
  					{
  						plpgsql_ns_setlocal(false);
  						$$.label	  = $1;
--- 286,292 ----
  						$$.initvarnos = NULL;
  						plpgsql_add_initdatums(NULL);
  					}
! 				| opt_block_label decl_start
  					{
  						plpgsql_ns_setlocal(false);
  						$$.label	  = $1;
***************
*** 285,291 ****
  						$$.initvarnos = NULL;
  						plpgsql_add_initdatums(NULL);
  					}
! 				| opt_label decl_start decl_stmts
  					{
  						plpgsql_ns_setlocal(false);
  						if ($3 != NULL)
--- 294,300 ----
  						$$.initvarnos = NULL;
  						plpgsql_add_initdatums(NULL);
  					}
! 				| opt_block_label decl_start decl_stmts
  					{
  						plpgsql_ns_setlocal(false);
  						if ($3 != NULL)
***************
*** 409,415 ****
  						plpgsql_ns_setlocal(false);
  						query = read_sql_stmt("");
  						plpgsql_ns_setlocal(true);
! 						
  						$$ = query;
  					}
  				;
--- 418,424 ----
  						plpgsql_ns_setlocal(false);
  						query = read_sql_stmt("");
  						plpgsql_ns_setlocal(true);
! 
  						$$ = query;
  					}
  				;
***************
*** 757,763 ****
  						 *	 ...							   ...
  						 * ELSE							   ELSE
  						 *	 ...							   ...
! 						 * END IF						   END IF			 
  						 *							   END IF
  						 */
  						PLpgSQL_stmt_if *new_if;
--- 766,772 ----
  						 *	 ...							   ...
  						 * ELSE							   ELSE
  						 *	 ...							   ...
! 						 * END IF						   END IF
  						 *							   END IF
  						 */
  						PLpgSQL_stmt_if *new_if;
***************
*** 776,786 ****
  
  				| K_ELSE proc_sect
  					{
! 						$$ = $2;				
  					}
  				;
  
! stmt_loop		: opt_label K_LOOP lno loop_body
  					{
  						PLpgSQL_stmt_loop *new;
  
--- 785,795 ----
  
  				| K_ELSE proc_sect
  					{
! 						$$ = $2;
  					}
  				;
  
! stmt_loop		: opt_block_label K_LOOP lno loop_body
  					{
  						PLpgSQL_stmt_loop *new;
  
***************
*** 788,802 ****
  						new->cmd_type = PLPGSQL_STMT_LOOP;
  						new->lineno   = $3;
  						new->label	  = $1;
! 						new->body	  = $4;
  
  						plpgsql_ns_pop();
  
  						$$ = (PLpgSQL_stmt *)new;
  					}
  				;
  
! stmt_while		: opt_label K_WHILE lno expr_until_loop loop_body
  					{
  						PLpgSQL_stmt_while *new;
  
--- 797,812 ----
  						new->cmd_type = PLPGSQL_STMT_LOOP;
  						new->lineno   = $3;
  						new->label	  = $1;
! 						new->body	  = $4.stmts;
  
+ 						check_labels($1, $4.end_label);
  						plpgsql_ns_pop();
  
  						$$ = (PLpgSQL_stmt *)new;
  					}
  				;
  
! stmt_while		: opt_block_label K_WHILE lno expr_until_loop loop_body
  					{
  						PLpgSQL_stmt_while *new;
  
***************
*** 805,819 ****
  						new->lineno   = $3;
  						new->label	  = $1;
  						new->cond	  = $4;
! 						new->body	  = $5;
  
  						plpgsql_ns_pop();
  
  						$$ = (PLpgSQL_stmt *)new;
  					}
  				;
  
! stmt_for		: opt_label K_FOR for_control loop_body
  					{
  						/* This runs after we've scanned the loop body */
  						if ($3->cmd_type == PLPGSQL_STMT_FORI)
--- 815,830 ----
  						new->lineno   = $3;
  						new->label	  = $1;
  						new->cond	  = $4;
! 						new->body	  = $5.stmts;
  
+ 						check_labels($1, $5.end_label);
  						plpgsql_ns_pop();
  
  						$$ = (PLpgSQL_stmt *)new;
  					}
  				;
  
! stmt_for		: opt_block_label K_FOR for_control loop_body
  					{
  						/* This runs after we've scanned the loop body */
  						if ($3->cmd_type == PLPGSQL_STMT_FORI)
***************
*** 822,828 ****
  
  							new = (PLpgSQL_stmt_fori *) $3;
  							new->label	  = $1;
! 							new->body	  = $4;
  							$$ = (PLpgSQL_stmt *) new;
  						}
  						else if ($3->cmd_type == PLPGSQL_STMT_FORS)
--- 833,839 ----
  
  							new = (PLpgSQL_stmt_fori *) $3;
  							new->label	  = $1;
! 							new->body	  = $4.stmts;
  							$$ = (PLpgSQL_stmt *) new;
  						}
  						else if ($3->cmd_type == PLPGSQL_STMT_FORS)
***************
*** 831,837 ****
  
  							new = (PLpgSQL_stmt_fors *) $3;
  							new->label	  = $1;
! 							new->body	  = $4;
  							$$ = (PLpgSQL_stmt *) new;
  						}
  						else
--- 842,848 ----
  
  							new = (PLpgSQL_stmt_fors *) $3;
  							new->label	  = $1;
! 							new->body	  = $4.stmts;
  							$$ = (PLpgSQL_stmt *) new;
  						}
  						else
***************
*** 841,850 ****
  							Assert($3->cmd_type == PLPGSQL_STMT_DYNFORS);
  							new = (PLpgSQL_stmt_dynfors *) $3;
  							new->label	  = $1;
! 							new->body	  = $4;
  							$$ = (PLpgSQL_stmt *) new;
  						}
  
  						/* close namespace started in opt_label */
  						plpgsql_ns_pop();
  					}
--- 852,862 ----
  							Assert($3->cmd_type == PLPGSQL_STMT_DYNFORS);
  							new = (PLpgSQL_stmt_dynfors *) $3;
  							new->label	  = $1;
! 							new->body	  = $4.stmts;
  							$$ = (PLpgSQL_stmt *) new;
  						}
  
+ 						check_labels($1, $4.end_label);
  						/* close namespace started in opt_label */
  						plpgsql_ns_pop();
  					}
***************
*** 1037,1043 ****
  					}
  				;
  
! stmt_exit		: exit_type lno opt_exitlabel opt_exitcond
  					{
  						PLpgSQL_stmt_exit *new;
  
--- 1049,1055 ----
  					}
  				;
  
! stmt_exit		: exit_type lno opt_label opt_exitcond
  					{
  						PLpgSQL_stmt_exit *new;
  
***************
*** 1245,1252 ****
  					}
  				;
  
! loop_body		: proc_sect K_END K_LOOP ';'
! 					{ $$ = $1; }
  				;
  
  stmt_execsql	: execsql_start lno
--- 1257,1267 ----
  					}
  				;
  
! loop_body		: proc_sect K_END K_LOOP opt_label ';'
! 					{
! 						$$.stmts = $1;
! 						$$.end_label = $4;
! 					}
  				;
  
  stmt_execsql	: execsql_start lno
***************
*** 1262,1268 ****
  					}
  				;
  
! stmt_dynexecute : K_EXECUTE lno 
  					{
  						PLpgSQL_stmt_dynexecute *new;
  						PLpgSQL_expr *expr;
--- 1277,1283 ----
  					}
  				;
  
! stmt_dynexecute : K_EXECUTE lno
  					{
  						PLpgSQL_stmt_dynexecute *new;
  						PLpgSQL_expr *expr;
***************
*** 1418,1424 ****
  											 errmsg("cursor \"%s\" has no arguments",
  													$3->refname)));
  								}
! 								
  								if (tok != ';')
  								{
  									plpgsql_error_lineno = plpgsql_scanner_lineno();
--- 1433,1439 ----
  											 errmsg("cursor \"%s\" has no arguments",
  													$3->refname)));
  								}
! 
  								if (tok != ';')
  								{
  									plpgsql_error_lineno = plpgsql_scanner_lineno();
***************
*** 1596,1602 ****
  					{ $$ = plpgsql_read_expression(K_LOOP, "LOOP"); }
  				;
  
! opt_label		:
  					{
  						plpgsql_ns_push(NULL);
  						$$ = NULL;
--- 1611,1617 ----
  					{ $$ = plpgsql_read_expression(K_LOOP, "LOOP"); }
  				;
  
! opt_block_label	:
  					{
  						plpgsql_ns_push(NULL);
  						$$ = NULL;
***************
*** 1608,1621 ****
  					}
  				;
  
! opt_exitlabel	:
! 					{ $$ = NULL; }
  				| T_LABEL
  					{
! 						char	*name;
! 
! 						plpgsql_convert_ident(yytext, &name, 1);
! 						$$ = name;
  					}
  				| T_WORD
  					{
--- 1623,1637 ----
  					}
  				;
  
! opt_label	:
! 					{
! 						$$ = NULL;
! 					}
  				| T_LABEL
  					{
! 						char *label_name;
! 						plpgsql_convert_ident(yytext, &label_name, 1);
! 						$$ = label_name;
  					}
  				| T_WORD
  					{
***************
*** 2210,2213 ****
--- 2226,2254 ----
  	errposition(0);
  }
  
+ static void
+ check_labels(const char *start_label, const char *end_label)
+ {
+ 	if (end_label)
+ 	{
+ 		if (!start_label)
+ 		{
+ 			plpgsql_error_lineno = plpgsql_scanner_lineno();
+ 			ereport(ERROR,
+ 					(errcode(ERRCODE_SYNTAX_ERROR),
+ 					 errmsg("end label \"%s\" specified for unlabelled block",
+ 							end_label)));
+ 		}
+ 
+ 		if (strcmp(start_label, end_label) != 0)
+ 		{
+ 			plpgsql_error_lineno = plpgsql_scanner_lineno();
+ 			ereport(ERROR,
+ 					(errcode(ERRCODE_SYNTAX_ERROR),
+ 					 errmsg("end label \"%s\" differs from block's label \"%s\"",
+ 							end_label, start_label)));
+ 		}
+ 	}
+ }
+ 
  #include "pl_scan.c"
Index: src/test/regress/expected/plpgsql.out
===================================================================
RCS file: /Users/neilc/local/cvs/pgsql/src/test/regress/expected/plpgsql.out,v
retrieving revision 1.36
diff -c -r1.36 plpgsql.out
*** src/test/regress/expected/plpgsql.out	22 Jun 2005 07:28:47 -0000	1.36
--- src/test/regress/expected/plpgsql.out	1 Jul 2005 11:53:55 -0000
***************
*** 2491,2497 ****
  (1 row)
  
  drop function raise_exprs();
! -- continue statement 
  create table conttesttbl(idx serial, v integer);
  NOTICE:  CREATE TABLE will create implicit sequence "conttesttbl_idx_seq" for serial column "conttesttbl.idx"
  insert into conttesttbl(v) values(10);
--- 2491,2497 ----
  (1 row)
  
  drop function raise_exprs();
! -- continue statement
  create table conttesttbl(idx serial, v integer);
  NOTICE:  CREATE TABLE will create implicit sequence "conttesttbl_idx_seq" for serial column "conttesttbl.idx"
  insert into conttesttbl(v) values(10);
***************
*** 2532,2538 ****
    for _i in 1..10 loop
      begin
        -- applies to outer loop, not the nested begin block
!       continue when _i < 5; 
        raise notice '%', _i;
      end;
    end loop;
--- 2532,2538 ----
    for _i in 1..10 loop
      begin
        -- applies to outer loop, not the nested begin block
!       continue when _i < 5;
        raise notice '%', _i;
      end;
    end loop;
***************
*** 2666,2668 ****
--- 2666,2723 ----
  drop function continue_test2();
  drop function continue_test3();
  drop table conttesttbl;
+ -- verbose end block and end loop
+ create function end_label1() returns void as $$
+ <<blbl>>
+ begin
+   <<flbl1>>
+   for _i in 1 .. 10 loop
+     exit flbl1;
+   end loop flbl1;
+   <<flbl2>>
+   for _i in 1 .. 10 loop
+     exit flbl2;
+   end loop;
+ end blbl;
+ $$ language plpgsql;
+ select end_label1();
+  end_label1 
+ ------------
+  
+ (1 row)
+ 
+ drop function end_label1();
+ -- should fail: undefined end label
+ create function end_label2() returns void as $$
+ begin
+   for _i in 1 .. 10 loop
+     exit;
+   end loop flbl1;
+ end;
+ $$ language plpgsql;
+ ERROR:  no such label at or near "flbl1" at character 101
+ LINE 5:   end loop flbl1;
+                    ^
+ -- should fail: end label does not match start label
+ create function end_label3() returns void as $$
+ <<outer_label>>
+ begin
+   <<inner_label>>
+   for _i in 1 .. 10 loop
+     exit;
+   end loop outer_label;
+ end;
+ $$ language plpgsql;
+ ERROR:  end label "outer_label" differs from block's label "inner_label"
+ CONTEXT:  compile of PL/pgSQL function "end_label3" near line 6
+ -- should fail: end label on a block without a start label
+ create function end_label4() returns void as $$
+ <<outer_label>>
+ begin
+   for _i in 1 .. 10 loop
+     exit;
+   end loop outer_label;
+ end;
+ $$ language plpgsql;
+ ERROR:  end label "outer_label" specified for unlabelled block
+ CONTEXT:  compile of PL/pgSQL function "end_label4" near line 5
Index: src/test/regress/sql/plpgsql.sql
===================================================================
RCS file: /Users/neilc/local/cvs/pgsql/src/test/regress/sql/plpgsql.sql,v
retrieving revision 1.31
diff -c -r1.31 plpgsql.sql
*** src/test/regress/sql/plpgsql.sql	22 Jun 2005 07:28:47 -0000	1.31
--- src/test/regress/sql/plpgsql.sql	1 Jul 2005 11:43:36 -0000
***************
*** 2113,2119 ****
  select raise_exprs();
  drop function raise_exprs();
  
! -- continue statement 
  create table conttesttbl(idx serial, v integer);
  insert into conttesttbl(v) values(10);
  insert into conttesttbl(v) values(20);
--- 2113,2119 ----
  select raise_exprs();
  drop function raise_exprs();
  
! -- continue statement
  create table conttesttbl(idx serial, v integer);
  insert into conttesttbl(v) values(10);
  insert into conttesttbl(v) values(20);
***************
*** 2154,2160 ****
    for _i in 1..10 loop
      begin
        -- applies to outer loop, not the nested begin block
!       continue when _i < 5; 
        raise notice '%', _i;
      end;
    end loop;
--- 2154,2160 ----
    for _i in 1..10 loop
      begin
        -- applies to outer loop, not the nested begin block
!       continue when _i < 5;
        raise notice '%', _i;
      end;
    end loop;
***************
*** 2232,2234 ****
--- 2232,2282 ----
  drop function continue_test2();
  drop function continue_test3();
  drop table conttesttbl;
+ 
+ -- verbose end block and end loop
+ create function end_label1() returns void as $$
+ <<blbl>>
+ begin
+   <<flbl1>>
+   for _i in 1 .. 10 loop
+     exit flbl1;
+   end loop flbl1;
+   <<flbl2>>
+   for _i in 1 .. 10 loop
+     exit flbl2;
+   end loop;
+ end blbl;
+ $$ language plpgsql;
+ 
+ select end_label1();
+ drop function end_label1();
+ 
+ -- should fail: undefined end label
+ create function end_label2() returns void as $$
+ begin
+   for _i in 1 .. 10 loop
+     exit;
+   end loop flbl1;
+ end;
+ $$ language plpgsql;
+ 
+ -- should fail: end label does not match start label
+ create function end_label3() returns void as $$
+ <<outer_label>>
+ begin
+   <<inner_label>>
+   for _i in 1 .. 10 loop
+     exit;
+   end loop outer_label;
+ end;
+ $$ language plpgsql;
+ 
+ -- should fail: end label on a block without a start label
+ create function end_label4() returns void as $$
+ <<outer_label>>
+ begin
+   for _i in 1 .. 10 loop
+     exit;
+   end loop outer_label;
+ end;
+ $$ language plpgsql;

Index: doc/src/sgml/plpgsql.sgml
===================================================================
RCS file: /Users/neilc/local/cvs/pgsql/doc/src/sgml/plpgsql.sgml,v
retrieving revision 1.75
diff -c -r1.75 plpgsql.sgml
*** doc/src/sgml/plpgsql.sgml	2 Jul 2005 08:59:47 -0000	1.75
--- doc/src/sgml/plpgsql.sgml	6 Jul 2005 13:26:22 -0000
***************
*** 2117,2123 ****
      <para>
       The <replaceable>condition</replaceable> names can be any of those
       shown in <xref linkend="errcodes-appendix">.  A category name matches
!      any error within its category.
       The special condition name <literal>OTHERS</>
       matches every error type except <literal>QUERY_CANCELED</>.
       (It is possible, but often unwise, to trap
--- 2117,2125 ----
      <para>
       The <replaceable>condition</replaceable> names can be any of those
       shown in <xref linkend="errcodes-appendix">.  A category name matches
!      any error within its category. You can use exception variable as
!      condition name. Exception variable is declared with type 
!      <literal>EXCEPTION</literal>
       The special condition name <literal>OTHERS</>
       matches every error type except <literal>QUERY_CANCELED</>.
       (It is possible, but often unwise, to trap
***************
*** 2571,2577 ****
      raise errors.
  
  <synopsis>
! RAISE <replaceable class="parameter">level</replaceable> '<replaceable class="parameter">format</replaceable>' <optional>, <replaceable class="parameter">expression</replaceable> <optional>, ...</optional></optional>;
  </synopsis>
  
      Possible levels are <literal>DEBUG</literal>,
--- 2573,2580 ----
      raise errors.
  
  <synopsis>
! RAISE <replaceable class="parameter">level</replaceable> 
! <optional>system exception|exception variable</optional> '<replaceable class="parameter">format</replaceable>' <optional>, <replaceable class="parameter">expression</replaceable> <optional>, ...</optional></optional>;
  </synopsis>
  
      Possible levels are <literal>DEBUG</literal>,
***************
*** 2588,2593 ****
--- 2591,2600 ----
      variables. See <xref linkend="runtime-config"> for more
      information.
     </para>
+     
+    <para>
+    You can specify any system exception or any user exception.
+    </para>
  
     <para>
      Inside the format string, <literal>%</literal> is replaced by the
Index: src/include/utils/elog.h
===================================================================
RCS file: /Users/neilc/local/cvs/pgsql/src/include/utils/elog.h,v
retrieving revision 1.79
diff -c -r1.79 elog.h
*** src/include/utils/elog.h	10 Jun 2005 16:23:10 -0000	1.79
--- src/include/utils/elog.h	6 Jul 2005 13:26:22 -0000
***************
*** 61,66 ****
--- 61,72 ----
  	(PGSIXBIT(ch1) + (PGSIXBIT(ch2) << 6) + (PGSIXBIT(ch3) << 12) + \
  	 (PGSIXBIT(ch4) << 18) + (PGSIXBIT(ch5) << 24))
  
+ #define MAKE_SQLSTATE_STR(str) \
+ ( \
+ 	AssertMacro(strlen(str) == 5), \
+ 	MAKE_SQLSTATE(str[0], str[1], str[2], str[3], str[4])	\
+ )
+ 
  /* These macros depend on the fact that '0' becomes a zero in SIXBIT */
  #define ERRCODE_TO_CATEGORY(ec)  ((ec) & ((1 << 12) - 1))
  #define ERRCODE_IS_CATEGORY(ec)  (((ec) & ~((1 << 12) - 1)) == 0)
Index: src/pl/plpgsql/src/gram.y
===================================================================
RCS file: /Users/neilc/local/cvs/pgsql/src/pl/plpgsql/src/gram.y,v
retrieving revision 1.80
diff -c -r1.80 gram.y
*** src/pl/plpgsql/src/gram.y	2 Jul 2005 17:01:59 -0000	1.80
--- src/pl/plpgsql/src/gram.y	6 Jul 2005 13:38:35 -0000
***************
*** 103,108 ****
--- 103,109 ----
  		PLpgSQL_exception_block	*exception_block;
  		PLpgSQL_nsitem			*nsitem;
  		PLpgSQL_diag_item		*diagitem;
+ 		PLpgSQL_user_exc		*user_exc;
  }
  
  %type <declhdr> decl_sect
***************
*** 142,150 ****
  %type <exception_block> exception_sect
  %type <exception>	proc_exception
  %type <condition>	proc_conditions
  
! 
! %type <ival>	raise_level
  %type <str>		raise_msg
  
  %type <list>	getdiag_list
--- 143,152 ----
  %type <exception_block> exception_sect
  %type <exception>	proc_exception
  %type <condition>	proc_conditions
+ %type <str>	    exception_name
+ %type <ival>    decl_sqlstate sqlstate_defn
  
! %type <ival>	raise_level opt_raise_exc
  %type <str>		raise_msg
  
  %type <list>	getdiag_list
***************
*** 221,226 ****
--- 223,229 ----
  %token	T_LABEL
  %token	T_WORD
  %token	T_ERROR
+ %token	T_EXCEPTION
  
  %token	O_OPTION
  %token	O_DUMP
***************
*** 348,354 ****
  										(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
  										 errmsg("row or record variable cannot be NOT NULL")));
  						}
! 						if ($5 != NULL)
  						{
  							if (var->dtype == PLPGSQL_DTYPE_VAR)
  								((PLpgSQL_var *) var)->default_val = $5;
--- 351,357 ----
  										(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
  										 errmsg("row or record variable cannot be NOT NULL")));
  						}
! 						if ($5)
  						{
  							if (var->dtype == PLPGSQL_DTYPE_VAR)
  								((PLpgSQL_var *) var)->default_val = $5;
***************
*** 358,363 ****
--- 361,378 ----
  										 errmsg("default value for row or record variable is not supported")));
  						}
  					}
+ 				| decl_varname K_EXCEPTION decl_sqlstate
+ 					{
+ 						PLpgSQL_user_exc *exc_var;
+ 						PLpgSQL_type dtype;
+ 
+ 						dtype.typname = "exception";
+ 						dtype.ttype = PLPGSQL_TTYPE_EXCEPTION;
+ 
+ 						exc_var = (PLpgSQL_user_exc *) plpgsql_build_variable($1.name, $1.lineno,
+ 																			  &dtype, true);
+ 						exc_var->sqlstate = $3;
+ 					}
  				| decl_varname K_ALIAS K_FOR decl_aliasitem ';'
  					{
  						plpgsql_ns_additem($4->itemtype,
***************
*** 563,572 ****
  				| K_DEFAULT
  				;
  
! proc_sect		:
  					{
! 						$$ = NIL;
  					}
  				| proc_stmts
  					{ $$ = $1; }
  				;
--- 578,615 ----
  				| K_DEFAULT
  				;
  
! decl_sqlstate	: ';'
! 					{ $$ = plpgsql_new_user_sqlstate(); }
! 				| decl_defkey sqlstate_defn ';'
  					{
!                         $$ = $2;
  					}
+ 				;
+ 
+ sqlstate_defn	: T_STRING
+ 					{
+ 						char *state_str = plpgsql_get_string_value();
+ 
+ 						if (strlen(state_str) != 5)
+ 							ereport(ERROR,
+ 									(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+ 									 errmsg("invalid SQLSTATE value \"%s\" for "
+ 											"user-defined exception", state_str),
+ 									 errdetail("SQLSTATE values must be 5 characters in length")));
+ 
+ 						if (strncmp(state_str, "U0", 2) == 0)
+ 							ereport(ERROR,
+ 									(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+ 									 errmsg("invalid SQLSTATE value \"%s\" for "
+ 											"user-defined exception", state_str),
+ 									 errhint("Class \"U0\" is reserved for default values user's exceptions.")));
+ 
+ 						$$ = MAKE_SQLSTATE_STR(state_str);
+ 					}
+ 				;
+ 
+ proc_sect		:
+ 					{ $$ = NIL; }
  				| proc_stmts
  					{ $$ = $1; }
  				;
***************
*** 1184,1190 ****
  					}
  				;
  
! stmt_raise		: K_RAISE lno raise_level raise_msg
  					{
  						PLpgSQL_stmt_raise		*new;
  						int	tok;
--- 1227,1233 ----
  					}
  				;
  
! stmt_raise		: K_RAISE lno raise_level opt_raise_exc raise_msg
  					{
  						PLpgSQL_stmt_raise		*new;
  						int	tok;
***************
*** 1194,1202 ****
  						new->cmd_type	= PLPGSQL_STMT_RAISE;
  						new->lineno		= $2;
  						new->elog_level = $3;
! 						new->message	= $4;
  						new->params		= NIL;
  
  						tok = yylex();
  
  						/*
--- 1237,1256 ----
  						new->cmd_type	= PLPGSQL_STMT_RAISE;
  						new->lineno		= $2;
  						new->elog_level = $3;
! 						new->message	= $5;
  						new->params		= NIL;
  
+ 						/* No exception variable or SQLSTATE value specified? */
+ 						if ($4 == -1)
+ 						{
+ 							if (new->elog_level >= ERROR)
+ 								new->sqlstate = ERRCODE_RAISE_EXCEPTION;
+ 							else
+ 								new->sqlstate = 0;
+ 						}
+ 						else
+ 							new->sqlstate = $4;
+ 
  						tok = yylex();
  
  						/*
***************
*** 1266,1271 ****
--- 1320,1344 ----
  					}
  				;
  
+ opt_raise_exc	: T_EXCEPTION
+ 					{
+ 					$$ = yylval.user_exc->sqlstate;
+ 				}
+ 				| T_WORD
+ 					{
+ 						PLpgSQL_condition *c = plpgsql_parse_err_condition(yytext);
+ 						/* Don't allow "OTHERS" to be thrown via RAISE */
+ 						if (c->sqlerrstate == 0)
+ 							yyerror("illegal SQLSTATE value");
+ 						$$ = c->sqlerrstate;
+ 						pfree(c);
+ 					}
+ 				| /* EMPTY */
+ 					{
+ 						$$ = -1;
+ 					}
+ 				;
+ 
  stmt_execsql	: execsql_start lno
  					{
  						PLpgSQL_stmt_execsql	*new;
***************
*** 1285,1292 ****
  						PLpgSQL_expr *expr;
  						int endtoken;
  
! 						expr = read_sql_construct(K_INTO, ';', "INTO|;", "SELECT ",
! 												  true, true, &endtoken);
  
  						new = palloc(sizeof(PLpgSQL_stmt_dynexecute));
  						new->cmd_type = PLPGSQL_STMT_DYNEXECUTE;
--- 1358,1366 ----
  						PLpgSQL_expr *expr;
  						int endtoken;
  
! 						expr = read_sql_construct(K_INTO, ';', "INTO or ;",
! 												  "SELECT ", true, true,
! 												  &endtoken);
  
  						new = palloc(sizeof(PLpgSQL_stmt_dynexecute));
  						new->cmd_type = PLPGSQL_STMT_DYNEXECUTE;
***************
*** 1581,1600 ****
  					}
  				;
  
! proc_conditions	: proc_conditions K_OR opt_lblname
! 						{
! 							PLpgSQL_condition	*old;
  
! 							for (old = $1; old->next != NULL; old = old->next)
! 								/* skip */ ;
! 							old->next = plpgsql_parse_err_condition($3);
  
! 							$$ = $1;
! 						}
! 				| opt_lblname
! 						{
! 							$$ = plpgsql_parse_err_condition($1);
! 						}
  				;
  
  expr_until_semi :
--- 1655,1686 ----
  					}
  				;
  
! proc_conditions	: proc_conditions K_OR exception_name
! 					{
! 						PLpgSQL_condition	*old;
! 
! 						for (old = $1; old->next != NULL; old = old->next)
! 							/* skip */ ;
! 						old->next = plpgsql_parse_err_condition($3);
! 						$$ = $1;
! 					}
! 				| exception_name
! 					{
! 						$$ = plpgsql_parse_err_condition($1);
! 					}
! 				;
  
! exception_name	: T_WORD
! 					{
! 						char	*name;
  
! 						plpgsql_convert_ident(yytext, &name, 1);
! 						$$ = name;
! 					}
! 				| T_EXCEPTION
! 					{
! 						$$ = yylval.user_exc->refname;
! 					}
  				;
  
  expr_until_semi :
Index: src/pl/plpgsql/src/pl_comp.c
===================================================================
RCS file: /Users/neilc/local/cvs/pgsql/src/pl/plpgsql/src/pl_comp.c,v
retrieving revision 1.91
diff -c -r1.91 pl_comp.c
*** src/pl/plpgsql/src/pl_comp.c	10 Jun 2005 16:23:11 -0000	1.91
--- src/pl/plpgsql/src/pl_comp.c	6 Jul 2005 13:26:22 -0000
***************
*** 80,85 ****
--- 80,87 ----
  bool		plpgsql_DumpExecTree = false;
  bool		plpgsql_check_syntax = false;
  
+ static int	plpgsql_user_exc_counter;
+ 
  PLpgSQL_function *plpgsql_curr_compile;
  
  /* A context appropriate for short-term allocs during compilation */
***************
*** 316,321 ****
--- 318,325 ----
  	plpgsql_Datums = palloc(sizeof(PLpgSQL_datum *) * datums_alloc);
  	datums_last = 0;
  
+ 	plpgsql_user_exc_counter = 0;
+ 
  	/*
  	 * Do extra syntax checks when validating the function
  	 * definition. We skip this when actually compiling functions for
***************
*** 905,910 ****
--- 909,918 ----
  				plpgsql_yylval.row = (PLpgSQL_row *) (plpgsql_Datums[nse->itemno]);
  				return T_ROW;
  
+ 			case PLPGSQL_NSTYPE_EXCEPTION:
+ 				plpgsql_yylval.user_exc = (PLpgSQL_user_exc *) (plpgsql_Datums[nse->itemno]);
+ 				return T_EXCEPTION;
+ 				
  			default:
  				return T_ERROR;
  		}
***************
*** 1626,1631 ****
--- 1634,1658 ----
  				result = (PLpgSQL_variable *) rec;
  				break;
  			}
+ 		case PLPGSQL_TTYPE_EXCEPTION:
+ 			{
+ 				/* The exception type */
+ 				PLpgSQL_user_exc *exception;
+ 
+ 				exception = palloc0(sizeof(PLpgSQL_user_exc));
+ 				exception->dtype = PLPGSQL_DTYPE_EXCEPTION;
+ 				exception->refname = pstrdup(refname);
+ 				exception->lineno = lineno;
+ 				/* caller should define sqlstate! */
+ 
+ 				plpgsql_adddatum((PLpgSQL_datum *) exception);
+ 				if (add2namespace)
+ 					plpgsql_ns_additem(PLPGSQL_NSTYPE_EXCEPTION,
+ 									   exception->dno,
+ 									   refname);
+ 				result = (PLpgSQL_variable *) exception;
+ 				break;
+ 			}
  		case PLPGSQL_TTYPE_PSEUDO:
  			ereport(ERROR,
  					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
***************
*** 1883,1890 ****
   * plpgsql_parse_err_condition
   *		Generate PLpgSQL_condition entry(s) for an exception condition name
   *
!  * This has to be able to return a list because there are some duplicate
!  * names in the table of error code names.
   */
  PLpgSQL_condition *
  plpgsql_parse_err_condition(char *condname)
--- 1910,1919 ----
   * plpgsql_parse_err_condition
   *		Generate PLpgSQL_condition entry(s) for an exception condition name
   *
!  * This has to be able to return a list because there are some
!  * duplicate names in the table of error code names. Note that the
!  * exception name should already be normalized (e.g. via
!  * plpgsql_convert_ident).
   */
  PLpgSQL_condition *
  plpgsql_parse_err_condition(char *condname)
***************
*** 1892,1902 ****
  	int			i;
  	PLpgSQL_condition *new;
  	PLpgSQL_condition *prev;
! 
! 	/*
! 	 * XXX Eventually we will want to look for user-defined exception
! 	 * names here.
! 	 */
  
  	/*
  	 * OTHERS is represented as code 0 (which would map to '00000', but we
--- 1921,1927 ----
  	int			i;
  	PLpgSQL_condition *new;
  	PLpgSQL_condition *prev;
! 	PLpgSQL_nsitem *nse;
  
  	/*
  	 * OTHERS is represented as code 0 (which would map to '00000', but we
***************
*** 1924,1929 ****
--- 1949,1981 ----
  		}
  	}
  
+ 	/*
+ 	 * If "condname" is not the name of any builtin exceptions, look
+ 	 * for a user-defined exception variable with that name.
+ 	 */
+ 	if (!prev)
+ 	{
+ 		/*
+ 		 * Do a lookup on the compiler's namestack
+ 		 */
+ 		nse = plpgsql_ns_lookup(condname, NULL);
+ 
+ 		if (nse != NULL)
+ 		{
+ 			PLpgSQL_user_exc *exc_var;
+ 
+ 			exc_var = (PLpgSQL_user_exc *) (plpgsql_Datums[nse->itemno]);
+ 			if (nse->itemtype == PLPGSQL_NSTYPE_EXCEPTION)
+ 			{
+ 				new = palloc(sizeof(PLpgSQL_condition));
+ 				new->sqlerrstate = exc_var->sqlstate;
+ 				new->condname = condname;
+ 				new->next = prev;
+ 				prev = new;
+ 			}
+ 		}
+ 	}
+ 
  	if (!prev)
  		ereport(ERROR,
  				(errcode(ERRCODE_UNDEFINED_OBJECT),
***************
*** 2171,2179 ****
  	plpgsql_HashEnt *hentry;
  
  	hentry = (plpgsql_HashEnt *) hash_search(plpgsql_HashTable,
! 										   (void *) function->fn_hashkey,
  											 HASH_REMOVE,
  											 NULL);
  	if (hentry == NULL)
  		elog(WARNING, "trying to delete function that does not exist");
  }
--- 2223,2246 ----
  	plpgsql_HashEnt *hentry;
  
  	hentry = (plpgsql_HashEnt *) hash_search(plpgsql_HashTable,
! 											 (void *) function->fn_hashkey,
  											 HASH_REMOVE,
  											 NULL);
  	if (hentry == NULL)
  		elog(WARNING, "trying to delete function that does not exist");
  }
+ 
+ #define MAX_USER_EXCPT 999
+ 
+ int
+ plpgsql_new_user_sqlstate(void)
+ {
+     char str[6];
+ 
+     if (plpgsql_user_exc_counter >= MAX_USER_EXCPT)
+ 		ereport(ERROR,
+ 				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+ 				 errmsg("Too many user-defined exceptions")));
+     snprintf(str, sizeof(str), "U0%03d", ++plpgsql_user_exc_counter);
+ 	return MAKE_SQLSTATE_STR(str);
+ }
Index: src/pl/plpgsql/src/pl_exec.c
===================================================================
RCS file: /Users/neilc/local/cvs/pgsql/src/pl/plpgsql/src/pl_exec.c,v
retrieving revision 1.149
diff -c -r1.149 pl_exec.c
*** src/pl/plpgsql/src/pl_exec.c	26 Jun 2005 22:05:42 -0000	1.149
--- src/pl/plpgsql/src/pl_exec.c	6 Jul 2005 13:56:49 -0000
***************
*** 723,728 ****
--- 723,733 ----
  			result = datum;
  			break;
  
+ 		case PLPGSQL_DTYPE_EXCEPTION:
+ 			/* XXX: this is read-only at runtime -- just copy as well? */
+ 			result = NULL;
+ 			break;
+ 
  		default:
  			elog(ERROR, "unrecognized dtype: %d", datum->dtype);
  			result = NULL;		/* keep compiler quiet */
***************
*** 825,830 ****
--- 830,836 ----
  
  			case PLPGSQL_DTYPE_RECFIELD:
  			case PLPGSQL_DTYPE_ARRAYELEM:
+ 			case PLPGSQL_DTYPE_EXCEPTION:
  				break;
  
  			default:
***************
*** 2062,2069 ****
  	estate->err_text = raise_skip_msg;	/* suppress traceback of raise */
  
  	ereport(stmt->elog_level,
! 	 ((stmt->elog_level >= ERROR) ? errcode(ERRCODE_RAISE_EXCEPTION) : 0,
! 	  errmsg_internal("%s", plpgsql_dstring_get(&ds))));
  
  	estate->err_text = NULL;	/* un-suppress... */
  
--- 2068,2075 ----
  	estate->err_text = raise_skip_msg;	/* suppress traceback of raise */
  
  	ereport(stmt->elog_level,
! 			(errcode(stmt->sqlstate),
! 			 errmsg_internal("%s", plpgsql_dstring_get(&ds))));
  
  	estate->err_text = NULL;	/* un-suppress... */
  
Index: src/pl/plpgsql/src/plpgsql.h
===================================================================
RCS file: /Users/neilc/local/cvs/pgsql/src/pl/plpgsql/src/plpgsql.h,v
retrieving revision 1.64
diff -c -r1.64 plpgsql.h
*** src/pl/plpgsql/src/plpgsql.h	22 Jun 2005 01:35:02 -0000	1.64
--- src/pl/plpgsql/src/plpgsql.h	6 Jul 2005 13:26:22 -0000
***************
*** 58,64 ****
  	PLPGSQL_NSTYPE_LABEL,
  	PLPGSQL_NSTYPE_VAR,
  	PLPGSQL_NSTYPE_ROW,
! 	PLPGSQL_NSTYPE_REC
  };
  
  /* ----------
--- 58,65 ----
  	PLPGSQL_NSTYPE_LABEL,
  	PLPGSQL_NSTYPE_VAR,
  	PLPGSQL_NSTYPE_ROW,
! 	PLPGSQL_NSTYPE_REC,
! 	PLPGSQL_NSTYPE_EXCEPTION
  };
  
  /* ----------
***************
*** 73,79 ****
  	PLPGSQL_DTYPE_RECFIELD,
  	PLPGSQL_DTYPE_ARRAYELEM,
  	PLPGSQL_DTYPE_EXPR,
! 	PLPGSQL_DTYPE_TRIGARG
  };
  
  /* ----------
--- 74,81 ----
  	PLPGSQL_DTYPE_RECFIELD,
  	PLPGSQL_DTYPE_ARRAYELEM,
  	PLPGSQL_DTYPE_EXPR,
! 	PLPGSQL_DTYPE_TRIGARG,
! 	PLPGSQL_DTYPE_EXCEPTION
  };
  
  /* ----------
***************
*** 85,91 ****
  	PLPGSQL_TTYPE_SCALAR,		/* scalar types and domains */
  	PLPGSQL_TTYPE_ROW,			/* composite types */
  	PLPGSQL_TTYPE_REC,			/* RECORD pseudotype */
! 	PLPGSQL_TTYPE_PSEUDO		/* other pseudotypes */
  };
  
  /* ----------
--- 87,94 ----
  	PLPGSQL_TTYPE_SCALAR,		/* scalar types and domains */
  	PLPGSQL_TTYPE_ROW,			/* composite types */
  	PLPGSQL_TTYPE_REC,			/* RECORD pseudotype */
! 	PLPGSQL_TTYPE_PSEUDO,		/* other pseudotypes */
! 	PLPGSQL_TTYPE_EXCEPTION		/* user-defined exception variables */
  };
  
  /* ----------
***************
*** 173,179 ****
   * PLpgSQL_trigarg
   */
  typedef struct
! {								/* Generic datum array item		*/
  	int			dtype;
  	int			dno;
  } PLpgSQL_datum;
--- 176,182 ----
   * PLpgSQL_trigarg
   */
  typedef struct
! {								/* Generic datum array item */
  	int			dtype;
  	int			dno;
  } PLpgSQL_datum;
***************
*** 190,197 ****
  	int			lineno;
  } PLpgSQL_variable;
  
  typedef struct PLpgSQL_expr
! {								/* SQL Query to plan and execute	*/
  	int			dtype;
  	int			exprno;
  	char	   *query;
--- 193,209 ----
  	int			lineno;
  } PLpgSQL_variable;
  
+ typedef struct
+ {								/* User-defined exception variable */
+ 	int			dtype;
+ 	int			dno;
+ 	char	   *refname;
+ 	int			lineno;
+ 	int			sqlstate;
+ } PLpgSQL_user_exc;
+ 
  typedef struct PLpgSQL_expr
! {								/* SQL Query to plan and execute */
  	int			dtype;
  	int			exprno;
  	char	   *query;
***************
*** 292,298 ****
  
  
  typedef struct
! {								/* Item in the compilers namestack	*/
  	int			itemtype;
  	int			itemno;
  	char		name[1];
--- 304,310 ----
  
  
  typedef struct
! {								/* Item in the compiler's namestack	*/
  	int			itemtype;
  	int			itemno;
  	char		name[1];
***************
*** 516,521 ****
--- 528,534 ----
  	int			cmd_type;
  	int			lineno;
  	int			elog_level;
+ 	int			sqlstate;
  	char	   *message;
  	List	   *params;			/* list of expressions */
  } PLpgSQL_stmt_raise;
***************
*** 688,693 ****
--- 701,708 ----
  extern int	plpgsql_add_initdatums(int **varnos);
  extern void plpgsql_HashTableInit(void);
  extern void plpgsql_compile_error_callback(void *arg);
+ extern int	plpgsql_new_user_sqlstate(void);
+ 
  
  /* ----------
   * Functions in pl_handler.c
Index: src/test/regress/expected/plpgsql.out
===================================================================
RCS file: /Users/neilc/local/cvs/pgsql/src/test/regress/expected/plpgsql.out,v
retrieving revision 1.38
diff -c -r1.38 plpgsql.out
*** src/test/regress/expected/plpgsql.out	2 Jul 2005 08:59:48 -0000	1.38
--- src/test/regress/expected/plpgsql.out	6 Jul 2005 15:03:56 -0000
***************
*** 2721,2723 ****
--- 2721,2778 ----
  $$ language plpgsql;
  ERROR:  end label "outer_label" specified for unlabelled block
  CONTEXT:  compile of PL/pgSQL function "end_label4" near line 5
+ -- user-defined exceptions
+ -- should fail: illegal sqlstate for exception
+ create function innerfx() returns void as $$
+ declare
+   my_exc exception = 'U0001';
+ begin -- using msgtext as one param of exception
+   raise exception my_exc '%', CURRENT_TIMESTAMP;
+ end;
+ $$ language plpgsql;
+ ERROR:  invalid SQLSTATE value "U0001" for user-defined exception
+ HINT:  Class "U0" is reserved for default values user's exceptions.
+ CONTEXT:  compile of PL/pgSQL function "innerfx" near line 2
+ create function innerfx() returns integer as $$
+ declare
+   my_exc1 exception = 'U1001';
+ begin -- using msgtext as one param of exception
+   raise exception my_exc1 '%', 100.34::numeric;
+   return 1;
+ end $$ language plpgsql;
+ create function outerfx() returns integer as $$
+ declare 
+   my_excpt exception = 'U1001';
+   alias_div_by_zero exception = '22012';
+   def_sqlstate exception;
+ begin
+   begin
+     raise exception def_sqlstate 'foo';
+   exception when def_sqlstate then
+     raise notice '01 catch: %, %', sqlstate, sqlerrm;
+   end;
+   begin
+     raise notice '%', innerfx();
+   exception when my_excpt then
+     raise notice '02 catch: %, %', sqlstate, sqlerrm::numeric;
+   end;
+   begin
+     raise exception alias_div_by_zero 'testing';
+   exception when division_by_zero then
+     raise notice 'Divison by zero: %, %', sqlstate, sqlerrm;
+   end;
+   return 1;
+ end; $$ language plpgsql;
+ select innerfx();
+ ERROR:  100.34
+ select outerfx();
+ NOTICE:  01 catch: U0001, foo
+ NOTICE:  02 catch: U1001, 100.34
+ NOTICE:  Divison by zero: 22012, testing
+  outerfx 
+ ---------
+        1
+ (1 row)
+ 
+ drop function outerfx();
+ drop function innerfx();
Index: src/test/regress/sql/plpgsql.sql
===================================================================
RCS file: /Users/neilc/local/cvs/pgsql/src/test/regress/sql/plpgsql.sql,v
retrieving revision 1.33
diff -c -r1.33 plpgsql.sql
*** src/test/regress/sql/plpgsql.sql	2 Jul 2005 08:59:48 -0000	1.33
--- src/test/regress/sql/plpgsql.sql	6 Jul 2005 13:57:44 -0000
***************
*** 2280,2282 ****
--- 2280,2331 ----
    end loop outer_label;
  end;
  $$ language plpgsql;
+ 
+ -- user-defined exceptions
+ 
+ -- should fail: illegal sqlstate for exception
+ create function innerfx() returns void as $$
+ declare
+   my_exc exception = 'U0001';
+ begin -- using msgtext as one param of exception
+   raise exception my_exc '%', CURRENT_TIMESTAMP;
+ end;
+ $$ language plpgsql;
+ 
+ create function innerfx() returns integer as $$
+ declare
+   my_exc1 exception = 'U1001';
+ begin -- using msgtext as one param of exception
+   raise exception my_exc1 '%', 100.34::numeric;
+   return 1;
+ end $$ language plpgsql;
+ 
+ create function outerfx() returns integer as $$
+ declare 
+   my_excpt exception = 'U1001';
+   alias_div_by_zero exception = '22012';
+   def_sqlstate exception;
+ begin
+   begin
+     raise exception def_sqlstate 'foo';
+   exception when def_sqlstate then
+     raise notice '01 catch: %, %', sqlstate, sqlerrm;
+   end;
+   begin
+     raise notice '%', innerfx();
+   exception when my_excpt then
+     raise notice '02 catch: %, %', sqlstate, sqlerrm::numeric;
+   end;
+   begin
+     raise exception alias_div_by_zero 'testing';
+   exception when division_by_zero then
+     raise notice 'Divison by zero: %, %', sqlstate, sqlerrm;
+   end;
+   return 1;
+ end; $$ language plpgsql;
+ 
+ select innerfx();
+ select outerfx();
+ 
+ drop function outerfx();
+ drop function innerfx();