rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add %option nodefault to all our flex lexers. Fix a couple of rule gaps 

exposed thereby.  AFAICT these would not lead to any worse problems than
junk emitted on the backend's stdout, but we should have the option to
catch possible worse errors in future.
This commit is contained in:
Tom Lane 2004-02-24 22:06:32 +00:00
parent 58e705320e
commit fa96a5e15b
8 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/cube/cubescan.l
View File

@ -26,6 +26,7 @@ void cube_scanner_finish(void);
%option 8bit
%option never-interactive
%option nodefault
%option nounput
%option noyywrap
%option prefix="cube_yy"
@ -44,7 +45,7 @@ float ({integer}|{real})([eE]{integer})?
\( yylval = "("; return O_PAREN;
\) yylval = ")"; return C_PAREN;
\, yylval = ")"; return COMMA;
[ ]+ /* discard spaces */
[ \t\n\r\f]+ /* discard spaces */
. return yytext[0]; /* alert parser of the garbage */
%%

3
contrib/seg/segscan.l
View File

@ -25,6 +25,7 @@ void seg_scanner_finish(void);
%option 8bit
%option never-interactive
%option nodefault
%option nounput
%option noyywrap
%option prefix="seg_yy"
@ -44,7 +45,7 @@ float ({integer}|{real})([eE]{integer})?
\< yylval.text = "<"; return EXTENSION;
\> yylval.text = ">"; return EXTENSION;
\~ yylval.text = "~"; return EXTENSION;
[ ]+ /* discard spaces */
[ \t\n\r\f]+ /* discard spaces */
. return yytext[0]; /* alert parser of the garbage */
%%

1
contrib/tsearch/parser.l
View File

@ -16,6 +16,7 @@ YY_BUFFER_STATE buf = NULL; /* buffer to parse; it need for parse from string */
%option 8bit
%option never-interactive
%option nodefault
%option nounput
%option noyywrap

1
contrib/tsearch2/wordparser/parser.l
View File

@ -18,6 +18,7 @@ YY_BUFFER_STATE buf = NULL; /* buffer to parse; it need for parse from string */
%option 8bit
%option never-interactive
%option nodefault
%option nounput
%option noyywrap

3
src/backend/bootstrap/bootscanner.l
View File

@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/bootstrap/bootscanner.l,v 1.32 2003/11/29 19:51:41 pgsql Exp $
* $PostgreSQL: pgsql/src/backend/bootstrap/bootscanner.l,v 1.33 2004/02/24 22:06:32 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -53,6 +53,7 @@ static int yyline; /* keep track of the line number for error reporting */
%option 8bit
%option never-interactive
%option nodefault
%option nounput
%option noyywrap

3
src/backend/utils/misc/guc-file.l
View File

@ -4,7 +4,7 @@
*
* Copyright (c) 2000-2003, PostgreSQL Global Development Group
*
* $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.20 2003/11/29 19:52:03 pgsql Exp $
* $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.21 2004/02/24 22:06:32 tgl Exp $
*/
%{
@ -47,6 +47,7 @@ char *GUC_scanstr(char *);
%option 8bit
%option never-interactive
%option nodefault
%option nounput
%option noyywrap

3
src/interfaces/ecpg/preproc/pgc.l
View File

@ -12,7 +12,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.125 2004/02/15 13:48:54 meskes Exp $
* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.126 2004/02/24 22:06:32 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -70,6 +70,7 @@ static struct _if_value
%option 8bit
%option never-interactive
%option nodefault
%option noyywrap
%option yylineno

6
src/pl/plpgsql/src/scan.l
View File

@ -4,7 +4,7 @@
* procedural language
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/pl/plpgsql/src/scan.l,v 1.30 2003/11/29 19:52:12 pgsql Exp $
* $PostgreSQL: pgsql/src/pl/plpgsql/src/scan.l,v 1.31 2004/02/24 22:06:32 tgl Exp $
*
* This software is copyrighted by Jan Wieck - Hamburg.
*
@ -63,6 +63,7 @@ int plpgsql_SpaceScanned = 0;
%option 8bit
%option never-interactive
%option nodefault
%option nounput
%option noyywrap
@ -272,6 +273,7 @@ dump { return O_DUMP; }
BEGIN IN_STRING;
}
<IN_STRING>\\. { }
<IN_STRING>\\ { /* can only happen with \ at EOF */ }
<IN_STRING>'' { }
<IN_STRING>' {
yyleng -= (yytext - start_charpos);
@ -279,13 +281,13 @@ dump { return O_DUMP; }
BEGIN INITIAL;
return T_STRING;
}
<IN_STRING>[^'\\]+ { }
<IN_STRING><<EOF>> {
plpgsql_error_lineno = start_lineno;
ereport(ERROR,
(errcode(ERRCODE_DATATYPE_MISMATCH),
errmsg("unterminated string")));
}
<IN_STRING>[^'\\]* { }
/* ----------
* Any unmatched character is returned as is