[postgis-tickets] r16665 - Better parallel build, closes #4105
Paul Ramsey
pramsey at cleverelephant.ca
Tue Jul 24 06:33:53 PDT 2018
Author: pramsey
Date: 2018-07-24 06:33:53 -0700 (Tue, 24 Jul 2018)
New Revision: 16665
Modified:
branches/2.4/NEWS
branches/2.4/extensions/address_standardizer/Makefile.in
branches/2.4/extensions/postgis/Makefile.in
branches/2.4/extensions/postgis_tiger_geocoder/Makefile.in
branches/2.4/extensions/postgis_topology/Makefile.in
branches/2.4/liblwgeom/lwin_wkt_lex.c
Log:
Better parallel build, closes #4105
Modified: branches/2.4/NEWS
===================================================================
--- branches/2.4/NEWS 2018-07-24 13:11:16 UTC (rev 16664)
+++ branches/2.4/NEWS 2018-07-24 13:33:53 UTC (rev 16665)
@@ -15,6 +15,7 @@
- #4090, PG 11 support (Paul Ramsey, Raúl Marín)
- #3997, fix bug in lwgeom_median and avoid division by zero (Raúl Marín)
- #4093, Inconsistent results from qsort callback (yugr)
+ - #4105, Parallel build of tarball (Bas Couwenberg)
PostGIS 2.4.4
Modified: branches/2.4/extensions/address_standardizer/Makefile.in
===================================================================
--- branches/2.4/extensions/address_standardizer/Makefile.in 2018-07-24 13:11:16 UTC (rev 16664)
+++ branches/2.4/extensions/address_standardizer/Makefile.in 2018-07-24 13:33:53 UTC (rev 16665)
@@ -70,21 +70,26 @@
sql/address_standardizer-- at POSTGIS_LIB_VERSION@.sql: sql/address_standardizer_types.sql \
sql/address_standardizer_functions.sql
+ mkdir -p sql
cat $^ > $@
sql/address_standardizer.sql: sql/address_standardizer_types.sql \
sql/address_standardizer_functions.sql
+ mkdir -p sql
cat $^ > $@
sql/address_standardizer--1.0--$(EXTVERSION).sql: sql/address_standardizer_functions.sql
+ mkdir -p sql
cat $^ > $@
# upgrade logic for us data extension (to go to next cludge for dev upgrading)
sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: sql/address_standardizer_functions.sql
+ mkdir -p sql
cat $^ > $@
# upgrade logic for us data extension (to go to original round-robin yoyo cludge for dev upgrading)
sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql/address_standardizer_functions.sql
+ mkdir -p sql
cat $^ > $@
# build us data extension
@@ -98,10 +103,12 @@
# upgrade logic for us data extension (to go to next cludge for dev upgrading)
sql/$(EXTENSION)_data_us--$(EXTVERSION)--$(EXTVERSION)next.sql: sql/$(EXTENSION)_data_us--$(EXTVERSION).sql
+ mkdir -p sql
cat $^ > $@
# upgrade logic for us data extension (to go to original round-robin yoyo cludge for dev upgrading)
sql/$(EXTENSION)_data_us--$(EXTVERSION)next--$(EXTVERSION).sql: sql/$(EXTENSION)_data_us--$(EXTVERSION).sql
+ mkdir -p sql
cat $^ > $@
mk-st-regexp: mk-st-regexp.pl
Modified: branches/2.4/extensions/postgis/Makefile.in
===================================================================
--- branches/2.4/extensions/postgis/Makefile.in 2018-07-24 13:11:16 UTC (rev 16664)
+++ branches/2.4/extensions/postgis/Makefile.in 2018-07-24 13:33:53 UTC (rev 16665)
@@ -52,12 +52,15 @@
#this is a cludge to allow upgrading from same SVN to same SVN
sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: sql_bits/postgis_extension_upgrade_minor.sql
+ mkdir -p sql
cp $< $@
sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql_bits/postgis_extension_upgrade_minor.sql
+ mkdir -p sql
cp $< $@
#strip BEGIN/COMMIT since these are not allowed in extensions
sql_bits/spatial_ref_sys.sql: ../../spatial_ref_sys.sql
+ mkdir -p sql_bits
$(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' $< > $@
#strip BEGIN/COMMIT since these are not allowed in extensions
@@ -69,6 +72,7 @@
$(MAKE) -C ../../doc comments
sql_bits/postgis_comments.sql: ../../doc/postgis_comments.sql
+ mkdir -p sql_bits
cp $< $@
#strip BEGIN/COMMIT since these are not allowed in extensions
@@ -77,12 +81,15 @@
$(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' $< > $@
sql_bits/spatial_ref_sys_config_dump.sql: ../../spatial_ref_sys.sql ../../utils/create_spatial_ref_sys_config_dump.pl
+ mkdir -p sql_bits
$(PERL) ../../utils/create_spatial_ref_sys_config_dump.pl $< > $@
sql_bits/rtpostgis_upgrade.sql: ../../raster/rt_pg/rtpostgis_upgrade_for_extension.sql
+ mkdir -p sql_bits
$(PERL) -pe "s/BEGIN\;//g ; s/COMMIT\;//g; s/^(DROP .*)\;/SELECT postgis_extension_drop_if_exists('$(EXTENSION)', '\1');\n\1\;/" $< > $@
sql_bits/postgis_upgrade.sql: ../../postgis/postgis_upgrade_for_extension.sql
+ mkdir -p sql_bits
$(PERL) -pe "s/BEGIN\;//g ; s/COMMIT\;//g; s/^(DROP .*)\;/SELECT postgis_extension_drop_if_exists('$(EXTENSION)', '\1');\n\1\;/" $< > $@
@@ -90,10 +97,12 @@
$(MAKE) -C ../../doc comments
sql_bits/raster_comments.sql: ../../doc/raster_comments.sql
+ mkdir -p sql_bits
cp $< $@
#postgis_extension_upgrade_minor.sql is the one that contains both postgis AND raster
sql_bits/postgis_extension_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/postgis_upgrade.sql sql_bits/rtpostgis_upgrade.sql ../../doc/raster_comments.sql ../../doc/postgis_comments.sql ../postgis_extension_helper_uninstall.sql
+ mkdir -p sql_bits
printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
cat $^ >> $@
Modified: branches/2.4/extensions/postgis_tiger_geocoder/Makefile.in
===================================================================
--- branches/2.4/extensions/postgis_tiger_geocoder/Makefile.in 2018-07-24 13:11:16 UTC (rev 16664)
+++ branches/2.4/extensions/postgis_tiger_geocoder/Makefile.in 2018-07-24 13:33:53 UTC (rev 16665)
@@ -52,6 +52,7 @@
cat $^ > $@
expected/test-pagc_normalize_address.out: sql_bits/test_tuples_only_unaligned.sql.in ../../extras/tiger_geocoder/regress/pagc_normalize_address_regress
+ mkdir -p expected
cat $^ > $@
## adding \t .. to force output to be the same as what get in regular regress in tiger folder
@@ -64,6 +65,7 @@
echo 'ALTER EXTENSION ${EXTENSION} UPDATE TO "$(EXTVERSION)next"' > $@
expected/test-upgrade.out: sql/test-upgrade.sql
+ mkdir -p expected
cp $< $@
sql/test-pagc_normalize_address.sql: sql_bits/test_tuples_only_unaligned.sql.in ../../extras/tiger_geocoder/regress/pagc_normalize_address_regress.sql
@@ -123,6 +125,7 @@
../../extras/tiger_geocoder/geocode/geocode.sql \
../../extras/tiger_geocoder/geocode/reverse_geocode.sql \
../../extras/tiger_geocoder/geocode/census_tracts_functions.sql
+ mkdir -p sql_bits
cat $^ > $@
#also remove tiger_data from extension if it is part of it so data gets backed up
@@ -162,15 +165,18 @@
../../extras/tiger_geocoder/topology/tiger_topology_loader.sql \
../postgis_extension_helper.sql \
sql_bits/add_search_path.sql
+ mkdir -p sql_bits
cat $^ > $@
echo "SELECT postgis_extension_drop_if_exists('${EXTENSION}', 'DROP SCHEMA tiger_data');" >> $@
cat ../postgis_extension_helper_uninstall.sql >> $@
sql_bits/tiger_geocoder.sql: sql_bits/tiger_geocoder.sql.in
+ mkdir -p sql_bits
sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' -e '/^CREATE SCHEMA/d;' $< > $@
$(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' $< > $@
sql_bits/add_search_path.sql: sql_bits/add_search_path.sql.in
+ mkdir -p sql_bits
cp $< $@
../../doc/tiger_geocoder_comments.sql:
@@ -177,6 +183,7 @@
$(MAKE) -C ../../doc comments
sql_bits/tiger_geocoder_comments.sql: ../../doc/tiger_geocoder_comments.sql
+ mkdir -p sql_bits
cp $< $@
#grep all lines that start with CREATE OR REPLACE FUNCTION, TRIGGER...
Modified: branches/2.4/extensions/postgis_topology/Makefile.in
===================================================================
--- branches/2.4/extensions/postgis_topology/Makefile.in 2018-07-24 13:11:16 UTC (rev 16664)
+++ branches/2.4/extensions/postgis_topology/Makefile.in 2018-07-24 13:33:53 UTC (rev 16665)
@@ -42,8 +42,10 @@
#this is a cludge to allow upgrading from same SVN to same SVN
sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: extlock.sql ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/topology_upgrade.sql sql_bits/mark_editable_objects.sql.in sql_bits/topology_comments.sql ../postgis_extension_helper_uninstall.sql
+ mkdir -p sql
cat $^ > $@
sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql
+ mkdir -p sql
cat $^ > $@
#strip BEGIN/COMMIT since these are not allowed in extensions
@@ -50,6 +52,7 @@
#strip CREATE SCHEMA since we force extension
# to create schema by setting schema to topology in control
sql_bits/topology.sql: ../../topology/topology.sql
+ mkdir -p sql_bits
sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' -e '/^CREATE SCHEMA/d;' $< > $@
../../doc/topology_comments.sql:
@@ -56,6 +59,7 @@
$(MAKE) -C ../../doc comments
sql_bits/topology_comments.sql: ../../doc/topology_comments.sql
+ mkdir -p sql_bits
cp $< $@
sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: ../../topology/topology.sql ../../utils/create_unpackaged.pl
Modified: branches/2.4/liblwgeom/lwin_wkt_lex.c
===================================================================
--- branches/2.4/liblwgeom/lwin_wkt_lex.c 2018-07-24 13:11:16 UTC (rev 16664)
+++ branches/2.4/liblwgeom/lwin_wkt_lex.c 2018-07-24 13:33:53 UTC (rev 16665)
@@ -1,6 +1,6 @@
-#line 1 "lwin_wkt_lex.c"
+#line 2 "lwin_wkt_lex.c"
-#line 3 "lwin_wkt_lex.c"
+#line 4 "lwin_wkt_lex.c"
#define YY_INT_ALIGNED short int
@@ -8,17 +8,11 @@
#define yy_create_buffer wkt_yy_create_buffer
#define yy_delete_buffer wkt_yy_delete_buffer
-#define yy_scan_buffer wkt_yy_scan_buffer
-#define yy_scan_string wkt_yy_scan_string
-#define yy_scan_bytes wkt_yy_scan_bytes
+#define yy_flex_debug wkt_yy_flex_debug
#define yy_init_buffer wkt_yy_init_buffer
#define yy_flush_buffer wkt_yy_flush_buffer
#define yy_load_buffer_state wkt_yy_load_buffer_state
#define yy_switch_to_buffer wkt_yy_switch_to_buffer
-#define yypush_buffer_state wkt_yypush_buffer_state
-#define yypop_buffer_state wkt_yypop_buffer_state
-#define yyensure_buffer_stack wkt_yyensure_buffer_stack
-#define yy_flex_debug wkt_yy_flex_debug
#define yyin wkt_yyin
#define yyleng wkt_yyleng
#define yylex wkt_yylex
@@ -33,246 +27,12 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 6
-#define YY_FLEX_SUBMINOR_VERSION 4
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 35
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
-#ifdef yy_create_buffer
-#define wkt_yy_create_buffer_ALREADY_DEFINED
-#else
-#define yy_create_buffer wkt_yy_create_buffer
-#endif
-
-#ifdef yy_delete_buffer
-#define wkt_yy_delete_buffer_ALREADY_DEFINED
-#else
-#define yy_delete_buffer wkt_yy_delete_buffer
-#endif
-
-#ifdef yy_scan_buffer
-#define wkt_yy_scan_buffer_ALREADY_DEFINED
-#else
-#define yy_scan_buffer wkt_yy_scan_buffer
-#endif
-
-#ifdef yy_scan_string
-#define wkt_yy_scan_string_ALREADY_DEFINED
-#else
-#define yy_scan_string wkt_yy_scan_string
-#endif
-
-#ifdef yy_scan_bytes
-#define wkt_yy_scan_bytes_ALREADY_DEFINED
-#else
-#define yy_scan_bytes wkt_yy_scan_bytes
-#endif
-
-#ifdef yy_init_buffer
-#define wkt_yy_init_buffer_ALREADY_DEFINED
-#else
-#define yy_init_buffer wkt_yy_init_buffer
-#endif
-
-#ifdef yy_flush_buffer
-#define wkt_yy_flush_buffer_ALREADY_DEFINED
-#else
-#define yy_flush_buffer wkt_yy_flush_buffer
-#endif
-
-#ifdef yy_load_buffer_state
-#define wkt_yy_load_buffer_state_ALREADY_DEFINED
-#else
-#define yy_load_buffer_state wkt_yy_load_buffer_state
-#endif
-
-#ifdef yy_switch_to_buffer
-#define wkt_yy_switch_to_buffer_ALREADY_DEFINED
-#else
-#define yy_switch_to_buffer wkt_yy_switch_to_buffer
-#endif
-
-#ifdef yypush_buffer_state
-#define wkt_yypush_buffer_state_ALREADY_DEFINED
-#else
-#define yypush_buffer_state wkt_yypush_buffer_state
-#endif
-
-#ifdef yypop_buffer_state
-#define wkt_yypop_buffer_state_ALREADY_DEFINED
-#else
-#define yypop_buffer_state wkt_yypop_buffer_state
-#endif
-
-#ifdef yyensure_buffer_stack
-#define wkt_yyensure_buffer_stack_ALREADY_DEFINED
-#else
-#define yyensure_buffer_stack wkt_yyensure_buffer_stack
-#endif
-
-#ifdef yylex
-#define wkt_yylex_ALREADY_DEFINED
-#else
-#define yylex wkt_yylex
-#endif
-
-#ifdef yyrestart
-#define wkt_yyrestart_ALREADY_DEFINED
-#else
-#define yyrestart wkt_yyrestart
-#endif
-
-#ifdef yylex_init
-#define wkt_yylex_init_ALREADY_DEFINED
-#else
-#define yylex_init wkt_yylex_init
-#endif
-
-#ifdef yylex_init_extra
-#define wkt_yylex_init_extra_ALREADY_DEFINED
-#else
-#define yylex_init_extra wkt_yylex_init_extra
-#endif
-
-#ifdef yylex_destroy
-#define wkt_yylex_destroy_ALREADY_DEFINED
-#else
-#define yylex_destroy wkt_yylex_destroy
-#endif
-
-#ifdef yyget_debug
-#define wkt_yyget_debug_ALREADY_DEFINED
-#else
-#define yyget_debug wkt_yyget_debug
-#endif
-
-#ifdef yyset_debug
-#define wkt_yyset_debug_ALREADY_DEFINED
-#else
-#define yyset_debug wkt_yyset_debug
-#endif
-
-#ifdef yyget_extra
-#define wkt_yyget_extra_ALREADY_DEFINED
-#else
-#define yyget_extra wkt_yyget_extra
-#endif
-
-#ifdef yyset_extra
-#define wkt_yyset_extra_ALREADY_DEFINED
-#else
-#define yyset_extra wkt_yyset_extra
-#endif
-
-#ifdef yyget_in
-#define wkt_yyget_in_ALREADY_DEFINED
-#else
-#define yyget_in wkt_yyget_in
-#endif
-
-#ifdef yyset_in
-#define wkt_yyset_in_ALREADY_DEFINED
-#else
-#define yyset_in wkt_yyset_in
-#endif
-
-#ifdef yyget_out
-#define wkt_yyget_out_ALREADY_DEFINED
-#else
-#define yyget_out wkt_yyget_out
-#endif
-
-#ifdef yyset_out
-#define wkt_yyset_out_ALREADY_DEFINED
-#else
-#define yyset_out wkt_yyset_out
-#endif
-
-#ifdef yyget_leng
-#define wkt_yyget_leng_ALREADY_DEFINED
-#else
-#define yyget_leng wkt_yyget_leng
-#endif
-
-#ifdef yyget_text
-#define wkt_yyget_text_ALREADY_DEFINED
-#else
-#define yyget_text wkt_yyget_text
-#endif
-
-#ifdef yyget_lineno
-#define wkt_yyget_lineno_ALREADY_DEFINED
-#else
-#define yyget_lineno wkt_yyget_lineno
-#endif
-
-#ifdef yyset_lineno
-#define wkt_yyset_lineno_ALREADY_DEFINED
-#else
-#define yyset_lineno wkt_yyset_lineno
-#endif
-
-#ifdef yywrap
-#define wkt_yywrap_ALREADY_DEFINED
-#else
-#define yywrap wkt_yywrap
-#endif
-
-#ifdef yyalloc
-#define wkt_yyalloc_ALREADY_DEFINED
-#else
-#define yyalloc wkt_yyalloc
-#endif
-
-#ifdef yyrealloc
-#define wkt_yyrealloc_ALREADY_DEFINED
-#else
-#define yyrealloc wkt_yyrealloc
-#endif
-
-#ifdef yyfree
-#define wkt_yyfree_ALREADY_DEFINED
-#else
-#define yyfree wkt_yyfree
-#endif
-
-#ifdef yytext
-#define wkt_yytext_ALREADY_DEFINED
-#else
-#define yytext wkt_yytext
-#endif
-
-#ifdef yyleng
-#define wkt_yyleng_ALREADY_DEFINED
-#else
-#define yyleng wkt_yyleng
-#endif
-
-#ifdef yyin
-#define wkt_yyin_ALREADY_DEFINED
-#else
-#define yyin wkt_yyin
-#endif
-
-#ifdef yyout
-#define wkt_yyout_ALREADY_DEFINED
-#else
-#define yyout wkt_yyout
-#endif
-
-#ifdef yy_flex_debug
-#define wkt_yy_flex_debug_ALREADY_DEFINED
-#else
-#define yy_flex_debug wkt_yy_flex_debug
-#endif
-
-#ifdef yylineno
-#define wkt_yylineno_ALREADY_DEFINED
-#else
-#define yylineno wkt_yylineno
-#endif
-
/* First, we deal with platform-specific or compiler-specific issues. */
/* begin standard C headers. */
@@ -306,6 +66,7 @@
typedef uint16_t flex_uint16_t;
typedef int32_t flex_int32_t;
typedef uint32_t flex_uint32_t;
+typedef uint64_t flex_uint64_t;
#else
typedef signed char flex_int8_t;
typedef short int flex_int16_t;
@@ -313,6 +74,7 @@
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
@@ -343,32 +105,38 @@
#define UINT32_MAX (4294967295U)
#endif
-#ifndef SIZE_MAX
-#define SIZE_MAX (~(size_t)0)
-#endif
+#endif /* ! FLEXINT_H */
-#endif /* ! C99 */
+#ifdef __cplusplus
-#endif /* ! FLEXINT_H */
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
-/* begin standard C++ headers. */
+#else /* ! __cplusplus */
-/* TODO: this is always defined, so inline it */
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif /* defined (__STDC__) */
+#endif /* ! __cplusplus */
+
+#ifdef YY_USE_CONST
#define yyconst const
-
-#if defined(__GNUC__) && __GNUC__ >= 3
-#define yynoreturn __attribute__((__noreturn__))
#else
-#define yynoreturn
+#define yyconst
#endif
/* Returned upon end-of-file. */
#define YY_NULL 0
-/* Promotes a possibly negative, possibly signed char to an
- * integer in range [0..255] for use as an array index.
+/* 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.
*/
-#define YY_SC_TO_UI(c) ((YY_CHAR) (c))
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned 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
@@ -375,6 +143,7 @@
* 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.
@@ -381,23 +150,18 @@
*/
#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_NEW_FILE wkt_yyrestart(wkt_yyin )
+
#define YY_END_OF_BUFFER_CHAR 0
/* 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.
@@ -414,30 +178,30 @@
typedef size_t yy_size_t;
#endif
-extern int yyleng;
+extern yy_size_t wkt_yyleng;
-extern FILE *yyin, *yyout;
+extern FILE *wkt_yyin, *wkt_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) \
do \
{ \
- /* Undo effects of setting up yytext. */ \
+ /* Undo effects of setting up wkt_yytext. */ \
int yyless_macro_arg = (n); \
YY_LESS_LINENO(yyless_macro_arg);\
*yy_cp = (yy_hold_char); \
YY_RESTORE_YY_MORE_OFFSET \
(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
- YY_DO_BEFORE_ACTION; /* set up yytext again */ \
+ YY_DO_BEFORE_ACTION; /* set up wkt_yytext again */ \
} \
while ( 0 )
+
#define unput(c) yyunput( c, (yytext_ptr) )
#ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -452,12 +216,12 @@
/* Size of input buffer in bytes, not including room for EOB
* characters.
*/
- int yy_buf_size;
+ yy_size_t yy_buf_size;
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
- int yy_n_chars;
+ yy_size_t 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
@@ -480,7 +244,7 @@
int yy_bs_lineno; /**< The line count. */
int yy_bs_column; /**< The column count. */
-
+
/* Whether to try to fill the input buffer when we reach the
* end of it.
*/
@@ -497,8 +261,8 @@
* possible backing-up.
*
* When we actually see the EOF, we change the status to "new"
- * (via yyrestart()), so that the user can continue scanning by
- * just pointing yyin at a new input file.
+ * (via wkt_yyrestart()), so that the user can continue scanning by
+ * just pointing wkt_yyin at a new input file.
*/
#define YY_BUFFER_EOF_PENDING 2
@@ -508,7 +272,7 @@
/* 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 = NULL; /**< Stack as an array. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< 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
@@ -519,101 +283,106 @@
#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.
*/
#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
-/* yy_hold_char holds the character lost when yytext is formed. */
+/* yy_hold_char holds the character lost when wkt_yytext is formed. */
static char yy_hold_char;
-static int yy_n_chars; /* number of characters read into yy_ch_buf */
-int yyleng;
+static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */
+yy_size_t wkt_yyleng;
/* Points to current character in buffer. */
-static char *yy_c_buf_p = NULL;
+static char *yy_c_buf_p = (char *) 0;
static int yy_init = 0; /* whether we need to initialize */
static int yy_start = 0; /* start state number */
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin. A bit of a hack ...
+/* Flag which is used to allow wkt_yywrap()'s to do buffer switches
+ * instead of setting up a fresh wkt_yyin. A bit of a hack ...
*/
static int yy_did_buffer_switch_on_eof;
-void yyrestart ( FILE *input_file );
-void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer );
-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 );
+void wkt_yyrestart (FILE *input_file );
+void wkt_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer );
+YY_BUFFER_STATE wkt_yy_create_buffer (FILE *file,int size );
+void wkt_yy_delete_buffer (YY_BUFFER_STATE b );
+void wkt_yy_flush_buffer (YY_BUFFER_STATE b );
+void wkt_yypush_buffer_state (YY_BUFFER_STATE new_buffer );
+void wkt_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 )
+static void wkt_yyensure_buffer_stack (void );
+static void wkt_yy_load_buffer_state (void );
+static void wkt_yy_init_buffer (YY_BUFFER_STATE b,FILE *file );
-YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size );
-YY_BUFFER_STATE yy_scan_string ( const char *yy_str );
-YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len );
+#define YY_FLUSH_BUFFER wkt_yy_flush_buffer(YY_CURRENT_BUFFER )
-void *yyalloc ( yy_size_t );
-void *yyrealloc ( void *, yy_size_t );
-void yyfree ( void * );
+YY_BUFFER_STATE wkt_yy_scan_buffer (char *base,yy_size_t size );
+YY_BUFFER_STATE wkt_yy_scan_string (yyconst char *yy_str );
+YY_BUFFER_STATE wkt_yy_scan_bytes (yyconst char *bytes,yy_size_t len );
-#define yy_new_buffer yy_create_buffer
+void *wkt_yyalloc (yy_size_t );
+void *wkt_yyrealloc (void *,yy_size_t );
+void wkt_yyfree (void * );
+
+#define yy_new_buffer wkt_yy_create_buffer
+
#define yy_set_interactive(is_interactive) \
{ \
if ( ! YY_CURRENT_BUFFER ){ \
- yyensure_buffer_stack (); \
+ wkt_yyensure_buffer_stack (); \
YY_CURRENT_BUFFER_LVALUE = \
- yy_create_buffer( yyin, YY_BUF_SIZE ); \
+ wkt_yy_create_buffer(wkt_yyin,YY_BUF_SIZE ); \
} \
YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
}
+
#define yy_set_bol(at_bol) \
{ \
if ( ! YY_CURRENT_BUFFER ){\
- yyensure_buffer_stack (); \
+ wkt_yyensure_buffer_stack (); \
YY_CURRENT_BUFFER_LVALUE = \
- yy_create_buffer( yyin, YY_BUF_SIZE ); \
+ wkt_yy_create_buffer(wkt_yyin,YY_BUF_SIZE ); \
} \
YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
}
+
#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
/* Begin user sect3 */
-#define wkt_yywrap() (/*CONSTCOND*/1)
+#define wkt_yywrap(n) 1
#define YY_SKIP_YYWRAP
-typedef flex_uint8_t YY_CHAR;
-FILE *yyin = NULL, *yyout = NULL;
+typedef unsigned char YY_CHAR;
+FILE *wkt_yyin = (FILE *) 0, *wkt_yyout = (FILE *) 0;
+
typedef int yy_state_type;
-extern int yylineno;
-int yylineno = 1;
+extern int wkt_yylineno;
-extern char *yytext;
-#ifdef yytext_ptr
-#undef yytext_ptr
-#endif
-#define yytext_ptr yytext
+int wkt_yylineno = 1;
-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 yynoreturn yy_fatal_error ( const char* msg );
+extern char *wkt_yytext;
+#define yytext_ptr wkt_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[] );
+
/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
+ * corresponding action - sets up wkt_yytext.
*/
#define YY_DO_BEFORE_ACTION \
(yytext_ptr) = yy_bp; \
- yyleng = (int) (yy_cp - yy_bp); \
+ wkt_yyleng = (yy_size_t) (yy_cp - yy_bp); \
(yy_hold_char) = *yy_cp; \
*yy_cp = '\0'; \
(yy_c_buf_p) = yy_cp;
+
#define YY_NUM_RULES 26
#define YY_END_OF_BUFFER 27
/* This struct is not used in this scanner,
@@ -623,7 +392,7 @@
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static const flex_int16_t yy_accept[172] =
+static yyconst flex_int16_t yy_accept[172] =
{ 0,
0, 0, 27, 25, 24, 24, 20, 21, 22, 25,
25, 1, 23, 25, 25, 25, 25, 19, 25, 25,
@@ -646,7 +415,7 @@
0
} ;
-static const YY_CHAR yy_ec[256] =
+static yyconst flex_int32_t yy_ec[256] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
1, 1, 2, 1, 1, 1, 1, 1, 1, 1,
@@ -678,7 +447,7 @@
1, 1, 1, 1, 1
} ;
-static const YY_CHAR yy_meta[53] =
+static yyconst flex_int32_t yy_meta[53] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -688,7 +457,7 @@
1, 1
} ;
-static const flex_int16_t yy_base[172] =
+static yyconst flex_int16_t yy_base[172] =
{ 0,
0, 0, 353, 366, 51, 53, 366, 366, 366, 48,
342, 50, 366, 41, 40, 47, 44, 38, 44, 43,
@@ -711,7 +480,7 @@
366
} ;
-static const flex_int16_t yy_def[172] =
+static yyconst flex_int16_t yy_def[172] =
{ 0,
171, 1, 171, 171, 171, 171, 171, 171, 171, 171,
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
@@ -734,7 +503,7 @@
0
} ;
-static const flex_int16_t yy_nxt[419] =
+static yyconst flex_int16_t yy_nxt[419] =
{ 0,
4, 5, 6, 7, 8, 4, 9, 10, 11, 12,
13, 4, 4, 14, 4, 15, 4, 16, 4, 4,
@@ -784,7 +553,7 @@
171, 171, 171, 171, 171, 171, 171, 171
} ;
-static const flex_int16_t yy_chk[419] =
+static yyconst flex_int16_t yy_chk[419] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -837,8 +606,8 @@
static yy_state_type yy_last_accepting_state;
static char *yy_last_accepting_cpos;
-extern int yy_flex_debug;
-int yy_flex_debug = 0;
+extern int wkt_yy_flex_debug;
+int wkt_yy_flex_debug = 0;
/* The intent behind this definition is that it'll catch
* any uses of REJECT which flex missed.
@@ -847,7 +616,7 @@
#define yymore() yymore_used_but_not_detected
#define YY_MORE_ADJ 0
#define YY_RESTORE_YY_MORE_OFFSET
-char *yytext;
+char *wkt_yytext;
#line 1 "lwin_wkt_lex.l"
#line 2 "lwin_wkt_lex.l"
@@ -879,17 +648,16 @@
* debugging info.
*/
#define YY_USER_ACTION do { \
- wkt_yylloc.first_line = wkt_yylloc.last_line = yylineno; \
+ wkt_yylloc.first_line = wkt_yylloc.last_line = wkt_yylineno; \
wkt_yylloc.first_column = wkt_yylloc.last_column; \
- wkt_yylloc.last_column += yyleng; \
+ wkt_yylloc.last_column += wkt_yyleng; \
LWDEBUGF(5,"lex: %s", wkt_yytext); \
} while (0);
-#line 889 "lwin_wkt_lex.c"
#define YY_NO_INPUT 1
/* Suppress the default implementations. */
-#line 892 "lwin_wkt_lex.c"
+#line 661 "lwin_wkt_lex.c"
#define INITIAL 0
@@ -905,36 +673,36 @@
#define YY_EXTRA_TYPE void *
#endif
-static int yy_init_globals ( void );
+static int yy_init_globals (void );
/* Accessor methods to globals.
These are made visible to non-reentrant scanners for convenience. */
-int yylex_destroy ( void );
+int wkt_yylex_destroy (void );
-int yyget_debug ( void );
+int wkt_yyget_debug (void );
-void yyset_debug ( int debug_flag );
+void wkt_yyset_debug (int debug_flag );
-YY_EXTRA_TYPE yyget_extra ( void );
+YY_EXTRA_TYPE wkt_yyget_extra (void );
-void yyset_extra ( YY_EXTRA_TYPE user_defined );
+void wkt_yyset_extra (YY_EXTRA_TYPE user_defined );
-FILE *yyget_in ( void );
+FILE *wkt_yyget_in (void );
-void yyset_in ( FILE * _in_str );
+void wkt_yyset_in (FILE * in_str );
-FILE *yyget_out ( void );
+FILE *wkt_yyget_out (void );
-void yyset_out ( FILE * _out_str );
+void wkt_yyset_out (FILE * out_str );
- int yyget_leng ( void );
+yy_size_t wkt_yyget_leng (void );
-char *yyget_text ( void );
+char *wkt_yyget_text (void );
-int yyget_lineno ( void );
+int wkt_yyget_lineno (void );
-void yyset_lineno ( int _line_number );
+void wkt_yyset_lineno (int line_number );
/* Macros after this point can all be overridden by user definitions in
* section 1.
@@ -942,29 +710,26 @@
#ifndef YY_SKIP_YYWRAP
#ifdef __cplusplus
-extern "C" int yywrap ( void );
+extern "C" int wkt_yywrap (void );
#else
-extern int yywrap ( void );
+extern int wkt_yywrap (void );
#endif
#endif
-#ifndef YY_NO_UNPUT
-
-#endif
-
#ifndef yytext_ptr
-static void yy_flex_strncpy ( char *, const char *, int );
+static void yy_flex_strncpy (char *,yyconst char *,int );
#endif
#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen ( const char * );
+static int yy_flex_strlen (yyconst char * );
#endif
#ifndef YY_NO_INPUT
+
#ifdef __cplusplus
-static int yyinput ( void );
+static int yyinput (void );
#else
-static int input ( void );
+static int input (void );
#endif
#endif
@@ -971,12 +736,7 @@
/* 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. */
@@ -984,7 +744,7 @@
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)
+#define ECHO fwrite( wkt_yytext, wkt_yyleng, 1, wkt_yyout )
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -995,13 +755,13 @@
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- int n; \
+ yy_size_t n; \
for ( n = 0; n < max_size && \
- (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
+ (c = getc( wkt_yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
if ( c == '\n' ) \
buf[n++] = (char) c; \
- if ( c == EOF && ferror( yyin ) ) \
+ if ( c == EOF && ferror( wkt_yyin ) ) \
YY_FATAL_ERROR( "input in flex scanner failed" ); \
result = n; \
} \
@@ -1008,7 +768,7 @@
else \
{ \
errno=0; \
- while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \
+ while ( (result = fread(buf, 1, max_size, wkt_yyin))==0 && ferror(wkt_yyin)) \
{ \
if( errno != EINTR) \
{ \
@@ -1016,7 +776,7 @@
break; \
} \
errno=0; \
- clearerr(yyin); \
+ clearerr(wkt_yyin); \
} \
}\
\
@@ -1049,12 +809,12 @@
#ifndef YY_DECL
#define YY_DECL_IS_OURS 1
-extern int yylex (void);
+extern int wkt_yylex (void);
-#define YY_DECL int yylex (void)
+#define YY_DECL int wkt_yylex (void)
#endif /* !YY_DECL */
-/* Code executed at the beginning of each rule, after yytext and yyleng
+/* Code executed at the beginning of each rule, after wkt_yytext and wkt_yyleng
* have been set up.
*/
#ifndef YY_USER_ACTION
@@ -1063,7 +823,7 @@
/* Code executed at the end of each rule. */
#ifndef YY_BREAK
-#define YY_BREAK /*LINTED*/break;
+#define YY_BREAK break;
#endif
#define YY_RULE_SETUP \
@@ -1073,10 +833,15 @@
*/
YY_DECL
{
- yy_state_type yy_current_state;
- char *yy_cp, *yy_bp;
- int yy_act;
+ register yy_state_type yy_current_state;
+ register char *yy_cp, *yy_bp;
+ register int yy_act;
+#line 49 "lwin_wkt_lex.l"
+
+
+#line 844 "lwin_wkt_lex.c"
+
if ( !(yy_init) )
{
(yy_init) = 1;
@@ -1088,32 +853,26 @@
if ( ! (yy_start) )
(yy_start) = 1; /* first start state */
- if ( ! yyin )
- yyin = stdin;
+ if ( ! wkt_yyin )
+ wkt_yyin = stdin;
- if ( ! yyout )
- yyout = stdout;
+ if ( ! wkt_yyout )
+ wkt_yyout = stdout;
if ( ! YY_CURRENT_BUFFER ) {
- yyensure_buffer_stack ();
+ wkt_yyensure_buffer_stack ();
YY_CURRENT_BUFFER_LVALUE =
- yy_create_buffer( yyin, YY_BUF_SIZE );
+ wkt_yy_create_buffer(wkt_yyin,YY_BUF_SIZE );
}
- yy_load_buffer_state( );
+ wkt_yy_load_buffer_state( );
}
- {
-#line 49 "lwin_wkt_lex.l"
-
-
-#line 1110 "lwin_wkt_lex.c"
-
- while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
+ while ( 1 ) /* loops until end-of-file is reached */
{
yy_cp = (yy_c_buf_p);
- /* Support of yytext. */
+ /* Support of wkt_yytext. */
*yy_cp = (yy_hold_char);
/* yy_bp points to the position in yy_ch_buf of the start of
@@ -1125,7 +884,7 @@
yy_match:
do
{
- YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
+ register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
if ( yy_accept[yy_current_state] )
{
(yy_last_accepting_state) = yy_current_state;
@@ -1135,9 +894,9 @@
{
yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 172 )
- yy_c = yy_meta[yy_c];
+ yy_c = yy_meta[(unsigned int) yy_c];
}
- yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp;
}
while ( yy_current_state != 171 );
@@ -1307,7 +1066,7 @@
#line 99 "lwin_wkt_lex.l"
ECHO;
YY_BREAK
-#line 1310 "lwin_wkt_lex.c"
+#line 1070 "lwin_wkt_lex.c"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -1324,8 +1083,8 @@
{
/* We're scanning a new file or input source. It's
* possible that this happened because the user
- * just pointed yyin at a new source and called
- * yylex(). If so, then we have to assure
+ * just pointed wkt_yyin at a new source and called
+ * wkt_yylex(). If so, then we have to assure
* consistency between YY_CURRENT_BUFFER and our
* globals. Here is the right place to do so, because
* this is the first action (other than possibly a
@@ -1332,7 +1091,7 @@
* back-up) that will match for the new input source.
*/
(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
- YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
+ YY_CURRENT_BUFFER_LVALUE->yy_input_file = wkt_yyin;
YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
}
@@ -1386,11 +1145,11 @@
{
(yy_did_buffer_switch_on_eof) = 0;
- if ( yywrap( ) )
+ if ( wkt_yywrap( ) )
{
/* Note: because we've taken care in
* yy_get_next_buffer() to have set up
- * yytext, we can now set up
+ * wkt_yytext, we can now set up
* yy_c_buf_p so that if some total
* hoser (like flex itself) wants to
* call the scanner after we return the
@@ -1439,8 +1198,7 @@
"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 */
+} /* end of wkt_yylex */
/* yy_get_next_buffer - try to read in a new buffer
*
@@ -1451,9 +1209,9 @@
*/
static int yy_get_next_buffer (void)
{
- char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
- char *source = (yytext_ptr);
- int number_to_move, i;
+ register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+ register char *source = (yytext_ptr);
+ register int number_to_move, i;
int ret_val;
if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
@@ -1482,7 +1240,7 @@
/* 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++);
@@ -1495,7 +1253,7 @@
else
{
- int num_to_read =
+ yy_size_t num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
@@ -1502,7 +1260,7 @@
{ /* Not enough room in the buffer - grow it. */
/* just a shorter name for the current buffer */
- YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
+ YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
int yy_c_buf_p_offset =
(int) ((yy_c_buf_p) - b->yy_ch_buf);
@@ -1509,7 +1267,7 @@
if ( b->yy_is_our_buffer )
{
- int new_size = b->yy_buf_size * 2;
+ yy_size_t new_size = b->yy_buf_size * 2;
if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8;
@@ -1518,12 +1276,11 @@
b->yy_ch_buf = (char *)
/* Include room in for 2 EOB chars. */
- yyrealloc( (void *) b->yy_ch_buf,
- (yy_size_t) (b->yy_buf_size + 2) );
+ wkt_yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 );
}
else
/* Can't grow it, we don't own it. */
- b->yy_ch_buf = NULL;
+ b->yy_ch_buf = 0;
if ( ! b->yy_ch_buf )
YY_FATAL_ERROR(
@@ -1551,7 +1308,7 @@
if ( number_to_move == YY_MORE_ADJ )
{
ret_val = EOB_ACT_END_OF_FILE;
- yyrestart( yyin );
+ wkt_yyrestart(wkt_yyin );
}
else
@@ -1565,15 +1322,12 @@
else
ret_val = EOB_ACT_CONTINUE_SCAN;
- if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+ 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. */
- 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 );
+ yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+ YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) wkt_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()" );
- /* "- 2" to take care of EOB's */
- YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2);
}
(yy_n_chars) += number_to_move;
@@ -1589,14 +1343,14 @@
static yy_state_type yy_get_previous_state (void)
{
- yy_state_type yy_current_state;
- char *yy_cp;
+ register yy_state_type yy_current_state;
+ register char *yy_cp;
yy_current_state = (yy_start);
for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
{
- YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+ register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
if ( yy_accept[yy_current_state] )
{
(yy_last_accepting_state) = yy_current_state;
@@ -1606,9 +1360,9 @@
{
yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 172 )
- yy_c = yy_meta[yy_c];
+ yy_c = yy_meta[(unsigned int) yy_c];
}
- yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
}
return yy_current_state;
@@ -1621,10 +1375,10 @@
*/
static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state )
{
- int yy_is_jam;
- char *yy_cp = (yy_c_buf_p);
+ register int yy_is_jam;
+ register char *yy_cp = (yy_c_buf_p);
- YY_CHAR yy_c = 1;
+ register YY_CHAR yy_c = 1;
if ( yy_accept[yy_current_state] )
{
(yy_last_accepting_state) = yy_current_state;
@@ -1634,18 +1388,14 @@
{
yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 172 )
- yy_c = yy_meta[yy_c];
+ yy_c = yy_meta[(unsigned int) yy_c];
}
- yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
yy_is_jam = (yy_current_state == 171);
- return yy_is_jam ? 0 : yy_current_state;
+ return yy_is_jam ? 0 : yy_current_state;
}
-#ifndef YY_NO_UNPUT
-
-#endif
-
#ifndef YY_NO_INPUT
#ifdef __cplusplus
static int yyinput (void)
@@ -1670,7 +1420,7 @@
else
{ /* need more input */
- int offset = (int) ((yy_c_buf_p) - (yytext_ptr));
+ yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
++(yy_c_buf_p);
switch ( yy_get_next_buffer( ) )
@@ -1687,13 +1437,13 @@
*/
/* Reset buffer status. */
- yyrestart( yyin );
+ wkt_yyrestart(wkt_yyin );
/*FALLTHROUGH*/
case EOB_ACT_END_OF_FILE:
{
- if ( yywrap( ) )
+ if ( wkt_yywrap( ) )
return 0;
if ( ! (yy_did_buffer_switch_on_eof) )
@@ -1713,7 +1463,7 @@
}
c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */
- *(yy_c_buf_p) = '\0'; /* preserve yytext */
+ *(yy_c_buf_p) = '\0'; /* preserve wkt_yytext */
(yy_hold_char) = *++(yy_c_buf_p);
return c;
@@ -1725,17 +1475,17 @@
*
* @note This function does not reset the start condition to @c INITIAL .
*/
- void yyrestart (FILE * input_file )
+ void wkt_yyrestart (FILE * input_file )
{
if ( ! YY_CURRENT_BUFFER ){
- yyensure_buffer_stack ();
+ wkt_yyensure_buffer_stack ();
YY_CURRENT_BUFFER_LVALUE =
- yy_create_buffer( yyin, YY_BUF_SIZE );
+ wkt_yy_create_buffer(wkt_yyin,YY_BUF_SIZE );
}
- yy_init_buffer( YY_CURRENT_BUFFER, input_file );
- yy_load_buffer_state( );
+ wkt_yy_init_buffer(YY_CURRENT_BUFFER,input_file );
+ wkt_yy_load_buffer_state( );
}
/** Switch to a different input buffer.
@@ -1742,15 +1492,15 @@
* @param new_buffer The new input buffer.
*
*/
- void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer )
+ void wkt_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer )
{
/* TODO. We should be able to replace this entire function body
* with
- * yypop_buffer_state();
- * yypush_buffer_state(new_buffer);
+ * wkt_yypop_buffer_state();
+ * wkt_yypush_buffer_state(new_buffer);
*/
- yyensure_buffer_stack ();
+ wkt_yyensure_buffer_stack ();
if ( YY_CURRENT_BUFFER == new_buffer )
return;
@@ -1763,21 +1513,21 @@
}
YY_CURRENT_BUFFER_LVALUE = new_buffer;
- yy_load_buffer_state( );
+ wkt_yy_load_buffer_state( );
/* We don't actually know whether we did this switch during
- * EOF (yywrap()) processing, but the only time this flag
- * is looked at is after yywrap() is called, so it's safe
+ * EOF (wkt_yywrap()) processing, but the only time this flag
+ * is looked at is after wkt_yywrap() is called, so it's safe
* to go ahead and always set it.
*/
(yy_did_buffer_switch_on_eof) = 1;
}
-static void yy_load_buffer_state (void)
+static void wkt_yy_load_buffer_state (void)
{
(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
- yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+ wkt_yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
(yy_hold_char) = *(yy_c_buf_p);
}
@@ -1787,13 +1537,13 @@
*
* @return the allocated buffer state.
*/
- YY_BUFFER_STATE yy_create_buffer (FILE * file, int size )
+ YY_BUFFER_STATE wkt_yy_create_buffer (FILE * file, int size )
{
YY_BUFFER_STATE b;
- b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) );
+ b = (YY_BUFFER_STATE) wkt_yyalloc(sizeof( struct yy_buffer_state ) );
if ( ! b )
- YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+ YY_FATAL_ERROR( "out of dynamic memory in wkt_yy_create_buffer()" );
b->yy_buf_size = size;
@@ -1800,22 +1550,22 @@
/* 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( (yy_size_t) (b->yy_buf_size + 2) );
+ b->yy_ch_buf = (char *) wkt_yyalloc(b->yy_buf_size + 2 );
if ( ! b->yy_ch_buf )
- YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+ YY_FATAL_ERROR( "out of dynamic memory in wkt_yy_create_buffer()" );
b->yy_is_our_buffer = 1;
- yy_init_buffer( b, file );
+ wkt_yy_init_buffer(b,file );
return b;
}
/** Destroy the buffer.
- * @param b a buffer created with yy_create_buffer()
+ * @param b a buffer created with wkt_yy_create_buffer()
*
*/
- void yy_delete_buffer (YY_BUFFER_STATE b )
+ void wkt_yy_delete_buffer (YY_BUFFER_STATE b )
{
if ( ! b )
@@ -1825,27 +1575,27 @@
YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
if ( b->yy_is_our_buffer )
- yyfree( (void *) b->yy_ch_buf );
+ wkt_yyfree((void *) b->yy_ch_buf );
- yyfree( (void *) b );
+ wkt_yyfree((void *) b );
}
/* Initializes or reinitializes a buffer.
* This function is sometimes called more than once on the same buffer,
- * such as during a yyrestart() or at EOF.
+ * such as during a wkt_yyrestart() or at EOF.
*/
- static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file )
+ static void wkt_yy_init_buffer (YY_BUFFER_STATE b, FILE * file )
{
int oerrno = errno;
- yy_flush_buffer( b );
+ wkt_yy_flush_buffer(b );
b->yy_input_file = file;
b->yy_fill_buffer = 1;
- /* If b is the current buffer, then yy_init_buffer was _probably_
- * called from yyrestart() or through yy_get_next_buffer.
+ /* If b is the current buffer, then wkt_yy_init_buffer was _probably_
+ * called from wkt_yyrestart() or through yy_get_next_buffer.
* In that case, we don't want to reset the lineno or column.
*/
if (b != YY_CURRENT_BUFFER){
@@ -1862,7 +1612,7 @@
* @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
*
*/
- void yy_flush_buffer (YY_BUFFER_STATE b )
+ void wkt_yy_flush_buffer (YY_BUFFER_STATE b )
{
if ( ! b )
return;
@@ -1882,7 +1632,7 @@
b->yy_buffer_status = YY_BUFFER_NEW;
if ( b == YY_CURRENT_BUFFER )
- yy_load_buffer_state( );
+ wkt_yy_load_buffer_state( );
}
/** Pushes the new state onto the stack. The new state becomes
@@ -1891,14 +1641,14 @@
* @param new_buffer The new state.
*
*/
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
+void wkt_yypush_buffer_state (YY_BUFFER_STATE new_buffer )
{
if (new_buffer == NULL)
return;
- yyensure_buffer_stack();
+ wkt_yyensure_buffer_stack();
- /* This block is copied from yy_switch_to_buffer. */
+ /* This block is copied from wkt_yy_switch_to_buffer. */
if ( YY_CURRENT_BUFFER )
{
/* Flush out information for old buffer. */
@@ -1912,8 +1662,8 @@
(yy_buffer_stack_top)++;
YY_CURRENT_BUFFER_LVALUE = new_buffer;
- /* copied from yy_switch_to_buffer. */
- yy_load_buffer_state( );
+ /* copied from wkt_yy_switch_to_buffer. */
+ wkt_yy_load_buffer_state( );
(yy_did_buffer_switch_on_eof) = 1;
}
@@ -1921,18 +1671,18 @@
* The next element becomes the new top.
*
*/
-void yypop_buffer_state (void)
+void wkt_yypop_buffer_state (void)
{
if (!YY_CURRENT_BUFFER)
return;
- yy_delete_buffer(YY_CURRENT_BUFFER );
+ wkt_yy_delete_buffer(YY_CURRENT_BUFFER );
YY_CURRENT_BUFFER_LVALUE = NULL;
if ((yy_buffer_stack_top) > 0)
--(yy_buffer_stack_top);
if (YY_CURRENT_BUFFER) {
- yy_load_buffer_state( );
+ wkt_yy_load_buffer_state( );
(yy_did_buffer_switch_on_eof) = 1;
}
}
@@ -1940,7 +1690,7 @@
/* Allocates the stack if it does not exist.
* Guarantees space for at least one push.
*/
-static void yyensure_buffer_stack (void)
+static void wkt_yyensure_buffer_stack (void)
{
yy_size_t num_to_alloc;
@@ -1950,15 +1700,15 @@
* 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; /* After all that talk, this was set to 1 anyways... */
- (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
+ num_to_alloc = 1;
+ (yy_buffer_stack) = (struct yy_buffer_state**)wkt_yyalloc
(num_to_alloc * sizeof(struct yy_buffer_state*)
);
if ( ! (yy_buffer_stack) )
- YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-
+ YY_FATAL_ERROR( "out of dynamic memory in wkt_yyensure_buffer_stack()" );
+
memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-
+
(yy_buffer_stack_max) = num_to_alloc;
(yy_buffer_stack_top) = 0;
return;
@@ -1967,15 +1717,15 @@
if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
/* Increase the buffer to prepare for a possible push. */
- yy_size_t grow_size = 8 /* arbitrary grow size */;
+ int grow_size = 8 /* arbitrary grow size */;
num_to_alloc = (yy_buffer_stack_max) + grow_size;
- (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
+ (yy_buffer_stack) = (struct yy_buffer_state**)wkt_yyrealloc
((yy_buffer_stack),
num_to_alloc * sizeof(struct yy_buffer_state*)
);
if ( ! (yy_buffer_stack) )
- YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+ YY_FATAL_ERROR( "out of dynamic memory in wkt_yyensure_buffer_stack()" );
/* zero only the new slots.*/
memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
@@ -1987,9 +1737,9 @@
* @param base the character buffer
* @param size the size in bytes of the character buffer
*
- * @return the newly allocated buffer state object.
+ * @return the newly allocated buffer state object.
*/
-YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size )
+YY_BUFFER_STATE wkt_yy_scan_buffer (char * base, yy_size_t size )
{
YY_BUFFER_STATE b;
@@ -1997,16 +1747,16 @@
base[size-2] != YY_END_OF_BUFFER_CHAR ||
base[size-1] != YY_END_OF_BUFFER_CHAR )
/* They forgot to leave room for the EOB's. */
- return NULL;
+ return 0;
- b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) );
+ b = (YY_BUFFER_STATE) wkt_yyalloc(sizeof( struct yy_buffer_state ) );
if ( ! b )
- YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
+ YY_FATAL_ERROR( "out of dynamic memory in wkt_yy_scan_buffer()" );
- b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */
+ b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */
b->yy_buf_pos = b->yy_ch_buf = base;
b->yy_is_our_buffer = 0;
- b->yy_input_file = NULL;
+ b->yy_input_file = 0;
b->yy_n_chars = b->yy_buf_size;
b->yy_is_interactive = 0;
b->yy_at_bol = 1;
@@ -2013,44 +1763,43 @@
b->yy_fill_buffer = 0;
b->yy_buffer_status = YY_BUFFER_NEW;
- yy_switch_to_buffer( b );
+ wkt_yy_switch_to_buffer(b );
return b;
}
-/** Setup the input buffer state to scan a string. The next call to yylex() will
+/** Setup the input buffer state to scan a string. The next call to wkt_yylex() will
* scan from a @e copy of @a str.
* @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
- * yy_scan_bytes() instead.
+ * wkt_yy_scan_bytes() instead.
*/
-YY_BUFFER_STATE yy_scan_string (const char * yystr )
+YY_BUFFER_STATE wkt_yy_scan_string (yyconst char * yystr )
{
- return yy_scan_bytes( yystr, (int) strlen(yystr) );
+ return wkt_yy_scan_bytes(yystr,strlen(yystr) );
}
-/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
+/** Setup the input buffer state to scan the given bytes. The next call to wkt_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.
*/
-YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len )
+YY_BUFFER_STATE wkt_yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len )
{
YY_BUFFER_STATE b;
char *buf;
- yy_size_t n;
- int i;
+ yy_size_t n, i;
/* Get memory for full buffer, including space for trailing EOB's. */
- n = (yy_size_t) (_yybytes_len + 2);
- buf = (char *) yyalloc( n );
+ n = _yybytes_len + 2;
+ buf = (char *) wkt_yyalloc(n );
if ( ! buf )
- YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
+ YY_FATAL_ERROR( "out of dynamic memory in wkt_yy_scan_bytes()" );
for ( i = 0; i < _yybytes_len; ++i )
buf[i] = yybytes[i];
@@ -2057,9 +1806,9 @@
buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
- b = yy_scan_buffer( buf, n );
+ b = wkt_yy_scan_buffer(buf,n );
if ( ! b )
- YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
+ YY_FATAL_ERROR( "bad buffer in wkt_yy_scan_bytes()" );
/* It's okay to grow etc. this buffer, and we should throw it
* away when we're done.
@@ -2073,9 +1822,9 @@
#define YY_EXIT_FAILURE 2
#endif
-static void yynoreturn yy_fatal_error (const char* msg )
+static void yy_fatal_error (yyconst char* msg )
{
- fprintf( stderr, "%s\n", msg );
+ (void) fprintf( stderr, "%s\n", msg );
exit( YY_EXIT_FAILURE );
}
@@ -2085,14 +1834,14 @@
#define yyless(n) \
do \
{ \
- /* Undo effects of setting up yytext. */ \
+ /* Undo effects of setting up wkt_yytext. */ \
int yyless_macro_arg = (n); \
YY_LESS_LINENO(yyless_macro_arg);\
- yytext[yyleng] = (yy_hold_char); \
- (yy_c_buf_p) = yytext + yyless_macro_arg; \
+ wkt_yytext[wkt_yyleng] = (yy_hold_char); \
+ (yy_c_buf_p) = wkt_yytext + yyless_macro_arg; \
(yy_hold_char) = *(yy_c_buf_p); \
*(yy_c_buf_p) = '\0'; \
- yyleng = yyless_macro_arg; \
+ wkt_yyleng = yyless_macro_arg; \
} \
while ( 0 )
@@ -2101,34 +1850,34 @@
/** Get the current line number.
*
*/
-int yyget_lineno (void)
+int wkt_yyget_lineno (void)
{
-
- return yylineno;
+
+ return wkt_yylineno;
}
/** Get the input stream.
*
*/
-FILE *yyget_in (void)
+FILE *wkt_yyget_in (void)
{
- return yyin;
+ return wkt_yyin;
}
/** Get the output stream.
*
*/
-FILE *yyget_out (void)
+FILE *wkt_yyget_out (void)
{
- return yyout;
+ return wkt_yyout;
}
/** Get the length of the current token.
*
*/
-int yyget_leng (void)
+yy_size_t wkt_yyget_leng (void)
{
- return yyleng;
+ return wkt_yyleng;
}
/** Get the current token.
@@ -2135,92 +1884,92 @@
*
*/
-char *yyget_text (void)
+char *wkt_yyget_text (void)
{
- return yytext;
+ return wkt_yytext;
}
/** Set the current line number.
- * @param _line_number line number
+ * @param line_number
*
*/
-void yyset_lineno (int _line_number )
+void wkt_yyset_lineno (int line_number )
{
- yylineno = _line_number;
+ wkt_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
+ * @see wkt_yy_switch_to_buffer
*/
-void yyset_in (FILE * _in_str )
+void wkt_yyset_in (FILE * in_str )
{
- yyin = _in_str ;
+ wkt_yyin = in_str ;
}
-void yyset_out (FILE * _out_str )
+void wkt_yyset_out (FILE * out_str )
{
- yyout = _out_str ;
+ wkt_yyout = out_str ;
}
-int yyget_debug (void)
+int wkt_yyget_debug (void)
{
- return yy_flex_debug;
+ return wkt_yy_flex_debug;
}
-void yyset_debug (int _bdebug )
+void wkt_yyset_debug (int bdebug )
{
- yy_flex_debug = _bdebug ;
+ wkt_yy_flex_debug = bdebug ;
}
static int yy_init_globals (void)
{
/* Initialization is the same as for the non-reentrant scanner.
- * This function is called from yylex_destroy(), so don't allocate here.
+ * This function is called from wkt_yylex_destroy(), so don't allocate here.
*/
- (yy_buffer_stack) = NULL;
+ (yy_buffer_stack) = 0;
(yy_buffer_stack_top) = 0;
(yy_buffer_stack_max) = 0;
- (yy_c_buf_p) = NULL;
+ (yy_c_buf_p) = (char *) 0;
(yy_init) = 0;
(yy_start) = 0;
/* Defined in main.c */
#ifdef YY_STDINIT
- yyin = stdin;
- yyout = stdout;
+ wkt_yyin = stdin;
+ wkt_yyout = stdout;
#else
- yyin = NULL;
- yyout = NULL;
+ wkt_yyin = (FILE *) 0;
+ wkt_yyout = (FILE *) 0;
#endif
/* For future reference: Set errno on error, since we are called by
- * yylex_init()
+ * wkt_yylex_init()
*/
return 0;
}
-/* yylex_destroy is for both reentrant and non-reentrant scanners. */
-int yylex_destroy (void)
+/* wkt_yylex_destroy is for both reentrant and non-reentrant scanners. */
+int wkt_yylex_destroy (void)
{
/* Pop the buffer stack, destroying each element. */
while(YY_CURRENT_BUFFER){
- yy_delete_buffer( YY_CURRENT_BUFFER );
+ wkt_yy_delete_buffer(YY_CURRENT_BUFFER );
YY_CURRENT_BUFFER_LVALUE = NULL;
- yypop_buffer_state();
+ wkt_yypop_buffer_state();
}
/* Destroy the stack itself. */
- yyfree((yy_buffer_stack) );
+ wkt_yyfree((yy_buffer_stack) );
(yy_buffer_stack) = NULL;
/* Reset the globals. This is important in a non-reentrant scanner so the next time
- * yylex() is called, initialization will occur. */
+ * wkt_yylex() is called, initialization will occur. */
yy_init_globals( );
return 0;
@@ -2231,10 +1980,9 @@
*/
#ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, const char * s2, int n )
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
{
-
- int i;
+ register int i;
for ( i = 0; i < n; ++i )
s1[i] = s2[i];
}
@@ -2241,9 +1989,9 @@
#endif
#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (const char * s )
+static int yy_flex_strlen (yyconst char * s )
{
- int n;
+ register int n;
for ( n = 0; s[n]; ++n )
;
@@ -2256,6 +2004,7 @@
#line 99 "lwin_wkt_lex.l"
+
void *wkt_yyalloc (yy_size_t size )
{
return (void *) lwalloc( size );
More information about the postgis-tickets
mailing list