Regenerate

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@33599 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 2180 insertions, 2011 deletions

diff --git a/lib/AsmParser/llvmAsmParser.cpp.cvs b/lib/AsmParser/llvmAsmParser.cpp.cvs
index 01888429ac..fdd664365b 100644
--- a/lib/AsmParser/llvmAsmParser.cpp.cvs
+++ b/lib/AsmParser/llvmAsmParser.cpp.cvs
@@ -1,7 +1,9 @@
-/* A Bison parser, made by GNU Bison 2.1.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,13 +20,21 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
 
-/* Written by Richard Stallman by simplifying the original so called
-   ``semantic'' parser.  */
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
 
 /* All symbols defined below should begin with yy or YY, to avoid
    infringing on user name space.  This should be done even for local
@@ -37,7 +47,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.1"
+#define YYBISON_VERSION "2.3"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -116,82 +126,83 @@
      SIDEEFFECT = 307,
      CC_TOK = 308,
      CCC_TOK = 309,
-     CSRETCC_TOK = 310,
-     FASTCC_TOK = 311,
-     COLDCC_TOK = 312,
-     X86_STDCALLCC_TOK = 313,
-     X86_FASTCALLCC_TOK = 314,
-     DATALAYOUT = 315,
-     RET = 316,
-     BR = 317,
-     SWITCH = 318,
-     INVOKE = 319,
-     UNWIND = 320,
-     UNREACHABLE = 321,
-     ADD = 322,
-     SUB = 323,
-     MUL = 324,
-     UDIV = 325,
-     SDIV = 326,
-     FDIV = 327,
-     UREM = 328,
-     SREM = 329,
-     FREM = 330,
-     AND = 331,
-     OR = 332,
-     XOR = 333,
-     ICMP = 334,
-     FCMP = 335,
-     EQ = 336,
-     NE = 337,
-     SLT = 338,
-     SGT = 339,
-     SLE = 340,
-     SGE = 341,
-     ULT = 342,
-     UGT = 343,
-     ULE = 344,
-     UGE = 345,
-     OEQ = 346,
-     ONE = 347,
-     OLT = 348,
-     OGT = 349,
-     OLE = 350,
-     OGE = 351,
-     ORD = 352,
-     UNO = 353,
-     UEQ = 354,
-     UNE = 355,
-     MALLOC = 356,
-     ALLOCA = 357,
-     FREE = 358,
-     LOAD = 359,
-     STORE = 360,
-     GETELEMENTPTR = 361,
-     TRUNC = 362,
-     ZEXT = 363,
-     SEXT = 364,
-     FPTRUNC = 365,
-     FPEXT = 366,
-     BITCAST = 367,
-     UITOFP = 368,
-     SITOFP = 369,
-     FPTOUI = 370,
-     FPTOSI = 371,
-     INTTOPTR = 372,
-     PTRTOINT = 373,
-     PHI_TOK = 374,
-     SELECT = 375,
-     SHL = 376,
-     LSHR = 377,
-     ASHR = 378,
-     VAARG = 379,
-     EXTRACTELEMENT = 380,
-     INSERTELEMENT = 381,
-     SHUFFLEVECTOR = 382,
-     NORETURN = 383,
-     DEFAULT = 384,
-     HIDDEN = 385
+     FASTCC_TOK = 310,
+     COLDCC_TOK = 311,
+     X86_STDCALLCC_TOK = 312,
+     X86_FASTCALLCC_TOK = 313,
+     DATALAYOUT = 314,
+     RET = 315,
+     BR = 316,
+     SWITCH = 317,
+     INVOKE = 318,
+     UNWIND = 319,
+     UNREACHABLE = 320,
+     ADD = 321,
+     SUB = 322,
+     MUL = 323,
+     UDIV = 324,
+     SDIV = 325,
+     FDIV = 326,
+     UREM = 327,
+     SREM = 328,
+     FREM = 329,
+     AND = 330,
+     OR = 331,
+     XOR = 332,
+     ICMP = 333,
+     FCMP = 334,
+     EQ = 335,
+     NE = 336,
+     SLT = 337,
+     SGT = 338,
+     SLE = 339,
+     SGE = 340,
+     ULT = 341,
+     UGT = 342,
+     ULE = 343,
+     UGE = 344,
+     OEQ = 345,
+     ONE = 346,
+     OLT = 347,
+     OGT = 348,
+     OLE = 349,
+     OGE = 350,
+     ORD = 351,
+     UNO = 352,
+     UEQ = 353,
+     UNE = 354,
+     MALLOC = 355,
+     ALLOCA = 356,
+     FREE = 357,
+     LOAD = 358,
+     STORE = 359,
+     GETELEMENTPTR = 360,
+     TRUNC = 361,
+     ZEXT = 362,
+     SEXT = 363,
+     FPTRUNC = 364,
+     FPEXT = 365,
+     BITCAST = 366,
+     UITOFP = 367,
+     SITOFP = 368,
+     FPTOUI = 369,
+     FPTOSI = 370,
+     INTTOPTR = 371,
+     PTRTOINT = 372,
+     PHI_TOK = 373,
+     SELECT = 374,
+     SHL = 375,
+     LSHR = 376,
+     ASHR = 377,
+     VAARG = 378,
+     EXTRACTELEMENT = 379,
+     INSERTELEMENT = 380,
+     SHUFFLEVECTOR = 381,
+     NORETURN = 382,
+     INREG = 383,
+     SRET = 384,
+     DEFAULT = 385,
+     HIDDEN = 386
    };
 #endif
 /* Tokens.  */
