[Commits] 38478e17787: MDEV-12273 Remove dict_table_t::does_not_fit_in_memory

marko.makela at mariadb.com marko.makela at mariadb.com
Wed Mar 15 15:59:04 EET 2017


revision-id: 38478e17787ad0a832a159d23218117379a141df (mariadb-10.2.4-63-g38478e17787)
parent(s): 122d0701f7b933145d068d66fe72f6959b9afb14
author: Marko Mäkelä
committer: Marko Mäkelä
timestamp: 2017-03-15 15:56:17 +0200
message:

MDEV-12273 Remove dict_table_t::does_not_fit_in_memory

In the InnoDB internal SQL parser, there is the keyword
DOES_NOT_FIT_IN_MEMORY that is never specified in any CREATE TABLE
statement that is passed to the InnoDB SQL parser
(que_eval_sql() or pars_sql() or yyparse()). If this keyword were
ever present, it would set the flag dict_table_t::does_not_fit_in_memory
which is only present in debug builds.

Let us remove all traces of this.

Also, fix storage/innobase/pars/make_flex.sh so that no the generated
file storage/innobase/pars/lexyy.cc works as is.

FIXME: Always generate the InnoDB Bison files at build time, similar
to how sql/sql_yacc.yy is handled. (This would still leave the
generated scanner files, unless we want to add a build-time dependency
for Flex.)

---
 storage/innobase/btr/btr0sea.cc      |    6 -
 storage/innobase/include/dict0mem.h  |    9 -
 storage/innobase/include/pars0grm.h  |  353 ++--
 storage/innobase/include/pars0pars.h |   13 +-
 storage/innobase/pars/lexyy.cc       | 1701 +++++++++---------
 storage/innobase/pars/make_flex.sh   |    8 +-
 storage/innobase/pars/pars0grm.cc    | 3190 ++++++++++++++++------------------
 storage/innobase/pars/pars0grm.y     |   17 +-
 storage/innobase/pars/pars0lex.l     |    7 +-
 storage/innobase/pars/pars0pars.cc   |   18 +-
 10 files changed, 2514 insertions(+), 2808 deletions(-)

diff --git a/storage/innobase/btr/btr0sea.cc b/storage/innobase/btr/btr0sea.cc
index 86827fabdd4..720b84aceef 100644
--- a/storage/innobase/btr/btr0sea.cc
+++ b/storage/innobase/btr/btr0sea.cc
@@ -568,12 +568,6 @@ btr_search_update_block_hash_info(
 		block->left_side = info->left_side;
 	}
 
-#ifdef UNIV_DEBUG
-	if (cursor->index->table->does_not_fit_in_memory) {
-		block->n_hash_helps = 0;
-	}
-#endif /* UNIV_DEBUG */
-
 	if ((block->n_hash_helps > page_get_n_recs(block->frame)
 	     / BTR_SEARCH_PAGE_BUILD_LIMIT)
 	    && (info->n_hash_potential >= BTR_SEARCH_BUILD_LIMIT)) {
diff --git a/storage/innobase/include/dict0mem.h b/storage/innobase/include/dict0mem.h
index ff28add8ca4..0faaac4d206 100644
--- a/storage/innobase/include/dict0mem.h
+++ b/storage/innobase/include/dict0mem.h
@@ -1532,15 +1532,6 @@ struct dict_table_t {
 	/*!< set of foreign key constraints which refer to this table */
 	dict_foreign_set			referenced_set;
 
-#ifdef UNIV_DEBUG
-	/** This field is used to specify in simulations tables which are so
-	big that disk should be accessed. Disk access is simulated by putting
-	the thread to sleep for a while. NOTE that this flag is not stored to
-	the data dictionary on disk, and the database will forget about value
-	TRUE if it has to reload the table definition from disk. */
-	ibool					does_not_fit_in_memory;
-#endif /* UNIV_DEBUG */
-
 	/** TRUE if the maximum length of a single row exceeds BIG_ROW_SIZE.
 	Initialized in dict_table_add_to_cache(). */
 	unsigned				big_rows:1;
diff --git a/storage/innobase/include/pars0grm.h b/storage/innobase/include/pars0grm.h
index 8e725fe9545..788090a2e74 100644
--- a/storage/innobase/include/pars0grm.h
+++ b/storage/innobase/include/pars0grm.h
@@ -1,14 +1,13 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
-/* Skeleton interface for Bison's Yacc-like parsers in C
+/* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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 2, or (at your option)
-   any later version.
+   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
@@ -16,9 +15,7 @@
    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, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -33,229 +30,135 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-/* Tokens.  */
+#ifndef YY_YY_PARS0GRM_TAB_H_INCLUDED
+# define YY_YY_PARS0GRM_TAB_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
+
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     PARS_INT_LIT = 258,
-     PARS_FLOAT_LIT = 259,
-     PARS_STR_LIT = 260,
-     PARS_FIXBINARY_LIT = 261,
-     PARS_BLOB_LIT = 262,
-     PARS_NULL_LIT = 263,
-     PARS_ID_TOKEN = 264,
-     PARS_AND_TOKEN = 265,
-     PARS_OR_TOKEN = 266,
-     PARS_NOT_TOKEN = 267,
-     PARS_GE_TOKEN = 268,
-     PARS_LE_TOKEN = 269,
-     PARS_NE_TOKEN = 270,
-     PARS_PROCEDURE_TOKEN = 271,
-     PARS_IN_TOKEN = 272,
-     PARS_OUT_TOKEN = 273,
-     PARS_BINARY_TOKEN = 274,
-     PARS_BLOB_TOKEN = 275,
-     PARS_INT_TOKEN = 276,
-     PARS_INTEGER_TOKEN = 277,
-     PARS_FLOAT_TOKEN = 278,
-     PARS_CHAR_TOKEN = 279,
-     PARS_IS_TOKEN = 280,
-     PARS_BEGIN_TOKEN = 281,
-     PARS_END_TOKEN = 282,
-     PARS_IF_TOKEN = 283,
-     PARS_THEN_TOKEN = 284,
-     PARS_ELSE_TOKEN = 285,
-     PARS_ELSIF_TOKEN = 286,
-     PARS_LOOP_TOKEN = 287,
-     PARS_WHILE_TOKEN = 288,
-     PARS_RETURN_TOKEN = 289,
-     PARS_SELECT_TOKEN = 290,
-     PARS_SUM_TOKEN = 291,
-     PARS_COUNT_TOKEN = 292,
-     PARS_DISTINCT_TOKEN = 293,
-     PARS_FROM_TOKEN = 294,
-     PARS_WHERE_TOKEN = 295,
-     PARS_FOR_TOKEN = 296,
-     PARS_DDOT_TOKEN = 297,
-     PARS_READ_TOKEN = 298,
-     PARS_ORDER_TOKEN = 299,
-     PARS_BY_TOKEN = 300,
-     PARS_ASC_TOKEN = 301,
-     PARS_DESC_TOKEN = 302,
-     PARS_INSERT_TOKEN = 303,
-     PARS_INTO_TOKEN = 304,
-     PARS_VALUES_TOKEN = 305,
-     PARS_UPDATE_TOKEN = 306,
-     PARS_SET_TOKEN = 307,
-     PARS_DELETE_TOKEN = 308,
-     PARS_CURRENT_TOKEN = 309,
-     PARS_OF_TOKEN = 310,
-     PARS_CREATE_TOKEN = 311,
-     PARS_TABLE_TOKEN = 312,
-     PARS_INDEX_TOKEN = 313,
-     PARS_UNIQUE_TOKEN = 314,
-     PARS_CLUSTERED_TOKEN = 315,
-     PARS_DOES_NOT_FIT_IN_MEM_TOKEN = 316,
-     PARS_ON_TOKEN = 317,
-     PARS_ASSIGN_TOKEN = 318,
-     PARS_DECLARE_TOKEN = 319,
-     PARS_CURSOR_TOKEN = 320,
-     PARS_SQL_TOKEN = 321,
-     PARS_OPEN_TOKEN = 322,
-     PARS_FETCH_TOKEN = 323,
-     PARS_CLOSE_TOKEN = 324,
-     PARS_NOTFOUND_TOKEN = 325,
-     PARS_TO_CHAR_TOKEN = 326,
-     PARS_TO_NUMBER_TOKEN = 327,
-     PARS_TO_BINARY_TOKEN = 328,
-     PARS_BINARY_TO_NUMBER_TOKEN = 329,
-     PARS_SUBSTR_TOKEN = 330,
-     PARS_REPLSTR_TOKEN = 331,
-     PARS_CONCAT_TOKEN = 332,
-     PARS_INSTR_TOKEN = 333,
-     PARS_LENGTH_TOKEN = 334,
-     PARS_SYSDATE_TOKEN = 335,
-     PARS_PRINTF_TOKEN = 336,
-     PARS_ASSERT_TOKEN = 337,
-     PARS_RND_TOKEN = 338,
-     PARS_RND_STR_TOKEN = 339,
-     PARS_ROW_PRINTF_TOKEN = 340,
-     PARS_COMMIT_TOKEN = 341,
-     PARS_ROLLBACK_TOKEN = 342,
-     PARS_WORK_TOKEN = 343,
-     PARS_UNSIGNED_TOKEN = 344,
-     PARS_EXIT_TOKEN = 345,
-     PARS_FUNCTION_TOKEN = 346,
-     PARS_LOCK_TOKEN = 347,
-     PARS_SHARE_TOKEN = 348,
-     PARS_MODE_TOKEN = 349,
-     PARS_LIKE_TOKEN = 350,
-     PARS_LIKE_TOKEN_EXACT = 351,
-     PARS_LIKE_TOKEN_PREFIX = 352,
-     PARS_LIKE_TOKEN_SUFFIX = 353,
-     PARS_LIKE_TOKEN_SUBSTR = 354,
-     PARS_TABLE_NAME_TOKEN = 355,
-     PARS_COMPACT_TOKEN = 356,
-     PARS_BLOCK_SIZE_TOKEN = 357,
-     PARS_BIGINT_TOKEN = 358,
-     NEG = 359
-   };
+  enum yytokentype
+  {
+    PARS_INT_LIT = 258,
+    PARS_FLOAT_LIT = 259,
+    PARS_STR_LIT = 260,
+    PARS_FIXBINARY_LIT = 261,
+    PARS_BLOB_LIT = 262,
+    PARS_NULL_LIT = 263,
+    PARS_ID_TOKEN = 264,
+    PARS_AND_TOKEN = 265,
+    PARS_OR_TOKEN = 266,
+    PARS_NOT_TOKEN = 267,
+    PARS_GE_TOKEN = 268,
+    PARS_LE_TOKEN = 269,
+    PARS_NE_TOKEN = 270,
+    PARS_PROCEDURE_TOKEN = 271,
+    PARS_IN_TOKEN = 272,
+    PARS_OUT_TOKEN = 273,
+    PARS_BINARY_TOKEN = 274,
+    PARS_BLOB_TOKEN = 275,
+    PARS_INT_TOKEN = 276,
+    PARS_INTEGER_TOKEN = 277,
+    PARS_FLOAT_TOKEN = 278,
+    PARS_CHAR_TOKEN = 279,
+    PARS_IS_TOKEN = 280,
+    PARS_BEGIN_TOKEN = 281,
+    PARS_END_TOKEN = 282,
+    PARS_IF_TOKEN = 283,
+    PARS_THEN_TOKEN = 284,
+    PARS_ELSE_TOKEN = 285,
+    PARS_ELSIF_TOKEN = 286,
+    PARS_LOOP_TOKEN = 287,
+    PARS_WHILE_TOKEN = 288,
+    PARS_RETURN_TOKEN = 289,
+    PARS_SELECT_TOKEN = 290,
+    PARS_SUM_TOKEN = 291,
+    PARS_COUNT_TOKEN = 292,
+    PARS_DISTINCT_TOKEN = 293,
+    PARS_FROM_TOKEN = 294,
+    PARS_WHERE_TOKEN = 295,
+    PARS_FOR_TOKEN = 296,
+    PARS_DDOT_TOKEN = 297,
+    PARS_READ_TOKEN = 298,
+    PARS_ORDER_TOKEN = 299,
+    PARS_BY_TOKEN = 300,
+    PARS_ASC_TOKEN = 301,
+    PARS_DESC_TOKEN = 302,
+    PARS_INSERT_TOKEN = 303,
+    PARS_INTO_TOKEN = 304,
+    PARS_VALUES_TOKEN = 305,
+    PARS_UPDATE_TOKEN = 306,
+    PARS_SET_TOKEN = 307,
+    PARS_DELETE_TOKEN = 308,
+    PARS_CURRENT_TOKEN = 309,
+    PARS_OF_TOKEN = 310,
+    PARS_CREATE_TOKEN = 311,
+    PARS_TABLE_TOKEN = 312,
+    PARS_INDEX_TOKEN = 313,
+    PARS_UNIQUE_TOKEN = 314,
+    PARS_CLUSTERED_TOKEN = 315,
+    PARS_ON_TOKEN = 316,
+    PARS_ASSIGN_TOKEN = 317,
+    PARS_DECLARE_TOKEN = 318,
+    PARS_CURSOR_TOKEN = 319,
+    PARS_SQL_TOKEN = 320,
+    PARS_OPEN_TOKEN = 321,
+    PARS_FETCH_TOKEN = 322,
+    PARS_CLOSE_TOKEN = 323,
+    PARS_NOTFOUND_TOKEN = 324,
+    PARS_TO_CHAR_TOKEN = 325,
+    PARS_TO_NUMBER_TOKEN = 326,
+    PARS_TO_BINARY_TOKEN = 327,
+    PARS_BINARY_TO_NUMBER_TOKEN = 328,
+    PARS_SUBSTR_TOKEN = 329,
+    PARS_REPLSTR_TOKEN = 330,
+    PARS_CONCAT_TOKEN = 331,
+    PARS_INSTR_TOKEN = 332,
+    PARS_LENGTH_TOKEN = 333,
+    PARS_SYSDATE_TOKEN = 334,
+    PARS_PRINTF_TOKEN = 335,
+    PARS_ASSERT_TOKEN = 336,
+    PARS_RND_TOKEN = 337,
+    PARS_RND_STR_TOKEN = 338,
+    PARS_ROW_PRINTF_TOKEN = 339,
+    PARS_COMMIT_TOKEN = 340,
+    PARS_ROLLBACK_TOKEN = 341,
+    PARS_WORK_TOKEN = 342,
+    PARS_UNSIGNED_TOKEN = 343,
+    PARS_EXIT_TOKEN = 344,
+    PARS_FUNCTION_TOKEN = 345,
+    PARS_LOCK_TOKEN = 346,
+    PARS_SHARE_TOKEN = 347,
+    PARS_MODE_TOKEN = 348,
+    PARS_LIKE_TOKEN = 349,
+    PARS_LIKE_TOKEN_EXACT = 350,
+    PARS_LIKE_TOKEN_PREFIX = 351,
+    PARS_LIKE_TOKEN_SUFFIX = 352,
+    PARS_LIKE_TOKEN_SUBSTR = 353,
+    PARS_TABLE_NAME_TOKEN = 354,
+    PARS_COMPACT_TOKEN = 355,
+    PARS_BLOCK_SIZE_TOKEN = 356,
+    PARS_BIGINT_TOKEN = 357,
+    NEG = 358
+  };
 #endif
-/* Tokens.  */
-#define PARS_INT_LIT 258
-#define PARS_FLOAT_LIT 259
-#define PARS_STR_LIT 260
-#define PARS_FIXBINARY_LIT 261
-#define PARS_BLOB_LIT 262
-#define PARS_NULL_LIT 263
-#define PARS_ID_TOKEN 264
-#define PARS_AND_TOKEN 265
-#define PARS_OR_TOKEN 266
-#define PARS_NOT_TOKEN 267
-#define PARS_GE_TOKEN 268
-#define PARS_LE_TOKEN 269
-#define PARS_NE_TOKEN 270
-#define PARS_PROCEDURE_TOKEN 271
-#define PARS_IN_TOKEN 272
-#define PARS_OUT_TOKEN 273
-#define PARS_BINARY_TOKEN 274
-#define PARS_BLOB_TOKEN 275
-#define PARS_INT_TOKEN 276
-#define PARS_INTEGER_TOKEN 277
-#define PARS_FLOAT_TOKEN 278
-#define PARS_CHAR_TOKEN 279
-#define PARS_IS_TOKEN 280
-#define PARS_BEGIN_TOKEN 281
-#define PARS_END_TOKEN 282
-#define PARS_IF_TOKEN 283
-#define PARS_THEN_TOKEN 284
-#define PARS_ELSE_TOKEN 285
-#define PARS_ELSIF_TOKEN 286
-#define PARS_LOOP_TOKEN 287
-#define PARS_WHILE_TOKEN 288
-#define PARS_RETURN_TOKEN 289
-#define PARS_SELECT_TOKEN 290
-#define PARS_SUM_TOKEN 291
-#define PARS_COUNT_TOKEN 292
-#define PARS_DISTINCT_TOKEN 293
-#define PARS_FROM_TOKEN 294
-#define PARS_WHERE_TOKEN 295
-#define PARS_FOR_TOKEN 296
-#define PARS_DDOT_TOKEN 297
-#define PARS_READ_TOKEN 298
-#define PARS_ORDER_TOKEN 299
-#define PARS_BY_TOKEN 300
-#define PARS_ASC_TOKEN 301
-#define PARS_DESC_TOKEN 302
-#define PARS_INSERT_TOKEN 303
-#define PARS_INTO_TOKEN 304
-#define PARS_VALUES_TOKEN 305
-#define PARS_UPDATE_TOKEN 306
-#define PARS_SET_TOKEN 307
-#define PARS_DELETE_TOKEN 308
-#define PARS_CURRENT_TOKEN 309
-#define PARS_OF_TOKEN 310
-#define PARS_CREATE_TOKEN 311
-#define PARS_TABLE_TOKEN 312
-#define PARS_INDEX_TOKEN 313
-#define PARS_UNIQUE_TOKEN 314
-#define PARS_CLUSTERED_TOKEN 315
-#define PARS_DOES_NOT_FIT_IN_MEM_TOKEN 316
-#define PARS_ON_TOKEN 317
-#define PARS_ASSIGN_TOKEN 318
-#define PARS_DECLARE_TOKEN 319
-#define PARS_CURSOR_TOKEN 320
-#define PARS_SQL_TOKEN 321
-#define PARS_OPEN_TOKEN 322
-#define PARS_FETCH_TOKEN 323
-#define PARS_CLOSE_TOKEN 324
-#define PARS_NOTFOUND_TOKEN 325
-#define PARS_TO_CHAR_TOKEN 326
-#define PARS_TO_NUMBER_TOKEN 327
-#define PARS_TO_BINARY_TOKEN 328
-#define PARS_BINARY_TO_NUMBER_TOKEN 329
-#define PARS_SUBSTR_TOKEN 330
-#define PARS_REPLSTR_TOKEN 331
-#define PARS_CONCAT_TOKEN 332
-#define PARS_INSTR_TOKEN 333
-#define PARS_LENGTH_TOKEN 334
-#define PARS_SYSDATE_TOKEN 335
-#define PARS_PRINTF_TOKEN 336
-#define PARS_ASSERT_TOKEN 337
-#define PARS_RND_TOKEN 338
-#define PARS_RND_STR_TOKEN 339
-#define PARS_ROW_PRINTF_TOKEN 340
-#define PARS_COMMIT_TOKEN 341
-#define PARS_ROLLBACK_TOKEN 342
-#define PARS_WORK_TOKEN 343
-#define PARS_UNSIGNED_TOKEN 344
-#define PARS_EXIT_TOKEN 345
-#define PARS_FUNCTION_TOKEN 346
-#define PARS_LOCK_TOKEN 347
-#define PARS_SHARE_TOKEN 348
-#define PARS_MODE_TOKEN 349
-#define PARS_LIKE_TOKEN 350
-#define PARS_LIKE_TOKEN_EXACT 351
-#define PARS_LIKE_TOKEN_PREFIX 352
-#define PARS_LIKE_TOKEN_SUFFIX 353
-#define PARS_LIKE_TOKEN_SUBSTR 354
-#define PARS_TABLE_NAME_TOKEN 355
-#define PARS_COMPACT_TOKEN 356
-#define PARS_BLOCK_SIZE_TOKEN 357
-#define PARS_BIGINT_TOKEN 358
-#define NEG 359
-
-
-
 
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
 #endif
 
+
 extern YYSTYPE yylval;
 
+int yyparse (void);
+
+#endif /* !YY_YY_PARS0GRM_TAB_H_INCLUDED  */
diff --git a/storage/innobase/include/pars0pars.h b/storage/innobase/include/pars0pars.h
index 7e153d0c19b..732eb8b3945 100644
--- a/storage/innobase/include/pars0pars.h
+++ b/storage/innobase/include/pars0pars.h
@@ -373,18 +373,7 @@ pars_create_table(
 					table */
 	sym_node_t*	column_defs,	/*!< in: list of column names */
 	sym_node_t*	compact,	/* in: non-NULL if COMPACT table. */
-	sym_node_t*	block_size,	/* in: block size (can be NULL) */
-	void*		not_fit_in_memory);
-					/*!< in: a non-NULL pointer means that
-					this is a table which in simulations
-					should be simulated as not fitting
-					in memory; thread is put to sleep
-					to simulate disk accesses; NOTE that
-					this flag is not stored to the data
-					dictionary on disk, and the database
-					will forget about non-NULL value if
-					it has to reload the table definition
-					from disk */
+	sym_node_t*	block_size);	/* in: block size (can be NULL) */
 /*********************************************************************//**
 Parses an index creation operation.
 @return index create subgraph */
diff --git a/storage/innobase/pars/lexyy.cc b/storage/innobase/pars/lexyy.cc
index b97afd7c76b..4d1b021fa2b 100644
--- a/storage/innobase/pars/lexyy.cc
+++ b/storage/innobase/pars/lexyy.cc
@@ -9,8 +9,8 @@
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 1
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -35,7 +35,7 @@
 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types.
+ * if you want the limit (max/min) macros for int types. 
  */
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
@@ -52,7 +52,7 @@ typedef uint32_t flex_uint32_t;
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
 typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t;
+typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
 
@@ -89,25 +89,13 @@ typedef unsigned int flex_uint32_t;
 
 #endif /* ! FLEXINT_H */
 
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
-
-#ifdef YY_USE_CONST
+/* TODO: this is always defined, so inline it */
 #define yyconst const
+
+#if defined(__GNUC__) && __GNUC__ >= 3
+#define yynoreturn __attribute__((__noreturn__))
 #else
-#define yyconst
+#define yynoreturn
 #endif
 
 /* Returned upon end-of-file. */
@@ -168,23 +156,24 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 typedef size_t yy_size_t;
 #endif
 
-extern yy_size_t yyleng;
 
-extern FILE *yyin, *yyout;
+
+
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
 
-#define YY_LESS_LINENO(n)
-
+    #define YY_LESS_LINENO(n)
+    #define YY_LINENO_REWIND_TO(ptr)
+    
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
 		{ \
 		/* Undo effects of setting up yytext. */ \
-		int yyless_macro_arg = (n); \
-		YY_LESS_LINENO(yyless_macro_arg);\
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
 		*yy_cp = (yy_hold_char); \
 		YY_RESTORE_YY_MORE_OFFSET \
 		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
@@ -206,12 +195,12 @@ struct yy_buffer_state
 	/* Size of input buffer in bytes, not including room for EOB
 	 * characters.
 	 */
-	yy_size_t yy_buf_size;
+	int yy_buf_size;
 
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	yy_size_t yy_n_chars;
+	int yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -232,8 +221,8 @@ struct yy_buffer_state
 	 */
 	int yy_at_bol;
 
-	int yy_bs_lineno; /**< The line count. */
-	int yy_bs_column; /**< The column count. */
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
 
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
@@ -262,7 +251,7 @@ struct yy_buffer_state
 /* Stack of input buffers. */
 static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
 static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
@@ -281,11 +270,11 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
-static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
-yy_size_t yyleng;
+static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+static int yyleng;
 
 /* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
+static char *yy_c_buf_p = NULL;
 static int yy_init = 0;		/* whether we need to initialize */
 static int yy_start = 0;	/* start state number */
 
@@ -294,13 +283,13 @@ static int yy_start = 0;	/* start state number */
  */
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart (FILE *input_file  );
+static void yyrestart (FILE *input_file  );
 MY_ATTRIBUTE((unused)) static void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
 static YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
-void yy_delete_buffer (YY_BUFFER_STATE b  );
-void yy_flush_buffer (YY_BUFFER_STATE b  );
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
-void yypop_buffer_state (void );
+static void yy_delete_buffer (YY_BUFFER_STATE b  );
+static void yy_flush_buffer (YY_BUFFER_STATE b  );
+MY_ATTRIBUTE((unused)) static void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
+MY_ATTRIBUTE((unused)) static void yypop_buffer_state (void );
 
 static void yyensure_buffer_stack (void );
 static void yy_load_buffer_state (void );
@@ -310,20 +299,20 @@ static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
 
 YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
 YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len  );
+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len  );
 
-void *yyalloc (yy_size_t  );
-void *yyrealloc (void *,yy_size_t  );
-void yyfree (void *  );
+static void *yyalloc (yy_size_t  );
+static void *yyrealloc (void *,yy_size_t  );
+static void yyfree (void *  );
 
 #define yy_new_buffer yy_create_buffer
 
 #define yy_set_interactive(is_interactive) \
 	{ \
 	if ( ! YY_CURRENT_BUFFER ){ \
-		yyensure_buffer_stack (); \
+        yyensure_buffer_stack (); \
 		YY_CURRENT_BUFFER_LVALUE =    \
-			yy_create_buffer(yyin,YY_BUF_SIZE ); \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
 	} \
 	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
 	}
@@ -331,9 +320,9 @@ void yyfree (void *  );
 #define yy_set_bol(at_bol) \
 	{ \
 	if ( ! YY_CURRENT_BUFFER ){\
-		yyensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE = \
-			yy_create_buffer(yyin,YY_BUF_SIZE ); \
+        yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
 	} \
 	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
 	}
@@ -342,39 +331,42 @@ void yyfree (void *  );
 
 /* Begin user sect3 */
 
-#define yywrap() 1
+#define yywrap() (/*CONSTCOND*/1)
 #define YY_SKIP_YYWRAP
 
 typedef unsigned char YY_CHAR;
 
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+static FILE *yyin = NULL, *yyout = NULL;
 
 typedef int yy_state_type;
 
-extern int yylineno;
 
-int yylineno = 1;
 
-extern char *yytext;
+static int yylineno = 1;
+
+
+#ifdef yytext_ptr
+#undef yytext_ptr
+#endif
 #define yytext_ptr yytext
 
 static yy_state_type yy_get_previous_state (void );
 static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
 static int yy_get_next_buffer (void );
