summaryrefslogtreecommitdiff
path: root/src/backend/bootstrap/bootscanner.l
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2002-07-30 16:33:08 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2002-07-30 16:33:08 +0000
commit9f1fc1080e91005cad96f84463e2392604823024 (patch)
tree6ef13d6e0f5bd9efc7c4aad4ec7953f8c341a2c1 /src/backend/bootstrap/bootscanner.l
parent74780590d81150712e7971a9a6af24c0ef78842f (diff)
downloadpostgresql-9f1fc1080e91005cad96f84463e2392604823024.tar.gz
Since we're depending on %option noyywrap in the main scanner now,
we may as well use it in all our flex files. Make all the flex files have a consistent set of options.
Diffstat (limited to 'src/backend/bootstrap/bootscanner.l')
-rw-r--r--src/backend/bootstrap/bootscanner.l20
1 files changed, 7 insertions, 13 deletions
diff --git a/src/backend/bootstrap/bootscanner.l b/src/backend/bootstrap/bootscanner.l
index 6261e8fc81..ac94d0001b 100644
--- a/src/backend/bootstrap/bootscanner.l
+++ b/src/backend/bootstrap/bootscanner.l
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.24 2002/06/20 20:29:26 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.25 2002/07/30 16:33:08 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -42,18 +42,18 @@
#include "bootstrap_tokens.h"
-#define YY_NO_UNPUT
-
-/* some versions of lex define this as a macro */
-#if defined(yywrap)
-#undef yywrap
-#endif /* yywrap */
YYSTYPE yylval;
int yyline; /* keep track of the line number for error reporting */
%}
+%option 8bit
+%option never-interactive
+%option nounput
+%option noyywrap
+
+
D [0-9]
oct \\{D}{D}{D}
Exp [Ee][-+]?{D}+
@@ -132,12 +132,6 @@ insert { return(INSERT_TUPLE); }
%%
-int
-yywrap(void)
-{
- return 1;
-}
-
void
yyerror(const char *str)
{