Hopefully these are the regenerated files

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

1 files changed, 1856 insertions, 2156 deletions

diff --git a/lib/AsmParser/llvmAsmParser.cpp.cvs b/lib/AsmParser/llvmAsmParser.cpp.cvs
index 681990382f..955fb871f5 100644
--- a/lib/AsmParser/llvmAsmParser.cpp.cvs
+++ b/lib/AsmParser/llvmAsmParser.cpp.cvs
@@ -1,9 +1,7 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
+/* A Bison parser, made by GNU Bison 1.875c.  */
 
-/* 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.
+/* Skeleton parser for Yacc-like parsing with Bison,
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 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
@@ -17,24 +15,16 @@
 
    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.  */
-
-/* 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.
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
+/* 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.  */
 
-/* C LALR(1) parser skeleton written by Richard Stallman, by
-   simplifying the original so-called "semantic" parser.  */
+/* 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
@@ -46,9 +36,6 @@
 /* Identify Bison output.  */
 #define YYBISON 1
 
-/* Bison version.  */
-#define YYBISON_VERSION "2.3"
-
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 
@@ -58,7 +45,8 @@
 /* Using locations.  */
 #define YYLSP_NEEDED 0
 
-/* Substitute the variable and function names.  */
+/* If NAME_PREFIX is specified substitute the variables and functions
+   names.  */
 #define yyparse llvmAsmparse
 #define yylex   llvmAsmlex
 #define yyerror llvmAsmerror
@@ -218,7 +206,6 @@
      SHUFFLEVECTOR = 399
    };
 #endif
-/* Tokens.  */
 #define ESINT64VAL 258
 #define EUINT64VAL 259
 #define SINTVAL 260
@@ -366,7 +353,7 @@
 
 
 /* Copy the first part of user declarations.  */
-#line 14 "/Volumes/Gir/devel/llvm/llvm.src/lib/AsmParser/llvmAsmParser.y"
+#line 14 "/home/vadve/alenhar2/llvm.old/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -1221,15 +1208,9 @@ Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) {
 # define YYERROR_VERBOSE 0
 #endif
 
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
-
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-#line 855 "/Volumes/Gir/devel/llvm/llvm.src/lib/AsmParser/llvmAsmParser.y"
-{
+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+#line 855 "/home/vadve/alenhar2/llvm.old/lib/AsmParser/llvmAsmParser.y"
+typedef union YYSTYPE {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   std::pair<llvm::PATypeHolder*, char*>  *ArgVal;
@@ -1270,10 +1251,9 @@ typedef union YYSTYPE
   llvm::Module::Endianness          Endianness;
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
-}
-/* Line 193 of yacc.c.  */
-#line 1276 "llvmAsmParser.tab.c"
-	YYSTYPE;
+} YYSTYPE;
+/* Line 191 of yacc.c.  */
+#line 1257 "llvmAsmParser.tab.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -1284,171 +1264,56 @@ typedef union YYSTYPE
 /* Copy the second part of user declarations.  */
 
 
-/* Line 216 of yacc.c.  */
-#line 1289 "llvmAsmParser.tab.c"
-
-#ifdef short
-# undef short
-#endif
-
-#ifdef YYTYPE_UINT8
-typedef YYTYPE_UINT8 yytype_uint8;
-#else
-typedef unsigned char yytype_uint8;
-#endif
-
-#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
-
-#ifdef YYTYPE_UINT16
-typedef YYTYPE_UINT16 yytype_uint16;
-#else
-typedef unsigned short int yytype_uint16;
-#endif
-
-#ifdef YYTYPE_INT16
-typedef YYTYPE_INT16 yytype_int16;
-#else
-typedef short int yytype_int16;
-#endif
-
-#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
+/* Line 214 of yacc.c.  */
+#line 1269 "llvmAsmParser.tab.c"
 
-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+#if ! defined (yyoverflow) || YYERROR_VERBOSE
 
-#ifndef YY_
-# if YYENABLE_NLS
-#  if ENABLE_NLS
-#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
-#  endif
+# ifndef YYFREE
+#  define YYFREE free
 # endif
-# ifndef YY_
-#  define YY_(msgid) msgid
+# ifndef YYMALLOC
+#  define YYMALLOC malloc
 # endif
-#endif
-
-/* 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.  */
 
 # ifdef YYSTACK_USE_ALLOCA
 #  if YYSTACK_USE_ALLOCA