-static void yy_fatal_error (yyconst char msg[]  );
+static void yynoreturn yy_fatal_error (yyconst char* msg  );
 
 /* Done after the current pattern has been matched and before the
  * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
 	(yytext_ptr) = yy_bp; \
-	yyleng = (size_t) (yy_cp - yy_bp); \
+	yyleng = (int) (yy_cp - yy_bp); \
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 124
-#define YY_END_OF_BUFFER 125
+#define YY_NUM_RULES 123
+#define YY_END_OF_BUFFER 124
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -382,58 +374,56 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[425] =
+static yyconst flex_int16_t yy_accept[404] =
     {   0,
-        0,    0,  119,  119,    0,    0,    0,    0,  125,  123,
-      122,  122,    8,  123,  114,    5,  103,  109,  112,  110,
-      107,  111,  123,  113,    1,  123,  108,  106,  104,  105,
-      117,   96,   96,   96,   96,   96,   96,   96,   96,   96,
-       96,   96,   96,   96,   96,   96,   96,   96,   96,   96,
-      115,  116,  119,  120,    6,    7,    9,   10,  122,    4,
-       98,  118,    2,    1,    3,   99,  100,  102,  101,    0,
-       96,    0,   96,   96,   96,   96,   96,   44,   96,   96,
-       96,   96,   96,   96,   96,   96,   96,   96,   96,   96,
-       96,   96,   96,   96,   28,   17,   25,   96,   96,   96,
-
-       96,   96,   96,   54,   63,   96,   14,   96,   96,   96,
-       96,   96,   96,   96,   96,   96,   96,   96,   96,   96,
-       96,   96,   96,   96,   96,  119,  120,  120,  121,    6,
-        7,    9,   10,    2,    0,   97,   13,   45,   96,   96,
-       96,   96,   96,   96,   96,   96,   96,   96,   96,   96,
-       96,   96,   96,   96,   96,   96,   96,   27,   96,   96,
-       96,   41,   96,   96,   96,   96,   21,   96,   96,   96,
-       96,   96,   15,   96,   96,   96,   18,   96,   96,   96,
-       96,   96,   82,   96,   96,   96,   51,   96,   12,   96,
-       36,   96,   96,   96,   96,   96,   96,   96,   96,   96,
-
-       96,   96,    0,   97,   96,   96,   96,   96,   20,   96,
-       24,   96,   96,   96,   96,   96,   96,   96,   96,   96,
-       96,   96,   46,   96,   96,   30,   96,   89,   96,   96,
-       39,   96,   96,   96,   96,   96,   48,   96,   94,   91,
-       32,   93,   96,   11,   66,   96,   96,   96,   42,   96,
-       96,   96,   96,   96,   96,   96,   96,   96,   96,   29,
-       96,   96,   96,   96,   96,   96,   96,   96,   96,   87,
-        0,   96,   26,   96,   96,   96,   68,   96,   96,   96,
-       96,   37,   96,   96,   96,   96,   96,   96,   96,   31,
-       67,   23,   96,   59,   96,   77,   96,   96,   96,   43,
-
-       96,   96,   96,   96,   96,   96,   96,   96,   92,   96,
-       96,   56,   96,   96,   96,   96,   96,   96,   96,   40,
-       33,    0,   81,   95,   19,   96,   96,   85,   96,   76,
-       55,   96,   65,   96,   52,   96,   96,   96,   47,   96,
-       78,   96,   80,   96,   96,   34,   96,   96,   96,   35,
-       74,   96,   96,   96,   96,   60,   96,   50,   49,   96,
-       96,   96,   57,   53,   64,   96,   96,   96,   22,   96,
-       96,   75,   83,   96,   96,   79,   96,   70,   96,   96,
-       96,   96,   96,   38,   96,   90,   69,   96,   86,   96,
-       96,   96,   88,   96,   96,   61,   96,   16,   96,   72,
-
-       71,   96,   58,   96,   84,   96,   96,   96,   96,   96,
-       96,   96,   96,   96,   96,   73,   96,   96,   96,   96,
-       96,   96,   62,    0
+        0,    0,  118,  118,    0,    0,    0,    0,  124,  122,
+      121,  121,    8,  122,  113,    5,  102,  108,  111,  109,
+      106,  110,  122,  112,    1,  122,  107,  105,  103,  104,
+      116,   95,   95,   95,   95,   95,   95,   95,   95,   95,
+       95,   95,   95,   95,   95,   95,   95,   95,   95,   95,
+      114,  115,  118,  119,    6,    7,    9,   10,  121,    4,
+       97,  117,    2,    1,    3,   98,   99,  101,  100,    0,
+       95,    0,   95,   95,   95,   95,   95,   44,   95,   95,
+       95,   95,   95,   95,   95,   95,   95,   95,   95,   95,
+       95,   95,   95,   28,   17,   25,   95,   95,   95,   95,
+
+       95,   95,   54,   62,   95,   14,   95,   95,   95,   95,
+       95,   95,   95,   95,   95,   95,   95,   95,   95,   95,
+       95,   95,   95,   95,  118,  119,  119,  120,    6,    7,
+        9,   10,    2,    0,   96,   13,   45,   95,   95,   95,
+       95,   95,   95,   95,   95,   95,   95,   95,   95,   95,
+       95,   95,   95,   95,   95,   27,   95,   95,   95,   41,
+       95,   95,   95,   95,   21,   95,   95,   95,   95,   95,
+       15,   95,   95,   95,   18,   95,   95,   95,   95,   95,
+       81,   95,   95,   95,   51,   95,   12,   95,   36,   95,
+       95,   95,   95,   95,   95,   95,   95,   95,   95,   95,
+
+        0,   96,   95,   95,   95,   95,   20,   95,   24,   95,
+       95,   95,   95,   95,   95,   95,   95,   95,   95,   95,
+       46,   95,   30,   95,   88,   95,   95,   39,   95,   95,
+       95,   95,   95,   48,   95,   93,   90,   32,   92,   95,
+       11,   65,   95,   95,   95,   42,   95,   95,   95,   95,
+       95,   95,   95,   95,   95,   95,   29,   95,   95,   95,
+       95,   95,   95,   95,   95,   95,   86,    0,   95,   26,
+       95,   95,   95,   67,   95,   95,   95,   95,   37,   95,
+       95,   95,   95,   95,   95,   31,   66,   23,   95,   59,
+       95,   76,   95,   95,   95,   43,   95,   95,   95,   95,
+
+       95,   95,   95,   95,   91,   95,   95,   56,   95,   95,
+       95,   95,   95,   95,   95,   40,   33,    0,   80,   94,
+       19,   95,   95,   84,   95,   75,   55,   95,   64,   95,
+       52,   95,   95,   47,   95,   77,   95,   79,   95,   95,
+       34,   95,   95,   95,   35,   73,   95,   95,   95,   95,
+       60,   95,   50,   49,   95,   95,   95,   57,   53,   63,
+       95,   95,   22,   95,   95,   74,   82,   95,   95,   78,
+       95,   69,   95,   95,   95,   95,   95,   38,   89,   68,
+       95,   85,   95,   95,   95,   87,   95,   95,   61,   16,
+       95,   71,   70,   95,   58,   83,   95,   95,   95,   95,
+
+       95,   72,    0
     } ;
 
-static yyconst flex_int32_t yy_ec[256] =
+static yyconst YY_CHAR yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -465,7 +455,7 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[57] =
+static yyconst YY_CHAR yy_meta[57] =
     {   0,
         1,    1,    1,    2,    3,    1,    1,    4,    1,    1,
         5,    1,    1,    1,    1,    6,    7,    1,    1,    1,
@@ -475,111 +465,107 @@ static yyconst flex_int32_t yy_meta[57] =
         9,    9,    9,    9,    1,    1
     } ;
 
-static yyconst flex_int16_t yy_base[438] =
+static yyconst flex_uint16_t yy_base[417] =
     {   0,
-        0,    0,  293,  287,  284,  281,  272,  256,  254, 1357,
-       55,   57, 1357,    0, 1357, 1357, 1357, 1357, 1357, 1357,
-     1357, 1357,  238,  227,   46,  205, 1357,   43, 1357,  203,
-     1357,   46,   50,   56,   52,   66,   64,   51,   81,   92,
+        0,    0,  296,  281,  283,  280,  261,  252,  253, 1285,
+       55,   57, 1285,    0, 1285, 1285, 1285, 1285, 1285, 1285,
+     1285, 1285,  211,  213,   46,  202, 1285,   43, 1285,  199,
+     1285,   46,   50,   56,   52,   66,   64,   51,   81,   92,
        91,   94,   96,  111,  113,  116,  130,  134,   53,  143,
-     1357, 1357,    0,  106,    0,  212,    0,  210,  141,    0,
-     1357, 1357,  192,   56,  173, 1357, 1357, 1357, 1357,  168,
-      140,  150,  152,  154,  155,  161,  167,  171,  177,  172,
-      184,  174,  188,  189,  191,  194,  203,  212,  215,  217,
-      219,  221,  226,  228,  231,  240,  233,  235,  246,  251,
-
-      258,  253,  255,  256,  269,  271,  278,  272,  285,  283,
-      287,  289,  296,  305,  298,  315,  319,  321,  322,  326,
-      332,  333,  342,  339,  343,    0,  112,  173, 1357,    0,
-      155,    0,  156,  132,   93,    0,  355,  357,  358,  360,
-      364,  367,  374,  370,  379,  380,  389,  383,  390,  392,
-      395,  408,  411,  409,  415,  418,  425,  427,  429,  436,
-      431,  441,  446,  448,  450,  452,  453,  462,  471,  464,
-      473,  474,  478,  485,  488,  490,  491,  494,  500,  501,
-      504,  506,  507,  517,  518,  519,  520,  521,  522,  523,
-      533,  536,  538,  543,  549,  554,  555,  561,  556,  566,
-
-      567,  576,   60,    0,  573,  578,  580,  582,  583,  593,
-      589,  596,  598,  603,  605,  607,  610,  617,  619,  621,
-      622,  628,  633,  634,  635,  639,  640,  649,  650,  652,
-      653,  655,  659,  664,  668,  669,  665,  671,  674,  678,
-      681,  685,  687,  688,  692,  697,  698,  701,  703,  704,
-      707,  708,  717,  713,  728,  730,  724,  740,  734,  745,
-      746,  750,  751,  756,  757,  760,  761,  762,  771,  773,
-       42,  778,  782,  783,  787,  789,  792,  794,  793,  804,
-      805,  808,  809,  810,  819,  823,  826,  828,  829,  830,
-      835,  840,  844,  846,  847,  856,  857,  858,  859,  860,
-
-      863,  872,  873,  878,  879,  882,  885,  889,  894,  895,
-      896,  898,  905,  910,  908,  912,  914,  915,  926,  930,
-      931,   73,  932,  933,  935,  937,  942,  944,  946,  947,
-      948,  949,  951,  958,  961,  965,  967,  972,  978,  979,
-      981,  984,  983,  985,  994,  988,  999, 1000, 1001, 1004,
-     1013, 1015, 1022, 1016, 1019, 1026, 1032, 1033, 1035, 1036,
-     1038, 1039, 1048, 1049, 1050, 1051, 1053, 1054, 1060, 1063,
-     1065, 1066, 1069, 1070, 1072, 1082, 1084, 1085, 1087, 1096,
-     1097, 1098, 1099, 1101, 1113, 1114, 1115, 1116, 1117, 1118,
-     1119, 1128, 1130, 1131, 1134, 1133, 1135, 1137, 1150, 1151,
-
-     1153, 1155, 1157, 1162, 1160, 1167, 1172, 1173, 1174, 1176,
-     1185, 1190, 1183, 1187, 1189, 1199, 1204, 1206, 1208, 1210,
-     1215, 1220, 1222, 1357, 1269, 1278, 1287, 1290, 1293, 1297,
-     1306, 1315, 1324, 1333, 1340, 1344, 1347
+     1285, 1285,    0,  106,    0,  206,    0,  205,  141,    0,
+     1285, 1285,  177,   56,  152, 1285, 1285, 1285, 1285,  161,
+      140,  147,  152,  154,  155,  161,  167,  171,  177,  172,
+      184,  174,  188,  189,  191,  194,  203,  212,  217,  219,
+      222,  223,  228,  224,  226,  233,  235,  239,  244,  251,
+
+      256,  260,  261,  262,  265,  271,  266,  281,  277,  287,
+      282,  288,  303,  306,  307,  292,  310,  321,  322,  323,
+      324,  325,  335,  338,    0,  112,  173, 1285,    0,  152,
+        0,  145,  130,   59,    0,  339,  341,  353,  351,  354,
+      365,  367,  355,  372,  376,  383,  379,  386,  388,  385,
+      398,  392,  402,  401,  414,  415,  416,  417,  426,  430,
+      432,  437,  433,  439,  442,  443,  449,  456,  460,  461,
+      463,  470,  472,  473,  479,  483,  485,  489,  492,  495,
+      498,  499,  502,  508,  509,  514,  515,  518,  520,  527,
+      530,  534,  536,  541,  543,  553,  555,  557,  559,  568,
+
+       41,    0,  564,  569,  570,  573,  574,  585,  580,  589,
+      586,  595,  598,  600,  605,  610,  611,  617,  620,  615,
+      622,  627,  626,  631,  641,  642,  646,  647,  648,  651,
+      652,  653,  657,  662,  663,  667,  669,  673,  680,  682,
+      684,  685,  686,  687,  689,  696,  698,  700,  701,  703,
+      699,  710,  714,  716,  729,  732,  731,  733,  735,  734,
+      746,  747,  748,  752,  753,  759,  749,   39,  769,  770,
+      771,  773,  774,  780,  783,  784,  787,  785,  786,  802,
+      800,  803,  816,  817,  818,  819,  820,  823,  833,  835,
+      836,  837,  838,  839,  848,  849,  852,  853,  854,  859,
+
+      863,  870,  868,  872,  875,  884,  885,  887,  889,  890,
+      888,  904,  906,  907,  908,  918,  919,   73,  921,  922,
+      923,  924,  933,  934,  936,  937,  938,  939,  940,  949,
+      952,  955,  953,  965,  969,  970,  971,  972,  974,  975,
+      981,  984,  986,  988,  990,  991, 1000, 1006, 1004, 1009,
+     1016, 1018, 1020, 1021, 1025, 1027, 1032, 1034, 1038, 1039,
+     1041, 1043, 1048, 1050, 1052, 1055, 1059, 1064, 1066, 1068,
+     1071, 1073, 1077, 1084, 1086, 1087, 1091, 1093, 1098, 1100,
+     1102, 1104, 1105, 1111, 1114, 1116, 1117, 1118, 1120, 1127,
+     1129, 1130, 1134, 1139, 1141, 1145, 1146, 1148, 1150, 1151,
+
+     1155, 1157, 1285, 1197, 1206, 1215, 1218, 1221, 1225, 1234,
+     1243, 1252, 1261, 1268, 1272, 1275
     } ;
 
-static yyconst flex_int16_t yy_def[438] =
+static yyconst flex_int16_t yy_def[417] =
     {   0,
-      424,    1,  425,  425,  426,  426,  427,  427,  424,  424,
-      424,  424,  424,  428,  424,  424,  424,  424,  424,  424,
-      424,  424,  424,  424,  424,  429,  424,  424,  424,  424,
-      424,  430,  430,  430,  430,  430,   34,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      424,  424,  431,  432,  433,  424,  434,  424,  424,  428,
-      424,  424,  424,  424,  429,  424,  424,  424,  424,  435,
-      430,  436,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  431,  432,  432,  424,  433,
-      424,  434,  424,  424,  424,  437,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-
-      430,  430,  424,  437,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      424,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  424,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
-      430,  430,  430,    0,  424,  424,  424,  424,  424,  424,
-      424,  424,  424,  424,  424,  424,  424
+      403,    1,  404,  404,  405,  405,  406,  406,  403,  403,
+      403,  403,  403,  407,  403,  403,  403,  403,  403,  403,
+      403,  403,  403,  403,  403,  408,  403,  403,  403,  403,
+      403,  409,  409,  409,  409,  409,   34,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      403,  403,  410,  411,  412,  403,  413,  403,  403,  407,
+      403,  403,  403,  403,  408,  403,  403,  403,  403,  414,
+      409,  415,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  410,  411,  411,  403,  412,  403,
+      413,  403,  403,  403,  416,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+
+      403,  416,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  403,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  403,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+      409,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+
+      409,  409,    0,  403,  403,  403,  403,  403,  403,  403,
+      403,  403,  403,  403,  403,  403
     } ;
 
-static yyconst flex_int16_t yy_nxt[1414] =
+static yyconst flex_uint16_t yy_nxt[1342] =
     {   0,
        10,   11,   12,   13,   10,   14,   15,   16,   17,   18,
        19,   20,   21,   22,   23,   24,   25,   26,   27,   28,
@@ -588,158 +574,150 @@ static yyconst flex_int16_t yy_nxt[1414] =
        38,   45,   46,   47,   48,   49,   50,   38,   38,   38,
        38,   38,   38,   38,   51,   52,   59,   59,   59,   59,
        63,   70,   64,   67,   68,   70,   70,   70,   70,   72,
-       63,   70,   64,   72,   72,   72,   72,  123,   75,   72,
-       84,   70,   76,   73,   85,   77,  136,   79,   74,   72,
-       86,   80,   90,  322,   81,   71,   70,   82,   78,   91,
-
-       83,   87,   92,   88,   72,   93,   70,   70,   94,   70,
-       95,   70,  271,   89,   72,   72,  128,   72,   96,   72,
-       98,  129,  424,   97,   99,  104,   70,  424,   70,  101,
-      100,   70,  102,  105,   72,  106,   72,  107,  103,   72,
-      108,  110,   59,   59,  113,   70,  203,  114,  134,   70,
-      111,  112,  109,   72,  118,   70,  115,   72,   70,  133,
-      116,  119,  131,   72,  117,   70,   72,   70,  120,   70,
-       70,  121,  135,  122,  124,   72,   70,   72,   72,  137,
-      138,  125,   70,  128,   72,  140,   70,   70,  129,   70,
-       72,  141,   70,  424,   72,   72,  139,   72,  142,   70,
-
-       72,  144,  150,   70,   70,  143,   70,   72,  134,   70,
-      145,   72,   72,  133,   72,  152,  146,   72,   70,  131,
-      147,  148,  156,   69,  153,   66,   72,   70,  149,  151,
-       70,  154,   70,  155,   70,   72,   70,   62,   72,  158,
-       72,   70,   72,   70,   72,  157,   70,  159,   70,   72,
-       70,   72,   61,  424,   72,   70,   72,  161,   72,   58,
-      160,   70,  162,   72,  163,  164,   70,  165,   70,   72,
-       70,   70,  168,   70,   72,   58,   72,  170,   72,   72,
-      169,   72,  166,  167,   70,  172,   70,   70,   56,  171,
-      174,   56,   72,   70,   72,   72,  173,   54,   70,  175,
-
-       70,   72,   70,   54,   70,  176,   72,  180,   72,  424,
-       72,   70,   72,   70,  183,  177,  424,  178,  424,   72,
-       70,   72,  181,  179,  184,  424,  182,  424,   72,  188,
-       70,  186,  424,  189,   70,  185,   70,   70,   72,  187,
-      190,   70,   72,  424,   72,   72,  193,   70,   70,   72,
-      194,  191,  424,  424,   70,   72,   72,   70,   70,  424,
-      198,  192,   72,  424,  196,   72,   72,  200,  424,  424,
-       70,  201,   70,   70,  197,   70,  195,  199,   72,   70,
-       72,   72,   70,   72,  202,   70,  205,   72,  424,   70,
-       72,  208,  206,   72,   70,   70,  207,   72,   70,  209,
-
-      210,  424,   72,   72,   70,   70,   72,   70,  424,  216,
-       70,  211,   72,   72,  424,   72,  218,  424,   72,  424,
-      424,  212,  213,   70,   70,  214,   70,  217,  215,  424,
-       70,   72,   72,   70,   72,  223,  219,  220,   72,  222,
-       70,   72,   70,  221,   70,  424,   70,  424,   72,  424,
-       72,   70,   72,  226,   72,  230,   70,  227,  224,   72,
-      225,   70,  229,   70,   72,   70,  424,   70,   70,   72,
-      424,   72,  228,   72,  232,   72,   72,   70,  233,   70,
-      234,  236,  231,  424,  424,   72,   70,   72,   70,   70,
-      424,  237,  238,   70,   72,  235,   72,   72,  240,  239,
-
-       70,   72,  242,   70,  424,   70,   70,  243,   72,   70,
-      424,   72,  241,   72,   72,   70,   70,   72,  246,   70,
-      244,   70,   70,   72,   72,  245,  248,   72,  249,   72,
-       72,  247,   70,   70,   70,   70,   70,   70,   70,  250,
-       72,   72,   72,   72,   72,   72,   72,  255,   70,  424,
-      251,   70,  253,   70,  424,  424,   72,  252,   70,   72,
-      424,   72,  256,  258,   70,  257,   72,  424,  254,   70,
-       70,   70,   72,  259,  261,  262,   70,   72,   72,   72,
-      260,   70,   70,  424,   72,  266,  263,  265,   70,   72,
-       72,   70,  424,   70,  264,   70,   72,   70,   70,   72,
-
-      267,   72,  269,   72,   70,   72,   72,  268,   70,  424,
-      270,   70,   72,   70,  272,  273,   72,  274,   70,   72,
-       70,   72,   70,  275,  277,   70,   72,  276,   72,  280,
-       72,  281,   70,   72,   70,  279,   70,   70,  424,  424,
-       72,  278,   72,   70,   72,   72,  286,  284,   70,   70,
-       70,   72,  424,  282,   70,   70,   72,   72,   72,  285,
-      283,  424,   72,   72,   70,   70,  288,   70,   70,  290,
-       70,  287,   72,   72,   70,   72,   72,  424,   72,   70,
-       70,  291,   72,   70,   70,  289,   70,   72,   72,   70,
-      424,   72,   72,   70,   72,  292,   70,   72,  293,  297,
-
-       70,   72,   70,   70,   72,  295,  294,   70,   72,  296,
-       72,   72,   70,   70,  298,   72,   70,  424,   70,   70,
-       72,   72,   70,   70,   72,  299,   72,   72,   70,  302,
-       72,   72,   70,  424,  424,  424,   72,  424,  300,   70,
-       72,  301,  306,   70,  424,   70,  303,   72,  304,   70,
-      305,   72,  307,   72,  308,   70,  424,   72,  309,  424,
-       70,   70,  312,   72,  311,   70,   70,  310,   72,   72,
-      424,   70,   70,   72,   72,   70,   70,   70,  313,   72,
-       72,  314,  424,   72,   72,   72,   70,  317,   70,  319,
-      320,  424,  424,   70,   72,  315,   72,   70,   70,  321,
-
-      316,   72,   70,  318,   70,   72,   72,   70,   70,   70,
-       72,  424,   72,  424,  424,   72,   72,   72,  424,   70,
-       70,  323,  327,   70,   70,   70,  324,   72,   72,  424,
-      329,   72,   72,   72,   70,  325,  328,  331,   70,  326,
-      424,   70,   72,   70,   70,   70,   72,  332,  330,   72,
-       70,   72,   72,   72,  335,   70,  424,  424,   72,   70,
-      333,   70,   70,   72,  334,  336,  337,   72,  424,   72,
-       72,   70,   70,   70,   70,   70,  338,  424,   70,   72,
-       72,   72,   72,   72,  424,  340,   72,   70,   70,  341,
-      339,  424,  343,   70,   70,   72,   72,   70,  424,  344,
-
-       70,   72,   72,  342,   70,   72,  348,  424,   72,   70,
-       70,   70,   72,   70,  424,  346,  345,   72,   72,   72,
-       70,   72,  347,   70,  424,   70,  349,   70,   72,   70,
-       70,   72,  350,   72,  354,   72,  351,   72,   72,  352,
-      356,   70,  353,  358,  355,   70,   70,   70,   70,   72,
-       70,  357,   70,   72,   72,   72,   72,   70,   72,   70,
-       72,   70,   70,   70,   70,   72,   70,   72,  359,   72,
-       72,   72,   72,   70,   72,  424,   70,  424,  424,  361,
-       70,   72,   70,  362,   72,  360,  365,   70,   72,  363,
-       72,  366,  364,   70,   70,   72,   70,  424,   70,   70,
-
-       70,   72,   72,   70,   72,  367,   72,   72,   72,   70,
-      368,   72,  424,  424,   70,   70,   70,   72,  424,   70,
-      369,  370,   72,   72,   72,  424,  374,   72,   70,  371,
-       70,   70,  424,  375,   70,  372,   72,   70,   72,   72,
-      373,   70,   72,  376,  379,   72,  377,   70,   70,   72,
-       70,   70,  424,   70,   70,   72,   72,  378,   72,   72,
-      380,   72,   72,   70,   70,   70,   70,  383,   70,   70,
-      382,   72,   72,   72,   72,   70,   72,   72,   70,  381,
-       70,   70,  424,   72,   70,   70,   72,   70,   72,   72,
-      387,  386,   72,   72,  384,   72,  385,   70,  424,   70,
-
-       70,  424,   70,  424,  389,   72,  388,   72,   72,  390,
-       72,   70,   70,   70,   70,  392,   70,  424,  424,   72,
-       72,   72,   72,  393,   72,  391,  396,  424,   70,   70,
-       70,   70,   70,   70,   70,  394,   72,   72,   72,   72,
-       72,   72,   72,   70,  398,   70,   70,  395,   70,   70,
-       70,   72,   70,   72,   72,  424,   72,   72,   72,  424,
-       72,  399,  403,  397,  404,   70,   70,  400,   70,  401,
-       70,  424,   70,   72,   72,   70,   72,   70,   72,  405,
-       72,  402,   70,   72,  424,   72,  424,   70,   70,   70,
-       72,   70,  406,  424,  407,   72,   72,   72,   70,   72,
-
-       70,  412,   70,  424,   70,   70,   72,  424,   72,  410,
-       72,  408,   72,   72,   70,  409,  424,  413,  414,   70,
-      415,   70,   72,   70,  411,   70,  424,   72,  416,   72,
-       70,   72,  424,   72,  419,   70,  424,   70,   72,  417,
-      418,  424,  424,   72,  420,   72,  424,  424,  421,  424,
-      424,  424,  424,  424,  424,  424,  422,  424,  424,  424,
-      424,  424,  424,  424,  424,  424,  424,  424,  423,   53,
-       53,   53,   53,   53,   53,   53,   53,   53,   55,   55,
-       55,   55,   55,   55,   55,   55,   55,   57,   57,   57,
-       57,   57,   57,   57,   57,   57,   60,  424,   60,   65,
-
-       65,   65,   71,   71,  424,   71,  126,  126,  126,  126,
-      424,  126,  126,  126,  126,  127,  127,  127,  127,  127,
-      127,  127,  127,  127,  130,  130,  130,  424,  130,  130,
-      130,  130,  130,  132,  424,  132,  132,  132,  132,  132,
-      132,  132,  136,  424,  424,  424,  424,  424,  136,   72,
-       72,  424,   72,  204,  424,  204,    9,  424,  424,  424,
-      424,  424,  424,  424,  424,  424,  424,  424,  424,  424,
-      424,  424,  424,  424,  424,  424,  424,  424,  424,  424,
-      424,  424,  424,  424,  424,  424,  424,  424,  424,  424,
-      424,  424,  424,  424,  424,  424,  424,  424,  424,  424,
-
-      424,  424,  424,  424,  424,  424,  424,  424,  424,  424,
-      424,  424,  424
+       63,   70,   64,   72,   72,   72,   72,  122,   75,   72,
+       84,   70,   76,   73,   85,   77,  135,   79,   74,   72,
+      318,   80,   89,  268,   81,   71,   70,   82,   78,   90,
+
+       83,   86,   91,   87,   72,   92,   70,   70,   93,   70,
+       94,   70,  201,   88,   72,   72,  127,   72,   95,   72,
+       97,  128,  403,   96,   98,  103,   70,  403,   70,  100,
+       99,   70,  101,  104,   72,  105,   72,  106,  102,   72,
+      107,  109,   59,   59,  112,   70,  133,  113,  132,   70,
+      110,  111,  108,   72,  117,   70,  114,   72,   70,  130,
+      115,  118,   70,   72,  116,  134,   72,   70,  119,   70,
+       70,  120,  403,  121,  123,   72,   70,   72,   72,  136,
+      137,  124,   70,  127,   72,  139,   70,   70,  128,   70,
+       72,  140,   70,  133,   72,   72,  138,   72,  141,   70,
+
+       72,  143,  149,   70,   70,  142,   70,   72,  132,   70,
+      144,   72,   72,  130,   72,  151,  145,   72,   70,   69,
+      146,  147,   66,   62,  152,   61,   72,   70,  148,  150,
+      156,  153,   70,  154,   70,   72,  155,   70,   70,   70,
+       72,   70,   72,   70,  157,   72,   72,   72,   70,   72,
+       70,   72,  403,  163,   70,   58,   72,  159,   72,   70,
+      158,  161,   72,  160,   58,  162,   70,   72,  164,  165,
+      168,   70,  166,  167,   72,   70,   70,   70,  170,   72,
+       70,   70,  169,   72,   72,   72,   70,   56,   72,   72,
+       56,   54,   70,  173,   72,  172,   70,   70,  174,  171,
+
+       72,  178,   70,   70,   72,   72,   54,   70,  403,  175,
+       72,   72,  403,  176,  181,   72,  179,  182,   70,  177,
+      180,   70,   70,  184,  403,   70,   72,  186,  183,   72,
+       72,  185,  188,   72,  190,  191,   70,   70,   70,   70,
+       70,  187,  403,  189,   72,   72,   72,   72,   72,  192,
+       70,  196,  403,   70,   70,  194,   70,  403,   72,  403,
+      197,   72,   72,  198,   72,  195,   70,  199,   70,   70,
+       70,  403,  193,  403,   72,  403,   72,   72,   72,  200,
+       70,  203,   70,  204,  403,  403,  205,   70,   72,  206,
+       72,   70,  207,  208,   70,   72,  209,  403,   70,   72,
+
+       70,   70,   72,   70,  403,  214,   72,   70,   72,   72,
+      403,   72,  216,   70,  210,   72,   70,   70,  211,  212,
+      220,   72,  213,  215,   72,   72,  217,  218,  221,   70,
+       70,   70,   70,  219,  403,  403,  403,   72,   72,   72,
+       72,   70,  223,  226,  222,   70,  224,   70,   70,   72,
+      227,  403,   70,   72,   70,   72,   72,   70,   70,  225,
+       72,  230,   72,  229,   70,   72,   72,  231,  228,  403,
+      233,   70,   72,  235,  403,   70,   70,  236,   70,   72,
+      234,  403,  232,   72,   72,   70,   72,   70,   70,  239,
+      237,  403,  240,   72,   70,   72,   72,  403,   70,  238,
+
+       70,  243,   72,  403,   70,  241,   72,   70,   72,  242,
+       70,  245,   72,   70,   70,   72,  246,   70,   72,  403,
+      244,   72,   72,   70,   70,   72,  403,  247,  403,   70,
+       70,   72,   72,   70,  250,   70,  252,   72,   72,  248,
+      403,   72,   70,   72,  403,   70,  403,  403,  249,   70,
+       72,   70,  251,   72,  255,  253,   70,   72,   70,   72,
+      254,  258,  259,  403,   72,  256,   72,  403,   70,  403,
+       70,  257,   70,  260,   70,  262,   72,  263,   72,   70,
+       72,  261,   72,   70,   70,   70,  403,   72,   70,   70,
+      403,   72,   72,   72,  266,   70,   72,   72,  265,  264,
+
+       70,   70,  267,   72,   70,  269,  270,  271,   72,   72,
+       70,  403,   72,   70,  272,   70,  403,  274,   72,  273,
+       70,   72,  277,   72,  278,   70,   70,  276,   72,  275,
+       70,  403,   70,   72,   72,   70,  403,   70,   72,  281,
+       72,   70,   70,   72,  283,   72,   70,  403,  279,   72,
+       72,  403,  403,  280,   72,  282,   70,   70,  284,  285,
+      286,   70,   70,   70,   72,   72,   70,   70,   70,   72,
+       72,   72,   70,  287,   72,   72,   72,   70,   70,  403,
+       72,  403,   70,  403,   70,   72,   72,  293,   70,  288,
+       72,  289,   72,  291,  292,   70,   72,   70,  290,   70,
+
+       70,   70,   70,   72,   70,   72,  294,   72,   72,   72,
+       72,   70,   72,   70,   70,   70,   70,  298,   70,   72,
+      295,   72,   72,   72,   72,   70,   72,  296,  302,   70,
+      297,   70,  403,   72,  403,  403,  304,   72,  303,   72,
+      299,  300,  305,  301,   70,  403,   70,   70,   70,   70,
+       70,  403,   72,  307,   72,   72,   72,   72,   72,  306,
+      308,   70,   70,   70,   70,  309,  310,   70,   70,   72,
+       72,   72,   72,  403,   70,   72,   72,  313,  311,  403,
+      315,  316,   72,  403,   70,   70,   70,  317,   70,   70,
+      312,  314,   72,   72,   72,   70,   72,   72,   70,   70,
+
+       70,   70,   70,   72,  403,  403,   72,   72,   72,   72,
+       72,  323,  319,  325,  320,   70,  403,   70,   70,  403,
+      403,  321,  403,   72,  322,   72,   72,  324,  326,  403,
+      327,   70,   70,   70,   70,   70,  403,  328,   70,   72,
+       72,   72,   72,   72,  329,  331,   72,  403,   70,  403,
+       70,   70,   70,   70,   70,  332,   72,  330,   72,   72,
+       72,   72,   72,   70,   70,  333,  335,   70,   70,   70,
+      336,   72,   72,  403,   70,   72,   72,   72,   70,  334,
+      339,  338,   72,   70,  403,   70,   72,   70,  403,  403,
+       70,   72,  337,   72,  343,   72,  341,  340,   72,   70,
+
+       70,  403,   70,   70,   70,   70,  342,   72,   72,  344,
+       72,   72,   72,   72,  349,  345,  403,  403,  403,   70,
+      403,   70,   70,   70,  350,  346,  348,   72,  347,   72,
+       72,   72,  351,   70,   70,  353,   70,   70,   70,   70,
+      403,   72,   72,  352,   72,   72,   72,   72,   70,   70,
+      354,   70,   70,   70,   70,   70,   72,   72,  403,   72,
+       72,   72,   72,   72,   70,  403,  356,   70,   70,  403,
+       70,  403,   72,  355,  357,   72,   72,  360,   72,  358,
+       70,  361,  359,  403,   70,   70,   70,   70,   72,   70,
+       70,  362,   72,   72,   72,   72,   70,   72,   72,   70,
+
+      403,   70,  403,   70,   72,   70,   70,   72,  364,   72,
+      363,   72,  368,   72,   72,   70,  366,  403,  365,   70,
+      369,   70,  403,   72,   70,  367,  403,   72,  370,   72,
+      371,   70,   72,   70,  373,   70,   70,  403,  403,   72,
+       70,   72,   70,   72,   72,  372,  374,   70,   72,   70,
+       72,  403,  403,   70,   70,   72,   70,   72,   70,  376,
+      377,   72,   72,   70,   72,   70,   72,   70,  375,  403,
+       70,   72,  403,   72,   70,   72,  403,  380,   72,   70,
+      379,   70,   72,   70,  378,  403,   70,   72,   70,   72,
+      403,   72,   70,  381,   72,  403,   72,  403,  382,   70,
+
+       72,   70,   70,  383,  403,  385,   70,   72,   70,   72,
+       72,  386,  384,   70,   72,   70,   72,   70,  389,   70,
+       70,   72,  403,   72,  387,   72,   70,   72,   72,   70,
+      390,   70,   70,   70,   72,   70,  388,   72,  403,   72,
+       72,   72,   70,   72,   70,   70,  395,  403,  391,   70,
+       72,  403,   72,   72,   70,  393,   70,   72,  396,  392,
+       70,   70,   72,   70,   72,   70,   70,  394,   72,   72,
+       70,   72,   70,   72,   72,  400,  397,  403,   72,  401,
+       72,  403,  403,  403,  399,  403,  403,  403,  403,  403,
+      398,  403,  403,  403,  403,  403,  402,   53,   53,   53,
+
+       53,   53,   53,   53,   53,   53,   55,   55,   55,   55,
+       55,   55,   55,   55,   55,   57,   57,   57,   57,   57,
+       57,   57,   57,   57,   60,  403,   60,   65,   65,   65,
+       71,   71,  403,   71,  125,  125,  125,  125,  403,  125,
+      125,  125,  125,  126,  126,  126,  126,  126,  126,  126,
+      126,  126,  129,  129,  129,  403,  129,  129,  129,  129,
+      129,  131,  403,  131,  131,  131,  131,  131,  131,  131,
+      135,  403,  403,  403,  403,  403,  135,   72,   72,  403,
+       72,  202,  403,  202,    9,  403,  403,  403,  403,  403,
+      403,  403,  403,  403,  403,  403,  403,  403,  403,  403,
+
+      403,  403,  403,  403,  403,  403,  403,  403,  403,  403,
+      403,  403,  403,  403,  403,  403,  403,  403,  403,  403,
+      403,  403,  403,  403,  403,  403,  403,  403,  403,  403,
+      403,  403,  403,  403,  403,  403,  403,  403,  403,  403,
+      403
     } ;
 
-static yyconst flex_int16_t yy_chk[1414] =
+static yyconst flex_int16_t yy_chk[1342] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -749,161 +727,153 @@ static yyconst flex_int16_t yy_chk[1414] =
         1,    1,    1,    1,    1,    1,   11,   11,   12,   12,
        25,   32,   25,   28,   28,   33,   38,   35,   49,   32,
        64,   34,   64,   33,   38,   35,   49,   49,   33,   34,
-       35,   36,   33,   32,   35,   33,  322,   34,   32,   36,
-       35,   34,   37,  271,   34,   37,   39,   34,   33,   37,
+       35,   36,   33,   32,   35,   33,  318,   34,   32,   36,
+      268,   34,   37,  201,   34,   37,   39,   34,   33,   37,
 
        34,   36,   37,   36,   39,   37,   41,   40,   37,   42,
-       39,   43,  203,   36,   41,   40,   54,   42,   39,   43,
-       40,   54,  127,   39,   40,   43,   44,  127,   45,   41,
+       39,   43,  134,   36,   41,   40,   54,   42,   39,   43,
+       40,   54,  126,   39,   40,   43,   44,  126,   45,   41,
        40,   46,   42,   43,   44,   43,   45,   43,   42,   46,
-       43,   45,   59,   59,   46,   47,  135,   46,  134,   48,
-       45,   45,   44,   47,   47,   71,   46,   48,   50,  133,
-       46,   47,  131,   71,   46,   72,   50,   73,   47,   74,
-       75,   48,   70,   48,   50,   73,   76,   74,   75,   73,
-       74,   50,   77,  128,   76,   75,   78,   80,  128,   82,
-       77,   76,   79,   65,   78,   80,   74,   82,   76,   81,
-
-       79,   79,   82,   83,   84,   77,   85,   81,   63,   86,
-       80,   83,   84,   58,   85,   84,   80,   86,   87,   56,
-       81,   81,   86,   30,   84,   26,   87,   88,   81,   83,
-       89,   84,   90,   85,   91,   88,   92,   24,   89,   88,
-       90,   93,   91,   94,   92,   87,   95,   89,   97,   93,
-       98,   94,   23,    9,   95,   96,   97,   91,   98,    8,
-       90,   99,   92,   96,   93,   94,  100,   96,  102,   99,
-      103,  104,   98,  101,  100,    7,  102,  100,  103,  104,
-       99,  101,   96,   96,  105,  101,  106,  108,    6,  100,
-      103,    5,  105,  107,  106,  108,  102,    4,  110,  106,
-
-      109,  107,  111,    3,  112,  107,  110,  110,  109,    0,
-      111,  113,  112,  115,  111,  108,    0,  109,    0,  113,
-      114,  115,  110,  109,  112,    0,  110,    0,  114,  114,
-      116,  113,    0,  115,  117,  112,  118,  119,  116,  113,
-      116,  120,  117,    0,  118,  119,  118,  121,  122,  120,
-      119,  116,    0,    0,  124,  121,  122,  123,  125,    0,
-      122,  117,  124,    0,  121,  123,  125,  124,    0,    0,
-      137,  124,  138,  139,  121,  140,  120,  123,  137,  141,
-      138,  139,  142,  140,  125,  144,  139,  141,    0,  143,
-      142,  142,  140,  144,  145,  146,  141,  143,  148,  143,
-
-      143,    0,  145,  146,  147,  149,  148,  150,    0,  148,
-      151,  144,  147,  149,    0,  150,  150,    0,  151,    0,
-        0,  145,  146,  152,  154,  147,  153,  149,  147,    0,
-      155,  152,  154,  156,  153,  154,  151,  151,  155,  153,
-      157,  156,  158,  152,  159,    0,  161,    0,  157,    0,
-      158,  160,  159,  157,  161,  161,  162,  157,  155,  160,
-      156,  163,  160,  164,  162,  165,    0,  166,  167,  163,
-        0,  164,  159,  165,  164,  166,  167,  168,  165,  170,
-      166,  167,  163,    0,    0,  168,  169,  170,  171,  172,
-        0,  167,  168,  173,  169,  166,  171,  172,  170,  169,
-
-      174,  173,  172,  175,    0,  176,  177,  173,  174,  178,
-        0,  175,  171,  176,  177,  179,  180,  178,  176,  181,
-      174,  182,  183,  179,  180,  175,  179,  181,  180,  182,
-      183,  178,  184,  185,  186,  187,  188,  189,  190,  181,
-      184,  185,  186,  187,  188,  189,  190,  186,  191,    0,
-      182,  192,  184,  193,    0,    0,  191,  183,  194,  192,
-        0,  193,  188,  192,  195,  190,  194,    0,  185,  196,
-      197,  199,  195,  193,  195,  195,  198,  196,  197,  199,
-      194,  200,  201,    0,  198,  198,  195,  197,  205,  200,
-      201,  202,    0,  206,  196,  207,  205,  208,  209,  202,
-
-      199,  206,  201,  207,  211,  208,  209,  200,  210,    0,
-      202,  212,  211,  213,  205,  206,  210,  207,  214,  212,
-      215,  213,  216,  208,  212,  217,  214,  210,  215,  215,
-      216,  216,  218,  217,  219,  214,  220,  221,    0,    0,
-      218,  213,  219,  222,  220,  221,  221,  219,  223,  224,
-      225,  222,    0,  217,  226,  227,  223,  224,  225,  220,
-      218,    0,  226,  227,  228,  229,  224,  230,  231,  227,
-      232,  222,  228,  229,  233,  230,  231,    0,  232,  234,
-      237,  229,  233,  235,  236,  225,  238,  234,  237,  239,
-        0,  235,  236,  240,  238,  230,  241,  239,  232,  236,
-
-      242,  240,  243,  244,  241,  234,  233,  245,  242,  235,
-      243,  244,  246,  247,  238,  245,  248,    0,  249,  250,
-      246,  247,  251,  252,  248,  243,  249,  250,  254,  248,
-      251,  252,  253,    0,    0,    0,  254,    0,  246,  257,
-      253,  247,  253,  255,    0,  256,  250,  257,  251,  259,
-      252,  255,  254,  256,  255,  258,    0,  259,  256,    0,
-      260,  261,  259,  258,  258,  262,  263,  257,  260,  261,
-        0,  264,  265,  262,  263,  266,  267,  268,  261,  264,
-      265,  262,    0,  266,  267,  268,  269,  265,  270,  267,
-      268,    0,    0,  272,  269,  263,  270,  273,  274,  269,
-
-      264,  272,  275,  266,  276,  273,  274,  277,  279,  278,
-      275,    0,  276,    0,    0,  277,  279,  278,    0,  280,
-      281,  272,  278,  282,  283,  284,  274,  280,  281,    0,
-      280,  282,  283,  284,  285,  275,  279,  283,  286,  276,
-        0,  287,  285,  288,  289,  290,  286,  284,  281,  287,
-      291,  288,  289,  290,  287,  292,    0,    0,  291,  293,
-      285,  294,  295,  292,  286,  288,  289,  293,    0,  294,
-      295,  296,  297,  298,  299,  300,  293,    0,  301,  296,
-      297,  298,  299,  300,    0,  297,  301,  302,  303,  298,
-      295,    0,  301,  304,  305,  302,  303,  306,    0,  302,
-
-      307,  304,  305,  299,  308,  306,  306,    0,  307,  309,
-      310,  311,  308,  312,    0,  304,  303,  309,  310,  311,
-      313,  312,  305,  315,    0,  314,  307,  316,  313,  317,
-      318,  315,  308,  314,  314,  316,  310,  317,  318,  311,
-      316,  319,  313,  318,  315,  320,  321,  323,  324,  319,
-      325,  317,  326,  320,  321,  323,  324,  327,  325,  328,
-      326,  329,  330,  331,  332,  327,  333,  328,  319,  329,
-      330,  331,  332,  334,  333,    0,  335,    0,    0,  326,
-      336,  334,  337,  327,  335,  325,  334,  338,  336,  329,
-      337,  336,  332,  339,  340,  338,  341,    0,  343,  342,
-
-      344,  339,  340,  346,  341,  337,  343,  342,  344,  345,
-      338,  346,    0,    0,  347,  348,  349,  345,    0,  350,
-      340,  342,  347,  348,  349,    0,  348,  350,  351,  344,
-      352,  354,    0,  349,  355,  345,  351,  353,  352,  354,
-      347,  356,  355,  352,  355,  353,  353,  357,  358,  356,
-      359,  360,    0,  361,  362,  357,  358,  354,  359,  360,
-      357,  361,  362,  363,  364,  365,  366,  362,  367,  368,
-      361,  363,  364,  365,  366,  369,  367,  368,  370,  360,
-      371,  372,    0,  369,  373,  374,  370,  375,  371,  372,
-      370,  368,  373,  374,  366,  375,  367,  376,    0,  377,
-
-      378,    0,  379,    0,  374,  376,  371,  377,  378,  375,
-      379,  380,  381,  382,  383,  379,  384,    0,    0,  380,
-      381,  382,  383,  380,  384,  377,  383,    0,  385,  386,
-      387,  388,  389,  390,  391,  381,  385,  386,  387,  388,
-      389,  390,  391,  392,  388,  393,  394,  382,  396,  395,
-      397,  392,  398,  393,  394,    0,  396,  395,  397,    0,
-      398,  390,  395,  385,  397,  399,  400,  391,  401,  392,
-      402,    0,  403,  399,  400,  405,  401,  404,  402,  399,
-      403,  394,  406,  405,    0,  404,    0,  407,  408,  409,
-      406,  410,  402,    0,  404,  407,  408,  409,  413,  410,
-
-      411,  410,  414,    0,  415,  412,  413,    0,  411,  408,
-      414,  406,  415,  412,  416,  407,    0,  411,  412,  417,
-      413,  418,  416,  419,  409,  420,    0,  417,  414,  418,
-      421,  419,    0,  420,  418,  422,    0,  423,  421,  415,
-      417,    0,    0,  422,  419,  423,    0,    0,  420,    0,
-        0,    0,    0,    0,    0,    0,  421,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,  422,  425,
-      425,  425,  425,  425,  425,  425,  425,  425,  426,  426,
-      426,  426,  426,  426,  426,  426,  426,  427,  427,  427,
-      427,  427,  427,  427,  427,  427,  428,    0,  428,  429,
-
-      429,  429,  430,  430,    0,  430,  431,  431,  431,  431,
-        0,  431,  431,  431,  431,  432,  432,  432,  432,  432,
-      432,  432,  432,  432,  433,  433,  433,    0,  433,  433,
-      433,  433,  433,  434,    0,  434,  434,  434,  434,  434,
-      434,  434,  435,    0,    0,    0,    0,    0,  435,  436,
-      436,    0,  436,  437,    0,  437,  424,  424,  424,  424,
-      424,  424,  424,  424,  424,  424,  424,  424,  424,  424,
-      424,  424,  424,  424,  424,  424,  424,  424,  424,  424,
-      424,  424,  424,  424,  424,  424,  424,  424,  424,  424,
-      424,  424,  424,  424,  424,  424,  424,  424,  424,  424,
-
-      424,  424,  424,  424,  424,  424,  424,  424,  424,  424,
-      424,  424,  424
+       43,   45,   59,   59,   46,   47,  133,   46,  132,   48,
+       45,   45,   44,   47,   47,   71,   46,   48,   50,  130,
+       46,   47,   72,   71,   46,   70,   50,   73,   47,   74,
+       75,   48,   65,   48,   50,   73,   76,   74,   75,   73,
+       74,   50,   77,  127,   76,   75,   78,   80,  127,   82,
+       77,   76,   79,   63,   78,   80,   74,   82,   76,   81,
+
+       79,   79,   82,   83,   84,   77,   85,   81,   58,   86,
+       80,   83,   84,   56,   85,   84,   80,   86,   87,   30,
+       81,   81,   26,   24,   84,   23,   87,   88,   81,   83,
+       87,   84,   89,   85,   90,   88,   86,   91,   92,   94,
+       89,   95,   90,   93,   88,   91,   92,   94,   96,   95,
+       97,   93,    9,   95,   98,    8,   96,   90,   97,   99,
+       89,   92,   98,   91,    7,   93,  100,   99,   95,   95,
+       99,  101,   97,   98,  100,  102,  103,  104,  100,  101,
+      105,  107,   99,  102,  103,  104,  106,    6,  105,  107,
+        5,    4,  109,  105,  106,  102,  108,  111,  106,  101,
+
+      109,  109,  110,  112,  108,  111,    3,  116,    0,  107,
+      110,  112,    0,  108,  110,  116,  109,  111,  113,  108,
+      109,  114,  115,  112,    0,  117,  113,  113,  111,  114,
+      115,  112,  115,  117,  116,  117,  118,  119,  120,  121,
+      122,  114,    0,  115,  118,  119,  120,  121,  122,  118,
+      123,  121,    0,  124,  136,  120,  137,    0,  123,    0,
+      122,  124,  136,  123,  137,  120,  139,  123,  138,  140,
+      143,    0,  119,    0,  139,    0,  138,  140,  143,  124,
+      141,  138,  142,  139,    0,    0,  140,  144,  141,  141,
+      142,  145,  142,  142,  147,  144,  143,    0,  146,  145,
+
+      150,  148,  147,  149,    0,  147,  146,  152,  150,  148,
+        0,  149,  149,  151,  144,  152,  154,  153,  145,  146,
+      152,  151,  146,  148,  154,  153,  150,  150,  153,  155,
+      156,  157,  158,  151,    0,    0,    0,  155,  156,  157,
+      158,  159,  155,  158,  154,  160,  155,  161,  163,  159,
+      159,    0,  162,  160,  164,  161,  163,  165,  166,  157,
+      162,  163,  164,  162,  167,  165,  166,  164,  161,    0,
+      165,  168,  167,  166,    0,  169,  170,  167,  171,  168,
+      165,    0,  164,  169,  170,  172,  171,  173,  174,  170,
+      168,    0,  171,  172,  175,  173,  174,    0,  176,  169,
+
+      177,  174,  175,    0,  178,  172,  176,  179,  177,  173,
+      180,  177,  178,  181,  182,  179,  178,  183,  180,    0,
+      176,  181,  182,  184,  185,  183,    0,  179,    0,  186,
+      187,  184,  185,  188,  182,  189,  184,  186,  187,  180,
+        0,  188,  190,  189,    0,  191,    0,    0,  181,  192,
+      190,  193,  183,  191,  190,  186,  194,  192,  195,  193,
+      188,  193,  193,    0,  194,  191,  195,    0,  196,    0,
+      197,  192,  198,  193,  199,  195,  196,  196,  197,  203,
+      198,  194,  199,  200,  204,  205,    0,  203,  206,  207,
+        0,  200,  204,  205,  199,  209,  206,  207,  198,  197,
+
+      208,  211,  200,  209,  210,  203,  204,  205,  208,  211,
+      212,    0,  210,  213,  206,  214,    0,  210,  212,  208,
+      215,  213,  213,  214,  214,  216,  217,  212,  215,  211,
+      220,    0,  218,  216,  217,  219,    0,  221,  220,  217,
+      218,  223,  222,  219,  219,  221,  224,    0,  215,  223,
+      222,    0,    0,  216,  224,  218,  225,  226,  220,  222,
+      224,  227,  228,  229,  225,  226,  230,  231,  232,  227,
+      228,  229,  233,  226,  230,  231,  232,  234,  235,    0,
+      233,    0,  236,    0,  237,  234,  235,  233,  238,  227,
+      236,  229,  237,  231,  232,  239,  238,  240,  230,  241,
+
+      242,  243,  244,  239,  245,  240,  235,  241,  242,  243,
+      244,  246,  245,  247,  251,  248,  249,  245,  250,  246,
+      240,  247,  251,  248,  249,  252,  250,  243,  250,  253,
+      244,  254,    0,  252,    0,    0,  252,  253,  251,  254,
+      247,  248,  253,  249,  255,    0,  257,  256,  258,  260,
+      259,    0,  255,  255,  257,  256,  258,  260,  259,  254,
+      256,  261,  262,  263,  267,  258,  259,  264,  265,  261,
+      262,  263,  267,    0,  266,  264,  265,  262,  260,    0,
+      264,  265,  266,    0,  269,  270,  271,  266,  272,  273,
+      261,  263,  269,  270,  271,  274,  272,  273,  275,  276,
+
+      278,  279,  277,  274,    0,    0,  275,  276,  278,  279,
+      277,  275,  269,  277,  271,  281,    0,  280,  282,    0,
+        0,  272,    0,  281,  273,  280,  282,  276,  278,    0,
+      280,  283,  284,  285,  286,  287,    0,  281,  288,  283,
+      284,  285,  286,  287,  282,  284,  288,    0,  289,    0,
+      290,  291,  292,  293,  294,  285,  289,  283,  290,  291,
+      292,  293,  294,  295,  296,  289,  293,  297,  298,  299,
+      294,  295,  296,    0,  300,  297,  298,  299,  301,  291,
+      298,  297,  300,  303,    0,  302,  301,  304,    0,    0,
+      305,  303,  295,  302,  302,  304,  300,  299,  305,  306,
+
+      307,    0,  308,  311,  309,  310,  301,  306,  307,  303,
+      308,  311,  309,  310,  310,  304,    0,    0,    0,  312,
+        0,  313,  314,  315,  311,  306,  309,  312,  307,  313,
+      314,  315,  312,  316,  317,  314,  319,  320,  321,  322,
+        0,  316,  317,  313,  319,  320,  321,  322,  323,  324,
+      315,  325,  326,  327,  328,  329,  323,  324,    0,  325,
+      326,  327,  328,  329,  330,    0,  322,  331,  333,    0,
+      332,    0,  330,  321,  323,  331,  333,  330,  332,  325,
+      334,  332,  328,    0,  335,  336,  337,  338,  334,  339,
+      340,  333,  335,  336,  337,  338,  341,  339,  340,  342,
+
+        0,  343,    0,  344,  341,  345,  346,  342,  337,  343,
+      335,  344,  343,  345,  346,  347,  340,    0,  339,  349,
+      344,  348,    0,  347,  350,  342,    0,  349,  347,  348,
+      348,  351,  350,  352,  350,  353,  354,    0,    0,  351,
+      355,  352,  356,  353,  354,  349,  352,  357,  355,  358,
+      356,    0,    0,  359,  360,  357,  361,  358,  362,  356,
+      357,  359,  360,  363,  361,  364,  362,  365,  355,    0,
+      366,  363,    0,  364,  367,  365,    0,  364,  366,  368,
+      362,  369,  367,  370,  361,    0,  371,  368,  372,  369,
+        0,  370,  373,  365,  371,    0,  372,    0,  368,  374,
+
+      373,  375,  376,  369,    0,  373,  377,  374,  378,  375,
+      376,  374,  371,  379,  377,  380,  378,  381,  377,  382,
+      383,  379,    0,  380,  375,  381,  384,  382,  383,  385,
+      381,  386,  387,  388,  384,  389,  376,  385,    0,  386,
+      387,  388,  390,  389,  391,  392,  388,    0,  383,  393,
+      390,    0,  391,  392,  394,  385,  395,  393,  391,  384,
+      396,  397,  394,  398,  395,  399,  400,  387,  396,  397,
+      401,  398,  402,  399,  400,  399,  394,    0,  401,  400,
+      402,    0,    0,    0,  398,    0,    0,    0,    0,    0,
+      397,    0,    0,    0,    0,    0,  401,  404,  404,  404,
+
+      404,  404,  404,  404,  404,  404,  405,  405,  405,  405,
+      405,  405,  405,  405,  405,  406,  406,  406,  406,  406,
+      406,  406,  406,  406,  407,    0,  407,  408,  408,  408,
+      409,  409,    0,  409,  410,  410,  410,  410,    0,  410,
+      410,  410,  410,  411,  411,  411,  411,  411,  411,  411,
+      411,  411,  412,  412,  412,    0,  412,  412,  412,  412,
+      412,  413,    0,  413,  413,  413,  413,  413,  413,  413,
+      414,    0,    0,    0,    0,    0,  414,  415,  415,    0,
+      415,  416,    0,  416,  403,  403,  403,  403,  403,  403,
+      403,  403,  403,  403,  403,  403,  403,  403,  403,  403,
+
+      403,  403,  403,  403,  403,  403,  403,  403,  403,  403,
+      403,  403,  403,  403,  403,  403,  403,  403,  403,  403,
+      403,  403,  403,  403,  403,  403,  403,  403,  403,  403,
+      403,  403,  403,  403,  403,  403,  403,  403,  403,  403,
+      403
     } ;
 
 static yy_state_type yy_last_accepting_state;
 static char *yy_last_accepting_cpos;
 
-extern int yy_flex_debug;
-int yy_flex_debug = 0;
+
+static int yy_flex_debug = 0;
 
 /* The intent behind this definition is that it'll catch
  * any uses of REJECT which flex missed.
@@ -912,11 +882,12 @@ int yy_flex_debug = 0;
 #define yymore() yymore_used_but_not_detected
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
-char *yytext;
+static char *yytext;
 #line 1 "pars0lex.l"
 /*****************************************************************************
 
-Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2017, MariaDB Corporation.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -951,7 +922,7 @@ Created 12/14/1997 Heikki Tuuri
 *******************************************************/
 #define YY_NO_INPUT 1
 #define YY_NO_UNISTD_H 1
