Revert accidental commit of lex.yy.c

git-svn-id: http://svn.osgeo.org/postgis/trunk@3475 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/liblwgeom/lex.yy.c b/liblwgeom/lex.yy.c
index 540f1eb0338ffdbc7225d0cf98aa47fa8e449e54..d78371fb605eb3039906dca77a3f2b99faee2ff7 100644 (file)
--- a/liblwgeom/lex.yy.c
+++ b/liblwgeom/lex.yy.c
@@ -6,10 +6,29 @@
 
 /* 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 33
+#define YY_FLEX_SUBMINOR_VERSION 35
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -31,7 +50,7 @@
 
 /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
 
-#if __STDC_VERSION__ >= 199901L
+#if defined (__STDC_VERSION__) && __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. 
@@ -54,7 +73,6 @@ 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
@@ -85,6 +103,8 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#endif /* ! C99 */
+
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -94,11 +114,12 @@ typedef unsigned int flex_uint32_t;
 
 #else  /* ! __cplusplus */
 
-#if __STDC__
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
 
 #define YY_USE_CONST
 
-#endif /* __STDC__ */
+#endif /* defined (__STDC__) */
 #endif /* ! __cplusplus */
 
 #ifdef YY_USE_CONST
@@ -178,14 +199,9 @@ 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 unsigned int yy_size_t;
+typedef size_t yy_size_t;
 #endif
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -3335,7 +3351,7 @@ char *lwg_parse_yytext;
 #line 11 "wktparse.lex"
 #include "wktparse.tab.h"
 #include <unistd.h>
-#include <stdlib.h> /* need stdlib for atof() definition */
+#include <stdlib.h> // need stdlib for atof() definition 
 
 void init_parser(const char *src);
 void close_parser(void);
@@ -3350,7 +3366,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 3354 "lex.yy.c"
+#line 3370 "lex.yy.c"
 
 #define INITIAL 0
 #define vals_ok 1
@@ -3369,6 +3385,35 @@ 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.
  */
@@ -3411,7 +3456,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 (void) fwrite( lwg_parse_yytext, lwg_parse_yyleng, 1, lwg_parse_yyout )
+#define ECHO 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,
@@ -3491,7 +3536,7 @@ YY_DECL
 #line 30 "wktparse.lex"
 
 
-#line 3495 "lex.yy.c"
+#line 3540 "lex.yy.c"
 
        if ( !(yy_init) )
                {
@@ -3753,7 +3798,7 @@ YY_RULE_SETUP
 #line 73 "wktparse.lex"
 ECHO;
        YY_BREAK
-#line 3757 "lex.yy.c"
+#line 3802 "lex.yy.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(vals_ok):
        yyterminate();
@@ -3985,7 +4030,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), num_to_read );
+                       (yy_n_chars), (size_t) num_to_read );
 
                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
                }
@@ -4009,6 +4054,14 @@ 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;
@@ -4155,7 +4208,7 @@ static int yy_get_next_buffer (void)
                                case EOB_ACT_END_OF_FILE:
                                        {
                                        if ( lwg_parse_yywrap( ) )
-                                               return 0;
+                                               return EOF;
 
                                        if ( ! (yy_did_buffer_switch_on_eof) )
                                                YY_NEW_FILE;
@@ -4419,7 +4472,9 @@ 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;
@@ -4437,6 +4492,8 @@ 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*));
@@ -4481,7 +4538,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 str a NUL-terminated string to scan
+ * @param yystr 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