@@ -247,88 +258,89 @@
 #define SIDEEFFECT 307
 #define CC_TOK 308
 #define CCC_TOK 309
-#define CSRETCC_TOK 310
-#define FASTCC_TOK 311
-#define COLDCC_TOK 312
-#define X86_STDCALLCC_TOK 313
-#define X86_FASTCALLCC_TOK 314
-#define DATALAYOUT 315
-#define RET 316
-#define BR 317
-#define SWITCH 318
-#define INVOKE 319
-#define UNWIND 320
-#define UNREACHABLE 321
-#define ADD 322
-#define SUB 323
-#define MUL 324
-#define UDIV 325
-#define SDIV 326
-#define FDIV 327
-#define UREM 328
-#define SREM 329
-#define FREM 330
-#define AND 331
-#define OR 332
-#define XOR 333
-#define ICMP 334
-#define FCMP 335
-#define EQ 336
-#define NE 337
-#define SLT 338
-#define SGT 339
-#define SLE 340
-#define SGE 341
-#define ULT 342
-#define UGT 343
-#define ULE 344
-#define UGE 345
-#define OEQ 346
-#define ONE 347
-#define OLT 348
-#define OGT 349
-#define OLE 350
-#define OGE 351
-#define ORD 352
-#define UNO 353
-#define UEQ 354
-#define UNE 355
-#define MALLOC 356
-#define ALLOCA 357
-#define FREE 358
-#define LOAD 359
-#define STORE 360
-#define GETELEMENTPTR 361
-#define TRUNC 362
-#define ZEXT 363
-#define SEXT 364
-#define FPTRUNC 365
-#define FPEXT 366
-#define BITCAST 367
-#define UITOFP 368
-#define SITOFP 369
-#define FPTOUI 370
-#define FPTOSI 371
-#define INTTOPTR 372
-#define PTRTOINT 373
-#define PHI_TOK 374
-#define SELECT 375
-#define SHL 376
-#define LSHR 377
-#define ASHR 378
-#define VAARG 379
-#define EXTRACTELEMENT 380
-#define INSERTELEMENT 381
-#define SHUFFLEVECTOR 382
-#define NORETURN 383
-#define DEFAULT 384
-#define HIDDEN 385
+#define FASTCC_TOK 310
+#define COLDCC_TOK 311
+#define X86_STDCALLCC_TOK 312
+#define X86_FASTCALLCC_TOK 313
+#define DATALAYOUT 314
+#define RET 315
+#define BR 316
+#define SWITCH 317
+#define INVOKE 318
+#define UNWIND 319
+#define UNREACHABLE 320
+#define ADD 321
+#define SUB 322
+#define MUL 323
+#define UDIV 324
+#define SDIV 325
+#define FDIV 326
+#define UREM 327
+#define SREM 328
+#define FREM 329
+#define AND 330
+#define OR 331
+#define XOR 332
+#define ICMP 333
+#define FCMP 334
+#define EQ 335
+#define NE 336
+#define SLT 337
+#define SGT 338
+#define SLE 339
+#define SGE 340
+#define ULT 341
+#define UGT 342
+#define ULE 343
+#define UGE 344
+#define OEQ 345
+#define ONE 346
+#define OLT 347
+#define OGT 348
+#define OLE 349
+#define OGE 350
+#define ORD 351
+#define UNO 352
+#define UEQ 353
+#define UNE 354
+#define MALLOC 355
+#define ALLOCA 356
+#define FREE 357
+#define LOAD 358
+#define STORE 359
+#define GETELEMENTPTR 360
+#define TRUNC 361
+#define ZEXT 362
+#define SEXT 363
+#define FPTRUNC 364
+#define FPEXT 365
+#define BITCAST 366
+#define UITOFP 367
+#define SITOFP 368
+#define FPTOUI 369
+#define FPTOSI 370
+#define INTTOPTR 371
+#define PTRTOINT 372
+#define PHI_TOK 373
+#define SELECT 374
+#define SHL 375
+#define LSHR 376
+#define ASHR 377
+#define VAARG 378
+#define EXTRACTELEMENT 379
+#define INSERTELEMENT 380
+#define SHUFFLEVECTOR 381
+#define NORETURN 382
+#define INREG 383
+#define SRET 384
+#define DEFAULT 385
+#define HIDDEN 386
 
 
 
 
 /* Copy the first part of user declarations.  */