-#line 53 "pars0lex.l"
+#line 54 "pars0lex.l"
 #define YYSTYPE que_node_t*
 
 #include "univ.i"
@@ -1003,7 +974,7 @@ string_append(
 
 
 
-#line 1006 "lexyy.cc"
+#line 977 "lexyy.cc"
 
 #define INITIAL 0
 #define comment 1
@@ -1029,29 +1000,29 @@ static int yy_init_globals (void );
 
 MY_ATTRIBUTE((unused)) static int yylex_destroy (void );
 
-int yyget_debug (void );
+MY_ATTRIBUTE((unused)) static int yyget_debug (void );
 
-void yyset_debug (int debug_flag  );
+MY_ATTRIBUTE((unused)) static void yyset_debug (int debug_flag  );
 
 YY_EXTRA_TYPE yyget_extra (void );
 
-void yyset_extra (YY_EXTRA_TYPE user_defined  );
 
-FILE *yyget_in (void );
 
-void yyset_in  (FILE * in_str  );
+MY_ATTRIBUTE((unused)) static FILE *yyget_in (void );
+
+MY_ATTRIBUTE((unused)) static void yyset_in  (FILE * _in_str  );
 
-FILE *yyget_out (void );
+MY_ATTRIBUTE((unused)) static FILE *yyget_out (void );
 
-void yyset_out  (FILE * out_str  );
+MY_ATTRIBUTE((unused)) static void yyset_out  (FILE * _out_str  );
 
-yy_size_t yyget_leng (void );
+			MY_ATTRIBUTE((unused)) static int yyget_leng (void );
 
-char *yyget_text (void );
+MY_ATTRIBUTE((unused)) static char *yyget_text (void );
 
-int yyget_lineno (void );
+MY_ATTRIBUTE((unused)) static int yyget_lineno (void );
 
-void yyset_lineno (int line_number  );
+MY_ATTRIBUTE((unused)) static void yyset_lineno (int _line_number  );
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1065,6 +1036,10 @@ extern int yywrap (void );
 #endif
 #endif
 
+#ifndef YY_NO_UNPUT
+    
+#endif
+
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
@@ -1098,7 +1073,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1122,7 +1097,7 @@ static int input (void );
 	else \
 		{ \
 		errno=0; \
-		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+		while ( (result = (int) fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
 			{ \
 			if( errno != EINTR) \
 				{ \
@@ -1177,7 +1152,7 @@ extern int yylex (void);
 
 /* Code executed at the end of each rule. */
 #ifndef YY_BREAK
-#define YY_BREAK break;
+#define YY_BREAK /*LINTED*/break;
 #endif
 
 #define YY_RULE_SETUP \
@@ -1187,15 +1162,10 @@ extern int yylex (void);
  */
 YY_DECL
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
-
-#line 112 "pars0lex.l"
-
-
-#line 1197 "lexyy.cc"
-
+	yy_state_type yy_current_state;
+	char *yy_cp, *yy_bp;
+	int yy_act;
+    
 	if ( !(yy_init) )
 		{
 		(yy_init) = 1;
@@ -1222,7 +1192,13 @@ YY_DECL
 		yy_load_buffer_state( );
 		}
 
-	while ( 1 )		/* loops until end-of-file is reached */
+	{
+#line 113 "pars0lex.l"
+
+
+#line 1199 "lexyy.cc"
+
+	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
 		yy_cp = (yy_c_buf_p);
 
@@ -1238,7 +1214,7 @@ YY_DECL
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
 			if ( yy_accept[yy_current_state] )
 				{
 				(yy_last_accepting_state) = yy_current_state;
@@ -1247,13 +1223,13 @@ YY_DECL
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 425 )
+				if ( yy_current_state >= 404 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
 			++yy_cp;
 			}
-		while ( yy_current_state != 424 );
+		while ( yy_current_state != 403 );
 		yy_cp = (yy_last_accepting_cpos);
 		yy_current_state = (yy_last_accepting_state);
 
@@ -1275,7 +1251,7 @@ YY_DECL
 
 case 1:
 YY_RULE_SETUP
-#line 114 "pars0lex.l"
+#line 115 "pars0lex.l"
 {
 			yylval = sym_tab_add_int_lit(pars_sym_tab_global,
 								atoi(yytext));
@@ -1284,7 +1260,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 120 "pars0lex.l"
+#line 121 "pars0lex.l"
 {
 			ut_error;	/* not implemented */
 
@@ -1293,7 +1269,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 126 "pars0lex.l"
+#line 127 "pars0lex.l"
 {
 			ulint	type;
 
@@ -1305,7 +1281,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 135 "pars0lex.l"
+#line 136 "pars0lex.l"
 {
 			yylval = sym_tab_add_bound_id(pars_sym_tab_global,
 				yytext + 1);
@@ -1315,7 +1291,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 142 "pars0lex.l"
+#line 143 "pars0lex.l"
 {
 /* Quoted character string literals are handled in an explicit
 start state 'quoted'.  This state is entered and the buffer for
@@ -1329,7 +1305,7 @@ In the state 'quoted', only two actions are possible (defined below). */
 case 6:
 /* rule 6 can match eol */
 YY_RULE_SETUP
-#line 151 "pars0lex.l"
+#line 152 "pars0lex.l"
 {
 			/* Got a sequence of characters other than "'":
 			append to string buffer */
@@ -1338,7 +1314,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 156 "pars0lex.l"
+#line 157 "pars0lex.l"
 {
 			/* Got a sequence of "'" characters:
 			append half of them to string buffer,
@@ -1365,7 +1341,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 180 "pars0lex.l"
+#line 181 "pars0lex.l"
 {
 /* Quoted identifiers are handled in an explicit start state 'id'.
 This state is entered and the buffer for the scanned string is emptied
@@ -1379,7 +1355,7 @@ In the state 'id', only two actions are possible (defined below). */
 case 9:
 /* rule 9 can match eol */
 YY_RULE_SETUP
-#line 189 "pars0lex.l"
+#line 190 "pars0lex.l"
 {
 			/* Got a sequence of characters other than '"':
 			append to string buffer */
@@ -1388,7 +1364,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 194 "pars0lex.l"
+#line 195 "pars0lex.l"
 {
 			/* Got a sequence of '"' characters:
 			append half of them to string buffer,
@@ -1416,7 +1392,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 219 "pars0lex.l"
+#line 220 "pars0lex.l"
 {
 			yylval = sym_tab_add_null_lit(pars_sym_tab_global);
 
@@ -1425,7 +1401,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 225 "pars0lex.l"
+#line 226 "pars0lex.l"
 {
 			/* Implicit cursor name */
 			yylval = sym_tab_add_str_lit(pars_sym_tab_global,
@@ -1435,643 +1411,644 @@ YY_RULE_SETUP
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 232 "pars0lex.l"
+#line 233 "pars0lex.l"
 {
 			return(PARS_AND_TOKEN);
 }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 236 "pars0lex.l"
+#line 237 "pars0lex.l"
 {
 			return(PARS_OR_TOKEN);
 }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 240 "pars0lex.l"
+#line 241 "pars0lex.l"
 {
 			return(PARS_NOT_TOKEN);
 }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 244 "pars0lex.l"
+#line 245 "pars0lex.l"
 {
 			return(PARS_PROCEDURE_TOKEN);
 }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 248 "pars0lex.l"
+#line 249 "pars0lex.l"
 {
 			return(PARS_IN_TOKEN);
 }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 252 "pars0lex.l"
+#line 253 "pars0lex.l"
 {
 			return(PARS_OUT_TOKEN);
 }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 256 "pars0lex.l"
+#line 257 "pars0lex.l"
 {
 			return(PARS_BINARY_TOKEN);
 }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 260 "pars0lex.l"
+#line 261 "pars0lex.l"
 {
 			return(PARS_BLOB_TOKEN);
 }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 264 "pars0lex.l"
+#line 265 "pars0lex.l"
 {
 			return(PARS_INT_TOKEN);
 }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 268 "pars0lex.l"
+#line 269 "pars0lex.l"
 {
 			return(PARS_INT_TOKEN);
 }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 272 "pars0lex.l"
+#line 273 "pars0lex.l"
 {
 			return(PARS_FLOAT_TOKEN);
 }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 276 "pars0lex.l"
+#line 277 "pars0lex.l"
 {
 			return(PARS_CHAR_TOKEN);
 }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 280 "pars0lex.l"
+#line 281 "pars0lex.l"
 {
 			return(PARS_IS_TOKEN);
 }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 284 "pars0lex.l"
+#line 285 "pars0lex.l"
 {
 			return(PARS_BEGIN_TOKEN);
 }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 288 "pars0lex.l"
+#line 289 "pars0lex.l"
 {
 			return(PARS_END_TOKEN);
 }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 292 "pars0lex.l"
+#line 293 "pars0lex.l"
 {
 			return(PARS_IF_TOKEN);
 }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 296 "pars0lex.l"
+#line 297 "pars0lex.l"
 {
 			return(PARS_THEN_TOKEN);
 }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 300 "pars0lex.l"
+#line 301 "pars0lex.l"
 {
 			return(PARS_ELSE_TOKEN);
 }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 304 "pars0lex.l"
+#line 305 "pars0lex.l"
 {
 			return(PARS_ELSIF_TOKEN);
 }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 308 "pars0lex.l"
+#line 309 "pars0lex.l"
 {
 			return(PARS_LOOP_TOKEN);
 }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 312 "pars0lex.l"
+#line 313 "pars0lex.l"
 {
 			return(PARS_WHILE_TOKEN);
 }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 316 "pars0lex.l"
+#line 317 "pars0lex.l"
 {
 			return(PARS_RETURN_TOKEN);
 }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 320 "pars0lex.l"
+#line 321 "pars0lex.l"
 {
 			return(PARS_SELECT_TOKEN);
 }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 324 "pars0lex.l"
+#line 325 "pars0lex.l"
 {
 			return(PARS_SUM_TOKEN);
 }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 328 "pars0lex.l"
+#line 329 "pars0lex.l"
 {
 			return(PARS_COUNT_TOKEN);
 }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 332 "pars0lex.l"
+#line 333 "pars0lex.l"
 {
 			return(PARS_DISTINCT_TOKEN);
 }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 336 "pars0lex.l"
+#line 337 "pars0lex.l"
 {
 			return(PARS_FROM_TOKEN);
 }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 340 "pars0lex.l"
+#line 341 "pars0lex.l"
 {
 			return(PARS_WHERE_TOKEN);
 }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 344 "pars0lex.l"
+#line 345 "pars0lex.l"
 {
 			return(PARS_FOR_TOKEN);
 }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 348 "pars0lex.l"
+#line 349 "pars0lex.l"
 {
 			return(PARS_READ_TOKEN);
 }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 352 "pars0lex.l"
+#line 353 "pars0lex.l"
 {
 			return(PARS_ORDER_TOKEN);
 }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 356 "pars0lex.l"
+#line 357 "pars0lex.l"
 {
 			return(PARS_BY_TOKEN);
 }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 360 "pars0lex.l"
+#line 361 "pars0lex.l"
 {
 			return(PARS_ASC_TOKEN);
 }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 364 "pars0lex.l"
+#line 365 "pars0lex.l"
 {
 			return(PARS_DESC_TOKEN);
 }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 368 "pars0lex.l"
+#line 369 "pars0lex.l"
 {
 			return(PARS_INSERT_TOKEN);
 }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 372 "pars0lex.l"
+#line 373 "pars0lex.l"
 {
 			return(PARS_INTO_TOKEN);
 }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 376 "pars0lex.l"
+#line 377 "pars0lex.l"
 {
 			return(PARS_VALUES_TOKEN);
 }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 380 "pars0lex.l"
+#line 381 "pars0lex.l"
 {
 			return(PARS_UPDATE_TOKEN);
 }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 384 "pars0lex.l"
+#line 385 "pars0lex.l"
 {
 			return(PARS_SET_TOKEN);
 }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 388 "pars0lex.l"
+#line 389 "pars0lex.l"
 {
 			return(PARS_DELETE_TOKEN);
 }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 392 "pars0lex.l"
+#line 393 "pars0lex.l"
 {
 			return(PARS_CURRENT_TOKEN);
 }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 396 "pars0lex.l"
+#line 397 "pars0lex.l"
 {
 			return(PARS_OF_TOKEN);
 }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 400 "pars0lex.l"
+#line 401 "pars0lex.l"
 {
 			return(PARS_CREATE_TOKEN);
 }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 404 "pars0lex.l"
+#line 405 "pars0lex.l"
 {
 			return(PARS_TABLE_TOKEN);
 }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 408 "pars0lex.l"
+#line 409 "pars0lex.l"
 {
 			return(PARS_COMPACT_TOKEN);
 }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 412 "pars0lex.l"
+#line 413 "pars0lex.l"
 {
 			return(PARS_BLOCK_SIZE_TOKEN);
 }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 416 "pars0lex.l"
+#line 417 "pars0lex.l"
 {
 			return(PARS_INDEX_TOKEN);
 }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 420 "pars0lex.l"
+#line 421 "pars0lex.l"
 {
 			return(PARS_UNIQUE_TOKEN);
 }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 424 "pars0lex.l"
+#line 425 "pars0lex.l"
 {
 			return(PARS_CLUSTERED_TOKEN);
 }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 428 "pars0lex.l"
+#line 429 "pars0lex.l"
 {
-			return(PARS_DOES_NOT_FIT_IN_MEM_TOKEN);
+			return(PARS_ON_TOKEN);
 }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 432 "pars0lex.l"
+#line 433 "pars0lex.l"
 {
-			return(PARS_ON_TOKEN);
+			return(PARS_DECLARE_TOKEN);
 }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 436 "pars0lex.l"
+#line 437 "pars0lex.l"
 {
-			return(PARS_DECLARE_TOKEN);
+			return(PARS_CURSOR_TOKEN);
 }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 440 "pars0lex.l"
+#line 441 "pars0lex.l"
 {
-			return(PARS_CURSOR_TOKEN);
+			return(PARS_OPEN_TOKEN);
 }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 444 "pars0lex.l"
+#line 445 "pars0lex.l"
 {
-			return(PARS_OPEN_TOKEN);
+			return(PARS_FETCH_TOKEN);
 }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 448 "pars0lex.l"
+#line 449 "pars0lex.l"
 {
-			return(PARS_FETCH_TOKEN);
+			return(PARS_CLOSE_TOKEN);
 }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 452 "pars0lex.l"
+#line 453 "pars0lex.l"
 {
-			return(PARS_CLOSE_TOKEN);
+			return(PARS_NOTFOUND_TOKEN);
 }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 456 "pars0lex.l"
+#line 457 "pars0lex.l"
 {
-			return(PARS_NOTFOUND_TOKEN);
+			return(PARS_TO_CHAR_TOKEN);
 }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 460 "pars0lex.l"
+#line 461 "pars0lex.l"
 {
-			return(PARS_TO_CHAR_TOKEN);
+			return(PARS_TO_NUMBER_TOKEN);
 }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 464 "pars0lex.l"
+#line 465 "pars0lex.l"
 {
-			return(PARS_TO_NUMBER_TOKEN);
+			return(PARS_TO_BINARY_TOKEN);
 }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 468 "pars0lex.l"
+#line 469 "pars0lex.l"
 {
-			return(PARS_TO_BINARY_TOKEN);
+			return(PARS_BINARY_TO_NUMBER_TOKEN);
 }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 472 "pars0lex.l"
+#line 473 "pars0lex.l"
 {
-			return(PARS_BINARY_TO_NUMBER_TOKEN);
+			return(PARS_SUBSTR_TOKEN);
 }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 476 "pars0lex.l"
+#line 477 "pars0lex.l"
 {
-			return(PARS_SUBSTR_TOKEN);
+			return(PARS_REPLSTR_TOKEN);
 }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 480 "pars0lex.l"
+#line 481 "pars0lex.l"
 {
-			return(PARS_REPLSTR_TOKEN);
+			return(PARS_CONCAT_TOKEN);
 }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 484 "pars0lex.l"
+#line 485 "pars0lex.l"
 {
-			return(PARS_CONCAT_TOKEN);
+			return(PARS_INSTR_TOKEN);
 }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 488 "pars0lex.l"
+#line 489 "pars0lex.l"
 {
-			return(PARS_INSTR_TOKEN);
+			return(PARS_LENGTH_TOKEN);
 }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 492 "pars0lex.l"
+#line 493 "pars0lex.l"
 {
-			return(PARS_LENGTH_TOKEN);
+			return(PARS_SYSDATE_TOKEN);
 }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 496 "pars0lex.l"
+#line 497 "pars0lex.l"
 {
-			return(PARS_SYSDATE_TOKEN);
+			return(PARS_PRINTF_TOKEN);
 }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 500 "pars0lex.l"
+#line 501 "pars0lex.l"
 {
-			return(PARS_PRINTF_TOKEN);
+			return(PARS_ASSERT_TOKEN);
 }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 504 "pars0lex.l"
+#line 505 "pars0lex.l"
 {
-			return(PARS_ASSERT_TOKEN);
+			return(PARS_RND_TOKEN);
 }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 508 "pars0lex.l"
+#line 509 "pars0lex.l"
 {
-			return(PARS_RND_TOKEN);
+			return(PARS_RND_STR_TOKEN);
 }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 512 "pars0lex.l"
+#line 513 "pars0lex.l"
 {
-			return(PARS_RND_STR_TOKEN);
+			return(PARS_ROW_PRINTF_TOKEN);
 }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 516 "pars0lex.l"
+#line 517 "pars0lex.l"
 {
-			return(PARS_ROW_PRINTF_TOKEN);
+			return(PARS_COMMIT_TOKEN);
 }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 520 "pars0lex.l"
+#line 521 "pars0lex.l"
 {
-			return(PARS_COMMIT_TOKEN);
+			return(PARS_ROLLBACK_TOKEN);
 }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 524 "pars0lex.l"
+#line 525 "pars0lex.l"
 {
-			return(PARS_ROLLBACK_TOKEN);
+			return(PARS_WORK_TOKEN);
 }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 528 "pars0lex.l"
+#line 529 "pars0lex.l"
 {
-			return(PARS_WORK_TOKEN);
+			return(PARS_UNSIGNED_TOKEN);
 }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 532 "pars0lex.l"
+#line 533 "pars0lex.l"
 {
-			return(PARS_UNSIGNED_TOKEN);
+			return(PARS_EXIT_TOKEN);
 }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 536 "pars0lex.l"
+#line 537 "pars0lex.l"
 {
-			return(PARS_EXIT_TOKEN);
+			return(PARS_FUNCTION_TOKEN);
 }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 540 "pars0lex.l"
+#line 541 "pars0lex.l"
 {
-			return(PARS_FUNCTION_TOKEN);
+			return(PARS_LOCK_TOKEN);
 }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 544 "pars0lex.l"
+#line 545 "pars0lex.l"
 {
-			return(PARS_LOCK_TOKEN);
+			return(PARS_SHARE_TOKEN);
 }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 548 "pars0lex.l"
+#line 549 "pars0lex.l"
 {
-			return(PARS_SHARE_TOKEN);
+			return(PARS_MODE_TOKEN);
 }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 552 "pars0lex.l"
+#line 553 "pars0lex.l"
 {
-			return(PARS_MODE_TOKEN);
+                        return(PARS_LIKE_TOKEN);
 }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 556 "pars0lex.l"
+#line 557 "pars0lex.l"
 {
-                        return(PARS_LIKE_TOKEN);
+			return(PARS_BIGINT_TOKEN);
 }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 560 "pars0lex.l"
+#line 561 "pars0lex.l"
 {
-			return(PARS_BIGINT_TOKEN);
+			yylval = sym_tab_add_id(pars_sym_tab_global,
+							(byte*) yytext,
+							ut_strlen(yytext));
+			return(PARS_ID_TOKEN);
 }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 564 "pars0lex.l"
+#line 568 "pars0lex.l"
 {
 			yylval = sym_tab_add_id(pars_sym_tab_global,
 							(byte*) yytext,
 							ut_strlen(yytext));
-			return(PARS_ID_TOKEN);
+			return(PARS_TABLE_NAME_TOKEN);
 }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 571 "pars0lex.l"
+#line 575 "pars0lex.l"
 {
-			yylval = sym_tab_add_id(pars_sym_tab_global,
-							(byte*) yytext,
-							ut_strlen(yytext));
-			return(PARS_TABLE_NAME_TOKEN);
+			return(PARS_DDOT_TOKEN);
 }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 578 "pars0lex.l"
+#line 579 "pars0lex.l"
 {
-			return(PARS_DDOT_TOKEN);
+			return(PARS_ASSIGN_TOKEN);
 }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 582 "pars0lex.l"
+#line 583 "pars0lex.l"
 {
-			return(PARS_ASSIGN_TOKEN);
+			return(PARS_LE_TOKEN);
 }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 586 "pars0lex.l"
+#line 587 "pars0lex.l"
 {
-			return(PARS_LE_TOKEN);
+			return(PARS_GE_TOKEN);
 }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 590 "pars0lex.l"
+#line 591 "pars0lex.l"
 {
-			return(PARS_GE_TOKEN);
+			return(PARS_NE_TOKEN);
 }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 594 "pars0lex.l"
+#line 595 "pars0lex.l"
 {
-			return(PARS_NE_TOKEN);
+
+			return((int)(*yytext));
 }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 598 "pars0lex.l"
+#line 600 "pars0lex.l"
 {
 
 			return((int)(*yytext));
@@ -2079,7 +2056,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 603 "pars0lex.l"
+#line 605 "pars0lex.l"
 {
 
 			return((int)(*yytext));
@@ -2087,7 +2064,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 608 "pars0lex.l"
+#line 610 "pars0lex.l"
 {
 
 			return((int)(*yytext));
@@ -2095,7 +2072,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 613 "pars0lex.l"
+#line 615 "pars0lex.l"
 {
 
 			return((int)(*yytext));
@@ -2103,7 +2080,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 618 "pars0lex.l"
+#line 620 "pars0lex.l"
 {
 
 			return((int)(*yytext));
@@ -2111,7 +2088,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 623 "pars0lex.l"
+#line 625 "pars0lex.l"
 {
 
 			return((int)(*yytext));
@@ -2119,7 +2096,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 628 "pars0lex.l"
+#line 630 "pars0lex.l"
 {
 
 			return((int)(*yytext));
@@ -2127,7 +2104,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 633 "pars0lex.l"
+#line 635 "pars0lex.l"
 {
 
 			return((int)(*yytext));
@@ -2135,7 +2112,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 638 "pars0lex.l"
+#line 640 "pars0lex.l"
 {
 
 			return((int)(*yytext));
@@ -2143,7 +2120,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 643 "pars0lex.l"
+#line 645 "pars0lex.l"
 {
 
 			return((int)(*yytext));
@@ -2151,7 +2128,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 648 "pars0lex.l"
+#line 650 "pars0lex.l"
 {
 
 			return((int)(*yytext));
@@ -2159,7 +2136,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 653 "pars0lex.l"
+#line 655 "pars0lex.l"
 {
 
 			return((int)(*yytext));
@@ -2167,7 +2144,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 658 "pars0lex.l"
+#line 660 "pars0lex.l"
 {
 
 			return((int)(*yytext));
@@ -2175,7 +2152,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 663 "pars0lex.l"
+#line 665 "pars0lex.l"
 {
 
 			return((int)(*yytext));
@@ -2183,43 +2160,35 @@ YY_RULE_SETUP
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 668 "pars0lex.l"
-{
-
-			return((int)(*yytext));
-}
+#line 670 "pars0lex.l"
+BEGIN(comment); /* eat up comment */
 	YY_BREAK
 case 118:
+/* rule 118 can match eol */
 YY_RULE_SETUP
-#line 673 "pars0lex.l"
-BEGIN(comment); /* eat up comment */
+#line 672 "pars0lex.l"
+
 	YY_BREAK
 case 119:
 /* rule 119 can match eol */
 YY_RULE_SETUP
-#line 675 "pars0lex.l"
+#line 673 "pars0lex.l"
 
 	YY_BREAK
 case 120:
-/* rule 120 can match eol */
 YY_RULE_SETUP
-#line 676 "pars0lex.l"
-
+#line 674 "pars0lex.l"
+BEGIN(INITIAL);
 	YY_BREAK
 case 121:
+/* rule 121 can match eol */
 YY_RULE_SETUP
-#line 677 "pars0lex.l"
-BEGIN(INITIAL);
+#line 676 "pars0lex.l"
+/* eat up whitespace */
 	YY_BREAK
 case 122:
-/* rule 122 can match eol */
 YY_RULE_SETUP
 #line 679 "pars0lex.l"
-/* eat up whitespace */
-	YY_BREAK
-case 123:
-YY_RULE_SETUP
-#line 682 "pars0lex.l"
 {
 			fprintf(stderr,"Unrecognized character: %02x\n",
 				*yytext);
@@ -2229,12 +2198,12 @@ YY_RULE_SETUP
 			return(0);
 }
 	YY_BREAK
-case 124:
+case 123:
 YY_RULE_SETUP
-#line 691 "pars0lex.l"
+#line 688 "pars0lex.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2237 "lexyy.cc"
+#line 2206 "lexyy.cc"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(comment):
 case YY_STATE_EOF(quoted):
@@ -2369,6 +2338,7 @@ case YY_STATE_EOF(id):
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
+	} /* end of user's declarations */
 } /* end of yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
@@ -2380,9 +2350,9 @@ case YY_STATE_EOF(id):
  */
 static int yy_get_next_buffer (void)
 {
-	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
-	register int number_to_move, i;
+    	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	char *source = (yytext_ptr);
+	int number_to_move, i;
 	int ret_val;
 
 	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
@@ -2411,7 +2381,7 @@ static int yy_get_next_buffer (void)
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1);
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
@@ -2424,21 +2394,21 @@ static int yy_get_next_buffer (void)
 
 	else
 		{
-			int num_to_read = static_cast<int>(
-				YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1);
+			int num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
-		{ /* Not enough room in the buffer - grow it. */
+			{ /* Not enough room in the buffer - grow it. */
 
 			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
 
 			int yy_c_buf_p_offset =
 				(int) ((yy_c_buf_p) - b->yy_ch_buf);
 
 			if ( b->yy_is_our_buffer )
 				{
-				int new_size = static_cast<int>(b->yy_buf_size * 2);
+				int new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->yy_buf_size += b->yy_buf_size / 8;
@@ -2451,7 +2421,7 @@ static int yy_get_next_buffer (void)
 				}
 			else
 				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
+				b->yy_ch_buf = NULL;
 
 			if ( ! b->yy_ch_buf )
 				YY_FATAL_ERROR(
@@ -2459,17 +2429,17 @@ static int yy_get_next_buffer (void)
 
 			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
 
-			num_to_read = static_cast<int>(
-				YY_CURRENT_BUFFER_LVALUE->yy_buf_size
-				- number_to_move - 1);
-		}
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
+
+			}
 
 		if ( num_to_read > YY_READ_BUF_SIZE )
 			num_to_read = YY_READ_BUF_SIZE;
 
 		/* Read in more data. */
 		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), (size_t) num_to_read );
+			(yy_n_chars), num_to_read );
 
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
@@ -2493,9 +2463,9 @@ static int yy_get_next_buffer (void)
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+	if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
 		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
 		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
 		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
 			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
@@ -2512,16 +2482,16 @@ static int yy_get_next_buffer (void)
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
 
-yy_state_type yy_get_previous_state (void)
+    static yy_state_type yy_get_previous_state (void)
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
-
+	yy_state_type yy_current_state;
+	char *yy_cp;
+    
 	yy_current_state = (yy_start);
 
 	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
 		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		if ( yy_accept[yy_current_state] )
 			{
 			(yy_last_accepting_state) = yy_current_state;
@@ -2530,10 +2500,10 @@ yy_state_type yy_get_previous_state (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 425 )
+			if ( yy_current_state >= 404 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
 		}
 
 	return yy_current_state;
@@ -2544,12 +2514,12 @@ yy_state_type yy_get_previous_state (void)
  * synopsis
  *	next_state = yy_try_NUL_trans( current_state );
  */
-static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
 {
-	register int yy_is_jam;
-	register char *yy_cp = (yy_c_buf_p);
+	int yy_is_jam;
+    	char *yy_cp = (yy_c_buf_p);
 
-	register YY_CHAR yy_c = 1;
+	YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
 		(yy_last_accepting_state) = yy_current_state;
@@ -2558,15 +2528,19 @@ static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 425 )
+		if ( yy_current_state >= 404 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 424);
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
+	yy_is_jam = (yy_current_state == 403);
 
-	return yy_is_jam ? 0 : yy_current_state;
+		return yy_is_jam ? 0 : yy_current_state;
 }
 
+#ifndef YY_NO_UNPUT
+
+#endif
+
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
     static int yyinput (void)
@@ -2576,7 +2550,7 @@ static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
 
 {
 	int c;
-
+    
 	*(yy_c_buf_p) = (yy_hold_char);
 
 	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
@@ -2615,7 +2589,7 @@ static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
 				case EOB_ACT_END_OF_FILE:
 					{
 					if ( yywrap( ) )
-						return EOF;
+						return 0;
 
 					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
@@ -2643,16 +2617,16 @@ static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
 
 /** Immediately switch to a different input stream.
  * @param input_file A readable stream.
- *
+ * 
  * @note This function does not reset the start condition to @c INITIAL .
  */
-void yyrestart  (FILE * input_file )
+    static void yyrestart  (FILE * input_file )
 {
-
+    
 	if ( ! YY_CURRENT_BUFFER ){
-		yyensure_buffer_stack ();
+        yyensure_buffer_stack ();
 		YY_CURRENT_BUFFER_LVALUE =
-		yy_create_buffer(yyin,YY_BUF_SIZE );
+            yy_create_buffer(yyin,YY_BUF_SIZE );
 	}
 
 	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
@@ -2661,16 +2635,16 @@ void yyrestart  (FILE * input_file )
 
 /** Switch to a different input buffer.
  * @param new_buffer The new input buffer.
- *
+ * 
  */
-MY_ATTRIBUTE((unused)) static void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+    MY_ATTRIBUTE((unused)) static void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
-
+    
 	/* TODO. We should be able to replace this entire function body
 	 * with
 	 *		yypop_buffer_state();
 	 *		yypush_buffer_state(new_buffer);
-	 */
+     */
 	yyensure_buffer_stack ();
 	if ( YY_CURRENT_BUFFER == new_buffer )
 		return;
@@ -2696,7 +2670,7 @@ MY_ATTRIBUTE((unused)) static void yy_switch_to_buffer  (YY_BUFFER_STATE  new_bu
 
 static void yy_load_buffer_state  (void)
 {
-	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
 	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
 	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
 	(yy_hold_char) = *(yy_c_buf_p);
@@ -2705,18 +2679,18 @@ static void yy_load_buffer_state  (void)
 /** Allocate and initialize an input buffer state.
  * @param file A readable stream.
  * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- *
+ * 
  * @return the allocated buffer state.
  */
-static YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
+    static YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
 {
 	YY_BUFFER_STATE b;
-
+    
 	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
-	b->yy_buf_size = size;
+	b->yy_buf_size = (yy_size_t)size;
 
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
@@ -2734,11 +2708,11 @@ static YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
 
 /** Destroy the buffer.
  * @param b a buffer created with yy_create_buffer()
- *
+ * 
  */
-void yy_delete_buffer (YY_BUFFER_STATE  b )
+    static void yy_delete_buffer (YY_BUFFER_STATE  b )
 {
-
+    
 	if ( ! b )
 		return;
 
@@ -2755,37 +2729,37 @@ void yy_delete_buffer (YY_BUFFER_STATE  b )
  * This function is sometimes called more than once on the same buffer,
  * such as during a yyrestart() or at EOF.
  */
-static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
 {
 	int oerrno = errno;
-
+    
 	yy_flush_buffer(b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-	/* If b is the current buffer, then yy_init_buffer was _probably_
-	 * called from yyrestart() or through yy_get_next_buffer.
-	 * In that case, we don't want to reset the lineno or column.
-	 */
-	if (b != YY_CURRENT_BUFFER){
-		b->yy_bs_lineno = 1;
-		b->yy_bs_column = 0;
-	}
-
-	b->yy_is_interactive = 0;
-
+    /* If b is the current buffer, then yy_init_buffer was _probably_
+     * called from yyrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = 0;
+    
 	errno = oerrno;
 }
 
 /** Discard all buffered characters. On the next scan, YY_INPUT will be called.
  * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- *
+ * 
  */
-void yy_flush_buffer (YY_BUFFER_STATE  b )
+    static void yy_flush_buffer (YY_BUFFER_STATE  b )
 {
-	if ( ! b )
+    	if ( ! b )
 		return;
 
 	b->yy_n_chars = 0;
@@ -2810,11 +2784,11 @@ void yy_flush_buffer (YY_BUFFER_STATE  b )
  *  the current state. This function will allocate the stack
  *  if necessary.
  *  @param new_buffer The new state.
- *
+ *  
  */
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
+MY_ATTRIBUTE((unused)) static void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
 {
-	if (new_buffer == NULL)
+    	if (new_buffer == NULL)
 		return;
 
 	yyensure_buffer_stack();
@@ -2840,11 +2814,11 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
 
 /** Removes and deletes the top of the stack, if present.
  *  The next element becomes the new top.
- *
+ *  
  */
-void yypop_buffer_state (void)
+MY_ATTRIBUTE((unused)) static void yypop_buffer_state (void)
 {
-	if (!YY_CURRENT_BUFFER)
+    	if (!YY_CURRENT_BUFFER)
 		return;
 
 	yy_delete_buffer(YY_CURRENT_BUFFER );
@@ -2864,14 +2838,14 @@ void yypop_buffer_state (void)
 static void yyensure_buffer_stack (void)
 {
 	int num_to_alloc;
-
+    
 	if (!(yy_buffer_stack)) {
 
 		/* First allocation is just for 2 elements, since we don't know if this
 		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
 		 * immediate realloc on the next call.
-		 */
-		num_to_alloc = 1;
+         */
+      num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
 		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
@@ -2888,10 +2862,9 @@ static void yyensure_buffer_stack (void)
 	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
 
 		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
+		yy_size_t grow_size = 8 /* arbitrary grow size */;
 
-		num_to_alloc = static_cast<int>(
-			(yy_buffer_stack_max) + grow_size);
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
 		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
 								((yy_buffer_stack),
 								num_to_alloc * sizeof(struct yy_buffer_state*)
@@ -2909,9 +2882,9 @@ static void yyensure_buffer_stack (void)
 #define YY_EXIT_FAILURE 2
 #endif
 
-static void yy_fatal_error (yyconst char* msg )
+static void yynoreturn yy_fatal_error (yyconst char* msg )
 {
-	(void) fprintf( stderr, "%s\n", msg );
+			(void) fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
 }
 
@@ -2922,8 +2895,8 @@ static void yy_fatal_error (yyconst char* msg )
 	do \
 		{ \
 		/* Undo effects of setting up yytext. */ \
-		int yyless_macro_arg = (n); \
-		YY_LESS_LINENO(yyless_macro_arg);\
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
 		yytext[yyleng] = (yy_hold_char); \
 		(yy_c_buf_p) = yytext + yyless_macro_arg; \
 		(yy_hold_char) = *(yy_c_buf_p); \
@@ -2935,116 +2908,116 @@ static void yy_fatal_error (yyconst char* msg )
 /* Accessor  methods (get/set functions) to struct members. */
 
 /** Get the current line number.
- *
+ * 
  */
-int yyget_lineno  (void)
+MY_ATTRIBUTE((unused)) static int yyget_lineno  (void)
 {
-
-	return yylineno;
+    
+    return yylineno;
 }
 
 /** Get the input stream.
- *
+ * 
  */
-FILE *yyget_in  (void)
+MY_ATTRIBUTE((unused)) static FILE *yyget_in  (void)
 {
-	return yyin;
+        return yyin;
 }
 
 /** Get the output stream.
- *
+ * 
  */
-FILE *yyget_out  (void)
+MY_ATTRIBUTE((unused)) static FILE *yyget_out  (void)
 {
-	return yyout;
+        return yyout;
 }
 
 /** Get the length of the current token.
- *
+ * 
  */
-yy_size_t yyget_leng  (void)
+MY_ATTRIBUTE((unused)) static int yyget_leng  (void)
 {
-	return yyleng;
+        return yyleng;
 }
 
 /** Get the current token.
- *
+ * 
  */
 
-char *yyget_text  (void)
+MY_ATTRIBUTE((unused)) static char *yyget_text  (void)
 {
-	return yytext;
+        return yytext;
 }
 
 /** Set the current line number.
- * @param line_number
- *
+ * @param _line_number line number
+ * 
  */
-void yyset_lineno (int  line_number )
+MY_ATTRIBUTE((unused)) static void yyset_lineno (int  _line_number )
 {
-
-	yylineno = line_number;
+    
+    yylineno = _line_number;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
- * @param in_str A readable stream.
- *
+ * @param _in_str A readable stream.
+ * 
  * @see yy_switch_to_buffer
  */
-void yyset_in (FILE *  in_str )
+MY_ATTRIBUTE((unused)) static void yyset_in (FILE *  _in_str )
 {
-	yyin = in_str ;
+        yyin = _in_str ;
 }
 
-void yyset_out (FILE *  out_str )
+MY_ATTRIBUTE((unused)) static void yyset_out (FILE *  _out_str )
 {
-	yyout = out_str ;
+        yyout = _out_str ;
 }
 
-int yyget_debug  (void)
+MY_ATTRIBUTE((unused)) static int yyget_debug  (void)
 {
-	return yy_flex_debug;
+        return yy_flex_debug;
 }
 
-void yyset_debug (int  bdebug )
+MY_ATTRIBUTE((unused)) static void yyset_debug (int  _bdebug )
 {
-	yy_flex_debug = bdebug ;
+        yy_flex_debug = _bdebug ;
 }
 
 static int yy_init_globals (void)
 {
-	/* Initialization is the same as for the non-reentrant scanner.
-	 * This function is called from yylex_destroy(), so don't allocate here.
-	 */
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from yylex_destroy(), so don't allocate here.
+     */
 
-	(yy_buffer_stack) = 0;
-	(yy_buffer_stack_top) = 0;
-	(yy_buffer_stack_max) = 0;
-	(yy_c_buf_p) = (char *) 0;
-	(yy_init) = 0;
-	(yy_start) = 0;
+    (yy_buffer_stack) = NULL;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = NULL;
+    (yy_init) = 0;
+    (yy_start) = 0;
 
 /* Defined in main.c */
 #ifdef YY_STDINIT
-	yyin = stdin;
-	yyout = stdout;
+    yyin = stdin;
+    yyout = stdout;
 #else
-	yyin = (FILE *) 0;
-	yyout = (FILE *) 0;
+    yyin = NULL;
+    yyout = NULL;
 #endif
 
-	/* For future reference: Set errno on error, since we are called by
-	 * yylex_init()
-	 */
-	return 0;
+    /* For future reference: Set errno on error, since we are called by
+     * yylex_init()
+     */
+    return 0;
 }
 
 /* yylex_destroy is for both reentrant and non-reentrant scanners. */
 MY_ATTRIBUTE((unused)) static int yylex_destroy  (void)
 {
-
-	/* Pop the buffer stack, destroying each element. */
+    
+    /* Pop the buffer stack, destroying each element. */
 	while(YY_CURRENT_BUFFER){
 		yy_delete_buffer(YY_CURRENT_BUFFER  );
 		YY_CURRENT_BUFFER_LVALUE = NULL;
@@ -3055,11 +3028,11 @@ MY_ATTRIBUTE((unused)) static int yylex_destroy  (void)
 	yyfree((yy_buffer_stack) );
 	(yy_buffer_stack) = NULL;
 
-	/* Reset the globals. This is important in a non-reentrant scanner so the next time
-	 * yylex() is called, initialization will occur. */
-	yy_init_globals( );
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * yylex() is called, initialization will occur. */
+    yy_init_globals( );
 
-	return 0;
+    return 0;
 }
 
 /*
@@ -3069,7 +3042,8 @@ MY_ATTRIBUTE((unused)) static int yylex_destroy  (void)
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 {
-	register int i;
+		
+	int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
 }
@@ -3078,7 +3052,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 #ifdef YY_NEED_STRLEN
 static int yy_flex_strlen (yyconst char * s )
 {
-	register int n;
+	int n;
 	for ( n = 0; s[n]; ++n )
 		;
 
@@ -3086,13 +3060,14 @@ static int yy_flex_strlen (yyconst char * s )
 }
 #endif
 
-void *yyalloc (yy_size_t  size )
+static void *yyalloc (yy_size_t  size )
 {
-	return (void *) malloc( size );
+			return malloc(size);
 }
 
-void *yyrealloc  (void * ptr, yy_size_t  size )
+static void *yyrealloc  (void * ptr, yy_size_t  size )
 {
+		
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
 	 * that use void* generic pointers.  It works with the latter
@@ -3100,17 +3075,17 @@ void *yyrealloc  (void * ptr, yy_size_t  size )
 	 * any pointer type to void*, and deal with argument conversions
 	 * as though doing an assignment.
 	 */
-	return (void *) realloc( (char *) ptr, size );
+	return realloc(ptr, size);
 }
 
-void yyfree (void * ptr )
+static void yyfree (void * ptr )
 {
-	free( (char*) ptr );	/* see yyrealloc() for (char *) cast */
+			free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
 }
 
 #define YYTABLES_NAME "yytables"
 
-#line 691 "pars0lex.l"
+#line 688 "pars0lex.l"
 
 
 
diff --git a/storage/innobase/pars/make_flex.sh b/storage/innobase/pars/make_flex.sh
index 2c493097463..2ddb1460640 100755
--- a/storage/innobase/pars/make_flex.sh
+++ b/storage/innobase/pars/make_flex.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 #
 # Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
+# Copyright (c) 2017, MariaDB Corporation.
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -31,6 +32,7 @@ echo '#include "univ.i"' > $OUTFILE
 # a warning on Win64.  Add the cast.  Also define some symbols as static.
 sed -e '
 s/'"$TMPFILE"'/'"$OUTFILE"'/;
+s/^void yyset_extra *(YY_EXTRA_TYPE  *user_defined *);//
 s/\(int offset = \)\((yy_c_buf_p) - (yytext_ptr)\);/\1(int)(\2);/;
 s/\(void yy\(restart\|_\(delete\|flush\)_buffer\)\)/static \1/;
 s/\(void yy_switch_to_buffer\)/MY_ATTRIBUTE((unused)) static \1/;
@@ -38,10 +40,12 @@ s/\(void yy\(push\|pop\)_buffer_state\)/MY_ATTRIBUTE((unused)) static \1/;
 s/\(YY_BUFFER_STATE yy_create_buffer\)/static \1/;
 s/\(\(int\|void\) yy[gs]et_\)/MY_ATTRIBUTE((unused)) static \1/;
 s/\(void \*\?yy\(\(re\)\?alloc\|free\)\)/static \1/;
-s/\(extern \)\?\(int yy\(leng\|lineno\|_flex_debug\)\)/static \2/;
+s/extern int yy\(leng\|_flex_debug\|lineno\);//;
+s/\(int yy\(leng\|lineno\|_flex_debug\)\)/static \1/;
 s/\(int yylex_destroy\)/MY_ATTRIBUTE((unused)) static \1/;
 s/^\(\(FILE\|char\) *\* *yyget\)/MY_ATTRIBUTE((unused)) static \1/;
-s/^\(extern \)\?\(\(FILE\|char\) *\* *yy\)/static \2/;
+s/^extern \(\(FILE\|char\) *\* *yy\).*//;
+s/^\(FILE\|char\) *\* *yy/static &/;
 ' < $TMPFILE >> $OUTFILE
 
 rm $TMPFILE
diff --git a/storage/innobase/pars/pars0grm.cc b/storage/innobase/pars/pars0grm.cc
index 5fbb70c4481..ef732209978 100644
--- a/storage/innobase/pars/pars0grm.cc
+++ b/storage/innobase/pars/pars0grm.cc
@@ -1,14 +1,13 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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 2, or (at your option)
-   any later version.
+   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
@@ -16,9 +15,7 @@
    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, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -47,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.3"
+#define YYBISON_VERSION "3.0.4"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -55,230 +52,17 @@
 /* Pure parsers.  */
 #define YYPURE 0
 
-/* Using locations.  */
-#define YYLSP_NEEDED 0
+/* Push parsers.  */
+#define YYPUSH 0
 
-
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     PARS_INT_LIT = 258,
-     PARS_FLOAT_LIT = 259,
-     PARS_STR_LIT = 260,
-     PARS_FIXBINARY_LIT = 261,
-     PARS_BLOB_LIT = 262,
-     PARS_NULL_LIT = 263,
-     PARS_ID_TOKEN = 264,
-     PARS_AND_TOKEN = 265,
-     PARS_OR_TOKEN = 266,
-     PARS_NOT_TOKEN = 267,
-     PARS_GE_TOKEN = 268,
-     PARS_LE_TOKEN = 269,
-     PARS_NE_TOKEN = 270,
-     PARS_PROCEDURE_TOKEN = 271,
-     PARS_IN_TOKEN = 272,
-     PARS_OUT_TOKEN = 273,
-     PARS_BINARY_TOKEN = 274,
-     PARS_BLOB_TOKEN = 275,
-     PARS_INT_TOKEN = 276,
-     PARS_INTEGER_TOKEN = 277,
-     PARS_FLOAT_TOKEN = 278,
-     PARS_CHAR_TOKEN = 279,
-     PARS_IS_TOKEN = 280,
-     PARS_BEGIN_TOKEN = 281,
-     PARS_END_TOKEN = 282,
-     PARS_IF_TOKEN = 283,
-     PARS_THEN_TOKEN = 284,
-     PARS_ELSE_TOKEN = 285,
-     PARS_ELSIF_TOKEN = 286,
-     PARS_LOOP_TOKEN = 287,
-     PARS_WHILE_TOKEN = 288,
-     PARS_RETURN_TOKEN = 289,
-     PARS_SELECT_TOKEN = 290,
-     PARS_SUM_TOKEN = 291,
-     PARS_COUNT_TOKEN = 292,
-     PARS_DISTINCT_TOKEN = 293,
-     PARS_FROM_TOKEN = 294,
-     PARS_WHERE_TOKEN = 295,
-     PARS_FOR_TOKEN = 296,
-     PARS_DDOT_TOKEN = 297,
-     PARS_READ_TOKEN = 298,
-     PARS_ORDER_TOKEN = 299,
-     PARS_BY_TOKEN = 300,
-     PARS_ASC_TOKEN = 301,
-     PARS_DESC_TOKEN = 302,
-     PARS_INSERT_TOKEN = 303,
-     PARS_INTO_TOKEN = 304,
-     PARS_VALUES_TOKEN = 305,
-     PARS_UPDATE_TOKEN = 306,
-     PARS_SET_TOKEN = 307,
-     PARS_DELETE_TOKEN = 308,
-     PARS_CURRENT_TOKEN = 309,
-     PARS_OF_TOKEN = 310,
-     PARS_CREATE_TOKEN = 311,
-     PARS_TABLE_TOKEN = 312,
-     PARS_INDEX_TOKEN = 313,
-     PARS_UNIQUE_TOKEN = 314,
-     PARS_CLUSTERED_TOKEN = 315,
-     PARS_DOES_NOT_FIT_IN_MEM_TOKEN = 316,
-     PARS_ON_TOKEN = 317,
-     PARS_ASSIGN_TOKEN = 318,
-     PARS_DECLARE_TOKEN = 319,
-     PARS_CURSOR_TOKEN = 320,
-     PARS_SQL_TOKEN = 321,
-     PARS_OPEN_TOKEN = 322,
-     PARS_FETCH_TOKEN = 323,
-     PARS_CLOSE_TOKEN = 324,
-     PARS_NOTFOUND_TOKEN = 325,
-     PARS_TO_CHAR_TOKEN = 326,
-     PARS_TO_NUMBER_TOKEN = 327,
-     PARS_TO_BINARY_TOKEN = 328,
-     PARS_BINARY_TO_NUMBER_TOKEN = 329,
-     PARS_SUBSTR_TOKEN = 330,
-     PARS_REPLSTR_TOKEN = 331,
-     PARS_CONCAT_TOKEN = 332,
-     PARS_INSTR_TOKEN = 333,
-     PARS_LENGTH_TOKEN = 334,
-     PARS_SYSDATE_TOKEN = 335,
-     PARS_PRINTF_TOKEN = 336,
-     PARS_ASSERT_TOKEN = 337,
-     PARS_RND_TOKEN = 338,
-     PARS_RND_STR_TOKEN = 339,
-     PARS_ROW_PRINTF_TOKEN = 340,
-     PARS_COMMIT_TOKEN = 341,
-     PARS_ROLLBACK_TOKEN = 342,
-     PARS_WORK_TOKEN = 343,
-     PARS_UNSIGNED_TOKEN = 344,
-     PARS_EXIT_TOKEN = 345,
-     PARS_FUNCTION_TOKEN = 346,
-     PARS_LOCK_TOKEN = 347,
-     PARS_SHARE_TOKEN = 348,
-     PARS_MODE_TOKEN = 349,
-     PARS_LIKE_TOKEN = 350,
-     PARS_LIKE_TOKEN_EXACT = 351,
-     PARS_LIKE_TOKEN_PREFIX = 352,
-     PARS_LIKE_TOKEN_SUFFIX = 353,
-     PARS_LIKE_TOKEN_SUBSTR = 354,
-     PARS_TABLE_NAME_TOKEN = 355,
-     PARS_COMPACT_TOKEN = 356,
-     PARS_BLOCK_SIZE_TOKEN = 357,
-     PARS_BIGINT_TOKEN = 358,
-     NEG = 359
-   };
-#endif
-/* Tokens.  */
-#define PARS_INT_LIT 258
-#define PARS_FLOAT_LIT 259
-#define PARS_STR_LIT 260
-#define PARS_FIXBINARY_LIT 261
-#define PARS_BLOB_LIT 262
-#define PARS_NULL_LIT 263
-#define PARS_ID_TOKEN 264
-#define PARS_AND_TOKEN 265
-#define PARS_OR_TOKEN 266
-#define PARS_NOT_TOKEN 267
-#define PARS_GE_TOKEN 268
-#define PARS_LE_TOKEN 269
-#define PARS_NE_TOKEN 270
-#define PARS_PROCEDURE_TOKEN 271
-#define PARS_IN_TOKEN 272
-#define PARS_OUT_TOKEN 273
-#define PARS_BINARY_TOKEN 274
-#define PARS_BLOB_TOKEN 275
-#define PARS_INT_TOKEN 276
-#define PARS_INTEGER_TOKEN 277
-#define PARS_FLOAT_TOKEN 278
-#define PARS_CHAR_TOKEN 279
-#define PARS_IS_TOKEN 280
-#define PARS_BEGIN_TOKEN 281
-#define PARS_END_TOKEN 282
-#define PARS_IF_TOKEN 283
-#define PARS_THEN_TOKEN 284
-#define PARS_ELSE_TOKEN 285
-#define PARS_ELSIF_TOKEN 286
-#define PARS_LOOP_TOKEN 287
-#define PARS_WHILE_TOKEN 288
-#define PARS_RETURN_TOKEN 289
-#define PARS_SELECT_TOKEN 290
-#define PARS_SUM_TOKEN 291
-#define PARS_COUNT_TOKEN 292
-#define PARS_DISTINCT_TOKEN 293
-#define PARS_FROM_TOKEN 294
-#define PARS_WHERE_TOKEN 295
-#define PARS_FOR_TOKEN 296
-#define PARS_DDOT_TOKEN 297
-#define PARS_READ_TOKEN 298
-#define PARS_ORDER_TOKEN 299
-#define PARS_BY_TOKEN 300
-#define PARS_ASC_TOKEN 301
-#define PARS_DESC_TOKEN 302
-#define PARS_INSERT_TOKEN 303
-#define PARS_INTO_TOKEN 304
-#define PARS_VALUES_TOKEN 305
-#define PARS_UPDATE_TOKEN 306
-#define PARS_SET_TOKEN 307
-#define PARS_DELETE_TOKEN 308
-#define PARS_CURRENT_TOKEN 309
-#define PARS_OF_TOKEN 310
-#define PARS_CREATE_TOKEN 311
-#define PARS_TABLE_TOKEN 312
-#define PARS_INDEX_TOKEN 313
-#define PARS_UNIQUE_TOKEN 314
-#define PARS_CLUSTERED_TOKEN 315
-#define PARS_DOES_NOT_FIT_IN_MEM_TOKEN 316
-#define PARS_ON_TOKEN 317
-#define PARS_ASSIGN_TOKEN 318
-#define PARS_DECLARE_TOKEN 319
-#define PARS_CURSOR_TOKEN 320
-#define PARS_SQL_TOKEN 321
-#define PARS_OPEN_TOKEN 322
-#define PARS_FETCH_TOKEN 323
-#define PARS_CLOSE_TOKEN 324
-#define PARS_NOTFOUND_TOKEN 325
-#define PARS_TO_CHAR_TOKEN 326
-#define PARS_TO_NUMBER_TOKEN 327
-#define PARS_TO_BINARY_TOKEN 328
-#define PARS_BINARY_TO_NUMBER_TOKEN 329
-#define PARS_SUBSTR_TOKEN 330
-#define PARS_REPLSTR_TOKEN 331
-#define PARS_CONCAT_TOKEN 332
-#define PARS_INSTR_TOKEN 333
-#define PARS_LENGTH_TOKEN 334
-#define PARS_SYSDATE_TOKEN 335
-#define PARS_PRINTF_TOKEN 336
-#define PARS_ASSERT_TOKEN 337
-#define PARS_RND_TOKEN 338
-#define PARS_RND_STR_TOKEN 339
-#define PARS_ROW_PRINTF_TOKEN 340
-#define PARS_COMMIT_TOKEN 341
-#define PARS_ROLLBACK_TOKEN 342
-#define PARS_WORK_TOKEN 343
-#define PARS_UNSIGNED_TOKEN 344
-#define PARS_EXIT_TOKEN 345
-#define PARS_FUNCTION_TOKEN 346
-#define PARS_LOCK_TOKEN 347
-#define PARS_SHARE_TOKEN 348
-#define PARS_MODE_TOKEN 349
-#define PARS_LIKE_TOKEN 350
-#define PARS_LIKE_TOKEN_EXACT 351
-#define PARS_LIKE_TOKEN_PREFIX 352
-#define PARS_LIKE_TOKEN_SUFFIX 353
-#define PARS_LIKE_TOKEN_SUBSTR 354
-#define PARS_TABLE_NAME_TOKEN 355
-#define PARS_COMPACT_TOKEN 356
-#define PARS_BLOCK_SIZE_TOKEN 357
-#define PARS_BIGINT_TOKEN 358
-#define NEG 359
+/* Pull parsers.  */
+#define YYPULL 1
 
 
 
 
 /* Copy the first part of user declarations.  */
-#line 28 "pars0grm.y"
+#line 29 "pars0grm.y" /* yacc.c:339  */
 
 /* The value of the semantic attribute is a pointer to a query tree node
 que_node_t */
@@ -297,11 +81,15 @@ que_node_t */
 int
 yylex(void);
 
+#line 85 "pars0grm.cc" /* yacc.c:339  */
 
-/* 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
@@ -311,25 +99,144 @@ yylex(void);
 # define YYERROR_VERBOSE 0
 #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 "pars0grm.tab.h".  */
+#ifndef YY_YY_PARS0GRM_TAB_H_INCLUDED
+# define YY_YY_PARS0GRM_TAB_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    PARS_INT_LIT = 258,
+    PARS_FLOAT_LIT = 259,
+    PARS_STR_LIT = 260,
+    PARS_FIXBINARY_LIT = 261,
+    PARS_BLOB_LIT = 262,
+    PARS_NULL_LIT = 263,
+    PARS_ID_TOKEN = 264,
+    PARS_AND_TOKEN = 265,
+    PARS_OR_TOKEN = 266,
+    PARS_NOT_TOKEN = 267,
+    PARS_GE_TOKEN = 268,
+    PARS_LE_TOKEN = 269,
+    PARS_NE_TOKEN = 270,
+    PARS_PROCEDURE_TOKEN = 271,
+    PARS_IN_TOKEN = 272,
+    PARS_OUT_TOKEN = 273,
+    PARS_BINARY_TOKEN = 274,
+    PARS_BLOB_TOKEN = 275,
+    PARS_INT_TOKEN = 276,
+    PARS_INTEGER_TOKEN = 277,
+    PARS_FLOAT_TOKEN = 278,
+    PARS_CHAR_TOKEN = 279,
+    PARS_IS_TOKEN = 280,
+    PARS_BEGIN_TOKEN = 281,
+    PARS_END_TOKEN = 282,
+    PARS_IF_TOKEN = 283,
+    PARS_THEN_TOKEN = 284,
+    PARS_ELSE_TOKEN = 285,
+    PARS_ELSIF_TOKEN = 286,
+    PARS_LOOP_TOKEN = 287,
+    PARS_WHILE_TOKEN = 288,
+    PARS_RETURN_TOKEN = 289,
+    PARS_SELECT_TOKEN = 290,
+    PARS_SUM_TOKEN = 291,
+    PARS_COUNT_TOKEN = 292,
+    PARS_DISTINCT_TOKEN = 293,
+    PARS_FROM_TOKEN = 294,
+    PARS_WHERE_TOKEN = 295,
+    PARS_FOR_TOKEN = 296,
+    PARS_DDOT_TOKEN = 297,
+    PARS_READ_TOKEN = 298,
+    PARS_ORDER_TOKEN = 299,
+    PARS_BY_TOKEN = 300,
+    PARS_ASC_TOKEN = 301,
+    PARS_DESC_TOKEN = 302,
+    PARS_INSERT_TOKEN = 303,
+    PARS_INTO_TOKEN = 304,
+    PARS_VALUES_TOKEN = 305,
+    PARS_UPDATE_TOKEN = 306,
+    PARS_SET_TOKEN = 307,
+    PARS_DELETE_TOKEN = 308,
+    PARS_CURRENT_TOKEN = 309,
+    PARS_OF_TOKEN = 310,
+    PARS_CREATE_TOKEN = 311,
+    PARS_TABLE_TOKEN = 312,
+    PARS_INDEX_TOKEN = 313,
+    PARS_UNIQUE_TOKEN = 314,
+    PARS_CLUSTERED_TOKEN = 315,
+    PARS_ON_TOKEN = 316,
+    PARS_ASSIGN_TOKEN = 317,
+    PARS_DECLARE_TOKEN = 318,
+    PARS_CURSOR_TOKEN = 319,
+    PARS_SQL_TOKEN = 320,
+    PARS_OPEN_TOKEN = 321,
+    PARS_FETCH_TOKEN = 322,
+    PARS_CLOSE_TOKEN = 323,
+    PARS_NOTFOUND_TOKEN = 324,
+    PARS_TO_CHAR_TOKEN = 325,
+    PARS_TO_NUMBER_TOKEN = 326,
+    PARS_TO_BINARY_TOKEN = 327,
+    PARS_BINARY_TO_NUMBER_TOKEN = 328,
+    PARS_SUBSTR_TOKEN = 329,
+    PARS_REPLSTR_TOKEN = 330,
+    PARS_CONCAT_TOKEN = 331,
+    PARS_INSTR_TOKEN = 332,
+    PARS_LENGTH_TOKEN = 333,
+    PARS_SYSDATE_TOKEN = 334,
+    PARS_PRINTF_TOKEN = 335,
+    PARS_ASSERT_TOKEN = 336,
+    PARS_RND_TOKEN = 337,
+    PARS_RND_STR_TOKEN = 338,
+    PARS_ROW_PRINTF_TOKEN = 339,
+    PARS_COMMIT_TOKEN = 340,
+    PARS_ROLLBACK_TOKEN = 341,
+    PARS_WORK_TOKEN = 342,
+    PARS_UNSIGNED_TOKEN = 343,
+    PARS_EXIT_TOKEN = 344,
+    PARS_FUNCTION_TOKEN = 345,
+    PARS_LOCK_TOKEN = 346,
+    PARS_SHARE_TOKEN = 347,
+    PARS_MODE_TOKEN = 348,
+    PARS_LIKE_TOKEN = 349,
+    PARS_LIKE_TOKEN_EXACT = 350,
+    PARS_LIKE_TOKEN_PREFIX = 351,
+    PARS_LIKE_TOKEN_SUFFIX = 352,
+    PARS_LIKE_TOKEN_SUBSTR = 353,
+    PARS_TABLE_NAME_TOKEN = 354,
+    PARS_COMPACT_TOKEN = 355,
+    PARS_BLOCK_SIZE_TOKEN = 356,
+    PARS_BIGINT_TOKEN = 357,
+    NEG = 358
+  };
 #endif
 
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
 #endif
 
 
+extern YYSTYPE yylval;
 
-/* Copy the second part of user declarations.  */
+int yyparse (void);
+
+#endif /* !YY_YY_PARS0GRM_TAB_H_INCLUDED  */
 
+/* Copy the second part of user declarations.  */
 
-/* Line 216 of yacc.c.  */
-#line 334 "pars0grm.cc"
+#line 240 "pars0grm.cc" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -343,11 +250,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
@@ -367,8 +271,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 <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
@@ -382,38 +285,67 @@ typedef short int yytype_int16;
 # if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* 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)
+#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
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int i)
-#else
-static int
-YYID (i)
-    int i;
+# define YY_INITIAL_VALUE(Value) Value
 #endif
-{
-  return i;
-}
+#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
 
@@ -425,16 +357,18 @@ YYID (i)
 #    define YYSTACK_ALLOC __builtin_alloca
 #   elif defined __BUILTIN_VA_ARG_INCR
 #    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
 #   elif defined _MSC_VER
 #    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef _STDLIB_H
-#      define _STDLIB_H 1
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
 #     endif
 #    endif
 #   endif
@@ -442,8 +376,8 @@ YYID (i)
 # 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
@@ -457,26 +391,24 @@ YYID (i)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined _STDLIB_H \
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \
-	     && (defined YYFREE || defined free)))
+             && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef _STDLIB_H
-#    define _STDLIB_H 1
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined _STDLIB_H && (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 _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-void free (void*); /* INFRINGES ON USER NAME SPACE */
+#   if ! defined free && ! defined EXIT_SUCCESS
+void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 # endif
@@ -485,14 +417,14 @@ void free (void*); /* INFRINGES ON USER NAME SPACE */
 
 #if (! defined yyoverflow \
      && (! defined __cplusplus \
-	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss;
-  YYSTYPE yyvs;
-  };
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -503,79 +435,85 @@ union yyalloc
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-/* Copy COUNT objects from FROM to TO.  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)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  YYSIZE_T yyi;				\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (YYID (0))
-#  endif
-# endif
+# define YYCOPY_NEEDED 1
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
    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)					\
-    do									\
-      {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack, Stack, yysize);				\
-	Stack = &yyptr->Stack;						\
-	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 SRC to DST.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+#  else
+#   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 */
+
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  5
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   816
+#define YYLAST   824
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  120
+#define YYNTOKENS  119
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  73
+#define YYNNTS  72
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  183
-/* YYNRULES -- Number of states.  */
-#define YYNSTATES  350
+#define YYNRULES  181
+/* YYNSTATES -- Number of states.  */
+#define YYNSTATES  348
 
-/* 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   359
+#define YYMAXUTOK   358
 
-#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,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,   112,     2,     2,
-     114,   115,   109,   108,   117,   107,     2,   110,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,   113,
-     105,   104,   106,   116,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,   111,     2,     2,
+     113,   114,   108,   107,   116,   106,     2,   109,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,   112,
+     104,   103,   105,   115,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   118,     2,   119,     2,     2,     2,     2,
+       2,     2,     2,   117,     2,   118,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -598,124 +536,36 @@ static const yytype_uint8 yytranslate[] =
       65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
       75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
       85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   111
+      95,    96,    97,    98,    99,   100,   101,   102,   110
 };
 
 #if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const yytype_uint16 yyprhs[] =
-{
-       0,     0,     3,     6,     8,    11,    14,    17,    20,    23,
-      26,    29,    32,    35,    38,    41,    44,    47,    50,    53,
-      56,    59,    62,    65,    68,    71,    73,    76,    78,    83,
-      85,    87,    89,    91,    93,    95,    97,   101,   105,   109,
-     113,   116,   120,   124,   128,   132,   136,   140,   144,   148,
-     152,   156,   159,   163,   167,   169,   171,   173,   175,   177,
-     179,   181,   183,   185,   187,   189,   190,   192,   196,   203,
-     208,   210,   212,   214,   218,   220,   224,   225,   227,   231,
-     232,   234,   238,   240,   245,   251,   256,   257,   259,   263,
-     265,   269,   271,   272,   275,   276,   279,   280,   285,   286,
-     288,   290,   291,   296,   305,   309,   315,   318,   322,   324,
-     328,   333,   338,   341,   344,   348,   351,   354,   357,   361,
-     366,   368,   371,   372,   375,   377,   385,   392,   403,   405,
-     407,   410,   413,   418,   423,   429,   431,   435,   436,   440,
-     441,   443,   444,   447,   448,   450,   451,   453,   454,   458,
-     468,   470,   474,   475,   477,   478,   480,   491,   493,   495,
-     498,   501,   503,   505,   507,   509,   511,   513,   517,   521,
-     522,   524,   528,   532,   533,   535,   538,   545,   550,   552,
-     554,   555,   557,   560
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int16 yyrhs[] =
-{
-     121,     0,    -1,   192,   113,    -1,   127,    -1,   128,   113,
-      -1,   160,   113,    -1,   161,   113,    -1,   162,   113,    -1,
-     159,   113,    -1,   163,   113,    -1,   155,   113,    -1,   142,
-     113,    -1,   144,   113,    -1,   154,   113,    -1,   152,   113,
-      -1,   153,   113,    -1,   149,   113,    -1,   150,   113,    -1,
-     164,   113,    -1,   166,   113,    -1,   165,   113,    -1,   181,
-     113,    -1,   182,   113,    -1,   175,   113,    -1,   179,   113,
-      -1,   122,    -1,   123,   122,    -1,     9,    -1,   125,   114,
-     133,   115,    -1,     3,    -1,     4,    -1,     5,    -1,     6,
-      -1,     7,    -1,     8,    -1,    66,    -1,   124,   108,   124,
-      -1,   124,   107,   124,    -1,   124,   109,   124,    -1,   124,
-     110,   124,    -1,   107,   124,    -1,   114,   124,   115,    -1,
-     124,   104,   124,    -1,   124,    95,     5,    -1,   124,   105,
-     124,    -1,   124,   106,   124,    -1,   124,    13,   124,    -1,
-     124,    14,   124,    -1,   124,    15,   124,    -1,   124,    10,
-     124,    -1,   124,    11,   124,    -1,    12,   124,    -1,     9,
-     112,    70,    -1,    66,   112,    70,    -1,    71,    -1,    72,
-      -1,    73,    -1,    74,    -1,    75,    -1,    77,    -1,    78,
-      -1,    79,    -1,    80,    -1,    83,    -1,    84,    -1,    -1,
-     116,    -1,   126,   117,   116,    -1,   118,     9,   114,   126,
-     115,   119,    -1,   129,   114,   133,   115,    -1,    76,    -1,
-      81,    -1,    82,    -1,     9,   114,   115,    -1,   180,    -1,
-     131,   117,   180,    -1,    -1,     9,    -1,   132,   117,     9,
-      -1,    -1,   124,    -1,   133,   117,   124,    -1,   124,    -1,
-      37,   114,   109,   115,    -1,    37,   114,    38,     9,   115,
-      -1,    36,   114,   124,   115,    -1,    -1,   134,    -1,   135,
-     117,   134,    -1,   109,    -1,   135,    49,   132,    -1,   135,
-      -1,    -1,    40,   124,    -1,    -1,    41,    51,    -1,    -1,
-      92,    17,    93,    94,    -1,    -1,    46,    -1,    47,    -1,
-      -1,    44,    45,     9,   140,    -1,    35,   136,    39,   131,
-     137,   138,   139,   141,    -1,    48,    49,   180,    -1,   143,
-      50,   114,   133,   115,    -1,   143,   142,    -1,     9,   104,
-     124,    -1,   145,    -1,   146,   117,   145,    -1,    40,    54,
-      55,     9,    -1,    51,   180,    52,   146,    -1,   148,   137,
-      -1,   148,   147,    -1,    53,    39,   180,    -1,   151,   137,
-      -1,   151,   147,    -1,    85,   142,    -1,     9,    63,   124,
-      -1,    31,   124,    29,   123,    -1,   156,    -1,   157,   156,
-      -1,    -1,    30,   123,    -1,   157,    -1,    28,   124,    29,
-     123,   158,    27,    28,    -1,    33,   124,    32,   123,    27,
-      32,    -1,    41,     9,    17,   124,    42,   124,    32,   123,
-      27,    32,    -1,    90,    -1,    34,    -1,    67,     9,    -1,
-      69,     9,    -1,    68,     9,    49,   132,    -1,    68,     9,
-      49,   130,    -1,     9,   183,   169,   170,   171,    -1,   167,
-      -1,   168,   117,   167,    -1,    -1,   114,     3,   115,    -1,
-      -1,    89,    -1,    -1,    12,     8,    -1,    -1,    61,    -1,
-      -1,   101,    -1,    -1,   102,   104,     3,    -1,    56,    57,
-     180,   114,   168,   115,   172,   173,   174,    -1,     9,    -1,
-     176,   117,     9,    -1,    -1,    59,    -1,    -1,    60,    -1,
-      56,   177,   178,    58,     9,    62,   180,   114,   176,   115,
-      -1,     9,    -1,   100,    -1,    86,    88,    -1,    87,    88,
-      -1,    21,    -1,    22,    -1,   103,    -1,    24,    -1,    19,
-      -1,    20,    -1,     9,    17,   183,    -1,     9,    18,   183,
-      -1,    -1,   184,    -1,   185,   117,   184,    -1,     9,   183,
-     113,    -1,    -1,   186,    -1,   187,   186,    -1,    64,    65,
-       9,    25,   142,   113,    -1,    64,    91,     9,   113,    -1,
-     188,    -1,   189,    -1,    -1,   190,    -1,   191,   190,    -1,
-      16,     9,   114,   185,   115,    25,   187,   191,    26,   123,
-      27,    -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,   162,   162,   165,   166,   167,   168,   169,   170,   171,
-     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,   185,   186,   190,   191,   196,   197,   199,
-     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
-     210,   211,   212,   213,   215,   216,   217,   218,   219,   220,
-     221,   222,   223,   225,   230,   231,   232,   233,   235,   236,
-     237,   238,   239,   240,   241,   244,   246,   247,   251,   257,
-     262,   263,   264,   268,   272,   273,   278,   279,   280,   285,
-     286,   287,   291,   292,   297,   303,   310,   311,   312,   317,
-     319,   322,   326,   327,   331,   332,   337,   338,   343,   344,
-     345,   349,   350,   357,   372,   377,   380,   388,   394,   395,
-     400,   406,   415,   423,   431,   438,   446,   454,   460,   467,
-     473,   474,   479,   480,   482,   486,   493,   499,   509,   513,
-     517,   524,   531,   535,   543,   552,   553,   558,   559,   564,
-     565,   571,   572,   578,   579,   585,   586,   591,   592,   597,
-     608,   609,   614,   615,   619,   620,   624,   638,   639,   643,
-     648,   653,   654,   655,   656,   657,   658,   662,   667,   675,
-     676,   677,   682,   688,   690,   691,   695,   703,   709,   710,
-     713,   715,   716,   720
+       0,   163,   163,   166,   167,   168,   169,   170,   171,   172,
+     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+     183,   184,   185,   186,   187,   191,   192,   197,   198,   200,
+     201,   202,   203,   204,   205,   206,   207,   208,   209,   210,
+     211,   212,   213,   214,   216,   217,   218,   219,   220,   221,
+     222,   223,   224,   226,   231,   232,   233,   234,   236,   237,
+     238,   239,   240,   241,   242,   245,   247,   248,   252,   258,
+     263,   264,   265,   269,   273,   274,   279,   280,   281,   286,
+     287,   288,   292,   293,   298,   304,   311,   312,   313,   318,
+     320,   323,   327,   328,   332,   333,   338,   339,   344,   345,
+     346,   350,   351,   358,   373,   378,   381,   389,   395,   396,
+     401,   407,   416,   424,   432,   439,   447,   455,   461,   468,
+     474,   475,   480,   481,   483,   487,   494,   500,   510,   514,
+     518,   525,   532,   536,   544,   553,   554,   559,   560,   565,
+     566,   572,   573,   579,   580,   585,   586,   591,   602,   603,
+     608,   609,   613,   614,   618,   632,   633,   637,   642,   647,
+     648,   649,   650,   651,   652,   656,   661,   669,   670,   671,
+     676,   682,   684,   685,   689,   697,   703,   704,   707,   709,
+     710,   714
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+#if YYDEBUG || YYERROR_VERBOSE || 0
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
@@ -738,19 +588,19 @@ static const char *const yytname[] =
   "PARS_UPDATE_TOKEN", "PARS_SET_TOKEN", "PARS_DELETE_TOKEN",
   "PARS_CURRENT_TOKEN", "PARS_OF_TOKEN", "PARS_CREATE_TOKEN",
   "PARS_TABLE_TOKEN", "PARS_INDEX_TOKEN", "PARS_UNIQUE_TOKEN",
-  "PARS_CLUSTERED_TOKEN", "PARS_DOES_NOT_FIT_IN_MEM_TOKEN",
-  "PARS_ON_TOKEN", "PARS_ASSIGN_TOKEN", "PARS_DECLARE_TOKEN",
-  "PARS_CURSOR_TOKEN", "PARS_SQL_TOKEN", "PARS_OPEN_TOKEN",
-  "PARS_FETCH_TOKEN", "PARS_CLOSE_TOKEN", "PARS_NOTFOUND_TOKEN",
-  "PARS_TO_CHAR_TOKEN", "PARS_TO_NUMBER_TOKEN", "PARS_TO_BINARY_TOKEN",
-  "PARS_BINARY_TO_NUMBER_TOKEN", "PARS_SUBSTR_TOKEN", "PARS_REPLSTR_TOKEN",
-  "PARS_CONCAT_TOKEN", "PARS_INSTR_TOKEN", "PARS_LENGTH_TOKEN",
-  "PARS_SYSDATE_TOKEN", "PARS_PRINTF_TOKEN", "PARS_ASSERT_TOKEN",
-  "PARS_RND_TOKEN", "PARS_RND_STR_TOKEN", "PARS_ROW_PRINTF_TOKEN",
-  "PARS_COMMIT_TOKEN", "PARS_ROLLBACK_TOKEN", "PARS_WORK_TOKEN",
-  "PARS_UNSIGNED_TOKEN", "PARS_EXIT_TOKEN", "PARS_FUNCTION_TOKEN",
-  "PARS_LOCK_TOKEN", "PARS_SHARE_TOKEN", "PARS_MODE_TOKEN",
-  "PARS_LIKE_TOKEN", "PARS_LIKE_TOKEN_EXACT", "PARS_LIKE_TOKEN_PREFIX",
+  "PARS_CLUSTERED_TOKEN", "PARS_ON_TOKEN", "PARS_ASSIGN_TOKEN",
+  "PARS_DECLARE_TOKEN", "PARS_CURSOR_TOKEN", "PARS_SQL_TOKEN",
+  "PARS_OPEN_TOKEN", "PARS_FETCH_TOKEN", "PARS_CLOSE_TOKEN",
+  "PARS_NOTFOUND_TOKEN", "PARS_TO_CHAR_TOKEN", "PARS_TO_NUMBER_TOKEN",
+  "PARS_TO_BINARY_TOKEN", "PARS_BINARY_TO_NUMBER_TOKEN",
+  "PARS_SUBSTR_TOKEN", "PARS_REPLSTR_TOKEN", "PARS_CONCAT_TOKEN",
+  "PARS_INSTR_TOKEN", "PARS_LENGTH_TOKEN", "PARS_SYSDATE_TOKEN",
+  "PARS_PRINTF_TOKEN", "PARS_ASSERT_TOKEN", "PARS_RND_TOKEN",
+  "PARS_RND_STR_TOKEN", "PARS_ROW_PRINTF_TOKEN", "PARS_COMMIT_TOKEN",
+  "PARS_ROLLBACK_TOKEN", "PARS_WORK_TOKEN", "PARS_UNSIGNED_TOKEN",
+  "PARS_EXIT_TOKEN", "PARS_FUNCTION_TOKEN", "PARS_LOCK_TOKEN",
+  "PARS_SHARE_TOKEN", "PARS_MODE_TOKEN", "PARS_LIKE_TOKEN",
+  "PARS_LIKE_TOKEN_EXACT", "PARS_LIKE_TOKEN_PREFIX",
   "PARS_LIKE_TOKEN_SUFFIX", "PARS_LIKE_TOKEN_SUBSTR",
   "PARS_TABLE_NAME_TOKEN", "PARS_COMPACT_TOKEN", "PARS_BLOCK_SIZE_TOKEN",
   "PARS_BIGINT_TOKEN", "'='", "'<'", "'>'", "'-'", "'+'", "'*'", "'/'",
@@ -771,20 +621,19 @@ static const char *const yytname[] =
   "if_statement", "while_statement", "for_statement", "exit_statement",
   "return_statement", "open_cursor_statement", "close_cursor_statement",
   "fetch_statement", "column_def", "column_def_list", "opt_column_len",
-  "opt_unsigned", "opt_not_null", "not_fit_in_memory", "compact",
-  "block_size", "create_table", "column_list", "unique_def",
-  "clustered_def", "create_index", "table_name", "commit_statement",
-  "rollback_statement", "type_name", "parameter_declaration",
-  "parameter_declaration_list", "variable_declaration",
-  "variable_declaration_list", "cursor_declaration",
-  "function_declaration", "declaration", "declaration_list",
-  "procedure_definition", 0
+  "opt_unsigned", "opt_not_null", "compact", "block_size", "create_table",
+  "column_list", "unique_def", "clustered_def", "create_index",
+  "table_name", "commit_statement", "rollback_statement", "type_name",
+  "parameter_declaration", "parameter_declaration_list",
+  "variable_declaration", "variable_declaration_list",
+  "cursor_declaration", "function_declaration", "declaration",
+  "declaration_list", "procedure_definition", 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,
@@ -797,86 +646,89 @@ static const yytype_uint16 yytoknum[] =
      325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
      335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
      345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
-     355,   356,   357,   358,    61,    60,    62,    45,    43,    42,
-      47,   359,    37,    59,    40,    41,    63,    44,   123,   125
+     355,   356,   357,    61,    60,    62,    45,    43,    42,    47,
+     358,    37,    59,    40,    41,    63,    44,   123,   125
 };
 # endif
 
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
-{
-       0,   120,   121,   122,   122,   122,   122,   122,   122,   122,
-     122,   122,   122,   122,   122,   122,   122,   122,   122,   122,
-     122,   122,   122,   122,   122,   123,   123,   124,   124,   124,
-     124,   124,   124,   124,   124,   124,   124,   124,   124,   124,
-     124,   124,   124,   124,   124,   124,   124,   124,   124,   124,
-     124,   124,   124,   124,   125,   125,   125,   125,   125,   125,
-     125,   125,   125,   125,   125,   126,   126,   126,   127,   128,
-     129,   129,   129,   130,   131,   131,   132,   132,   132,   133,
-     133,   133,   134,   134,   134,   134,   135,   135,   135,   136,
-     136,   136,   137,   137,   138,   138,   139,   139,   140,   140,
-     140,   141,   141,   142,   143,   144,   144,   145,   146,   146,
-     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
-     157,   157,   158,   158,   158,   159,   160,   161,   162,   163,
-     164,   165,   166,   166,   167,   168,   168,   169,   169,   170,
-     170,   171,   171,   172,   172,   173,   173,   174,   174,   175,
-     176,   176,   177,   177,   178,   178,   179,   180,   180,   181,
-     182,   183,   183,   183,   183,   183,   183,   184,   184,   185,
-     185,   185,   186,   187,   187,   187,   188,   189,   190,   190,
-     191,   191,   191,   192
-};
+#define YYPACT_NINF -179
 
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-179)))
+
+#define YYTABLE_NINF -1
+
+#define yytable_value_is_error(Yytable_value) \
+  0
+
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
+static const yytype_int16 yypact[] =
 {
-       0,     2,     2,     1,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     1,     2,     1,     4,     1,
-       1,     1,     1,     1,     1,     1,     3,     3,     3,     3,
-       2,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-       3,     2,     3,     3,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     0,     1,     3,     6,     4,
-       1,     1,     1,     3,     1,     3,     0,     1,     3,     0,
-       1,     3,     1,     4,     5,     4,     0,     1,     3,     1,
-       3,     1,     0,     2,     0,     2,     0,     4,     0,     1,
-       1,     0,     4,     8,     3,     5,     2,     3,     1,     3,
-       4,     4,     2,     2,     3,     2,     2,     2,     3,     4,
-       1,     2,     0,     2,     1,     7,     6,    10,     1,     1,
-       2,     2,     4,     4,     5,     1,     3,     0,     3,     0,
-       1,     0,     2,     0,     1,     0,     1,     0,     3,     9,
-       1,     3,     0,     1,     0,     1,    10,     1,     1,     2,
-       2,     1,     1,     1,     1,     1,     1,     3,     3,     0,
-       1,     3,     3,     0,     1,     2,     6,     4,     1,     1,
-       0,     1,     2,    11
+      35,    50,    72,   -37,   -36,  -179,  -179,    67,    49,  -179,
+     -78,    13,    13,    53,    67,  -179,  -179,  -179,  -179,  -179,
+    -179,  -179,  -179,    76,  -179,    13,  -179,     7,   -31,   -34,
+    -179,  -179,  -179,  -179,   -14,  -179,    77,    83,   583,  -179,
+      78,   -10,    42,   284,   284,  -179,    17,    96,    58,     2,
+      69,   -16,   105,   107,   108,  -179,  -179,  -179,    84,    31,
+      37,  -179,   113,  -179,   403,  -179,    14,    15,    19,    -4,
+      21,    89,    23,    24,    89,    25,    26,    32,    33,    44,
+      45,    47,    51,    52,    54,    55,    56,    57,    60,    62,
+      63,    84,  -179,   284,  -179,  -179,  -179,  -179,  -179,  -179,
+      43,   284,    59,  -179,  -179,  -179,  -179,  -179,  -179,  -179,
+    -179,  -179,  -179,  -179,   284,   284,   571,    70,   612,    73,
+      74,  -179,   699,  -179,   -45,    95,   145,     2,  -179,  -179,
+     136,     2,     2,  -179,   129,  -179,   116,  -179,  -179,  -179,
+    -179,    79,  -179,  -179,  -179,   284,  -179,    80,  -179,  -179,
+     194,  -179,  -179,  -179,  -179,  -179,  -179,  -179,  -179,  -179,
+    -179,  -179,  -179,  -179,  -179,  -179,  -179,  -179,  -179,  -179,
+    -179,  -179,  -179,    82,   699,   121,   715,   122,     3,   210,
+     284,   284,   284,   284,   284,   583,   190,   284,   284,   284,
+     284,   284,   284,   284,   284,   583,   284,   -29,   187,   173,
+       2,   284,  -179,   195,  -179,    92,  -179,   149,   199,    97,
+     699,   -72,   284,   156,   699,  -179,  -179,  -179,  -179,   715,
+     715,     4,     4,   699,   343,  -179,     4,     4,     4,    12,
+      12,     3,     3,   -69,   463,   226,   204,   101,  -179,   100,
+    -179,   -32,  -179,   642,   114,  -179,   103,   217,   218,   117,
+    -179,   100,  -179,   -66,  -179,   284,   -59,   220,   583,   284,
+    -179,   202,   207,  -179,   203,  -179,   128,  -179,   244,   284,
+       2,   216,   284,   284,   195,    13,  -179,   -52,   200,   146,
+     144,   154,   699,  -179,  -179,   583,   672,  -179,   246,  -179,
+    -179,  -179,  -179,   224,   189,   679,   699,  -179,   165,   181,
+     217,     2,  -179,  -179,  -179,   583,  -179,  -179,   265,   239,
+     583,   281,   197,  -179,   193,  -179,   182,   583,   205,   253,
+    -179,   523,   185,  -179,   289,   206,  -179,   293,   212,   294,
+     274,  -179,   300,  -179,   307,  -179,   -51,  -179,    22,  -179,
+    -179,  -179,  -179,   302,  -179,  -179,  -179,  -179
 };
 
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
+  /* 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,     1,     2,   169,     0,   170,
-       0,     0,     0,     0,     0,   165,   166,   161,   162,   164,
-     163,   167,   168,   173,   171,     0,   174,   180,     0,     0,
-     175,   178,   179,   181,     0,   172,     0,     0,     0,   182,
+       0,     0,     0,     0,     0,     1,     2,   167,     0,   168,
+       0,     0,     0,     0,     0,   163,   164,   159,   160,   162,
+     161,   165,   166,   171,   169,     0,   172,   178,     0,     0,
+     173,   176,   177,   179,     0,   170,     0,     0,     0,   180,
        0,     0,     0,     0,     0,   129,    86,     0,     0,     0,
-       0,   152,     0,     0,     0,    70,    71,    72,     0,     0,
+       0,   150,     0,     0,     0,    70,    71,    72,     0,     0,
        0,   128,     0,    25,     0,     3,     0,     0,     0,     0,
        0,    92,     0,     0,    92,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   177,     0,    29,    30,    31,    32,    33,    34,
+       0,     0,   175,     0,    29,    30,    31,    32,    33,    34,
       27,     0,    35,    54,    55,    56,    57,    58,    59,    60,
       61,    62,    63,    64,     0,     0,     0,     0,     0,     0,
-       0,    89,    82,    87,    91,     0,     0,     0,   157,   158,
-       0,     0,     0,   153,   154,   130,     0,   131,   117,   159,
-     160,     0,   183,    26,     4,    79,    11,     0,   106,    12,
+       0,    89,    82,    87,    91,     0,     0,     0,   155,   156,
+       0,     0,     0,   151,   152,   130,     0,   131,   117,   157,
+     158,     0,   181,    26,     4,    79,    11,     0,   106,    12,
        0,   112,   113,    16,    17,   115,   116,    14,    15,    13,
       10,     8,     5,     6,     7,     9,    18,    20,    19,    23,
       24,    21,    22,     0,   118,     0,    51,     0,    40,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,    79,     0,     0,     0,    76,     0,
-       0,     0,   104,     0,   114,     0,   155,     0,    76,    65,
-      80,     0,    79,     0,    93,   176,    52,    53,    41,    49,
+       0,     0,   104,     0,   114,     0,   153,     0,    76,    65,
+      80,     0,    79,     0,    93,   174,    52,    53,    41,    49,
       50,    46,    47,    48,   122,    43,    42,    44,    45,    37,
       36,    38,    39,     0,     0,     0,     0,     0,    77,    90,
       88,    92,    74,     0,     0,   108,   111,     0,     0,    77,
@@ -887,386 +739,338 @@ static const yytype_uint8 yydefact[] =
       84,    78,    75,     0,    96,     0,   107,   109,   137,   143,
        0,     0,    73,    68,    67,     0,   125,    95,     0,   101,
        0,     0,   139,   144,   145,   136,     0,   119,     0,     0,
-     103,     0,     0,   140,   141,   146,   147,     0,     0,     0,
-       0,   138,     0,   134,     0,   149,   150,     0,    97,    98,
-     127,   142,     0,   156,     0,    99,   100,   102,   148,   151
+     103,     0,     0,   140,   141,     0,   147,     0,     0,     0,
+       0,   138,     0,   134,     0,   148,     0,    97,    98,   127,
+     142,   146,   154,     0,    99,   100,   102,   149
+};
+
+  /* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
+{
+    -179,  -179,   -63,  -178,   -41,  -179,  -179,  -179,  -179,  -179,
+    -179,  -179,   104,  -154,   123,  -179,  -179,   -68,  -179,  -179,
+    -179,  -179,   -30,  -179,  -179,    64,  -179,   247,  -179,  -179,
+    -179,  -179,  -179,  -179,  -179,  -179,    65,  -179,  -179,  -179,
+    -179,  -179,  -179,  -179,  -179,  -179,  -179,    27,  -179,  -179,
+    -179,  -179,  -179,  -179,  -179,  -179,  -179,  -179,  -179,  -117,
+    -179,  -179,   -12,   309,  -179,   298,  -179,  -179,  -179,   303,
+    -179,  -179
 };
 
-/* YYDEFGOTO[NTERM-NUM].  */
+  /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
       -1,     2,    63,    64,   210,   117,   253,    65,    66,    67,
      250,   241,   239,   211,   123,   124,   125,   151,   294,   309,
-     347,   320,    68,    69,    70,   245,   246,   152,    71,    72,
+     346,   320,    68,    69,    70,   245,   246,   152,    71,    72,
       73,    74,    75,    76,    77,    78,   260,   261,   262,    79,
       80,    81,    82,    83,    84,    85,    86,   276,   277,   312,
-     324,   333,   314,   326,   335,    87,   337,   134,   207,    88,
-     130,    89,    90,    21,     9,    10,    26,    27,    31,    32,
-      33,    34,     3
-};
-
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -179
-static const yytype_int16 yypact[] =
-{
-      24,    36,    58,   -48,   -25,  -179,  -179,    57,    31,  -179,
-     -74,    14,    14,    50,    57,  -179,  -179,  -179,  -179,  -179,
-    -179,  -179,  -179,    72,  -179,    14,  -179,     3,   -26,   -28,
-    -179,  -179,  -179,  -179,     4,  -179,    91,    95,   589,  -179,
-      80,    -6,    43,   285,   285,  -179,    19,    99,    69,    -5,
-      81,   -13,   110,   112,   114,  -179,  -179,  -179,    89,    37,
-      41,  -179,   122,  -179,   406,  -179,    25,    40,    44,    -3,
-      46,   116,    49,    51,   116,    52,    53,    54,    55,    56,
-      59,    61,    62,    70,    73,    74,    75,    76,    77,    78,
-      79,    89,  -179,   285,  -179,  -179,  -179,  -179,  -179,  -179,
-      82,   285,    83,  -179,  -179,  -179,  -179,  -179,  -179,  -179,
-    -179,  -179,  -179,  -179,   285,   285,   577,    92,   618,    94,
-      97,  -179,   706,  -179,   -33,   124,   153,    -5,  -179,  -179,
-     141,    -5,    -5,  -179,   136,  -179,   148,  -179,  -179,  -179,
-    -179,    98,  -179,  -179,  -179,   285,  -179,   101,  -179,  -179,
-     195,  -179,  -179,  -179,  -179,  -179,  -179,  -179,  -179,  -179,
-    -179,  -179,  -179,  -179,  -179,  -179,  -179,  -179,  -179,  -179,
-    -179,  -179,  -179,   100,   706,   135,     6,   154,    -7,   206,
-     285,   285,   285,   285,   285,   589,   218,   285,   285,   285,
-     285,   285,   285,   285,   285,   589,   285,   -27,   216,   173,
-      -5,   285,  -179,   217,  -179,   113,  -179,   171,   221,   119,
-     706,   -56,   285,   185,   706,  -179,  -179,  -179,  -179,     6,
-       6,    27,    27,   706,   345,  -179,    27,    27,    27,    35,
-      35,    -7,    -7,   -53,   467,   223,   232,   127,  -179,   126,
-    -179,   -31,  -179,   638,   151,  -179,   142,   251,   253,   150,
-    -179,   126,  -179,   -46,  -179,   285,   -45,   256,   589,   285,
-    -179,   240,   249,  -179,   245,  -179,   166,  -179,   273,   285,
-      -5,   242,   285,   285,   217,    14,  -179,   -39,   222,   170,
-     167,   179,   706,  -179,  -179,   589,   679,  -179,   268,  -179,
-    -179,  -179,  -179,   247,   207,   686,   706,  -179,   186,   243,
-     251,    -5,  -179,  -179,  -179,   589,  -179,  -179,   286,   261,
-     589,   303,   219,  -179,   224,  -179,   193,   589,   226,   272,
-    -179,   528,   205,  -179,   310,  -179,   233,   314,   230,   317,
-     302,  -179,   328,  -179,   235,  -179,  -179,   -38,  -179,     7,
-    -179,  -179,   334,  -179,   331,  -179,  -179,  -179,  -179,  -179
-};
-
-/* YYPGOTO[NTERM-NUM].  */
-static const yytype_int16 yypgoto[] =
-{
-    -179,  -179,   -63,  -178,   -41,  -179,  -179,  -179,  -179,  -179,
-    -179,  -179,   133,  -155,   143,  -179,  -179,   -68,  -179,  -179,
-    -179,  -179,   -40,  -179,  -179,    71,  -179,   269,  -179,  -179,
-    -179,  -179,  -179,  -179,  -179,  -179,    85,  -179,  -179,  -179,
-    -179,  -179,  -179,  -179,  -179,  -179,  -179,    47,  -179,  -179,
-    -179,  -179,  -179,  -179,  -179,  -179,  -179,  -179,  -179,  -179,
-    -117,  -179,  -179,   -12,   330,  -179,   321,  -179,  -179,  -179,
-     315,  -179,  -179
+     324,   333,   314,   326,    87,   336,   134,   207,    88,   130,
+      89,    90,    21,     9,    10,    26,    27,    31,    32,    33,
+      34,     3
 };
 
-/* 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 zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -1
+  /* 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[] =
 {
-      22,   143,   116,   118,   128,   122,   155,   224,   184,   269,
-     202,   236,    25,    28,   204,   205,   198,   234,   138,   182,
-     183,   184,    94,    95,    96,    97,    98,    99,   100,   148,
-      38,   101,    46,    15,    16,    17,    18,    36,    19,   233,
-       1,    13,   184,    14,   132,     4,   133,   147,    11,    12,
-     184,   173,   174,   345,   346,   119,   120,   256,     5,   254,
-     176,   255,   263,    37,   255,     6,     8,    29,    29,   280,
-     283,   281,   255,   178,   179,    23,   299,   343,   300,   344,
-     285,    25,   237,   242,   199,   102,   270,    35,   186,     7,
-     103,   104,   105,   106,   107,   129,   108,   109,   110,   111,
-      40,   186,   112,   113,    41,    91,    93,    92,   126,   214,
-     187,   188,   189,   190,   191,   192,   193,    20,   127,   135,
-     131,   136,   186,   137,    46,   139,   114,   317,   121,   140,
-     186,   141,   321,   115,   190,   191,   192,   193,   144,   219,
-     220,   221,   222,   223,   192,   193,   226,   227,   228,   229,
-     230,   231,   232,   292,   145,   235,   150,   146,   122,   149,
-     243,   143,   153,   200,   154,   157,   158,   159,   160,   161,
-     201,   143,   162,   271,   163,   164,    94,    95,    96,    97,
-      98,    99,   100,   165,   316,   101,   166,   167,   168,   169,
-     170,   171,   172,   203,   175,   177,   206,   208,    94,    95,
-      96,    97,    98,    99,   100,   216,   194,   101,   196,   119,
-     120,   197,   209,   215,   282,   212,   180,   181,   286,   182,
-     183,   184,   143,   225,   217,   238,   244,   247,   214,   248,
-     249,   295,   296,   180,   181,   252,   182,   183,   184,   102,
-     257,   266,   267,   268,   103,   104,   105,   106,   107,   213,
-     108,   109,   110,   111,   143,   273,   112,   113,   143,   274,
-     275,   102,   278,   298,   279,   284,   103,   104,   105,   106,
-     107,   259,   108,   109,   110,   111,   288,   289,   112,   113,
-     114,   290,   291,   293,   301,   302,   303,   115,    94,    95,
-      96,    97,    98,    99,   100,   304,   306,   101,   307,   308,
-     311,   186,   114,   318,   313,   319,   322,   327,   323,   115,
-     187,   188,   189,   190,   191,   192,   193,   329,   186,   328,
-     331,   218,   332,   336,   338,   325,   339,   187,   188,   189,
-     190,   191,   192,   193,   340,   334,   341,   348,   265,   342,
-     349,   251,   240,   156,    24,   297,   287,   315,    30,    39,
-       0,   102,     0,     0,    42,     0,   103,   104,   105,   106,
-     107,     0,   108,   109,   110,   111,     0,     0,   112,   113,
-       0,     0,     0,    43,     0,   258,   259,     0,    44,    45,
-      46,     0,     0,     0,     0,     0,    47,     0,     0,     0,
-       0,     0,   114,    48,     0,     0,    49,     0,    50,   115,
-       0,    51,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    52,    53,    54,    42,     0,     0,     0,     0,
-       0,    55,     0,     0,     0,     0,    56,    57,     0,     0,
-      58,    59,    60,   142,    43,    61,     0,     0,     0,    44,
-      45,    46,     0,     0,     0,     0,     0,    47,     0,     0,
-       0,     0,     0,     0,    48,     0,     0,    49,     0,    50,
-       0,     0,    51,    62,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    52,    53,    54,    42,     0,     0,     0,
-       0,     0,    55,     0,     0,     0,     0,    56,    57,     0,
-       0,    58,    59,    60,   264,    43,    61,     0,     0,     0,
-      44,    45,    46,     0,     0,     0,     0,     0,    47,     0,
-       0,     0,     0,     0,     0,    48,     0,     0,    49,     0,
-      50,     0,     0,    51,    62,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    52,    53,    54,    42,     0,     0,
-       0,     0,     0,    55,     0,     0,     0,     0,    56,    57,
-       0,     0,    58,    59,    60,   330,    43,    61,     0,     0,
-       0,    44,    45,    46,     0,     0,     0,     0,     0,    47,
-       0,     0,     0,     0,     0,     0,    48,     0,     0,    49,
-       0,    50,     0,     0,    51,    62,     0,   180,   181,     0,
-     182,   183,   184,     0,     0,    52,    53,    54,    42,     0,
-       0,     0,     0,     0,    55,     0,   185,     0,     0,    56,
-      57,     0,     0,    58,    59,    60,     0,    43,    61,     0,
-       0,     0,    44,    45,    46,     0,     0,     0,   180,   181,
-      47,   182,   183,   184,     0,     0,     0,    48,     0,     0,
-      49,     0,    50,     0,     0,    51,    62,     0,   180,   181,
-     195,   182,   183,   184,     0,     0,    52,    53,    54,     0,
-       0,     0,     0,     0,     0,    55,     0,     0,     0,     0,
-      56,    57,   186,     0,    58,    59,    60,     0,     0,    61,
-     272,   187,   188,   189,   190,   191,   192,   193,     0,   180,
-     181,     0,   182,   183,   184,     0,   180,   181,     0,   182,
-     183,   184,     0,     0,     0,     0,     0,    62,   305,     0,
-       0,     0,     0,   186,     0,     0,   180,   181,   310,   182,
-     183,   184,   187,   188,   189,   190,   191,   192,   193,     0,
+      22,   143,   116,   118,   198,   122,   155,   224,   269,   236,
+     202,   128,    38,    28,   204,   205,    25,   234,   184,   184,
+      94,    95,    96,    97,    98,    99,   100,   184,   138,   101,
+      36,    46,    15,    16,    17,    18,    13,    19,    14,   148,
+     233,   132,   254,   133,   255,   263,   147,   255,   280,    29,
+     281,     1,   174,   119,   120,   283,    37,   255,   256,     4,
+     176,   173,   299,   342,   300,   343,    11,    12,   344,   345,
+      29,   199,     5,   178,   179,     6,     8,     7,    23,   237,
+     285,    35,   102,   242,   270,    25,    40,   103,   104,   105,
+     106,   107,    41,   108,   109,   110,   111,   186,   186,   112,
+     113,   129,    92,    91,    93,   126,   186,   127,   131,   214,
+     190,   191,   192,   193,   135,    20,   136,   137,   139,    46,
+     192,   193,   141,   114,   140,   121,   144,   317,   145,   150,
+     115,   146,   321,   149,   200,   153,   154,   157,   158,   219,
+     220,   221,   222,   223,   159,   160,   226,   227,   228,   229,
+     230,   231,   232,   292,   175,   235,   161,   162,   122,   163,
+     243,   143,   201,   164,   165,   208,   166,   167,   168,   169,
+     177,   143,   170,   271,   171,   172,    94,    95,    96,    97,
+      98,    99,   100,   194,   316,   101,   196,   197,   203,   206,
+     216,   217,   209,   212,   215,   225,   238,    94,    95,    96,
+      97,    98,    99,   100,   244,   247,   101,   248,   249,   119,
+     120,   257,   252,   266,   282,   267,   268,   273,   286,   274,
+     180,   181,   143,   182,   183,   184,   275,   278,   214,   284,
+     279,   295,   296,   259,   288,   289,   180,   181,   102,   182,
+     183,   184,   290,   103,   104,   105,   106,   107,   213,   108,
+     109,   110,   111,   291,   143,   112,   113,   293,   143,   102,
+     302,   301,   303,   298,   103,   104,   105,   106,   107,   304,
+     108,   109,   110,   111,   306,   307,   112,   113,   311,   114,
+     308,   313,   318,   319,   322,   323,   115,    94,    95,    96,
+      97,    98,    99,   100,   325,   327,   101,   328,   329,   331,
+     114,   332,   335,   338,   186,   337,   339,   115,   340,   334,
+     341,   347,   251,   187,   188,   189,   190,   191,   192,   193,
+     186,   156,   240,    24,   218,    30,   287,   315,     0,   187,
+     188,   189,   190,   191,   192,   193,     0,    39,   297,     0,
+     265,     0,     0,     0,     0,     0,     0,     0,     0,   102,
+       0,     0,    42,     0,   103,   104,   105,   106,   107,     0,
+     108,   109,   110,   111,     0,     0,   112,   113,     0,     0,
+       0,    43,     0,   258,   259,     0,    44,    45,    46,     0,
+       0,     0,     0,     0,    47,     0,     0,     0,     0,     0,
+     114,    48,     0,     0,    49,     0,    50,   115,     0,    51,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    52,
+      53,    54,    42,     0,     0,     0,     0,     0,    55,     0,
+       0,     0,     0,    56,    57,     0,     0,    58,    59,    60,
+     142,    43,    61,     0,     0,     0,    44,    45,    46,     0,
+       0,     0,     0,     0,    47,     0,     0,     0,     0,     0,
+       0,    48,     0,     0,    49,     0,    50,     0,     0,    51,
+      62,     0,     0,     0,     0,     0,     0,     0,     0,    52,
+      53,    54,    42,     0,     0,     0,     0,     0,    55,     0,
+       0,     0,     0,    56,    57,     0,     0,    58,    59,    60,
+     264,    43,    61,     0,     0,     0,    44,    45,    46,     0,
+       0,     0,     0,     0,    47,     0,     0,     0,     0,     0,
+       0,    48,     0,     0,    49,     0,    50,     0,     0,    51,
+      62,     0,     0,     0,     0,     0,     0,     0,     0,    52,
+      53,    54,    42,     0,     0,     0,     0,     0,    55,     0,
+       0,     0,     0,    56,    57,     0,     0,    58,    59,    60,
+     330,    43,    61,     0,     0,     0,    44,    45,    46,     0,
+       0,     0,     0,     0,    47,     0,     0,     0,     0,     0,
+       0,    48,     0,     0,    49,     0,    50,     0,     0,    51,
+      62,   180,   181,     0,   182,   183,   184,     0,     0,    52,
+      53,    54,    42,     0,     0,     0,     0,     0,    55,     0,
+     185,     0,     0,    56,    57,     0,     0,    58,    59,    60,
+       0,    43,    61,     0,     0,     0,    44,    45,    46,     0,
+       0,     0,   180,   181,    47,   182,   183,   184,     0,     0,
+       0,    48,     0,     0,    49,     0,    50,     0,     0,    51,
+      62,     0,     0,     0,   195,     0,     0,     0,     0,    52,
+      53,    54,   180,   181,     0,   182,   183,   184,    55,     0,
+       0,     0,     0,    56,    57,   186,     0,    58,    59,    60,
+       0,     0,    61,     0,   187,   188,   189,   190,   191,   192,
+     193,     0,   180,   181,   272,   182,   183,   184,     0,   180,
+     181,     0,   182,   183,   184,     0,     0,     0,     0,     0,
+      62,   305,     0,     0,     0,     0,   186,     0,     0,   180,
+     181,   310,   182,   183,   184,   187,   188,   189,   190,   191,
+     192,   193,     0,     0,     0,     0,     0,     0,   182,   183,
+     184,     0,     0,     0,     0,     0,   186,     0,     0,     0,
+       0,     0,     0,     0,     0,   187,   188,   189,   190,   191,
+     192,   193,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   186,     0,     0,     0,
+       0,     0,     0,   186,     0,   187,   188,   189,   190,   191,
+     192,   193,   187,   188,   189,   190,   191,   192,   193,     0,
        0,     0,     0,   186,     0,     0,     0,     0,     0,     0,
-       0,     0,   187,   188,   189,   190,   191,   192,   193,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   186,     0,     0,     0,     0,     0,
-       0,   186,     0,   187,   188,   189,   190,   191,   192,   193,
-     187,   188,   189,   190,   191,   192,   193,     0,     0,     0,
-       0,   186,     0,     0,     0,     0,     0,     0,     0,     0,
-     187,   188,   189,   190,   191,   192,   193
+       0,     0,   187,   188,   189,   190,   191,   192,   193,   186,
+       0,     0,     0,     0,     0,     0,     0,     0,   187,   188,
+     189,   190,   191,   192,   193
 };
 
 static const yytype_int16 yycheck[] =
 {
-      12,    64,    43,    44,     9,    46,    74,   185,    15,    40,
-     127,    38,     9,    25,   131,   132,    49,   195,    58,    13,
-      14,    15,     3,     4,     5,     6,     7,     8,     9,    69,
-      26,    12,    35,    19,    20,    21,    22,    65,    24,   194,
-      16,   115,    15,   117,    57,     9,    59,    50,    17,    18,
-      15,    91,    93,    46,    47,    36,    37,   212,     0,   115,
-     101,   117,   115,    91,   117,   113,     9,    64,    64,   115,
-     115,   117,   117,   114,   115,    25,   115,   115,   117,   117,
-     258,     9,   109,   200,   117,    66,   117,   113,    95,   114,
-      71,    72,    73,    74,    75,   100,    77,    78,    79,    80,
-       9,    95,    83,    84,     9,    25,    63,   113,     9,   150,
-     104,   105,   106,   107,   108,   109,   110,   103,    49,     9,
-      39,     9,    95,     9,    35,    88,   107,   305,   109,    88,
-      95,     9,   310,   114,   107,   108,   109,   110,   113,   180,
-     181,   182,   183,   184,   109,   110,   187,   188,   189,   190,
-     191,   192,   193,   270,   114,   196,    40,   113,   199,   113,
-     201,   224,   113,    39,   113,   113,   113,   113,   113,   113,
-      17,   234,   113,   241,   113,   113,     3,     4,     5,     6,
-       7,     8,     9,   113,   301,    12,   113,   113,   113,   113,
-     113,   113,   113,    52,   112,   112,    60,    49,     3,     4,
-       5,     6,     7,     8,     9,    70,   114,    12,   114,    36,
-      37,   114,   114,   113,   255,   114,    10,    11,   259,    13,
-      14,    15,   285,     5,    70,     9,     9,   114,   269,    58,
-       9,   272,   273,    10,    11,   116,    13,    14,    15,    66,
-      55,     9,   115,   117,    71,    72,    73,    74,    75,    54,
-      77,    78,    79,    80,   317,   104,    83,    84,   321,   117,
-       9,    66,     9,   275,   114,     9,    71,    72,    73,    74,
-      75,    31,    77,    78,    79,    80,    27,    32,    83,    84,
-     107,   115,     9,    41,    62,   115,   119,   114,     3,     4,
-       5,     6,     7,     8,     9,   116,    28,    12,    51,    92,
-     114,    95,   107,    17,    61,    44,     3,   114,    89,   114,
-     104,   105,   106,   107,   108,   109,   110,    45,    95,    93,
-     115,   115,    12,     9,    94,   101,     9,   104,   105,   106,
-     107,   108,   109,   110,    32,   102,     8,     3,   115,   104,
-       9,   208,   199,    74,    14,   274,   261,   300,    27,    34,
-      -1,    66,    -1,    -1,     9,    -1,    71,    72,    73,    74,
-      75,    -1,    77,    78,    79,    80,    -1,    -1,    83,    84,
-      -1,    -1,    -1,    28,    -1,    30,    31,    -1,    33,    34,
-      35,    -1,    -1,    -1,    -1,    -1,    41,    -1,    -1,    -1,
-      -1,    -1,   107,    48,    -1,    -1,    51,    -1,    53,   114,
-      -1,    56,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    67,    68,    69,     9,    -1,    -1,    -1,    -1,
-      -1,    76,    -1,    -1,    -1,    -1,    81,    82,    -1,    -1,
-      85,    86,    87,    27,    28,    90,    -1,    -1,    -1,    33,
-      34,    35,    -1,    -1,    -1,    -1,    -1,    41,    -1,    -1,
-      -1,    -1,    -1,    -1,    48,    -1,    -1,    51,    -1,    53,
-      -1,    -1,    56,   118,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    67,    68,    69,     9,    -1,    -1,    -1,
-      -1,    -1,    76,    -1,    -1,    -1,    -1,    81,    82,    -1,
-      -1,    85,    86,    87,    27,    28,    90,    -1,    -1,    -1,
-      33,    34,    35,    -1,    -1,    -1,    -1,    -1,    41,    -1,
-      -1,    -1,    -1,    -1,    -1,    48,    -1,    -1,    51,    -1,
-      53,    -1,    -1,    56,   118,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    67,    68,    69,     9,    -1,    -1,
-      -1,    -1,    -1,    76,    -1,    -1,    -1,    -1,    81,    82,
-      -1,    -1,    85,    86,    87,    27,    28,    90,    -1,    -1,
-      -1,    33,    34,    35,    -1,    -1,    -1,    -1,    -1,    41,
-      -1,    -1,    -1,    -1,    -1,    -1,    48,    -1,    -1,    51,
-      -1,    53,    -1,    -1,    56,   118,    -1,    10,    11,    -1,
-      13,    14,    15,    -1,    -1,    67,    68,    69,     9,    -1,
-      -1,    -1,    -1,    -1,    76,    -1,    29,    -1,    -1,    81,
-      82,    -1,    -1,    85,    86,    87,    -1,    28,    90,    -1,
-      -1,    -1,    33,    34,    35,    -1,    -1,    -1,    10,    11,
-      41,    13,    14,    15,    -1,    -1,    -1,    48,    -1,    -1,
-      51,    -1,    53,    -1,    -1,    56,   118,    -1,    10,    11,
-      32,    13,    14,    15,    -1,    -1,    67,    68,    69,    -1,
-      -1,    -1,    -1,    -1,    -1,    76,    -1,    -1,    -1,    -1,
-      81,    82,    95,    -1,    85,    86,    87,    -1,    -1,    90,
-      42,   104,   105,   106,   107,   108,   109,   110,    -1,    10,
-      11,    -1,    13,    14,    15,    -1,    10,    11,    -1,    13,
-      14,    15,    -1,    -1,    -1,    -1,    -1,   118,    29,    -1,
-      -1,    -1,    -1,    95,    -1,    -1,    10,    11,    32,    13,
-      14,    15,   104,   105,   106,   107,   108,   109,   110,    -1,
-      -1,    -1,    -1,    95,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   104,   105,   106,   107,   108,   109,   110,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    95,    -1,    -1,    -1,    -1,    -1,
-      -1,    95,    -1,   104,   105,   106,   107,   108,   109,   110,
-     104,   105,   106,   107,   108,   109,   110,    -1,    -1,    -1,
-      -1,    95,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     104,   105,   106,   107,   108,   109,   110
+      12,    64,    43,    44,    49,    46,    74,   185,    40,    38,
+     127,     9,    26,    25,   131,   132,     9,   195,    15,    15,
+       3,     4,     5,     6,     7,     8,     9,    15,    58,    12,
+      64,    35,    19,    20,    21,    22,   114,    24,   116,    69,
+     194,    57,   114,    59,   116,   114,    50,   116,   114,    63,
+     116,    16,    93,    36,    37,   114,    90,   116,   212,     9,
+     101,    91,   114,   114,   116,   116,    17,    18,    46,    47,
+      63,   116,     0,   114,   115,   112,     9,   113,    25,   108,
+     258,   112,    65,   200,   116,     9,     9,    70,    71,    72,
+      73,    74,     9,    76,    77,    78,    79,    94,    94,    82,
+      83,    99,   112,    25,    62,     9,    94,    49,    39,   150,
+     106,   107,   108,   109,     9,   102,     9,     9,    87,    35,
+     108,   109,     9,   106,    87,   108,   112,   305,   113,    40,
+     113,   112,   310,   112,    39,   112,   112,   112,   112,   180,
+     181,   182,   183,   184,   112,   112,   187,   188,   189,   190,
+     191,   192,   193,   270,   111,   196,   112,   112,   199,   112,
+     201,   224,    17,   112,   112,    49,   112,   112,   112,   112,
+     111,   234,   112,   241,   112,   112,     3,     4,     5,     6,
+       7,     8,     9,   113,   301,    12,   113,   113,    52,    60,
+      69,    69,   113,   113,   112,     5,     9,     3,     4,     5,
+       6,     7,     8,     9,     9,   113,    12,    58,     9,    36,
+      37,    55,   115,     9,   255,   114,   116,   103,   259,   116,
+      10,    11,   285,    13,    14,    15,     9,     9,   269,     9,
+     113,   272,   273,    31,    27,    32,    10,    11,    65,    13,
+      14,    15,   114,    70,    71,    72,    73,    74,    54,    76,
+      77,    78,    79,     9,   317,    82,    83,    41,   321,    65,
+     114,    61,   118,   275,    70,    71,    72,    73,    74,   115,
+      76,    77,    78,    79,    28,    51,    82,    83,   113,   106,
+      91,   100,    17,    44,     3,    88,   113,     3,     4,     5,
+       6,     7,     8,     9,   101,   113,    12,    92,    45,   114,
+     106,    12,     9,     9,    94,    93,    32,   113,     8,   103,
+       3,     9,   208,   103,   104,   105,   106,   107,   108,   109,
+      94,    74,   199,    14,   114,    27,   261,   300,    -1,   103,
+     104,   105,   106,   107,   108,   109,    -1,    34,   274,    -1,
+     114,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    65,
+      -1,    -1,     9,    -1,    70,    71,    72,    73,    74,    -1,
+      76,    77,    78,    79,    -1,    -1,    82,    83,    -1,    -1,
+      -1,    28,    -1,    30,    31,    -1,    33,    34,    35,    -1,
+      -1,    -1,    -1,    -1,    41,    -1,    -1,    -1,    -1,    -1,
+     106,    48,    -1,    -1,    51,    -1,    53,   113,    -1,    56,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,
+      67,    68,     9,    -1,    -1,    -1,    -1,    -1,    75,    -1,
+      -1,    -1,    -1,    80,    81,    -1,    -1,    84,    85,    86,
+      27,    28,    89,    -1,    -1,    -1,    33,    34,    35,    -1,
+      -1,    -1,    -1,    -1,    41,    -1,    -1,    -1,    -1,    -1,
+      -1,    48,    -1,    -1,    51,    -1,    53,    -1,    -1,    56,
+     117,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,
+      67,    68,     9,    -1,    -1,    -1,    -1,    -1,    75,    -1,
+      -1,    -1,    -1,    80,    81,    -1,    -1,    84,    85,    86,
+      27,    28,    89,    -1,    -1,    -1,    33,    34,    35,    -1,
+      -1,    -1,    -1,    -1,    41,    -1,    -1,    -1,    -1,    -1,
+      -1,    48,    -1,    -1,    51,    -1,    53,    -1,    -1,    56,
+     117,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,
+      67,    68,     9,    -1,    -1,    -1,    -1,    -1,    75,    -1,
+      -1,    -1,    -1,    80,    81,    -1,    -1,    84,    85,    86,
+      27,    28,    89,    -1,    -1,    -1,    33,    34,    35,    -1,
+      -1,    -1,    -1,    -1,    41,    -1,    -1,    -1,    -1,    -1,
+      -1,    48,    -1,    -1,    51,    -1,    53,    -1,    -1,    56,
+     117,    10,    11,    -1,    13,    14,    15,    -1,    -1,    66,
+      67,    68,     9,    -1,    -1,    -1,    -1,    -1,    75,    -1,
+      29,    -1,    -1,    80,    81,    -1,    -1,    84,    85,    86,
+      -1,    28,    89,    -1,    -1,    -1,    33,    34,    35,    -1,
+      -1,    -1,    10,    11,    41,    13,    14,    15,    -1,    -1,
+      -1,    48,    -1,    -1,    51,    -1,    53,    -1,    -1,    56,
+     117,    -1,    -1,    -1,    32,    -1,    -1,    -1,    -1,    66,
+      67,    68,    10,    11,    -1,    13,    14,    15,    75,    -1,
+      -1,    -1,    -1,    80,    81,    94,    -1,    84,    85,    86,
+      -1,    -1,    89,    -1,   103,   104,   105,   106,   107,   108,
+     109,    -1,    10,    11,    42,    13,    14,    15,    -1,    10,
+      11,    -1,    13,    14,    15,    -1,    -1,    -1,    -1,    -1,
+     117,    29,    -1,    -1,    -1,    -1,    94,    -1,    -1,    10,
+      11,    32,    13,    14,    15,   103,   104,   105,   106,   107,
+     108,   109,    -1,    -1,    -1,    -1,    -1,    -1,    13,    14,
+      15,    -1,    -1,    -1,    -1,    -1,    94,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   103,   104,   105,   106,   107,
+     108,   109,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    -1,    -1,    -1,
+      -1,    -1,    -1,    94,    -1,   103,   104,   105,   106,   107,
+     108,   109,   103,   104,   105,   106,   107,   108,   109,    -1,
+      -1,    -1,    -1,    94,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   103,   104,   105,   106,   107,   108,   109,    94,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   103,   104,
+     105,   106,   107,   108,   109
 };
 
-/* 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,    16,   121,   192,     9,     0,   113,   114,     9,   184,
-     185,    17,    18,   115,   117,    19,    20,    21,    22,    24,
-     103,   183,   183,    25,   184,     9,   186,   187,   183,    64,
-     186,   188,   189,   190,   191,   113,    65,    91,    26,   190,
+       0,    16,   120,   190,     9,     0,   112,   113,     9,   182,
+     183,    17,    18,   114,   116,    19,    20,    21,    22,    24,
+     102,   181,   181,    25,   182,     9,   184,   185,   181,    63,
+     184,   186,   187,   188,   189,   112,    64,    90,    26,   188,
        9,     9,     9,    28,    33,    34,    35,    41,    48,    51,
-      53,    56,    67,    68,    69,    76,    81,    82,    85,    86,
-      87,    90,   118,   122,   123,   127,   128,   129,   142,   143,
-     144,   148,   149,   150,   151,   152,   153,   154,   155,   159,
-     160,   161,   162,   163,   164,   165,   166,   175,   179,   181,
-     182,    25,   113,    63,     3,     4,     5,     6,     7,     8,
-       9,    12,    66,    71,    72,    73,    74,    75,    77,    78,
-      79,    80,    83,    84,   107,   114,   124,   125,   124,    36,
-      37,   109,   124,   134,   135,   136,     9,    49,     9,   100,
-     180,    39,    57,    59,   177,     9,     9,     9,   142,    88,
-      88,     9,    27,   122,   113,   114,   113,    50,   142,   113,
-      40,   137,   147,   113,   113,   137,   147,   113,   113,   113,
-     113,   113,   113,   113,   113,   113,   113,   113,   113,   113,
-     113,   113,   113,   142,   124,   112,   124,   112,   124,   124,
-      10,    11,    13,    14,    15,    29,    95,   104,   105,   106,
-     107,   108,   109,   110,   114,    32,   114,   114,    49,   117,
-      39,    17,   180,    52,   180,   180,    60,   178,    49,   114,
-     124,   133,   114,    54,   124,   113,    70,    70,   115,   124,
-     124,   124,   124,   124,   123,     5,   124,   124,   124,   124,
-     124,   124,   124,   133,   123,   124,    38,   109,     9,   132,
-     134,   131,   180,   124,     9,   145,   146,   114,    58,     9,
-     130,   132,   116,   126,   115,   117,   133,    55,    30,    31,
-     156,   157,   158,   115,    27,   115,     9,   115,   117,    40,
-     117,   137,    42,   104,   117,     9,   167,   168,     9,   114,
-     115,   117,   124,   115,     9,   123,   124,   156,    27,    32,
-     115,     9,   180,    41,   138,   124,   124,   145,   183,   115,
-     117,    62,   115,   119,   116,    29,    28,    51,    92,   139,
-      32,   114,   169,    61,   172,   167,   180,   123,    17,    44,
-     141,   123,     3,    89,   170,   101,   173,   114,    93,    45,
-      27,   115,    12,   171,   102,   174,     9,   176,    94,     9,
-      32,     8,   104,   115,   117,    46,    47,   140,     3,     9
+      53,    56,    66,    67,    68,    75,    80,    81,    84,    85,
+      86,    89,   117,   121,   122,   126,   127,   128,   141,   142,
+     143,   147,   148,   149,   150,   151,   152,   153,   154,   158,
+     159,   160,   161,   162,   163,   164,   165,   173,   177,   179,
+     180,    25,   112,    62,     3,     4,     5,     6,     7,     8,
+       9,    12,    65,    70,    71,    72,    73,    74,    76,    77,
+      78,    79,    82,    83,   106,   113,   123,   124,   123,    36,
+      37,   108,   123,   133,   134,   135,     9,    49,     9,    99,
+     178,    39,    57,    59,   175,     9,     9,     9,   141,    87,
+      87,     9,    27,   121,   112,   113,   112,    50,   141,   112,
+      40,   136,   146,   112,   112,   136,   146,   112,   112,   112,
+     112,   112,   112,   112,   112,   112,   112,   112,   112,   112,
+     112,   112,   112,   141,   123,   111,   123,   111,   123,   123,
+      10,    11,    13,    14,    15,    29,    94,   103,   104,   105,
+     106,   107,   108,   109,   113,    32,   113,   113,    49,   116,
+      39,    17,   178,    52,   178,   178,    60,   176,    49,   113,
+     123,   132,   113,    54,   123,   112,    69,    69,   114,   123,
+     123,   123,   123,   123,   122,     5,   123,   123,   123,   123,
+     123,   123,   123,   132,   122,   123,    38,   108,     9,   131,
+     133,   130,   178,   123,     9,   144,   145,   113,    58,     9,
+     129,   131,   115,   125,   114,   116,   132,    55,    30,    31,
+     155,   156,   157,   114,    27,   114,     9,   114,   116,    40,
+     116,   136,    42,   103,   116,     9,   166,   167,     9,   113,
+     114,   116,   123,   114,     9,   122,   123,   155,    27,    32,
+     114,     9,   178,    41,   137,   123,   123,   144,   181,   114,
+     116,    61,   114,   118,   115,    29,    28,    51,    91,   138,
+      32,   113,   168,   100,   171,   166,   178,   122,    17,    44,
+     140,   122,     3,    88,   169,   101,   172,   113,    92,    45,
+      27,   114,    12,   170,   103,     9,   174,    93,     9,    32,
+       8,     3,   114,   116,    46,    47,   139,     9
 };
 
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		(-2)
-#define YYEOF		0
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,   119,   120,   121,   121,   121,   121,   121,   121,   121,
+     121,   121,   121,   121,   121,   121,   121,   121,   121,   121,
+     121,   121,   121,   121,   121,   122,   122,   123,   123,   123,
+     123,   123,   123,   123,   123,   123,   123,   123,   123,   123,
+     123,   123,   123,   123,   123,   123,   123,   123,   123,   123,
+     123,   123,   123,   123,   124,   124,   124,   124,   124,   124,
+     124,   124,   124,   124,   124,   125,   125,   125,   126,   127,
+     128,   128,   128,   129,   130,   130,   131,   131,   131,   132,
+     132,   132,   133,   133,   133,   133,   134,   134,   134,   135,
+     135,   135,   136,   136,   137,   137,   138,   138,   139,   139,
+     139,   140,   140,   141,   142,   143,   143,   144,   145,   145,
+     146,   147,   148,   149,   150,   151,   152,   153,   154,   155,
+     156,   156,   157,   157,   157,   158,   159,   160,   161,   162,
+     163,   164,   165,   165,   166,   167,   167,   168,   168,   169,
+     169,   170,   170,   171,   171,   172,   172,   173,   174,   174,
+     175,   175,   176,   176,   177,   178,   178,   179,   180,   181,
+     181,   181,   181,   181,   181,   182,   182,   183,   183,   183,
+     184,   185,   185,   185,   186,   187,   188,   188,   189,   189,
+     189,   190
+};
 
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     2,     1,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     1,     2,     1,     4,     1,
+       1,     1,     1,     1,     1,     1,     3,     3,     3,     3,
+       2,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     2,     3,     3,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     0,     1,     3,     6,     4,
+       1,     1,     1,     3,     1,     3,     0,     1,     3,     0,
+       1,     3,     1,     4,     5,     4,     0,     1,     3,     1,
+       3,     1,     0,     2,     0,     2,     0,     4,     0,     1,
+       1,     0,     4,     8,     3,     5,     2,     3,     1,     3,
+       4,     4,     2,     2,     3,     2,     2,     2,     3,     4,
+       1,     2,     0,     2,     1,     7,     6,    10,     1,     1,
+       2,     2,     4,     4,     5,     1,     3,     0,     3,     0,
+       1,     0,     2,     0,     1,     0,     3,     8,     1,     3,
+       0,     1,     0,     1,    10,     1,     1,     2,     2,     1,
+       1,     1,     1,     1,     1,     3,     3,     0,     1,     3,
+       3,     0,     1,     2,     6,     4,     1,     1,     0,     1,
+       2,    11
+};
 
 
-/* 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.  */
+#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 YYFAIL		goto yyerrlab
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)					\
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    {								\
-      yychar = (Token);						\
-      yylval = (Value);						\
-      yytoken = YYTRANSLATE (yychar);				\
-      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))
-
-
-#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))
-#endif
-
-
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
+      YYERROR;                                                  \
+    }                                                           \
+while (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
+/* Error token number */
+#define YYTERROR        1
+#define YYERRCODE       256
 
 
-/* YYLEX -- calling `yylex' with the right arguments.  */
-
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (YYLEX_PARAM)
-#else
-# define YYLEX yylex ()
-#endif
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
@@ -1276,54 +1080,46 @@ while (YYID (0))
 #  define YYFPRINTF fprintf
 # endif
 
-# define YYDPRINTF(Args)			\
-do {						\
-  if (yydebug)					\
-    YYFPRINTF Args;				\
-} while (YYID (0))
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
-do {									  \
-  if (yydebug)								  \
-    {									  \
-      YYFPRINTF (stderr, "%s ", Title);					  \
-      yy_symbol_print (stderr,						  \
-		  Type, Value); \
-      YYFPRINTF (stderr, "\n");						  \
-    }									  \
-} while (YYID (0))
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
 
 
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
+
+
+/*----------------------------------------.
+| 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)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
 {
+  FILE *yyo = yyoutput;
+  YYUSE (yyo);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
-  YYUSE (yyoutput);
 # endif
-  switch (yytype)
-    {
-      default:
-	break;
-    }
+  YYUSE (yytype);
 }
 
 
@@ -1331,22 +1127,11 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
 | 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)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#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_symbol_value_print (yyoutput, yytype, yyvaluep);
   YYFPRINTF (yyoutput, ")");
@@ -1357,66 +1142,54 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
 | TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
-#else
 static void
-yy_stack_print (bottom, top)
-    yytype_int16 *bottom;
-    yytype_int16 *top;
-#endif
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
 {
   YYFPRINTF (stderr, "Stack now");
-  for (; bottom <= top; ++bottom)
-    YYFPRINTF (stderr, " %d", *bottom);
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
   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, int yyrule)
-#else
-static void
-yy_reduce_print (yyvsp, yyrule)
-    YYSTYPE *yyvsp;
-    int yyrule;
-#endif
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, 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++)
     {
-      fprintf (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-		       &(yyvsp[(yyi + 1) - (yynrhs)])
-		       		       );
-      fprintf (stderr, "\n");
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                                              );
+      YYFPRINTF (stderr, "\n");
     }
 }
 
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
-  if (yydebug)				\
-    yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule); \
+} while (0)
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
@@ -1430,7 +1203,7 @@ int yydebug;
 
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef	YYINITDEPTH
+#ifndef YYINITDEPTH
 # define YYINITDEPTH 200
 #endif
 
@@ -1446,7 +1219,6 @@ int yydebug;
 #endif
 
 
-
 #if YYERROR_VERBOSE
 
 # ifndef yystrlen
@@ -1454,15 +1226,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++)
@@ -1478,16 +1243,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;
@@ -1517,27 +1274,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: ;
     }
 
@@ -1548,204 +1305,209 @@ yytnamerr (char *yyres, const char *yystr)
 }
 # endif
 
-/* Copy into YYRESULT an error message about the unexpected token
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
-   including the terminating null byte.  If YYRESULT is null, do not
-   copy anything; just return the number of bytes that would be
-   copied.  As a special case, return 0 if an ordinary "syntax error"
-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
-   size calculation.  */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
+
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
 {
-  int yyn = yypact[yystate];
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  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
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - 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
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
+    {
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
+              }
+        }
+    }
 
-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
-    return 0;
-  else
+  switch (yycount)
     {
-      int yytype = YYTRANSLATE (yychar);
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-      YYSIZE_T yysize = yysize0;
-      YYSIZE_T yysize1;
-      int yysize_overflow = 0;
-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-      int yyx;
-
-# if 0
-      /* This is so xgettext sees the translatable formats that are
-	 constructed on the fly.  */
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
-      char *yyfmt;
-      char const *yyf;
-      static char const yyunexpected[] = "syntax error, unexpected %s";
-      static char const yyexpecting[] = ", expecting %s";
-      static char const yyor[] = " or %s";
-      char yyformat[sizeof yyunexpected
-		    + sizeof yyexpecting - 1
-		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-		       * (sizeof yyor - 1))];
-      char const *yyprefix = yyexpecting;
-
-      /* Start YYX at -YYN if negative to avoid negative indexes in
-	 YYCHECK.  */
-      int yyxbegin = yyn < 0 ? -yyn : 0;
-
-      /* Stay within bounds of both yycheck and yytname.  */
-      int yychecklim = YYLAST - yyn + 1;
-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-      int yycount = 1;
-
-      yyarg[0] = yytname[yytype];
-      yyfmt = yystpcpy (yyformat, yyunexpected);
-
-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	  {
-	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-	      {
-		yycount = 1;
-		yysize = yysize0;
-		yyformat[sizeof yyunexpected - 1] = '\0';
-		break;
-	      }
-	    yyarg[yycount++] = yytname[yyx];
-	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-	    yysize_overflow |= (yysize1 < yysize);
-	    yysize = yysize1;
-	    yyfmt = yystpcpy (yyfmt, yyprefix);
-	    yyprefix = yyor;
-	  }
-
-      yyf = YY_(yyformat);
-      yysize1 = yysize + yystrlen (yyf);
-      yysize_overflow |= (yysize1 < yysize);
-      yysize = yysize1;
-
-      if (yysize_overflow)
-	return YYSIZE_MAXIMUM;
-
-      if (yyresult)
-	{
-	  /* Avoid sprintf, as that infringes on the user's name space.
-	     Don't have undefined behavior even if the translation
-	     produced a string with the wrong number of "%s"s.  */
-	  char *yyp = yyresult;
-	  int yyi = 0;
-	  while ((*yyp = *yyf) != '\0')
-	    {
-	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		{
-		  yyp += yytnamerr (yyp, yyarg[yyi++]);
-		  yyf += 2;
-		}
-	      else
-		{
-		  yyp++;
-		  yyf++;
-		}
-	    }
-	}
-      return yysize;
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
     }
+
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
+
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
+    }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
 }
 #endif /* YYERROR_VERBOSE */
 
-
 /*-----------------------------------------------.
 | 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)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
-    const char *yymsg;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
 {
   YYUSE (yyvaluep);
-
   if (!yymsg)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YYUSE (yytype);
+  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.  */
+static int yychar;
 
-/* The look-ahead symbol.  */
-int yychar;
-
-/* The semantic value of the look-ahead symbol.  */
+/* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
-
 /* Number of syntax errors so far.  */
-int yynerrs;
-
+static 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.
+
+       Refer to the stacks through separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
+
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
+
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
+
+    YYSIZE_T yystacksize;
 
-  int yystate;
   int yyn;
   int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Look-ahead token as an internal (translated) token number.  */
+  /* Lookahead token as an internal (translated) token number.  */
   int yytoken = 0;
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
 #if YYERROR_VERBOSE
   /* Buffer for error messages, and its allocated size.  */
   char yymsgbuf[128];
@@ -1753,54 +1515,22 @@ yyparse ()
   YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
 #endif
 
-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
-
-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
-
-  /* The state stack.  */
-  yytype_int16 yyssa[YYINITDEPTH];
-  yytype_int16 *yyss = yyssa;
-  yytype_int16 *yyssp;
-
-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  YYSTYPE *yyvsp;
-
-
-
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
-  YYSIZE_T yystacksize = YYINITDEPTH;
-
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-
-
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   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;
-
+  yychar = YYEMPTY; /* Cause a token to be read.  */
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1821,25 +1551,23 @@ 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;
-
-
-	/* 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),
-
-		    &yystacksize);
-
-	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;
+
+        /* 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),
+                    &yystacksize);
+
+        yyss = yyss1;
+        yyvs = yyvs1;
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
@@ -1847,23 +1575,22 @@ 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);
-	YYSTACK_RELOCATE (yyvs);
-
+        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);
 #  undef YYSTACK_RELOCATE
-	if (yyss1 != yyssa)
-	  YYSTACK_FREE (yyss1);
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
       }
 # endif
 #endif /* no yyoverflow */
@@ -1871,16 +1598,18 @@ yyparse ()
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + 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));
 
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
   goto yybackup;
 
 /*-----------.
@@ -1889,20 +1618,20 @@ yyparse ()
 yybackup:
 
   /* Do appropriate processing given the current state.  Read a
-     look-ahead token if we need one and don't already have one.  */
+     lookahead token if we need one and don't already have one.  */
 
-  /* First try to decide what to do without reference to look-ahead token.  */
+  /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
+  if (yypact_value_is_default (yyn))
     goto yydefault;
 
-  /* Not known => get a look-ahead token if don't already have one.  */
+  /* Not known => get a lookahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
+      yychar = yylex ();
     }
 
   if (yychar <= YYEOF)
@@ -1924,29 +1653,27 @@ yyparse ()
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
-	goto yyerrlab;
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
-  /* Shift the look-ahead token.  */
+  /* Shift the lookahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-  /* Discard the shifted token unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
 
   yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
   goto yynewstate;
 
@@ -1969,7 +1696,7 @@ yyparse ()
   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
@@ -1983,838 +1710,983 @@ yyparse ()
   switch (yyn)
     {
         case 25:
-#line 190 "pars0grm.y"
-    { (yyval) = que_node_list_add_last(NULL, (yyvsp[(1) - (1)])); ;}
+#line 191 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = que_node_list_add_last(NULL, (yyvsp[0])); }
+#line 1716 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 26:
-#line 192 "pars0grm.y"
-    { (yyval) = que_node_list_add_last((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)])); ;}
+#line 193 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = que_node_list_add_last((yyvsp[-1]), (yyvsp[0])); }
+#line 1722 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 27:
-#line 196 "pars0grm.y"
-    { (yyval) = (yyvsp[(1) - (1)]);;}
+#line 197 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]);}
+#line 1728 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 28:
-#line 198 "pars0grm.y"
-    { (yyval) = pars_func((yyvsp[(1) - (4)]), (yyvsp[(3) - (4)])); ;}
+#line 199 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_func((yyvsp[-3]), (yyvsp[-1])); }
+#line 1734 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 29:
-#line 199 "pars0grm.y"
-    { (yyval) = (yyvsp[(1) - (1)]);;}
+#line 200 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]);}
+#line 1740 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 30:
-#line 200 "pars0grm.y"
-    { (yyval) = (yyvsp[(1) - (1)]);;}
+#line 201 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]);}
+#line 1746 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 31:
-#line 201 "pars0grm.y"
-    { (yyval) = (yyvsp[(1) - (1)]);;}
+#line 202 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]);}
+#line 1752 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 32:
-#line 202 "pars0grm.y"
-    { (yyval) = (yyvsp[(1) - (1)]);;}
+#line 203 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]);}
+#line 1758 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 33:
-#line 203 "pars0grm.y"
-    { (yyval) = (yyvsp[(1) - (1)]);;}
+#line 204 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]);}
+#line 1764 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 34:
-#line 204 "pars0grm.y"
-    { (yyval) = (yyvsp[(1) - (1)]);;}
+#line 205 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]);}
+#line 1770 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 35:
-#line 205 "pars0grm.y"
-    { (yyval) = (yyvsp[(1) - (1)]);;}
+#line 206 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]);}
+#line 1776 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 36:
-#line 206 "pars0grm.y"
-    { (yyval) = pars_op('+', (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); ;}
+#line 207 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_op('+', (yyvsp[-2]), (yyvsp[0])); }
+#line 1782 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 37:
-#line 207 "pars0grm.y"
-    { (yyval) = pars_op('-', (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); ;}
+#line 208 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_op('-', (yyvsp[-2]), (yyvsp[0])); }
+#line 1788 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 38:
-#line 208 "pars0grm.y"
-    { (yyval) = pars_op('*', (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); ;}
+#line 209 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_op('*', (yyvsp[-2]), (yyvsp[0])); }
+#line 1794 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 39:
-#line 209 "pars0grm.y"
-    { (yyval) = pars_op('/', (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); ;}
+#line 210 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_op('/', (yyvsp[-2]), (yyvsp[0])); }
+#line 1800 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 40:
-#line 210 "pars0grm.y"
-    { (yyval) = pars_op('-', (yyvsp[(2) - (2)]), NULL); ;}
+#line 211 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_op('-', (yyvsp[0]), NULL); }
+#line 1806 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 41:
-#line 211 "pars0grm.y"
-    { (yyval) = (yyvsp[(2) - (3)]); ;}
+#line 212 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[-1]); }
+#line 1812 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 42:
-#line 212 "pars0grm.y"
-    { (yyval) = pars_op('=', (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); ;}
+#line 213 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_op('=', (yyvsp[-2]), (yyvsp[0])); }
+#line 1818 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 43:
-#line 214 "pars0grm.y"
-    { (yyval) = pars_op(PARS_LIKE_TOKEN, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); ;}
+#line 215 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_op(PARS_LIKE_TOKEN, (yyvsp[-2]), (yyvsp[0])); }
+#line 1824 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 44:
-#line 215 "pars0grm.y"
-    { (yyval) = pars_op('<', (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); ;}
+#line 216 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_op('<', (yyvsp[-2]), (yyvsp[0])); }
+#line 1830 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 45:
-#line 216 "pars0grm.y"
-    { (yyval) = pars_op('>', (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); ;}
+#line 217 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_op('>', (yyvsp[-2]), (yyvsp[0])); }
+#line 1836 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 46:
-#line 217 "pars0grm.y"
-    { (yyval) = pars_op(PARS_GE_TOKEN, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); ;}
+#line 218 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_op(PARS_GE_TOKEN, (yyvsp[-2]), (yyvsp[0])); }
+#line 1842 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 47:
-#line 218 "pars0grm.y"
-    { (yyval) = pars_op(PARS_LE_TOKEN, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); ;}
+#line 219 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_op(PARS_LE_TOKEN, (yyvsp[-2]), (yyvsp[0])); }
+#line 1848 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 48:
-#line 219 "pars0grm.y"
-    { (yyval) = pars_op(PARS_NE_TOKEN, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); ;}
+#line 220 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_op(PARS_NE_TOKEN, (yyvsp[-2]), (yyvsp[0])); }
+#line 1854 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 49:
-#line 220 "pars0grm.y"
-    { (yyval) = pars_op(PARS_AND_TOKEN, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); ;}
+#line 221 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_op(PARS_AND_TOKEN, (yyvsp[-2]), (yyvsp[0])); }
+#line 1860 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 50:
-#line 221 "pars0grm.y"
-    { (yyval) = pars_op(PARS_OR_TOKEN, (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); ;}
+#line 222 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_op(PARS_OR_TOKEN, (yyvsp[-2]), (yyvsp[0])); }
+#line 1866 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 51:
-#line 222 "pars0grm.y"
-    { (yyval) = pars_op(PARS_NOT_TOKEN, (yyvsp[(2) - (2)]), NULL); ;}
+#line 223 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_op(PARS_NOT_TOKEN, (yyvsp[0]), NULL); }
+#line 1872 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 52:
-#line 224 "pars0grm.y"
-    { (yyval) = pars_op(PARS_NOTFOUND_TOKEN, (yyvsp[(1) - (3)]), NULL); ;}
+#line 225 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_op(PARS_NOTFOUND_TOKEN, (yyvsp[-2]), NULL); }
+#line 1878 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 53:
-#line 226 "pars0grm.y"
-    { (yyval) = pars_op(PARS_NOTFOUND_TOKEN, (yyvsp[(1) - (3)]), NULL); ;}
+#line 227 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_op(PARS_NOTFOUND_TOKEN, (yyvsp[-2]), NULL); }
+#line 1884 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 54:
-#line 230 "pars0grm.y"
-    { (yyval) = &pars_to_char_token; ;}
+#line 231 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_to_char_token; }
+#line 1890 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 55:
-#line 231 "pars0grm.y"
-    { (yyval) = &pars_to_number_token; ;}
+#line 232 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_to_number_token; }
+#line 1896 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 56:
-#line 232 "pars0grm.y"
-    { (yyval) = &pars_to_binary_token; ;}
+#line 233 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_to_binary_token; }
+#line 1902 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 57:
-#line 234 "pars0grm.y"
-    { (yyval) = &pars_binary_to_number_token; ;}
+#line 235 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_binary_to_number_token; }
+#line 1908 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 58:
-#line 235 "pars0grm.y"
-    { (yyval) = &pars_substr_token; ;}
+#line 236 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_substr_token; }
+#line 1914 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 59:
-#line 236 "pars0grm.y"
-    { (yyval) = &pars_concat_token; ;}
+#line 237 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_concat_token; }
+#line 1920 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 60:
-#line 237 "pars0grm.y"
-    { (yyval) = &pars_instr_token; ;}
+#line 238 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_instr_token; }
+#line 1926 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 61:
-#line 238 "pars0grm.y"
-    { (yyval) = &pars_length_token; ;}
+#line 239 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_length_token; }
+#line 1932 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 62:
-#line 239 "pars0grm.y"
-    { (yyval) = &pars_sysdate_token; ;}
+#line 240 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_sysdate_token; }
+#line 1938 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 63:
-#line 240 "pars0grm.y"
-    { (yyval) = &pars_rnd_token; ;}
+#line 241 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_rnd_token; }
+#line 1944 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 64:
-#line 241 "pars0grm.y"
-    { (yyval) = &pars_rnd_str_token; ;}
+#line 242 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_rnd_str_token; }
+#line 1950 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 68:
-#line 252 "pars0grm.y"
+#line 253 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_stored_procedure_call(
-					static_cast<sym_node_t*>((yyvsp[(2) - (6)]))); ;}
+					static_cast<sym_node_t*>((yyvsp[-4]))); }
+#line 1957 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 69:
-#line 258 "pars0grm.y"
-    { (yyval) = pars_procedure_call((yyvsp[(1) - (4)]), (yyvsp[(3) - (4)])); ;}
+#line 259 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_procedure_call((yyvsp[-3]), (yyvsp[-1])); }
+#line 1963 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 70:
-#line 262 "pars0grm.y"
-    { (yyval) = &pars_replstr_token; ;}
+#line 263 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_replstr_token; }
+#line 1969 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 71:
-#line 263 "pars0grm.y"
-    { (yyval) = &pars_printf_token; ;}
+#line 264 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_printf_token; }
+#line 1975 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 72:
-#line 264 "pars0grm.y"
-    { (yyval) = &pars_assert_token; ;}
+#line 265 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_assert_token; }
+#line 1981 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 73:
-#line 268 "pars0grm.y"
-    { (yyval) = (yyvsp[(1) - (3)]); ;}
+#line 269 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[-2]); }
+#line 1987 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 74:
-#line 272 "pars0grm.y"
-    { (yyval) = que_node_list_add_last(NULL, (yyvsp[(1) - (1)])); ;}
+#line 273 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = que_node_list_add_last(NULL, (yyvsp[0])); }
+#line 1993 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 75:
-#line 274 "pars0grm.y"
-    { (yyval) = que_node_list_add_last((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); ;}
+#line 275 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = que_node_list_add_last((yyvsp[-2]), (yyvsp[0])); }
+#line 1999 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 76:
-#line 278 "pars0grm.y"
-    { (yyval) = NULL; ;}
+#line 279 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = NULL; }
+#line 2005 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 77:
-#line 279 "pars0grm.y"
-    { (yyval) = que_node_list_add_last(NULL, (yyvsp[(1) - (1)])); ;}
+#line 280 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = que_node_list_add_last(NULL, (yyvsp[0])); }
+#line 2011 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 78:
-#line 281 "pars0grm.y"
-    { (yyval) = que_node_list_add_last((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); ;}
+#line 282 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = que_node_list_add_last((yyvsp[-2]), (yyvsp[0])); }
+#line 2017 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 79:
-#line 285 "pars0grm.y"
-    { (yyval) = NULL; ;}
+#line 286 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = NULL; }
+#line 2023 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 80:
-#line 286 "pars0grm.y"
-    { (yyval) = que_node_list_add_last(NULL, (yyvsp[(1) - (1)]));;}
+#line 287 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = que_node_list_add_last(NULL, (yyvsp[0]));}
+#line 2029 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 81:
-#line 287 "pars0grm.y"
-    { (yyval) = que_node_list_add_last((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); ;}
+#line 288 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = que_node_list_add_last((yyvsp[-2]), (yyvsp[0])); }
+#line 2035 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 82:
-#line 291 "pars0grm.y"
-    { (yyval) = (yyvsp[(1) - (1)]); ;}
+#line 292 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]); }
+#line 2041 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 83:
-#line 293 "pars0grm.y"
+#line 294 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_func(&pars_count_token,
 				          que_node_list_add_last(NULL,
 					    sym_tab_add_int_lit(
-						pars_sym_tab_global, 1))); ;}
+						pars_sym_tab_global, 1))); }
+#line 2050 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 84:
-#line 298 "pars0grm.y"
+#line 299 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_func(&pars_count_token,
 					    que_node_list_add_last(NULL,
 						pars_func(&pars_distinct_token,
 						     que_node_list_add_last(
-								NULL, (yyvsp[(4) - (5)]))))); ;}
+								NULL, (yyvsp[-1]))))); }
+#line 2060 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 85:
-#line 304 "pars0grm.y"
+#line 305 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_func(&pars_sum_token,
 						que_node_list_add_last(NULL,
-									(yyvsp[(3) - (4)]))); ;}
+									(yyvsp[-1]))); }
+#line 2068 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 86:
-#line 310 "pars0grm.y"
-    { (yyval) = NULL; ;}
+#line 311 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = NULL; }
+#line 2074 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 87:
-#line 311 "pars0grm.y"
-    { (yyval) = que_node_list_add_last(NULL, (yyvsp[(1) - (1)])); ;}
+#line 312 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = que_node_list_add_last(NULL, (yyvsp[0])); }
+#line 2080 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 88:
-#line 313 "pars0grm.y"
-    { (yyval) = que_node_list_add_last((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); ;}
+#line 314 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = que_node_list_add_last((yyvsp[-2]), (yyvsp[0])); }
+#line 2086 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 89:
-#line 317 "pars0grm.y"
+#line 318 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_select_list(&pars_star_denoter,
-								NULL); ;}
+								NULL); }
+#line 2093 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 90:
-#line 320 "pars0grm.y"
+#line 321 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_select_list(
-					(yyvsp[(1) - (3)]), static_cast<sym_node_t*>((yyvsp[(3) - (3)]))); ;}
+					(yyvsp[-2]), static_cast<sym_node_t*>((yyvsp[0]))); }
+#line 2100 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 91:
-#line 322 "pars0grm.y"
-    { (yyval) = pars_select_list((yyvsp[(1) - (1)]), NULL); ;}
+#line 323 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_select_list((yyvsp[0]), NULL); }
+#line 2106 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 92:
-#line 326 "pars0grm.y"
-    { (yyval) = NULL; ;}
+#line 327 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = NULL; }
+#line 2112 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 93:
-#line 327 "pars0grm.y"
-    { (yyval) = (yyvsp[(2) - (2)]); ;}
+#line 328 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]); }
+#line 2118 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 94:
-#line 331 "pars0grm.y"
-    { (yyval) = NULL; ;}
+#line 332 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = NULL; }
+#line 2124 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 95:
-#line 333 "pars0grm.y"
-    { (yyval) = &pars_update_token; ;}
+#line 334 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_update_token; }
+#line 2130 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 96:
-#line 337 "pars0grm.y"
-    { (yyval) = NULL; ;}
+#line 338 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = NULL; }
+#line 2136 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 97:
-#line 339 "pars0grm.y"
-    { (yyval) = &pars_share_token; ;}
+#line 340 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_share_token; }
+#line 2142 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 98:
-#line 343 "pars0grm.y"
-    { (yyval) = &pars_asc_token; ;}
+#line 344 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_asc_token; }
+#line 2148 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 99:
-#line 344 "pars0grm.y"
-    { (yyval) = &pars_asc_token; ;}
+#line 345 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_asc_token; }
+#line 2154 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 100:
-#line 345 "pars0grm.y"
-    { (yyval) = &pars_desc_token; ;}
+#line 346 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_desc_token; }
+#line 2160 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 101:
-#line 349 "pars0grm.y"
-    { (yyval) = NULL; ;}
+#line 350 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = NULL; }
+#line 2166 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 102:
-#line 351 "pars0grm.y"
+#line 352 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_order_by(
-					static_cast<sym_node_t*>((yyvsp[(3) - (4)])),
-					static_cast<pars_res_word_t*>((yyvsp[(4) - (4)]))); ;}
+					static_cast<sym_node_t*>((yyvsp[-1])),
+					static_cast<pars_res_word_t*>((yyvsp[0]))); }
+#line 2174 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 103:
-#line 362 "pars0grm.y"
+#line 363 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_select_statement(
-					static_cast<sel_node_t*>((yyvsp[(2) - (8)])),
-					static_cast<sym_node_t*>((yyvsp[(4) - (8)])),
-					static_cast<que_node_t*>((yyvsp[(5) - (8)])),
-					static_cast<pars_res_word_t*>((yyvsp[(6) - (8)])),
-					static_cast<pars_res_word_t*>((yyvsp[(7) - (8)])),
-					static_cast<order_node_t*>((yyvsp[(8) - (8)]))); ;}
+					static_cast<sel_node_t*>((yyvsp[-6])),
+					static_cast<sym_node_t*>((yyvsp[-4])),
+					static_cast<que_node_t*>((yyvsp[-3])),
+					static_cast<pars_res_word_t*>((yyvsp[-2])),
+					static_cast<pars_res_word_t*>((yyvsp[-1])),
+					static_cast<order_node_t*>((yyvsp[0]))); }
+#line 2186 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 104:
-#line 373 "pars0grm.y"
-    { (yyval) = (yyvsp[(3) - (3)]); ;}
+#line 374 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]); }
+#line 2192 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 105:
-#line 378 "pars0grm.y"
+#line 379 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_insert_statement(
-					static_cast<sym_node_t*>((yyvsp[(1) - (5)])), (yyvsp[(4) - (5)]), NULL); ;}
+					static_cast<sym_node_t*>((yyvsp[-4])), (yyvsp[-1]), NULL); }
+#line 2199 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 106:
-#line 381 "pars0grm.y"
+#line 382 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_insert_statement(
-					static_cast<sym_node_t*>((yyvsp[(1) - (2)])),
+					static_cast<sym_node_t*>((yyvsp[-1])),
 					NULL,
-					static_cast<sel_node_t*>((yyvsp[(2) - (2)]))); ;}
+					static_cast<sel_node_t*>((yyvsp[0]))); }
+#line 2208 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 107:
-#line 388 "pars0grm.y"
+#line 389 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_column_assignment(
-					static_cast<sym_node_t*>((yyvsp[(1) - (3)])),
-					static_cast<que_node_t*>((yyvsp[(3) - (3)]))); ;}
+					static_cast<sym_node_t*>((yyvsp[-2])),
+					static_cast<que_node_t*>((yyvsp[0]))); }
+#line 2216 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 108:
-#line 394 "pars0grm.y"
-    { (yyval) = que_node_list_add_last(NULL, (yyvsp[(1) - (1)])); ;}
+#line 395 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = que_node_list_add_last(NULL, (yyvsp[0])); }
+#line 2222 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 109:
-#line 396 "pars0grm.y"
-    { (yyval) = que_node_list_add_last((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); ;}
+#line 397 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = que_node_list_add_last((yyvsp[-2]), (yyvsp[0])); }
+#line 2228 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 110:
-#line 402 "pars0grm.y"
-    { (yyval) = (yyvsp[(4) - (4)]); ;}
+#line 403 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]); }
+#line 2234 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 111:
-#line 408 "pars0grm.y"
+#line 409 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_update_statement_start(
 					FALSE,
-					static_cast<sym_node_t*>((yyvsp[(2) - (4)])),
-					static_cast<col_assign_node_t*>((yyvsp[(4) - (4)]))); ;}
+					static_cast<sym_node_t*>((yyvsp[-2])),
+					static_cast<col_assign_node_t*>((yyvsp[0]))); }
+#line 2243 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 112:
-#line 416 "pars0grm.y"
+#line 417 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_update_statement(
-					static_cast<upd_node_t*>((yyvsp[(1) - (2)])),
+					static_cast<upd_node_t*>((yyvsp[-1])),
 					NULL,
-					static_cast<que_node_t*>((yyvsp[(2) - (2)]))); ;}
+					static_cast<que_node_t*>((yyvsp[0]))); }
+#line 2252 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 113:
-#line 424 "pars0grm.y"
+#line 425 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_update_statement(
-					static_cast<upd_node_t*>((yyvsp[(1) - (2)])),
-					static_cast<sym_node_t*>((yyvsp[(2) - (2)])),
-					NULL); ;}
+					static_cast<upd_node_t*>((yyvsp[-1])),
+					static_cast<sym_node_t*>((yyvsp[0])),
+					NULL); }
+#line 2261 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 114:
-#line 432 "pars0grm.y"
+#line 433 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_update_statement_start(
 					TRUE,
-					static_cast<sym_node_t*>((yyvsp[(3) - (3)])), NULL); ;}
+					static_cast<sym_node_t*>((yyvsp[0])), NULL); }
+#line 2269 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 115:
-#line 439 "pars0grm.y"
+#line 440 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_update_statement(
-					static_cast<upd_node_t*>((yyvsp[(1) - (2)])),
+					static_cast<upd_node_t*>((yyvsp[-1])),
 					NULL,
-					static_cast<que_node_t*>((yyvsp[(2) - (2)]))); ;}
+					static_cast<que_node_t*>((yyvsp[0]))); }
+#line 2278 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 116:
-#line 447 "pars0grm.y"
+#line 448 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_update_statement(
-					static_cast<upd_node_t*>((yyvsp[(1) - (2)])),
-					static_cast<sym_node_t*>((yyvsp[(2) - (2)])),
-					NULL); ;}
+					static_cast<upd_node_t*>((yyvsp[-1])),
+					static_cast<sym_node_t*>((yyvsp[0])),
+					NULL); }
+#line 2287 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 117:
-#line 455 "pars0grm.y"
+#line 456 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_row_printf_statement(
-					static_cast<sel_node_t*>((yyvsp[(2) - (2)]))); ;}
+					static_cast<sel_node_t*>((yyvsp[0]))); }
+#line 2294 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 118:
-#line 461 "pars0grm.y"
+#line 462 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_assignment_statement(
-					static_cast<sym_node_t*>((yyvsp[(1) - (3)])),
-					static_cast<que_node_t*>((yyvsp[(3) - (3)]))); ;}
+					static_cast<sym_node_t*>((yyvsp[-2])),
+					static_cast<que_node_t*>((yyvsp[0]))); }
+#line 2302 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 119:
-#line 469 "pars0grm.y"
-    { (yyval) = pars_elsif_element((yyvsp[(2) - (4)]), (yyvsp[(4) - (4)])); ;}
+#line 470 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_elsif_element((yyvsp[-2]), (yyvsp[0])); }
+#line 2308 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 120:
-#line 473 "pars0grm.y"
-    { (yyval) = que_node_list_add_last(NULL, (yyvsp[(1) - (1)])); ;}
+#line 474 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = que_node_list_add_last(NULL, (yyvsp[0])); }
+#line 2314 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 121:
-#line 475 "pars0grm.y"
-    { (yyval) = que_node_list_add_last((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)])); ;}
+#line 476 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = que_node_list_add_last((yyvsp[-1]), (yyvsp[0])); }
+#line 2320 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 122:
-#line 479 "pars0grm.y"
-    { (yyval) = NULL; ;}
+#line 480 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = NULL; }
+#line 2326 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 123:
-#line 481 "pars0grm.y"
-    { (yyval) = (yyvsp[(2) - (2)]); ;}
+#line 482 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]); }
+#line 2332 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 124:
-#line 482 "pars0grm.y"
-    { (yyval) = (yyvsp[(1) - (1)]); ;}
+#line 483 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]); }
+#line 2338 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 125:
-#line 489 "pars0grm.y"
-    { (yyval) = pars_if_statement((yyvsp[(2) - (7)]), (yyvsp[(4) - (7)]), (yyvsp[(5) - (7)])); ;}
+#line 490 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_if_statement((yyvsp[-5]), (yyvsp[-3]), (yyvsp[-2])); }
+#line 2344 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 126:
-#line 495 "pars0grm.y"
-    { (yyval) = pars_while_statement((yyvsp[(2) - (6)]), (yyvsp[(4) - (6)])); ;}
+#line 496 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_while_statement((yyvsp[-4]), (yyvsp[-2])); }
+#line 2350 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 127:
-#line 503 "pars0grm.y"
+#line 504 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_for_statement(
-					static_cast<sym_node_t*>((yyvsp[(2) - (10)])),
-					(yyvsp[(4) - (10)]), (yyvsp[(6) - (10)]), (yyvsp[(8) - (10)])); ;}
+					static_cast<sym_node_t*>((yyvsp[-8])),
+					(yyvsp[-6]), (yyvsp[-4]), (yyvsp[-2])); }
+#line 2358 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 128:
-#line 509 "pars0grm.y"
-    { (yyval) = pars_exit_statement(); ;}
+#line 510 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_exit_statement(); }
+#line 2364 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 129:
-#line 513 "pars0grm.y"
-    { (yyval) = pars_return_statement(); ;}
+#line 514 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_return_statement(); }
+#line 2370 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 130:
-#line 518 "pars0grm.y"
+#line 519 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_open_statement(
 						ROW_SEL_OPEN_CURSOR,
-						static_cast<sym_node_t*>((yyvsp[(2) - (2)]))); ;}
+						static_cast<sym_node_t*>((yyvsp[0]))); }
+#line 2378 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 131:
-#line 525 "pars0grm.y"
+#line 526 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_open_statement(
 						ROW_SEL_CLOSE_CURSOR,
-						static_cast<sym_node_t*>((yyvsp[(2) - (2)]))); ;}
+						static_cast<sym_node_t*>((yyvsp[0]))); }
+#line 2386 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 132:
-#line 532 "pars0grm.y"
+#line 533 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_fetch_statement(
-					static_cast<sym_node_t*>((yyvsp[(2) - (4)])),
-					static_cast<sym_node_t*>((yyvsp[(4) - (4)])), NULL); ;}
+					static_cast<sym_node_t*>((yyvsp[-2])),
+					static_cast<sym_node_t*>((yyvsp[0])), NULL); }
+#line 2394 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 133:
-#line 536 "pars0grm.y"
+#line 537 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_fetch_statement(
-					static_cast<sym_node_t*>((yyvsp[(2) - (4)])),
+					static_cast<sym_node_t*>((yyvsp[-2])),
 					NULL,
-					static_cast<sym_node_t*>((yyvsp[(4) - (4)]))); ;}
+					static_cast<sym_node_t*>((yyvsp[0]))); }
+#line 2403 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 134:
-#line 544 "pars0grm.y"
+#line 545 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_column_def(
-					static_cast<sym_node_t*>((yyvsp[(1) - (5)])),
-					static_cast<pars_res_word_t*>((yyvsp[(2) - (5)])),
-					static_cast<sym_node_t*>((yyvsp[(3) - (5)])),
-					(yyvsp[(4) - (5)]), (yyvsp[(5) - (5)])); ;}
+					static_cast<sym_node_t*>((yyvsp[-4])),
+					static_cast<pars_res_word_t*>((yyvsp[-3])),
+					static_cast<sym_node_t*>((yyvsp[-2])),
+					(yyvsp[-1]), (yyvsp[0])); }
+#line 2413 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 135:
-#line 552 "pars0grm.y"
-    { (yyval) = que_node_list_add_last(NULL, (yyvsp[(1) - (1)])); ;}
+#line 553 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = que_node_list_add_last(NULL, (yyvsp[0])); }
+#line 2419 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 136:
-#line 554 "pars0grm.y"
-    { (yyval) = que_node_list_add_last((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); ;}
+#line 555 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = que_node_list_add_last((yyvsp[-2]), (yyvsp[0])); }
+#line 2425 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 137:
-#line 558 "pars0grm.y"
-    { (yyval) = NULL; ;}
+#line 559 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = NULL; }
+#line 2431 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 138:
-#line 560 "pars0grm.y"
-    { (yyval) = (yyvsp[(2) - (3)]); ;}
+#line 561 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[-1]); }
+#line 2437 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 139:
-#line 564 "pars0grm.y"
-    { (yyval) = NULL; ;}
+#line 565 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = NULL; }
+#line 2443 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 140:
-#line 566 "pars0grm.y"
+#line 567 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = &pars_int_token;
-					/* pass any non-NULL pointer */ ;}
+					/* pass any non-NULL pointer */ }
+#line 2450 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 141:
-#line 571 "pars0grm.y"
-    { (yyval) = NULL; ;}
+#line 572 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = NULL; }
+#line 2456 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 142:
-#line 573 "pars0grm.y"
+#line 574 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = &pars_int_token;
-					/* pass any non-NULL pointer */ ;}
+					/* pass any non-NULL pointer */ }
+#line 2463 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 143:
-#line 578 "pars0grm.y"
-    { (yyval) = NULL; ;}
+#line 579 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = NULL; }
+#line 2469 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 144:
-#line 580 "pars0grm.y"
+#line 580 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = &pars_int_token;
-					/* pass any non-NULL pointer */ ;}
+					/* pass any non-NULL pointer */ }
+#line 2476 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 145:
-#line 585 "pars0grm.y"
-    { (yyval) = NULL; ;}
+#line 585 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = NULL; }
+#line 2482 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 146:
-#line 586 "pars0grm.y"
-    { (yyval) = &pars_int_token;
-					/* pass any non-NULL pointer */ ;}
+#line 587 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]); }
+#line 2488 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 147:
-#line 591 "pars0grm.y"
-    { (yyval) = NULL; ;}
+#line 594 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_create_table(
+					static_cast<sym_node_t*>((yyvsp[-5])),
+					static_cast<sym_node_t*>((yyvsp[-3])),
+					static_cast<sym_node_t*>((yyvsp[-1])),
+					static_cast<sym_node_t*>((yyvsp[0]))); }
+#line 2498 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 148:
-#line 593 "pars0grm.y"
-    { (yyval) = (yyvsp[(3) - (3)]); ;}
+#line 602 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = que_node_list_add_last(NULL, (yyvsp[0])); }
+#line 2504 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 149:
-#line 600 "pars0grm.y"
-    { (yyval) = pars_create_table(
-					static_cast<sym_node_t*>((yyvsp[(3) - (9)])),
-					static_cast<sym_node_t*>((yyvsp[(5) - (9)])),
-					static_cast<sym_node_t*>((yyvsp[(8) - (9)])),
-					static_cast<sym_node_t*>((yyvsp[(9) - (9)])), (yyvsp[(7) - (9)])); ;}
+#line 604 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = que_node_list_add_last((yyvsp[-2]), (yyvsp[0])); }
+#line 2510 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 150:
-#line 608 "pars0grm.y"
-    { (yyval) = que_node_list_add_last(NULL, (yyvsp[(1) - (1)])); ;}
+#line 608 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = NULL; }
+#line 2516 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 151:
-#line 610 "pars0grm.y"
-    { (yyval) = que_node_list_add_last((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); ;}
+#line 609 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_unique_token; }
+#line 2522 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 152:
-#line 614 "pars0grm.y"
-    { (yyval) = NULL; ;}
+#line 613 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = NULL; }
+#line 2528 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 153:
-#line 615 "pars0grm.y"
-    { (yyval) = &pars_unique_token; ;}
+#line 614 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_clustered_token; }
+#line 2534 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 154:
-#line 619 "pars0grm.y"
-    { (yyval) = NULL; ;}
+#line 623 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_create_index(
+					static_cast<pars_res_word_t*>((yyvsp[-8])),
+					static_cast<pars_res_word_t*>((yyvsp[-7])),
+					static_cast<sym_node_t*>((yyvsp[-5])),
+					static_cast<sym_node_t*>((yyvsp[-3])),
+					static_cast<sym_node_t*>((yyvsp[-1]))); }
+#line 2545 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 155:
-#line 620 "pars0grm.y"
-    { (yyval) = &pars_clustered_token; ;}
+#line 632 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]); }
+#line 2551 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 156:
-#line 629 "pars0grm.y"
-    { (yyval) = pars_create_index(
-					static_cast<pars_res_word_t*>((yyvsp[(2) - (10)])),
-					static_cast<pars_res_word_t*>((yyvsp[(3) - (10)])),
-					static_cast<sym_node_t*>((yyvsp[(5) - (10)])),
-					static_cast<sym_node_t*>((yyvsp[(7) - (10)])),
-					static_cast<sym_node_t*>((yyvsp[(9) - (10)]))); ;}
+#line 633 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]); }
+#line 2557 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 157:
-#line 638 "pars0grm.y"
-    { (yyval) = (yyvsp[(1) - (1)]); ;}
+#line 638 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_commit_statement(); }
+#line 2563 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 158:
-#line 639 "pars0grm.y"
-    { (yyval) = (yyvsp[(1) - (1)]); ;}
+#line 643 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_rollback_statement(); }
+#line 2569 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 159:
-#line 644 "pars0grm.y"
-    { (yyval) = pars_commit_statement(); ;}
+#line 647 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_int_token; }
+#line 2575 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 160:
-#line 649 "pars0grm.y"
-    { (yyval) = pars_rollback_statement(); ;}
+#line 648 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_int_token; }
+#line 2581 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 161:
-#line 653 "pars0grm.y"
-    { (yyval) = &pars_int_token; ;}
+#line 649 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_bigint_token; }
+#line 2587 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 162:
-#line 654 "pars0grm.y"
-    { (yyval) = &pars_int_token; ;}
+#line 650 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_char_token; }
+#line 2593 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 163:
-#line 655 "pars0grm.y"
-    { (yyval) = &pars_bigint_token; ;}
+#line 651 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_binary_token; }
+#line 2599 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 164:
-#line 656 "pars0grm.y"
-    { (yyval) = &pars_char_token; ;}
+#line 652 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = &pars_blob_token; }
+#line 2605 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 165:
-#line 657 "pars0grm.y"
-    { (yyval) = &pars_binary_token; ;}
+#line 657 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_parameter_declaration(
+					static_cast<sym_node_t*>((yyvsp[-2])),
+					PARS_INPUT,
+					static_cast<pars_res_word_t*>((yyvsp[0]))); }
+#line 2614 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 166:
-#line 658 "pars0grm.y"
-    { (yyval) = &pars_blob_token; ;}
+#line 662 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = pars_parameter_declaration(
+					static_cast<sym_node_t*>((yyvsp[-2])),
+					PARS_OUTPUT,
+					static_cast<pars_res_word_t*>((yyvsp[0]))); }
+#line 2623 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 167:
-#line 663 "pars0grm.y"
-    { (yyval) = pars_parameter_declaration(
-					static_cast<sym_node_t*>((yyvsp[(1) - (3)])),
-					PARS_INPUT,
-					static_cast<pars_res_word_t*>((yyvsp[(3) - (3)]))); ;}
+#line 669 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = NULL; }
+#line 2629 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 168:
-#line 668 "pars0grm.y"
-    { (yyval) = pars_parameter_declaration(
-					static_cast<sym_node_t*>((yyvsp[(1) - (3)])),
-					PARS_OUTPUT,
-					static_cast<pars_res_word_t*>((yyvsp[(3) - (3)]))); ;}
+#line 670 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = que_node_list_add_last(NULL, (yyvsp[0])); }
+#line 2635 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 169:
-#line 675 "pars0grm.y"
-    { (yyval) = NULL; ;}
+#line 672 "pars0grm.y" /* yacc.c:1646  */
+    { (yyval) = que_node_list_add_last((yyvsp[-2]), (yyvsp[0])); }
+#line 2641 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
   case 170:
-#line 676 "pars0grm.y"
-    { (yyval) = que_node_list_add_last(NULL, (yyvsp[(1) - (1)])); ;}
-    break;
-
-  case 171:
-#line 678 "pars0grm.y"
-    { (yyval) = que_node_list_add_last((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); ;}
-    break;
-
-  case 172:
-#line 683 "pars0grm.y"
+#line 677 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_variable_declaration(
-					static_cast<sym_node_t*>((yyvsp[(1) - (3)])),
-					static_cast<pars_res_word_t*>((yyvsp[(2) - (3)]))); ;}
+					static_cast<sym_node_t*>((yyvsp[-2])),
+					static_cast<pars_res_word_t*>((yyvsp[-1]))); }
+#line 2649 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
-  case 176:
-#line 697 "pars0grm.y"
+  case 174:
+#line 691 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_cursor_declaration(
-					static_cast<sym_node_t*>((yyvsp[(3) - (6)])),
-					static_cast<sel_node_t*>((yyvsp[(5) - (6)]))); ;}
+					static_cast<sym_node_t*>((yyvsp[-3])),
+					static_cast<sel_node_t*>((yyvsp[-1]))); }
+#line 2657 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
-  case 177:
-#line 704 "pars0grm.y"
+  case 175:
+#line 698 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_function_declaration(
-					static_cast<sym_node_t*>((yyvsp[(3) - (4)]))); ;}
+					static_cast<sym_node_t*>((yyvsp[-1]))); }
+#line 2664 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
-  case 183:
-#line 726 "pars0grm.y"
+  case 181:
+#line 720 "pars0grm.y" /* yacc.c:1646  */
     { (yyval) = pars_procedure_definition(
-					static_cast<sym_node_t*>((yyvsp[(2) - (11)])),
-					static_cast<sym_node_t*>((yyvsp[(4) - (11)])),
-					(yyvsp[(10) - (11)])); ;}
+					static_cast<sym_node_t*>((yyvsp[-9])),
+					static_cast<sym_node_t*>((yyvsp[-7])),
+					(yyvsp[-1])); }
+#line 2673 "pars0grm.cc" /* yacc.c:1646  */
     break;
 
 
-/* Line 1267 of yacc.c.  */
-#line 2826 "pars0grm.cc"
+#line 2677 "pars0grm.cc" /* yacc.c:1646  */
       default: break;
     }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
@@ -2823,8 +2695,7 @@ yyparse ()
 
   *++yyvsp = yyval;
 
-
-  /* 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.  */
 
@@ -2839,10 +2710,14 @@ yyparse ()
   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.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
@@ -2850,37 +2725,36 @@ yyparse ()
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
       {
-	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-	  {
-	    YYSIZE_T yyalloc = 2 * yysize;
-	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
-	    if (yymsg != yymsgbuf)
-	      YYSTACK_FREE (yymsg);
-	    yymsg = (char*) YYSTACK_ALLOC (yyalloc);
-	    if (yymsg)
-	      yymsg_alloc = yyalloc;
-	    else
-	      {
-		yymsg = yymsgbuf;
-		yymsg_alloc = sizeof yymsgbuf;
-	      }
-	  }
-
-	if (0 < yysize && yysize <= yymsg_alloc)
-	  {
-	    (void) yysyntax_error (yymsg, yystate, yychar);
-	    yyerror (yymsg);
-	  }
-	else
-	  {
-	    yyerror (YY_("syntax error"));
-	    if (yysize != 0)
-	      goto yyexhaustedlab;
-	  }
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
       }
+# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -2888,24 +2762,24 @@ yyparse ()
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse look-ahead token after an
-	 error, discard it.  */
+      /* If just tried and failed to reuse lookahead token after an
+         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);
-	  yychar = YYEMPTY;
-	}
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval);
+          yychar = YYEMPTY;
+        }
     }
 
-  /* Else will try to reuse look-ahead token after shifting the error
+  /* Else will try to reuse lookahead token after shifting the error
      token.  */
   goto yyerrlab1;
 
@@ -2921,7 +2795,7 @@ yyparse ()
   if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 
-  /* 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;
@@ -2934,38 +2808,37 @@ yyparse ()
 | 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 (yyn != YYPACT_NINF)
-	{
-	  yyn += YYTERROR;
-	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-	    {
-	      yyn = yytable[yyn];
-	      if (0 < yyn)
-		break;
-	    }
-	}
+      if (!yypact_value_is_default (yyn))
+        {
+          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;
 
 
       yydestruct ("Error: popping",
-		  yystos[yystate], yyvsp);
+                  yystos[yystate], yyvsp);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
 
   /* Shift the error token.  */
@@ -2989,7 +2862,7 @@ yyparse ()
   yyresult = 1;
   goto yyreturn;
 
-#ifndef yyoverflow
+#if !defined yyoverflow || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -3000,17 +2873,22 @@ yyparse ()
 #endif
 
 yyreturn:
-  if (yychar != YYEOF && yychar != YYEMPTY)
-     yydestruct ("Cleanup: discarding lookahead",
-		 yytoken, &yylval);
-  /* Do not reclaim the symbols of the rule which action triggered
+  if (yychar != YYEMPTY)
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval);
+    }
+  /* 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);
+                  yystos[*yyssp], yyvsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
@@ -3021,11 +2899,7 @@ yyparse ()
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif
-  /* Make sure YYID is used.  */
-  return YYID (yyresult);
+  return yyresult;
 }
-
-
-#line 732 "pars0grm.y"
-
+#line 726 "pars0grm.y" /* yacc.c:1906  */
 
diff --git a/storage/innobase/pars/pars0grm.y b/storage/innobase/pars/pars0grm.y
index 2f0c83da8e3..5f3cb41310f 100644
--- a/storage/innobase/pars/pars0grm.y
+++ b/storage/innobase/pars/pars0grm.y
@@ -1,6 +1,7 @@
 /*****************************************************************************
 
 Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2017, MariaDB Corporation.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -102,7 +103,6 @@ yylex(void);
 %token PARS_INDEX_TOKEN
 %token PARS_UNIQUE_TOKEN
 %token PARS_CLUSTERED_TOKEN
-%token PARS_DOES_NOT_FIT_IN_MEM_TOKEN
 %token PARS_ON_TOKEN
 %token PARS_ASSIGN_TOKEN
 %token PARS_DECLARE_TOKEN
@@ -154,6 +154,8 @@ yylex(void);
 %left NEG     /* negation--unary minus */
 %left '%'
 
+%expect 41
+
 /* Grammar follows */
 %%
 
@@ -573,13 +575,6 @@ opt_not_null:
 					/* pass any non-NULL pointer */ }
 ;
 
-not_fit_in_memory:
-	/* Nothing */		{ $$ = NULL; }
-	| PARS_DOES_NOT_FIT_IN_MEM_TOKEN
-				{ $$ = &pars_int_token;
-					/* pass any non-NULL pointer */ }
-;
-
 compact:
 	/* Nothing */		{ $$ = NULL; }
 	| PARS_COMPACT_TOKEN	{ $$ = &pars_int_token;
@@ -595,12 +590,12 @@ block_size:
 create_table:
 	PARS_CREATE_TOKEN PARS_TABLE_TOKEN
 	table_name '(' column_def_list ')'
-	not_fit_in_memory compact block_size
+	compact block_size
 				{ $$ = pars_create_table(
 					static_cast<sym_node_t*>($3),
 					static_cast<sym_node_t*>($5),
-					static_cast<sym_node_t*>($8),
-					static_cast<sym_node_t*>($9), $7); }
+					static_cast<sym_node_t*>($7),
+					static_cast<sym_node_t*>($8)); }
 ;
 
 column_list:
diff --git a/storage/innobase/pars/pars0lex.l b/storage/innobase/pars/pars0lex.l
index 3efcc2c8b4d..e73472866fb 100644
--- a/storage/innobase/pars/pars0lex.l
+++ b/storage/innobase/pars/pars0lex.l
@@ -1,6 +1,7 @@
 /*****************************************************************************
 
 Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2017, MariaDB Corporation.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -66,7 +67,7 @@ Created 12/14/1997 Heikki Tuuri
 
 /* Note: We cast &result to int* from yysize_t* */
 #define YY_INPUT(buf, result, max_size) \
-	pars_get_lex_chars(buf, (int*) &result, max_size)
+	(result = pars_get_lex_chars(buf, max_size))
 
 /* String buffer for removing quotes */
 static ulint	stringbuf_len_alloc = 0; /* Allocated length */
@@ -425,10 +426,6 @@ In the state 'id', only two actions are possible (defined below). */
 			return(PARS_CLUSTERED_TOKEN);
 }
 
-"DOES_NOT_FIT_IN_MEMORY"	{
-			return(PARS_DOES_NOT_FIT_IN_MEM_TOKEN);
-}
-
 "ON"		{
 			return(PARS_ON_TOKEN);
 }
diff --git a/storage/innobase/pars/pars0pars.cc b/storage/innobase/pars/pars0pars.cc
index 36846e418b0..f34784b2883 100644
--- a/storage/innobase/pars/pars0pars.cc
+++ b/storage/innobase/pars/pars0pars.cc
@@ -1857,18 +1857,7 @@ pars_create_table(
 					table */
 	sym_node_t*	column_defs,	/*!< in: list of column names */
 	sym_node_t*	compact,	/* in: non-NULL if COMPACT table. */
-	sym_node_t*	block_size,	/* in: block size (can be NULL) */
-	void*		not_fit_in_memory MY_ATTRIBUTE((unused)))
-					/*!< in: a non-NULL pointer means that
-					this is a table which in simulations
-					should be simulated as not fitting
-					in memory; thread is put to sleep
-					to simulate disk accesses; NOTE that
-					this flag is not stored to the data
-					dictionary on disk, and the database
-					will forget about non-NULL value if
-					it has to reload the table definition
-					from disk */
+	sym_node_t*	block_size)	/* in: block size (can be NULL) */
 {
 	dict_table_t*	table;
 	sym_node_t*	column;
@@ -1932,11 +1921,6 @@ pars_create_table(
 	table = dict_mem_table_create(
 		table_sym->name, 0, n_cols, 0, flags, flags2);
 
-#ifdef UNIV_DEBUG
-	if (not_fit_in_memory != NULL) {
-		table->does_not_fit_in_memory = TRUE;
-	}
-#endif /* UNIV_DEBUG */
 	column = column_defs;
 
 	while (column) {



More information about the commits mailing list