+#   define YYSTACK_ALLOC alloca
+#  endif
+# else
+#  if defined (alloca) || defined (_ALLOCA_H)
+#   define YYSTACK_ALLOC alloca
+#  else
 #   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 _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     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 (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 2006 */
-#  endif
+   /* Pacify GCC's `empty if-body' warning. */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
 # else
-#  define YYSTACK_ALLOC YYMALLOC
-#  define YYSTACK_FREE YYFREE
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
-#  endif
-#  if (defined __cplusplus && ! defined _STDLIB_H \
-       && ! ((defined YYMALLOC || defined malloc) \
-	     && (defined YYFREE || defined free)))
+#  if defined (__STDC__) || defined (__cplusplus)
 #   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 _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 _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-void free (void *); /* INFRINGES ON USER NAME SPACE */
-#   endif
+#   define YYSIZE_T size_t
 #  endif
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
 # 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
 {
-  yytype_int16 yyss;
+  short yyss;
   YYSTYPE yyvs;
   };
 
@@ -1458,24 +1323,24 @@ union yyalloc
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+     ((N) * (sizeof (short) + 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
 #   define YYCOPY(To, From, Count)		\
       do					\
 	{					\
-	  YYSIZE_T yyi;				\
+	  register YYSIZE_T yyi;		\
 	  for (yyi = 0; yyi < (Count); yyi++)	\
 	    (To)[yyi] = (From)[yyi];		\
 	}					\
-      while (YYID (0))
+      while (0)
 #  endif
 # endif
 
@@ -1493,33 +1358,39 @@ union yyalloc
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
-    while (YYID (0))
+    while (0)
 
 #endif
 
-/* YYFINAL -- State number of the termination state.  */
+#if defined (__STDC__) || defined (__cplusplus)
+   typedef signed char yysigned_char;
+#else
+   typedef short yysigned_char;
+#endif
+
+/* YYFINAL -- State number of the termination state. */
 #define YYFINAL  4
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1509
+#define YYLAST   1476
 
-/* YYNTOKENS -- Number of terminals.  */
+/* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS  159
-/* YYNNTS -- Number of nonterminals.  */
+/* YYNNTS -- Number of nonterminals. */
 #define YYNNTS  78
-/* YYNRULES -- Number of rules.  */
-#define YYNRULES  297
-/* YYNRULES -- Number of states.  */
-#define YYNSTATES  578
+/* YYNRULES -- Number of rules. */
+#define YYNRULES  299
+/* YYNRULES -- Number of states. */
+#define YYNSTATES  584
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   399
 
-#define YYTRANSLATE(YYX)						\
+#define YYTRANSLATE(YYX) 						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const yytype_uint8 yytranslate[] =
+static const unsigned char yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -1566,7 +1437,7 @@ static const yytype_uint8 yytranslate[] =
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */
-static const yytype_uint16 yyprhs[] =
+static const unsigned short yyprhs[] =
 {
        0,     0,     3,     5,     7,     9,    11,    13,    15,    17,
       19,    21,    23,    25,    27,    29,    31,    33,    35,    37,
@@ -1581,27 +1452,27 @@ static const yytype_uint16 yyprhs[] =
      200,   201,   203,   204,   208,   210,   213,   215,   217,   219,
      221,   223,   225,   227,   229,   231,   233,   235,   237,   239,
      241,   243,   245,   247,   249,   251,   253,   255,   258,   263,
-     269,   275,   279,   282,   285,   287,   291,   293,   297,   299,
-     300,   305,   309,   313,   318,   323,   327,   330,   333,   336,
-     339,   342,   345,   348,   351,   354,   357,   364,   370,   379,
-     386,   393,   400,   408,   416,   423,   430,   439,   448,   452,
-     454,   456,   458,   460,   463,   466,   471,   474,   476,   481,
-     484,   489,   490,   498,   499,   507,   508,   516,   517,   525,
-     529,   534,   535,   537,   539,   541,   545,   549,   553,   557,
-     561,   565,   567,   568,   570,   572,   574,   575,   578,   582,
-     584,   586,   590,   592,   593,   602,   604,   606,   610,   612,
-     614,   617,   618,   620,   622,   623,   628,   629,   631,   633,
-     635,   637,   639,   641,   643,   645,   647,   651,   653,   659,
-     661,   663,   665,   667,   670,   673,   676,   680,   683,   684,
-     686,   689,   692,   696,   706,   716,   725,   739,   741,   743,
-     750,   756,   759,   766,   774,   776,   780,   782,   783,   786,
-     788,   794,   800,   806,   813,   820,   823,   828,   833,   840,
-     845,   850,   857,   864,   867,   875,   877,   880,   881,   883,
-     884,   888,   895,   899,   906,   909,   914,   921
+     269,   275,   279,   282,   288,   293,   296,   298,   302,   304,
+     308,   310,   311,   316,   320,   324,   329,   334,   338,   341,
+     344,   347,   350,   353,   356,   359,   362,   365,   368,   375,
+     381,   390,   397,   404,   411,   419,   427,   434,   441,   450,
+     459,   463,   465,   467,   469,   471,   474,   477,   482,   485,
+     487,   492,   495,   500,   501,   509,   510,   518,   519,   527,
+     528,   536,   540,   545,   546,   548,   550,   552,   556,   560,
+     564,   568,   572,   576,   578,   579,   581,   583,   585,   586,
+     589,   593,   595,   597,   601,   603,   604,   613,   615,   617,
+     621,   623,   625,   628,   629,   631,   633,   634,   639,   640,
+     642,   644,   646,   648,   650,   652,   654,   656,   658,   662,
+     664,   670,   672,   674,   676,   678,   681,   684,   687,   691,
+     694,   695,   697,   700,   703,   707,   717,   727,   736,   750,
+     752,   754,   761,   767,   770,   777,   785,   787,   791,   793,
+     794,   797,   799,   805,   811,   817,   824,   831,   834,   839,
+     844,   851,   856,   861,   868,   875,   878,   886,   888,   891,
+     892,   894,   895,   899,   906,   910,   917,   920,   925,   932
 };
 
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int16 yyrhs[] =
+/* YYRHS -- A `-1'-separated list of the rules' RHS. */
+static const short yyrhs[] =
 {
      193,     0,    -1,     5,    -1,     6,    -1,     3,    -1,     4,
       -1,    78,    -1,    79,    -1,    80,    -1,    81,    -1,    82,
@@ -1631,75 +1502,76 @@ static const yytype_int16 yyrhs[] =
       -1,   185,    -1,   220,    -1,   147,     4,    -1,   183,   148,
      188,   149,    -1,   150,     4,   151,   186,   152,    -1,   153,
        4,   151,   186,   154,    -1,   155,   187,   156,    -1,   155,
-     156,    -1,   186,   157,    -1,   186,    -1,   187,   146,   186,
-      -1,   187,    -1,   187,   146,    37,    -1,    37,    -1,    -1,
-     184,   150,   191,   152,    -1,   184,   150,   152,    -1,   184,
-     158,    24,    -1,   184,   153,   191,   154,    -1,   184,   155,
-     191,   156,    -1,   184,   155,   156,    -1,   184,    38,    -1,
-     184,    39,    -1,   184,   220,    -1,   184,   190,    -1,   184,
-      26,    -1,   169,   161,    -1,   170,     4,    -1,     9,    27,
-      -1,     9,    28,    -1,   172,     7,    -1,   165,   148,   189,
-      36,   184,   149,    -1,   123,   148,   189,   234,   149,    -1,
-     137,   148,   189,   146,   189,   146,   189,   149,    -1,   162,
-     148,   189,   146,   189,   149,    -1,   163,   148,   189,   146,
-     189,   149,    -1,   164,   148,   189,   146,   189,   149,    -1,
-      96,   167,   148,   189,   146,   189,   149,    -1,    97,   168,
-     148,   189,   146,   189,   149,    -1,   166,   148,   189,   146,
-     189,   149,    -1,   142,   148,   189,   146,   189,   149,    -1,
-     143,   148,   189,   146,   189,   146,   189,   149,    -1,   144,
-     148,   189,   146,   189,   146,   189,   149,    -1,   191,   146,
-     189,    -1,   189,    -1,    32,    -1,    33,    -1,   194,    -1,
-     194,   214,    -1,   194,   216,    -1,   194,    62,    61,   200,
-      -1,   194,    25,    -1,   195,    -1,   195,   173,    20,   182,
-      -1,   195,   216,    -1,   195,    62,    61,   200,    -1,    -1,
-     195,   173,   174,   192,   189,   196,   180,    -1,    -1,   195,
-     173,    50,   192,   184,   197,   180,    -1,    -1,   195,   173,
-      45,   192,   184,   198,   180,    -1,    -1,   195,   173,    47,
-     192,   184,   199,   180,    -1,   195,    51,   202,    -1,   195,
-      58,   145,   203,    -1,    -1,    24,    -1,    56,    -1,    55,
-      -1,    53,   145,   201,    -1,    54,   145,     4,    -1,    52,
-     145,    24,    -1,    71,   145,    24,    -1,   150,   204,   152,
-      -1,   204,   146,    24,    -1,    24,    -1,    -1,    22,    -1,
-      24,    -1,   205,    -1,    -1,   184,   206,    -1,   208,   146,
-     207,    -1,   207,    -1,   208,    -1,   208,   146,    37,    -1,
-      37,    -1,    -1,   175,   182,   205,   148,   209,   149,   179,
-     176,    -1,    29,    -1,   155,    -1,   174,   210,   211,    -1,
-      30,    -1,   156,    -1,   223,   213,    -1,    -1,    45,    -1,
-      47,    -1,    -1,    31,   217,   215,   210,    -1,    -1,    63,
-      -1,     3,    -1,     4,    -1,     7,    -1,    27,    -1,    28,
-      -1,    38,    -1,    39,    -1,    26,    -1,   153,   191,   154,
-      -1,   190,    -1,    61,   218,    24,   146,    24,    -1,   160,
-      -1,   205,    -1,   220,    -1,   219,    -1,   184,   221,    -1,
-     223,   224,    -1,   212,   224,    -1,   225,   173,   226,    -1,
-     225,   228,    -1,    -1,    23,    -1,    72,   222,    -1,    72,
-       8,    -1,    73,    21,   221,    -1,    73,     9,   221,   146,
-      21,   221,   146,    21,   221,    -1,    74,   171,   221,   146,
-      21,   221,   150,   227,   152,    -1,    74,   171,   221,   146,
-      21,   221,   150,   152,    -1,    75,   175,   182,   221,   148,
-     231,   149,    36,    21,   221,    76,    21,   221,    -1,    76,
-      -1,    77,    -1,   227,   171,   219,   146,    21,   221,    -1,
-     171,   219,   146,    21,   221,    -1,   173,   233,    -1,   184,
-     150,   221,   146,   221,   152,    -1,   229,   146,   150,   221,
-     146,   221,   152,    -1,   222,    -1,   230,   146,   222,    -1,
-     230,    -1,    -1,    60,    59,    -1,    59,    -1,   162,   184,
-     221,   146,   221,    -1,   163,   184,   221,   146,   221,    -1,
-     164,   184,   221,   146,   221,    -1,    96,   167,   184,   221,
-     146,   221,    -1,    97,   168,   184,   221,   146,   221,    -1,
-      49,   222,    -1,   166,   222,   146,   222,    -1,   165,   222,
-      36,   184,    -1,   137,   222,   146,   222,   146,   222,    -1,
-     141,   222,   146,   184,    -1,   142,   222,   146,   222,    -1,
-     143,   222,   146,   222,   146,   222,    -1,   144,   222,   146,
-     222,   146,   222,    -1,   136,   229,    -1,   232,   175,   182,
-     221,   148,   231,   149,    -1,   236,    -1,   146,   230,    -1,
-      -1,    35,    -1,    -1,   118,   184,   177,    -1,   118,   184,
-     146,    15,   221,   177,    -1,   119,   184,   177,    -1,   119,
-     184,   146,    15,   221,   177,    -1,   120,   222,    -1,   235,
-     121,   184,   221,    -1,   235,   122,   222,   146,   184,   221,
-      -1,   123,   184,   221,   234,    -1
+     156,    -1,   153,   155,   187,   156,   154,    -1,   153,   155,
+     156,   154,    -1,   186,   157,    -1,   186,    -1,   187,   146,
+     186,    -1,   187,    -1,   187,   146,    37,    -1,    37,    -1,
+      -1,   184,   150,   191,   152,    -1,   184,   150,   152,    -1,
+     184,   158,    24,    -1,   184,   153,   191,   154,    -1,   184,
+     155,   191,   156,    -1,   184,   155,   156,    -1,   184,    38,
+      -1,   184,    39,    -1,   184,   220,    -1,   184,   190,    -1,
+     184,    26,    -1,   169,   161,    -1,   170,     4,    -1,     9,
+      27,    -1,     9,    28,    -1,   172,     7,    -1,   165,   148,
+     189,    36,   184,   149,    -1,   123,   148,   189,   234,   149,
+      -1,   137,   148,   189,   146,   189,   146,   189,   149,    -1,
+     162,   148,   189,   146,   189,   149,    -1,   163,   148,   189,
+     146,   189,   149,    -1,   164,   148,   189,   146,   189,   149,
+      -1,    96,   167,   148,   189,   146,   189,   149,    -1,    97,
+     168,   148,   189,   146,   189,   149,    -1,   166,   148,   189,
+     146,   189,   149,    -1,   142,   148,   189,   146,   189,   149,
+      -1,   143,   148,   189,   146,   189,   146,   189,   149,    -1,
+     144,   148,   189,   146,   189,   146,   189,   149,    -1,   191,
+     146,   189,    -1,   189,    -1,    32,    -1,    33,    -1,   194,
+      -1,   194,   214,    -1,   194,   216,    -1,   194,    62,    61,
+     200,    -1,   194,    25,    -1,   195,    -1,   195,   173,    20,
+     182,    -1,   195,   216,    -1,   195,    62,    61,   200,    -1,
+      -1,   195,   173,   174,   192,   189,   196,   180,    -1,    -1,
+     195,   173,    50,   192,   184,   197,   180,    -1,    -1,   195,
+     173,    45,   192,   184,   198,   180,    -1,    -1,   195,   173,
+      47,   192,   184,   199,   180,    -1,   195,    51,   202,    -1,
+     195,    58,   145,   203,    -1,    -1,    24,    -1,    56,    -1,
+      55,    -1,    53,   145,   201,    -1,    54,   145,     4,    -1,
+      52,   145,    24,    -1,    71,   145,    24,    -1,   150,   204,
+     152,    -1,   204,   146,    24,    -1,    24,    -1,    -1,    22,
+      -1,    24,    -1,   205,    -1,    -1,   184,   206,    -1,   208,
+     146,   207,    -1,   207,    -1,   208,    -1,   208,   146,    37,
+      -1,    37,    -1,    -1,   175,   182,   205,   148,   209,   149,
+     179,   176,    -1,    29,    -1,   155,    -1,   174,   210,   211,
+      -1,    30,    -1,   156,    -1,   223,   213,    -1,    -1,    45,
+      -1,    47,    -1,    -1,    31,   217,   215,   210,    -1,    -1,
+      63,    -1,     3,    -1,     4,    -1,     7,    -1,    27,    -1,
+      28,    -1,    38,    -1,    39,    -1,    26,    -1,   153,   191,
+     154,    -1,   190,    -1,    61,   218,    24,   146,    24,    -1,
+     160,    -1,   205,    -1,   220,    -1,   219,    -1,   184,   221,
+      -1,   223,   224,    -1,   212,   224,    -1,   225,   173,   226,
+      -1,   225,   228,    -1,    -1,    23,    -1,    72,   222,    -1,
+      72,     8,    -1,    73,    21,   221,    -1,    73,     9,   221,
+     146,    21,   221,   146,    21,   221,    -1,    74,   171,   221,
+     146,    21,   221,   150,   227,   152,    -1,    74,   171,   221,
+     146,    21,   221,   150,   152,    -1,    75,   175,   182,   221,
+     148,   231,   149,    36,    21,   221,    76,    21,   221,    -1,
+      76,    -1,    77,    -1,   227,   171,   219,   146,    21,   221,
+      -1,   171,   219,   146,    21,   221,    -1,   173,   233,    -1,
+     184,   150,   221,   146,   221,   152,    -1,   229,   146,   150,
+     221,   146,   221,   152,    -1,   222,    -1,   230,   146,   222,
+      -1,   230,    -1,    -1,    60,    59,    -1,    59,    -1,   162,
+     184,   221,   146,   221,    -1,   163,   184,   221,   146,   221,
+      -1,   164,   184,   221,   146,   221,    -1,    96,   167,   184,
+     221,   146,   221,    -1,    97,   168,   184,   221,   146,   221,
+      -1,    49,   222,    -1,   166,   222,   146,   222,    -1,   165,
+     222,    36,   184,    -1,   137,   222,   146,   222,   146,   222,
+      -1,   141,   222,   146,   184,    -1,   142,   222,   146,   222,
+      -1,   143,   222,   146,   222,   146,   222,    -1,   144,   222,
+     146,   222,   146,   222,    -1,   136,   229,    -1,   232,   175,
+     182,   221,   148,   231,   149,    -1,   236,    -1,   146,   230,
+      -1,    -1,    35,    -1,    -1,   118,   184,   177,    -1,   118,
+     184,   146,    15,   221,   177,    -1,   119,   184,   177,    -1,
+     119,   184,   146,    15,   221,   177,    -1,   120,   222,    -1,
+     235,   121,   184,   221,    -1,   235,   122,   222,   146,   184,
+     221,    -1,   123,   184,   221,   234,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const yytype_uint16 yyrline[] =
+static const unsigned short yyrline[] =
 {
        0,   990,   990,   991,   999,  1000,  1010,  1010,  1010,  1010,
     1010,  1010,  1010,  1010,  1010,  1011,  1011,  1011,  1012,  1012,
@@ -1714,29 +1586,29 @@ static const yytype_uint16 yyrline[] =
     1102,  1103,  1108,  1109,  1110,  1115,  1129,  1129,  1130,  1130,
     1132,  1142,  1142,  1142,  1142,  1142,  1142,  1142,  1143,  1143,
     1143,  1143,  1143,  1143,  1144,  1148,  1152,  1160,  1168,  1181,
-    1186,  1198,  1208,  1212,  1223,  1228,  1234,  1235,  1239,  1243,
-    1254,  1280,  1294,  1324,  1350,  1371,  1384,  1394,  1399,  1460,
-    1467,  1475,  1481,  1487,  1491,  1495,  1503,  1515,  1536,  1544,
-    1550,  1561,  1567,  1572,  1577,  1586,  1592,  1598,  1607,  1611,
-    1619,  1619,  1629,  1637,  1642,  1646,  1650,  1654,  1669,  1691,
-    1694,  1697,  1697,  1705,  1705,  1713,  1713,  1721,  1721,  1730,
-    1733,  1736,  1740,  1753,  1754,  1756,  1760,  1769,  1773,  1778,
-    1780,  1785,  1790,  1799,  1799,  1800,  1800,  1802,  1809,  1815,
-    1822,  1826,  1832,  1837,  1842,  1937,  1937,  1939,  1947,  1947,
-    1949,  1954,  1955,  1956,  1958,  1958,  1968,  1972,  1977,  1981,
-    1985,  1989,  1993,  1997,  2001,  2005,  2009,  2034,  2038,  2052,
-    2056,  2062,  2062,  2068,  2073,  2077,  2086,  2097,  2106,  2118,
-    2131,  2135,  2139,  2144,  2153,  2172,  2181,  2237,  2241,  2248,
-    2259,  2272,  2281,  2290,  2300,  2304,  2311,  2311,  2313,  2317,
-    2322,  2341,  2356,  2370,  2381,  2392,  2405,  2414,  2425,  2433,
-    2438,  2444,  2450,  2456,  2471,  2530,  2537,  2540,  2545,  2549,
-    2556,  2561,  2567,  2572,  2578,  2586,  2598,  2613
+    1186,  1198,  1208,  1212,  1222,  1226,  1237,  1242,  1248,  1249,
+    1253,  1257,  1268,  1294,  1308,  1338,  1364,  1385,  1398,  1408,
+    1413,  1474,  1481,  1489,  1495,  1501,  1505,  1509,  1517,  1529,
+    1550,  1558,  1564,  1575,  1581,  1586,  1591,  1600,  1606,  1612,
+    1621,  1625,  1633,  1633,  1643,  1651,  1656,  1660,  1664,  1668,
+    1683,  1705,  1708,  1711,  1711,  1719,  1719,  1727,  1727,  1735,
+    1735,  1744,  1747,  1750,  1754,  1767,  1768,  1770,  1774,  1783,
+    1787,  1792,  1794,  1799,  1804,  1813,  1813,  1814,  1814,  1816,
+    1823,  1829,  1836,  1840,  1846,  1851,  1856,  1951,  1951,  1953,
+    1961,  1961,  1963,  1968,  1969,  1970,  1972,  1972,  1982,  1986,
+    1991,  1995,  1999,  2003,  2007,  2011,  2015,  2019,  2023,  2048,
+    2052,  2066,  2070,  2076,  2076,  2082,  2087,  2091,  2100,  2111,
+    2120,  2132,  2145,  2149,  2153,  2158,  2167,  2186,  2195,  2251,
+    2255,  2262,  2273,  2286,  2295,  2304,  2314,  2318,  2325,  2325,
+    2327,  2331,  2336,  2355,  2370,  2384,  2395,  2406,  2419,  2428,
+    2439,  2447,  2452,  2458,  2464,  2470,  2485,  2544,  2551,  2554,
+    2559,  2563,  2570,  2575,  2581,  2586,  2592,  2600,  2612,  2627
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+#if YYDEBUG || YYERROR_VERBOSE
+/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {
   "$end", "error", "$undefined", "ESINT64VAL", "EUINT64VAL", "SINTVAL",
@@ -1784,7 +1656,7 @@ static const char *const yytname[] =
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
-static const yytype_uint16 yytoknum[] =
+static const unsigned short yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
@@ -1806,7 +1678,7 @@ static const yytype_uint16 yytoknum[] =
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
+static const unsigned char yyr1[] =
 {
        0,   159,   160,   160,   161,   161,   162,   162,   162,   162,
      162,   162,   162,   162,   162,   163,   163,   163,   164,   164,
@@ -1821,27 +1693,27 @@ static const yytype_uint8 yyr1[] =
      179,   179,   180,   180,   181,   181,   182,   182,   183,   183,
      184,   185,   185,   185,   185,   185,   185,   185,   185,   185,
      185,   185,   185,   185,   186,   186,   186,   186,   186,   186,
-     186,   186,   186,   186,   187,   187,   188,   188,   188,   188,
-     189,   189,   189,   189,   189,   189,   189,   189,   189,   189,
-     189,   189,   189,   189,   189,   189,   190,   190,   190,   190,
-     190,   190,   190,   190,   190,   190,   190,   190,   191,   191,
-     192,   192,   193,   194,   194,   194,   194,   194,   195,   195,
-     195,   196,   195,   197,   195,   198,   195,   199,   195,   195,
-     195,   195,   200,   201,   201,   202,   202,   202,   202,   203,
-     204,   204,   204,   205,   205,   206,   206,   207,   208,   208,
-     209,   209,   209,   209,   210,   211,   211,   212,   213,   213,
-     214,   215,   215,   215,   217,   216,   218,   218,   219,   219,
-     219,   219,   219,   219,   219,   219,   219,   219,   219,   220,
-     220,   221,   221,   222,   223,   223,   224,   225,   225,   225,
-     226,   226,   226,   226,   226,   226,   226,   226,   226,   227,
-     227,   228,   229,   229,   230,   230,   231,   231,   232,   232,
-     233,   233,   233,   233,   233,   233,   233,   233,   233,   233,
-     233,   233,   233,   233,   233,   233,   234,   234,   235,   235,
-     236,   236,   236,   236,   236,   236,   236,   236
+     186,   186,   186,   186,   186,   186,   187,   187,   188,   188,
+     188,   188,   189,   189,   189,   189,   189,   189,   189,   189,
+     189,   189,   189,   189,   189,   189,   189,   189,   190,   190,
+     190,   190,   190,   190,   190,   190,   190,   190,   190,   190,
+     191,   191,   192,   192,   193,   194,   194,   194,   194,   194,
+     195,   195,   195,   196,   195,   197,   195,   198,   195,   199,
+     195,   195,   195,   195,   200,   201,   201,   202,   202,   202,
+     202,   203,   204,   204,   204,   205,   205,   206,   206,   207,
+     208,   208,   209,   209,   209,   209,   210,   211,   211,   212,
+     213,   213,   214,   215,   215,   215,   217,   216,   218,   218,
+     219,   219,   219,   219,   219,   219,   219,   219,   219,   219,
+     219,   220,   220,   221,   221,   222,   223,   223,   224,   225,
+     225,   225,   226,   226,   226,   226,   226,   226,   226,   226,
+     226,   227,   227,   228,   229,   229,   230,   230,   231,   231,
+     232,   232,   233,   233,   233,   233,   233,   233,   233,   233,
+     233,   233,   233,   233,   233,   233,   233,   233,   234,   234,
+     235,   235,   236,   236,   236,   236,   236,   236,   236,   236
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
+static const unsigned char yyr2[] =
 {
        0,     2,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
@@ -1856,499 +1728,495 @@ static const yytype_uint8 yyr2[] =
        0,     1,     0,     3,     1,     2,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     2,     4,     5,
-       5,     3,     2,     2,     1,     3,     1,     3,     1,     0,
-       4,     3,     3,     4,     4,     3,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     6,     5,     8,     6,
-       6,     6,     7,     7,     6,     6,     8,     8,     3,     1,
-       1,     1,     1,     2,     2,     4,     2,     1,     4,     2,
-       4,     0,     7,     0,     7,     0,     7,     0,     7,     3,
-       4,     0,     1,     1,     1,     3,     3,     3,     3,     3,
-       3,     1,     0,     1,     1,     1,     0,     2,     3,     1,
-       1,     3,     1,     0,     8,     1,     1,     3,     1,     1,
-       2,     0,     1,     1,     0,     4,     0,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     3,     1,     5,     1,
-       1,     1,     1,     2,     2,     2,     3,     2,     0,     1,
-       2,     2,     3,     9,     9,     8,    13,     1,     1,     6,
-       5,     2,     6,     7,     1,     3,     1,     0,     2,     1,
-       5,     5,     5,     6,     6,     2,     4,     4,     6,     4,
-       4,     6,     6,     2,     7,     1,     2,     0,     1,     0,
-       3,     6,     3,     6,     2,     4,     6,     4
+       5,     3,     2,     5,     4,     2,     1,     3,     1,     3,
+       1,     0,     4,     3,     3,     4,     4,     3,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     6,     5,
+       8,     6,     6,     6,     7,     7,     6,     6,     8,     8,
+       3,     1,     1,     1,     1,     2,     2,     4,     2,     1,
+       4,     2,     4,     0,     7,     0,     7,     0,     7,     0,
+       7,     3,     4,     0,     1,     1,     1,     3,     3,     3,
+       3,     3,     3,     1,     0,     1,     1,     1,     0,     2,
+       3,     1,     1,     3,     1,     0,     8,     1,     1,     3,
+       1,     1,     2,     0,     1,     1,     0,     4,     0,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     3,     1,
+       5,     1,     1,     1,     1,     2,     2,     2,     3,     2,
+       0,     1,     2,     2,     3,     9,     9,     8,    13,     1,
+       1,     6,     5,     2,     6,     7,     1,     3,     1,     0,
+       2,     1,     5,     5,     5,     6,     6,     2,     4,     4,
+       6,     4,     4,     6,     6,     2,     7,     1,     2,     0,
+       1,     0,     3,     6,     3,     6,     2,     4,     6,     4
 };
 
 /* 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.  */
-static const yytype_uint16 yydefact[] =
+static const unsigned short yydefact[] =
 {
-     191,     0,    86,   177,     1,   176,   224,    79,    80,    81,
-      82,    83,    84,    85,     0,    87,   248,   173,   174,   248,
-     203,   204,     0,     0,     0,    86,     0,   179,   221,     0,
-       0,    88,    89,    90,    91,    92,    93,     0,     0,   249,
-     245,    78,   218,   219,   220,   244,     0,     0,     0,     0,
-     189,     0,     0,     0,     0,     0,     0,     0,    77,   222,
-     223,    87,   192,   175,    94,     2,     3,   107,   111,   112,
+     193,     0,    86,   179,     1,   178,   226,    79,    80,    81,
+      82,    83,    84,    85,     0,    87,   250,   175,   176,   250,
+     205,   206,     0,     0,     0,    86,     0,   181,   223,     0,
+       0,    88,    89,    90,    91,    92,    93,     0,     0,   251,
+     247,    78,   220,   221,   222,   246,     0,     0,     0,     0,
+     191,     0,     0,     0,     0,     0,     0,     0,    77,   224,
+     225,    87,   194,   177,    94,     2,     3,   107,   111,   112,
      113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,     0,     0,     0,     0,   239,     0,     0,   106,
-     125,   110,   240,   126,   215,   216,   217,   289,   247,     0,
-       0,     0,     0,   202,   190,   180,   178,   170,   171,     0,
-       0,     0,     0,   225,   127,     0,     0,   109,   132,   134,
-       0,     0,   139,   133,   288,     0,   269,     0,     0,     0,
-       0,    87,   257,   258,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,     0,     0,     0,     0,     0,     0,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-       0,     0,    36,    37,    38,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   246,    87,   261,     0,   285,   197,
-     194,   193,   195,   196,   198,   201,     0,   185,   187,   183,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,     0,     0,     0,     0,   181,     0,     0,     0,   131,
-     213,   138,   136,     0,     0,   275,   268,   251,   250,     0,
-       0,    68,    72,    67,    71,    66,    70,    65,    69,    73,
-      74,     0,     0,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,     0,    63,    64,    59,    60,    61,    62,
-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
-       0,    97,    97,   294,     0,     0,   283,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   199,   102,   102,   102,   153,   154,     4,     5,   151,
-     152,   155,   150,   146,   147,     0,     0,     0,     0,     0,
+     123,   124,     0,     0,     0,     0,   241,     0,     0,   106,
+     125,   110,   242,   126,   217,   218,   219,   291,   249,     0,
+       0,     0,     0,   204,   192,   182,   180,   172,   173,     0,
+       0,     0,     0,