*** postgresql-7.0.2/src/pl/plpgsql/src/scan.l.orig	Thu Sep 21 16:10:19 2000
--- postgresql-7.0.2/src/pl/plpgsql/src/scan.l	Thu Sep 21 16:10:52 2000
***************
*** 48,55 ****
  #define YY_INPUT(buf,res,max)	plpgsql_input(buf, &res, max)
  %}
  
! WS	[[:alpha:]_"]
! WC	[[:alnum:]_"]
  
  %x	IN_STRING IN_COMMENT
  
--- 48,55 ----
  #define YY_INPUT(buf,res,max)	plpgsql_input(buf, &res, max)
  %}
  
! WS	[\200-\377_A-Za-z"]
! WC	[\200-\377_A-Za-z0-9"]
  
  %x	IN_STRING IN_COMMENT
  
*** postgresql-7.0.2/src/pl/plpgsql/src/pl_scan.c.orig	Thu Sep 21 16:13:47 2000
--- postgresql-7.0.2/src/pl/plpgsql/src/pl_scan.c	Thu Sep 21 16:13:53 2000
***************
*** 2,8 ****
  
  /* Scanner skeleton version:
   * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
-  * $FreeBSD: src/usr.bin/lex/flex.skl,v 1.4 1999/10/27 07:56:44 obrien Exp $
   */
  
  #define FLEX_SCANNER
--- 2,7 ----
***************
*** 373,393 ****
  
         21,   22,   23,   24,   25,    4,    4,   26,   27,   28,
         29,   30,    4,   31,   32,   33,   34,   35,   36,   37,
!        38,    4,    1,    1,    1,    1,    1,    1,    1,    1,
!         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
!         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
!         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
!         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
!         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
!         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
!         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
! 
!         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
!         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
!         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
!         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
!         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
!         1,    1,    1,    1,    1
      } ;
  
  static plpgsql_yyconst int plpgsql_yy_meta[39] =
--- 372,392 ----
  
         21,   22,   23,   24,   25,    4,    4,   26,   27,   28,
         29,   30,    4,   31,   32,   33,   34,   35,   36,   37,
!        38,    4,    1,    1,    1,    1,    1,    4,    4,    4,
!         4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
!         4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
!         4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
!         4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
!         4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
!         4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
!         4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
! 
!         4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
!         4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
!         4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
!         4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
!         4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
!         4,    4,    4,    4,    4
      } ;
  
  static plpgsql_yyconst int plpgsql_yy_meta[39] =
***************
*** 679,685 ****
  #define IN_STRING 1
  #define IN_COMMENT 2
  
! #line 683 "lex.plpgsql_yy.c"
  
  /* Macros after this point can all be overridden by user definitions in
   * section 1.
--- 678,684 ----
  #define IN_STRING 1
  #define IN_COMMENT 2
  
! #line 682 "lex.plpgsql_yy.c"
  
  /* Macros after this point can all be overridden by user definitions in
   * section 1.
***************
*** 830,836 ****
  PLPGSQL_YY_DECL
  	{
  	register plpgsql_yy_state_type plpgsql_yy_current_state;
! 	register char *plpgsql_yy_cp, *plpgsql_yy_bp;
  	register int plpgsql_yy_act;
  
  #line 56 "scan.l"
--- 829,835 ----
  PLPGSQL_YY_DECL
  	{
  	register plpgsql_yy_state_type plpgsql_yy_current_state;
! 	register char *plpgsql_yy_cp = NULL, *plpgsql_yy_bp = NULL;
  	register int plpgsql_yy_act;
  
  #line 56 "scan.l"
***************
*** 863,869 ****
       * The keyword rules
       * ----------
       */
! #line 867 "lex.plpgsql_yy.c"
  
  	if ( plpgsql_yy_init )
  		{
--- 862,868 ----
       * The keyword rules
       * ----------
       */
! #line 866 "lex.plpgsql_yy.c"
  
  	if ( plpgsql_yy_init )
  		{
***************
*** 1293,1299 ****
  #line 188 "scan.l"
  ECHO;
  	PLPGSQL_YY_BREAK
! #line 1297 "lex.plpgsql_yy.c"
  			case PLPGSQL_YY_STATE_EOF(INITIAL):
  				plpgsql_yyterminate();
  
--- 1292,1298 ----
  #line 188 "scan.l"
  ECHO;
  	PLPGSQL_YY_BREAK
! #line 1296 "lex.plpgsql_yy.c"
  			case PLPGSQL_YY_STATE_EOF(INITIAL):
  				plpgsql_yyterminate();