From 5cd03f314bfc68b110dcee059bd095ff1449dd0c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jorge=20Ar=C3=A9valo?= Date: Mon, 28 Mar 2011 22:56:11 +0000 Subject: [PATCH] liblwgeom/lex.yy.c version 6180 reverted git-svn-id: http://svn.osgeo.org/postgis/trunk@6982 b70326c6-7e19-0410-871a-916f4a2858ee --- liblwgeom/lex.yy.c | 112 +++++++++------------------------------------ 1 file changed, 21 insertions(+), 91 deletions(-) diff --git a/liblwgeom/lex.yy.c b/liblwgeom/lex.yy.c index 610391df4..1fa3143e8 100644 --- a/liblwgeom/lex.yy.c +++ b/liblwgeom/lex.yy.c @@ -6,29 +6,10 @@ /* A lexical scanner generated by flex */ -#define yy_create_buffer lwg_parse_yy_create_buffer -#define yy_delete_buffer lwg_parse_yy_delete_buffer -#define yy_flex_debug lwg_parse_yy_flex_debug -#define yy_init_buffer lwg_parse_yy_init_buffer -#define yy_flush_buffer lwg_parse_yy_flush_buffer -#define yy_load_buffer_state lwg_parse_yy_load_buffer_state -#define yy_switch_to_buffer lwg_parse_yy_switch_to_buffer -#define yyin lwg_parse_yyin -#define yyleng lwg_parse_yyleng -#define yylex lwg_parse_yylex -#define yylineno lwg_parse_yylineno -#define yyout lwg_parse_yyout -#define yyrestart lwg_parse_yyrestart -#define yytext lwg_parse_yytext -#define yywrap lwg_parse_yywrap -#define yyalloc lwg_parse_yyalloc -#define yyrealloc lwg_parse_yyrealloc -#define yyfree lwg_parse_yyfree - #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 35 +#define YY_FLEX_SUBMINOR_VERSION 33 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -50,7 +31,7 @@ /* C99 systems have . Non-C99 systems may or may not. */ -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#if __STDC_VERSION__ >= 199901L /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, * if you want the limit (max/min) macros for int types. @@ -73,6 +54,7 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -103,8 +85,6 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#endif /* ! C99 */ - #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -114,12 +94,11 @@ typedef unsigned int flex_uint32_t; #else /* ! __cplusplus */ -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) +#if __STDC__ #define YY_USE_CONST -#endif /* defined (__STDC__) */ +#endif /* __STDC__ */ #endif /* ! __cplusplus */ #ifdef YY_USE_CONST @@ -161,15 +140,7 @@ typedef unsigned int flex_uint32_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else #define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -207,9 +178,14 @@ extern FILE *lwg_parse_yyin, *lwg_parse_yyout; #define unput(c) yyunput( c, (yytext_ptr) ) +/* The following is because we cannot portably get our hands on size_t + * (without autoconf's help, which isn't available because we want + * flex-generated scanners to compile on their own). + */ + #ifndef YY_TYPEDEF_YY_SIZE_T #define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; +typedef unsigned int yy_size_t; #endif #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -3848,7 +3824,7 @@ static YY_BUFFER_STATE buf_state; /* Macro to keep track of the current parse position */ #define UPDATE_YYLLOC() (lwg_parse_yylloc.last_column += lwg_parse_yyleng) -#line 3852 "lex.yy.c" +#line 3828 "lex.yy.c" #define INITIAL 0 #define vals_ok 1 @@ -3867,35 +3843,6 @@ static YY_BUFFER_STATE buf_state; static int yy_init_globals (void ); -/* Accessor methods to globals. - These are made visible to non-reentrant scanners for convenience. */ - -int lwg_parse_yylex_destroy (void ); - -int lwg_parse_yyget_debug (void ); - -void lwg_parse_yyset_debug (int debug_flag ); - -YY_EXTRA_TYPE lwg_parse_yyget_extra (void ); - -void lwg_parse_yyset_extra (YY_EXTRA_TYPE user_defined ); - -FILE *lwg_parse_yyget_in (void ); - -void lwg_parse_yyset_in (FILE * in_str ); - -FILE *lwg_parse_yyget_out (void ); - -void lwg_parse_yyset_out (FILE * out_str ); - -int lwg_parse_yyget_leng (void ); - -char *lwg_parse_yyget_text (void ); - -int lwg_parse_yyget_lineno (void ); - -void lwg_parse_yyset_lineno (int line_number ); - /* Macros after this point can all be overridden by user definitions in * section 1. */ @@ -3930,12 +3877,7 @@ static int input (void ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else #define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -3943,7 +3885,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( lwg_parse_yytext, lwg_parse_yyleng, 1, lwg_parse_yyout )) {} } while (0) +#define ECHO (void) fwrite( lwg_parse_yytext, lwg_parse_yyleng, 1, lwg_parse_yyout ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -4023,7 +3965,7 @@ YY_DECL #line 29 "wktparse.lex" -#line 4027 "lex.yy.c" +#line 3969 "lex.yy.c" if ( !(yy_init) ) { @@ -4315,7 +4257,7 @@ YY_RULE_SETUP #line 78 "wktparse.lex" ECHO; YY_BREAK -#line 4319 "lex.yy.c" +#line 4261 "lex.yy.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(vals_ok): yyterminate(); @@ -4547,7 +4489,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); } @@ -4571,14 +4513,6 @@ 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) { - /* 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 *) lwg_parse_yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); - if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); - } - (yy_n_chars) += number_to_move; YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; @@ -4725,7 +4659,7 @@ static int yy_get_next_buffer (void) case EOB_ACT_END_OF_FILE: { if ( lwg_parse_yywrap( ) ) - return EOF; + return 0; if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; @@ -4989,9 +4923,7 @@ static void lwg_parse_yyensure_buffer_stack (void) (yy_buffer_stack) = (struct yy_buffer_state**)lwg_parse_yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); - if ( ! (yy_buffer_stack) ) - YY_FATAL_ERROR( "out of dynamic memory in lwg_parse_yyensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); (yy_buffer_stack_max) = num_to_alloc; @@ -5009,8 +4941,6 @@ static void lwg_parse_yyensure_buffer_stack (void) ((yy_buffer_stack), num_to_alloc * sizeof(struct yy_buffer_state*) ); - if ( ! (yy_buffer_stack) ) - YY_FATAL_ERROR( "out of dynamic memory in lwg_parse_yyensure_buffer_stack()" ); /* zero only the new slots.*/ memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); @@ -5055,7 +4985,7 @@ YY_BUFFER_STATE lwg_parse_yy_scan_buffer (char * base, yy_size_t size ) /** Setup the input buffer state to scan a string. The next call to lwg_parse_yylex() will * scan from a @e copy of @a str. - * @param yystr a NUL-terminated string to scan + * @param str a NUL-terminated string to scan * * @return the newly allocated buffer state object. * @note If you want to scan bytes that may contain NUL values, then use @@ -5069,8 +4999,8 @@ YY_BUFFER_STATE lwg_parse_yy_scan_string (yyconst char * yystr ) /** Setup the input buffer state to scan the given bytes. The next call to lwg_parse_yylex() will * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ -- 2.50.1