Commit 31b9e3fc authored by Thomas G. Lockhart's avatar Thomas G. Lockhart

Temporarily back out fixes for unary minus parsing.

Will re-introduce for v6.4 but requires fixes for automatic type
 conversion beforehand.
parent 45a0b474
This diff is collapsed.
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.37 1998/03/18 16:50:25 thomas Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.38 1998/04/08 06:35:00 thomas Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -148,10 +148,12 @@ self [,()\[\].;$\:\+\-\*\/\<\>\=\|] ...@@ -148,10 +148,12 @@ self [,()\[\].;$\:\+\-\*\/\<\>\=\|]
op_and_self [\~\!\@\#\%\^\&\|\`\?\$\:\+\-\*\/\<\>\=] op_and_self [\~\!\@\#\%\^\&\|\`\?\$\:\+\-\*\/\<\>\=]
operator {op_and_self}+ operator {op_and_self}+
xminteger {integer}/-
xmreal {real}/{space}*-{digit}
xmstop - xmstop -
integer [\-]?{digit}+ integer -?{digit}+
real [\-]?{digit}+\.{digit}+([Ee][-+]?{digit}+)? real -?{digit}+\.{digit}+([Ee][-+]?{digit}+)?
param \${integer} param \${integer}
...@@ -289,8 +291,7 @@ other . ...@@ -289,8 +291,7 @@ other .
{typecast} { return TYPECAST; } {typecast} { return TYPECAST; }
{self}/{space}*-[\.0-9] { {self}/-[\.0-9] {
BEGIN(xm);
return (yytext[0]); return (yytext[0]);
} }
{self} { return (yytext[0]); } {self} { return (yytext[0]); }
...@@ -310,7 +311,6 @@ other . ...@@ -310,7 +311,6 @@ other .
return (PARAM); return (PARAM);
} }
{identifier}/{space}*-{number} { {identifier}/{space}*-{number} {
int i; int i;
ScanKeyword *keyword; ScanKeyword *keyword;
...@@ -386,8 +386,6 @@ other . ...@@ -386,8 +386,6 @@ other .
CheckFloat8Val(yylval.dval); CheckFloat8Val(yylval.dval);
return (FCONST); return (FCONST);
} }
{identifier} { {identifier} {
int i; int i;
ScanKeyword *keyword; ScanKeyword *keyword;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment