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.
This commit is contained in:
Tom Lane
parent
74780590d8
commit
9f1fc1080e
@ -10,8 +10,6 @@
|
||||
#include "cubeparse.h"
|
||||
#include "buffer.h"
|
||||
|
||||
#define YY_NO_UNPUT 1
|
||||
#undef yywrap
|
||||
|
||||
/* flex screws a couple symbols when used with the -P otion; fix those */
|
||||
#define YY_DECL int cube_yylex YY_PROTO(( void )); \
|
||||
@ -28,6 +26,12 @@ int cube_yylex YY_PROTO(( void ))
|
||||
void cube_flush_scanner_buffer(void);
|
||||
%}
|
||||
|
||||
%option 8bit
|
||||
%option never-interactive
|
||||
%option nounput
|
||||
%option noyywrap
|
||||
|
||||
|
||||
n [0-9]+
|
||||
integer [+-]?{n}
|
||||
real [+-]?({n}\.{n}?)|(\.{n})
|
||||
|
||||
@ -8,8 +8,6 @@
|
||||
#include "segparse.h"
|
||||
#include "buffer.h"
|
||||
|
||||
#define YY_NO_UNPUT 1
|
||||
#undef yywrap
|
||||
|
||||
/* flex screws a couple symbols when used with the -P otion; fix those */
|
||||
#define YY_DECL int seg_yylex YY_PROTO(( void )); \
|
||||
@ -27,6 +25,12 @@ int seg_yylex YY_PROTO(( void ))
|
||||
void seg_flush_scanner_buffer(void);
|
||||
%}
|
||||
|
||||
%option 8bit
|
||||
%option never-interactive
|
||||
%option nounput
|
||||
%option noyywrap
|
||||
|
||||
|
||||
range (\.\.)(\.)?
|
||||
plumin (\'\+\-\')|(\(\+\-)\)
|
||||
integer [+-]?[0-9]+
|
||||
|
||||
@ -50,9 +50,14 @@ int bytestoread = 0; /* for limiting read from filehandle */
|
||||
} \
|
||||
}
|
||||
|
||||
#define YY_NO_UNPUT
|
||||
%}
|
||||
|
||||
%option 8bit
|
||||
%option never-interactive
|
||||
%option nounput
|
||||
%option noyywrap
|
||||
|
||||
|
||||
/* parser's state for parsing defis-word */
|
||||
%x DELIM
|
||||
/* parser's state for parsing URL*/
|
||||
@ -289,10 +294,6 @@ ftp"://" {
|
||||
|
||||
%%
|
||||
|
||||
int tsearch_yywrap(void) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* clearing after parsing from string */
|
||||
void end_parse() {
|
||||
if (s) { free(s); s=NULL; }
|
||||
|
||||
@ -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)
|
||||
{
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
*
|
||||
* Copyright 2000 by PostgreSQL Global Development Group
|
||||
*
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc-file.l,v 1.12 2002/05/17 01:19:18 tgl Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc-file.l,v 1.13 2002/07/30 16:33:08 tgl Exp $
|
||||
*/
|
||||
|
||||
%{
|
||||
@ -38,18 +38,19 @@ enum {
|
||||
GUC_ERROR = 100
|
||||
};
|
||||
|
||||
#if defined(yywrap)
|
||||
#undef yywrap
|
||||
#endif /* yywrap */
|
||||
|
||||
#define YY_USER_INIT (ConfigFileLineno = 1)
|
||||
#define YY_NO_UNPUT
|
||||
|
||||
/* prototype, so compiler is happy with our high warnings setting */
|
||||
int GUC_yylex(void);
|
||||
char *GUC_scanstr(char *);
|
||||
%}
|
||||
|
||||
%option 8bit
|
||||
%option never-interactive
|
||||
%option nounput
|
||||
%option noyywrap
|
||||
|
||||
|
||||
SIGN ("-"|"+")
|
||||
DIGIT [0-9]
|
||||
HEXDIGIT [0-9a-fA-F]
|
||||
@ -271,12 +272,6 @@ ProcessConfigFile(GucContext context)
|
||||
|
||||
|
||||
|
||||
int
|
||||
yywrap(void)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* ----------------
|
||||
* scanstr
|
||||
*
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.97 2002/07/20 08:24:18 meskes Exp $
|
||||
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.98 2002/07/30 16:33:08 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -26,12 +26,6 @@
|
||||
#include "extern.h"
|
||||
#include "preproc.h"
|
||||
|
||||
/* some versions of lex define this as a macro */
|
||||
#if defined(yywrap)
|
||||
#undef yywrap
|
||||
#endif /* yywrap */
|
||||
|
||||
#define YY_NO_UNPUT
|
||||
|
||||
extern YYSTYPE yylval;
|
||||
|
||||
@ -75,7 +69,13 @@ static struct _if_value
|
||||
|
||||
%}
|
||||
|
||||
%option 8bit
|
||||
%option never-interactive
|
||||
%option nounput
|
||||
%option noyywrap
|
||||
|
||||
%option yylineno
|
||||
|
||||
%s C SQL incl def def_ident
|
||||
|
||||
/*
|
||||
@ -945,10 +945,3 @@ addlitchar(unsigned char ychar)
|
||||
literallen += 1;
|
||||
literalbuf[literallen] = '\0';
|
||||
}
|
||||
|
||||
int
|
||||
yywrap(void)
|
||||
{
|
||||
return(1);
|
||||
}
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* procedural language
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/scan.l,v 1.17 2002/03/06 18:50:29 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/scan.l,v 1.18 2002/07/30 16:33:08 tgl Exp $
|
||||
*
|
||||
* This software is copyrighted by Jan Wieck - Hamburg.
|
||||
*
|
||||
@ -52,9 +52,13 @@ int plpgsql_SpaceScanned = 0;
|
||||
static void plpgsql_input(char *buf, int *result, int max);
|
||||
|
||||
#define YY_INPUT(buf,res,max) plpgsql_input(buf, &res, max)
|
||||
#define YY_NO_UNPUT
|
||||
%}
|
||||
|
||||
%option 8bit
|
||||
%option never-interactive
|
||||
%option nounput
|
||||
%option noyywrap
|
||||
|
||||
%option yylineno
|
||||
|
||||
|
||||
@ -215,12 +219,6 @@ dump { return O_DUMP; }
|
||||
|
||||
%%
|
||||
|
||||
int
|
||||
yywrap()
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
plpgsql_input(char *buf, int *result, int max)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user