1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge 10.1 into 10.2

This commit is contained in:
Marko Mäkelä
2019-04-02 09:14:15 +03:00
21 changed files with 4619 additions and 2379 deletions

View File

@ -387,7 +387,7 @@ SPACE NAME ENCRYPTION_SCHEME KEYSERVER_REQUESTS MIN_KEY_VERSION CURRENT_KEY_VERS
Warnings:
Warning 1012 InnoDB: SELECTing from INFORMATION_SCHEMA.innodb_tablespaces_encryption but the InnoDB storage engine is not installed
select * from information_schema.innodb_tablespaces_scrubbing;
SPACE NAME COMPRESSED LAST_SCRUB_COMPLETED CURRENT_SCRUB_STARTED CURRENT_SCRUB_ACTIVE_THREADS CURRENT_SCRUB_PAGE_NUMBER CURRENT_SCRUB_MAX_PAGE_NUMBER ROTATING_OR_FLUSHING
SPACE NAME COMPRESSED LAST_SCRUB_COMPLETED CURRENT_SCRUB_STARTED CURRENT_SCRUB_ACTIVE_THREADS CURRENT_SCRUB_PAGE_NUMBER CURRENT_SCRUB_MAX_PAGE_NUMBER
Warnings:
Warning 1012 InnoDB: SELECTing from INFORMATION_SCHEMA.innodb_tablespaces_scrubbing but the InnoDB storage engine is not installed
select * from information_schema.innodb_mutexes;

View File

@ -9,23 +9,9 @@ fts0blex.cc: fts0blex.l
fts0tlex.cc: fts0tlex.l
.l.cc:
$(LEX) -P$(subst lex,,$*) -o $*.cc --header-file=../include/$*.h $<
.y.cc:
$(YACC) -p $(PREFIX) -o $*.cc -d $<
mv $*.h ../include
LEX=flex
YACC=bison
PREFIX=fts
all: fts0pars.cc fts0blex.cc fts0tlex.cc
fts0par.cc: fts0pars.y
fts0blex.cc: fts0blex.l
fts0tlex.cc: fts0tlex.l
.l.cc:
$(LEX) -P$(subst lex,,$*) -o $*.cc --header-file=../include/$*.h $<
echo '#include "univ.i"' > $*.cc
$(LEX) --stdout -P$(subst lex,,$*) -o $*.cc \
--header-file=../include/$*.h $< >> $*.cc
.y.cc:
$(YACC) -p $(PREFIX) -o $*.cc -d $<

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -8804,15 +8804,6 @@ static ST_FIELD_INFO innodb_tablespaces_scrubbing_fields_info[] =
STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
#define TABLESPACES_ENCRYPTION_ROTATING_OR_FLUSHING 9
{STRUCT_FLD(field_name, "ROTATING_OR_FLUSHING"),
STRUCT_FLD(field_length, MY_INT32_NUM_DECIMAL_DIGITS),
STRUCT_FLD(field_type, MYSQL_TYPE_LONG),
STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, MY_I_S_UNSIGNED),
STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
END_OF_ST_FIELD_INFO
};

View File

@ -12,12 +12,222 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
#define YY_FLEX_SUBMINOR_VERSION 35
#define YY_FLEX_MINOR_VERSION 6
#define YY_FLEX_SUBMINOR_VERSION 4
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
#ifdef yy_create_buffer
#define fts0b_create_buffer_ALREADY_DEFINED
#else
#define yy_create_buffer fts0b_create_buffer
#endif
#ifdef yy_delete_buffer
#define fts0b_delete_buffer_ALREADY_DEFINED
#else
#define yy_delete_buffer fts0b_delete_buffer
#endif
#ifdef yy_scan_buffer
#define fts0b_scan_buffer_ALREADY_DEFINED
#else
#define yy_scan_buffer fts0b_scan_buffer
#endif
#ifdef yy_scan_string
#define fts0b_scan_string_ALREADY_DEFINED
#else
#define yy_scan_string fts0b_scan_string
#endif
#ifdef yy_scan_bytes
#define fts0b_scan_bytes_ALREADY_DEFINED
#else
#define yy_scan_bytes fts0b_scan_bytes
#endif
#ifdef yy_init_buffer
#define fts0b_init_buffer_ALREADY_DEFINED
#else
#define yy_init_buffer fts0b_init_buffer
#endif
#ifdef yy_flush_buffer
#define fts0b_flush_buffer_ALREADY_DEFINED
#else
#define yy_flush_buffer fts0b_flush_buffer
#endif
#ifdef yy_load_buffer_state
#define fts0b_load_buffer_state_ALREADY_DEFINED
#else
#define yy_load_buffer_state fts0b_load_buffer_state
#endif
#ifdef yy_switch_to_buffer
#define fts0b_switch_to_buffer_ALREADY_DEFINED
#else
#define yy_switch_to_buffer fts0b_switch_to_buffer
#endif
#ifdef yypush_buffer_state
#define fts0bpush_buffer_state_ALREADY_DEFINED
#else
#define yypush_buffer_state fts0bpush_buffer_state
#endif
#ifdef yypop_buffer_state
#define fts0bpop_buffer_state_ALREADY_DEFINED
#else
#define yypop_buffer_state fts0bpop_buffer_state
#endif
#ifdef yyensure_buffer_stack
#define fts0bensure_buffer_stack_ALREADY_DEFINED
#else
#define yyensure_buffer_stack fts0bensure_buffer_stack
#endif
#ifdef yylex
#define fts0blex_ALREADY_DEFINED
#else
#define yylex fts0blex
#endif
#ifdef yyrestart
#define fts0brestart_ALREADY_DEFINED
#else
#define yyrestart fts0brestart
#endif
#ifdef yylex_init
#define fts0blex_init_ALREADY_DEFINED
#else
#define yylex_init fts0blex_init
#endif
#ifdef yylex_init_extra
#define fts0blex_init_extra_ALREADY_DEFINED
#else
#define yylex_init_extra fts0blex_init_extra
#endif
#ifdef yylex_destroy
#define fts0blex_destroy_ALREADY_DEFINED
#else
#define yylex_destroy fts0blex_destroy
#endif
#ifdef yyget_debug
#define fts0bget_debug_ALREADY_DEFINED
#else
#define yyget_debug fts0bget_debug
#endif
#ifdef yyset_debug
#define fts0bset_debug_ALREADY_DEFINED
#else
#define yyset_debug fts0bset_debug
#endif
#ifdef yyget_extra
#define fts0bget_extra_ALREADY_DEFINED
#else
#define yyget_extra fts0bget_extra
#endif
#ifdef yyset_extra
#define fts0bset_extra_ALREADY_DEFINED
#else
#define yyset_extra fts0bset_extra
#endif
#ifdef yyget_in
#define fts0bget_in_ALREADY_DEFINED
#else
#define yyget_in fts0bget_in
#endif
#ifdef yyset_in
#define fts0bset_in_ALREADY_DEFINED
#else
#define yyset_in fts0bset_in
#endif
#ifdef yyget_out
#define fts0bget_out_ALREADY_DEFINED
#else
#define yyget_out fts0bget_out
#endif
#ifdef yyset_out
#define fts0bset_out_ALREADY_DEFINED
#else
#define yyset_out fts0bset_out
#endif
#ifdef yyget_leng
#define fts0bget_leng_ALREADY_DEFINED
#else
#define yyget_leng fts0bget_leng
#endif
#ifdef yyget_text
#define fts0bget_text_ALREADY_DEFINED
#else
#define yyget_text fts0bget_text
#endif
#ifdef yyget_lineno
#define fts0bget_lineno_ALREADY_DEFINED
#else
#define yyget_lineno fts0bget_lineno
#endif
#ifdef yyset_lineno
#define fts0bset_lineno_ALREADY_DEFINED
#else
#define yyset_lineno fts0bset_lineno
#endif
#ifdef yyget_column
#define fts0bget_column_ALREADY_DEFINED
#else
#define yyget_column fts0bget_column
#endif
#ifdef yyset_column
#define fts0bset_column_ALREADY_DEFINED
#else
#define yyset_column fts0bset_column
#endif
#ifdef yywrap
#define fts0bwrap_ALREADY_DEFINED
#else
#define yywrap fts0bwrap
#endif
#ifdef yyalloc
#define fts0balloc_ALREADY_DEFINED
#else
#define yyalloc fts0balloc
#endif
#ifdef yyrealloc
#define fts0brealloc_ALREADY_DEFINED
#else
#define yyrealloc fts0brealloc
#endif
#ifdef yyfree
#define fts0bfree_ALREADY_DEFINED
#else
#define yyfree fts0bfree
#endif
/* First, we deal with platform-specific or compiler-specific issues. */
/* begin standard C headers. */
@ -88,29 +298,23 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U)
#endif
#ifndef SIZE_MAX
#define SIZE_MAX (~(size_t)0)
#endif
#endif /* ! C99 */
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
/* begin standard C++ headers. */
/* The "const" storage-class-modifier is valid. */
#define YY_USE_CONST
#else /* ! __cplusplus */
/* C99 requires __STDC__ to be defined as 1. */
#if defined (__STDC__)
#define YY_USE_CONST
#endif /* defined (__STDC__) */
#endif /* ! __cplusplus */
#ifdef YY_USE_CONST
/* TODO: this is always defined, so inline it */
#define yyconst const
#if defined(__GNUC__) && __GNUC__ >= 3
#define yynoreturn __attribute__((__noreturn__))
#else
#define yyconst
#define yynoreturn
#endif
/* An opaque pointer. */
@ -165,7 +369,7 @@ struct yy_buffer_state
/* Size of input buffer in bytes, not including room for EOB
* characters.
*/
yy_size_t yy_buf_size;
int yy_buf_size;
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
@ -204,25 +408,25 @@ struct yy_buffer_state
};
#endif /* !YY_STRUCT_YY_BUFFER_STATE */
void fts0brestart (FILE *input_file ,yyscan_t yyscanner );
void fts0b_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
YY_BUFFER_STATE fts0b_create_buffer (FILE *file,int size ,yyscan_t yyscanner );
void fts0b_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
void fts0b_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
void fts0bpush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
void fts0bpop_buffer_state (yyscan_t yyscanner );
void yyrestart ( FILE *input_file , yyscan_t yyscanner );
void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner );
YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner );
void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner );
void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner );
void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner );
void yypop_buffer_state ( yyscan_t yyscanner );
YY_BUFFER_STATE fts0b_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
YY_BUFFER_STATE fts0b_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
YY_BUFFER_STATE fts0b_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner );
YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner );
YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner );
void *fts0balloc (yy_size_t ,yyscan_t yyscanner );
void *fts0brealloc (void *,yy_size_t ,yyscan_t yyscanner );
void fts0bfree (void * ,yyscan_t yyscanner );
void *yyalloc ( yy_size_t , yyscan_t yyscanner );
void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner );
void yyfree ( void * , yyscan_t yyscanner );
/* Begin user sect3 */
#define fts0bwrap(n) 1
#define fts0bwrap(yyscanner) (/*CONSTCOND*/1)
#define YY_SKIP_YYWRAP
#define yytext_ptr yytext_r
@ -244,38 +448,42 @@ void fts0bfree (void * ,yyscan_t yyscanner );
#define YY_EXTRA_TYPE void *
#endif
int fts0blex_init (yyscan_t* scanner);
int yylex_init (yyscan_t* scanner);
int fts0blex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner);
/* Accessor methods to globals.
These are made visible to non-reentrant scanners for convenience. */
int fts0blex_destroy (yyscan_t yyscanner );
int yylex_destroy ( yyscan_t yyscanner );
int fts0bget_debug (yyscan_t yyscanner );
int yyget_debug ( yyscan_t yyscanner );
void fts0bset_debug (int debug_flag ,yyscan_t yyscanner );
void yyset_debug ( int debug_flag , yyscan_t yyscanner );
YY_EXTRA_TYPE fts0bget_extra (yyscan_t yyscanner );
YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner );
void fts0bset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner );
FILE *fts0bget_in (yyscan_t yyscanner );
FILE *yyget_in ( yyscan_t yyscanner );
void fts0bset_in (FILE * in_str ,yyscan_t yyscanner );
void yyset_in ( FILE * _in_str , yyscan_t yyscanner );
FILE *fts0bget_out (yyscan_t yyscanner );
FILE *yyget_out ( yyscan_t yyscanner );
void fts0bset_out (FILE * out_str ,yyscan_t yyscanner );
void yyset_out ( FILE * _out_str , yyscan_t yyscanner );
int fts0bget_leng (yyscan_t yyscanner );
int yyget_leng ( yyscan_t yyscanner );
char *fts0bget_text (yyscan_t yyscanner );
char *yyget_text ( yyscan_t yyscanner );
int fts0bget_lineno (yyscan_t yyscanner );
int yyget_lineno ( yyscan_t yyscanner );
void fts0bset_lineno (int line_number ,yyscan_t yyscanner );
void yyset_lineno ( int _line_number , yyscan_t yyscanner );
int yyget_column ( yyscan_t yyscanner );
void yyset_column ( int _column_no , yyscan_t yyscanner );
/* Macros after this point can all be overridden by user definitions in
* section 1.
@ -283,18 +491,18 @@ void fts0bset_lineno (int line_number ,yyscan_t yyscanner );
#ifndef YY_SKIP_YYWRAP
#ifdef __cplusplus
extern "C" int fts0bwrap (yyscan_t yyscanner );
extern "C" int yywrap ( yyscan_t yyscanner );
#else
extern int fts0bwrap (yyscan_t yyscanner );
extern int yywrap ( yyscan_t yyscanner );
#endif
#endif
#ifndef yytext_ptr
static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner);
#endif
#ifdef YY_NEED_STRLEN
static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
static int yy_flex_strlen ( const char * , yyscan_t yyscanner);
#endif
#ifndef YY_NO_INPUT
@ -322,9 +530,9 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
#ifndef YY_DECL
#define YY_DECL_IS_OURS 1
extern int fts0blex (yyscan_t yyscanner);
extern int yylex (yyscan_t yyscanner);
#define YY_DECL int fts0blex (yyscan_t yyscanner)
#define YY_DECL int yylex (yyscan_t yyscanner)
#endif /* !YY_DECL */
/* yy_get_previous_state - get the state just before the EOB char was reached */
@ -341,9 +549,154 @@ extern int fts0blex (yyscan_t yyscanner);
#undef YY_DECL
#endif
#ifndef fts0b_create_buffer_ALREADY_DEFINED
#undef yy_create_buffer
#endif
#ifndef fts0b_delete_buffer_ALREADY_DEFINED
#undef yy_delete_buffer
#endif
#ifndef fts0b_scan_buffer_ALREADY_DEFINED
#undef yy_scan_buffer
#endif
#ifndef fts0b_scan_string_ALREADY_DEFINED
#undef yy_scan_string
#endif
#ifndef fts0b_scan_bytes_ALREADY_DEFINED
#undef yy_scan_bytes
#endif
#ifndef fts0b_init_buffer_ALREADY_DEFINED
#undef yy_init_buffer
#endif
#ifndef fts0b_flush_buffer_ALREADY_DEFINED
#undef yy_flush_buffer
#endif
#ifndef fts0b_load_buffer_state_ALREADY_DEFINED
#undef yy_load_buffer_state
#endif
#ifndef fts0b_switch_to_buffer_ALREADY_DEFINED
#undef yy_switch_to_buffer
#endif
#ifndef fts0bpush_buffer_state_ALREADY_DEFINED
#undef yypush_buffer_state
#endif
#ifndef fts0bpop_buffer_state_ALREADY_DEFINED
#undef yypop_buffer_state
#endif
#ifndef fts0bensure_buffer_stack_ALREADY_DEFINED
#undef yyensure_buffer_stack
#endif
#ifndef fts0blex_ALREADY_DEFINED
#undef yylex
#endif
#ifndef fts0brestart_ALREADY_DEFINED
#undef yyrestart
#endif
#ifndef fts0blex_init_ALREADY_DEFINED
#undef yylex_init
#endif
#ifndef fts0blex_init_extra_ALREADY_DEFINED
#undef yylex_init_extra
#endif
#ifndef fts0blex_destroy_ALREADY_DEFINED
#undef yylex_destroy
#endif
#ifndef fts0bget_debug_ALREADY_DEFINED
#undef yyget_debug
#endif
#ifndef fts0bset_debug_ALREADY_DEFINED
#undef yyset_debug
#endif
#ifndef fts0bget_extra_ALREADY_DEFINED
#undef yyget_extra
#endif
#ifndef fts0bset_extra_ALREADY_DEFINED
#undef yyset_extra
#endif
#ifndef fts0bget_in_ALREADY_DEFINED
#undef yyget_in
#endif
#ifndef fts0bset_in_ALREADY_DEFINED
#undef yyset_in
#endif
#ifndef fts0bget_out_ALREADY_DEFINED
#undef yyget_out
#endif
#ifndef fts0bset_out_ALREADY_DEFINED
#undef yyset_out
#endif
#ifndef fts0bget_leng_ALREADY_DEFINED
#undef yyget_leng
#endif
#ifndef fts0bget_text_ALREADY_DEFINED
#undef yyget_text
#endif
#ifndef fts0bget_lineno_ALREADY_DEFINED
#undef yyget_lineno
#endif
#ifndef fts0bset_lineno_ALREADY_DEFINED
#undef yyset_lineno
#endif
#ifndef fts0bget_column_ALREADY_DEFINED
#undef yyget_column
#endif
#ifndef fts0bset_column_ALREADY_DEFINED
#undef yyset_column
#endif
#ifndef fts0bwrap_ALREADY_DEFINED
#undef yywrap
#endif
#ifndef fts0bget_lval_ALREADY_DEFINED
#undef yyget_lval
#endif
#ifndef fts0bset_lval_ALREADY_DEFINED
#undef yyset_lval
#endif
#ifndef fts0bget_lloc_ALREADY_DEFINED
#undef yyget_lloc
#endif
#ifndef fts0bset_lloc_ALREADY_DEFINED
#undef yyset_lloc
#endif
#ifndef fts0balloc_ALREADY_DEFINED
#undef yyalloc
#endif
#ifndef fts0brealloc_ALREADY_DEFINED
#undef yyrealloc
#endif
#ifndef fts0bfree_ALREADY_DEFINED
#undef yyfree
#endif
#ifndef fts0btext_ALREADY_DEFINED
#undef yytext
#endif
#ifndef fts0bleng_ALREADY_DEFINED
#undef yyleng
#endif
#ifndef fts0bin_ALREADY_DEFINED
#undef yyin
#endif
#ifndef fts0bout_ALREADY_DEFINED
#undef yyout
#endif
#ifndef fts0b_flex_debug_ALREADY_DEFINED
#undef yy_flex_debug
#endif
#ifndef fts0blineno_ALREADY_DEFINED
#undef yylineno
#endif
#ifndef fts0btables_fload_ALREADY_DEFINED
#undef yytables_fload
#endif
#ifndef fts0btables_destroy_ALREADY_DEFINED
#undef yytables_destroy
#endif
#ifndef fts0bTABLES_NAME_ALREADY_DEFINED
#undef yyTABLES_NAME
#endif
#line 74 "fts0blex.l"
#line 348 "../include/fts0blex.h"
#line 701 "../include/fts0blex.h"
#undef fts0bIN_HEADER
#endif /* fts0bHEADER_H */

