aboutsummaryrefslogtreecommitdiff
path: root/src/backend/parser/scan.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/parser/scan.c')
-rw-r--r--src/backend/parser/scan.c45
1 files changed, 23 insertions, 22 deletions
diff --git a/src/backend/parser/scan.c b/src/backend/parser/scan.c
index f7c3eb80b98..8724dfe3edc 100644
--- a/src/backend/parser/scan.c
+++ b/src/backend/parser/scan.c
@@ -1,7 +1,7 @@
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.25 1998/08/30 23:25:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.26 1998/09/01 03:24:22 momjian Exp $
*/
#define FLEX_SCANNER
@@ -555,7 +555,7 @@ char *yytext;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.25 1998/08/30 23:25:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.26 1998/09/01 03:24:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -974,7 +974,7 @@ YY_RULE_SETUP
yylval.ival = strtol((char *)literal,&endptr,2);
if (*endptr != '\0' || errno == ERANGE)
elog(ERROR,"Bad binary integer input '%s'",literal);
- return (ICONST);
+ return ICONST;
}
YY_BREAK
case 9:
@@ -1017,7 +1017,7 @@ YY_RULE_SETUP
yylval.ival = strtol((char *)literal,&endptr,16);
if (*endptr != '\0' || errno == ERANGE)
elog(ERROR,"Bad hexadecimal integer input '%s'",literal);
- return (ICONST);
+ return ICONST;
}
YY_BREAK
case 15:
@@ -1035,7 +1035,7 @@ YY_RULE_SETUP
{
BEGIN(INITIAL);
yylval.str = pstrdup(scanstr(literal));
- return (SCONST);
+ return SCONST;
}
YY_BREAK
case 17:
@@ -1092,7 +1092,7 @@ YY_RULE_SETUP
{
BEGIN(INITIAL);
yylval.str = pstrdup(literal);
- return (IDENT);
+ return IDENT;
}
YY_BREAK
case 24:
@@ -1115,7 +1115,7 @@ YY_RULE_SETUP
#line 287 "scan.l"
{
BEGIN(INITIAL);
- return (yytext[0]);
+ return yytext[0];
}
YY_BREAK
case 27:
@@ -1131,13 +1131,14 @@ YY_RULE_SETUP
#line 295 "scan.l"
{
BEGIN(xm);
- return (yytext[0]);
+ return yytext[0];
}
YY_BREAK
case 29:
YY_RULE_SETUP
#line 299 "scan.l"
-{ return (yytext[0]); }
+{ return yytext[0]; }
+{ return yytext[0]; }
YY_BREAK
case 30:
*yy_cp = yy_hold_char; /* undo effects of setting up yytext */
@@ -1147,7 +1148,7 @@ YY_RULE_SETUP
#line 300 "scan.l"
{
yylval.str = pstrdup((char*)yytext);
- return (Op);
+ return Op;
}
YY_BREAK
case 31:
@@ -1158,7 +1159,7 @@ YY_RULE_SETUP
yylval.str = pstrdup("<>"); /* compatability */
else
yylval.str = pstrdup((char*)yytext);
- return (Op);
+ return Op;
}
YY_BREAK
case 32:
@@ -1166,7 +1167,7 @@ YY_RULE_SETUP
#line 311 "scan.l"
{
yylval.ival = atoi((char*)&yytext[1]);
- return (PARAM);
+ return PARAM;
}
YY_BREAK
case 33:
@@ -1186,12 +1187,12 @@ YY_RULE_SETUP
keyword = ScanKeywordLookup((char*)yytext);
if (keyword != NULL) {
- return (keyword->value);
+ return keyword->value;
}
else
{
yylval.str = pstrdup((char*)yytext);
- return (IDENT);
+ return IDENT;
}
}
YY_BREAK
@@ -1212,9 +1213,9 @@ YY_RULE_SETUP
elog(ERROR,"Bad integer input '%s'",yytext);
CheckFloat8Val(yylval.dval);
elog(NOTICE,"Integer input '%s' is out of range; promoted to float", yytext);
- return (FCONST);
+ return FCONST;
}
- return (ICONST);
+ return ICONST;
}
YY_BREAK
case 35:
@@ -1229,7 +1230,7 @@ YY_RULE_SETUP
if (*endptr != '\0' || errno == ERANGE)
elog(ERROR,"Bad float8 input '%s'",yytext);
CheckFloat8Val(yylval.dval);
- return (FCONST);
+ return FCONST;
}
YY_BREAK
case 36:
@@ -1248,9 +1249,9 @@ YY_RULE_SETUP
elog(ERROR,"Bad integer input '%s'",yytext);
CheckFloat8Val(yylval.dval);
elog(NOTICE,"Integer input '%s' is out of range; promoted to float", yytext);
- return (FCONST);
+ return FCONST;
}
- return (ICONST);
+ return ICONST;
}
YY_BREAK
case 37:
@@ -1264,7 +1265,7 @@ YY_RULE_SETUP
if (*endptr != '\0' || errno == ERANGE)
elog(ERROR,"Bad float input '%s'",yytext);
CheckFloat8Val(yylval.dval);
- return (FCONST);
+ return FCONST;
}
YY_BREAK
case 38:
@@ -1283,12 +1284,12 @@ YY_RULE_SETUP
keyword = ScanKeywordLookup((char*)yytext);
if (keyword != NULL) {
- return (keyword->value);
+ return keyword->value;
}
else
{
yylval.str = pstrdup((char*)yytext);
- return (IDENT);
+ return IDENT;
}
}
YY_BREAK