summaryrefslogtreecommitdiff
path: root/src/backend/parser/scan.l
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/parser/scan.l')
-rw-r--r--src/backend/parser/scan.l14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
index b0a2c01fbcb..49631e51f3e 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.36 1998/02/18 07:22:40 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.37 1998/03/18 16:50:25 thomas Exp $
*
*-------------------------------------------------------------------------
*/
@@ -148,12 +148,10 @@ self [,()\[\].;$\:\+\-\*\/\<\>\=\|]
op_and_self [\~\!\@\#\%\^\&\|\`\?\$\:\+\-\*\/\<\>\=]
operator {op_and_self}+
-xminteger {integer}/-
-xmreal {real}/{space}*-{digit}
xmstop -
-integer -?{digit}+
-real -?{digit}+\.{digit}+([Ee][-+]?{digit}+)?
+integer [\-]?{digit}+
+real [\-]?{digit}+\.{digit}+([Ee][-+]?{digit}+)?
param \${integer}
@@ -291,7 +289,8 @@ other .
{typecast} { return TYPECAST; }
-{self}/-[\.0-9] {
+{self}/{space}*-[\.0-9] {
+ BEGIN(xm);
return (yytext[0]);
}
{self} { return (yytext[0]); }
@@ -311,6 +310,7 @@ other .
return (PARAM);
}
+
{identifier}/{space}*-{number} {
int i;
ScanKeyword *keyword;
@@ -386,6 +386,8 @@ other .
CheckFloat8Val(yylval.dval);
return (FCONST);
}
+
+
{identifier} {
int i;
ScanKeyword *keyword;