View File

@ -12,12 +12,222 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
#define YY_FLEX_SUBMINOR_VERSION 35
#define YY_FLEX_MINOR_VERSION 6
#define YY_FLEX_SUBMINOR_VERSION 4
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
#ifdef yy_create_buffer
#define fts0t_create_buffer_ALREADY_DEFINED
#else
#define yy_create_buffer fts0t_create_buffer
#endif
#ifdef yy_delete_buffer
#define fts0t_delete_buffer_ALREADY_DEFINED
#else
#define yy_delete_buffer fts0t_delete_buffer
#endif
#ifdef yy_scan_buffer
#define fts0t_scan_buffer_ALREADY_DEFINED
#else
#define yy_scan_buffer fts0t_scan_buffer
#endif
#ifdef yy_scan_string
#define fts0t_scan_string_ALREADY_DEFINED
#else
#define yy_scan_string fts0t_scan_string
#endif
#ifdef yy_scan_bytes
#define fts0t_scan_bytes_ALREADY_DEFINED
#else
#define yy_scan_bytes fts0t_scan_bytes
#endif
#ifdef yy_init_buffer
#define fts0t_init_buffer_ALREADY_DEFINED
#else
#define yy_init_buffer fts0t_init_buffer
#endif
#ifdef yy_flush_buffer
#define fts0t_flush_buffer_ALREADY_DEFINED
#else
#define yy_flush_buffer fts0t_flush_buffer
#endif
#ifdef yy_load_buffer_state
#define fts0t_load_buffer_state_ALREADY_DEFINED
#else
#define yy_load_buffer_state fts0t_load_buffer_state
#endif
#ifdef yy_switch_to_buffer
#define fts0t_switch_to_buffer_ALREADY_DEFINED
#else
#define yy_switch_to_buffer fts0t_switch_to_buffer
#endif
#ifdef yypush_buffer_state
#define fts0tpush_buffer_state_ALREADY_DEFINED
#else
#define yypush_buffer_state fts0tpush_buffer_state
#endif
#ifdef yypop_buffer_state
#define fts0tpop_buffer_state_ALREADY_DEFINED
#else
#define yypop_buffer_state fts0tpop_buffer_state
#endif
#ifdef yyensure_buffer_stack
#define fts0tensure_buffer_stack_ALREADY_DEFINED
#else
#define yyensure_buffer_stack fts0tensure_buffer_stack
#endif
#ifdef yylex
#define fts0tlex_ALREADY_DEFINED
#else
#define yylex fts0tlex
#endif
#ifdef yyrestart
#define fts0trestart_ALREADY_DEFINED
#else
#define yyrestart fts0trestart
#endif
#ifdef yylex_init
#define fts0tlex_init_ALREADY_DEFINED
#else
#define yylex_init fts0tlex_init
#endif
#ifdef yylex_init_extra
#define fts0tlex_init_extra_ALREADY_DEFINED
#else
#define yylex_init_extra fts0tlex_init_extra
#endif
#ifdef yylex_destroy
#define fts0tlex_destroy_ALREADY_DEFINED
#else
#define yylex_destroy fts0tlex_destroy
#endif
#ifdef yyget_debug
#define fts0tget_debug_ALREADY_DEFINED
#else
#define yyget_debug fts0tget_debug
#endif
#ifdef yyset_debug
#define fts0tset_debug_ALREADY_DEFINED
#else
#define yyset_debug fts0tset_debug
#endif
#ifdef yyget_extra
#define fts0tget_extra_ALREADY_DEFINED
#else
#define yyget_extra fts0tget_extra
#endif
#ifdef yyset_extra
#define fts0tset_extra_ALREADY_DEFINED
#else
#define yyset_extra fts0tset_extra
#endif
#ifdef yyget_in
#define fts0tget_in_ALREADY_DEFINED
#else
#define yyget_in fts0tget_in
#endif
#ifdef yyset_in
#define fts0tset_in_ALREADY_DEFINED
#else
#define yyset_in fts0tset_in
#endif
#ifdef yyget_out
#define fts0tget_out_ALREADY_DEFINED
#else
#define yyget_out fts0tget_out
#endif
#ifdef yyset_out
#define fts0tset_out_ALREADY_DEFINED
#else
#define yyset_out fts0tset_out
#endif
#ifdef yyget_leng
#define fts0tget_leng_ALREADY_DEFINED
#else
#define yyget_leng fts0tget_leng
#endif
#ifdef yyget_text
#define fts0tget_text_ALREADY_DEFINED
#else
#define yyget_text fts0tget_text
#endif
#ifdef yyget_lineno
#define fts0tget_lineno_ALREADY_DEFINED
#else
#define yyget_lineno fts0tget_lineno
#endif
#ifdef yyset_lineno
#define fts0tset_lineno_ALREADY_DEFINED
#else
#define yyset_lineno fts0tset_lineno
#endif
#ifdef yyget_column
#define fts0tget_column_ALREADY_DEFINED
#else
#define yyget_column fts0tget_column
#endif
#ifdef yyset_column
#define fts0tset_column_ALREADY_DEFINED
#else
#define yyset_column fts0tset_column
#endif
#ifdef yywrap
#define fts0twrap_ALREADY_DEFINED
#else
#define yywrap fts0twrap
#endif
#ifdef yyalloc
#define fts0talloc_ALREADY_DEFINED
#else
#define yyalloc fts0talloc
#endif
#ifdef yyrealloc
#define fts0trealloc_ALREADY_DEFINED
#else
#define yyrealloc fts0trealloc
#endif
#ifdef yyfree
#define fts0tfree_ALREADY_DEFINED
#else
#define yyfree fts0tfree
#endif
/* First, we deal with platform-specific or compiler-specific issues. */
/* begin standard C headers. */
@ -88,29 +298,23 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U)
#endif
#ifndef SIZE_MAX
#define SIZE_MAX (~(size_t)0)
#endif
#endif /* ! C99 */
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
/* begin standard C++ headers. */
/* The "const" storage-class-modifier is valid. */
#define YY_USE_CONST
#else /* ! __cplusplus */
/* C99 requires __STDC__ to be defined as 1. */
#if defined (__STDC__)
#define YY_USE_CONST
#endif /* defined (__STDC__) */
#endif /* ! __cplusplus */
#ifdef YY_USE_CONST
/* TODO: this is always defined, so inline it */
#define yyconst const
#if defined(__GNUC__) && __GNUC__ >= 3
#define yynoreturn __attribute__((__noreturn__))
#else
#define yyconst
#define yynoreturn
#endif
/* An opaque pointer. */
@ -165,7 +369,7 @@ struct yy_buffer_state
/* Size of input buffer in bytes, not including room for EOB
* characters.
*/
yy_size_t yy_buf_size;
int yy_buf_size;
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
@ -204,25 +408,25 @@ struct yy_buffer_state
};
#endif /* !YY_STRUCT_YY_BUFFER_STATE */
void fts0trestart (FILE *input_file ,yyscan_t yyscanner );
void fts0t_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
YY_BUFFER_STATE fts0t_create_buffer (FILE *file,int size ,yyscan_t yyscanner );
void fts0t_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
void fts0t_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
void fts0tpush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
void fts0tpop_buffer_state (yyscan_t yyscanner );
void yyrestart ( FILE *input_file , yyscan_t yyscanner );
void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner );
YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner );
void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner );
void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner );
void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner );
void yypop_buffer_state ( yyscan_t yyscanner );
YY_BUFFER_STATE fts0t_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
YY_BUFFER_STATE fts0t_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
YY_BUFFER_STATE fts0t_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner );
YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner );
YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner );
void *fts0talloc (yy_size_t ,yyscan_t yyscanner );
void *fts0trealloc (void *,yy_size_t ,yyscan_t yyscanner );
void fts0tfree (void * ,yyscan_t yyscanner );
void *yyalloc ( yy_size_t , yyscan_t yyscanner );
void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner );
void yyfree ( void * , yyscan_t yyscanner );
/* Begin user sect3 */
#define fts0twrap(n) 1
#define fts0twrap(yyscanner) (/*CONSTCOND*/1)
#define YY_SKIP_YYWRAP
#define yytext_ptr yytext_r
@ -244,38 +448,42 @@ void fts0tfree (void * ,yyscan_t yyscanner );
#define YY_EXTRA_TYPE void *
#endif
int fts0tlex_init (yyscan_t* scanner);
int yylex_init (yyscan_t* scanner);
int fts0tlex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner);
/* Accessor methods to globals.
These are made visible to non-reentrant scanners for convenience. */
int fts0tlex_destroy (yyscan_t yyscanner );
int yylex_destroy ( yyscan_t yyscanner );
int fts0tget_debug (yyscan_t yyscanner );
int yyget_debug ( yyscan_t yyscanner );
void fts0tset_debug (int debug_flag ,yyscan_t yyscanner );
void yyset_debug ( int debug_flag , yyscan_t yyscanner );
YY_EXTRA_TYPE fts0tget_extra (yyscan_t yyscanner );
YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner );
void fts0tset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner );
FILE *fts0tget_in (yyscan_t yyscanner );
FILE *yyget_in ( yyscan_t yyscanner );
void fts0tset_in (FILE * in_str ,yyscan_t yyscanner );
void yyset_in ( FILE * _in_str , yyscan_t yyscanner );
FILE *fts0tget_out (yyscan_t yyscanner );
FILE *yyget_out ( yyscan_t yyscanner );
void fts0tset_out (FILE * out_str ,yyscan_t yyscanner );
void yyset_out ( FILE * _out_str , yyscan_t yyscanner );
int fts0tget_leng (yyscan_t yyscanner );
int yyget_leng ( yyscan_t yyscanner );
char *fts0tget_text (yyscan_t yyscanner );
char *yyget_text ( yyscan_t yyscanner );
int fts0tget_lineno (yyscan_t yyscanner );
int yyget_lineno ( yyscan_t yyscanner );
void fts0tset_lineno (int line_number ,yyscan_t yyscanner );
void yyset_lineno ( int _line_number , yyscan_t yyscanner );
int yyget_column ( yyscan_t yyscanner );
void yyset_column ( int _column_no , yyscan_t yyscanner );
/* Macros after this point can all be overridden by user definitions in
* section 1.
@ -283,18 +491,18 @@ void fts0tset_lineno (int line_number ,yyscan_t yyscanner );
#ifndef YY_SKIP_YYWRAP
#ifdef __cplusplus
extern "C" int fts0twrap (yyscan_t yyscanner );
extern "C" int yywrap ( yyscan_t yyscanner );
#else
extern int fts0twrap (yyscan_t yyscanner );
extern int yywrap ( yyscan_t yyscanner );
#endif
#endif
#ifndef yytext_ptr
static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner);
#endif
#ifdef YY_NEED_STRLEN
static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
static int yy_flex_strlen ( const char * , yyscan_t yyscanner);
#endif
#ifndef YY_NO_INPUT
@ -322,9 +530,9 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
#ifndef YY_DECL
#define YY_DECL_IS_OURS 1
extern int fts0tlex (yyscan_t yyscanner);
extern int yylex (yyscan_t yyscanner);
#define YY_DECL int fts0tlex (yyscan_t yyscanner)
#define YY_DECL int yylex (yyscan_t yyscanner)
#endif /* !YY_DECL */
/* yy_get_previous_state - get the state just before the EOB char was reached */
@ -341,9 +549,154 @@ extern int fts0tlex (yyscan_t yyscanner);
#undef YY_DECL
#endif
#ifndef fts0t_create_buffer_ALREADY_DEFINED
#undef yy_create_buffer
#endif
#ifndef fts0t_delete_buffer_ALREADY_DEFINED
#undef yy_delete_buffer
#endif
#ifndef fts0t_scan_buffer_ALREADY_DEFINED
#undef yy_scan_buffer
#endif
#ifndef fts0t_scan_string_ALREADY_DEFINED
#undef yy_scan_string
#endif
#ifndef fts0t_scan_bytes_ALREADY_DEFINED
#undef yy_scan_bytes
#endif
#ifndef fts0t_init_buffer_ALREADY_DEFINED
#undef yy_init_buffer
#endif
#ifndef fts0t_flush_buffer_ALREADY_DEFINED
#undef yy_flush_buffer
#endif
#ifndef fts0t_load_buffer_state_ALREADY_DEFINED
#undef yy_load_buffer_state
#endif
#ifndef fts0t_switch_to_buffer_ALREADY_DEFINED
#undef yy_switch_to_buffer
#endif
#ifndef fts0tpush_buffer_state_ALREADY_DEFINED
#undef yypush_buffer_state
#endif
#ifndef fts0tpop_buffer_state_ALREADY_DEFINED
#undef yypop_buffer_state
#endif
#ifndef fts0tensure_buffer_stack_ALREADY_DEFINED
#undef yyensure_buffer_stack
#endif
#ifndef fts0tlex_ALREADY_DEFINED
#undef yylex
#endif
#ifndef fts0trestart_ALREADY_DEFINED
#undef yyrestart
#endif
#ifndef fts0tlex_init_ALREADY_DEFINED
#undef yylex_init
#endif
#ifndef fts0tlex_init_extra_ALREADY_DEFINED
#undef yylex_init_extra
#endif
#ifndef fts0tlex_destroy_ALREADY_DEFINED
#undef yylex_destroy
#endif
#ifndef fts0tget_debug_ALREADY_DEFINED
#undef yyget_debug
#endif
#ifndef fts0tset_debug_ALREADY_DEFINED
#undef yyset_debug
#endif
#ifndef fts0tget_extra_ALREADY_DEFINED
#undef yyget_extra
#endif
#ifndef fts0tset_extra_ALREADY_DEFINED
#undef yyset_extra
#endif
#ifndef fts0tget_in_ALREADY_DEFINED
#undef yyget_in
#endif
#ifndef fts0tset_in_ALREADY_DEFINED
#undef yyset_in
#endif
#ifndef fts0tget_out_ALREADY_DEFINED
#undef yyget_out
#endif
#ifndef fts0tset_out_ALREADY_DEFINED
#undef yyset_out
#endif
#ifndef fts0tget_leng_ALREADY_DEFINED
#undef yyget_leng
#endif
#ifndef fts0tget_text_ALREADY_DEFINED
#undef yyget_text
#endif
#ifndef fts0tget_lineno_ALREADY_DEFINED
#undef yyget_lineno
#endif
#ifndef fts0tset_lineno_ALREADY_DEFINED
#undef yyset_lineno
#endif
#ifndef fts0tget_column_ALREADY_DEFINED
#undef yyget_column
#endif
#ifndef fts0tset_column_ALREADY_DEFINED
#undef yyset_column
#endif
#ifndef fts0twrap_ALREADY_DEFINED
#undef yywrap
#endif
#ifndef fts0tget_lval_ALREADY_DEFINED
#undef yyget_lval
#endif
#ifndef fts0tset_lval_ALREADY_DEFINED
#undef yyset_lval
#endif
#ifndef fts0tget_lloc_ALREADY_DEFINED
#undef yyget_lloc
#endif
#ifndef fts0tset_lloc_ALREADY_DEFINED
#undef yyset_lloc
#endif
#ifndef fts0talloc_ALREADY_DEFINED
#undef yyalloc
#endif
#ifndef fts0trealloc_ALREADY_DEFINED
#undef yyrealloc
#endif
#ifndef fts0tfree_ALREADY_DEFINED
#undef yyfree
#endif
#ifndef fts0ttext_ALREADY_DEFINED
#undef yytext
#endif
#ifndef fts0tleng_ALREADY_DEFINED
#undef yyleng
#endif
#ifndef fts0tin_ALREADY_DEFINED
#undef yyin
#endif
#ifndef fts0tout_ALREADY_DEFINED
#undef yyout
#endif
#ifndef fts0t_flex_debug_ALREADY_DEFINED
#undef yy_flex_debug
#endif
#ifndef fts0tlineno_ALREADY_DEFINED
#undef yylineno
#endif
#ifndef fts0ttables_fload_ALREADY_DEFINED
#undef yytables_fload
#endif
#ifndef fts0ttables_destroy_ALREADY_DEFINED
#undef yytables_destroy
#endif
#ifndef fts0tTABLES_NAME_ALREADY_DEFINED
#undef yyTABLES_NAME
#endif
#line 69 "fts0tlex.l"
#line 348 "../include/fts0tlex.h"
#line 701 "../include/fts0tlex.h"
#undef fts0tIN_HEADER
#endif /* fts0tHEADER_H */

