From: Sandro Santilli Date: Fri, 5 Sep 2014 15:25:27 +0000 (+0000) Subject: Regenerate parser with bison 3.0.2 and flex 2.5.35 X-Git-Tag: 2.2.0rc1~855 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=530416729e45f4c5e430a7995a62bf4b23d48792;p=postgis Regenerate parser with bison 3.0.2 and flex 2.5.35 git-svn-id: http://svn.osgeo.org/postgis/trunk@12949 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/liblwgeom/lwin_wkt_lex.c b/liblwgeom/lwin_wkt_lex.c index a9e13147d..0c3042aaa 100644 --- a/liblwgeom/lwin_wkt_lex.c +++ b/liblwgeom/lwin_wkt_lex.c @@ -73,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 @@ -104,6 +103,8 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#endif /* ! C99 */ + #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -160,7 +161,15 @@ 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. @@ -172,12 +181,7 @@ typedef unsigned int flex_uint32_t; typedef struct yy_buffer_state *YY_BUFFER_STATE; #endif -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - -extern yy_size_t wkt_yyleng; +extern int wkt_yyleng; extern FILE *wkt_yyin, *wkt_yyout; @@ -203,6 +207,11 @@ extern FILE *wkt_yyin, *wkt_yyout; #define unput(c) yyunput( c, (yytext_ptr) ) +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + #ifndef YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state @@ -220,7 +229,7 @@ struct yy_buffer_state /* 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 @@ -290,8 +299,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* yy_hold_char holds the character lost when wkt_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 wkt_yyleng; +static int yy_n_chars; /* number of characters read into yy_ch_buf */ +int wkt_yyleng; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; @@ -319,7 +328,7 @@ static void wkt_yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); 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 ); +YY_BUFFER_STATE wkt_yy_scan_bytes (yyconst char *bytes,int len ); void *wkt_yyalloc (yy_size_t ); void *wkt_yyrealloc (void *,yy_size_t ); @@ -672,7 +681,8 @@ static void wkt_lexer_unknown() } while (0); -#line 676 "lwin_wkt_lex.c" +#define YY_NO_INPUT 1 +#line 686 "lwin_wkt_lex.c" #define INITIAL 0 @@ -711,7 +721,7 @@ FILE *wkt_yyget_out (void ); void wkt_yyset_out (FILE * out_str ); -yy_size_t wkt_yyget_leng (void ); +int wkt_yyget_leng (void ); char *wkt_yyget_text (void ); @@ -751,7 +761,12 @@ 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. */ @@ -759,7 +774,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 fwrite( wkt_yytext, wkt_yyleng, 1, wkt_yyout ) +#define ECHO do { if (fwrite( wkt_yytext, wkt_yyleng, 1, wkt_yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -770,7 +785,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - yy_size_t n; \ + size_t n; \ for ( n = 0; n < max_size && \ (c = getc( wkt_yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -852,10 +867,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 64 "lwin_wkt_lex.l" +#line 65 "lwin_wkt_lex.l" -#line 859 "lwin_wkt_lex.c" +#line 874 "lwin_wkt_lex.c" if ( !(yy_init) ) { @@ -936,7 +951,7 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 66 "lwin_wkt_lex.l" +#line 67 "lwin_wkt_lex.l" { LWDEBUG(5,"DOUBLE"); wkt_yylval.doublevalue = atof(wkt_yytext); @@ -945,7 +960,7 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 72 "lwin_wkt_lex.l" +#line 73 "lwin_wkt_lex.l" { LWDEBUG(5,"SRID"); wkt_yylval.integervalue = wkt_lexer_read_srid(wkt_yytext); @@ -954,87 +969,87 @@ YY_RULE_SETUP YY_BREAK case 3: YY_RULE_SETUP -#line 78 "lwin_wkt_lex.l" +#line 79 "lwin_wkt_lex.l" { return COLLECTION_TOK; } YY_BREAK case 4: YY_RULE_SETUP -#line 79 "lwin_wkt_lex.l" +#line 80 "lwin_wkt_lex.l" { return MSURFACE_TOK; } YY_BREAK case 5: YY_RULE_SETUP -#line 80 "lwin_wkt_lex.l" +#line 81 "lwin_wkt_lex.l" { return MPOLYGON_TOK; } YY_BREAK case 6: YY_RULE_SETUP -#line 81 "lwin_wkt_lex.l" +#line 82 "lwin_wkt_lex.l" { return MCURVE_TOK; } YY_BREAK case 7: YY_RULE_SETUP -#line 82 "lwin_wkt_lex.l" +#line 83 "lwin_wkt_lex.l" { return MLINESTRING_TOK; } YY_BREAK case 8: YY_RULE_SETUP -#line 83 "lwin_wkt_lex.l" +#line 84 "lwin_wkt_lex.l" { return MPOINT_TOK; } YY_BREAK case 9: YY_RULE_SETUP -#line 84 "lwin_wkt_lex.l" +#line 85 "lwin_wkt_lex.l" { return CURVEPOLYGON_TOK; } YY_BREAK case 10: YY_RULE_SETUP -#line 85 "lwin_wkt_lex.l" +#line 86 "lwin_wkt_lex.l" { return POLYGON_TOK; } YY_BREAK case 11: YY_RULE_SETUP -#line 86 "lwin_wkt_lex.l" +#line 87 "lwin_wkt_lex.l" { return COMPOUNDCURVE_TOK; } YY_BREAK case 12: YY_RULE_SETUP -#line 87 "lwin_wkt_lex.l" +#line 88 "lwin_wkt_lex.l" { return CIRCULARSTRING_TOK; } YY_BREAK case 13: YY_RULE_SETUP -#line 88 "lwin_wkt_lex.l" +#line 89 "lwin_wkt_lex.l" { return LINESTRING_TOK; } YY_BREAK case 14: YY_RULE_SETUP -#line 89 "lwin_wkt_lex.l" +#line 90 "lwin_wkt_lex.l" { return POLYHEDRALSURFACE_TOK; } YY_BREAK case 15: YY_RULE_SETUP -#line 90 "lwin_wkt_lex.l" +#line 91 "lwin_wkt_lex.l" { return TRIANGLE_TOK; } YY_BREAK case 16: YY_RULE_SETUP -#line 91 "lwin_wkt_lex.l" +#line 92 "lwin_wkt_lex.l" { return TIN_TOK; } YY_BREAK case 17: YY_RULE_SETUP -#line 92 "lwin_wkt_lex.l" +#line 93 "lwin_wkt_lex.l" { return POINT_TOK; } YY_BREAK case 18: YY_RULE_SETUP -#line 93 "lwin_wkt_lex.l" +#line 94 "lwin_wkt_lex.l" { return EMPTY_TOK; } YY_BREAK case 19: YY_RULE_SETUP -#line 95 "lwin_wkt_lex.l" +#line 96 "lwin_wkt_lex.l" { LWDEBUG(5,"DIMENSIONALITY"); wkt_yylval.stringvalue = wkt_yytext; @@ -1043,33 +1058,33 @@ YY_RULE_SETUP YY_BREAK case 20: YY_RULE_SETUP -#line 101 "lwin_wkt_lex.l" +#line 102 "lwin_wkt_lex.l" { LWDEBUG(5,"LBRACKET"); return LBRACKET_TOK; } YY_BREAK case 21: YY_RULE_SETUP -#line 102 "lwin_wkt_lex.l" +#line 103 "lwin_wkt_lex.l" { LWDEBUG(5,"RBRACKET"); return RBRACKET_TOK; } YY_BREAK case 22: YY_RULE_SETUP -#line 103 "lwin_wkt_lex.l" +#line 104 "lwin_wkt_lex.l" { LWDEBUG(5,"COMMA"); return COMMA_TOK; } YY_BREAK case 23: YY_RULE_SETUP -#line 104 "lwin_wkt_lex.l" +#line 105 "lwin_wkt_lex.l" { LWDEBUG(5,"SEMICOLON"); return SEMICOLON_TOK; } YY_BREAK case 24: /* rule 24 can match eol */ YY_RULE_SETUP -#line 106 "lwin_wkt_lex.l" +#line 107 "lwin_wkt_lex.l" { /* ignore whitespace */ LWDEBUG(5,"WHITESPACE"); } YY_BREAK case 25: YY_RULE_SETUP -#line 108 "lwin_wkt_lex.l" +#line 109 "lwin_wkt_lex.l" { /* Error out and stop parsing on unknown/unexpected characters */ LWDEBUG(5,"UNKNOWN"); wkt_lexer_unknown(); @@ -1078,10 +1093,10 @@ YY_RULE_SETUP YY_BREAK case 26: YY_RULE_SETUP -#line 114 "lwin_wkt_lex.l" +#line 115 "lwin_wkt_lex.l" ECHO; YY_BREAK -#line 1085 "lwin_wkt_lex.c" +#line 1100 "lwin_wkt_lex.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1268,7 +1283,7 @@ static int yy_get_next_buffer (void) else { - yy_size_t num_to_read = + int num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) @@ -1282,7 +1297,7 @@ static int yy_get_next_buffer (void) if ( b->yy_is_our_buffer ) { - yy_size_t new_size = 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; @@ -1313,7 +1328,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); } @@ -1435,7 +1450,7 @@ static int yy_get_next_buffer (void) else { /* need more input */ - yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); + int offset = (yy_c_buf_p) - (yytext_ptr); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -1459,7 +1474,7 @@ static int yy_get_next_buffer (void) case EOB_ACT_END_OF_FILE: { if ( wkt_yywrap( ) ) - return 0; + return EOF; if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; @@ -1707,7 +1722,7 @@ void wkt_yypop_buffer_state (void) */ static void wkt_yyensure_buffer_stack (void) { - yy_size_t num_to_alloc; + int num_to_alloc; if (!(yy_buffer_stack)) { @@ -1799,16 +1814,17 @@ YY_BUFFER_STATE wkt_yy_scan_string (yyconst char * yystr ) /** 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 bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. + * @param yybytes the byte buffer to scan + * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE wkt_yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) +YY_BUFFER_STATE wkt_yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; - yy_size_t n, i; + yy_size_t n; + int i; /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; @@ -1890,7 +1906,7 @@ FILE *wkt_yyget_out (void) /** Get the length of the current token. * */ -yy_size_t wkt_yyget_leng (void) +int wkt_yyget_leng (void) { return wkt_yyleng; } @@ -2038,7 +2054,7 @@ void wkt_yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 114 "lwin_wkt_lex.l" +#line 115 "lwin_wkt_lex.l" diff --git a/liblwgeom/lwin_wkt_parse.c b/liblwgeom/lwin_wkt_parse.c index 96b8c8663..dde999ee1 100644 --- a/liblwgeom/lwin_wkt_parse.c +++ b/liblwgeom/lwin_wkt_parse.c @@ -1,19 +1,19 @@ -/* A Bison parser, made by GNU Bison 2.5. */ +/* A Bison parser, made by GNU Bison 3.0.2. */ /* Bison implementation for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. - + + Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. + 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 Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -26,7 +26,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.5" +#define YYBISON_VERSION "3.0.2" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -58,23 +58,20 @@ /* Pull parsers. */ #define YYPULL 1 -/* Using locations. */ -#define YYLSP_NEEDED 1 /* Substitute the variable and function names. */ #define yyparse wkt_yyparse #define yylex wkt_yylex #define yyerror wkt_yyerror -#define yylval wkt_yylval -#define yychar wkt_yychar #define yydebug wkt_yydebug #define yynerrs wkt_yynerrs + +#define yylval wkt_yylval +#define yychar wkt_yychar #define yylloc wkt_yylloc /* Copy the first part of user declarations. */ - -/* Line 268 of yacc.c */ -#line 1 "lwin_wkt_parse.y" +#line 1 "lwin_wkt_parse.y" /* yacc.c:339 */ /* WKT Parser */ @@ -127,7 +124,15 @@ int lwgeom_parse_wkt(LWGEOM_PARSER_RESULT *parser_result, char *wktstr, int pars int parse_rv = 0; /* Clean up our global parser result. */ - lwgeom_parser_result_init(&global_parser_result); + lwgeom_parser_result_init(&global_parser_result); + /* Work-around possible bug in GNU Bison 3.0.2 resulting in wkt_yylloc + * members not being initialized on yyparse() as documented here: + * https://www.gnu.org/software/bison/manual/html_node/Location-Type.html + * See discussion here: + * http://lists.osgeo.org/pipermail/postgis-devel/2014-September/024506.html + */ + wkt_yylloc.last_column = wkt_yylloc.last_line = \ + wkt_yylloc.first_column = wkt_yylloc.first_line = 1; /* Set the input text string, and parse checks. */ global_parser_result.wkinput = wktstr; @@ -167,14 +172,15 @@ int lwgeom_parse_wkt(LWGEOM_PARSER_RESULT *parser_result, char *wktstr, int pars +#line 176 "lwin_wkt_parse.c" /* yacc.c:339 */ -/* Line 268 of yacc.c */ -#line 173 "lwin_wkt_parse.c" - -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif +# ifndef YY_NULLPTR +# if defined __cplusplus && 201103L <= __cplusplus +# define YY_NULLPTR nullptr +# else +# define YY_NULLPTR 0 +# endif +# endif /* Enabling verbose error messages. */ #ifdef YYERROR_VERBOSE @@ -184,42 +190,47 @@ int lwgeom_parse_wkt(LWGEOM_PARSER_RESULT *parser_result, char *wktstr, int pars # define YYERROR_VERBOSE 1 #endif -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 +/* In a future release of Bison, this section will be replaced + by #include "lwin_wkt_parse.h". */ +#ifndef YY_WKT_YY_LWIN_WKT_PARSE_H_INCLUDED +# define YY_WKT_YY_LWIN_WKT_PARSE_H_INCLUDED +/* Debug traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif +#if YYDEBUG +extern int wkt_yydebug; #endif - -/* Tokens. */ +/* Token type. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - POINT_TOK = 258, - LINESTRING_TOK = 259, - POLYGON_TOK = 260, - MPOINT_TOK = 261, - MLINESTRING_TOK = 262, - MPOLYGON_TOK = 263, - MSURFACE_TOK = 264, - MCURVE_TOK = 265, - CURVEPOLYGON_TOK = 266, - COMPOUNDCURVE_TOK = 267, - CIRCULARSTRING_TOK = 268, - COLLECTION_TOK = 269, - RBRACKET_TOK = 270, - LBRACKET_TOK = 271, - COMMA_TOK = 272, - EMPTY_TOK = 273, - SEMICOLON_TOK = 274, - TRIANGLE_TOK = 275, - TIN_TOK = 276, - POLYHEDRALSURFACE_TOK = 277, - DOUBLE_TOK = 278, - DIMENSIONALITY_TOK = 279, - SRID_TOK = 280 - }; + enum yytokentype + { + POINT_TOK = 258, + LINESTRING_TOK = 259, + POLYGON_TOK = 260, + MPOINT_TOK = 261, + MLINESTRING_TOK = 262, + MPOLYGON_TOK = 263, + MSURFACE_TOK = 264, + MCURVE_TOK = 265, + CURVEPOLYGON_TOK = 266, + COMPOUNDCURVE_TOK = 267, + CIRCULARSTRING_TOK = 268, + COLLECTION_TOK = 269, + RBRACKET_TOK = 270, + LBRACKET_TOK = 271, + COMMA_TOK = 272, + EMPTY_TOK = 273, + SEMICOLON_TOK = 274, + TRIANGLE_TOK = 275, + TIN_TOK = 276, + POLYHEDRALSURFACE_TOK = 277, + DOUBLE_TOK = 278, + DIMENSIONALITY_TOK = 279, + SRID_TOK = 280 + }; #endif /* Tokens. */ #define POINT_TOK 258 @@ -246,15 +257,12 @@ int lwgeom_parse_wkt(LWGEOM_PARSER_RESULT *parser_result, char *wktstr, int pars #define DIMENSIONALITY_TOK 279 #define SRID_TOK 280 - - - +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE +typedef union YYSTYPE YYSTYPE; +union YYSTYPE { - -/* Line 293 of yacc.c */ -#line 98 "lwin_wkt_parse.y" +#line 106 "lwin_wkt_parse.y" /* yacc.c:355 */ int integervalue; double doublevalue; @@ -263,35 +271,36 @@ typedef union YYSTYPE POINT coordinatevalue; POINTARRAY *ptarrayvalue; - - -/* Line 293 of yacc.c */ -#line 270 "lwin_wkt_parse.c" -} YYSTYPE; +#line 275 "lwin_wkt_parse.c" /* yacc.c:355 */ +}; # define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 #endif +/* Location type. */ #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED -typedef struct YYLTYPE +typedef struct YYLTYPE YYLTYPE; +struct YYLTYPE { int first_line; int first_column; int last_line; int last_column; -} YYLTYPE; -# define yyltype YYLTYPE /* obsolescent; will be withdrawn */ +}; # define YYLTYPE_IS_DECLARED 1 # define YYLTYPE_IS_TRIVIAL 1 #endif -/* Copy the second part of user declarations. */ +extern YYSTYPE wkt_yylval; +extern YYLTYPE wkt_yylloc; +int wkt_yyparse (void); +#endif /* !YY_WKT_YY_LWIN_WKT_PARSE_H_INCLUDED */ -/* Line 343 of yacc.c */ -#line 295 "lwin_wkt_parse.c" +/* Copy the second part of user declarations. */ + +#line 304 "lwin_wkt_parse.c" /* yacc.c:358 */ #ifdef short # undef short @@ -305,11 +314,8 @@ typedef unsigned char yytype_uint8; #ifdef YYTYPE_INT8 typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -typedef signed char yytype_int8; #else -typedef short int yytype_int8; +typedef signed char yytype_int8; #endif #ifdef YYTYPE_UINT16 @@ -329,8 +335,7 @@ typedef short int yytype_int16; # define YYSIZE_T __SIZE_TYPE__ # elif defined size_t # define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# elif ! defined YYSIZE_T # include /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else @@ -344,39 +349,68 @@ typedef short int yytype_int16; # if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) +# define YY_(Msgid) dgettext ("bison-runtime", Msgid) # endif # endif # ifndef YY_ -# define YY_(msgid) msgid +# define YY_(Msgid) Msgid +# endif +#endif + +#ifndef YY_ATTRIBUTE +# if (defined __GNUC__ \ + && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \ + || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C +# define YY_ATTRIBUTE(Spec) __attribute__(Spec) +# else +# define YY_ATTRIBUTE(Spec) /* empty */ +# endif +#endif + +#ifndef YY_ATTRIBUTE_PURE +# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__)) +#endif + +#ifndef YY_ATTRIBUTE_UNUSED +# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) +#endif + +#if !defined _Noreturn \ + && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) +# if defined _MSC_VER && 1200 <= _MSC_VER +# define _Noreturn __declspec (noreturn) +# else +# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) +# define YYUSE(E) ((void) (E)) #else -# define YYUSE(e) /* empty */ +# define YYUSE(E) /* empty */ #endif -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(n) (n) -#else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int yyi) +#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ + _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ + _Pragma ("GCC diagnostic pop") #else -static int -YYID (yyi) - int yyi; +# define YY_INITIAL_VALUE(Value) Value #endif -{ - return yyi; -} +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ #endif + #if ! defined yyoverflow || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -394,9 +428,9 @@ YYID (yyi) # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS # include /* INFRINGES ON USER NAME SPACE */ + /* Use EXIT_SUCCESS as a witness for stdlib.h. */ # ifndef EXIT_SUCCESS # define EXIT_SUCCESS 0 # endif @@ -406,8 +440,8 @@ YYID (yyi) # endif # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) + /* Pacify GCC's 'empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # ifndef YYSTACK_ALLOC_MAXIMUM /* The OS might guarantee only one guard page at the bottom of the stack, and a page size can be as small as 4096 bytes. So we cannot safely @@ -423,7 +457,7 @@ YYID (yyi) # endif # if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) + && (defined YYFREE || defined free))) # include /* INFRINGES ON USER NAME SPACE */ # ifndef EXIT_SUCCESS # define EXIT_SUCCESS 0 @@ -431,15 +465,13 @@ YYID (yyi) # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined malloc && ! defined EXIT_SUCCESS void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined free && ! defined EXIT_SUCCESS void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif @@ -449,8 +481,8 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \ - && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \ + && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc @@ -476,35 +508,35 @@ union yyalloc elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ - Stack = &yyptr->Stack_alloc; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (YYID (0)) +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (0) #endif #if defined YYCOPY_NEEDED && YYCOPY_NEEDED -/* Copy COUNT objects from FROM to TO. The source and destination do +/* Copy COUNT objects from SRC to DST. The source and destination do not overlap. */ # ifndef YYCOPY # if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# define YYCOPY(Dst, Src, Count) \ + __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) # else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (YYID (0)) +# define YYCOPY(Dst, Src, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (Dst)[yyi] = (Src)[yyi]; \ + } \ + while (0) # endif # endif #endif /* !YYCOPY_NEEDED */ @@ -520,17 +552,19 @@ union yyalloc #define YYNNTS 40 /* YYNRULES -- Number of rules. */ #define YYNRULES 136 -/* YYNRULES -- Number of states. */ +/* YYNSTATES -- Number of states. */ #define YYNSTATES 264 -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ +/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned + by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 #define YYMAXUTOK 280 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ +/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, without out-of-bounds checking. */ static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -565,102 +599,27 @@ static const yytype_uint8 yytranslate[] = }; #if YYDEBUG -/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in - YYRHS. */ -static const yytype_uint16 yyprhs[] = -{ - 0, 0, 3, 5, 9, 11, 13, 15, 17, 19, - 21, 23, 25, 27, 29, 31, 33, 35, 37, 39, - 44, 50, 54, 57, 61, 63, 68, 74, 78, 81, - 85, 89, 93, 95, 97, 99, 104, 110, 114, 117, - 122, 128, 132, 135, 140, 146, 150, 153, 157, 159, - 163, 165, 170, 176, 180, 183, 187, 189, 193, 198, - 204, 208, 211, 215, 217, 219, 221, 223, 225, 229, - 231, 235, 237, 241, 245, 250, 256, 260, 263, 267, - 271, 275, 277, 279, 281, 286, 292, 296, 299, 303, - 307, 311, 315, 317, 319, 321, 323, 328, 334, 338, - 341, 345, 347, 352, 358, 362, 365, 370, 376, 380, - 383, 387, 389, 393, 395, 402, 410, 414, 417, 423, - 428, 434, 438, 441, 445, 447, 449, 453, 455, 460, - 466, 470, 473, 477, 479, 482, 486 -}; - -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int8 yyrhs[] = -{ - 27, 0, -1, 28, -1, 25, 19, 28, -1, 63, - -1, 55, -1, 54, -1, 48, -1, 38, -1, 41, - -1, 60, -1, 52, -1, 35, -1, 31, -1, 50, - -1, 33, -1, 34, -1, 58, -1, 29, -1, 14, - 16, 30, 15, -1, 14, 24, 16, 30, 15, -1, - 14, 24, 18, -1, 14, 18, -1, 30, 17, 28, - -1, 28, -1, 9, 16, 32, 15, -1, 9, 24, - 16, 32, 15, -1, 9, 24, 18, -1, 9, 18, - -1, 32, 17, 38, -1, 32, 17, 41, -1, 32, - 17, 39, -1, 38, -1, 41, -1, 39, -1, 21, - 16, 57, 15, -1, 21, 24, 16, 57, 15, -1, - 21, 24, 18, -1, 21, 18, -1, 22, 16, 37, - 15, -1, 22, 24, 16, 37, 15, -1, 22, 24, - 18, -1, 22, 18, -1, 8, 16, 36, 15, -1, - 8, 24, 16, 36, 15, -1, 8, 24, 18, -1, - 8, 18, -1, 36, 17, 39, -1, 39, -1, 37, - 17, 40, -1, 40, -1, 5, 16, 45, 15, -1, - 5, 24, 16, 45, 15, -1, 5, 24, 18, -1, - 5, 18, -1, 16, 45, 15, -1, 18, -1, 16, - 44, 15, -1, 11, 16, 42, 15, -1, 11, 24, - 16, 42, 15, -1, 11, 24, 18, -1, 11, 18, - -1, 42, 17, 43, -1, 43, -1, 56, -1, 55, - -1, 48, -1, 54, -1, 44, 17, 46, -1, 46, - -1, 45, 17, 47, -1, 47, -1, 16, 64, 15, - -1, 16, 64, 15, -1, 12, 16, 49, 15, -1, - 12, 24, 16, 49, 15, -1, 12, 24, 18, -1, - 12, 18, -1, 49, 17, 54, -1, 49, 17, 55, - -1, 49, 17, 56, -1, 54, -1, 55, -1, 56, - -1, 10, 16, 51, 15, -1, 10, 24, 16, 51, - 15, -1, 10, 24, 18, -1, 10, 18, -1, 51, - 17, 54, -1, 51, 17, 48, -1, 51, 17, 55, - -1, 51, 17, 56, -1, 54, -1, 48, -1, 55, - -1, 56, -1, 7, 16, 53, 15, -1, 7, 24, - 16, 53, 15, -1, 7, 24, 18, -1, 7, 18, - -1, 53, 17, 56, -1, 56, -1, 13, 16, 64, - 15, -1, 13, 24, 16, 64, 15, -1, 13, 24, - 18, -1, 13, 18, -1, 4, 16, 64, 15, -1, - 4, 24, 16, 64, 15, -1, 4, 24, 18, -1, - 4, 18, -1, 16, 64, 15, -1, 18, -1, 57, - 17, 59, -1, 59, -1, 20, 16, 16, 64, 15, - 15, -1, 20, 24, 16, 16, 64, 15, 15, -1, - 20, 24, 18, -1, 20, 18, -1, 16, 16, 64, - 15, 15, -1, 6, 16, 61, 15, -1, 6, 24, - 16, 61, 15, -1, 6, 24, 18, -1, 6, 18, - -1, 61, 17, 62, -1, 62, -1, 65, -1, 16, - 65, 15, -1, 18, -1, 3, 16, 64, 15, -1, - 3, 24, 16, 64, 15, -1, 3, 24, 18, -1, - 3, 18, -1, 64, 17, 65, -1, 65, -1, 23, - 23, -1, 23, 23, 23, -1, 23, 23, 23, 23, - -1 -}; - -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ + /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 202, 202, 204, 208, 209, 210, 211, 212, 213, - 214, 215, 216, 217, 218, 219, 220, 221, 222, 225, - 227, 229, 231, 235, 237, 241, 243, 245, 247, 251, - 253, 255, 257, 259, 261, 265, 267, 269, 271, 275, - 277, 279, 281, 285, 287, 289, 291, 295, 297, 301, - 303, 307, 309, 311, 313, 317, 319, 323, 326, 328, - 330, 332, 336, 338, 342, 343, 344, 345, 348, 350, - 354, 356, 360, 363, 366, 368, 370, 372, 376, 378, - 380, 382, 384, 386, 390, 392, 394, 396, 400, 402, - 404, 406, 408, 410, 412, 414, 418, 420, 422, 424, - 428, 430, 434, 436, 438, 440, 444, 446, 448, 450, - 454, 456, 460, 462, 466, 468, 470, 472, 476, 480, - 482, 484, 486, 490, 492, 496, 498, 500, 504, 506, - 508, 510, 514, 516, 520, 522, 524 + 0, 210, 210, 212, 216, 217, 218, 219, 220, 221, + 222, 223, 224, 225, 226, 227, 228, 229, 230, 233, + 235, 237, 239, 243, 245, 249, 251, 253, 255, 259, + 261, 263, 265, 267, 269, 273, 275, 277, 279, 283, + 285, 287, 289, 293, 295, 297, 299, 303, 305, 309, + 311, 315, 317, 319, 321, 325, 327, 331, 334, 336, + 338, 340, 344, 346, 350, 351, 352, 353, 356, 358, + 362, 364, 368, 371, 374, 376, 378, 380, 384, 386, + 388, 390, 392, 394, 398, 400, 402, 404, 408, 410, + 412, 414, 416, 418, 420, 422, 426, 428, 430, 432, + 436, 438, 442, 444, 446, 448, 452, 454, 456, 458, + 462, 464, 468, 470, 474, 476, 478, 480, 484, 488, + 490, 492, 494, 498, 500, 504, 506, 508, 512, 514, + 516, 518, 522, 524, 528, 530, 532 }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +#if YYDEBUG || YYERROR_VERBOSE || 1 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = @@ -680,13 +639,13 @@ static const char *const yytname[] = "multilinestring", "linestring_list", "circularstring", "linestring", "linestring_untagged", "triangle_list", "triangle", "triangle_untagged", "multipoint", "point_list", "point_untagged", "point", "ptarray", - "coordinate", 0 + "coordinate", YY_NULLPTR }; #endif # ifdef YYPRINT -/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to - token YYLEX-NUM. */ +/* YYTOKNUM[NUM] -- (External) token number corresponding to the + (internal) symbol number NUM (which must be that of a token). */ static const yytype_uint16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, @@ -695,90 +654,18 @@ static const yytype_uint16 yytoknum[] = }; # endif -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = -{ - 0, 26, 27, 27, 28, 28, 28, 28, 28, 28, - 28, 28, 28, 28, 28, 28, 28, 28, 28, 29, - 29, 29, 29, 30, 30, 31, 31, 31, 31, 32, - 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, - 34, 34, 34, 35, 35, 35, 35, 36, 36, 37, - 37, 38, 38, 38, 38, 39, 39, 40, 41, 41, - 41, 41, 42, 42, 43, 43, 43, 43, 44, 44, - 45, 45, 46, 47, 48, 48, 48, 48, 49, 49, - 49, 49, 49, 49, 50, 50, 50, 50, 51, 51, - 51, 51, 51, 51, 51, 51, 52, 52, 52, 52, - 53, 53, 54, 54, 54, 54, 55, 55, 55, 55, - 56, 56, 57, 57, 58, 58, 58, 58, 59, 60, - 60, 60, 60, 61, 61, 62, 62, 62, 63, 63, - 63, 63, 64, 64, 65, 65, 65 -}; +#define YYPACT_NINF -90 -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = -{ - 0, 2, 1, 3, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, - 5, 3, 2, 3, 1, 4, 5, 3, 2, 3, - 3, 3, 1, 1, 1, 4, 5, 3, 2, 4, - 5, 3, 2, 4, 5, 3, 2, 3, 1, 3, - 1, 4, 5, 3, 2, 3, 1, 3, 4, 5, - 3, 2, 3, 1, 1, 1, 1, 1, 3, 1, - 3, 1, 3, 3, 4, 5, 3, 2, 3, 3, - 3, 1, 1, 1, 4, 5, 3, 2, 3, 3, - 3, 3, 1, 1, 1, 1, 4, 5, 3, 2, - 3, 1, 4, 5, 3, 2, 4, 5, 3, 2, - 3, 1, 3, 1, 6, 7, 3, 2, 5, 4, - 5, 3, 2, 3, 1, 1, 3, 1, 4, 5, - 3, 2, 3, 1, 2, 3, 4 -}; +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-90))) -/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. - Performed when YYTABLE doesn't specify something else to do. Zero - means the default is an error. */ -static const yytype_uint8 yydefact[] = -{ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 2, 18, - 13, 15, 16, 12, 8, 9, 7, 14, 11, 6, - 5, 17, 10, 4, 0, 131, 0, 0, 109, 0, - 0, 54, 0, 0, 122, 0, 0, 99, 0, 0, - 46, 0, 0, 28, 0, 0, 87, 0, 0, 61, - 0, 0, 77, 0, 0, 105, 0, 0, 22, 0, - 0, 117, 0, 0, 38, 0, 0, 42, 0, 0, - 1, 0, 0, 133, 0, 130, 0, 0, 108, 0, - 0, 71, 0, 53, 0, 127, 0, 124, 125, 0, - 121, 0, 111, 0, 101, 0, 98, 0, 56, 0, - 48, 0, 45, 0, 32, 34, 33, 0, 27, 93, - 0, 92, 94, 95, 0, 86, 0, 63, 66, 67, - 65, 64, 0, 60, 0, 81, 82, 83, 0, 76, - 0, 0, 104, 24, 0, 0, 21, 0, 0, 116, - 0, 0, 113, 0, 37, 0, 0, 50, 0, 41, - 3, 134, 128, 0, 0, 106, 0, 0, 51, 0, - 0, 0, 119, 0, 0, 0, 96, 0, 0, 0, - 43, 0, 0, 25, 0, 0, 84, 0, 0, 58, - 0, 0, 74, 0, 0, 102, 0, 19, 0, 0, - 0, 0, 0, 35, 0, 0, 0, 0, 69, 39, - 0, 0, 135, 132, 129, 107, 73, 70, 52, 126, - 123, 120, 110, 100, 97, 55, 47, 44, 29, 31, - 30, 26, 89, 88, 90, 91, 85, 62, 59, 78, - 79, 80, 75, 103, 23, 20, 0, 0, 0, 112, - 36, 0, 57, 0, 49, 40, 136, 114, 0, 0, - 72, 68, 115, 118 -}; +#define YYTABLE_NINF -1 -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int16 yydefgoto[] = -{ - -1, 17, 143, 19, 144, 20, 113, 21, 22, 23, - 109, 156, 24, 110, 157, 25, 126, 127, 207, 90, - 208, 91, 26, 134, 27, 120, 28, 103, 29, 30, - 131, 151, 31, 152, 32, 96, 97, 33, 82, 83 -}; +#define yytable_value_is_error(Yytable_value) \ + 0 -/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -#define YYPACT_NINF -90 + /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ static const yytype_int16 yypact[] = { 109, -2, 16, 23, 26, 36, 39, 40, 52, 53, @@ -810,7 +697,41 @@ static const yytype_int16 yypact[] = -90, -90, -90, -90 }; -/* YYPGOTO[NTERM-NUM]. */ + /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE does not specify something else to do. Zero + means the default is an error. */ +static const yytype_uint8 yydefact[] = +{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 2, 18, + 13, 15, 16, 12, 8, 9, 7, 14, 11, 6, + 5, 17, 10, 4, 0, 131, 0, 0, 109, 0, + 0, 54, 0, 0, 122, 0, 0, 99, 0, 0, + 46, 0, 0, 28, 0, 0, 87, 0, 0, 61, + 0, 0, 77, 0, 0, 105, 0, 0, 22, 0, + 0, 117, 0, 0, 38, 0, 0, 42, 0, 0, + 1, 0, 0, 133, 0, 130, 0, 0, 108, 0, + 0, 71, 0, 53, 0, 127, 0, 124, 125, 0, + 121, 0, 111, 0, 101, 0, 98, 0, 56, 0, + 48, 0, 45, 0, 32, 34, 33, 0, 27, 93, + 0, 92, 94, 95, 0, 86, 0, 63, 66, 67, + 65, 64, 0, 60, 0, 81, 82, 83, 0, 76, + 0, 0, 104, 24, 0, 0, 21, 0, 0, 116, + 0, 0, 113, 0, 37, 0, 0, 50, 0, 41, + 3, 134, 128, 0, 0, 106, 0, 0, 51, 0, + 0, 0, 119, 0, 0, 0, 96, 0, 0, 0, + 43, 0, 0, 25, 0, 0, 84, 0, 0, 58, + 0, 0, 74, 0, 0, 102, 0, 19, 0, 0, + 0, 0, 0, 35, 0, 0, 0, 0, 69, 39, + 0, 0, 135, 132, 129, 107, 73, 70, 52, 126, + 123, 120, 110, 100, 97, 55, 47, 44, 29, 31, + 30, 26, 89, 88, 90, 91, 85, 62, 59, 78, + 79, 80, 75, 103, 23, 20, 0, 0, 0, 112, + 36, 0, 57, 0, 49, 40, 136, 114, 0, 0, + 72, 68, 115, 118 +}; + + /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { -90, -90, 0, -90, 5, -90, 37, -90, -90, -90, @@ -819,10 +740,18 @@ static const yytype_int16 yypgoto[] = -44, 138, -90, 89, -90, 193, 121, -90, -36, -6 }; -/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule which - number is the opposite. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -1 + /* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int16 yydefgoto[] = +{ + -1, 17, 143, 19, 144, 20, 113, 21, 22, 23, + 109, 156, 24, 110, 157, 25, 126, 127, 207, 90, + 208, 91, 26, 134, 27, 120, 28, 103, 29, 30, + 131, 151, 31, 152, 32, 96, 97, 33, 82, 83 +}; + + /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule whose + number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_uint16 yytable[] = { 18, 86, 104, 170, 121, 119, 122, 129, 128, 130, @@ -857,12 +786,6 @@ static const yytype_uint16 yytable[] = 178, 205, 174, 249, 220 }; -#define yypact_value_is_default(yystate) \ - ((yystate) == (-90)) - -#define yytable_value_is_error(yytable_value) \ - YYID (0) - static const yytype_uint8 yycheck[] = { 0, 37, 46, 92, 55, 55, 55, 58, 58, 58, @@ -897,8 +820,8 @@ static const yytype_uint8 yycheck[] = 105, 153, 99, 204, 173 }; -/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ + /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, @@ -930,79 +853,120 @@ static const yytype_uint8 yystos[] = 15, 46, 15, 15 }; -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 - -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab - - -/* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. However, - YYFAIL appears to be in use. Nevertheless, it is formally deprecated - in Bison 2.4.2's NEWS entry, where a plan to phase it out is - discussed. */ - -#define YYFAIL goto yyerrlab -#if defined YYFAIL - /* This is here to suppress warnings from the GCC cpp's - -Wunused-macros. Normally we don't worry about that warning, but - some users do, and we want to make it easy for users to remove - YYFAIL uses, which will produce warnings from Bison 2.5. */ -#endif + /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const yytype_uint8 yyr1[] = +{ + 0, 26, 27, 27, 28, 28, 28, 28, 28, 28, + 28, 28, 28, 28, 28, 28, 28, 28, 28, 29, + 29, 29, 29, 30, 30, 31, 31, 31, 31, 32, + 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, + 34, 34, 34, 35, 35, 35, 35, 36, 36, 37, + 37, 38, 38, 38, 38, 39, 39, 40, 41, 41, + 41, 41, 42, 42, 43, 43, 43, 43, 44, 44, + 45, 45, 46, 47, 48, 48, 48, 48, 49, 49, + 49, 49, 49, 49, 50, 50, 50, 50, 51, 51, + 51, 51, 51, 51, 51, 51, 52, 52, 52, 52, + 53, 53, 54, 54, 54, 54, 55, 55, 55, 55, + 56, 56, 57, 57, 58, 58, 58, 58, 59, 60, + 60, 60, 60, 61, 61, 62, 62, 62, 63, 63, + 63, 63, 64, 64, 65, 65, 65 +}; + + /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ +static const yytype_uint8 yyr2[] = +{ + 0, 2, 1, 3, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, + 5, 3, 2, 3, 1, 4, 5, 3, 2, 3, + 3, 3, 1, 1, 1, 4, 5, 3, 2, 4, + 5, 3, 2, 4, 5, 3, 2, 3, 1, 3, + 1, 4, 5, 3, 2, 3, 1, 3, 4, 5, + 3, 2, 3, 1, 1, 1, 1, 1, 3, 1, + 3, 1, 3, 3, 4, 5, 3, 2, 3, 3, + 3, 1, 1, 1, 4, 5, 3, 2, 3, 3, + 3, 3, 1, 1, 1, 1, 4, 5, 3, 2, + 3, 1, 4, 5, 3, 2, 4, 5, 3, 2, + 3, 1, 3, 1, 6, 7, 3, 2, 5, 4, + 5, 3, 2, 3, 1, 1, 3, 1, 4, 5, + 3, 2, 3, 1, 2, 3, 4 +}; + + +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 + +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab + #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (1); \ - goto yybackup; \ - } \ - else \ - { \ +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (YYID (0)) + YYERROR; \ + } \ +while (0) - -#define YYTERROR 1 -#define YYERRCODE 256 +/* Error token number */ +#define YYTERROR 1 +#define YYERRCODE 256 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. If N is 0, then set CURRENT to the empty location which ends the previous symbol: RHS[0] (always defined). */ -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (YYID (0)) +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ + if (N) \ + { \ + (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ + (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ + (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ + (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = \ + YYRHSLOC (Rhs, 0).last_line; \ + (Current).first_column = (Current).last_column = \ + YYRHSLOC (Rhs, 0).last_column; \ + } \ + while (0) #endif +#define YYRHSLOC(Rhs, K) ((Rhs)[K]) + + +/* Enable debugging if requested. */ +#if YYDEBUG + +# ifndef YYFPRINTF +# include /* INFRINGES ON USER NAME SPACE */ +# define YYFPRINTF fprintf +# endif + +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (0) + /* YY_LOCATION_PRINT -- Print the location on the stream. This macro was not mandated originally: define only if we know @@ -1010,82 +974,73 @@ while (YYID (0)) #ifndef YY_LOCATION_PRINT # if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif -#endif - -/* YYLEX -- calling `yylex' with the right arguments. */ +/* Print *YYLOCP on YYO. Private, do not rely on its existence. */ -#ifdef YYLEX_PARAM -# define YYLEX yylex (YYLEX_PARAM) -#else -# define YYLEX yylex () -#endif +YY_ATTRIBUTE_UNUSED +static unsigned +yy_location_print_ (FILE *yyo, YYLTYPE const * const yylocp) +{ + unsigned res = 0; + int end_col = 0 != yylocp->last_column ? yylocp->last_column - 1 : 0; + if (0 <= yylocp->first_line) + { + res += YYFPRINTF (yyo, "%d", yylocp->first_line); + if (0 <= yylocp->first_column) + res += YYFPRINTF (yyo, ".%d", yylocp->first_column); + } + if (0 <= yylocp->last_line) + { + if (yylocp->first_line < yylocp->last_line) + { + res += YYFPRINTF (yyo, "-%d", yylocp->last_line); + if (0 <= end_col) + res += YYFPRINTF (yyo, ".%d", end_col); + } + else if (0 <= end_col && yylocp->first_column < end_col) + res += YYFPRINTF (yyo, "-%d", end_col); + } + return res; + } -/* Enable debugging if requested. */ -#if YYDEBUG +# define YY_LOCATION_PRINT(File, Loc) \ + yy_location_print_ (File, &(Loc)) -# ifndef YYFPRINTF -# include /* INFRINGES ON USER NAME SPACE */ -# define YYFPRINTF fprintf +# else +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) # endif +#endif -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (YYID (0)) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value, Location); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (YYID (0)) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value, Location); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (0) -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ +/*----------------------------------------. +| Print this symbol's value on YYOUTPUT. | +`----------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp) -#else -static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; - YYLTYPE const * const yylocationp; -#endif { + FILE *yyo = yyoutput; + YYUSE (yyo); + YYUSE (yylocationp); if (!yyvaluep) return; - YYUSE (yylocationp); # ifdef YYPRINT if (yytype < YYNTOKENS) YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# else - YYUSE (yyoutput); # endif - switch (yytype) - { - default: - break; - } + YYUSE (yytype); } @@ -1093,23 +1048,11 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) | Print this symbol on YYOUTPUT. | `--------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp) -#else -static void -yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; - YYLTYPE const * const yylocationp; -#endif { - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + YYFPRINTF (yyoutput, "%s %s (", + yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); YY_LOCATION_PRINT (yyoutput, *yylocationp); YYFPRINTF (yyoutput, ": "); @@ -1122,16 +1065,8 @@ yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp) | TOP (included). | `------------------------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) -#else -static void -yy_stack_print (yybottom, yytop) - yytype_int16 *yybottom; - yytype_int16 *yytop; -#endif { YYFPRINTF (stderr, "Stack now"); for (; yybottom <= yytop; yybottom++) @@ -1142,50 +1077,42 @@ yy_stack_print (yybottom, yytop) YYFPRINTF (stderr, "\n"); } -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (0) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule) -#else static void -yy_reduce_print (yyvsp, yylsp, yyrule) - YYSTYPE *yyvsp; - YYLTYPE *yylsp; - int yyrule; -#endif +yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule) { + unsigned long int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; - unsigned long int yylno = yyrline[yyrule]; YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); + yyrule - 1, yylno); /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { YYFPRINTF (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], - &(yyvsp[(yyi + 1) - (yynrhs)]) - , &(yylsp[(yyi + 1) - (yynrhs)]) ); + yy_symbol_print (stderr, + yystos[yyssp[yyi + 1 - yynrhs]], + &(yyvsp[(yyi + 1) - (yynrhs)]) + , &(yylsp[(yyi + 1) - (yynrhs)]) ); YYFPRINTF (stderr, "\n"); } } -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyvsp, yylsp, Rule); \ -} while (YYID (0)) +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyssp, yyvsp, yylsp, Rule); \ +} while (0) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ @@ -1199,7 +1126,7 @@ int yydebug; /* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH +#ifndef YYINITDEPTH # define YYINITDEPTH 200 #endif @@ -1222,15 +1149,8 @@ int yydebug; # define yystrlen strlen # else /* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static YYSIZE_T yystrlen (const char *yystr) -#else -static YYSIZE_T -yystrlen (yystr) - const char *yystr; -#endif { YYSIZE_T yylen; for (yylen = 0; yystr[yylen]; yylen++) @@ -1246,16 +1166,8 @@ yystrlen (yystr) # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static char * yystpcpy (char *yydest, const char *yysrc) -#else -static char * -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif { char *yyd = yydest; const char *yys = yysrc; @@ -1285,27 +1197,27 @@ yytnamerr (char *yyres, const char *yystr) char const *yyp = yystr; for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } do_not_strip_quotes: ; } @@ -1328,12 +1240,11 @@ static int yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, yytype_int16 *yyssp, int yytoken) { - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]); + YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; /* Internationalized format string. */ - const char *yyformat = 0; + const char *yyformat = YY_NULLPTR; /* Arguments of yyformat. */ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; /* Number of reported tokens (one for the "unexpected", one per @@ -1341,10 +1252,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, int yycount = 0; /* There are many possibilities here to consider: - - Assume YYFAIL is not used. It's too flawed to consider. See - - for details. YYERROR is fine as it does not invoke this - function. - If this state is a consistent state with a default action, then the only way this function was invoked is if the default action is an error action. In that case, don't check for expected @@ -1393,11 +1300,13 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, break; } yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + { + YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } } } } @@ -1417,10 +1326,12 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, # undef YYCASE_ } - yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + { + YYSIZE_T yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } if (*yymsg_alloc < yysize) { @@ -1457,374 +1368,242 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, | Release the memory associated to this symbol. | `-----------------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp) -#else -static void -yydestruct (yymsg, yytype, yyvaluep, yylocationp) - const char *yymsg; - int yytype; - YYSTYPE *yyvaluep; - YYLTYPE *yylocationp; -#endif { YYUSE (yyvaluep); YYUSE (yylocationp); - if (!yymsg) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN switch (yytype) { - case 28: /* "geometry_no_srid" */ - -/* Line 1391 of yacc.c */ -#line 180 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1491 "lwin_wkt_parse.c" - break; - case 29: /* "geometrycollection" */ - -/* Line 1391 of yacc.c */ -#line 181 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1500 "lwin_wkt_parse.c" - break; - case 31: /* "multisurface" */ - -/* Line 1391 of yacc.c */ -#line 188 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1509 "lwin_wkt_parse.c" - break; - case 32: /* "surface_list" */ - -/* Line 1391 of yacc.c */ -#line 167 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1518 "lwin_wkt_parse.c" - break; - case 33: /* "tin" */ - -/* Line 1391 of yacc.c */ -#line 195 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1527 "lwin_wkt_parse.c" - break; - case 34: /* "polyhedralsurface" */ - -/* Line 1391 of yacc.c */ -#line 194 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1536 "lwin_wkt_parse.c" - break; - case 35: /* "multipolygon" */ - -/* Line 1391 of yacc.c */ -#line 187 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1545 "lwin_wkt_parse.c" - break; - case 36: /* "polygon_list" */ - -/* Line 1391 of yacc.c */ -#line 168 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1554 "lwin_wkt_parse.c" - break; - case 37: /* "patch_list" */ - -/* Line 1391 of yacc.c */ -#line 169 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1563 "lwin_wkt_parse.c" - break; - case 38: /* "polygon" */ - -/* Line 1391 of yacc.c */ -#line 191 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1572 "lwin_wkt_parse.c" - break; - case 39: /* "polygon_untagged" */ - -/* Line 1391 of yacc.c */ -#line 193 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1581 "lwin_wkt_parse.c" - break; - case 40: /* "patch" */ - -/* Line 1391 of yacc.c */ -#line 192 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1590 "lwin_wkt_parse.c" - break; - case 41: /* "curvepolygon" */ - -/* Line 1391 of yacc.c */ -#line 178 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1599 "lwin_wkt_parse.c" - break; - case 42: /* "curvering_list" */ - -/* Line 1391 of yacc.c */ -#line 165 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1608 "lwin_wkt_parse.c" - break; - case 43: /* "curvering" */ - -/* Line 1391 of yacc.c */ -#line 179 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1617 "lwin_wkt_parse.c" - break; - case 44: /* "patchring_list" */ - -/* Line 1391 of yacc.c */ -#line 175 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1626 "lwin_wkt_parse.c" - break; - case 45: /* "ring_list" */ - -/* Line 1391 of yacc.c */ -#line 174 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1635 "lwin_wkt_parse.c" - break; - case 46: /* "patchring" */ - -/* Line 1391 of yacc.c */ -#line 164 "lwin_wkt_parse.y" - { ptarray_free((yyvaluep->ptarrayvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1644 "lwin_wkt_parse.c" - break; - case 47: /* "ring" */ - -/* Line 1391 of yacc.c */ -#line 163 "lwin_wkt_parse.y" - { ptarray_free((yyvaluep->ptarrayvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1653 "lwin_wkt_parse.c" - break; - case 48: /* "compoundcurve" */ - -/* Line 1391 of yacc.c */ -#line 177 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1662 "lwin_wkt_parse.c" - break; - case 49: /* "compound_list" */ - -/* Line 1391 of yacc.c */ -#line 173 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1671 "lwin_wkt_parse.c" - break; - case 50: /* "multicurve" */ - -/* Line 1391 of yacc.c */ -#line 184 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1680 "lwin_wkt_parse.c" - break; - case 51: /* "curve_list" */ - -/* Line 1391 of yacc.c */ -#line 172 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1689 "lwin_wkt_parse.c" - break; - case 52: /* "multilinestring" */ - -/* Line 1391 of yacc.c */ -#line 185 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1698 "lwin_wkt_parse.c" - break; - case 53: /* "linestring_list" */ - -/* Line 1391 of yacc.c */ -#line 171 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1707 "lwin_wkt_parse.c" - break; - case 54: /* "circularstring" */ - -/* Line 1391 of yacc.c */ -#line 176 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1716 "lwin_wkt_parse.c" - break; - case 55: /* "linestring" */ - -/* Line 1391 of yacc.c */ -#line 182 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1725 "lwin_wkt_parse.c" - break; - case 56: /* "linestring_untagged" */ - -/* Line 1391 of yacc.c */ -#line 183 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1734 "lwin_wkt_parse.c" - break; - case 57: /* "triangle_list" */ - -/* Line 1391 of yacc.c */ -#line 166 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1743 "lwin_wkt_parse.c" - break; - case 58: /* "triangle" */ - -/* Line 1391 of yacc.c */ -#line 196 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1752 "lwin_wkt_parse.c" - break; - case 59: /* "triangle_untagged" */ - -/* Line 1391 of yacc.c */ -#line 197 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1761 "lwin_wkt_parse.c" - break; - case 60: /* "multipoint" */ - -/* Line 1391 of yacc.c */ -#line 186 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1770 "lwin_wkt_parse.c" - break; - case 61: /* "point_list" */ - -/* Line 1391 of yacc.c */ -#line 170 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1779 "lwin_wkt_parse.c" - break; - case 62: /* "point_untagged" */ - -/* Line 1391 of yacc.c */ -#line 190 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1788 "lwin_wkt_parse.c" - break; - case 63: /* "point" */ - -/* Line 1391 of yacc.c */ -#line 189 "lwin_wkt_parse.y" - { lwgeom_free((yyvaluep->geometryvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1797 "lwin_wkt_parse.c" - break; - case 64: /* "ptarray" */ - -/* Line 1391 of yacc.c */ -#line 162 "lwin_wkt_parse.y" - { ptarray_free((yyvaluep->ptarrayvalue)); }; - -/* Line 1391 of yacc.c */ -#line 1806 "lwin_wkt_parse.c" - break; + case 28: /* geometry_no_srid */ +#line 188 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1387 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 29: /* geometrycollection */ +#line 189 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1393 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 31: /* multisurface */ +#line 196 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1399 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 32: /* surface_list */ +#line 175 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1405 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 33: /* tin */ +#line 203 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1411 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 34: /* polyhedralsurface */ +#line 202 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1417 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 35: /* multipolygon */ +#line 195 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1423 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 36: /* polygon_list */ +#line 176 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1429 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 37: /* patch_list */ +#line 177 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1435 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 38: /* polygon */ +#line 199 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1441 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 39: /* polygon_untagged */ +#line 201 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1447 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 40: /* patch */ +#line 200 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1453 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 41: /* curvepolygon */ +#line 186 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1459 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 42: /* curvering_list */ +#line 173 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1465 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 43: /* curvering */ +#line 187 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1471 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 44: /* patchring_list */ +#line 183 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1477 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 45: /* ring_list */ +#line 182 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1483 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 46: /* patchring */ +#line 172 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { ptarray_free(((*yyvaluep).ptarrayvalue)); } +#line 1489 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 47: /* ring */ +#line 171 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { ptarray_free(((*yyvaluep).ptarrayvalue)); } +#line 1495 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 48: /* compoundcurve */ +#line 185 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1501 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 49: /* compound_list */ +#line 181 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1507 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 50: /* multicurve */ +#line 192 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1513 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 51: /* curve_list */ +#line 180 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1519 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 52: /* multilinestring */ +#line 193 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1525 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 53: /* linestring_list */ +#line 179 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1531 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 54: /* circularstring */ +#line 184 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1537 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 55: /* linestring */ +#line 190 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1543 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 56: /* linestring_untagged */ +#line 191 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1549 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 57: /* triangle_list */ +#line 174 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1555 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 58: /* triangle */ +#line 204 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1561 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 59: /* triangle_untagged */ +#line 205 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1567 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 60: /* multipoint */ +#line 194 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1573 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 61: /* point_list */ +#line 178 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1579 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 62: /* point_untagged */ +#line 198 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1585 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 63: /* point */ +#line 197 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { lwgeom_free(((*yyvaluep).geometryvalue)); } +#line 1591 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + + case 64: /* ptarray */ +#line 170 "lwin_wkt_parse.y" /* yacc.c:1257 */ + { ptarray_free(((*yyvaluep).ptarrayvalue)); } +#line 1597 "lwin_wkt_parse.c" /* yacc.c:1257 */ + break; + default: - break; + break; } + YY_IGNORE_MAYBE_UNINITIALIZED_END } -/* Prevent warnings from -Wmissing-prototypes. */ -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ /* The lookahead symbol. */ @@ -1832,10 +1611,12 @@ int yychar; /* The semantic value of the lookahead symbol. */ YYSTYPE yylval; - /* Location data for the lookahead symbol. */ -YYLTYPE yylloc; - +YYLTYPE yylloc +# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL + = { 1, 1, 1, 1 } +# endif +; /* Number of syntax errors so far. */ int yynerrs; @@ -1844,38 +1625,19 @@ int yynerrs; | yyparse. | `----------*/ -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) int yyparse (void) -#else -int -yyparse () - -#endif -#endif { int yystate; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; /* The stacks and their tools: - `yyss': related to states. - `yyvs': related to semantic values. - `yyls': related to locations. + 'yyss': related to states. + 'yyvs': related to semantic values. + 'yyls': related to locations. - Refer to the stacks thru separate pointers, to allow yyoverflow + Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ /* The state stack. */ @@ -1901,7 +1663,7 @@ yyparse () int yyn; int yyresult; /* Lookahead token as an internal (translated) token number. */ - int yytoken; + int yytoken = 0; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; @@ -1920,10 +1682,9 @@ yyparse () Keep to zero when no symbol should be popped. */ int yylen = 0; - yytoken = 0; - yyss = yyssa; - yyvs = yyvsa; - yyls = yylsa; + yyssp = yyss = yyssa; + yyvsp = yyvs = yyvsa; + yylsp = yyls = yylsa; yystacksize = YYINITDEPTH; YYDPRINTF ((stderr, "Starting parse\n")); @@ -1932,21 +1693,7 @@ yyparse () yyerrstatus = 0; yynerrs = 0; yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - yyssp = yyss; - yyvsp = yyvs; - yylsp = yyls; - -#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL - /* Initialize the default location before parsing starts. */ - yylloc.first_line = yylloc.last_line = 1; - yylloc.first_column = yylloc.last_column = 1; -#endif - + yylsp[0] = yylloc; goto yysetstate; /*------------------------------------------------------------. @@ -1967,26 +1714,26 @@ yyparse () #ifdef yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; - YYLTYPE *yyls1 = yyls; - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yyls1, yysize * sizeof (*yylsp), - &yystacksize); - - yyls = yyls1; - yyss = yyss1; - yyvs = yyvs1; + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + YYSTYPE *yyvs1 = yyvs; + yytype_int16 *yyss1 = yyss; + YYLTYPE *yyls1 = yyls; + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + &yyls1, yysize * sizeof (*yylsp), + &yystacksize); + + yyls = yyls1; + yyss = yyss1; + yyvs = yyvs1; } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE @@ -1994,23 +1741,23 @@ yyparse () # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + goto yyexhaustedlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; + yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss_alloc, yyss); - YYSTACK_RELOCATE (yyvs_alloc, yyvs); - YYSTACK_RELOCATE (yyls_alloc, yyls); + yytype_int16 *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyexhaustedlab; + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); + YYSTACK_RELOCATE (yyls_alloc, yyls); # undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); } # endif #endif /* no yyoverflow */ @@ -2020,10 +1767,10 @@ yyparse () yylsp = yyls + yysize - 1; YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + (unsigned long int) yystacksize)); if (yyss + yystacksize - 1 <= yyssp) - YYABORT; + YYABORT; } YYDPRINTF ((stderr, "Entering state %d\n", yystate)); @@ -2052,7 +1799,7 @@ yybackup: if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; + yychar = yylex (); } if (yychar <= YYEOF) @@ -2092,7 +1839,9 @@ yybackup: yychar = YYEMPTY; yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END *++yylsp = yylloc; goto yynewstate; @@ -2115,7 +1864,7 @@ yyreduce: yylen = yyr2[yyn]; /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. + '$$ = $1'. Otherwise, the following line sets YYVAL to garbage. This behavior is undocumented and Bison @@ -2130,954 +1879,817 @@ yyreduce: switch (yyn) { case 2: - -/* Line 1806 of yacc.c */ -#line 203 "lwin_wkt_parse.y" - { wkt_parser_geometry_new((yyvsp[(1) - (1)].geometryvalue), SRID_UNKNOWN); WKT_ERROR(); } +#line 211 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { wkt_parser_geometry_new((yyvsp[0].geometryvalue), SRID_UNKNOWN); WKT_ERROR(); } +#line 1885 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 3: - -/* Line 1806 of yacc.c */ -#line 205 "lwin_wkt_parse.y" - { wkt_parser_geometry_new((yyvsp[(3) - (3)].geometryvalue), (yyvsp[(1) - (3)].integervalue)); WKT_ERROR(); } +#line 213 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { wkt_parser_geometry_new((yyvsp[0].geometryvalue), (yyvsp[-2].integervalue)); WKT_ERROR(); } +#line 1891 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 4: - -/* Line 1806 of yacc.c */ -#line 208 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = (yyvsp[(1) - (1)].geometryvalue); } +#line 216 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = (yyvsp[0].geometryvalue); } +#line 1897 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 5: - -/* Line 1806 of yacc.c */ -#line 209 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = (yyvsp[(1) - (1)].geometryvalue); } +#line 217 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = (yyvsp[0].geometryvalue); } +#line 1903 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 6: - -/* Line 1806 of yacc.c */ -#line 210 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = (yyvsp[(1) - (1)].geometryvalue); } +#line 218 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = (yyvsp[0].geometryvalue); } +#line 1909 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 7: - -/* Line 1806 of yacc.c */ -#line 211 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = (yyvsp[(1) - (1)].geometryvalue); } +#line 219 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = (yyvsp[0].geometryvalue); } +#line 1915 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 8: - -/* Line 1806 of yacc.c */ -#line 212 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = (yyvsp[(1) - (1)].geometryvalue); } +#line 220 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = (yyvsp[0].geometryvalue); } +#line 1921 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 9: - -/* Line 1806 of yacc.c */ -#line 213 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = (yyvsp[(1) - (1)].geometryvalue); } +#line 221 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = (yyvsp[0].geometryvalue); } +#line 1927 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 10: - -/* Line 1806 of yacc.c */ -#line 214 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = (yyvsp[(1) - (1)].geometryvalue); } +#line 222 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = (yyvsp[0].geometryvalue); } +#line 1933 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 11: - -/* Line 1806 of yacc.c */ -#line 215 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = (yyvsp[(1) - (1)].geometryvalue); } +#line 223 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = (yyvsp[0].geometryvalue); } +#line 1939 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 12: - -/* Line 1806 of yacc.c */ -#line 216 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = (yyvsp[(1) - (1)].geometryvalue); } +#line 224 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = (yyvsp[0].geometryvalue); } +#line 1945 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 13: - -/* Line 1806 of yacc.c */ -#line 217 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = (yyvsp[(1) - (1)].geometryvalue); } +#line 225 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = (yyvsp[0].geometryvalue); } +#line 1951 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 14: - -/* Line 1806 of yacc.c */ -#line 218 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = (yyvsp[(1) - (1)].geometryvalue); } +#line 226 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = (yyvsp[0].geometryvalue); } +#line 1957 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 15: - -/* Line 1806 of yacc.c */ -#line 219 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = (yyvsp[(1) - (1)].geometryvalue); } +#line 227 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = (yyvsp[0].geometryvalue); } +#line 1963 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 16: - -/* Line 1806 of yacc.c */ -#line 220 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = (yyvsp[(1) - (1)].geometryvalue); } +#line 228 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = (yyvsp[0].geometryvalue); } +#line 1969 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 17: - -/* Line 1806 of yacc.c */ -#line 221 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = (yyvsp[(1) - (1)].geometryvalue); } +#line 229 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = (yyvsp[0].geometryvalue); } +#line 1975 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 18: - -/* Line 1806 of yacc.c */ -#line 222 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = (yyvsp[(1) - (1)].geometryvalue); } +#line 230 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = (yyvsp[0].geometryvalue); } +#line 1981 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 19: - -/* Line 1806 of yacc.c */ -#line 226 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(COLLECTIONTYPE, (yyvsp[(3) - (4)].geometryvalue), NULL); WKT_ERROR(); } +#line 234 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(COLLECTIONTYPE, (yyvsp[-1].geometryvalue), NULL); WKT_ERROR(); } +#line 1987 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 20: - -/* Line 1806 of yacc.c */ -#line 228 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(COLLECTIONTYPE, (yyvsp[(4) - (5)].geometryvalue), (yyvsp[(2) - (5)].stringvalue)); WKT_ERROR(); } +#line 236 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(COLLECTIONTYPE, (yyvsp[-1].geometryvalue), (yyvsp[-3].stringvalue)); WKT_ERROR(); } +#line 1993 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 21: - -/* Line 1806 of yacc.c */ -#line 230 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(COLLECTIONTYPE, NULL, (yyvsp[(2) - (3)].stringvalue)); WKT_ERROR(); } +#line 238 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(COLLECTIONTYPE, NULL, (yyvsp[-1].stringvalue)); WKT_ERROR(); } +#line 1999 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 22: - -/* Line 1806 of yacc.c */ -#line 232 "lwin_wkt_parse.y" +#line 240 "lwin_wkt_parse.y" /* yacc.c:1646 */ { (yyval.geometryvalue) = wkt_parser_collection_finalize(COLLECTIONTYPE, NULL, NULL); WKT_ERROR(); } +#line 2005 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 23: - -/* Line 1806 of yacc.c */ -#line 236 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[(1) - (3)].geometryvalue),(yyvsp[(3) - (3)].geometryvalue)); WKT_ERROR(); } +#line 244 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[-2].geometryvalue),(yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2011 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 24: - -/* Line 1806 of yacc.c */ -#line 238 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[(1) - (1)].geometryvalue)); WKT_ERROR(); } +#line 246 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2017 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 25: - -/* Line 1806 of yacc.c */ -#line 242 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTISURFACETYPE, (yyvsp[(3) - (4)].geometryvalue), NULL); WKT_ERROR(); } +#line 250 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTISURFACETYPE, (yyvsp[-1].geometryvalue), NULL); WKT_ERROR(); } +#line 2023 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 26: - -/* Line 1806 of yacc.c */ -#line 244 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTISURFACETYPE, (yyvsp[(4) - (5)].geometryvalue), (yyvsp[(2) - (5)].stringvalue)); WKT_ERROR(); } +#line 252 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTISURFACETYPE, (yyvsp[-1].geometryvalue), (yyvsp[-3].stringvalue)); WKT_ERROR(); } +#line 2029 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 27: - -/* Line 1806 of yacc.c */ -#line 246 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTISURFACETYPE, NULL, (yyvsp[(2) - (3)].stringvalue)); WKT_ERROR(); } +#line 254 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTISURFACETYPE, NULL, (yyvsp[-1].stringvalue)); WKT_ERROR(); } +#line 2035 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 28: - -/* Line 1806 of yacc.c */ -#line 248 "lwin_wkt_parse.y" +#line 256 "lwin_wkt_parse.y" /* yacc.c:1646 */ { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTISURFACETYPE, NULL, NULL); WKT_ERROR(); } +#line 2041 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 29: - -/* Line 1806 of yacc.c */ -#line 252 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[(1) - (3)].geometryvalue),(yyvsp[(3) - (3)].geometryvalue)); WKT_ERROR(); } +#line 260 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[-2].geometryvalue),(yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2047 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 30: - -/* Line 1806 of yacc.c */ -#line 254 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[(1) - (3)].geometryvalue),(yyvsp[(3) - (3)].geometryvalue)); WKT_ERROR(); } +#line 262 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[-2].geometryvalue),(yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2053 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 31: - -/* Line 1806 of yacc.c */ -#line 256 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[(1) - (3)].geometryvalue),(yyvsp[(3) - (3)].geometryvalue)); WKT_ERROR(); } +#line 264 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[-2].geometryvalue),(yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2059 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 32: - -/* Line 1806 of yacc.c */ -#line 258 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[(1) - (1)].geometryvalue)); WKT_ERROR(); } +#line 266 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2065 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 33: - -/* Line 1806 of yacc.c */ -#line 260 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[(1) - (1)].geometryvalue)); WKT_ERROR(); } +#line 268 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2071 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 34: - -/* Line 1806 of yacc.c */ -#line 262 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[(1) - (1)].geometryvalue)); WKT_ERROR(); } +#line 270 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2077 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 35: - -/* Line 1806 of yacc.c */ -#line 266 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(TINTYPE, (yyvsp[(3) - (4)].geometryvalue), NULL); WKT_ERROR(); } +#line 274 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(TINTYPE, (yyvsp[-1].geometryvalue), NULL); WKT_ERROR(); } +#line 2083 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 36: - -/* Line 1806 of yacc.c */ -#line 268 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(TINTYPE, (yyvsp[(4) - (5)].geometryvalue), (yyvsp[(2) - (5)].stringvalue)); WKT_ERROR(); } +#line 276 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(TINTYPE, (yyvsp[-1].geometryvalue), (yyvsp[-3].stringvalue)); WKT_ERROR(); } +#line 2089 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 37: - -/* Line 1806 of yacc.c */ -#line 270 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(TINTYPE, NULL, (yyvsp[(2) - (3)].stringvalue)); WKT_ERROR(); } +#line 278 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(TINTYPE, NULL, (yyvsp[-1].stringvalue)); WKT_ERROR(); } +#line 2095 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 38: - -/* Line 1806 of yacc.c */ -#line 272 "lwin_wkt_parse.y" +#line 280 "lwin_wkt_parse.y" /* yacc.c:1646 */ { (yyval.geometryvalue) = wkt_parser_collection_finalize(TINTYPE, NULL, NULL); WKT_ERROR(); } +#line 2101 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 39: - -/* Line 1806 of yacc.c */ -#line 276 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(POLYHEDRALSURFACETYPE, (yyvsp[(3) - (4)].geometryvalue), NULL); WKT_ERROR(); } +#line 284 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(POLYHEDRALSURFACETYPE, (yyvsp[-1].geometryvalue), NULL); WKT_ERROR(); } +#line 2107 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 40: - -/* Line 1806 of yacc.c */ -#line 278 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(POLYHEDRALSURFACETYPE, (yyvsp[(4) - (5)].geometryvalue), (yyvsp[(2) - (5)].stringvalue)); WKT_ERROR(); } +#line 286 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(POLYHEDRALSURFACETYPE, (yyvsp[-1].geometryvalue), (yyvsp[-3].stringvalue)); WKT_ERROR(); } +#line 2113 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 41: - -/* Line 1806 of yacc.c */ -#line 280 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(POLYHEDRALSURFACETYPE, NULL, (yyvsp[(2) - (3)].stringvalue)); WKT_ERROR(); } +#line 288 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(POLYHEDRALSURFACETYPE, NULL, (yyvsp[-1].stringvalue)); WKT_ERROR(); } +#line 2119 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 42: - -/* Line 1806 of yacc.c */ -#line 282 "lwin_wkt_parse.y" +#line 290 "lwin_wkt_parse.y" /* yacc.c:1646 */ { (yyval.geometryvalue) = wkt_parser_collection_finalize(POLYHEDRALSURFACETYPE, NULL, NULL); WKT_ERROR(); } +#line 2125 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 43: - -/* Line 1806 of yacc.c */ -#line 286 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTIPOLYGONTYPE, (yyvsp[(3) - (4)].geometryvalue), NULL); WKT_ERROR(); } +#line 294 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTIPOLYGONTYPE, (yyvsp[-1].geometryvalue), NULL); WKT_ERROR(); } +#line 2131 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 44: - -/* Line 1806 of yacc.c */ -#line 288 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTIPOLYGONTYPE, (yyvsp[(4) - (5)].geometryvalue), (yyvsp[(2) - (5)].stringvalue)); WKT_ERROR(); } +#line 296 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTIPOLYGONTYPE, (yyvsp[-1].geometryvalue), (yyvsp[-3].stringvalue)); WKT_ERROR(); } +#line 2137 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 45: - -/* Line 1806 of yacc.c */ -#line 290 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTIPOLYGONTYPE, NULL, (yyvsp[(2) - (3)].stringvalue)); WKT_ERROR(); } +#line 298 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTIPOLYGONTYPE, NULL, (yyvsp[-1].stringvalue)); WKT_ERROR(); } +#line 2143 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 46: - -/* Line 1806 of yacc.c */ -#line 292 "lwin_wkt_parse.y" +#line 300 "lwin_wkt_parse.y" /* yacc.c:1646 */ { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTIPOLYGONTYPE, NULL, NULL); WKT_ERROR(); } +#line 2149 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 47: - -/* Line 1806 of yacc.c */ -#line 296 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[(1) - (3)].geometryvalue),(yyvsp[(3) - (3)].geometryvalue)); WKT_ERROR(); } +#line 304 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[-2].geometryvalue),(yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2155 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 48: - -/* Line 1806 of yacc.c */ -#line 298 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[(1) - (1)].geometryvalue)); WKT_ERROR(); } +#line 306 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2161 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 49: - -/* Line 1806 of yacc.c */ -#line 302 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[(1) - (3)].geometryvalue),(yyvsp[(3) - (3)].geometryvalue)); WKT_ERROR(); } +#line 310 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[-2].geometryvalue),(yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2167 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 50: - -/* Line 1806 of yacc.c */ -#line 304 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[(1) - (1)].geometryvalue)); WKT_ERROR(); } +#line 312 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2173 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 51: - -/* Line 1806 of yacc.c */ -#line 308 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_polygon_finalize((yyvsp[(3) - (4)].geometryvalue), NULL); WKT_ERROR(); } +#line 316 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_polygon_finalize((yyvsp[-1].geometryvalue), NULL); WKT_ERROR(); } +#line 2179 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 52: - -/* Line 1806 of yacc.c */ -#line 310 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_polygon_finalize((yyvsp[(4) - (5)].geometryvalue), (yyvsp[(2) - (5)].stringvalue)); WKT_ERROR(); } +#line 318 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_polygon_finalize((yyvsp[-1].geometryvalue), (yyvsp[-3].stringvalue)); WKT_ERROR(); } +#line 2185 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 53: - -/* Line 1806 of yacc.c */ -#line 312 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_polygon_finalize(NULL, (yyvsp[(2) - (3)].stringvalue)); WKT_ERROR(); } +#line 320 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_polygon_finalize(NULL, (yyvsp[-1].stringvalue)); WKT_ERROR(); } +#line 2191 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 54: - -/* Line 1806 of yacc.c */ -#line 314 "lwin_wkt_parse.y" +#line 322 "lwin_wkt_parse.y" /* yacc.c:1646 */ { (yyval.geometryvalue) = wkt_parser_polygon_finalize(NULL, NULL); WKT_ERROR(); } +#line 2197 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 55: - -/* Line 1806 of yacc.c */ -#line 318 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = (yyvsp[(2) - (3)].geometryvalue); } +#line 326 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = (yyvsp[-1].geometryvalue); } +#line 2203 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 56: - -/* Line 1806 of yacc.c */ -#line 320 "lwin_wkt_parse.y" +#line 328 "lwin_wkt_parse.y" /* yacc.c:1646 */ { (yyval.geometryvalue) = wkt_parser_polygon_finalize(NULL, NULL); WKT_ERROR(); } +#line 2209 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 57: - -/* Line 1806 of yacc.c */ -#line 323 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = (yyvsp[(2) - (3)].geometryvalue); } +#line 331 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = (yyvsp[-1].geometryvalue); } +#line 2215 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 58: - -/* Line 1806 of yacc.c */ -#line 327 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_curvepolygon_finalize((yyvsp[(3) - (4)].geometryvalue), NULL); WKT_ERROR(); } +#line 335 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_curvepolygon_finalize((yyvsp[-1].geometryvalue), NULL); WKT_ERROR(); } +#line 2221 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 59: - -/* Line 1806 of yacc.c */ -#line 329 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_curvepolygon_finalize((yyvsp[(4) - (5)].geometryvalue), (yyvsp[(2) - (5)].stringvalue)); WKT_ERROR(); } +#line 337 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_curvepolygon_finalize((yyvsp[-1].geometryvalue), (yyvsp[-3].stringvalue)); WKT_ERROR(); } +#line 2227 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 60: - -/* Line 1806 of yacc.c */ -#line 331 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_curvepolygon_finalize(NULL, (yyvsp[(2) - (3)].stringvalue)); WKT_ERROR(); } +#line 339 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_curvepolygon_finalize(NULL, (yyvsp[-1].stringvalue)); WKT_ERROR(); } +#line 2233 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 61: - -/* Line 1806 of yacc.c */ -#line 333 "lwin_wkt_parse.y" +#line 341 "lwin_wkt_parse.y" /* yacc.c:1646 */ { (yyval.geometryvalue) = wkt_parser_curvepolygon_finalize(NULL, NULL); WKT_ERROR(); } +#line 2239 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 62: - -/* Line 1806 of yacc.c */ -#line 337 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_curvepolygon_add_ring((yyvsp[(1) - (3)].geometryvalue),(yyvsp[(3) - (3)].geometryvalue)); WKT_ERROR(); } +#line 345 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_curvepolygon_add_ring((yyvsp[-2].geometryvalue),(yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2245 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 63: - -/* Line 1806 of yacc.c */ -#line 339 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_curvepolygon_new((yyvsp[(1) - (1)].geometryvalue)); WKT_ERROR(); } +#line 347 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_curvepolygon_new((yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2251 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 64: - -/* Line 1806 of yacc.c */ -#line 342 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = (yyvsp[(1) - (1)].geometryvalue); } +#line 350 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = (yyvsp[0].geometryvalue); } +#line 2257 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 65: - -/* Line 1806 of yacc.c */ -#line 343 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = (yyvsp[(1) - (1)].geometryvalue); } +#line 351 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = (yyvsp[0].geometryvalue); } +#line 2263 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 66: - -/* Line 1806 of yacc.c */ -#line 344 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = (yyvsp[(1) - (1)].geometryvalue); } +#line 352 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = (yyvsp[0].geometryvalue); } +#line 2269 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 67: - -/* Line 1806 of yacc.c */ -#line 345 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = (yyvsp[(1) - (1)].geometryvalue); } +#line 353 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = (yyvsp[0].geometryvalue); } +#line 2275 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 68: - -/* Line 1806 of yacc.c */ -#line 349 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_polygon_add_ring((yyvsp[(1) - (3)].geometryvalue),(yyvsp[(3) - (3)].ptarrayvalue),'Z'); WKT_ERROR(); } +#line 357 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_polygon_add_ring((yyvsp[-2].geometryvalue),(yyvsp[0].ptarrayvalue),'Z'); WKT_ERROR(); } +#line 2281 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 69: - -/* Line 1806 of yacc.c */ -#line 351 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_polygon_new((yyvsp[(1) - (1)].ptarrayvalue),'Z'); WKT_ERROR(); } +#line 359 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_polygon_new((yyvsp[0].ptarrayvalue),'Z'); WKT_ERROR(); } +#line 2287 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 70: - -/* Line 1806 of yacc.c */ -#line 355 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_polygon_add_ring((yyvsp[(1) - (3)].geometryvalue),(yyvsp[(3) - (3)].ptarrayvalue),'2'); WKT_ERROR(); } +#line 363 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_polygon_add_ring((yyvsp[-2].geometryvalue),(yyvsp[0].ptarrayvalue),'2'); WKT_ERROR(); } +#line 2293 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 71: - -/* Line 1806 of yacc.c */ -#line 357 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_polygon_new((yyvsp[(1) - (1)].ptarrayvalue),'2'); WKT_ERROR(); } +#line 365 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_polygon_new((yyvsp[0].ptarrayvalue),'2'); WKT_ERROR(); } +#line 2299 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 72: - -/* Line 1806 of yacc.c */ -#line 360 "lwin_wkt_parse.y" - { (yyval.ptarrayvalue) = (yyvsp[(2) - (3)].ptarrayvalue); } +#line 368 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.ptarrayvalue) = (yyvsp[-1].ptarrayvalue); } +#line 2305 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 73: - -/* Line 1806 of yacc.c */ -#line 363 "lwin_wkt_parse.y" - { (yyval.ptarrayvalue) = (yyvsp[(2) - (3)].ptarrayvalue); } +#line 371 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.ptarrayvalue) = (yyvsp[-1].ptarrayvalue); } +#line 2311 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 74: - -/* Line 1806 of yacc.c */ -#line 367 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(COMPOUNDTYPE, (yyvsp[(3) - (4)].geometryvalue), NULL); WKT_ERROR(); } +#line 375 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(COMPOUNDTYPE, (yyvsp[-1].geometryvalue), NULL); WKT_ERROR(); } +#line 2317 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 75: - -/* Line 1806 of yacc.c */ -#line 369 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(COMPOUNDTYPE, (yyvsp[(4) - (5)].geometryvalue), (yyvsp[(2) - (5)].stringvalue)); WKT_ERROR(); } +#line 377 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(COMPOUNDTYPE, (yyvsp[-1].geometryvalue), (yyvsp[-3].stringvalue)); WKT_ERROR(); } +#line 2323 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 76: - -/* Line 1806 of yacc.c */ -#line 371 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(COMPOUNDTYPE, NULL, (yyvsp[(2) - (3)].stringvalue)); WKT_ERROR(); } +#line 379 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(COMPOUNDTYPE, NULL, (yyvsp[-1].stringvalue)); WKT_ERROR(); } +#line 2329 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 77: - -/* Line 1806 of yacc.c */ -#line 373 "lwin_wkt_parse.y" +#line 381 "lwin_wkt_parse.y" /* yacc.c:1646 */ { (yyval.geometryvalue) = wkt_parser_collection_finalize(COMPOUNDTYPE, NULL, NULL); WKT_ERROR(); } +#line 2335 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 78: - -/* Line 1806 of yacc.c */ -#line 377 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_compound_add_geom((yyvsp[(1) - (3)].geometryvalue),(yyvsp[(3) - (3)].geometryvalue)); WKT_ERROR(); } +#line 385 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_compound_add_geom((yyvsp[-2].geometryvalue),(yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2341 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 79: - -/* Line 1806 of yacc.c */ -#line 379 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_compound_add_geom((yyvsp[(1) - (3)].geometryvalue),(yyvsp[(3) - (3)].geometryvalue)); WKT_ERROR(); } +#line 387 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_compound_add_geom((yyvsp[-2].geometryvalue),(yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2347 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 80: - -/* Line 1806 of yacc.c */ -#line 381 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_compound_add_geom((yyvsp[(1) - (3)].geometryvalue),(yyvsp[(3) - (3)].geometryvalue)); WKT_ERROR(); } +#line 389 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_compound_add_geom((yyvsp[-2].geometryvalue),(yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2353 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 81: - -/* Line 1806 of yacc.c */ -#line 383 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[(1) - (1)].geometryvalue)); WKT_ERROR(); } +#line 391 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2359 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 82: - -/* Line 1806 of yacc.c */ -#line 385 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[(1) - (1)].geometryvalue)); WKT_ERROR(); } +#line 393 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2365 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 83: - -/* Line 1806 of yacc.c */ -#line 387 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[(1) - (1)].geometryvalue)); WKT_ERROR(); } +#line 395 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2371 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 84: - -/* Line 1806 of yacc.c */ -#line 391 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTICURVETYPE, (yyvsp[(3) - (4)].geometryvalue), NULL); WKT_ERROR(); } +#line 399 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTICURVETYPE, (yyvsp[-1].geometryvalue), NULL); WKT_ERROR(); } +#line 2377 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 85: - -/* Line 1806 of yacc.c */ -#line 393 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTICURVETYPE, (yyvsp[(4) - (5)].geometryvalue), (yyvsp[(2) - (5)].stringvalue)); WKT_ERROR(); } +#line 401 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTICURVETYPE, (yyvsp[-1].geometryvalue), (yyvsp[-3].stringvalue)); WKT_ERROR(); } +#line 2383 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 86: - -/* Line 1806 of yacc.c */ -#line 395 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTICURVETYPE, NULL, (yyvsp[(2) - (3)].stringvalue)); WKT_ERROR(); } +#line 403 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTICURVETYPE, NULL, (yyvsp[-1].stringvalue)); WKT_ERROR(); } +#line 2389 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 87: - -/* Line 1806 of yacc.c */ -#line 397 "lwin_wkt_parse.y" +#line 405 "lwin_wkt_parse.y" /* yacc.c:1646 */ { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTICURVETYPE, NULL, NULL); WKT_ERROR(); } +#line 2395 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 88: - -/* Line 1806 of yacc.c */ -#line 401 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[(1) - (3)].geometryvalue),(yyvsp[(3) - (3)].geometryvalue)); WKT_ERROR(); } +#line 409 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[-2].geometryvalue),(yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2401 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 89: - -/* Line 1806 of yacc.c */ -#line 403 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[(1) - (3)].geometryvalue),(yyvsp[(3) - (3)].geometryvalue)); WKT_ERROR(); } +#line 411 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[-2].geometryvalue),(yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2407 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 90: - -/* Line 1806 of yacc.c */ -#line 405 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[(1) - (3)].geometryvalue),(yyvsp[(3) - (3)].geometryvalue)); WKT_ERROR(); } +#line 413 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[-2].geometryvalue),(yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2413 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 91: - -/* Line 1806 of yacc.c */ -#line 407 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[(1) - (3)].geometryvalue),(yyvsp[(3) - (3)].geometryvalue)); WKT_ERROR(); } +#line 415 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[-2].geometryvalue),(yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2419 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 92: - -/* Line 1806 of yacc.c */ -#line 409 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[(1) - (1)].geometryvalue)); WKT_ERROR(); } +#line 417 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2425 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 93: - -/* Line 1806 of yacc.c */ -#line 411 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[(1) - (1)].geometryvalue)); WKT_ERROR(); } +#line 419 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2431 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 94: - -/* Line 1806 of yacc.c */ -#line 413 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[(1) - (1)].geometryvalue)); WKT_ERROR(); } +#line 421 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2437 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 95: - -/* Line 1806 of yacc.c */ -#line 415 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[(1) - (1)].geometryvalue)); WKT_ERROR(); } +#line 423 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2443 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 96: - -/* Line 1806 of yacc.c */ -#line 419 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTILINETYPE, (yyvsp[(3) - (4)].geometryvalue), NULL); WKT_ERROR(); } +#line 427 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTILINETYPE, (yyvsp[-1].geometryvalue), NULL); WKT_ERROR(); } +#line 2449 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 97: - -/* Line 1806 of yacc.c */ -#line 421 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTILINETYPE, (yyvsp[(4) - (5)].geometryvalue), (yyvsp[(2) - (5)].stringvalue)); WKT_ERROR(); } +#line 429 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTILINETYPE, (yyvsp[-1].geometryvalue), (yyvsp[-3].stringvalue)); WKT_ERROR(); } +#line 2455 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 98: - -/* Line 1806 of yacc.c */ -#line 423 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTILINETYPE, NULL, (yyvsp[(2) - (3)].stringvalue)); WKT_ERROR(); } +#line 431 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTILINETYPE, NULL, (yyvsp[-1].stringvalue)); WKT_ERROR(); } +#line 2461 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 99: - -/* Line 1806 of yacc.c */ -#line 425 "lwin_wkt_parse.y" +#line 433 "lwin_wkt_parse.y" /* yacc.c:1646 */ { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTILINETYPE, NULL, NULL); WKT_ERROR(); } +#line 2467 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 100: - -/* Line 1806 of yacc.c */ -#line 429 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[(1) - (3)].geometryvalue),(yyvsp[(3) - (3)].geometryvalue)); WKT_ERROR(); } +#line 437 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[-2].geometryvalue),(yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2473 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 101: - -/* Line 1806 of yacc.c */ -#line 431 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[(1) - (1)].geometryvalue)); WKT_ERROR(); } +#line 439 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2479 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 102: - -/* Line 1806 of yacc.c */ -#line 435 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_circularstring_new((yyvsp[(3) - (4)].ptarrayvalue), NULL); WKT_ERROR(); } +#line 443 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_circularstring_new((yyvsp[-1].ptarrayvalue), NULL); WKT_ERROR(); } +#line 2485 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 103: - -/* Line 1806 of yacc.c */ -#line 437 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_circularstring_new((yyvsp[(4) - (5)].ptarrayvalue), (yyvsp[(2) - (5)].stringvalue)); WKT_ERROR(); } +#line 445 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_circularstring_new((yyvsp[-1].ptarrayvalue), (yyvsp[-3].stringvalue)); WKT_ERROR(); } +#line 2491 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 104: - -/* Line 1806 of yacc.c */ -#line 439 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_circularstring_new(NULL, (yyvsp[(2) - (3)].stringvalue)); WKT_ERROR(); } +#line 447 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_circularstring_new(NULL, (yyvsp[-1].stringvalue)); WKT_ERROR(); } +#line 2497 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 105: - -/* Line 1806 of yacc.c */ -#line 441 "lwin_wkt_parse.y" +#line 449 "lwin_wkt_parse.y" /* yacc.c:1646 */ { (yyval.geometryvalue) = wkt_parser_circularstring_new(NULL, NULL); WKT_ERROR(); } +#line 2503 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 106: - -/* Line 1806 of yacc.c */ -#line 445 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_linestring_new((yyvsp[(3) - (4)].ptarrayvalue), NULL); WKT_ERROR(); } +#line 453 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_linestring_new((yyvsp[-1].ptarrayvalue), NULL); WKT_ERROR(); } +#line 2509 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 107: - -/* Line 1806 of yacc.c */ -#line 447 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_linestring_new((yyvsp[(4) - (5)].ptarrayvalue), (yyvsp[(2) - (5)].stringvalue)); WKT_ERROR(); } +#line 455 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_linestring_new((yyvsp[-1].ptarrayvalue), (yyvsp[-3].stringvalue)); WKT_ERROR(); } +#line 2515 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 108: - -/* Line 1806 of yacc.c */ -#line 449 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_linestring_new(NULL, (yyvsp[(2) - (3)].stringvalue)); WKT_ERROR(); } +#line 457 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_linestring_new(NULL, (yyvsp[-1].stringvalue)); WKT_ERROR(); } +#line 2521 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 109: - -/* Line 1806 of yacc.c */ -#line 451 "lwin_wkt_parse.y" +#line 459 "lwin_wkt_parse.y" /* yacc.c:1646 */ { (yyval.geometryvalue) = wkt_parser_linestring_new(NULL, NULL); WKT_ERROR(); } +#line 2527 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 110: - -/* Line 1806 of yacc.c */ -#line 455 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_linestring_new((yyvsp[(2) - (3)].ptarrayvalue), NULL); WKT_ERROR(); } +#line 463 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_linestring_new((yyvsp[-1].ptarrayvalue), NULL); WKT_ERROR(); } +#line 2533 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 111: - -/* Line 1806 of yacc.c */ -#line 457 "lwin_wkt_parse.y" +#line 465 "lwin_wkt_parse.y" /* yacc.c:1646 */ { (yyval.geometryvalue) = wkt_parser_linestring_new(NULL, NULL); WKT_ERROR(); } +#line 2539 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 112: - -/* Line 1806 of yacc.c */ -#line 461 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[(1) - (3)].geometryvalue),(yyvsp[(3) - (3)].geometryvalue)); WKT_ERROR(); } +#line 469 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[-2].geometryvalue),(yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2545 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 113: - -/* Line 1806 of yacc.c */ -#line 463 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[(1) - (1)].geometryvalue)); WKT_ERROR(); } +#line 471 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2551 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 114: - -/* Line 1806 of yacc.c */ -#line 467 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_triangle_new((yyvsp[(4) - (6)].ptarrayvalue), NULL); WKT_ERROR(); } +#line 475 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_triangle_new((yyvsp[-2].ptarrayvalue), NULL); WKT_ERROR(); } +#line 2557 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 115: - -/* Line 1806 of yacc.c */ -#line 469 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_triangle_new((yyvsp[(5) - (7)].ptarrayvalue), (yyvsp[(2) - (7)].stringvalue)); WKT_ERROR(); } +#line 477 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_triangle_new((yyvsp[-2].ptarrayvalue), (yyvsp[-5].stringvalue)); WKT_ERROR(); } +#line 2563 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 116: - -/* Line 1806 of yacc.c */ -#line 471 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_triangle_new(NULL, (yyvsp[(2) - (3)].stringvalue)); WKT_ERROR(); } +#line 479 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_triangle_new(NULL, (yyvsp[-1].stringvalue)); WKT_ERROR(); } +#line 2569 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 117: - -/* Line 1806 of yacc.c */ -#line 473 "lwin_wkt_parse.y" +#line 481 "lwin_wkt_parse.y" /* yacc.c:1646 */ { (yyval.geometryvalue) = wkt_parser_triangle_new(NULL, NULL); WKT_ERROR(); } +#line 2575 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 118: - -/* Line 1806 of yacc.c */ -#line 477 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_triangle_new((yyvsp[(3) - (5)].ptarrayvalue), NULL); WKT_ERROR(); } +#line 485 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_triangle_new((yyvsp[-2].ptarrayvalue), NULL); WKT_ERROR(); } +#line 2581 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 119: - -/* Line 1806 of yacc.c */ -#line 481 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTIPOINTTYPE, (yyvsp[(3) - (4)].geometryvalue), NULL); WKT_ERROR(); } +#line 489 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTIPOINTTYPE, (yyvsp[-1].geometryvalue), NULL); WKT_ERROR(); } +#line 2587 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 120: - -/* Line 1806 of yacc.c */ -#line 483 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTIPOINTTYPE, (yyvsp[(4) - (5)].geometryvalue), (yyvsp[(2) - (5)].stringvalue)); WKT_ERROR(); } +#line 491 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTIPOINTTYPE, (yyvsp[-1].geometryvalue), (yyvsp[-3].stringvalue)); WKT_ERROR(); } +#line 2593 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 121: - -/* Line 1806 of yacc.c */ -#line 485 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTIPOINTTYPE, NULL, (yyvsp[(2) - (3)].stringvalue)); WKT_ERROR(); } +#line 493 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTIPOINTTYPE, NULL, (yyvsp[-1].stringvalue)); WKT_ERROR(); } +#line 2599 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 122: - -/* Line 1806 of yacc.c */ -#line 487 "lwin_wkt_parse.y" +#line 495 "lwin_wkt_parse.y" /* yacc.c:1646 */ { (yyval.geometryvalue) = wkt_parser_collection_finalize(MULTIPOINTTYPE, NULL, NULL); WKT_ERROR(); } +#line 2605 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 123: - -/* Line 1806 of yacc.c */ -#line 491 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[(1) - (3)].geometryvalue),(yyvsp[(3) - (3)].geometryvalue)); WKT_ERROR(); } +#line 499 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_add_geom((yyvsp[-2].geometryvalue),(yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2611 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 124: - -/* Line 1806 of yacc.c */ -#line 493 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[(1) - (1)].geometryvalue)); WKT_ERROR(); } +#line 501 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_collection_new((yyvsp[0].geometryvalue)); WKT_ERROR(); } +#line 2617 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 125: - -/* Line 1806 of yacc.c */ -#line 497 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_point_new(wkt_parser_ptarray_new((yyvsp[(1) - (1)].coordinatevalue)),NULL); WKT_ERROR(); } +#line 505 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_point_new(wkt_parser_ptarray_new((yyvsp[0].coordinatevalue)),NULL); WKT_ERROR(); } +#line 2623 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 126: - -/* Line 1806 of yacc.c */ -#line 499 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_point_new(wkt_parser_ptarray_new((yyvsp[(2) - (3)].coordinatevalue)),NULL); WKT_ERROR(); } +#line 507 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_point_new(wkt_parser_ptarray_new((yyvsp[-1].coordinatevalue)),NULL); WKT_ERROR(); } +#line 2629 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 127: - -/* Line 1806 of yacc.c */ -#line 501 "lwin_wkt_parse.y" +#line 509 "lwin_wkt_parse.y" /* yacc.c:1646 */ { (yyval.geometryvalue) = wkt_parser_point_new(NULL, NULL); WKT_ERROR(); } +#line 2635 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 128: - -/* Line 1806 of yacc.c */ -#line 505 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_point_new((yyvsp[(3) - (4)].ptarrayvalue), NULL); WKT_ERROR(); } +#line 513 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_point_new((yyvsp[-1].ptarrayvalue), NULL); WKT_ERROR(); } +#line 2641 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 129: - -/* Line 1806 of yacc.c */ -#line 507 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_point_new((yyvsp[(4) - (5)].ptarrayvalue), (yyvsp[(2) - (5)].stringvalue)); WKT_ERROR(); } +#line 515 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_point_new((yyvsp[-1].ptarrayvalue), (yyvsp[-3].stringvalue)); WKT_ERROR(); } +#line 2647 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 130: - -/* Line 1806 of yacc.c */ -#line 509 "lwin_wkt_parse.y" - { (yyval.geometryvalue) = wkt_parser_point_new(NULL, (yyvsp[(2) - (3)].stringvalue)); WKT_ERROR(); } +#line 517 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.geometryvalue) = wkt_parser_point_new(NULL, (yyvsp[-1].stringvalue)); WKT_ERROR(); } +#line 2653 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 131: - -/* Line 1806 of yacc.c */ -#line 511 "lwin_wkt_parse.y" +#line 519 "lwin_wkt_parse.y" /* yacc.c:1646 */ { (yyval.geometryvalue) = wkt_parser_point_new(NULL,NULL); WKT_ERROR(); } +#line 2659 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 132: - -/* Line 1806 of yacc.c */ -#line 515 "lwin_wkt_parse.y" - { (yyval.ptarrayvalue) = wkt_parser_ptarray_add_coord((yyvsp[(1) - (3)].ptarrayvalue), (yyvsp[(3) - (3)].coordinatevalue)); WKT_ERROR(); } +#line 523 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.ptarrayvalue) = wkt_parser_ptarray_add_coord((yyvsp[-2].ptarrayvalue), (yyvsp[0].coordinatevalue)); WKT_ERROR(); } +#line 2665 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 133: - -/* Line 1806 of yacc.c */ -#line 517 "lwin_wkt_parse.y" - { (yyval.ptarrayvalue) = wkt_parser_ptarray_new((yyvsp[(1) - (1)].coordinatevalue)); WKT_ERROR(); } +#line 525 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.ptarrayvalue) = wkt_parser_ptarray_new((yyvsp[0].coordinatevalue)); WKT_ERROR(); } +#line 2671 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 134: - -/* Line 1806 of yacc.c */ -#line 521 "lwin_wkt_parse.y" - { (yyval.coordinatevalue) = wkt_parser_coord_2((yyvsp[(1) - (2)].doublevalue), (yyvsp[(2) - (2)].doublevalue)); WKT_ERROR(); } +#line 529 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.coordinatevalue) = wkt_parser_coord_2((yyvsp[-1].doublevalue), (yyvsp[0].doublevalue)); WKT_ERROR(); } +#line 2677 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 135: - -/* Line 1806 of yacc.c */ -#line 523 "lwin_wkt_parse.y" - { (yyval.coordinatevalue) = wkt_parser_coord_3((yyvsp[(1) - (3)].doublevalue), (yyvsp[(2) - (3)].doublevalue), (yyvsp[(3) - (3)].doublevalue)); WKT_ERROR(); } +#line 531 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.coordinatevalue) = wkt_parser_coord_3((yyvsp[-2].doublevalue), (yyvsp[-1].doublevalue), (yyvsp[0].doublevalue)); WKT_ERROR(); } +#line 2683 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; case 136: - -/* Line 1806 of yacc.c */ -#line 525 "lwin_wkt_parse.y" - { (yyval.coordinatevalue) = wkt_parser_coord_4((yyvsp[(1) - (4)].doublevalue), (yyvsp[(2) - (4)].doublevalue), (yyvsp[(3) - (4)].doublevalue), (yyvsp[(4) - (4)].doublevalue)); WKT_ERROR(); } +#line 533 "lwin_wkt_parse.y" /* yacc.c:1646 */ + { (yyval.coordinatevalue) = wkt_parser_coord_4((yyvsp[-3].doublevalue), (yyvsp[-2].doublevalue), (yyvsp[-1].doublevalue), (yyvsp[0].doublevalue)); WKT_ERROR(); } +#line 2689 "lwin_wkt_parse.c" /* yacc.c:1646 */ break; - -/* Line 1806 of yacc.c */ -#line 3081 "lwin_wkt_parse.c" +#line 2693 "lwin_wkt_parse.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -3100,7 +2712,7 @@ yyreduce: *++yyvsp = yyval; *++yylsp = yyloc; - /* Now `shift' the result of the reduction. Determine what state + /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ @@ -3115,9 +2727,9 @@ yyreduce: goto yynewstate; -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ +/*--------------------------------------. +| yyerrlab -- here on detecting error. | +`--------------------------------------*/ yyerrlab: /* Make sure we have latest lookahead translation. See comments at user semantic actions for why this is necessary. */ @@ -3168,20 +2780,20 @@ yyerrlab: if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an - error, discard it. */ + error, discard it. */ if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } else - { - yydestruct ("Error: discarding", - yytoken, &yylval, &yylloc); - yychar = YYEMPTY; - } + { + yydestruct ("Error: discarding", + yytoken, &yylval, &yylloc); + yychar = YYEMPTY; + } } /* Else will try to reuse lookahead token after shifting the error @@ -3201,7 +2813,7 @@ yyerrorlab: goto yyerrorlab; yyerror_range[1] = yylsp[1-yylen]; - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ YYPOPSTACK (yylen); yylen = 0; @@ -3214,35 +2826,37 @@ yyerrorlab: | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ + yyerrstatus = 3; /* Each real token shifted decrements this. */ for (;;) { yyn = yypact[yystate]; if (!yypact_value_is_default (yyn)) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } /* Pop the current state because it cannot handle the error token. */ if (yyssp == yyss) - YYABORT; + YYABORT; yyerror_range[1] = *yylsp; yydestruct ("Error: popping", - yystos[yystate], yyvsp, yylsp); + yystos[yystate], yyvsp, yylsp); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END yyerror_range[2] = yylloc; /* Using YYLLOC is tempting, but would change the location of @@ -3271,7 +2885,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#if !defined(yyoverflow) || YYERROR_VERBOSE +#if !defined yyoverflow || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -3290,14 +2904,14 @@ yyreturn: yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval, &yylloc); } - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); YY_STACK_PRINT (yyss, yyssp); while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp, yylsp); + yystos[*yyssp], yyvsp, yylsp); YYPOPSTACK (1); } #ifndef yyoverflow @@ -3308,14 +2922,8 @@ yyreturn: if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); #endif - /* Make sure YYID is used. */ - return YYID (yyresult); + return yyresult; } - - - -/* Line 2067 of yacc.c */ -#line 527 "lwin_wkt_parse.y" - +#line 535 "lwin_wkt_parse.y" /* yacc.c:1906 */ diff --git a/liblwgeom/lwin_wkt_parse.h b/liblwgeom/lwin_wkt_parse.h index d294fb81c..30d9a8d93 100644 --- a/liblwgeom/lwin_wkt_parse.h +++ b/liblwgeom/lwin_wkt_parse.h @@ -1,19 +1,19 @@ -/* A Bison parser, made by GNU Bison 2.5. */ +/* A Bison parser, made by GNU Bison 3.0.2. */ /* Bison interface for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. - + + Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. + 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 Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -26,41 +26,49 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ +#ifndef YY_WKT_YY_LWIN_WKT_PARSE_H_INCLUDED +# define YY_WKT_YY_LWIN_WKT_PARSE_H_INCLUDED +/* Debug traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif +#if YYDEBUG +extern int wkt_yydebug; +#endif -/* Tokens. */ +/* Token type. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - POINT_TOK = 258, - LINESTRING_TOK = 259, - POLYGON_TOK = 260, - MPOINT_TOK = 261, - MLINESTRING_TOK = 262, - MPOLYGON_TOK = 263, - MSURFACE_TOK = 264, - MCURVE_TOK = 265, - CURVEPOLYGON_TOK = 266, - COMPOUNDCURVE_TOK = 267, - CIRCULARSTRING_TOK = 268, - COLLECTION_TOK = 269, - RBRACKET_TOK = 270, - LBRACKET_TOK = 271, - COMMA_TOK = 272, - EMPTY_TOK = 273, - SEMICOLON_TOK = 274, - TRIANGLE_TOK = 275, - TIN_TOK = 276, - POLYHEDRALSURFACE_TOK = 277, - DOUBLE_TOK = 278, - DIMENSIONALITY_TOK = 279, - SRID_TOK = 280 - }; + enum yytokentype + { + POINT_TOK = 258, + LINESTRING_TOK = 259, + POLYGON_TOK = 260, + MPOINT_TOK = 261, + MLINESTRING_TOK = 262, + MPOLYGON_TOK = 263, + MSURFACE_TOK = 264, + MCURVE_TOK = 265, + CURVEPOLYGON_TOK = 266, + COMPOUNDCURVE_TOK = 267, + CIRCULARSTRING_TOK = 268, + COLLECTION_TOK = 269, + RBRACKET_TOK = 270, + LBRACKET_TOK = 271, + COMMA_TOK = 272, + EMPTY_TOK = 273, + SEMICOLON_TOK = 274, + TRIANGLE_TOK = 275, + TIN_TOK = 276, + POLYHEDRALSURFACE_TOK = 277, + DOUBLE_TOK = 278, + DIMENSIONALITY_TOK = 279, + SRID_TOK = 280 + }; #endif /* Tokens. */ #define POINT_TOK 258 @@ -87,15 +95,12 @@ #define DIMENSIONALITY_TOK 279 #define SRID_TOK 280 - - - +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE +typedef union YYSTYPE YYSTYPE; +union YYSTYPE { - -/* Line 2068 of yacc.c */ -#line 98 "lwin_wkt_parse.y" +#line 106 "lwin_wkt_parse.y" /* yacc.c:1909 */ int integervalue; double doublevalue; @@ -104,30 +109,29 @@ typedef union YYSTYPE POINT coordinatevalue; POINTARRAY *ptarrayvalue; - - -/* Line 2068 of yacc.c */ -#line 111 "lwin_wkt_parse.h" -} YYSTYPE; +#line 113 "lwin_wkt_parse.h" /* yacc.c:1909 */ +}; # define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 #endif -extern YYSTYPE wkt_yylval; - +/* Location type. */ #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED -typedef struct YYLTYPE +typedef struct YYLTYPE YYLTYPE; +struct YYLTYPE { int first_line; int first_column; int last_line; int last_column; -} YYLTYPE; -# define yyltype YYLTYPE /* obsolescent; will be withdrawn */ +}; # define YYLTYPE_IS_DECLARED 1 # define YYLTYPE_IS_TRIVIAL 1 #endif + +extern YYSTYPE wkt_yylval; extern YYLTYPE wkt_yylloc; +int wkt_yyparse (void); +#endif /* !YY_WKT_YY_LWIN_WKT_PARSE_H_INCLUDED */