File tree 8 files changed +16
-7
lines changed
8 files changed +16
-7
lines changed Original file line number Diff line number Diff line change @@ -26,6 +26,7 @@ void cube_scanner_finish(void);
26
26
27
27
%option 8bit
28
28
%option never-interactive
29
+ %option nodefault
29
30
%option nounput
30
31
%option noyywrap
31
32
%option prefix="cube_yy"
@@ -44,7 +45,7 @@ float ({integer}|{real})([eE]{integer})?
44
45
\( yylval = " (" ; return O_PAREN;
45
46
\) yylval = " )" ; return C_PAREN;
46
47
\, yylval = " )" ; return COMMA;
47
- [ ] + /* discard spaces */
48
+ [ \t\n\r\f ] + /* discard spaces */
48
49
. return yytext[0 ]; /* alert parser of the garbage */
49
50
50
51
%%
Original file line number Diff line number Diff line change @@ -25,6 +25,7 @@ void seg_scanner_finish(void);
25
25
26
26
%option 8bit
27
27
%option never-interactive
28
+ %option nodefault
28
29
%option nounput
29
30
%option noyywrap
30
31
%option prefix="seg_yy"
@@ -44,7 +45,7 @@ float ({integer}|{real})([eE]{integer})?
44
45
\< yylval.text = " <" ; return EXTENSION;
45
46
\> yylval.text = " >" ; return EXTENSION;
46
47
\~ yylval.text = " ~" ; return EXTENSION;
47
- [ ] + /* discard spaces */
48
+ [ \t\n\r\f ] + /* discard spaces */
48
49
. return yytext[0 ]; /* alert parser of the garbage */
49
50
50
51
%%
Original file line number Diff line number Diff line change @@ -16,6 +16,7 @@ YY_BUFFER_STATE buf = NULL; /* buffer to parse; it need for parse from string */
16
16
17
17
%option 8bit
18
18
%option never-interactive
19
+ %option nodefault
19
20
%option nounput
20
21
%option noyywrap
21
22
Original file line number Diff line number Diff line change @@ -18,6 +18,7 @@ YY_BUFFER_STATE buf = NULL; /* buffer to parse; it need for parse from string */
18
18
19
19
%option 8bit
20
20
%option never-interactive
21
+ %option nodefault
21
22
%option nounput
22
23
%option noyywrap
23
24
Original file line number Diff line number Diff line change 9
9
*
10
10
*
11
11
* IDENTIFICATION
12
- * $PostgreSQL: pgsql/src/backend/bootstrap/bootscanner.l,v 1.32 2003/11/29 19:51:41 pgsql Exp $
12
+ * $PostgreSQL: pgsql/src/backend/bootstrap/bootscanner.l,v 1.33 2004/02/24 22:06:32 tgl Exp $
13
13
*
14
14
*-------------------------------------------------------------------------
15
15
*/
@@ -53,6 +53,7 @@ static int yyline; /* keep track of the line number for error reporting */
53
53
54
54
%option 8bit
55
55
%option never-interactive
56
+ %option nodefault
56
57
%option nounput
57
58
%option noyywrap
58
59
Original file line number Diff line number Diff line change 4
4
*
5
5
* Copyright (c) 2000-2003, PostgreSQL Global Development Group
6
6
*
7
- * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.20 2003/11/29 19:52:03 pgsql Exp $
7
+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.21 2004/02/24 22:06:32 tgl Exp $
8
8
*/
9
9
10
10
%{
@@ -47,6 +47,7 @@ char *GUC_scanstr(char *);
47
47
48
48
%option 8bit
49
49
%option never-interactive
50
+ %option nodefault
50
51
%option nounput
51
52
%option noyywrap
52
53
Original file line number Diff line number Diff line change 12
12
*
13
13
*
14
14
* IDENTIFICATION
15
- * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.125 2004/02/15 13:48:54 meskes Exp $
15
+ * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.126 2004/02/24 22:06:32 tgl Exp $
16
16
*
17
17
*-------------------------------------------------------------------------
18
18
*/
@@ -70,6 +70,7 @@ static struct _if_value
70
70
71
71
%option 8bit
72
72
%option never-interactive
73
+ %option nodefault
73
74
%option noyywrap
74
75
75
76
%option yylineno
Original file line number Diff line number Diff line change 4
4
* procedural language
5
5
*
6
6
* IDENTIFICATION
7
- * $PostgreSQL: pgsql/src/pl/plpgsql/src/scan.l,v 1.30 2003/11/29 19:52:12 pgsql Exp $
7
+ * $PostgreSQL: pgsql/src/pl/plpgsql/src/scan.l,v 1.31 2004/02/24 22:06:32 tgl Exp $
8
8
*
9
9
* This software is copyrighted by Jan Wieck - Hamburg.
10
10
*
@@ -63,6 +63,7 @@ int plpgsql_SpaceScanned = 0;
63
63
64
64
%option 8bit
65
65
%option never-interactive
66
+ %option nodefault
66
67
%option nounput
67
68
%option noyywrap
68
69
@@ -272,20 +273,21 @@ dump { return O_DUMP; }
272
273
BEGIN IN_STRING;
273
274
}
274
275
<IN_STRING >\\ . { }
276
+ <IN_STRING >\\ { /* can only happen with \ at EOF */ }
275
277
<IN_STRING >'' { }
276
278
<IN_STRING >' {
277
279
yyleng -= (yytext - start_charpos);
278
280
yytext = start_charpos;
279
281
BEGIN INITIAL;
280
282
return T_STRING;
281
283
}
284
+ <IN_STRING >[^ ' \\ ]+ { }
282
285
<IN_STRING ><<EOF>> {
283
286
plpgsql_error_lineno = start_lineno;
284
287
ereport (ERROR,
285
288
(errcode (ERRCODE_DATATYPE_MISMATCH),
286
289
errmsg (" unterminated string" )));
287
290
}
288
- <IN_STRING >[^ ' \\ ]* { }
289
291
290
292
/* ----------
291
293
* Any unmatched character is returned as is
You can’t perform that action at this time.
0 commit comments