View File

@ -1,7 +1,7 @@
/*****************************************************************************
Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2017, 2018, MariaDB Corporation.
Copyright (c) 2017, 2019, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@ -101,11 +101,11 @@ pars_sql(
/*************************************************************//**
Retrieves characters to the lexical analyzer.
@return number of characters copied or 0 on EOF */
int
size_t
pars_get_lex_chars(
/*===============*/
char* buf, /*!< in/out: buffer where to copy */
int max_size); /*!< in: maximum number of characters which fit
size_t max_size); /*!< in: maximum number of characters which fit
in the buffer */
/*************************************************************//**
Called by yyparse on error. */

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
#!/bin/bash
#
# Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
# Copyright (c) 2017, MariaDB Corporation.
# Copyright (c) 2017, 2019, MariaDB Corporation.
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
@ -24,15 +24,14 @@ OUTFILE=lexyy.cc
flex -o $TMPFILE pars0lex.l
# AIX needs its includes done in a certain order, so include "univ.i" first
# to be sure we get it right.
# The Microsoft compiler needs its includes done in a certain order.
echo '#include "univ.i"' > $OUTFILE
# flex assigns a pointer to an int in one place without a cast, resulting in
# a warning on Win64. Add the cast. Also define some symbols as static.
sed -e '
s/'"$TMPFILE"'/'"$OUTFILE"'/;
s/^void yyset_extra *(YY_EXTRA_TYPE *user_defined *);//
s/^void *yyset_extra *( *YY_EXTRA_TYPE *user_defined *) *;//
s/\(int offset = \)\((yy_c_buf_p) - (yytext_ptr)\);/\1(int)(\2);/;
s/\(void yy\(restart\|_\(delete\|flush\)_buffer\)\)/static \1/;
s/\(void yy_switch_to_buffer\)/MY_ATTRIBUTE((unused)) static \1/;

View File

@ -1,7 +1,7 @@
/*****************************************************************************
Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2017, MariaDB Corporation.
Copyright (c) 2017, 2019, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@ -65,9 +65,8 @@ Created 12/14/1997 Heikki Tuuri
#define realloc(P, A) ut_realloc(P, A)
#define exit(A) ut_error
/* Note: We cast &result to int* from yysize_t* */
#define YY_INPUT(buf, result, max_size) \
(result = pars_get_lex_chars(buf, max_size))
result = pars_get_lex_chars(buf, max_size)
/* String buffer for removing quotes */
static ulint stringbuf_len_alloc = 0; /* Allocated length */

View File

