From 341e360d67e19c03c68f4770ceb82c293f214e33 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Mon, 27 Sep 1999 21:02:54 +0000 Subject: [PATCH] Sorry, guys. Here is the ultimate patch which keeps the entire behavior as it was, apart from forbidding minus-terminated operators. Seems that I have to break the habit of doing before thinking properly :-/ The point is that my second patch breaks constructs like a & b or a ! b. This patch is to be applied instead of any of two other today's patches. Leon --- src/backend/parser/scan.l | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l index 5091149e60..0f33ca774a 100644 --- a/src/backend/parser/scan.l +++ b/src/backend/parser/scan.l @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.55 1999/09/27 19:40:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.56 1999/09/27 21:02:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -151,7 +151,7 @@ typecast "::" self [,()\[\].;$\:\+\-\*\/\%\^\<\>\=\|] op_and_self [\~\!\@\#\^\&\|\`\?\$\:\+\-\*\/\%\<\>\=] -operator {op_and_self}+ +operator {op_and_self}|({op_and_self}+[\~\!\@\#\^\&\|\`\?\$\:\+\*\/\%\<\>\=]) /* we do not allow unary minus in numbers. * instead we pass it verbatim to parser. there it gets -- 2.11.0