-#line 14 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 14 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -1218,9 +1230,10 @@ Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) {
 # define YYTOKEN_TABLE 0
 #endif
 
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 885 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
-typedef union YYSTYPE {
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 885 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+{
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   llvm::BasicBlock                       *BasicBlockVal;
@@ -1264,9 +1277,10 @@ typedef union YYSTYPE {
   llvm::Instruction::OtherOps       OtherOpVal;
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
-} YYSTYPE;
-/* Line 196 of yacc.c.  */
-#line 1270 "llvmAsmParser.tab.c"
+}
+/* Line 187 of yacc.c.  */
+#line 1283 "llvmAsmParser.tab.c"
+	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -1277,23 +1291,56 @@ typedef union YYSTYPE {
 /* Copy the second part of user declarations.  */
 
 
-/* Line 219 of yacc.c.  */
-#line 1282 "llvmAsmParser.tab.c"
+/* Line 216 of yacc.c.  */
+#line 1296 "llvmAsmParser.tab.c"
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
 
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
+#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;
 #endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
 #endif
-#if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus))
-# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T size_t
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
 #endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  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)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
 #endif
 
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
 #ifndef YY_
 # if YYENABLE_NLS
 #  if ENABLE_NLS
@@ -1306,7 +1353,32 @@ typedef union YYSTYPE {
 # endif
 #endif
 
-#if ! defined (yyoverflow) || YYERROR_VERBOSE
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int i)
+#else
+static int
+YYID (i)
+    int i;
+#endif
+{
+  return i;
+}
+#endif
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
@@ -1314,64 +1386,76 @@ typedef union YYSTYPE {
 #  if YYSTACK_USE_ALLOCA
 #   ifdef __GNUC__
 #    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 (__STDC__) || defined (__cplusplus)
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     define YYINCLUDED_STDLIB_H
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
 #    endif
 #   endif
 #  endif
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning. */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (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
        invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
        to allow for a few compiler-allocated temporary stack slots.  */
-#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
 #  endif
 # else
 #  define YYSTACK_ALLOC YYMALLOC
 #  define YYSTACK_FREE YYFREE
 #  ifndef YYSTACK_ALLOC_MAXIMUM
-#   define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1)
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  ifdef __cplusplus
-extern "C" {
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \
-	&& (defined (__STDC__) || defined (__cplusplus)))
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \
-	&& (defined (__STDC__) || defined (__cplusplus)))
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
-#  ifdef __cplusplus
-}
-#  endif
 # endif
-#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
 
 
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  short int yyss;
+  yytype_int16 yyss;
   YYSTYPE yyvs;
   };
 
@@ -1381,13 +1465,13 @@ union yyalloc
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short int) + sizeof (YYSTYPE))			\
+     ((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__
+#  if defined __GNUC__ && 1 < __GNUC__
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
@@ -1398,7 +1482,7 @@ union yyalloc
 	  for (yyi = 0; yyi < (Count); yyi++)	\
 	    (To)[yyi] = (From)[yyi];		\
 	}					\
-      while (0)
+      while (YYID (0))
 #  endif
 # endif
 
@@ -1416,53 +1500,47 @@ union yyalloc
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
-    while (0)
+    while (YYID (0))
 
 #endif
 
-#if defined (__STDC__) || defined (__cplusplus)
-   typedef signed char yysigned_char;
-#else
-   typedef short int yysigned_char;
-#endif
-
-/* YYFINAL -- State number of the termination state. */
+/* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  40
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1476
+#define YYLAST   1466
 
-/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS  145
-/* YYNNTS -- Number of nonterminals. */
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  146
+/* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  79
-/* YYNRULES -- Number of rules. */
-#define YYNRULES  285
-/* YYNRULES -- Number of states. */
-#define YYNSTATES  566
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  286
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  567
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   385
+#define YYMAXUTOK   386
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const unsigned char yytranslate[] =
+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,     2,     2,     2,
-     135,   136,   133,     2,   132,     2,     2,     2,     2,     2,
+     136,   137,   134,     2,   133,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     140,   131,   141,     2,     2,     2,     2,     2,     2,     2,
+     141,   132,   142,     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,   137,   134,   139,     2,     2,     2,     2,     2,   144,
+       2,   138,   135,   140,     2,     2,     2,     2,     2,   145,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     138,     2,     2,   142,     2,   143,     2,     2,     2,     2,
+     139,     2,     2,   143,     2,   144,     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,
@@ -1488,13 +1566,13 @@ static const unsigned char yytranslate[] =
       95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
      105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
      115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130
+     125,   126,   127,   128,   129,   130,   131
 };
 
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */
-static const unsigned short int yyprhs[] =
+static const yytype_uint16 yyprhs[] =
 {
        0,     0,     3,     5,     7,     9,    11,    13,    15,    17,
       19,    21,    23,    25,    27,    29,    31,    33,    35,    37,
@@ -1505,163 +1583,163 @@ static const unsigned short int yyprhs[] =
      119,   121,   122,   125,   126,   128,   130,   133,   134,   136,
      138,   140,   142,   144,   146,   148,   150,   151,   153,   154,
      156,   158,   159,   161,   163,   165,   167,   168,   170,   172,
-     174,   176,   178,   180,   183,   185,   187,   188,   191,   193,
-     195,   196,   199,   200,   203,   204,   208,   211,   212,   214,
-     215,   219,   221,   224,   226,   228,   230,   232,   234,   236,
-     239,   241,   244,   250,   256,   262,   268,   272,   275,   281,
-     286,   289,   291,   293,   295,   299,   301,   305,   307,   308,
-     310,   314,   319,   323,   327,   332,   337,   341,   348,   354,
-     357,   360,   363,   366,   369,   372,   375,   378,   381,   384,
-     391,   397,   406,   413,   420,   428,   436,   443,   450,   459,
-     468,   472,   474,   476,   478,   480,   481,   483,   486,   487,
-     491,   492,   496,   500,   502,   506,   510,   511,   518,   519,
-     527,   528,   536,   539,   543,   545,   549,   553,   557,   561,
-     563,   564,   570,   574,   576,   580,   582,   583,   593,   595,
-     597,   602,   604,   606,   609,   613,   614,   616,   618,   620,
-     622,   624,   626,   628,   630,   632,   636,   638,   644,   646,
-     648,   650,   652,   654,   656,   659,   662,   665,   669,   672,
-     673,   675,   678,   681,   685,   695,   705,   714,   729,   731,
-     733,   740,   746,   749,   756,   764,   768,   774,   775,   776,
-     780,   783,   785,   791,   797,   804,   811,   816,   821,   828,
-     833,   838,   845,   852,   855,   864,   866,   868,   869,   873,
-     880,   884,   891,   894,   899,   906
+     174,   176,   178,   181,   183,   185,   187,   189,   190,   193,
+     195,   197,   198,   201,   202,   205,   206,   210,   213,   214,
+     216,   217,   221,   223,   226,   228,   230,   232,   234,   236,
+     238,   241,   243,   246,   252,   258,   264,   270,   274,   277,
+     283,   288,   291,   293,   295,   297,   301,   303,   307,   309,
+     310,   312,   316,   321,   325,   329,   334,   339,   343,   350,
+     356,   359,   362,   365,   368,   371,   374,   377,   380,   383,
+     386,   393,   399,   408,   415,   422,   430,   438,   445,   452,
+     461,   470,   474,   476,   478,   480,   482,   483,   485,   488,
+     489,   493,   494,   498,   502,   504,   508,   512,   513,   520,
+     521,   529,   530,   538,   541,   545,   547,   551,   555,   559,
+     563,   565,   566,   572,   576,   578,   582,   584,   585,   595,
+     597,   599,   604,   606,   608,   611,   615,   616,   618,   620,
+     622,   624,   626,   628,   630,   632,   634,   638,   640,   646,
+     648,   650,   652,   654,   656,   658,   661,   664,   667,   671,
+     674,   675,   677,   680,   683,   687,   697,   707,   716,   731,
+     733,   735,   742,   748,   751,   758,   766,   770,   776,   777,
+     778,   782,   785,   787,   793,   799,   806,   813,   818,   823,
+     830,   835,   840,   847,   854,   857,   866,   868,   870,   871,
+     875,   882,   886,   893,   896,   901,   908
 };
 
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const short int yyrhs[] =
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int16 yyrhs[] =
 {
-     186,     0,    -1,    67,    -1,    68,    -1,    69,    -1,    70,
-      -1,    71,    -1,    72,    -1,    73,    -1,    74,    -1,    75,
-      -1,    76,    -1,    77,    -1,    78,    -1,   107,    -1,   108,
-      -1,   109,    -1,   110,    -1,   111,    -1,   112,    -1,   113,
-      -1,   114,    -1,   115,    -1,   116,    -1,   117,    -1,   118,
-      -1,   121,    -1,   122,    -1,   123,    -1,    81,    -1,    82,
-      -1,    83,    -1,    84,    -1,    85,    -1,    86,    -1,    87,
-      -1,    88,    -1,    89,    -1,    90,    -1,    91,    -1,    92,
-      -1,    93,    -1,    94,    -1,    95,    -1,    96,    -1,    97,
-      -1,    98,    -1,    99,    -1,   100,    -1,    87,    -1,    88,
-      -1,    89,    -1,    90,    -1,    21,    -1,    22,    -1,     9,
-      -1,    10,    -1,    11,    -1,    14,    -1,    17,    -1,   154,
-      -1,    -1,   154,   131,    -1,    -1,    15,    -1,    18,    -1,
-     157,   131,    -1,    -1,    35,    -1,    37,    -1,    36,    -1,
+     187,     0,    -1,    66,    -1,    67,    -1,    68,    -1,    69,
+      -1,    70,    -1,    71,    -1,    72,    -1,    73,    -1,    74,
+      -1,    75,    -1,    76,    -1,    77,    -1,   106,    -1,   107,
+      -1,   108,    -1,   109,    -1,   110,    -1,   111,    -1,   112,
+      -1,   113,    -1,   114,    -1,   115,    -1,   116,    -1,   117,
+      -1,   120,    -1,   121,    -1,   122,    -1,    80,    -1,    81,
+      -1,    82,    -1,    83,    -1,    84,    -1,    85,    -1,    86,
+      -1,    87,    -1,    88,    -1,    89,    -1,    90,    -1,    91,
+      -1,    92,    -1,    93,    -1,    94,    -1,    95,    -1,    96,
+      -1,    97,    -1,    98,    -1,    99,    -1,    86,    -1,    87,
+      -1,    88,    -1,    89,    -1,    21,    -1,    22,    -1,     9,
+      -1,    10,    -1,    11,    -1,    14,    -1,    17,    -1,   155,
+      -1,    -1,   155,   132,    -1,    -1,    15,    -1,    18,    -1,
+     158,   132,    -1,    -1,    35,    -1,    37,    -1,    36,    -1,
       38,    -1,    40,    -1,    39,    -1,    41,    -1,    43,    -1,
-      -1,   130,    -1,    -1,    39,    -1,    41,    -1,    -1,    35,
+      -1,   131,    -1,    -1,    39,    -1,    41,    -1,    -1,    35,
       -1,    36,    -1,    37,    -1,    40,    -1,    -1,    54,    -1,
-      55,    -1,    56,    -1,    57,    -1,    58,    -1,    59,    -1,
-      53,     4,    -1,   108,    -1,   109,    -1,    -1,   166,   165,
-      -1,   128,    -1,   165,    -1,    -1,   168,   167,    -1,    -1,
-      46,     4,    -1,    -1,   132,    46,     4,    -1,    29,    17,
-      -1,    -1,   171,    -1,    -1,   132,   174,   173,    -1,   171,
-      -1,    46,     4,    -1,     9,    -1,    10,    -1,    11,    -1,
-      12,    -1,    42,    -1,   175,    -1,   176,   133,    -1,   208,
-      -1,   134,     4,    -1,   176,   135,   180,   136,   168,    -1,
-       8,   135,   180,   136,   168,    -1,   137,     4,   138,   176,
-     139,    -1,   140,     4,   138,   176,   141,    -1,   142,   181,
-     143,    -1,   142,   143,    -1,   140,   142,   181,   143,   141,
-      -1,   140,   142,   143,   141,    -1,   176,   166,    -1,   176,
-      -1,     8,    -1,   177,    -1,   179,   132,   177,    -1,   179,
-      -1,   179,   132,    32,    -1,    32,    -1,    -1,   176,    -1,
-     181,   132,   176,    -1,   176,   137,   184,   139,    -1,   176,
-     137,   139,    -1,   176,   144,    17,    -1,   176,   140,   184,
-     141,    -1,   176,   142,   184,   143,    -1,   176,   142,   143,
-      -1,   176,   140,   142,   184,   143,   141,    -1,   176,   140,
-     142,   143,   141,    -1,   176,    33,    -1,   176,    34,    -1,
-     176,   208,    -1,   176,   183,    -1,   176,    20,    -1,   152,
-       3,    -1,   152,     4,    -1,     9,    21,    -1,     9,    22,
-      -1,   153,     7,    -1,   148,   135,   182,    31,   176,   136,
-      -1,   106,   135,   182,   219,   136,    -1,   120,   135,   182,
-     132,   182,   132,   182,   136,    -1,   146,   135,   182,   132,
-     182,   136,    -1,   147,   135,   182,   132,   182,   136,    -1,
-      79,   150,   135,   182,   132,   182,   136,    -1,    80,   151,
-     135,   182,   132,   182,   136,    -1,   149,   135,   182,   132,
-     182,   136,    -1,   125,   135,   182,   132,   182,   136,    -1,
-     126,   135,   182,   132,   182,   132,   182,   136,    -1,   127,
-     135,   182,   132,   182,   132,   182,   136,    -1,   184,   132,
-     182,    -1,   182,    -1,    27,    -1,    28,    -1,   187,    -1,
-      -1,   188,    -1,   187,   188,    -1,    -1,    26,   189,   204,
-      -1,    -1,    25,   190,   205,    -1,    51,    50,   194,    -1,
-      19,    -1,   156,    13,   176,    -1,   156,    13,     8,    -1,
-      -1,   158,   161,   185,   182,   191,   173,    -1,    -1,   158,
-     159,   161,   185,   182,   192,   173,    -1,    -1,   158,   160,
-     161,   185,   176,   193,   173,    -1,    44,   195,    -1,    47,
-     131,   196,    -1,    17,    -1,    45,   131,    17,    -1,    60,
-     131,    17,    -1,   137,   197,   139,    -1,   197,   132,    17,
-      -1,    17,    -1,    -1,   198,   132,   176,   166,   155,    -1,
-     176,   166,   155,    -1,   198,    -1,   198,   132,    32,    -1,
-      32,    -1,    -1,   164,   178,   157,   135,   199,   136,   168,
-     172,   169,    -1,    23,    -1,   142,    -1,   163,   161,   200,
-     201,    -1,    24,    -1,   143,    -1,   211,   203,    -1,   162,
-     161,   200,    -1,    -1,    52,    -1,     3,    -1,     4,    -1,
-       7,    -1,    21,    -1,    22,    -1,    33,    -1,    34,    -1,
-      20,    -1,   140,   184,   141,    -1,   183,    -1,    50,   206,
-      17,   132,    17,    -1,     5,    -1,     6,    -1,   154,    -1,
-     157,    -1,   208,    -1,   207,    -1,   176,   209,    -1,   211,
-     212,    -1,   202,   212,    -1,   213,   156,   214,    -1,   213,
-     216,    -1,    -1,    16,    -1,    61,   210,    -1,    61,     8,
-      -1,    62,    12,   209,    -1,    62,     9,   209,   132,    12,
-     209,   132,    12,   209,    -1,    63,   152,   209,   132,    12,
-     209,   137,   215,   139,    -1,    63,   152,   209,   132,    12,
-     209,   137,   139,    -1,    64,   164,   178,   209,   135,   218,
-     136,   168,    31,    12,   209,    65,    12,   209,    -1,    65,
-      -1,    66,    -1,   215,   152,   207,   132,    12,   209,    -1,
-     152,   207,   132,    12,   209,    -1,   156,   221,    -1,   176,
-     137,   209,   132,   209,   139,    -1,   217,   132,   137,   209,
-     132,   209,   139,    -1,   176,   209,   166,    -1,   218,   132,
-     176,   209,   166,    -1,    -1,    -1,   219,   132,   210,    -1,
-      49,    48,    -1,    48,    -1,   146,   176,   209,   132,   209,
-      -1,   147,   176,   209,   132,   209,    -1,    79,   150,   176,
-     209,   132,   209,    -1,    80,   151,   176,   209,   132,   209,
-      -1,   149,   210,   132,   210,    -1,   148,   210,    31,   176,
-      -1,   120,   210,   132,   210,   132,   210,    -1,   124,   210,
-     132,   176,    -1,   125,   210,   132,   210,    -1,   126,   210,
-     132,   210,   132,   210,    -1,   127,   210,   132,   210,   132,
-     210,    -1,   119,   217,    -1,   220,   164,   178,   209,   135,
-     218,   136,   168,    -1,   223,    -1,    30,    -1,    -1,   101,
-     176,   170,    -1,   101,   176,   132,     9,   209,   170,    -1,
-     102,   176,   170,    -1,   102,   176,   132,     9,   209,   170,
-      -1,   103,   210,    -1,   222,   104,   176,   209,    -1,   222,
-     105,   210,   132,   176,   209,    -1,   106,   176,   209,   219,
-      -1
+      55,    -1,    56,    -1,    57,    -1,    58,    -1,    53,     4,
+      -1,   107,    -1,   108,    -1,   128,    -1,   129,    -1,    -1,
+     167,   166,    -1,   127,    -1,   166,    -1,    -1,   169,   168,
+      -1,    -1,    46,     4,    -1,    -1,   133,    46,     4,    -1,
+      29,    17,    -1,    -1,   172,    -1,    -1,   133,   175,   174,
+      -1,   172,    -1,    46,     4,    -1,     9,    -1,    10,    -1,
+      11,    -1,    12,    -1,    42,    -1,   176,    -1,   177,   134,
+      -1,   209,    -1,   135,     4,    -1,   177,   136,   181,   137,
+     169,    -1,     8,   136,   181,   137,   169,    -1,   138,     4,
+     139,   177,   140,    -1,   141,     4,   139,   177,   142,    -1,
+     143,   182,   144,    -1,   143,   144,    -1,   141,   143,   182,
+     144,   142,    -1,   141,   143,   144,   142,    -1,   177,   167,
+      -1,   177,    -1,     8,    -1,   178,    -1,   180,   133,   178,
+      -1,   180,    -1,   180,   133,    32,    -1,    32,    -1,    -1,
+     177,    -1,   182,   133,   177,    -1,   177,   138,   185,   140,
+      -1,   177,   138,   140,    -1,   177,   145,    17,    -1,   177,
+     141,   185,   142,    -1,   177,   143,   185,   144,    -1,   177,
+     143,   144,    -1,   177,   141,   143,   185,   144,   142,    -1,
+     177,   141,   143,   144,   142,    -1,   177,    33,    -1,   177,
+      34,    -1,   177,   209,    -1,   177,   184,    -1,   177,    20,
+      -1,   153,     3,    -1,   153,     4,    -1,     9,    21,    -1,
+       9,    22,    -1,   154,     7,    -1,   149,   136,   183,    31,
+     177,   137,    -1,   105,   136,   183,   220,   137,    -1,   119,
+     136,   183,   133,   183,   133,   183,   137,    -1,   147,   136,
+     183,   133,   183,   137,    -1,   148,   136,   183,   133,   183,
+     137,    -1,    78,   151,   136,   183,   133,   183,   137,    -1,
+      79,   152,   136,   183,   133,   183,   137,    -1,   150,   136,
+     183,   133,   183,   137,    -1,   124,   136,   183,   133,   183,
+     137,    -1,   125,   136,   183,   133,   183,   133,   183,   137,
+      -1,   126,   136,   183,   133,   183,   133,   183,   137,    -1,
+     185,   133,   183,    -1,   183,    -1,    27,    -1,    28,    -1,
+     188,    -1,    -1,   189,    -1,   188,   189,    -1,    -1,    26,
+     190,   205,    -1,    -1,    25,   191,   206,    -1,    51,    50,
+     195,    -1,    19,    -1,   157,    13,   177,    -1,   157,    13,
+       8,    -1,    -1,   159,   162,   186,   183,   192,   174,    -1,
+      -1,   159,   160,   162,   186,   183,   193,   174,    -1,    -1,
+     159,   161,   162,   186,   177,   194,   174,    -1,    44,   196,
+      -1,    47,   132,   197,    -1,    17,    -1,    45,   132,    17,
+      -1,    59,   132,    17,    -1,   138,   198,   140,    -1,   198,
+     133,    17,    -1,    17,    -1,    -1,   199,   133,   177,   167,
+     156,    -1,   177,   167,   156,    -1,   199,    -1,   199,   133,
+      32,    -1,    32,    -1,    -1,   165,   179,   158,   136,   200,
+     137,   169,   173,   170,    -1,    23,    -1,   143,    -1,   164,
+     162,   201,   202,    -1,    24,    -1,   144,    -1,   212,   204,
+      -1,   163,   162,   201,    -1,    -1,    52,    -1,     3,    -1,
+       4,    -1,     7,    -1,    21,    -1,    22,    -1,    33,    -1,
+      34,    -1,    20,    -1,   141,   185,   142,    -1,   184,    -1,
+      50,   207,    17,   133,    17,    -1,     5,    -1,     6,    -1,
+     155,    -1,   158,    -1,   209,    -1,   208,    -1,   177,   210,
+      -1,   212,   213,    -1,   203,   213,    -1,   214,   157,   215,
+      -1,   214,   217,    -1,    -1,    16,    -1,    60,   211,    -1,
+      60,     8,    -1,    61,    12,   210,    -1,    61,     9,   210,
+     133,    12,   210,   133,    12,   210,    -1,    62,   153,   210,
+     133,    12,   210,   138,   216,   140,    -1,    62,   153,   210,
+     133,    12,   210,   138,   140,    -1,    63,   165,   179,   210,
+     136,   219,   137,   169,    31,    12,   210,    64,    12,   210,
+      -1,    64,    -1,    65,    -1,   216,   153,   208,   133,    12,
+     210,    -1,   153,   208,   133,    12,   210,    -1,   157,   222,
+      -1,   177,   138,   210,   133,   210,   140,    -1,   218,   133,
+     138,   210,   133,   210,   140,    -1,   177,   210,   167,    -1,
+     219,   133,   177,   210,   167,    -1,    -1,    -1,   220,   133,
+     211,    -1,    49,    48,    -1,    48,    -1,   147,   177,   210,
+     133,   210,    -1,   148,   177,   210,   133,   210,    -1,    78,
+     151,   177,   210,   133,   210,    -1,    79,   152,   177,   210,
+     133,   210,    -1,   150,   211,   133,   211,    -1,   149,   211,
+      31,   177,    -1,   119,   211,   133,   211,   133,   211,    -1,
+     123,   211,   133,   177,    -1,   124,   211,   133,   211,    -1,
+     125,   211,   133,   211,   133,   211,    -1,   126,   211,   133,
+     211,   133,   211,    -1,   118,   218,    -1,   221,   165,   179,
+     210,   136,   219,   137,   169,    -1,   224,    -1,    30,    -1,
+      -1,   100,   177,   171,    -1,   100,   177,   133,     9,   210,
+     171,    -1,   101,   177,   171,    -1,   101,   177,   133,     9,
+     210,   171,    -1,   102,   211,    -1,   223,   103,   177,   210,
+      -1,   223,   104,   211,   133,   177,   210,    -1,   105,   177,
+     210,   220,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short int yyrline[] =
+static const yytype_uint16 yyrline[] =
 {