@ -1,6 +1,7 @@
/*****************************************************************************
Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2019, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@ -2057,16 +2058,14 @@ pars_stored_procedure_call(
/*************************************************************//**
Retrieves characters to the lexical analyzer. */
int
size_t
pars_get_lex_chars(
/*===============*/
char* buf, /*!< in/out: buffer where to copy */
int max_size) /*!< in: maximum number of characters which fit
size_t max_size) /*!< in: maximum number of characters which fit
in the buffer */
{
int len;
len = static_cast<int>(
size_t len = size_t(
pars_sym_tab_global->string_len
- pars_sym_tab_global->next_char_pos);
if (len == 0) {

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -12,12 +12,222 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
#define YY_FLEX_SUBMINOR_VERSION 35
#define YY_FLEX_MINOR_VERSION 6
#define YY_FLEX_SUBMINOR_VERSION 4
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
#ifdef yy_create_buffer
#define fts0b_create_buffer_ALREADY_DEFINED
#else
#define yy_create_buffer fts0b_create_buffer
#endif
#ifdef yy_delete_buffer
#define fts0b_delete_buffer_ALREADY_DEFINED
#else
#define yy_delete_buffer fts0b_delete_buffer
#endif
#ifdef yy_scan_buffer
#define fts0b_scan_buffer_ALREADY_DEFINED
#else
#define yy_scan_buffer fts0b_scan_buffer
#endif
#ifdef yy_scan_string
#define fts0b_scan_string_ALREADY_DEFINED
#else
#define yy_scan_string fts0b_scan_string
#endif
#ifdef yy_scan_bytes
#define fts0b_scan_bytes_ALREADY_DEFINED
#else
#define yy_scan_bytes fts0b_scan_bytes
#endif
#ifdef yy_init_buffer
#define fts0b_init_buffer_ALREADY_DEFINED
#else
#define yy_init_buffer fts0b_init_buffer
#endif
#ifdef yy_flush_buffer
#define fts0b_flush_buffer_ALREADY_DEFINED
#else
#define yy_flush_buffer fts0b_flush_buffer
#endif
#ifdef yy_load_buffer_state
#define fts0b_load_buffer_state_ALREADY_DEFINED
#else
#define yy_load_buffer_state fts0b_load_buffer_state
#endif
#ifdef yy_switch_to_buffer
#define fts0b_switch_to_buffer_ALREADY_DEFINED
#else
#define yy_switch_to_buffer fts0b_switch_to_buffer
#endif
#ifdef yypush_buffer_state
#define fts0bpush_buffer_state_ALREADY_DEFINED
#else
#define yypush_buffer_state fts0bpush_buffer_state
#endif
#ifdef yypop_buffer_state
#define fts0bpop_buffer_state_ALREADY_DEFINED
#else
#define yypop_buffer_state fts0bpop_buffer_state
#endif
#ifdef yyensure_buffer_stack
#define fts0bensure_buffer_stack_ALREADY_DEFINED
#else
#define yyensure_buffer_stack fts0bensure_buffer_stack
#endif
#ifdef yylex
#define fts0blex_ALREADY_DEFINED
#else
#define yylex fts0blex
#endif
#ifdef yyrestart
#define fts0brestart_ALREADY_DEFINED
#else
#define yyrestart fts0brestart
#endif
#ifdef yylex_init
#define fts0blex_init_ALREADY_DEFINED
#else
#define yylex_init fts0blex_init
#endif
#ifdef yylex_init_extra
#define fts0blex_init_extra_ALREADY_DEFINED
#else
#define yylex_init_extra fts0blex_init_extra
#endif
#ifdef yylex_destroy
#define fts0blex_destroy_ALREADY_DEFINED
#else
#define yylex_destroy fts0blex_destroy
#endif
#ifdef yyget_debug
#define fts0bget_debug_ALREADY_DEFINED
#else
#define yyget_debug fts0bget_debug
#endif
#ifdef yyset_debug
#define fts0bset_debug_ALREADY_DEFINED
#else
#define yyset_debug fts0bset_debug
#endif
#ifdef yyget_extra
#define fts0bget_extra_ALREADY_DEFINED
#else
#define yyget_extra fts0bget_extra
#endif
#ifdef yyset_extra
#define fts0bset_extra_ALREADY_DEFINED
#else
#define yyset_extra fts0bset_extra
#endif
#ifdef yyget_in
#define fts0bget_in_ALREADY_DEFINED
#else
#define yyget_in fts0bget_in
#endif
#ifdef yyset_in
#define fts0bset_in_ALREADY_DEFINED
#else
#define yyset_in fts0bset_in
#endif
#ifdef yyget_out
#define fts0bget_out_ALREADY_DEFINED
#else
#define yyget_out fts0bget_out
#endif
#ifdef yyset_out
#define fts0bset_out_ALREADY_DEFINED
#else
#define yyset_out fts0bset_out
#endif
#ifdef yyget_leng
#define fts0bget_leng_ALREADY_DEFINED
#else
#define yyget_leng fts0bget_leng
#endif
#ifdef yyget_text
#define fts0bget_text_ALREADY_DEFINED
#else
#define yyget_text fts0bget_text
#endif
#ifdef yyget_lineno
#define fts0bget_lineno_ALREADY_DEFINED
#else
#define yyget_lineno fts0bget_lineno
#endif
#ifdef yyset_lineno
#define fts0bset_lineno_ALREADY_DEFINED
#else
#define yyset_lineno fts0bset_lineno
#endif
#ifdef yyget_column
#define fts0bget_column_ALREADY_DEFINED
#else
#define yyget_column fts0bget_column
#endif
#ifdef yyset_column
#define fts0bset_column_ALREADY_DEFINED
#else
#define yyset_column fts0bset_column
#endif
#ifdef yywrap
#define fts0bwrap_ALREADY_DEFINED
#else
#define yywrap fts0bwrap
#endif
#ifdef yyalloc
#define fts0balloc_ALREADY_DEFINED
#else
#define yyalloc fts0balloc
#endif
#ifdef yyrealloc
#define fts0brealloc_ALREADY_DEFINED
#else
#define yyrealloc fts0brealloc
#endif
#ifdef yyfree
#define fts0bfree_ALREADY_DEFINED
#else
#define yyfree fts0bfree
#endif
/* First, we deal with platform-specific or compiler-specific issues. */
/* begin standard C headers. */
@ -88,29 +298,23 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U)
#endif
#ifndef SIZE_MAX
#define SIZE_MAX (~(size_t)0)
#endif
#endif /* ! C99 */
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
/* begin standard C++ headers. */
/* The "const" storage-class-modifier is valid. */
#define YY_USE_CONST
#else /* ! __cplusplus */
/* C99 requires __STDC__ to be defined as 1. */
#if defined (__STDC__)
#define YY_USE_CONST
#endif /* defined (__STDC__) */
#endif /* ! __cplusplus */
#ifdef YY_USE_CONST
/* TODO: this is always defined, so inline it */
#define yyconst const
#if defined(__GNUC__) && __GNUC__ >= 3
#define yynoreturn __attribute__((__noreturn__))
#else
#define yyconst
#define yynoreturn
#endif
/* An opaque pointer. */
@ -165,7 +369,7 @@ struct yy_buffer_state
/* Size of input buffer in bytes, not including room for EOB
* characters.
*/
yy_size_t yy_buf_size;
int yy_buf_size;
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
@ -204,25 +408,25 @@ struct yy_buffer_state
};
#endif /* !YY_STRUCT_YY_BUFFER_STATE */
void fts0brestart (FILE *input_file ,yyscan_t yyscanner );
void fts0b_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
YY_BUFFER_STATE fts0b_create_buffer (FILE *file,int size ,yyscan_t yyscanner );
void fts0b_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
void fts0b_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
void fts0bpush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
void fts0bpop_buffer_state (yyscan_t yyscanner );
void yyrestart ( FILE *input_file , yyscan_t yyscanner );
void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner );
YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner );
void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner );
void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner );
void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner );
void yypop_buffer_state ( yyscan_t yyscanner );
YY_BUFFER_STATE fts0b_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
YY_BUFFER_STATE fts0b_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
YY_BUFFER_STATE fts0b_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner );
YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner );
YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner );
void *fts0balloc (yy_size_t ,yyscan_t yyscanner );
void *fts0brealloc (void *,yy_size_t ,yyscan_t yyscanner );
void fts0bfree (void * ,yyscan_t yyscanner );
void *yyalloc ( yy_size_t , yyscan_t yyscanner );
void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner );
void yyfree ( void * , yyscan_t yyscanner );
/* Begin user sect3 */
#define fts0bwrap(n) 1
#define fts0bwrap(yyscanner) (/*CONSTCOND*/1)
#define YY_SKIP_YYWRAP
#define yytext_ptr yytext_r
@ -244,38 +448,42 @@ void fts0bfree (void * ,yyscan_t yyscanner );
#define YY_EXTRA_TYPE void *
#endif
int fts0blex_init (yyscan_t* scanner);
int yylex_init (yyscan_t* scanner);
int fts0blex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner);
/* Accessor methods to globals.
These are made visible to non-reentrant scanners for convenience. */
int fts0blex_destroy (yyscan_t yyscanner );
int yylex_destroy ( yyscan_t yyscanner );
int fts0bget_debug (yyscan_t yyscanner );
int yyget_debug ( yyscan_t yyscanner );
void fts0bset_debug (int debug_flag ,yyscan_t yyscanner );
void yyset_debug ( int debug_flag , yyscan_t yyscanner );
YY_EXTRA_TYPE fts0bget_extra (yyscan_t yyscanner );
YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner );
void fts0bset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner );
FILE *fts0bget_in (yyscan_t yyscanner );
FILE *yyget_in ( yyscan_t yyscanner );
void fts0bset_in (FILE * in_str ,yyscan_t yyscanner );
void yyset_in ( FILE * _in_str , yyscan_t yyscanner );
FILE *fts0bget_out (yyscan_t yyscanner );
FILE *yyget_out ( yyscan_t yyscanner );
void fts0bset_out (FILE * out_str ,yyscan_t yyscanner );
void yyset_out ( FILE * _out_str , yyscan_t yyscanner );
int fts0bget_leng (yyscan_t yyscanner );
int yyget_leng ( yyscan_t yyscanner );
char *fts0bget_text (yyscan_t yyscanner );
char *yyget_text ( yyscan_t yyscanner );
int fts0bget_lineno (yyscan_t yyscanner );
int yyget_lineno ( yyscan_t yyscanner );
void fts0bset_lineno (int line_number ,yyscan_t yyscanner );
void yyset_lineno ( int _line_number , yyscan_t yyscanner );
int yyget_column ( yyscan_t yyscanner );
void yyset_column ( int _column_no , yyscan_t yyscanner );
/* Macros after this point can all be overridden by user definitions in
* section 1.
@ -283,18 +491,18 @@ void fts0bset_lineno (int line_number ,yyscan_t yyscanner );
#ifndef YY_SKIP_YYWRAP
#ifdef __cplusplus
extern "C" int fts0bwrap (yyscan_t yyscanner );
extern "C" int yywrap ( yyscan_t yyscanner );
#else
extern int fts0bwrap (yyscan_t yyscanner );
extern int yywrap ( yyscan_t yyscanner );
#endif
#endif
#ifndef yytext_ptr
static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner);
#endif
#ifdef YY_NEED_STRLEN
static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
static int yy_flex_strlen ( const char * , yyscan_t yyscanner);
#endif
#ifndef YY_NO_INPUT
@ -322,9 +530,9 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
#ifndef YY_DECL
#define YY_DECL_IS_OURS 1
extern int fts0blex (yyscan_t yyscanner);
extern int yylex (yyscan_t yyscanner);
#define YY_DECL int fts0blex (yyscan_t yyscanner)
#define YY_DECL int yylex (yyscan_t yyscanner)
#endif /* !YY_DECL */
/* yy_get_previous_state - get the state just before the EOB char was reached */
@ -341,9 +549,154 @@ extern int fts0blex (yyscan_t yyscanner);
#undef YY_DECL
#endif
#ifndef fts0b_create_buffer_ALREADY_DEFINED
#undef yy_create_buffer
#endif
#ifndef fts0b_delete_buffer_ALREADY_DEFINED
#undef yy_delete_buffer
#endif
#ifndef fts0b_scan_buffer_ALREADY_DEFINED
#undef yy_scan_buffer
#endif
#ifndef fts0b_scan_string_ALREADY_DEFINED
#undef yy_scan_string
#endif
#ifndef fts0b_scan_bytes_ALREADY_DEFINED
#undef yy_scan_bytes
#endif
#ifndef fts0b_init_buffer_ALREADY_DEFINED
#undef yy_init_buffer
#endif
#ifndef fts0b_flush_buffer_ALREADY_DEFINED
#undef yy_flush_buffer
#endif
#ifndef fts0b_load_buffer_state_ALREADY_DEFINED
#undef yy_load_buffer_state
#endif
#ifndef fts0b_switch_to_buffer_ALREADY_DEFINED
#undef yy_switch_to_buffer
#endif
#ifndef fts0bpush_buffer_state_ALREADY_DEFINED
#undef yypush_buffer_state
#endif
#ifndef fts0bpop_buffer_state_ALREADY_DEFINED
#undef yypop_buffer_state
#endif
#ifndef fts0bensure_buffer_stack_ALREADY_DEFINED
#undef yyensure_buffer_stack
#endif
#ifndef fts0blex_ALREADY_DEFINED
#undef yylex
#endif
#ifndef fts0brestart_ALREADY_DEFINED
#undef yyrestart
#endif
#ifndef fts0blex_init_ALREADY_DEFINED
#undef yylex_init
#endif
#ifndef fts0blex_init_extra_ALREADY_DEFINED
#undef yylex_init_extra
#endif
#ifndef fts0blex_destroy_ALREADY_DEFINED
#undef yylex_destroy
#endif
#ifndef fts0bget_debug_ALREADY_DEFINED
#undef yyget_debug
#endif
#ifndef fts0bset_debug_ALREADY_DEFINED
#undef yyset_debug
#endif
#ifndef fts0bget_extra_ALREADY_DEFINED
#undef yyget_extra
#endif
#ifndef fts0bset_extra_ALREADY_DEFINED
#undef yyset_extra
#endif
#ifndef fts0bget_in_ALREADY_DEFINED
#undef yyget_in
#endif
#ifndef fts0bset_in_ALREADY_DEFINED
#undef yyset_in
#endif
#ifndef fts0bget_out_ALREADY_DEFINED
#undef yyget_out
#endif
#ifndef fts0bset_out_ALREADY_DEFINED
#undef yyset_out
#endif
#ifndef fts0bget_leng_ALREADY_DEFINED
#undef yyget_leng
#endif
#ifndef fts0bget_text_ALREADY_DEFINED
#undef yyget_text
#endif
#ifndef fts0bget_lineno_ALREADY_DEFINED
#undef yyget_lineno
#endif
#ifndef fts0bset_lineno_ALREADY_DEFINED
#undef yyset_lineno
#endif
#ifndef fts0bget_column_ALREADY_DEFINED
#undef yyget_column
#endif
#ifndef fts0bset_column_ALREADY_DEFINED
#undef yyset_column
#endif
#ifndef fts0bwrap_ALREADY_DEFINED
#undef yywrap
#endif
#ifndef fts0bget_lval_ALREADY_DEFINED
#undef yyget_lval
#endif
#ifndef fts0bset_lval_ALREADY_DEFINED
#undef yyset_lval
#endif
#ifndef fts0bget_lloc_ALREADY_DEFINED
#undef yyget_lloc
#endif
#ifndef fts0bset_lloc_ALREADY_DEFINED
#undef yyset_lloc
#endif
#ifndef fts0balloc_ALREADY_DEFINED
#undef yyalloc
#endif
#ifndef fts0brealloc_ALREADY_DEFINED
#undef yyrealloc
#endif
#ifndef fts0bfree_ALREADY_DEFINED
#undef yyfree
#endif
#ifndef fts0btext_ALREADY_DEFINED
#undef yytext
#endif
#ifndef fts0bleng_ALREADY_DEFINED
#undef yyleng
#endif
#ifndef fts0bin_ALREADY_DEFINED
#undef yyin
#endif
#ifndef fts0bout_ALREADY_DEFINED
#undef yyout
#endif
#ifndef fts0b_flex_debug_ALREADY_DEFINED
#undef yy_flex_debug
#endif
#ifndef fts0blineno_ALREADY_DEFINED
#undef yylineno
#endif
#ifndef fts0btables_fload_ALREADY_DEFINED
#undef yytables_fload
#endif
#ifndef fts0btables_destroy_ALREADY_DEFINED
#undef yytables_destroy
#endif
#ifndef fts0bTABLES_NAME_ALREADY_DEFINED
#undef yyTABLES_NAME
#endif
#line 73 "fts0blex.l"
#line 348 "../include/fts0blex.h"
#line 701 "../include/fts0blex.h"
#undef fts0bIN_HEADER
#endif /* fts0bHEADER_H */

