From 799ac992014374c23a1fc437f4fd9aa413be4920 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 27 Sep 2009 03:27:24 +0000
Subject: Sync psql's scanner with recent changes in backend scanner's flex
 rules. Marko Kreen, Tom Lane

---
 src/backend/parser/scan.l | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/backend/parser')

diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
index fdc95135509..150202e77ce 100644
--- a/src/backend/parser/scan.l
+++ b/src/backend/parser/scan.l
@@ -24,7 +24,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/scan.l,v 1.161 2009/09/25 21:13:06 petere Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/scan.l,v 1.162 2009/09/27 03:27:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -571,18 +571,16 @@ other			.
 
 					BEGIN(xe);
 				}
-<xeu>.			|
-<xeu>\n			|
+<xeu>.			{ yyerror("invalid Unicode surrogate pair"); }
+<xeu>\n			{ yyerror("invalid Unicode surrogate pair"); }
 <xeu><<EOF>>	{ yyerror("invalid Unicode surrogate pair"); }
-
 <xe,xeu>{xeunicodefail}	{
 						ereport(ERROR,
 								(errcode(ERRCODE_INVALID_ESCAPE_SEQUENCE),
 								 errmsg("invalid Unicode escape"),
 								 errhint("Unicode escapes must be \\uXXXX or \\UXXXXXXXX."),
 								 lexer_errposition()));
-					}
-
+				}
 <xe>{xeescape}  {
 					if (yytext[1] == '\'')
 					{
-- 
cgit v1.2.3