View File

@ -12,12 +12,222 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
#define YY_FLEX_SUBMINOR_VERSION 35
#define YY_FLEX_MINOR_VERSION 6
#define YY_FLEX_SUBMINOR_VERSION 4
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
#ifdef yy_create_buffer
#define fts0t_create_buffer_ALREADY_DEFINED
#else
#define yy_create_buffer fts0t_create_buffer
#endif
#ifdef yy_delete_buffer
#define fts0t_delete_buffer_ALREADY_DEFINED
#else
#define yy_delete_buffer fts0t_delete_buffer
#endif
#ifdef yy_scan_buffer
#define fts0t_scan_buffer_ALREADY_DEFINED
#else
#define yy_scan_buffer fts0t_scan_buffer
#endif
#ifdef yy_scan_string
#define fts0t_scan_string_ALREADY_DEFINED
#else
#define yy_scan_string fts0t_scan_string
#endif
#ifdef yy_scan_bytes
#define fts0t_scan_bytes_ALREADY_DEFINED
#else
#define yy_scan_bytes fts0t_scan_bytes
#endif
#ifdef yy_init_buffer
#define fts0t_init_buffer_ALREADY_DEFINED
#else
#define yy_init_buffer fts0t_init_buffer
#endif
#ifdef yy_flush_buffer
#define fts0t_flush_buffer_ALREADY_DEFINED
#else
#define yy_flush_buffer fts0t_flush_buffer
#endif
#ifdef yy_load_buffer_state
#define fts0t_load_buffer_state_ALREADY_DEFINED
#else
#define yy_load_buffer_state fts0t_load_buffer_state
#endif
#ifdef yy_switch_to_buffer
#define fts0t_switch_to_buffer_ALREADY_DEFINED
#else
#define yy_switch_to_buffer fts0t_switch_to_buffer
#endif
#ifdef yypush_buffer_state
#define fts0tpush_buffer_state_ALREADY_DEFINED
#else
#define yypush_buffer_state fts0tpush_buffer_state
#endif
#ifdef yypop_buffer_state
#define fts0tpop_buffer_state_ALREADY_DEFINED
#else
#define yypop_buffer_state fts0tpop_buffer_state
#endif
#ifdef yyensure_buffer_stack
#define fts0tensure_buffer_stack_ALREADY_DEFINED
#else
#define yyensure_buffer_stack fts0tensure_buffer_stack
#endif
#ifdef yylex
#define fts0tlex_ALREADY_DEFINED
#else
#define yylex fts0tlex
#endif
#ifdef yyrestart
#define fts0trestart_ALREADY_DEFINED
#else
#define yyrestart fts0trestart
#endif
#ifdef yylex_init
#define fts0tlex_init_ALREADY_DEFINED
#else
#define yylex_init fts0tlex_init
#endif
#ifdef yylex_init_extra
#define fts0tlex_init_extra_ALREADY_DEFINED
#else
#define yylex_init_extra fts0tlex_init_extra
#endif
#ifdef yylex_destroy
#define fts0tlex_destroy_ALREADY_DEFINED
#else
#define yylex_destroy fts0tlex_destroy
#endif
#ifdef yyget_debug
#define fts0tget_debug_ALREADY_DEFINED
#else
#define yyget_debug fts0tget_debug
#endif
#ifdef yyset_debug
#define fts0tset_debug_ALREADY_DEFINED
#else
#define yyset_debug fts0tset_debug
#endif
#ifdef yyget_extra
#define fts0tget_extra_ALREADY_DEFINED
#else
#define yyget_extra fts0tget_extra
#endif
#ifdef yyset_extra
#define fts0tset_extra_ALREADY_DEFINED
#else
#define yyset_extra fts0tset_extra
#endif
#ifdef yyget_in
#define fts0tget_in_ALREADY_DEFINED
#else
#define yyget_in fts0tget_in
#endif
#ifdef yyset_in
#define fts0tset_in_ALREADY_DEFINED
#else
#define yyset_in fts0tset_in
#endif
#ifdef yyget_out
#define fts0tget_out_ALREADY_DEFINED
#else
#define yyget_out fts0tget_out
#endif
#ifdef yyset_out
#define fts0tset_out_ALREADY_DEFINED
#else
#define yyset_out fts0tset_out
#endif
#ifdef yyget_leng
#define fts0tget_leng_ALREADY_DEFINED
#else
#define yyget_leng fts0tget_leng
#endif
#ifdef yyget_text
#define fts0tget_text_ALREADY_DEFINED
#else
#define yyget_text fts0tget_text
#endif
#ifdef yyget_lineno
#define fts0tget_lineno_ALREADY_DEFINED
#else
#define yyget_lineno fts0tget_lineno
#endif
#ifdef yyset_lineno
#define fts0tset_lineno_ALREADY_DEFINED
#else
#define yyset_lineno fts0tset_lineno
#endif
#ifdef yyget_column
#define fts0tget_column_ALREADY_DEFINED
#else
#define yyget_column fts0tget_column
#endif
#ifdef yyset_column
#define fts0tset_column_ALREADY_DEFINED
#else
#define yyset_column fts0tset_column
#endif
#ifdef yywrap
#define fts0twrap_ALREADY_DEFINED
#else
#define yywrap fts0twrap
#endif
#ifdef yyalloc
#define fts0talloc_ALREADY_DEFINED
#else
#define yyalloc fts0talloc
#endif
#ifdef yyrealloc
#define fts0trealloc_ALREADY_DEFINED
#else
#define yyrealloc fts0trealloc
#endif
#ifdef yyfree
#define fts0tfree_ALREADY_DEFINED
#else
#define yyfree fts0tfree
#endif
/* First, we deal with platform-specific or compiler-specific issues. */
/* begin standard C headers. */
@ -88,29 +298,23 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U)
#endif
#ifndef SIZE_MAX
#define SIZE_MAX (~(size_t)0)
#endif
#endif /* ! C99 */
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
/* begin standard C++ headers. */
/* The "const" storage-class-modifier is valid. */
#define YY_USE_CONST
#else /* ! __cplusplus */
/* C99 requires __STDC__ to be defined as 1. */
#if defined (__STDC__)
#define YY_USE_CONST
#endif /* defined (__STDC__) */
#endif /* ! __cplusplus */
#ifdef YY_USE_CONST
/* TODO: this is always defined, so inline it */
#define yyconst const
#if defined(__GNUC__) && __GNUC__ >= 3
#define yynoreturn __attribute__((__noreturn__))
#else
#define yyconst
#define yynoreturn
#endif
/* An opaque pointer. */
@ -165,7 +369,7 @@ struct yy_buffer_state
/* Size of input buffer in bytes, not including room for EOB
* characters.
*/
yy_size_t yy_buf_size;
int yy_buf_size;
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
@ -204,25 +408,25 @@ struct yy_buffer_state
};
#endif /* !YY_STRUCT_YY_BUFFER_STATE */
void fts0trestart (FILE *input_file ,yyscan_t yyscanner );
void fts0t_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
YY_BUFFER_STATE fts0t_create_buffer (FILE *file,int size ,yyscan_t yyscanner );
void fts0t_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
void fts0t_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
void fts0tpush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
void fts0tpop_buffer_state (yyscan_t yyscanner );
void yyrestart ( FILE *input_file , yyscan_t yyscanner );
void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner );
YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner );
void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner );
void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner );
void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner );
void yypop_buffer_state ( yyscan_t yyscanner );
YY_BUFFER_STATE fts0t_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
YY_BUFFER_STATE fts0t_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
YY_BUFFER_STATE fts0t_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner );
YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner );
YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner );
void *fts0talloc (yy_size_t ,yyscan_t yyscanner );
void *fts0trealloc (void *,yy_size_t ,yyscan_t yyscanner );
void fts0tfree (void * ,yyscan_t yyscanner );
void *yyalloc ( yy_size_t , yyscan_t yyscanner );
void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner );
void yyfree ( void * , yyscan_t yyscanner );
/* Begin user sect3 */
#define fts0twrap(n) 1
#define fts0twrap(yyscanner) (/*CONSTCOND*/1)
#define YY_SKIP_YYWRAP
#define yytext_ptr yytext_r
@ -244,38 +448,42 @@ void fts0tfree (void * ,yyscan_t yyscanner );
#define YY_EXTRA_TYPE void *
#endif
int fts0tlex_init (yyscan_t* scanner);
int yylex_init (yyscan_t* scanner);
int fts0tlex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner);
/* Accessor methods to globals.
These are made visible to non-reentrant scanners for convenience. */
int fts0tlex_destroy (yyscan_t yyscanner );
int yylex_destroy ( yyscan_t yyscanner );
int fts0tget_debug (yyscan_t yyscanner );
int yyget_debug ( yyscan_t yyscanner );
void fts0tset_debug (int debug_flag ,yyscan_t yyscanner );
void yyset_debug ( int debug_flag , yyscan_t yyscanner );
YY_EXTRA_TYPE fts0tget_extra (yyscan_t yyscanner );
YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner );
void fts0tset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner );
FILE *fts0tget_in (yyscan_t yyscanner );
FILE *yyget_in ( yyscan_t yyscanner );
void fts0tset_in (FILE * in_str ,yyscan_t yyscanner );
void yyset_in ( FILE * _in_str , yyscan_t yyscanner );
FILE *fts0tget_out (yyscan_t yyscanner );
FILE *yyget_out ( yyscan_t yyscanner );
void fts0tset_out (FILE * out_str ,yyscan_t yyscanner );
void yyset_out ( FILE * _out_str , yyscan_t yyscanner );
int fts0tget_leng (yyscan_t yyscanner );
int yyget_leng ( yyscan_t yyscanner );
char *fts0tget_text (yyscan_t yyscanner );
char *yyget_text ( yyscan_t yyscanner );
int fts0tget_lineno (yyscan_t yyscanner );
int yyget_lineno ( yyscan_t yyscanner );
void fts0tset_lineno (int line_number ,yyscan_t yyscanner );
void yyset_lineno ( int _line_number , yyscan_t yyscanner );
int yyget_column ( yyscan_t yyscanner );
void yyset_column ( int _column_no , yyscan_t yyscanner );
/* Macros after this point can all be overridden by user definitions in
* section 1.
@ -283,18 +491,18 @@ void fts0tset_lineno (int line_number ,yyscan_t yyscanner );
#ifndef YY_SKIP_YYWRAP
#ifdef __cplusplus
extern "C" int fts0twrap (yyscan_t yyscanner );
extern "C" int yywrap ( yyscan_t yyscanner );
#else
extern int fts0twrap (yyscan_t yyscanner );
extern int yywrap ( yyscan_t yyscanner );
#endif
#endif
#ifndef yytext_ptr
static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner);
#endif
#ifdef YY_NEED_STRLEN
static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
static int yy_flex_strlen ( const char * , yyscan_t yyscanner);
#endif
#ifndef YY_NO_INPUT
@ -322,9 +530,9 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
#ifndef YY_DECL
#define YY_DECL_IS_OURS 1
extern int fts0tlex (yyscan_t yyscanner);
extern int yylex (yyscan_t yyscanner);
#define YY_DECL int fts0tlex (yyscan_t yyscanner)
#define YY_DECL int yylex (yyscan_t yyscanner)
#endif /* !YY_DECL */
/* yy_get_previous_state - get the state just before the EOB char was reached */
@ -341,9 +549,154 @@ extern int fts0tlex (yyscan_t yyscanner);
#undef YY_DECL
#endif
#ifndef fts0t_create_buffer_ALREADY_DEFINED
#undef yy_create_buffer
#endif
#ifndef fts0t_delete_buffer_ALREADY_DEFINED
#undef yy_delete_buffer
#endif
#ifndef fts0t_scan_buffer_ALREADY_DEFINED
#undef yy_scan_buffer
#endif
#ifndef fts0t_scan_string_ALREADY_DEFINED
#undef yy_scan_string
#endif
#ifndef fts0t_scan_bytes_ALREADY_DEFINED
#undef yy_scan_bytes
#endif
#ifndef fts0t_init_buffer_ALREADY_DEFINED
#undef yy_init_buffer
#endif
#ifndef fts0t_flush_buffer_ALREADY_DEFINED
#undef yy_flush_buffer
#endif
#ifndef fts0t_load_buffer_state_ALREADY_DEFINED
#undef yy_load_buffer_state
#endif
#ifndef fts0t_switch_to_buffer_ALREADY_DEFINED
#undef yy_switch_to_buffer
#endif
#ifndef fts0tpush_buffer_state_ALREADY_DEFINED
#undef yypush_buffer_state
#endif
#ifndef fts0tpop_buffer_state_ALREADY_DEFINED
#undef yypop_buffer_state
#endif
#ifndef fts0tensure_buffer_stack_ALREADY_DEFINED
#undef yyensure_buffer_stack
#endif
#ifndef fts0tlex_ALREADY_DEFINED
#undef yylex
#endif
#ifndef fts0trestart_ALREADY_DEFINED
#undef yyrestart
#endif
#ifndef fts0tlex_init_ALREADY_DEFINED
#undef yylex_init
#endif
#ifndef fts0tlex_init_extra_ALREADY_DEFINED
#undef yylex_init_extra
#endif
#ifndef fts0tlex_destroy_ALREADY_DEFINED
#undef yylex_destroy
#endif
#ifndef fts0tget_debug_ALREADY_DEFINED
#undef yyget_debug
#endif
#ifndef fts0tset_debug_ALREADY_DEFINED
#undef yyset_debug
#endif
#ifndef fts0tget_extra_ALREADY_DEFINED
#undef yyget_extra
#endif
#ifndef fts0tset_extra_ALREADY_DEFINED
#undef yyset_extra
#endif
#ifndef fts0tget_in_ALREADY_DEFINED
#undef yyget_in
#endif
#ifndef fts0tset_in_ALREADY_DEFINED
#undef yyset_in
#endif
#ifndef fts0tget_out_ALREADY_DEFINED
#undef yyget_out
#endif
#ifndef fts0tset_out_ALREADY_DEFINED
#undef yyset_out
#endif
#ifndef fts0tget_leng_ALREADY_DEFINED
#undef yyget_leng
#endif
#ifndef fts0tget_text_ALREADY_DEFINED
#undef yyget_text
#endif
#ifndef fts0tget_lineno_ALREADY_DEFINED
#undef yyget_lineno
#endif
#ifndef fts0tset_lineno_ALREADY_DEFINED
#undef yyset_lineno
#endif
#ifndef fts0tget_column_ALREADY_DEFINED
#undef yyget_column
#endif
#ifndef fts0tset_column_ALREADY_DEFINED
#undef yyset_column
#endif
#ifndef fts0twrap_ALREADY_DEFINED
#undef yywrap
#endif
#ifndef fts0tget_lval_ALREADY_DEFINED
#undef yyget_lval
#endif
#ifndef fts0tset_lval_ALREADY_DEFINED
#undef yyset_lval
#endif
#ifndef fts0tget_lloc_ALREADY_DEFINED
#undef yyget_lloc
#endif
#ifndef fts0tset_lloc_ALREADY_DEFINED
#undef yyset_lloc
#endif
#ifndef fts0talloc_ALREADY_DEFINED
#undef yyalloc
#endif
#ifndef fts0trealloc_ALREADY_DEFINED
#undef yyrealloc
#endif
#ifndef fts0tfree_ALREADY_DEFINED
#undef yyfree
#endif
#ifndef fts0ttext_ALREADY_DEFINED
#undef yytext
#endif
#ifndef fts0tleng_ALREADY_DEFINED
#undef yyleng
#endif
#ifndef fts0tin_ALREADY_DEFINED
#undef yyin
#endif
#ifndef fts0tout_ALREADY_DEFINED
#undef yyout
#endif
#ifndef fts0t_flex_debug_ALREADY_DEFINED
#undef yy_flex_debug
#endif
#ifndef fts0tlineno_ALREADY_DEFINED
#undef yylineno
#endif
#ifndef fts0ttables_fload_ALREADY_DEFINED
#undef yytables_fload
#endif
#ifndef fts0ttables_destroy_ALREADY_DEFINED
#undef yytables_destroy
#endif
#ifndef fts0tTABLES_NAME_ALREADY_DEFINED
#undef yyTABLES_NAME
#endif
#line 68 "fts0tlex.l"
#line 348 "../include/fts0tlex.h"
#line 701 "../include/fts0tlex.h"
#undef fts0tIN_HEADER
#endif /* fts0tHEADER_H */

View File

@ -1,6 +1,7 @@
/*****************************************************************************
Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2019, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@ -109,11 +110,11 @@ pars_sql(
Retrieves characters to the lexical analyzer.
@return number of characters copied or 0 on EOF */
UNIV_INTERN
int
size_t
pars_get_lex_chars(
/*===============*/
char* buf, /*!< in/out: buffer where to copy */
int max_size); /*!< in: maximum number of characters which fit
size_t max_size); /*!< in: maximum number of characters which fit
in the buffer */
/*************************************************************//**
Called by yyparse on error. */

View File

@ -9,8 +9,8 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
#define YY_FLEX_SUBMINOR_VERSION 35
#define YY_FLEX_MINOR_VERSION 6
#define YY_FLEX_SUBMINOR_VERSION 4
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@ -85,60 +85,48 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U)
#endif
#ifndef SIZE_MAX
#define SIZE_MAX (~(size_t)0)
#endif
#endif /* ! C99 */
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
/* begin standard C++ headers. */
/* The "const" storage-class-modifier is valid. */
#define YY_USE_CONST
#else /* ! __cplusplus */
/* C99 requires __STDC__ to be defined as 1. */
#if defined (__STDC__)
#define YY_USE_CONST
#endif /* defined (__STDC__) */
#endif /* ! __cplusplus */
#ifdef YY_USE_CONST
/* TODO: this is always defined, so inline it */
#define yyconst const
#if defined(__GNUC__) && __GNUC__ >= 3
#define yynoreturn __attribute__((__noreturn__))
#else
#define yyconst
#define yynoreturn
#endif
/* Returned upon end-of-file. */
#define YY_NULL 0
/* Promotes a possibly negative, possibly signed char to an unsigned
* integer for use as an array index. If the signed char is negative,
* we want to instead treat it as an 8-bit unsigned char, hence the
* double cast.
/* Promotes a possibly negative, possibly signed char to an
* integer in range [0..255] for use as an array index.
*/
#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
#define YY_SC_TO_UI(c) ((YY_CHAR) (c))
/* Enter a start condition. This macro really ought to take a parameter,
* but we do it the disgusting crufty way forced on us by the ()-less
* definition of BEGIN.
*/
#define BEGIN (yy_start) = 1 + 2 *
/* Translate the current start state into a value that can be later handed
* to BEGIN to return to the state. The YYSTATE alias is for lex
* compatibility.
*/
#define YY_START (((yy_start) - 1) / 2)
#define YYSTATE YY_START
/* Action number for EOF rule of a given start state. */
#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
/* Special action meaning "start processing a new file". */
#define YY_NEW_FILE yyrestart( yyin )
#define YY_END_OF_BUFFER_CHAR 0
/* Size of default input buffer. */
@ -168,15 +156,16 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
typedef size_t yy_size_t;
#endif
extern yy_size_t yyleng;
extern FILE *yyin, *yyout;
#define EOB_ACT_CONTINUE_SCAN 0
#define EOB_ACT_END_OF_FILE 1
#define EOB_ACT_LAST_MATCH 2
#define YY_LESS_LINENO(n)
#define YY_LINENO_REWIND_TO(ptr)
/* Return all but the first "n" matched characters back to the input stream. */
#define yyless(n) \
@ -191,7 +180,6 @@ extern FILE *yyin, *yyout;
YY_DO_BEFORE_ACTION; /* set up yytext again */ \
} \
while ( 0 )
#define unput(c) yyunput( c, (yytext_ptr) )
#ifndef YY_STRUCT_YY_BUFFER_STATE
@ -206,12 +194,12 @@ struct yy_buffer_state
/* Size of input buffer in bytes, not including room for EOB
* characters.
*/
yy_size_t yy_buf_size;
int yy_buf_size;
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
yy_size_t yy_n_chars;
int yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
@ -262,7 +250,7 @@ struct yy_buffer_state
/* Stack of input buffers. */
static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
/* We provide macros for accessing buffer states in case in the
* future we want to put the buffer states in a more general
@ -273,7 +261,6 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
? (yy_buffer_stack)[(yy_buffer_stack_top)] \
: NULL)
/* Same as previous macro, but useful when we know that the buffer stack is not
* NULL or when we need an lvalue. For internal use only.
*/
@ -281,11 +268,11 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
/* yy_hold_char holds the character lost when yytext is formed. */
static char yy_hold_char;
static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */
yy_size_t yyleng;
static int yy_n_chars; /* number of characters read into yy_ch_buf */
static int yyleng;
/* Points to current character in buffer. */
static char *yy_c_buf_p = (char *) 0;
static char *yy_c_buf_p = NULL;
static int yy_init = 0; /* whether we need to initialize */
static int yy_start = 0; /* start state number */
@ -294,30 +281,28 @@ static int yy_start = 0; /* start state number */
*/
static int yy_did_buffer_switch_on_eof;
void yyrestart (FILE *input_file );
static void yyrestart ( FILE *input_file );
MY_ATTRIBUTE((unused)) static void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer );
static YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size );
void yy_delete_buffer (YY_BUFFER_STATE b );
void yy_flush_buffer (YY_BUFFER_STATE b );
void yypush_buffer_state (YY_BUFFER_STATE new_buffer );
void yypop_buffer_state (void );
static void yy_delete_buffer ( YY_BUFFER_STATE b );
static void yy_flush_buffer ( YY_BUFFER_STATE b );
MY_ATTRIBUTE((unused)) static void yypush_buffer_state ( YY_BUFFER_STATE new_buffer );
MY_ATTRIBUTE((unused)) static void yypop_buffer_state ( void );
static void yyensure_buffer_stack ( void );
static void yy_load_buffer_state ( void );
static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file );
#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER )
YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size );
YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str );
YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len );
YY_BUFFER_STATE yy_scan_string ( const char *yy_str );
YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len );
void *yyalloc (yy_size_t );
void *yyrealloc (void *,yy_size_t );
void yyfree (void * );
static void *yyalloc ( yy_size_t );
static void *yyrealloc ( void *, yy_size_t );
static void yyfree ( void * );
#define yy_new_buffer yy_create_buffer
#define yy_set_interactive(is_interactive) \
{ \
if ( ! YY_CURRENT_BUFFER ){ \
@ -327,7 +312,6 @@ void yyfree (void * );
} \
YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
}
#define yy_set_bol(at_bol) \
{ \
if ( ! YY_CURRENT_BUFFER ){\
@ -337,42 +321,41 @@ void yyfree (void * );
} \
YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
}
#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
/* Begin user sect3 */
#define yywrap(n) 1
#define yywrap() (/*CONSTCOND*/1)
#define YY_SKIP_YYWRAP
typedef flex_uint8_t YY_CHAR;
typedef unsigned char YY_CHAR;
FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
static FILE *yyin = NULL, *yyout = NULL;
typedef int yy_state_type;
extern int yylineno;
int yylineno = 1;
static int yylineno = 1;
extern char *yytext;
#ifdef yytext_ptr
#undef yytext_ptr
#endif
#define yytext_ptr yytext
static yy_state_type yy_get_previous_state ( void );
static yy_state_type yy_try_NUL_trans ( yy_state_type current_state );
static int yy_get_next_buffer ( void );
static void yy_fatal_error (yyconst char msg[] );
static void yynoreturn yy_fatal_error ( const char* msg );
/* Done after the current pattern has been matched and before the
* corresponding action - sets up yytext.
*/
#define YY_DO_BEFORE_ACTION \
(yytext_ptr) = yy_bp; \
yyleng = (size_t) (yy_cp - yy_bp); \
yyleng = (int) (yy_cp - yy_bp); \
(yy_hold_char) = *yy_cp; \
*yy_cp = '\0'; \
(yy_c_buf_p) = yy_cp;
#define YY_NUM_RULES 124
#define YY_END_OF_BUFFER 125
/* This struct is not used in this scanner,
@ -382,7 +365,7 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
static yyconst flex_int16_t yy_accept[425] =
static const flex_int16_t yy_accept[425] =
{ 0,
0, 0, 119, 119, 0, 0, 0, 0, 125, 123,
122, 122, 8, 123, 114, 5, 103, 109, 112, 110,
@ -433,7 +416,7 @@ static yyconst flex_int16_t yy_accept[425] =
96, 96, 62, 0
} ;
static yyconst flex_int32_t yy_ec[256] =
static const YY_CHAR yy_ec[256] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@ -465,7 +448,7 @@ static yyconst flex_int32_t yy_ec[256] =
1, 1, 1, 1, 1
} ;
static yyconst flex_int32_t yy_meta[57] =
static const YY_CHAR yy_meta[57] =
{ 0,
1, 1, 1, 2, 3, 1, 1, 4, 1, 1,
5, 1, 1, 1, 1, 6, 7, 1, 1, 1,
@ -475,7 +458,7 @@ static yyconst flex_int32_t yy_meta[57] =
9, 9, 9, 9, 1, 1
} ;
static yyconst flex_int16_t yy_base[438] =
static const flex_int16_t yy_base[438] =
{ 0,
0, 0, 293, 287, 284, 281, 272, 256, 254, 1357,
55, 57, 1357, 0, 1357, 1357, 1357, 1357, 1357, 1357,
@ -527,7 +510,7 @@ static yyconst flex_int16_t yy_base[438] =
1306, 1315, 1324, 1333, 1340, 1344, 1347
} ;
static yyconst flex_int16_t yy_def[438] =
static const flex_int16_t yy_def[438] =
{ 0,
424, 1, 425, 425, 426, 426, 427, 427, 424, 424,
424, 424, 424, 428, 424, 424, 424, 424, 424, 424,
@ -579,7 +562,7 @@ static yyconst flex_int16_t yy_def[438] =
424, 424, 424, 424, 424, 424, 424
} ;
static yyconst flex_int16_t yy_nxt[1414] =
static const flex_int16_t yy_nxt[1414] =
{ 0,
10, 11, 12, 13, 10, 14, 15, 16, 17, 18,
19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
@ -739,7 +722,7 @@ static yyconst flex_int16_t yy_nxt[1414] =
424, 424, 424
} ;
static yyconst flex_int16_t yy_chk[1414] =
static const flex_int16_t yy_chk[1414] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@ -902,8 +885,8 @@ static yyconst flex_int16_t yy_chk[1414] =
static yy_state_type yy_last_accepting_state;
static char *yy_last_accepting_cpos;
extern int yy_flex_debug;
int yy_flex_debug = 0;
static int yy_flex_debug = 0;
/* The intent behind this definition is that it'll catch
* any uses of REJECT which flex missed.
@ -912,11 +895,12 @@ int yy_flex_debug = 0;
#define yymore() yymore_used_but_not_detected
#define YY_MORE_ADJ 0
#define YY_RESTORE_YY_MORE_OFFSET
char *yytext;
static char *yytext;
#line 1 "pars0lex.l"
/*****************************************************************************
Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 1997, 2011, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2019, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@ -951,7 +935,7 @@ Created 12/14/1997 Heikki Tuuri
*******************************************************/
#define YY_NO_INPUT 1
#define YY_NO_UNISTD_H 1
#line 53 "pars0lex.l"
#line 54 "pars0lex.l"
#define YYSTYPE que_node_t*
#include "univ.i"
@ -966,9 +950,8 @@ Created 12/14/1997 Heikki Tuuri
#define realloc(P, A) ut_realloc(P, A)
#define exit(A) ut_error
/* Note: We cast &result to int* from yysize_t* */
#define YY_INPUT(buf, result, max_size) \
(result = pars_get_lex_chars(buf, max_size))
result = pars_get_lex_chars(buf, max_size)
/* String buffer for removing quotes */
static ulint stringbuf_len_alloc = 0; /* Allocated length */
@ -1000,10 +983,9 @@ string_append(
stringbuf_len += len;
}
#line 986 "lexyy.cc"
#line 1006 "lexyy.cc"
#line 988 "lexyy.cc"
#define INITIAL 0
#define comment 1
@ -1029,29 +1011,29 @@ static int yy_init_globals (void );
MY_ATTRIBUTE((unused)) static int yylex_destroy ( void );
int yyget_debug (void );
MY_ATTRIBUTE((unused)) static int yyget_debug ( void );
void yyset_debug (int debug_flag );
MY_ATTRIBUTE((unused)) static void yyset_debug ( int debug_flag );
YY_EXTRA_TYPE yyget_extra ( void );
void yyset_extra (YY_EXTRA_TYPE user_defined );
FILE *yyget_in (void );
void yyset_in (FILE * in_str );
MY_ATTRIBUTE((unused)) static FILE *yyget_in ( void );
FILE *yyget_out (void );
MY_ATTRIBUTE((unused)) static void yyset_in ( FILE * _in_str );
void yyset_out (FILE * out_str );
MY_ATTRIBUTE((unused)) static FILE *yyget_out ( void );
yy_size_t yyget_leng (void );
MY_ATTRIBUTE((unused)) static void yyset_out ( FILE * _out_str );
char *yyget_text (void );
MY_ATTRIBUTE((unused)) static int yyget_leng ( void );
int yyget_lineno (void );
MY_ATTRIBUTE((unused)) static char *yyget_text ( void );
void yyset_lineno (int line_number );
MY_ATTRIBUTE((unused)) static int yyget_lineno ( void );
MY_ATTRIBUTE((unused)) static void yyset_lineno ( int _line_number );
/* Macros after this point can all be overridden by user definitions in
* section 1.
@ -1065,16 +1047,19 @@ extern int yywrap (void );
#endif
#endif
#ifndef YY_NO_UNPUT
#endif
#ifndef yytext_ptr
static void yy_flex_strncpy (char *,yyconst char *,int );
static void yy_flex_strncpy ( char *, const char *, int );
#endif
#ifdef YY_NEED_STRLEN
static int yy_flex_strlen (yyconst char * );
static int yy_flex_strlen ( const char * );
#endif
#ifndef YY_NO_INPUT
#ifdef __cplusplus
static int yyinput ( void );
#else
@ -1098,7 +1083,7 @@ static int input (void );
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@ -1109,7 +1094,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
size_t n; \
int n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@ -1122,7 +1107,7 @@ static int input (void );
else \
{ \
errno=0; \
while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \
{ \
if( errno != EINTR) \
{ \
@ -1177,7 +1162,7 @@ extern int yylex (void);
/* Code executed at the end of each rule. */
#ifndef YY_BREAK
#define YY_BREAK break;
#define YY_BREAK /*LINTED*/break;
#endif
#define YY_RULE_SETUP \
@ -1191,11 +1176,6 @@ YY_DECL
char *yy_cp, *yy_bp;
int yy_act;
#line 112 "pars0lex.l"
#line 1197 "lexyy.cc"
if ( !(yy_init) )
{
(yy_init) = 1;
@ -1222,7 +1202,13 @@ YY_DECL
yy_load_buffer_state( );
}
while ( 1 ) /* loops until end-of-file is reached */
{
#line 112 "pars0lex.l"
#line 1209 "lexyy.cc"
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
yy_cp = (yy_c_buf_p);
@ -1248,9 +1234,9 @@ yy_match:
{
yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 425 )
yy_c = yy_meta[(unsigned int) yy_c];
yy_c = yy_meta[yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
++yy_cp;
}
while ( yy_current_state != 424 );
@ -2234,7 +2220,7 @@ YY_RULE_SETUP
#line 691 "pars0lex.l"
YY_FATAL_ERROR( "flex scanner jammed" );
YY_BREAK
#line 2237 "lexyy.cc"
#line 2223 "lexyy.cc"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(comment):
case YY_STATE_EOF(quoted):
@ -2369,6 +2355,7 @@ case YY_STATE_EOF(id):
"fatal flex scanner internal error--no action found" );
} /* end of action switch */
} /* end of scanning one token */
} /* end of user's declarations */
} /* end of yylex */
/* yy_get_next_buffer - try to read in a new buffer
@ -2411,7 +2398,7 @@ static int yy_get_next_buffer (void)
/* Try to read more data. */
/* First move last chars to start of buffer. */
number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1);
for ( i = 0; i < number_to_move; ++i )
*(dest++) = *(source++);
@ -2424,21 +2411,21 @@ static int yy_get_next_buffer (void)
else
{
int num_to_read = static_cast<int>(
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1);
int num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
{ /* Not enough room in the buffer - grow it. */
/* just a shorter name for the current buffer */
YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
int yy_c_buf_p_offset =
(int) ((yy_c_buf_p) - b->yy_ch_buf);
if ( b->yy_is_our_buffer )
{
int new_size = static_cast<int>(b->yy_buf_size * 2);
int new_size = b->yy_buf_size * 2;
if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8;
@ -2447,11 +2434,12 @@ static int yy_get_next_buffer (void)
b->yy_ch_buf = (char *)
/* Include room in for 2 EOB chars. */
yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 );
yyrealloc( (void *) b->yy_ch_buf,
(yy_size_t) (b->yy_buf_size + 2) );
}
else
/* Can't grow it, we don't own it. */
b->yy_ch_buf = 0;
b->yy_ch_buf = NULL;
if ( ! b->yy_ch_buf )
YY_FATAL_ERROR(
@ -2459,9 +2447,8 @@ static int yy_get_next_buffer (void)
(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
num_to_read = static_cast<int>(
YY_CURRENT_BUFFER_LVALUE->yy_buf_size
- number_to_move - 1);
num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
number_to_move - 1;
}
@ -2470,7 +2457,7 @@ static int yy_get_next_buffer (void)
/* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
(yy_n_chars), (size_t) num_to_read );
(yy_n_chars), num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
}
@ -2494,12 +2481,15 @@ static int yy_get_next_buffer (void)
else
ret_val = EOB_ACT_CONTINUE_SCAN;
if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
/* Extend the array by 50%, plus the number we really need. */
yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size );
int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc(
(void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size );
if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
/* "- 2" to take care of EOB's */
YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2);
}
(yy_n_chars) += number_to_move;
@ -2513,7 +2503,7 @@ static int yy_get_next_buffer (void)
/* yy_get_previous_state - get the state just before the EOB char was reached */
yy_state_type yy_get_previous_state (void)
static yy_state_type yy_get_previous_state (void)
{
yy_state_type yy_current_state;
char *yy_cp;
@ -2532,9 +2522,9 @@ static int yy_get_next_buffer (void)
{
yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 425 )
yy_c = yy_meta[(unsigned int) yy_c];
yy_c = yy_meta[yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
}
return yy_current_state;
@ -2560,14 +2550,18 @@ static int yy_get_next_buffer (void)
{
yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 425 )
yy_c = yy_meta[(unsigned int) yy_c];
yy_c = yy_meta[yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
yy_is_jam = (yy_current_state == 424);
return yy_is_jam ? 0 : yy_current_state;
}
#ifndef YY_NO_UNPUT
#endif
#ifndef YY_NO_INPUT
#ifdef __cplusplus
static int yyinput (void)
@ -2616,7 +2610,7 @@ static int yy_get_next_buffer (void)
case EOB_ACT_END_OF_FILE:
{
if ( yywrap( ) )
return EOF;
return 0;
if ( ! (yy_did_buffer_switch_on_eof) )
YY_NEW_FILE;
@ -2647,7 +2641,7 @@ static int yy_get_next_buffer (void)
*
* @note This function does not reset the start condition to @c INITIAL .
*/
void yyrestart (FILE * input_file )
static void yyrestart (FILE * input_file )
{
if ( ! YY_CURRENT_BUFFER ){
@ -2722,7 +2716,7 @@ static void yy_load_buffer_state (void)
/* yy_ch_buf has to be 2 characters longer than the size given because
* we need to put in 2 end-of-buffer characters.
*/
b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 );
b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) );
if ( ! b->yy_ch_buf )
YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
@ -2737,7 +2731,7 @@ static void yy_load_buffer_state (void)
* @param b a buffer created with yy_create_buffer()
*
*/
void yy_delete_buffer (YY_BUFFER_STATE b )
static void yy_delete_buffer (YY_BUFFER_STATE b )
{
if ( ! b )
@ -2784,7 +2778,7 @@ static void yy_load_buffer_state (void)
* @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
*
*/
void yy_flush_buffer (YY_BUFFER_STATE b )
static void yy_flush_buffer (YY_BUFFER_STATE b )
{
if ( ! b )
return;
@ -2813,7 +2807,7 @@ static void yy_load_buffer_state (void)
* @param new_buffer The new state.
*
*/
void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
MY_ATTRIBUTE((unused)) static void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
{
if (new_buffer == NULL)
return;
@ -2843,7 +2837,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
* The next element becomes the new top.
*
*/
void yypop_buffer_state (void)
MY_ATTRIBUTE((unused)) static void yypop_buffer_state (void)
{
if (!YY_CURRENT_BUFFER)
return;
@ -2864,7 +2858,7 @@ void yypop_buffer_state (void)
*/
static void yyensure_buffer_stack (void)
{
int num_to_alloc;
yy_size_t num_to_alloc;
if (!(yy_buffer_stack)) {
@ -2872,7 +2866,7 @@ static void yyensure_buffer_stack (void)
* scanner will even need a stack. We use 2 instead of 1 to avoid an
* immediate realloc on the next call.
*/
num_to_alloc = 1;
num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
(num_to_alloc * sizeof(struct yy_buffer_state*)
);
@ -2889,10 +2883,9 @@ static void yyensure_buffer_stack (void)
if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
/* Increase the buffer to prepare for a possible push. */
int grow_size = 8 /* arbitrary grow size */;
yy_size_t grow_size = 8 /* arbitrary grow size */;
num_to_alloc = static_cast<int>(
(yy_buffer_stack_max) + grow_size);
num_to_alloc = (yy_buffer_stack_max) + grow_size;
(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
((yy_buffer_stack),
num_to_alloc * sizeof(struct yy_buffer_state*)
@ -2910,9 +2903,9 @@ static void yyensure_buffer_stack (void)
#define YY_EXIT_FAILURE 2
#endif
static void yy_fatal_error (yyconst char* msg )
static void yynoreturn yy_fatal_error (const char* msg )
{
(void) fprintf( stderr, "%s\n", msg );
fprintf( stderr, "%s\n", msg );
exit( YY_EXIT_FAILURE );
}
@ -2938,7 +2931,7 @@ static void yy_fatal_error (yyconst char* msg )
/** Get the current line number.
*
*/
int yyget_lineno (void)
MY_ATTRIBUTE((unused)) static int yyget_lineno (void)
{
return yylineno;
@ -2947,7 +2940,7 @@ int yyget_lineno (void)
/** Get the input stream.
*
*/
FILE *yyget_in (void)
MY_ATTRIBUTE((unused)) static FILE *yyget_in (void)
{
return yyin;
}
@ -2955,7 +2948,7 @@ FILE *yyget_in (void)
/** Get the output stream.
*
*/
FILE *yyget_out (void)
MY_ATTRIBUTE((unused)) static FILE *yyget_out (void)
{
return yyout;
}
@ -2963,7 +2956,7 @@ FILE *yyget_out (void)
/** Get the length of the current token.
*
*/
yy_size_t yyget_leng (void)
MY_ATTRIBUTE((unused)) static int yyget_leng (void)
{
return yyleng;
}
@ -2972,45 +2965,45 @@ yy_size_t yyget_leng (void)
*
*/
char *yyget_text (void)
MY_ATTRIBUTE((unused)) static char *yyget_text (void)
{
return yytext;
}
/** Set the current line number.
* @param line_number
* @param _line_number line number
*
*/
void yyset_lineno (int line_number )
MY_ATTRIBUTE((unused)) static void yyset_lineno (int _line_number )
{
yylineno = line_number;
yylineno = _line_number;
}
/** Set the input stream. This does not discard the current
* input buffer.
* @param in_str A readable stream.
* @param _in_str A readable stream.
*
* @see yy_switch_to_buffer
*/
void yyset_in (FILE * in_str )
MY_ATTRIBUTE((unused)) static void yyset_in (FILE * _in_str )
{
yyin = in_str ;
yyin = _in_str ;
}
void yyset_out (FILE * out_str )
MY_ATTRIBUTE((unused)) static void yyset_out (FILE * _out_str )
{
yyout = out_str ;
yyout = _out_str ;
}
int yyget_debug (void)
MY_ATTRIBUTE((unused)) static int yyget_debug (void)
{
return yy_flex_debug;
}
void yyset_debug (int bdebug )
MY_ATTRIBUTE((unused)) static void yyset_debug (int _bdebug )
{
yy_flex_debug = bdebug ;
yy_flex_debug = _bdebug ;
}
static int yy_init_globals (void)
@ -3019,10 +3012,10 @@ static int yy_init_globals (void)
* This function is called from yylex_destroy(), so don't allocate here.
*/
(yy_buffer_stack) = 0;
(yy_buffer_stack) = NULL;
(yy_buffer_stack_top) = 0;
(yy_buffer_stack_max) = 0;
(yy_c_buf_p) = (char *) 0;
(yy_c_buf_p) = NULL;
(yy_init) = 0;
(yy_start) = 0;
@ -3031,8 +3024,8 @@ static int yy_init_globals (void)
yyin = stdin;
yyout = stdout;
#else
yyin = (FILE *) 0;
yyout = (FILE *) 0;
yyin = NULL;
yyout = NULL;
#endif
/* For future reference: Set errno on error, since we are called by
@ -3068,8 +3061,9 @@ MY_ATTRIBUTE((unused)) static int yylex_destroy (void)
*/
#ifndef yytext_ptr
static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
static void yy_flex_strncpy (char* s1, const char * s2, int n )
{
int i;
for ( i = 0; i < n; ++i )
s1[i] = s2[i];
@ -3077,7 +3071,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
#endif
#ifdef YY_NEED_STRLEN
static int yy_flex_strlen (yyconst char * s )
static int yy_flex_strlen (const char * s )
{
int n;
for ( n = 0; s[n]; ++n )
@ -3087,13 +3081,14 @@ static int yy_flex_strlen (yyconst char * s )
}
#endif
void *yyalloc (yy_size_t size )
static void *yyalloc (yy_size_t size )
{
return (void *) malloc( size );
return malloc(size);
}
void *yyrealloc (void * ptr, yy_size_t size )
static void *yyrealloc (void * ptr, yy_size_t size )
{
/* The cast to (char *) in the following accommodates both
* implementations that use char* generic pointers, and those
* that use void* generic pointers. It works with the latter
@ -3101,10 +3096,10 @@ void *yyrealloc (void * ptr, yy_size_t size )
* any pointer type to void*, and deal with argument conversions
* as though doing an assignment.
*/
return (void *) realloc( (char *) ptr, size );
return realloc(ptr, size);
}
void yyfree (void * ptr )
static void yyfree (void * ptr )
{
free( (char *) ptr ); /* see yyrealloc() for (char *) cast */
}
@ -3114,7 +3109,6 @@ void yyfree (void * ptr )
#line 691 "pars0lex.l"
/**********************************************************************
Release any resources used by the lexer. */
UNIV_INTERN
@ -3122,9 +3116,7 @@ void
pars_lexer_close(void)
/*==================*/
{
if (yy_buffer_stack)
yylex_destroy();
if (stringbuf)
free(stringbuf);
stringbuf = NULL;
stringbuf_len_alloc = stringbuf_len = 0;

View File

@ -1,6 +1,7 @@
#!/bin/bash
#
# Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
# Copyright (c) 2017, 2019, MariaDB Corporation.
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
@ -31,6 +32,7 @@ echo '#include "univ.i"' > $OUTFILE
# a warning on Win64. Add the cast. Also define some symbols as static.
sed -e '
s/'"$TMPFILE"'/'"$OUTFILE"'/;
s/^void *yyset_extra *( *YY_EXTRA_TYPE *user_defined *) *;//
s/\(int offset = \)\((yy_c_buf_p) - (yytext_ptr)\);/\1(int)(\2);/;
s/\(void yy\(restart\|_\(delete\|flush\)_buffer\)\)/static \1/;
s/\(void yy_switch_to_buffer\)/MY_ATTRIBUTE((unused)) static \1/;
@ -38,11 +40,12 @@ s/\(void yy\(push\|pop\)_buffer_state\)/MY_ATTRIBUTE((unused)) static \1/;
s/\(YY_BUFFER_STATE yy_create_buffer\)/static \1/;
s/\(\(int\|void\) yy[gs]et_\)/MY_ATTRIBUTE((unused)) static \1/;
s/\(void \*\?yy\(\(re\)\?alloc\|free\)\)/static \1/;
s/\(extern \)\?\(int yy\(leng\|lineno\|_flex_debug\)\)/static \2/;
s/extern int yy\(leng\|_flex_debug\|lineno\);//;
s/\(int yy\(leng\|lineno\|_flex_debug\)\)/static \1/;
s/\(int yylex_destroy\)/MY_ATTRIBUTE((unused)) static \1/;
s/\(extern \)\?\(int yylex \)/UNIV_INTERN \2/;
s/^\(\(FILE\|char\) *\* *yyget\)/MY_ATTRIBUTE((unused)) static \1/;
s/^\(extern \)\?\(\(FILE\|char\) *\* *yy\)/static \2/;
s/^extern \(\(FILE\|char\) *\* *yy\).*//;
s/^\(FILE\|char\) *\* *yy/static &/;
' < $TMPFILE >> $OUTFILE
rm $TMPFILE

View File

@ -1,6 +1,7 @@
/*****************************************************************************
Copyright (c) 1997, 2011, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2019, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@ -64,9 +65,8 @@ Created 12/14/1997 Heikki Tuuri
#define realloc(P, A) ut_realloc(P, A)
#define exit(A) ut_error
/* Note: We cast &result to int* from yysize_t* */
#define YY_INPUT(buf, result, max_size) \
pars_get_lex_chars(buf, (int*) &result, max_size)
result = pars_get_lex_chars(buf, max_size)
/* String buffer for removing quotes */
static ulint stringbuf_len_alloc = 0; /* Allocated length */
@ -697,9 +697,7 @@ void
pars_lexer_close(void)
/*==================*/
{
if (yy_buffer_stack)
yylex_destroy();
if (stringbuf)
free(stringbuf);
stringbuf = NULL;
stringbuf_len_alloc = stringbuf_len = 0;

View File

@ -1,6 +1,7 @@
/*****************************************************************************
Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2019, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@ -2153,16 +2154,14 @@ pars_stored_procedure_call(
/*************************************************************//**
Retrieves characters to the lexical analyzer. */
UNIV_INTERN
int
size_t
pars_get_lex_chars(
/*===============*/
char* buf, /*!< in/out: buffer where to copy */
int max_size) /*!< in: maximum number of characters which fit
size_t max_size) /*!< in: maximum number of characters which fit
in the buffer */
{
int len;
len = static_cast<int>(
size_t len = size_t(
pars_sym_tab_global->string_len
- pars_sym_tab_global->next_char_pos);
if (len == 0) {