[llvm-commits] [llvm] r53164 - in /llvm/branches/non-call-eh/lib: AsmParser/llvmAsmParser.cpp.cvs AsmParser/llvmAsmParser.h.cvs AsmParser/llvmAsmParser.y AsmParser/llvmAsmParser.y.cvs Bitcode/Writer/BitcodeWriter.cpp VMCore/BasicBlock.cpp

Nick Lewycky nicholas at mxc.ca
Sun Jul 6 14:59:11 PDT 2008


Author: nicholas
Date: Sun Jul  6 16:59:11 2008
New Revision: 53164

URL: http://llvm.org/viewvc/llvm-project?rev=53164&view=rev
Log:
Now passes make check.

Modified:
    llvm/branches/non-call-eh/lib/AsmParser/llvmAsmParser.cpp.cvs
    llvm/branches/non-call-eh/lib/AsmParser/llvmAsmParser.h.cvs
    llvm/branches/non-call-eh/lib/AsmParser/llvmAsmParser.y
    llvm/branches/non-call-eh/lib/AsmParser/llvmAsmParser.y.cvs
    llvm/branches/non-call-eh/lib/Bitcode/Writer/BitcodeWriter.cpp
    llvm/branches/non-call-eh/lib/VMCore/BasicBlock.cpp

Modified: llvm/branches/non-call-eh/lib/AsmParser/llvmAsmParser.cpp.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/non-call-eh/lib/AsmParser/llvmAsmParser.cpp.cvs?rev=53164&r1=53163&r2=53164&view=diff

==============================================================================
--- llvm/branches/non-call-eh/lib/AsmParser/llvmAsmParser.cpp.cvs (original)
+++ llvm/branches/non-call-eh/lib/AsmParser/llvmAsmParser.cpp.cvs Sun Jul  6 16:59:11 2008
@@ -127,106 +127,107 @@
      TRIPLE = 308,
      ALIGN = 309,
      ADDRSPACE = 310,
-     DEPLIBS = 311,
-     CALL = 312,
-     TAIL = 313,
-     ASM_TOK = 314,
-     MODULE = 315,
-     SIDEEFFECT = 316,
-     CC_TOK = 317,
-     CCC_TOK = 318,
-     FASTCC_TOK = 319,
-     COLDCC_TOK = 320,
-     X86_STDCALLCC_TOK = 321,
-     X86_FASTCALLCC_TOK = 322,
-     DATALAYOUT = 323,
-     RET = 324,
-     BR = 325,
-     SWITCH = 326,
-     INVOKE = 327,
-     UNWIND = 328,
-     UNREACHABLE = 329,
-     ADD = 330,
-     SUB = 331,
-     MUL = 332,
-     UDIV = 333,
-     SDIV = 334,
-     FDIV = 335,
-     UREM = 336,
-     SREM = 337,
-     FREM = 338,
-     AND = 339,
-     OR = 340,
-     XOR = 341,
-     SHL = 342,
-     LSHR = 343,
-     ASHR = 344,
-     ICMP = 345,
-     FCMP = 346,
-     VICMP = 347,
-     VFCMP = 348,
-     EQ = 349,
-     NE = 350,
-     SLT = 351,
-     SGT = 352,
-     SLE = 353,
-     SGE = 354,
-     ULT = 355,
-     UGT = 356,
-     ULE = 357,
-     UGE = 358,
-     OEQ = 359,
-     ONE = 360,
-     OLT = 361,
-     OGT = 362,
-     OLE = 363,
-     OGE = 364,
-     ORD = 365,
-     UNO = 366,
-     UEQ = 367,
-     UNE = 368,
-     MALLOC = 369,
-     ALLOCA = 370,
-     FREE = 371,
-     LOAD = 372,
-     STORE = 373,
-     GETELEMENTPTR = 374,
-     TRUNC = 375,
-     ZEXT = 376,
-     SEXT = 377,
-     FPTRUNC = 378,
-     FPEXT = 379,
-     BITCAST = 380,
-     UITOFP = 381,
-     SITOFP = 382,
-     FPTOUI = 383,
-     FPTOSI = 384,
-     INTTOPTR = 385,
-     PTRTOINT = 386,
-     PHI_TOK = 387,
-     SELECT = 388,
-     VAARG = 389,
-     EXTRACTELEMENT = 390,
-     INSERTELEMENT = 391,
-     SHUFFLEVECTOR = 392,
-     GETRESULT = 393,
-     EXTRACTVALUE = 394,
-     INSERTVALUE = 395,
-     SIGNEXT = 396,
-     ZEROEXT = 397,
-     NORETURN = 398,
-     INREG = 399,
-     SRET = 400,
-     NOUNWIND = 401,
-     NOALIAS = 402,
-     BYVAL = 403,
-     NEST = 404,
-     READNONE = 405,
-     READONLY = 406,
-     GC = 407,
-     DEFAULT = 408,
-     HIDDEN = 409,
-     PROTECTED = 410
+     UNWINDS = 311,
+     DEPLIBS = 312,
+     CALL = 313,
+     TAIL = 314,
+     ASM_TOK = 315,
+     MODULE = 316,
+     SIDEEFFECT = 317,
+     CC_TOK = 318,
+     CCC_TOK = 319,
+     FASTCC_TOK = 320,
+     COLDCC_TOK = 321,
+     X86_STDCALLCC_TOK = 322,
+     X86_FASTCALLCC_TOK = 323,
+     DATALAYOUT = 324,
+     RET = 325,
+     BR = 326,
+     SWITCH = 327,
+     INVOKE = 328,
+     UNWIND = 329,
+     UNREACHABLE = 330,
+     ADD = 331,
+     SUB = 332,
+     MUL = 333,
+     UDIV = 334,
+     SDIV = 335,
+     FDIV = 336,
+     UREM = 337,
+     SREM = 338,
+     FREM = 339,
+     AND = 340,
+     OR = 341,
+     XOR = 342,
+     SHL = 343,
+     LSHR = 344,
+     ASHR = 345,
+     ICMP = 346,
+     FCMP = 347,
+     VICMP = 348,
+     VFCMP = 349,
+     EQ = 350,
+     NE = 351,
+     SLT = 352,
+     SGT = 353,
+     SLE = 354,
+     SGE = 355,
+     ULT = 356,
+     UGT = 357,
+     ULE = 358,
+     UGE = 359,
+     OEQ = 360,
+     ONE = 361,
+     OLT = 362,
+     OGT = 363,
+     OLE = 364,
+     OGE = 365,
+     ORD = 366,
+     UNO = 367,
+     UEQ = 368,
+     UNE = 369,
+     MALLOC = 370,
+     ALLOCA = 371,
+     FREE = 372,
+     LOAD = 373,
+     STORE = 374,
+     GETELEMENTPTR = 375,
+     TRUNC = 376,
+     ZEXT = 377,
+     SEXT = 378,
+     FPTRUNC = 379,
+     FPEXT = 380,
+     BITCAST = 381,
+     UITOFP = 382,
+     SITOFP = 383,
+     FPTOUI = 384,
+     FPTOSI = 385,
+     INTTOPTR = 386,
+     PTRTOINT = 387,
+     PHI_TOK = 388,
+     SELECT = 389,
+     VAARG = 390,
+     EXTRACTELEMENT = 391,
+     INSERTELEMENT = 392,
+     SHUFFLEVECTOR = 393,
+     GETRESULT = 394,
+     EXTRACTVALUE = 395,
+     INSERTVALUE = 396,
+     SIGNEXT = 397,
+     ZEROEXT = 398,
+     NORETURN = 399,
+     INREG = 400,
+     SRET = 401,
+     NOUNWIND = 402,
+     NOALIAS = 403,
+     BYVAL = 404,
+     NEST = 405,
+     READNONE = 406,
+     READONLY = 407,
+     GC = 408,
+     DEFAULT = 409,
+     HIDDEN = 410,
+     PROTECTED = 411
    };
 #endif
 /* Tokens.  */
@@ -283,112 +284,113 @@
 #define TRIPLE 308
 #define ALIGN 309
 #define ADDRSPACE 310
-#define DEPLIBS 311
-#define CALL 312
-#define TAIL 313
-#define ASM_TOK 314
-#define MODULE 315
-#define SIDEEFFECT 316
-#define CC_TOK 317
-#define CCC_TOK 318
-#define FASTCC_TOK 319
-#define COLDCC_TOK 320
-#define X86_STDCALLCC_TOK 321
-#define X86_FASTCALLCC_TOK 322
-#define DATALAYOUT 323
-#define RET 324
-#define BR 325
-#define SWITCH 326
-#define INVOKE 327
-#define UNWIND 328
-#define UNREACHABLE 329
-#define ADD 330
-#define SUB 331
-#define MUL 332
-#define UDIV 333
-#define SDIV 334
-#define FDIV 335
-#define UREM 336
-#define SREM 337
-#define FREM 338
-#define AND 339
-#define OR 340
-#define XOR 341
-#define SHL 342
-#define LSHR 343
-#define ASHR 344
-#define ICMP 345
-#define FCMP 346
-#define VICMP 347
-#define VFCMP 348
-#define EQ 349
-#define NE 350
-#define SLT 351
-#define SGT 352
-#define SLE 353
-#define SGE 354
-#define ULT 355
-#define UGT 356
-#define ULE 357
-#define UGE 358
-#define OEQ 359
-#define ONE 360
-#define OLT 361
-#define OGT 362
-#define OLE 363
-#define OGE 364
-#define ORD 365
-#define UNO 366
-#define UEQ 367
-#define UNE 368
-#define MALLOC 369
-#define ALLOCA 370
-#define FREE 371
-#define LOAD 372
-#define STORE 373
-#define GETELEMENTPTR 374
-#define TRUNC 375
-#define ZEXT 376
-#define SEXT 377
-#define FPTRUNC 378
-#define FPEXT 379
-#define BITCAST 380
-#define UITOFP 381
-#define SITOFP 382
-#define FPTOUI 383
-#define FPTOSI 384
-#define INTTOPTR 385
-#define PTRTOINT 386
-#define PHI_TOK 387
-#define SELECT 388
-#define VAARG 389
-#define EXTRACTELEMENT 390
-#define INSERTELEMENT 391
-#define SHUFFLEVECTOR 392
-#define GETRESULT 393
-#define EXTRACTVALUE 394
-#define INSERTVALUE 395
-#define SIGNEXT 396
-#define ZEROEXT 397
-#define NORETURN 398
-#define INREG 399
-#define SRET 400
-#define NOUNWIND 401
-#define NOALIAS 402
-#define BYVAL 403
-#define NEST 404
-#define READNONE 405
-#define READONLY 406
-#define GC 407
-#define DEFAULT 408
-#define HIDDEN 409
-#define PROTECTED 410
+#define UNWINDS 311
+#define DEPLIBS 312
+#define CALL 313
+#define TAIL 314
+#define ASM_TOK 315
+#define MODULE 316
+#define SIDEEFFECT 317
+#define CC_TOK 318
+#define CCC_TOK 319
+#define FASTCC_TOK 320
+#define COLDCC_TOK 321
+#define X86_STDCALLCC_TOK 322
+#define X86_FASTCALLCC_TOK 323
+#define DATALAYOUT 324
+#define RET 325
+#define BR 326
+#define SWITCH 327
+#define INVOKE 328
+#define UNWIND 329
+#define UNREACHABLE 330
+#define ADD 331
+#define SUB 332
+#define MUL 333
+#define UDIV 334
+#define SDIV 335
+#define FDIV 336
+#define UREM 337
+#define SREM 338
+#define FREM 339
+#define AND 340
+#define OR 341
+#define XOR 342
+#define SHL 343
+#define LSHR 344
+#define ASHR 345
+#define ICMP 346
+#define FCMP 347
+#define VICMP 348
+#define VFCMP 349
+#define EQ 350
+#define NE 351
+#define SLT 352
+#define SGT 353
+#define SLE 354
+#define SGE 355
+#define ULT 356
+#define UGT 357
+#define ULE 358
+#define UGE 359
+#define OEQ 360
+#define ONE 361
+#define OLT 362
+#define OGT 363
+#define OLE 364
+#define OGE 365
+#define ORD 366
+#define UNO 367
+#define UEQ 368
+#define UNE 369
+#define MALLOC 370
+#define ALLOCA 371
+#define FREE 372
+#define LOAD 373
+#define STORE 374
+#define GETELEMENTPTR 375
+#define TRUNC 376
+#define ZEXT 377
+#define SEXT 378
+#define FPTRUNC 379
+#define FPEXT 380
+#define BITCAST 381
+#define UITOFP 382
+#define SITOFP 383
+#define FPTOUI 384
+#define FPTOSI 385
+#define INTTOPTR 386
+#define PTRTOINT 387
+#define PHI_TOK 388
+#define SELECT 389
+#define VAARG 390
+#define EXTRACTELEMENT 391
+#define INSERTELEMENT 392
+#define SHUFFLEVECTOR 393
+#define GETRESULT 394
+#define EXTRACTVALUE 395
+#define INSERTVALUE 396
+#define SIGNEXT 397
+#define ZEROEXT 398
+#define NORETURN 399
+#define INREG 400
+#define SRET 401
+#define NOUNWIND 402
+#define NOALIAS 403
+#define BYVAL 404
+#define NEST 405
+#define READNONE 406
+#define READONLY 407
+#define GC 408
+#define DEFAULT 409
+#define HIDDEN 410
+#define PROTECTED 411
 
 
 
 
 /* Copy the first part of user declarations.  */
-#line 14 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 14 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -1348,7 +1350,7 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 953 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 953 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
 {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -1396,8 +1398,8 @@
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
 }
-/* Line 193 of yacc.c.  */
-#line 1401 "llvmAsmParser.tab.c"
+/* Line 187 of yacc.c.  */
+#line 1403 "llvmAsmParser.tab.c"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -1410,7 +1412,7 @@
 
 
 /* Line 216 of yacc.c.  */
-#line 1414 "llvmAsmParser.tab.c"
+#line 1416 "llvmAsmParser.tab.c"
 
 #ifdef short
 # undef short
@@ -1460,7 +1462,7 @@
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -1625,20 +1627,20 @@
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  44
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   2339
+#define YYLAST   2343
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  170
+#define YYNTOKENS  171
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  86
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  340
+#define YYNRULES  345
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  699
+#define YYNSTATES  710
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   410
+#define YYMAXUTOK   411
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -1650,15 +1652,15 @@
        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,
-     156,   157,   160,     2,   159,     2,     2,     2,     2,     2,
+     157,   158,   161,     2,   160,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     165,   158,   166,     2,     2,     2,     2,     2,     2,     2,
+     166,   159,   167,     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,   162,   161,   164,     2,     2,     2,     2,     2,   169,
+       2,   163,   162,   165,     2,     2,     2,     2,     2,   170,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     163,     2,     2,   167,     2,   168,     2,     2,     2,     2,
+     164,     2,     2,   168,     2,   169,     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,
@@ -1687,7 +1689,7 @@
      125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
      135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
      145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
-     155
+     155,   156
 };
 
 #if YYDEBUG
@@ -1723,129 +1725,131 @@
      718,   720,   723,   727,   728,   730,   732,   734,   736,   738,
      740,   742,   744,   746,   750,   754,   757,   760,   764,   767,
      773,   778,   780,   786,   788,   790,   792,   794,   796,   798,
-     801,   803,   807,   810,   813,   817,   820,   821,   823,   826,
-     829,   833,   843,   853,   862,   877,   879,   881,   888,   894,
-     897,   904,   912,   917,   922,   929,   936,   937,   938,   942,
-     945,   949,   952,   954,   960,   966,   973,   980,   987,   994,
-     999,  1006,  1011,  1016,  1023,  1030,  1033,  1042,  1044,  1046,
-    1047,  1051,  1058,  1062,  1069,  1072,  1078,  1086,  1092,  1097,
-    1102
+     801,   803,   807,   810,   813,   817,   820,   821,   825,   827,
+     832,   834,   837,   843,   846,   849,   853,   863,   873,   882,
+     897,   899,   901,   908,   914,   917,   924,   932,   937,   942,
+     949,   956,   957,   958,   962,   965,   969,   972,   974,   980,
+     986,   993,  1000,  1007,  1014,  1019,  1026,  1031,  1036,  1043,
+    1050,  1053,  1062,  1064,  1066,  1067,  1071,  1078,  1082,  1089,
+    1092,  1098,  1106,  1112,  1117,  1122
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int16 yyrhs[] =
 {
-     216,     0,    -1,    75,    -1,    76,    -1,    77,    -1,    78,
-      -1,    79,    -1,    80,    -1,    81,    -1,    82,    -1,    83,
-      -1,    87,    -1,    88,    -1,    89,    -1,    84,    -1,    85,
-      -1,    86,    -1,   120,    -1,   121,    -1,   122,    -1,   123,
-      -1,   124,    -1,   125,    -1,   126,    -1,   127,    -1,   128,
-      -1,   129,    -1,   130,    -1,   131,    -1,    94,    -1,    95,
-      -1,    96,    -1,    97,    -1,    98,    -1,    99,    -1,   100,
-      -1,   101,    -1,   102,    -1,   103,    -1,   104,    -1,   105,
-      -1,   106,    -1,   107,    -1,   108,    -1,   109,    -1,   110,
-      -1,   111,    -1,   112,    -1,   113,    -1,   100,    -1,   101,
-      -1,   102,    -1,   103,    -1,    26,    -1,    27,    -1,    11,
+     217,     0,    -1,    76,    -1,    77,    -1,    78,    -1,    79,
+      -1,    80,    -1,    81,    -1,    82,    -1,    83,    -1,    84,
+      -1,    88,    -1,    89,    -1,    90,    -1,    85,    -1,    86,
+      -1,    87,    -1,   121,    -1,   122,    -1,   123,    -1,   124,
+      -1,   125,    -1,   126,    -1,   127,    -1,   128,    -1,   129,
+      -1,   130,    -1,   131,    -1,   132,    -1,    95,    -1,    96,
+      -1,    97,    -1,    98,    -1,    99,    -1,   100,    -1,   101,
+      -1,   102,    -1,   103,    -1,   104,    -1,   105,    -1,   106,
+      -1,   107,    -1,   108,    -1,   109,    -1,   110,    -1,   111,
+      -1,   112,    -1,   113,    -1,   114,    -1,   101,    -1,   102,
+      -1,   103,    -1,   104,    -1,    26,    -1,    27,    -1,    11,
       -1,    12,    -1,    13,    -1,    16,    -1,    15,    -1,    14,
-      -1,    19,    -1,    22,    -1,    24,    -1,   178,    -1,    -1,
-      55,   156,     4,   157,    -1,    -1,   178,   158,    -1,    -1,
-      20,    -1,    23,    -1,   184,    -1,    -1,   182,   158,    -1,
+      -1,    19,    -1,    22,    -1,    24,    -1,   179,    -1,    -1,
+      55,   157,     4,   158,    -1,    -1,   179,   159,    -1,    -1,
+      20,    -1,    23,    -1,   185,    -1,    -1,   183,   159,    -1,
       42,    -1,    44,    -1,    43,    -1,    45,    -1,    47,    -1,
-      49,    -1,    46,    -1,    48,    -1,    51,    -1,    -1,   153,
-      -1,   154,    -1,   155,    -1,    -1,    46,    -1,    48,    -1,
+      49,    -1,    46,    -1,    48,    -1,    51,    -1,    -1,   154,
+      -1,   155,    -1,   156,    -1,    -1,    46,    -1,    48,    -1,
       -1,    42,    -1,    43,    -1,    44,    -1,    47,    -1,    -1,
-      44,    -1,    42,    -1,    -1,    63,    -1,    64,    -1,    65,
-      -1,    66,    -1,    67,    -1,    62,     4,    -1,   142,    -1,
-     121,    -1,   141,    -1,   122,    -1,   144,    -1,   145,    -1,
-     147,    -1,   148,    -1,   149,    -1,    54,     4,    -1,    -1,
-     193,   192,    -1,   143,    -1,   146,    -1,   142,    -1,   141,
-      -1,   150,    -1,   151,    -1,    -1,   195,   194,    -1,    -1,
-     152,    22,    -1,    -1,    54,     4,    -1,    -1,   159,    54,
-       4,    -1,    34,    22,    -1,    -1,   199,    -1,    -1,   159,
-     202,   201,    -1,   199,    -1,    54,     4,    -1,    11,    -1,
+      44,    -1,    42,    -1,    -1,    64,    -1,    65,    -1,    66,
+      -1,    67,    -1,    68,    -1,    63,     4,    -1,   143,    -1,
+     122,    -1,   142,    -1,   123,    -1,   145,    -1,   146,    -1,
+     148,    -1,   149,    -1,   150,    -1,    54,     4,    -1,    -1,
+     194,   193,    -1,   144,    -1,   147,    -1,   143,    -1,   142,
+      -1,   151,    -1,   152,    -1,    -1,   196,   195,    -1,    -1,
+     153,    22,    -1,    -1,    54,     4,    -1,    -1,   160,    54,
+       4,    -1,    34,    22,    -1,    -1,   200,    -1,    -1,   160,
+     203,   202,    -1,   200,    -1,    54,     4,    -1,    11,    -1,
       12,    -1,    13,    -1,    16,    -1,    15,    -1,    14,    -1,
-      17,    -1,    50,    -1,   203,    -1,   204,   180,   160,    -1,
-     238,    -1,   161,     4,    -1,   204,   156,   208,   157,   195,
-      -1,    10,   156,   208,   157,   195,    -1,   162,     4,   163,
-     204,   164,    -1,   165,     4,   163,   204,   166,    -1,   167,
-     209,   168,    -1,   167,   168,    -1,   165,   167,   209,   168,
-     166,    -1,   165,   167,   168,   166,    -1,   204,   193,    -1,
-     204,    -1,    10,    -1,   205,    -1,   207,   159,   205,    -1,
-     207,    -1,   207,   159,    39,    -1,    39,    -1,    -1,   204,
-      -1,   209,   159,   204,    -1,   204,   162,   212,   164,    -1,
-     204,   162,   164,    -1,   204,   169,    22,    -1,   204,   165,
-     212,   166,    -1,   204,   167,   212,   168,    -1,   204,   167,
-     168,    -1,   204,   165,   167,   212,   168,   166,    -1,   204,
-     165,   167,   168,   166,    -1,   204,    40,    -1,   204,    41,
-      -1,   204,   238,    -1,   204,   211,    -1,   204,    25,    -1,
-     176,     3,    -1,   176,     5,    -1,   176,     4,    -1,   176,
-       6,    -1,    11,    26,    -1,    11,    27,    -1,   177,     9,
-      -1,   173,   156,   210,    38,   204,   157,    -1,   119,   156,
-     210,   250,   157,    -1,   133,   156,   210,   159,   210,   159,
-     210,   157,    -1,   171,   156,   210,   159,   210,   157,    -1,
-     172,   156,   210,   159,   210,   157,    -1,    90,   174,   156,
-     210,   159,   210,   157,    -1,    91,   175,   156,   210,   159,
-     210,   157,    -1,    92,   174,   156,   210,   159,   210,   157,
-      -1,    93,   175,   156,   210,   159,   210,   157,    -1,   135,
-     156,   210,   159,   210,   157,    -1,   136,   156,   210,   159,
-     210,   159,   210,   157,    -1,   137,   156,   210,   159,   210,
-     159,   210,   157,    -1,   139,   156,   210,   251,   157,    -1,
-     140,   156,   210,   159,   210,   251,   157,    -1,   212,   159,
-     210,    -1,   210,    -1,    32,    -1,    33,    -1,    37,    -1,
-      -1,   206,   238,    -1,   125,   156,   215,    38,   204,   157,
-      -1,   217,    -1,    -1,   218,    -1,   217,   218,    -1,    -1,
-      31,   219,   234,    -1,    -1,    30,   220,   235,    -1,    60,
-      59,   224,    -1,   181,    18,   204,    -1,   181,    18,    10,
-      -1,    -1,   183,   187,   214,   213,   210,   180,   221,   201,
-      -1,    -1,   183,   185,   187,   214,   213,   210,   180,   222,
-     201,    -1,    -1,   183,   186,   187,   214,   213,   204,   180,
-     223,   201,    -1,   183,   187,    35,   190,   215,    -1,    52,
-     225,    -1,    56,   158,   226,    -1,    22,    -1,    53,   158,
-      22,    -1,    68,   158,    22,    -1,   162,   227,   164,    -1,
-     227,   159,    22,    -1,    22,    -1,    -1,   228,   159,   204,
-     193,   179,    -1,   204,   193,   179,    -1,   228,    -1,   228,
-     159,    39,    -1,    39,    -1,    -1,   191,   206,   182,   156,
-     229,   157,   195,   200,   197,   196,    -1,    28,    -1,   167,
-      -1,   189,   187,   230,   231,    -1,    29,    -1,   168,    -1,
-     242,   233,    -1,   188,   187,   230,    -1,    -1,    61,    -1,
+      17,    -1,    50,    -1,   204,    -1,   205,   181,   161,    -1,
+     239,    -1,   162,     4,    -1,   205,   157,   209,   158,   196,
+      -1,    10,   157,   209,   158,   196,    -1,   163,     4,   164,
+     205,   165,    -1,   166,     4,   164,   205,   167,    -1,   168,
+     210,   169,    -1,   168,   169,    -1,   166,   168,   210,   169,
+     167,    -1,   166,   168,   169,   167,    -1,   205,   194,    -1,
+     205,    -1,    10,    -1,   206,    -1,   208,   160,   206,    -1,
+     208,    -1,   208,   160,    39,    -1,    39,    -1,    -1,   205,
+      -1,   210,   160,   205,    -1,   205,   163,   213,   165,    -1,
+     205,   163,   165,    -1,   205,   170,    22,    -1,   205,   166,
+     213,   167,    -1,   205,   168,   213,   169,    -1,   205,   168,
+     169,    -1,   205,   166,   168,   213,   169,   167,    -1,   205,
+     166,   168,   169,   167,    -1,   205,    40,    -1,   205,    41,
+      -1,   205,   239,    -1,   205,   212,    -1,   205,    25,    -1,
+     177,     3,    -1,   177,     5,    -1,   177,     4,    -1,   177,
+       6,    -1,    11,    26,    -1,    11,    27,    -1,   178,     9,
+      -1,   174,   157,   211,    38,   205,   158,    -1,   120,   157,
+     211,   251,   158,    -1,   134,   157,   211,   160,   211,   160,
+     211,   158,    -1,   172,   157,   211,   160,   211,   158,    -1,
+     173,   157,   211,   160,   211,   158,    -1,    91,   175,   157,
+     211,   160,   211,   158,    -1,    92,   176,   157,   211,   160,
+     211,   158,    -1,    93,   175,   157,   211,   160,   211,   158,
+      -1,    94,   176,   157,   211,   160,   211,   158,    -1,   136,
+     157,   211,   160,   211,   158,    -1,   137,   157,   211,   160,
+     211,   160,   211,   158,    -1,   138,   157,   211,   160,   211,
+     160,   211,   158,    -1,   140,   157,   211,   252,   158,    -1,
+     141,   157,   211,   160,   211,   252,   158,    -1,   213,   160,
+     211,    -1,   211,    -1,    32,    -1,    33,    -1,    37,    -1,
+      -1,   207,   239,    -1,   126,   157,   216,    38,   205,   158,
+      -1,   218,    -1,    -1,   219,    -1,   218,   219,    -1,    -1,
+      31,   220,   235,    -1,    -1,    30,   221,   236,    -1,    61,
+      60,   225,    -1,   182,    18,   205,    -1,   182,    18,    10,
+      -1,    -1,   184,   188,   215,   214,   211,   181,   222,   202,
+      -1,    -1,   184,   186,   188,   215,   214,   211,   181,   223,
+     202,    -1,    -1,   184,   187,   188,   215,   214,   205,   181,
+     224,   202,    -1,   184,   188,    35,   191,   216,    -1,    52,
+     226,    -1,    57,   159,   227,    -1,    22,    -1,    53,   159,
+      22,    -1,    69,   159,    22,    -1,   163,   228,   165,    -1,
+     228,   160,    22,    -1,    22,    -1,    -1,   229,   160,   205,
+     194,   180,    -1,   205,   194,   180,    -1,   229,    -1,   229,
+     160,    39,    -1,    39,    -1,    -1,   192,   207,   183,   157,
+     230,   158,   196,   201,   198,   197,    -1,    28,    -1,   168,
+      -1,   190,   188,   231,   232,    -1,    29,    -1,   169,    -1,
+     243,   234,    -1,   189,   188,   231,    -1,    -1,    62,    -1,
        3,    -1,     4,    -1,     9,    -1,    26,    -1,    27,    -1,
-      40,    -1,    41,    -1,    25,    -1,   165,   212,   166,    -1,
-     162,   212,   164,    -1,   162,   164,    -1,   169,    22,    -1,
-     167,   212,   168,    -1,   167,   168,    -1,   165,   167,   212,
-     168,   166,    -1,   165,   167,   168,   166,    -1,   211,    -1,
-      59,   236,    22,   159,    22,    -1,     7,    -1,     8,    -1,
-     178,    -1,   182,    -1,   238,    -1,   237,    -1,   204,   239,
-      -1,   240,    -1,   241,   159,   240,    -1,   242,   243,    -1,
-     232,   243,    -1,   244,   181,   245,    -1,   244,   247,    -1,
-      -1,    21,    -1,    69,   241,    -1,    69,    10,    -1,    70,
-      17,   239,    -1,    70,    11,   239,   159,    17,   239,   159,
-      17,   239,    -1,    71,   176,   239,   159,    17,   239,   162,
-     246,   164,    -1,    71,   176,   239,   159,    17,   239,   162,
-     164,    -1,    72,   191,   206,   239,   156,   249,   157,   195,
-      38,    17,   239,    73,    17,   239,    -1,    73,    -1,    74,
-      -1,   246,   176,   237,   159,    17,   239,    -1,   176,   237,
-     159,    17,   239,    -1,   181,   253,    -1,   204,   162,   239,
-     159,   239,   164,    -1,   248,   159,   162,   239,   159,   239,
-     164,    -1,   204,   193,   239,   193,    -1,    17,   193,   239,
-     193,    -1,   249,   159,   204,   193,   239,   193,    -1,   249,
-     159,    17,   193,   239,   193,    -1,    -1,    -1,   250,   159,
-     240,    -1,   159,     4,    -1,   251,   159,     4,    -1,    58,
-      57,    -1,    57,    -1,   171,   204,   239,   159,   239,    -1,
-     172,   204,   239,   159,   239,    -1,    90,   174,   204,   239,
-     159,   239,    -1,    91,   175,   204,   239,   159,   239,    -1,
-      92,   174,   204,   239,   159,   239,    -1,    93,   175,   204,
-     239,   159,   239,    -1,   173,   240,    38,   204,    -1,   133,
-     240,   159,   240,   159,   240,    -1,   134,   240,   159,   204,
-      -1,   135,   240,   159,   240,    -1,   136,   240,   159,   240,
-     159,   240,    -1,   137,   240,   159,   240,   159,   240,    -1,
-     132,   248,    -1,   252,   191,   206,   239,   156,   249,   157,
-     195,    -1,   255,    -1,    36,    -1,    -1,   114,   204,   198,
-      -1,   114,   204,   159,    11,   239,   198,    -1,   115,   204,
-     198,    -1,   115,   204,   159,    11,   239,   198,    -1,   116,
-     240,    -1,   254,   117,   204,   239,   198,    -1,   254,   118,
-     240,   159,   204,   239,   198,    -1,   138,   204,   239,   159,
-       4,    -1,   119,   204,   239,   250,    -1,   139,   204,   239,
-     251,    -1,   140,   204,   239,   159,   204,   239,   251,    -1
+      40,    -1,    41,    -1,    25,    -1,   166,   213,   167,    -1,
+     163,   213,   165,    -1,   163,   165,    -1,   170,    22,    -1,
+     168,   213,   169,    -1,   168,   169,    -1,   166,   168,   213,
+     169,   167,    -1,   166,   168,   169,   167,    -1,   212,    -1,
+      60,   237,    22,   160,    22,    -1,     7,    -1,     8,    -1,
+     179,    -1,   183,    -1,   239,    -1,   238,    -1,   205,   240,
+      -1,   241,    -1,   242,   160,   241,    -1,   243,   244,    -1,
+     233,   244,    -1,   245,   182,   246,    -1,   245,   248,    -1,
+      -1,    56,    38,   240,    -1,   147,    -1,   147,    56,    38,
+     240,    -1,    21,    -1,    21,   147,    -1,    21,   147,    56,
+      38,   240,    -1,    70,   242,    -1,    70,    10,    -1,    71,
+      17,   240,    -1,    71,    11,   240,   160,    17,   240,   160,
+      17,   240,    -1,    72,   177,   240,   160,    17,   240,   163,
+     247,   165,    -1,    72,   177,   240,   160,    17,   240,   163,
+     165,    -1,    73,   192,   207,   240,   157,   250,   158,   196,
+      38,    17,   240,    74,    17,   240,    -1,    74,    -1,    75,
+      -1,   247,   177,   238,   160,    17,   240,    -1,   177,   238,
+     160,    17,   240,    -1,   182,   254,    -1,   205,   163,   240,
+     160,   240,   165,    -1,   249,   160,   163,   240,   160,   240,
+     165,    -1,   205,   194,   240,   194,    -1,    17,   194,   240,
+     194,    -1,   250,   160,   205,   194,   240,   194,    -1,   250,
+     160,    17,   194,   240,   194,    -1,    -1,    -1,   251,   160,
+     241,    -1,   160,     4,    -1,   252,   160,     4,    -1,    59,
+      58,    -1,    58,    -1,   172,   205,   240,   160,   240,    -1,
+     173,   205,   240,   160,   240,    -1,    91,   175,   205,   240,
+     160,   240,    -1,    92,   176,   205,   240,   160,   240,    -1,
+      93,   175,   205,   240,   160,   240,    -1,    94,   176,   205,
+     240,   160,   240,    -1,   174,   241,    38,   205,    -1,   134,
+     241,   160,   241,   160,   241,    -1,   135,   241,   160,   205,
+      -1,   136,   241,   160,   241,    -1,   137,   241,   160,   241,
+     160,   241,    -1,   138,   241,   160,   241,   160,   241,    -1,
+     133,   249,    -1,   253,   192,   207,   240,   157,   250,   158,
+     196,    -1,   256,    -1,    36,    -1,    -1,   115,   205,   199,
+      -1,   115,   205,   160,    11,   240,   199,    -1,   116,   205,
+     199,    -1,   116,   205,   160,    11,   240,   199,    -1,   117,
+     241,    -1,   255,   118,   205,   240,   199,    -1,   255,   119,
+     241,   160,   205,   240,   199,    -1,   139,   205,   240,   160,
+       4,    -1,   120,   205,   240,   251,    -1,   140,   205,   240,
+     252,    -1,   141,   205,   240,   160,   205,   240,   252,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -1879,13 +1883,13 @@
     2420,  2422,  2427,  2439,  2443,  2448,  2452,  2456,  2460,  2464,
     2468,  2472,  2476,  2480,  2502,  2524,  2530,  2543,  2555,  2560,
     2572,  2578,  2582,  2592,  2596,  2600,  2605,  2612,  2612,  2618,
-    2627,  2632,  2637,  2641,  2650,  2659,  2668,  2672,  2680,  2687,
-    2691,  2696,  2707,  2726,  2735,  2821,  2825,  2832,  2843,  2856,
-    2866,  2877,  2887,  2898,  2906,  2916,  2923,  2926,  2927,  2935,
-    2941,  2950,  2954,  2959,  2975,  2992,  3006,  3020,  3034,  3048,
-    3060,  3068,  3075,  3081,  3087,  3093,  3108,  3198,  3203,  3207,
-    3214,  3221,  3231,  3238,  3248,  3256,  3270,  3287,  3295,  3310,
-    3325
+    2627,  2632,  2637,  2641,  2650,  2659,  2668,  2672,  2677,  2682,
+    2688,  2693,  2699,  2708,  2715,  2719,  2724,  2735,  2754,  2763,
+    2849,  2853,  2860,  2871,  2884,  2894,  2905,  2915,  2926,  2934,
+    2944,  2951,  2954,  2955,  2963,  2969,  2978,  2982,  2987,  3003,
+    3020,  3034,  3048,  3062,  3076,  3088,  3096,  3103,  3109,  3115,
+    3121,  3136,  3226,  3231,  3235,  3242,  3249,  3259,  3266,  3276,
+    3284,  3298,  3315,  3323,  3338,  3353
 };
 #endif
 
@@ -1903,26 +1907,26 @@
   "CONSTANT", "SECTION", "ALIAS", "VOLATILE", "THREAD_LOCAL", "TO",
   "DOTDOTDOT", "NULL_TOK", "UNDEF", "INTERNAL", "LINKONCE", "WEAK",
   "APPENDING", "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "COMMON", "OPAQUE",
-  "EXTERNAL", "TARGET", "TRIPLE", "ALIGN", "ADDRSPACE", "DEPLIBS", "CALL",
-  "TAIL", "ASM_TOK", "MODULE", "SIDEEFFECT", "CC_TOK", "CCC_TOK",
-  "FASTCC_TOK", "COLDCC_TOK", "X86_STDCALLCC_TOK", "X86_FASTCALLCC_TOK",
-  "DATALAYOUT", "RET", "BR", "SWITCH", "INVOKE", "UNWIND", "UNREACHABLE",
-  "ADD", "SUB", "MUL", "UDIV", "SDIV", "FDIV", "UREM", "SREM", "FREM",
-  "AND", "OR", "XOR", "SHL", "LSHR", "ASHR", "ICMP", "FCMP", "VICMP",
-  "VFCMP", "EQ", "NE", "SLT", "SGT", "SLE", "SGE", "ULT", "UGT", "ULE",
-  "UGE", "OEQ", "ONE", "OLT", "OGT", "OLE", "OGE", "ORD", "UNO", "UEQ",
-  "UNE", "MALLOC", "ALLOCA", "FREE", "LOAD", "STORE", "GETELEMENTPTR",
-  "TRUNC", "ZEXT", "SEXT", "FPTRUNC", "FPEXT", "BITCAST", "UITOFP",
-  "SITOFP", "FPTOUI", "FPTOSI", "INTTOPTR", "PTRTOINT", "PHI_TOK",
-  "SELECT", "VAARG", "EXTRACTELEMENT", "INSERTELEMENT", "SHUFFLEVECTOR",
-  "GETRESULT", "EXTRACTVALUE", "INSERTVALUE", "SIGNEXT", "ZEROEXT",
-  "NORETURN", "INREG", "SRET", "NOUNWIND", "NOALIAS", "BYVAL", "NEST",
-  "READNONE", "READONLY", "GC", "DEFAULT", "HIDDEN", "PROTECTED", "'('",
-  "')'", "'='", "','", "'*'", "'\\\\'", "'['", "'x'", "']'", "'<'", "'>'",
-  "'{'", "'}'", "'c'", "$accept", "ArithmeticOps", "LogicalOps", "CastOps",
-  "IPredicates", "FPredicates", "IntType", "FPType", "LocalName",
-  "OptLocalName", "OptAddrSpace", "OptLocalAssign", "GlobalName",
-  "OptGlobalAssign", "GlobalAssign", "GVInternalLinkage",
+  "EXTERNAL", "TARGET", "TRIPLE", "ALIGN", "ADDRSPACE", "UNWINDS",
+  "DEPLIBS", "CALL", "TAIL", "ASM_TOK", "MODULE", "SIDEEFFECT", "CC_TOK",
+  "CCC_TOK", "FASTCC_TOK", "COLDCC_TOK", "X86_STDCALLCC_TOK",
+  "X86_FASTCALLCC_TOK", "DATALAYOUT", "RET", "BR", "SWITCH", "INVOKE",
+  "UNWIND", "UNREACHABLE", "ADD", "SUB", "MUL", "UDIV", "SDIV", "FDIV",
+  "UREM", "SREM", "FREM", "AND", "OR", "XOR", "SHL", "LSHR", "ASHR",
+  "ICMP", "FCMP", "VICMP", "VFCMP", "EQ", "NE", "SLT", "SGT", "SLE", "SGE",
+  "ULT", "UGT", "ULE", "UGE", "OEQ", "ONE", "OLT", "OGT", "OLE", "OGE",
+  "ORD", "UNO", "UEQ", "UNE", "MALLOC", "ALLOCA", "FREE", "LOAD", "STORE",
+  "GETELEMENTPTR", "TRUNC", "ZEXT", "SEXT", "FPTRUNC", "FPEXT", "BITCAST",
+  "UITOFP", "SITOFP", "FPTOUI", "FPTOSI", "INTTOPTR", "PTRTOINT",
+  "PHI_TOK", "SELECT", "VAARG", "EXTRACTELEMENT", "INSERTELEMENT",
+  "SHUFFLEVECTOR", "GETRESULT", "EXTRACTVALUE", "INSERTVALUE", "SIGNEXT",
+  "ZEROEXT", "NORETURN", "INREG", "SRET", "NOUNWIND", "NOALIAS", "BYVAL",
+  "NEST", "READNONE", "READONLY", "GC", "DEFAULT", "HIDDEN", "PROTECTED",
+  "'('", "')'", "'='", "','", "'*'", "'\\\\'", "'['", "'x'", "']'", "'<'",
+  "'>'", "'{'", "'}'", "'c'", "$accept", "ArithmeticOps", "LogicalOps",
+  "CastOps", "IPredicates", "FPredicates", "IntType", "FPType",
+  "LocalName", "OptLocalName", "OptAddrSpace", "OptLocalAssign",
+  "GlobalName", "OptGlobalAssign", "GlobalAssign", "GVInternalLinkage",
   "GVExternalLinkage", "GVVisibilityStyle", "FunctionDeclareLinkage",
   "FunctionDefineLinkage", "AliasLinkage", "OptCallingConv", "ParamAttr",
   "OptParamAttrs", "FuncAttr", "OptFuncAttrs", "OptGC", "OptAlign",
@@ -1962,49 +1966,50 @@
      375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
      385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
      395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-     405,   406,   407,   408,   409,   410,    40,    41,    61,    44,
-      42,    92,    91,   120,    93,    60,    62,   123,   125,    99
+     405,   406,   407,   408,   409,   410,   411,    40,    41,    61,
+      44,    42,    92,    91,   120,    93,    60,    62,   123,   125,
+      99
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
+static const yytype_uint16 yyr1[] =
 {
-       0,   170,   171,   171,   171,   171,   171,   171,   171,   171,
-     171,   172,   172,   172,   172,   172,   172,   173,   173,   173,
-     173,   173,   173,   173,   173,   173,   173,   173,   173,   174,
+       0,   171,   172,   172,   172,   172,   172,   172,   172,   172,
+     172,   173,   173,   173,   173,   173,   173,   174,   174,   174,
      174,   174,   174,   174,   174,   174,   174,   174,   174,   175,
-     175,   175,   175,   175,   175,   175,   175,   175,   175,   175,
-     175,   175,   175,   175,   175,   176,   177,   177,   177,   177,
-     177,   178,   178,   178,   179,   179,   180,   180,   181,   181,
-     182,   182,   183,   183,   184,   185,   185,   185,   185,   185,
-     185,   186,   186,   186,   187,   187,   187,   187,   188,   188,
-     188,   189,   189,   189,   189,   189,   190,   190,   190,   191,
-     191,   191,   191,   191,   191,   191,   192,   192,   192,   192,
-     192,   192,   192,   192,   192,   192,   193,   193,   194,   194,
-     194,   194,   194,   194,   195,   195,   196,   196,   197,   197,
-     198,   198,   199,   200,   200,   201,   201,   202,   202,   203,
-     203,   203,   203,   203,   203,   203,   204,   204,   204,   204,
-     204,   204,   204,   204,   204,   204,   204,   204,   204,   205,
-     206,   206,   207,   207,   208,   208,   208,   208,   209,   209,
-     210,   210,   210,   210,   210,   210,   210,   210,   210,   210,
-     210,   210,   210,   210,   210,   210,   210,   210,   210,   210,
+     175,   175,   175,   175,   175,   175,   175,   175,   175,   176,
+     176,   176,   176,   176,   176,   176,   176,   176,   176,   176,
+     176,   176,   176,   176,   176,   177,   178,   178,   178,   178,
+     178,   179,   179,   179,   180,   180,   181,   181,   182,   182,
+     183,   183,   184,   184,   185,   186,   186,   186,   186,   186,
+     186,   187,   187,   187,   188,   188,   188,   188,   189,   189,
+     189,   190,   190,   190,   190,   190,   191,   191,   191,   192,
+     192,   192,   192,   192,   192,   192,   193,   193,   193,   193,
+     193,   193,   193,   193,   193,   193,   194,   194,   195,   195,
+     195,   195,   195,   195,   196,   196,   197,   197,   198,   198,
+     199,   199,   200,   201,   201,   202,   202,   203,   203,   204,
+     204,   204,   204,   204,   204,   204,   205,   205,   205,   205,
+     205,   205,   205,   205,   205,   205,   205,   205,   205,   206,
+     207,   207,   208,   208,   209,   209,   209,   209,   210,   210,
      211,   211,   211,   211,   211,   211,   211,   211,   211,   211,
-     211,   211,   211,   211,   212,   212,   213,   213,   214,   214,
-     215,   215,   216,   216,   217,   217,   219,   218,   220,   218,
-     218,   218,   218,   221,   218,   222,   218,   223,   218,   218,
-     218,   218,   224,   225,   225,   226,   227,   227,   227,   228,
-     228,   229,   229,   229,   229,   230,   231,   231,   232,   233,
-     233,   234,   235,   236,   236,   237,   237,   237,   237,   237,
-     237,   237,   237,   237,   237,   237,   237,   237,   237,   237,
-     237,   237,   237,   238,   238,   238,   238,   239,   239,   240,
-     241,   241,   242,   242,   243,   244,   244,   244,   245,   245,
-     245,   245,   245,   245,   245,   245,   245,   246,   246,   247,
-     248,   248,   249,   249,   249,   249,   249,   250,   250,   251,
-     251,   252,   252,   253,   253,   253,   253,   253,   253,   253,
-     253,   253,   253,   253,   253,   253,   253,   253,   254,   254,
-     255,   255,   255,   255,   255,   255,   255,   255,   255,   255,
-     255
+     211,   211,   211,   211,   211,   211,   211,   211,   211,   211,
+     212,   212,   212,   212,   212,   212,   212,   212,   212,   212,
+     212,   212,   212,   212,   213,   213,   214,   214,   215,   215,
+     216,   216,   217,   217,   218,   218,   220,   219,   221,   219,
+     219,   219,   219,   222,   219,   223,   219,   224,   219,   219,
+     219,   219,   225,   226,   226,   227,   228,   228,   228,   229,
+     229,   230,   230,   230,   230,   231,   232,   232,   233,   234,
+     234,   235,   236,   237,   237,   238,   238,   238,   238,   238,
+     238,   238,   238,   238,   238,   238,   238,   238,   238,   238,
+     238,   238,   238,   239,   239,   239,   239,   240,   240,   241,
+     242,   242,   243,   243,   244,   245,   245,   245,   245,   245,
+     245,   245,   245,   246,   246,   246,   246,   246,   246,   246,
+     246,   246,   247,   247,   248,   249,   249,   250,   250,   250,
+     250,   250,   251,   251,   252,   252,   253,   253,   254,   254,
+     254,   254,   254,   254,   254,   254,   254,   254,   254,   254,
+     254,   254,   254,   255,   255,   256,   256,   256,   256,   256,
+     256,   256,   256,   256,   256,   256
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -2038,13 +2043,13 @@
        1,     2,     3,     0,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     3,     3,     2,     2,     3,     2,     5,
        4,     1,     5,     1,     1,     1,     1,     1,     1,     2,
-       1,     3,     2,     2,     3,     2,     0,     1,     2,     2,
-       3,     9,     9,     8,    14,     1,     1,     6,     5,     2,
-       6,     7,     4,     4,     6,     6,     0,     0,     3,     2,
-       3,     2,     1,     5,     5,     6,     6,     6,     6,     4,
-       6,     4,     4,     6,     6,     2,     8,     1,     1,     0,
-       3,     6,     3,     6,     2,     5,     7,     5,     4,     4,
-       7
+       1,     3,     2,     2,     3,     2,     0,     3,     1,     4,
+       1,     2,     5,     2,     2,     3,     9,     9,     8,    14,
+       1,     1,     6,     5,     2,     6,     7,     4,     4,     6,
+       6,     0,     0,     3,     2,     3,     2,     1,     5,     5,
+       6,     6,     6,     6,     4,     6,     4,     4,     6,     6,
+       2,     8,     1,     1,     0,     3,     6,     3,     6,     2,
+       5,     7,     5,     4,     4,     7
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -2061,172 +2066,174 @@
      238,   231,   232,   220,   273,   274,   222,   139,   140,   141,
      144,   143,   142,   145,   146,     0,     0,     0,     0,   275,
      276,   147,   221,   149,   209,   209,    96,   208,     0,    99,
-      99,   287,   283,    69,   249,   250,   251,   282,   233,   234,
-     237,     0,   167,   150,     0,     0,     0,     0,   156,   168,
-       0,     0,   167,     0,     0,     0,    98,    97,     0,   206,
-     207,     0,     0,   100,   101,   102,   103,   104,     0,   252,
-       0,   329,   285,     0,   235,   166,   116,   162,   164,     0,
-       0,     0,     0,     0,     0,   155,     0,     0,   148,     0,
-       0,   161,     0,   160,     0,   229,   139,   140,   141,   144,
-     143,   142,     0,     0,    67,    67,   105,     0,   246,   247,
-     248,   328,   312,     0,     0,     0,     0,    99,   295,   296,
-       2,     3,     4,     5,     6,     7,     8,     9,    10,    14,
-      15,    16,    11,    12,    13,     0,     0,     0,     0,     0,
-       0,     0,     0,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   284,    99,   299,
-       0,   327,   236,   159,     0,   124,    67,    67,   158,     0,
-     169,     0,   124,    67,    67,     0,   210,   187,   188,   183,
-     185,   184,   186,   189,   182,   178,   179,     0,     0,     0,
+      99,   290,     0,   288,   283,    69,   249,   250,   251,   282,
+     233,   234,   237,     0,   167,   150,     0,     0,     0,     0,
+     156,   168,     0,     0,   167,     0,     0,     0,    98,    97,
+       0,   206,   207,     0,     0,   100,   101,   102,   103,   104,
+       0,   252,     0,   291,     0,     0,   334,   285,     0,   235,
+     166,   116,   162,   164,     0,     0,     0,     0,     0,     0,
+     155,     0,     0,   148,     0,     0,   161,     0,   160,     0,
+     229,   139,   140,   141,   144,   143,   142,     0,     0,    67,
+      67,   105,     0,   246,   247,   248,     0,   255,   256,   257,
+     262,   258,   259,   260,   261,   253,     2,     3,     4,     5,
+       6,     7,     8,     9,    10,    14,    15,    16,    11,    12,
+      13,     0,     0,     0,     0,     0,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,    27,    28,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   271,   278,   277,   287,     0,   333,   317,     0,     0,
+       0,     0,    99,   300,   301,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   181,   180,   223,     0,   311,
-     289,    67,   280,   288,     0,     0,    55,     0,     0,    29,
-      30,    31,    32,    33,    34,    35,    36,    37,    38,     0,
-      53,    54,    49,    50,    51,    52,    39,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,     0,     0,     0,   130,
-     130,   334,    67,    67,   325,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   284,    99,   304,     0,   332,
+     236,   159,     0,   124,    67,    67,   158,     0,   169,     0,
+     124,    67,    67,     0,   210,   187,   188,   183,   185,   184,
+     186,   189,   182,   178,   179,     0,     0,     0,     0,   181,
+     180,   223,     0,     0,   254,     0,    29,    30,    31,    32,
+      33,    34,    35,    36,    37,    38,     0,    53,    54,    49,
+      50,    51,    52,    39,    40,    41,    42,    43,    44,    45,
+      46,    47,    48,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   265,   205,     0,     0,     0,   268,     0,
+     266,     0,     0,     0,   289,   316,   294,    67,   280,   293,
+       0,     0,    55,     0,     0,     0,     0,     0,     0,   130,
+     130,   339,    67,    67,   330,     0,     0,     0,     0,     0,
       67,    67,    67,    67,    67,     0,     0,     0,     0,     0,
      107,   109,   108,   106,   110,   111,   112,   113,   114,   117,
      165,   163,   152,   153,   154,   157,    66,   151,   225,   227,
+       0,   171,     0,     0,     0,   175,     0,   172,   135,   244,
+     292,     0,     0,     0,     0,     0,   312,     0,     0,     0,
+       0,     0,     0,     0,   264,   156,   168,     0,   263,   267,
+       0,     0,     0,   279,     0,     0,   295,     0,     0,    67,
+      67,    67,    67,     0,   335,     0,   337,   312,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   171,   205,     0,     0,     0,   175,     0,   172,
-       0,     0,     0,   135,   244,   255,   256,   257,   262,   258,
-     259,   260,   261,   253,     0,     0,     0,     0,   271,   278,
-     277,   279,     0,     0,   290,     0,     0,    67,    67,    67,
-      67,     0,   330,     0,   332,   307,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      67,     0,   115,   121,   120,   118,   119,   122,   123,   125,
-     135,   135,     0,     0,     0,     0,     0,   307,     0,     0,
-       0,     0,     0,     0,     0,   170,   156,   168,     0,   173,
-     174,     0,     0,     0,     0,   224,   243,   116,   241,     0,
-     254,     0,   265,     0,     0,     0,   268,     0,   266,   281,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     338,     0,     0,     0,   321,   322,     0,     0,     0,     0,
-     339,     0,     0,     0,   319,     0,   130,     0,   226,   228,
-      67,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   204,   177,     0,     0,     0,     0,     0,     0,
-     137,   135,    65,     0,   124,     0,   264,   156,     0,   263,
-     267,     0,     0,   306,     0,     0,     0,     0,   130,   131,
-     130,     0,     0,     0,     0,     0,     0,   337,   309,     0,
-      67,   313,   314,   306,     0,   335,    67,   211,     0,     0,
-       0,     0,   191,     0,     0,     0,     0,   202,     0,   176,
-       0,     0,    67,   132,   138,   136,    64,   240,   242,   116,
-     133,     0,   270,     0,     0,     0,   116,   116,     0,   315,
-     316,   317,   318,   331,   333,   308,     0,     0,   320,   323,
-     324,   310,     0,     0,   130,     0,     0,     0,     0,     0,
-     199,     0,     0,     0,   193,   194,   190,    65,   134,   128,
-     272,   269,     0,     0,     0,     0,   124,     0,   300,     0,
-     340,   124,   336,   195,   196,   197,   198,     0,     0,     0,
-     203,   239,     0,   126,     0,   293,     0,     0,   107,   109,
-     116,   116,     0,   116,   116,   301,   326,   192,   200,   201,
-     129,     0,   245,   291,     0,   292,     0,   303,   302,     0,
-       0,     0,   127,     0,     0,     0,   116,   116,     0,     0,
-       0,   305,   304,   298,     0,     0,   297,     0,   294
+       0,     0,    67,     0,   115,   121,   120,   118,   119,   122,
+     123,   125,   135,   135,     0,   170,   156,     0,   173,   174,
+       0,   224,   243,   116,   241,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   204,
+     270,     0,     0,     0,     0,   281,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   343,     0,     0,     0,
+     326,   327,     0,     0,     0,   344,     0,     0,     0,   324,
+       0,   130,     0,   226,   228,    67,   177,     0,     0,     0,
+     137,   135,    65,     0,   124,   272,     0,     0,     0,     0,
+     191,     0,     0,     0,     0,     0,   314,   202,     0,     0,
+     269,     0,     0,    67,     0,     0,   311,     0,     0,     0,
+       0,   130,   131,   130,     0,     0,     0,     0,     0,   342,
+      67,   318,   319,   311,     0,   340,    67,   211,   176,   132,
+     138,   136,    64,   240,   242,   116,   133,     0,     0,     0,
+       0,   313,     0,   199,     0,     0,   315,     0,   193,   194,
+     190,     0,     0,   116,   116,     0,   320,   321,   322,   323,
+     336,   338,     0,     0,   325,   328,   329,     0,     0,   130,
+      65,   134,   128,   195,   196,   197,   198,     0,     0,     0,
+     203,     0,     0,     0,     0,   124,     0,   305,     0,   345,
+     124,   341,   239,     0,   126,   192,   200,   201,     0,   298,
+       0,     0,   107,   109,   116,   116,     0,   116,   116,   306,
+     331,   129,     0,   245,   296,     0,   297,     0,   308,   307,
+       0,     0,     0,   127,     0,     0,     0,   116,   116,     0,
+       0,     0,   310,   309,   303,     0,     0,   302,     0,   299
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,   272,   273,   274,   299,   316,   162,   163,    79,   587,
-     113,    12,    80,    14,    15,    41,    42,    43,    48,    54,
-     118,   128,   349,   233,   439,   352,   672,   653,   412,   530,
-     629,   465,   531,    81,   164,   137,   154,   138,   139,   110,
-     373,   398,   374,   121,    88,   155,    16,    17,    18,    20,
-      19,   383,   440,   441,    63,    23,    61,   101,   468,   469,
-     129,   170,    55,    96,    56,    49,   471,   399,    83,   401,
-     282,   283,    57,    92,    93,   227,   657,   132,   324,   598,
-     490,   500,   228,   229,   230,   231
+      -1,   228,   229,   230,   316,   333,   167,   168,    79,   603,
+     115,    12,    80,    14,    15,    41,    42,    43,    48,    54,
+     120,   130,   399,   271,   481,   402,   683,   664,   454,   550,
+     642,   491,   551,    81,   169,   142,   159,   143,   144,   112,
+     344,   231,   345,   123,    88,   160,    16,    17,    18,    20,
+      19,   418,   482,   483,    63,    23,    61,   103,   494,   495,
+     131,   175,    55,    98,    56,    49,   305,   232,    83,   234,
+     358,   359,    57,    94,    95,   265,   671,   137,   374,   625,
+     501,   507,   266,   267,   268,   269
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -622
+#define YYPACT_NINF -605
 static const yytype_int16 yypact[] =
 {
-     805,  -622,  -622,  -622,  -622,  -622,  -622,  -622,    -6,  -112,
-      23,   -97,    91,   -94,    24,  -622,   126,  1385,  -622,   135,
-     257,    48,    77,  -622,     3,   216,  -622,  1807,  -622,  -622,
-    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
-    -622,    49,    49,   187,  -622,  -622,  -622,  -622,    49,  -622,
-    -622,  -622,  -622,  -622,    49,   218,  -622,    16,   220,   239,
-     243,  -622,  -622,  -622,  -622,  -622,   110,  -622,  -622,  -622,
-    -622,  -622,  -622,  -622,  -622,   267,   271,     1,   691,  -622,
-    -622,  -622,   -28,  -622,   246,   246,   206,  -622,    46,   215,
-     215,  -622,  -622,   343,  -622,  -622,  -622,  -622,  -622,  -622,
-    -622,   -59,  1537,  -622,   121,   130,   880,   110,  -622,   -28,
-    -110,   138,  1537,   142,    46,    46,  -622,  -622,  1555,  -622,
-    -622,  1830,   302,  -622,  -622,  -622,  -622,  -622,  1848,  -622,
-     -14,  2199,  -622,   293,  -622,  -622,   -28,  -622,   160,   165,
-    1877,  1877,   168,  -103,  1877,  -622,   334,   189,  -622,  1830,
-    1877,   110,   191,   -28,   221,  -622,    85,   341,   342,   345,
-     354,   355,   323,   360,  1373,   315,  -622,    28,  -622,  -622,
-    -622,  -622,  -622,   316,  1921,    42,   361,   215,  -622,  -622,
-    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
-    -622,  -622,  -622,  -622,  -622,   393,   529,   393,   529,  1877,
-    1877,  1877,  1877,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
-    -622,  -622,  -622,  -622,  -622,  1877,  1877,  1877,  1877,  1877,
-    1877,  1877,  1877,  1877,  1877,  1877,  1877,  -622,   215,  -622,
-      70,  -622,  -622,   176,  1578,  -622,   -39,   -46,  -622,   208,
-     -28,   223,  -622,   315,     5,  1555,  -622,  -622,  -622,  -622,
-    -622,  -622,  -622,  -622,  -622,  -622,  -622,   393,   529,   393,
-     529,   219,   227,   228,   234,   235,   241,   242,  1596,  2009,
-     993,   356,   244,   245,   251,  -622,  -622,  -622,   254,  -622,
-     110,   792,  -622,   240,   943,   943,  -622,   943,  1848,  -622,
-    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  1877,
-    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
-    -622,  -622,  -622,  -622,  -622,  -622,  1877,  1877,  1877,    26,
-      58,  -622,   792,   -35,   252,   256,   258,   259,   260,   263,
-     792,   792,   792,   792,   792,   389,  1848,  1877,  1877,   375,
-    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
-    -622,  -622,   202,  -622,  -622,  -622,  -622,   202,  -622,   142,
-     390,   273,   274,   276,   277,  1830,  1830,  1830,  1830,  1830,
-    1830,  1830,  -622,  -622,    57,  1268,   -82,  -622,   -64,  -622,
-    1830,  1830,  1830,   275,  1628,  -622,  -622,  -622,  -622,  -622,
-    -622,  -622,  -622,   374,  1757,  2041,  1313,   414,  -622,  -622,
-    -622,  -622,  1877,   278,  -622,   279,   943,   792,   792,   792,
-     792,    31,  -622,    33,  -622,  -622,   943,   280,  1877,  1877,
-    1877,  1877,  1877,   281,   282,   284,   285,   287,  1877,   943,
-     792,   288,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
-     275,   275,  1877,  1830,  1830,  1830,  1830,  -622,   290,   291,
-     292,   294,   282,   295,  1830,  -622,   286,  1222,   -62,  -622,
-    -622,   301,   307,   429,    20,  -622,  -622,   -28,   309,   312,
-    -622,   448,  -622,    87,  1508,   -10,  -622,   -61,  -622,  -622,
-     455,   456,   318,   317,   319,   320,   321,   943,   473,   943,
-     338,   339,   943,   340,   -28,  -622,   344,   346,   478,   496,
-     351,  1877,   943,   943,   -28,   348,   352,  1877,  -622,  -622,
-      -5,   353,   357,   359,   362,   115,  1830,  1830,  1830,  1830,
-     146,  1830,  -622,  -622,   336,  1830,  1830,  1877,   493,   515,
-    -622,   275,   530,  1789,  -622,   363,  -622,   358,   -60,  -622,
-    -622,   943,   943,  2082,   943,   943,   943,   943,   352,  -622,
-     352,  1877,   943,   364,  1877,  1877,  1877,  -622,  -622,   516,
-     792,  -622,  -622,  2082,   472,  -622,   792,  -622,  1830,  1830,
-    1830,  1830,  -622,   368,   377,   372,   376,  -622,   282,  -622,
-     379,   381,     2,  -622,  -622,  -622,  -622,  -622,  -622,   -28,
-       4,   517,  -622,   380,   382,   378,   -16,   -28,   157,  -622,
-    -622,  -622,  -622,  -622,  -622,  -622,   384,   943,  -622,  -622,
-    -622,  -622,   282,   178,   352,   386,   388,   394,   396,  1830,
-    -622,  1830,  1830,   198,  -622,  -622,  -622,   530,  -622,   507,
-    -622,  -622,   533,    -7,   641,   641,  -622,  2100,  -622,   398,
-     351,  -622,  -622,  -622,  -622,  -622,  -622,   406,   408,   409,
-    -622,  -622,   564,   417,   943,  -622,  1088,     7,   415,   416,
-    -622,  -622,   -12,   -16,   -28,  -622,   202,  -622,  -622,  -622,
-    -622,   548,  -622,  -622,   418,  -622,  1088,   176,   176,   557,
-     641,   641,  -622,   558,   419,   943,  -622,  -622,   943,   562,
-     508,   176,   176,  -622,   943,   563,  -622,   943,  -622
+     502,  -605,  -605,  -605,  -605,  -605,  -605,  -605,    16,   -84,
+     -13,   -50,    95,   -42,    93,  -605,    60,   852,  -605,    80,
+     168,   -25,   -16,  -605,     1,   162,  -605,  1800,  -605,  -605,
+    -605,  -605,  -605,  -605,  -605,  -605,  -605,  -605,  -605,  -605,
+    -605,   176,   176,   330,  -605,  -605,  -605,  -605,   176,  -605,
+    -605,  -605,  -605,  -605,   176,    35,  -605,    34,   174,   182,
+     196,  -605,  -605,  -605,  -605,  -605,    65,  -605,  -605,  -605,
+    -605,  -605,  -605,  -605,  -605,   247,   256,     3,    17,  -605,
+    -605,  -605,    38,  -605,   226,   226,   332,  -605,   159,   361,
+     361,   119,   259,   254,  -605,   245,  -605,  -605,  -605,  -605,
+    -605,  -605,  -605,     8,   776,  -605,   149,   158,   143,    65,
+    -605,    38,   -95,   180,   776,   187,   159,   159,  -605,  -605,
+    1080,  -605,  -605,  1818,   329,  -605,  -605,  -605,  -605,  -605,
+    1841,  -605,     7,   310,  1143,   339,  2202,  -605,   364,  -605,
+    -605,    38,  -605,   223,   239,  1921,  1921,   242,   -62,  1921,
+    -605,   410,   263,  -605,  1818,  1921,    65,   260,    38,   327,
+    -605,    45,   411,   421,   430,   431,   434,   367,   437,  1576,
+     398,  -605,    53,  -605,  -605,  -605,   417,  -605,  -605,  -605,
+    -605,  -605,  -605,  -605,  -605,   394,  -605,  -605,  -605,  -605,
+    -605,  -605,  -605,  -605,  -605,  -605,  -605,  -605,  -605,  -605,
+    -605,   706,   650,   706,   650,   300,  -605,  -605,  -605,  -605,
+    -605,  -605,  -605,  -605,  -605,  -605,  -605,  -605,   306,   307,
+     308,   314,   315,   316,  1470,  2003,   279,   452,   318,   320,
+     321,  -605,  -605,  -605,  -605,  1143,  -605,  -605,   422,  2021,
+     116,   470,   361,  -605,  -605,   706,   650,   706,   650,  1921,
+    1921,  1921,  1921,  1921,  1921,  1921,  1921,  1921,  1921,  1921,
+    1921,  1921,  1921,  1921,  1921,  -605,   361,  -605,   234,  -605,
+    -605,   512,  1518,  -605,     4,    31,  -605,   317,    38,   324,
+    -605,   398,    15,  1080,  -605,  -605,  -605,  -605,  -605,  -605,
+    -605,  -605,  -605,  -605,  -605,  1712,  2044,   484,   461,  -605,
+    -605,  -605,   328,  1143,  -605,   464,  -605,  -605,  -605,  -605,
+    -605,  -605,  -605,  -605,  -605,  -605,   336,  -605,  -605,  -605,
+    -605,  -605,  -605,  -605,  -605,  -605,  -605,  -605,  -605,  -605,
+    -605,  -605,  -605,   348,   352,   354,  1818,  1818,  1818,  1818,
+    1818,  1818,  1818,  -605,  -605,   113,   562,   -99,  -605,   -61,
+    -605,  1818,  1818,  1818,  -605,  -605,    65,   991,  -605,   353,
+    1143,  1143,  -605,  1143,  1841,  1921,  1921,  1921,  1921,   147,
+     262,  -605,   991,    37,   359,   363,   368,   369,   370,   371,
+     991,   991,   991,   991,   991,   449,  1841,  1921,  1921,   508,
+    -605,  -605,  -605,  -605,  -605,  -605,  -605,  -605,  -605,  -605,
+    -605,  -605,   133,  -605,  -605,  -605,  -605,   133,  -605,   187,
+     476,  -605,   123,   726,   -46,  -605,   -59,  -605,   376,  1741,
+    -605,   377,  1818,  1818,  1818,  1818,  -605,   378,   379,   380,
+     382,   384,   385,  1818,  -605,   381,  1424,   -45,  -605,  -605,
+     389,   391,   515,  -605,  1921,   397,  -605,   404,  1143,   991,
+     991,   991,   991,    42,  -605,    43,  -605,  -605,  1143,   395,
+    1921,  1921,  1921,  1921,  1921,   405,   384,   408,   420,   423,
+    1921,  1143,   991,   427,  -605,  -605,  -605,  -605,  -605,  -605,
+    -605,  -605,   376,   376,  1921,  -605,   424,   -44,  -605,  -605,
+      30,  -605,  -605,    38,   428,   413,   567,   439,   440,   443,
+     446,   224,  1818,  1818,  1818,  1818,   586,   252,  1818,  -605,
+    -605,   442,  1818,  1818,  1921,  -605,   577,   593,   454,   453,
+     455,   457,   458,  1143,   615,  1143,   460,   462,  1143,   463,
+      38,  -605,   469,   471,   617,   472,  1921,  1143,  1143,    38,
+     479,   473,  1921,  -605,  -605,   -11,  -605,   474,   616,   633,
+    -605,   376,   246,  1759,  -605,  -605,  1818,  1818,  1818,  1818,
+    -605,  1921,   482,   481,   483,   485,  -605,  -605,   640,   384,
+    -605,   490,   491,    -9,  1143,  1143,  2085,  1143,  1143,  1143,
+    1143,   473,  -605,   473,  1143,   496,  1921,  1921,  1921,  -605,
+     991,  -605,  -605,  2085,   605,  -605,   991,  -605,  -605,  -605,
+    -605,  -605,  -605,  -605,  -605,    38,   172,   505,   506,   507,
+     509,  -605,  1818,  -605,  1818,  1818,  -605,   273,  -605,  -605,
+    -605,   510,   503,    48,    38,   291,  -605,  -605,  -605,  -605,
+    -605,  -605,   504,  1143,  -605,  -605,  -605,   384,   292,   473,
+     246,  -605,   614,  -605,  -605,  -605,  -605,   516,   517,   520,
+    -605,   656,     5,   839,   839,  -605,  2103,  -605,   514,   472,
+    -605,  -605,  -605,   676,   528,  -605,  -605,  -605,  1143,  -605,
+    1289,    11,   525,   526,  -605,  -605,   212,    48,    38,  -605,
+     133,  -605,   662,  -605,  -605,   527,  -605,  1289,   512,   512,
+     668,   839,   839,  -605,   671,   529,  1143,  -605,  -605,  1143,
+     673,   623,   512,   512,  -605,  1143,   674,  -605,  1143,  -605
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -622,   451,   452,   454,  -163,  -157,  -174,  -622,     0,   -41,
-    -102,   494,    13,  -622,  -622,  -622,  -622,   222,  -622,  -622,
-    -622,  -145,  -622,  -427,  -622,  -227,  -622,  -622,  -301,    -2,
-    -622,  -412,  -622,  -622,   -26,   369,  -116,  -622,   477,   484,
-    -113,  -161,  -259,     8,   147,   347,  -622,  -622,   574,  -622,
-    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
-     503,  -622,  -622,  -622,  -622,  -622,  -622,  -621,  -121,    55,
-    -195,  -622,  -622,   537,  -622,  -622,  -622,  -622,  -622,    32,
-     151,  -445,  -622,  -622,  -622,  -622
+    -605,   563,   564,   565,  -158,  -146,  -239,  -605,     0,    58,
+    -150,   608,     6,  -605,  -605,  -605,  -605,    64,  -605,  -605,
+    -605,  -204,  -605,  -416,  -605,  -275,  -605,  -605,  -367,    98,
+    -605,  -440,  -605,  -605,   -26,   433,  -112,  -605,   592,   599,
+     -97,  -165,  -216,   241,   319,   425,  -605,  -605,   694,  -605,
+    -605,  -605,  -605,  -605,  -605,  -605,  -605,  -605,  -605,  -605,
+     622,  -605,  -605,  -605,  -605,  -605,  -605,  -604,    18,   244,
+    -243,  -605,  -605,   661,  -605,  -605,  -605,  -605,  -605,   120,
+     264,  -447,  -605,  -605,  -605,  -605
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -2236,554 +2243,557 @@
 #define YYTABLE_NINF -214
 static const yytype_int16 yytable[] =
 {
-      11,    82,   287,   275,   286,   105,   321,   520,   165,   111,
-     376,   378,   167,    13,   168,   357,   111,    11,   286,   414,
-     111,   325,   326,   327,   328,   329,   679,   111,   508,   509,
-      13,   335,   288,   246,   317,   674,   243,    91,   528,  -145,
-     532,   318,   487,   276,   489,    94,    24,    21,     2,   144,
-     111,     4,   109,   284,   528,   684,   144,   111,   145,   285,
-     111,    26,    22,   277,    28,   239,    29,    30,    31,    32,
-      33,    34,    35,    36,   529,    37,   136,   454,   119,   120,
-     109,   111,    25,   336,   459,   488,   136,   488,   -55,   -55,
-     -55,   -55,   153,    11,   361,   454,   363,   454,   454,   454,
-     133,   362,   153,   364,   460,   134,   524,   540,   593,    27,
-     112,   247,   248,   111,   236,   237,   458,   112,   240,   585,
-     354,   112,   149,   150,   244,   353,    44,   416,   112,   433,
-     434,   435,   -67,   623,   436,   473,   475,   477,   437,   438,
-    -145,   358,   359,   431,  -145,   433,   434,   435,   281,   454,
-     436,   112,   567,   169,   437,   438,   539,   655,   112,   626,
-     400,   112,   627,   400,   400,    60,   400,   640,   106,   634,
-     635,   675,   406,   319,   320,   281,   322,    38,    39,    40,
-     278,    46,   112,    47,    95,   411,   -67,   337,   338,   323,
-     281,   281,   281,   281,   281,   330,   331,   332,   333,   334,
-     281,   400,    38,    39,    40,   565,    58,   479,   136,   400,
-     400,   400,   400,   400,   112,   538,   454,   413,   -67,   153,
-     429,   455,    86,   493,    87,   495,   496,   497,    64,    65,
-     339,   114,   115,   677,   678,    59,   680,   681,    62,    91,
-       1,     2,    98,     3,     4,     5,   454,   603,   116,   604,
-     117,   536,   447,   448,   449,   450,   451,   452,   453,   691,
-     692,    99,   153,    84,    85,   100,   102,   461,   462,   463,
-      89,   103,   572,   407,   551,   104,    90,   122,   123,   124,
-     125,   126,   127,    87,   140,   400,   400,   400,   400,   400,
-     408,   409,   410,   141,   146,   400,   275,   340,   341,    50,
-      51,    52,   148,   577,    53,   559,   166,   590,   400,   400,
-     153,   430,   281,   642,   636,   232,   637,   342,   343,   234,
-     344,   345,   235,   346,   347,   348,   249,   250,   251,   252,
-     511,   512,   513,   514,   238,   641,   276,   637,   241,   403,
-     404,   522,   405,   433,   434,   435,   242,   245,   436,   457,
-     -56,   -57,   437,   438,   -60,   650,   605,   559,   467,   608,
-     609,   610,     1,   -59,   -58,     3,   400,     5,   400,   253,
-     111,   400,   286,   279,   355,   365,   281,   415,   379,   432,
-     356,   400,   400,   366,   367,   423,   424,   425,   426,   427,
-     368,   369,   281,   494,   281,   281,   281,   370,   371,   402,
-     380,   381,   504,   573,   574,   575,   576,   382,   578,   662,
-     384,   417,   580,   581,   666,   418,   510,   419,   420,   421,
-     400,   400,   422,   400,   400,   400,   400,   428,   442,   443,
-     444,   400,   445,   446,   464,   470,   478,   480,   481,   400,
-     498,   499,   492,   501,   502,   400,   503,   507,   457,   516,
-     517,   518,   523,   519,   521,   615,   616,   617,   618,   656,
-     525,   482,   483,   484,   485,   486,   526,   527,   533,   534,
-     535,   491,   541,   542,   543,   560,   544,   549,   545,   546,
-     547,   566,   557,   676,   505,   506,   400,   289,   290,   291,
-     292,   293,   294,   295,   296,   297,   298,   551,   552,   554,
-     558,   582,   579,   555,   563,   556,   647,   589,   648,   649,
-     559,   564,   568,   400,   400,   583,   569,   597,   570,   584,
-     611,   571,   591,   607,   592,   281,   488,   619,   281,   281,
-     281,   621,   586,   400,   620,   622,   624,   597,   625,   630,
-     633,   632,   548,   643,   550,   644,   631,   553,   638,     1,
-     654,   645,     3,   646,     5,   300,   301,   561,   562,   400,
-     400,   652,   665,   667,   400,   668,   669,   400,   670,   671,
-     682,   -18,   -19,   400,   685,   688,   400,   683,   689,   694,
-     697,   695,   224,   225,   339,   226,   651,   131,   628,   147,
-     143,    45,   360,   130,    97,   613,   594,   595,   515,   599,
-     600,   601,   602,   351,     0,     0,     0,   606,     0,     0,
-       0,   664,     0,     0,     0,   612,     0,     0,     0,     0,
-       0,   614,     0,     0,     0,     0,     0,   586,     0,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,   315,     0,   385,   386,     0,     0,    64,    65,
-     387,   340,   341,     0,     0,     0,     0,     0,     0,     0,
-       1,     2,   639,     3,     4,     5,   388,   389,   390,     0,
-       0,   342,   343,     0,   344,   345,     0,   346,   347,   348,
-       0,   391,   392,     0,     0,     0,     0,     0,     0,   660,
-     661,     0,     0,     0,     0,   339,     0,     0,    64,    65,
-     393,   107,    67,    68,    69,    70,    71,    72,    73,   673,
-       1,     2,     0,     3,     4,     5,   180,   181,   182,   183,
-     184,   185,   186,   187,   188,   189,   190,   191,   192,   193,
-     194,   257,   258,   259,   260,   686,   687,     0,     0,     0,
-     690,    74,     0,   693,     0,     0,     0,     0,     0,   696,
-       0,     0,   698,     0,     0,     0,     0,     0,     0,     0,
-     261,   203,   658,   659,   206,   207,   208,   209,   210,   211,
-     212,   213,   214,     0,   262,     0,   263,   264,   265,     0,
-     266,   267,   342,   343,     0,   344,   345,     0,   346,   347,
-     348,     0,     0,     0,     0,   385,   386,     0,     0,    64,
-      65,   387,     0,   394,     0,  -213,   395,     0,   396,     0,
-     397,     1,     2,     0,     3,     4,     5,   388,   389,   390,
-       0,     0,     0,   -69,     1,     2,     0,     3,     4,     5,
-       0,     0,   391,   392,     0,     6,     7,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   111,     0,     0,
-       0,   393,    75,    76,     0,     0,    77,     8,    78,   108,
-       0,     9,     0,     0,     0,    10,     0,   180,   181,   182,
-     183,   184,   185,   186,   187,   188,   189,   190,   191,   192,
-     193,   194,   257,   258,   259,   260,     0,    64,    65,     0,
-     107,    67,    68,    69,    70,    71,    72,    73,     0,     1,
+      11,    82,   363,   456,   299,   407,    13,   107,   371,   347,
+     349,   375,   376,   377,   378,   379,   362,    11,   172,   535,
+     301,   385,   362,    13,    64,    65,   170,   109,    67,    68,
+      69,    70,    71,    72,    73,   173,     1,     2,   364,     3,
+       4,     5,   543,   544,   113,   334,   113,    25,   -55,   -55,
+     -55,   -55,   111,   523,   525,    91,    91,   281,   335,   113,
+      44,   433,   386,    96,   548,   149,   685,    74,   438,    21,
+     113,   285,   286,     2,   150,    24,     4,   552,   141,   412,
+     414,   416,   111,   695,   549,    22,   113,   365,   141,   367,
+      92,    92,   113,   113,   158,    11,   524,   524,   149,   433,
+     366,   433,   368,  -145,   158,    84,    85,   277,   439,    26,
+     489,   601,    89,    27,   433,   433,   433,    28,    90,   274,
+     275,   488,   617,   278,   511,   547,    46,   360,    47,   282,
+     437,   408,   409,   361,    58,    29,    30,    31,    32,    33,
+      34,    35,    36,    59,    37,   473,   114,   597,   114,   620,
+      64,    65,   233,   109,    67,    68,    69,    70,    71,    72,
+      73,   114,     1,     2,    60,     3,     4,     5,   138,   403,
+     669,   108,   114,   139,   595,   174,   686,   284,   302,    75,
+      76,    93,    93,    77,    62,    78,   110,   300,   114,   640,
+     659,   121,   122,    74,   114,   114,   100,   487,   404,   -67,
+     458,   515,   113,    97,   101,  -145,   548,   653,   654,  -145,
+      50,    51,    52,   357,   630,    53,   631,   529,   102,   531,
+     532,   533,   104,   369,   370,   357,   372,   373,   357,   357,
+     357,   357,   357,   380,   381,   382,   383,   384,   357,   426,
+     427,   428,   429,   430,   431,   432,   141,    38,    39,    40,
+     690,   105,   448,   233,   440,   441,   442,   158,   688,   689,
+     106,   691,   692,    87,     1,     1,   133,     3,     3,     5,
+       5,   299,   661,   433,   471,   475,   476,   477,   434,   606,
+     478,   702,   703,   433,   479,   480,    64,    65,   485,   109,
+     161,   162,   163,   164,   165,   166,    73,   134,     1,     2,
+     389,     3,     4,     5,   114,    75,    76,   453,   -67,    77,
+     135,    78,   147,   145,   475,   476,   477,   113,   611,   478,
+     436,   233,   146,   479,   480,   497,   498,   499,   500,    74,
+      38,    39,    40,   171,    64,    65,   509,   151,   158,   449,
+     450,   451,   452,   634,   635,   636,     1,     2,   153,     3,
+       4,     5,   387,   388,   475,   476,   477,   154,   155,   478,
+     158,   472,   357,   479,   480,    86,   176,    87,   390,   391,
+     287,   288,   289,   290,   118,   233,   119,   235,   233,   233,
+     676,   233,   560,   272,   561,   680,   270,   436,   392,   393,
+     233,   394,   395,   493,   396,   397,   398,   273,   233,   233,
+     233,   233,   233,   116,   117,   562,   563,   564,   565,   276,
+     567,   569,   568,   670,   279,   571,   572,   283,   357,   114,
+     -56,   280,   455,   -67,   124,   125,   126,   127,   128,   129,
+     -57,   650,   687,   568,   357,   530,   357,   357,   357,   -60,
+     -59,    75,    76,   -58,   539,    77,   291,    78,   348,   655,
+     660,   656,   656,   113,   300,   303,   304,   336,   545,   607,
+     608,   609,   610,   337,   338,   339,   233,   233,   233,   233,
+     233,   340,   341,   342,   350,   351,   233,   352,   353,   354,
+     355,   362,   406,   417,   405,   419,   421,   470,   573,   233,
+     233,    64,    65,   422,   109,   161,   162,   163,   164,   165,
+     166,    73,  -213,     1,     2,   423,     3,     4,     5,   424,
+     590,   425,   474,   444,   484,   647,   596,   648,   649,   459,
+     -69,     1,     2,   460,     3,     4,     5,   605,   461,   462,
+     463,   464,     6,     7,    74,   357,   490,   496,   502,   503,
+     504,   233,   505,   233,   506,   508,   233,   420,   510,   512,
+     624,   513,   602,   514,     8,   233,   233,   516,   528,     9,
+     357,   357,   357,    10,   517,   534,   389,   624,   536,    64,
+      65,   554,   109,   161,   162,   163,   164,   165,   166,    73,
+     537,     1,     2,   538,     3,     4,     5,   542,   553,   555,
+     566,   546,   233,   233,   574,   233,   233,   233,   233,   556,
+     557,   443,   233,   558,   445,   446,   559,   447,   233,   570,
+     575,   576,    74,   577,   233,   578,   457,   579,   580,   582,
+     561,   589,   584,   586,   465,   466,   467,   468,   469,   587,
+     678,   588,   568,   594,   390,   391,   593,   600,   599,   613,
+     602,   598,   612,   614,   616,   615,    75,    76,   618,   619,
+      77,   233,    78,   415,   392,   393,   633,   394,   395,   524,
+     396,   397,   398,   643,   644,   645,   652,   646,   663,   657,
+     651,   233,   233,   668,   665,   666,   317,   318,   667,   679,
+     681,   682,   -18,   -19,   693,   696,   233,   694,   699,   700,
+     705,   708,   518,   519,   520,   521,   522,   706,   662,   262,
+     263,   264,   527,   136,   641,   401,   152,   148,   410,   233,
+     233,    45,   132,   638,   233,   540,   541,   233,    99,     0,
+       0,   526,     0,   233,    75,    76,   233,     0,    77,     0,
+      78,   435,     0,    64,    65,     0,   109,   161,   162,   163,
+     164,   165,   166,    73,     0,     1,     2,     0,     3,     4,
+       5,   319,   320,   321,   322,   323,   324,   325,   326,   327,
+     328,   329,   330,   331,   332,     0,     0,   581,     0,   583,
+       0,     0,   585,     0,     0,     0,    74,     0,     0,     0,
+       0,   591,   592,    64,    65,     0,   109,    67,    68,    69,
+      70,    71,    72,    73,     0,     1,     2,     0,     3,     4,
+       5,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,     0,     0,     0,     0,   140,     0,     0,   621,   622,
+       0,   626,   627,   628,   629,     0,    74,     0,   632,     0,
+       0,     0,     0,     0,   637,     0,     0,     0,     0,     0,
+     639,     0,   177,   178,     0,     0,    64,    65,   179,     0,
+       0,     0,  -212,     0,     0,     0,     0,     0,     1,     2,
+       0,     3,     4,     5,   180,   181,   182,     0,     0,     0,
+     -69,     1,     2,     0,     3,     4,     5,   658,     0,   183,
+     184,     0,     6,     7,     0,     0,     0,     0,    75,    76,
+       0,     0,    77,   389,    78,   486,     0,   674,   675,   185,
+       0,     0,     0,     0,     8,     0,     0,     0,     0,     9,
+       0,     0,   684,    10,     0,   186,   187,   188,   189,   190,
+     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
+     201,   202,   203,   204,     0,   697,   698,     0,    75,    76,
+     701,     0,    77,   704,    78,     0,     0,     0,     0,   707,
+       0,     0,   709,     0,     0,     0,     0,     0,     0,   205,
+     206,   672,   673,   209,   210,   211,   212,   213,   214,   215,
+     216,   217,     0,   218,     0,   219,   220,   221,     0,   222,
+     223,   392,   393,     0,   394,   395,     0,   396,   397,   398,
+       0,     0,     0,     0,   177,   178,     0,     0,    64,    65,
+     179,     0,   224,     0,     0,   225,     0,   226,     0,   227,
+       1,     2,     0,     3,     4,     5,   180,   181,   182,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   183,   184,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   113,     0,     0,     0,
+       0,   185,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   186,   187,   188,
+     189,   190,   191,   192,   193,   194,   195,   196,   197,   198,
+     199,   200,   201,   202,   203,   204,     0,    64,    65,     0,
+     156,    67,    68,    69,    70,    71,    72,    73,     0,     1,
        2,     0,     3,     4,     5,     0,     0,     0,     0,     0,
-       0,   261,   203,   204,   205,   206,   207,   208,   209,   210,
-     211,   212,   213,   214,     0,   262,     0,   263,   264,   265,
-      74,   266,   267,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   385,   386,   112,     0,
-      64,    65,   387,     0,   394,     0,     0,   395,     0,   396,
-       0,   397,     1,     2,     0,     3,     4,     5,   388,   389,
-     390,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   391,   392,     0,     0,     0,     0,     0,
+       0,   205,   206,   207,   208,   209,   210,   211,   212,   213,
+     214,   215,   216,   217,     0,   218,     0,   219,   220,   221,
+      74,   222,   223,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   177,   178,   114,     0,
+      64,    65,   179,     0,   224,     0,     0,   225,     0,   226,
+       0,   227,     1,     2,     0,     3,     4,     5,   180,   181,
+     182,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   183,   184,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      64,    65,   393,   107,   156,   157,   158,   159,   160,   161,
-      73,     0,     1,     2,     0,     3,     4,     5,   180,   181,
-     182,   183,   184,   185,   186,   187,   188,   189,   190,   191,
-     192,   193,   194,   257,   258,   259,   260,     0,     0,     0,
-       0,    75,    76,    74,     0,    77,     0,    78,   142,     0,
+       0,     0,     0,   185,     0,     0,   157,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   186,
+     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
+     197,   198,   199,   200,   201,   202,   203,   204,     0,     0,
+       0,     0,    75,    76,     0,     0,    77,     0,    78,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   261,   203,   204,   205,   206,   207,   208,   209,
-     210,   211,   212,   213,   214,     0,   262,     0,   263,   264,
-     265,     0,   266,   267,     0,     0,     0,     0,     0,     0,
-       0,   385,   386,     0,     0,     0,     0,   387,     0,     0,
-       0,     0,     0,     0,     0,   394,     0,     0,   395,     0,
-     396,     0,   397,   388,   389,   390,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   391,   392,
+       0,     0,     0,   205,   206,   207,   208,   209,   210,   211,
+     212,   213,   214,   215,   216,   217,     0,   218,     0,   219,
+     220,   221,     0,   222,   223,     0,     0,     0,     0,     0,
+       0,     0,   177,   178,     0,     0,     0,     0,   179,     0,
+       0,     0,     0,     0,     0,     0,   224,     0,     0,   225,
+       0,   226,     0,   227,   180,   181,   182,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   183,
+     184,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   185,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   393,     0,     0,
-       0,     0,     0,     0,    75,    76,     0,     0,    77,     0,
-      78,   377,     0,   180,   181,   182,   183,   184,   185,   186,
-     187,   188,   189,   190,   191,   192,   193,   194,   257,   258,
-     259,   260,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   186,   187,   188,   189,   190,
+     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
+     201,   202,   203,   204,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   261,   203,   204,
-     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
-       0,   262,     0,   263,   264,   265,     0,   266,   267,    64,
-      65,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     1,     2,     0,     3,     4,     5,   254,     0,     0,
-     394,     0,     0,   395,     0,   396,     0,   397,     0,     0,
-       0,     0,   255,   256,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    64,    65,   111,   107,   156,
-     157,   158,   159,   160,   161,    73,     0,     1,     2,     0,
-       3,     4,     5,     0,     0,     0,     0,   180,   181,   182,
-     183,   184,   185,   186,   187,   188,   189,   190,   191,   192,
-     193,   194,   257,   258,   259,   260,     0,     0,    74,     0,
-      64,    65,     0,   107,   156,   157,   158,   159,   160,   161,
-      73,     0,     1,     2,     0,     3,     4,     5,     0,     0,
-       0,   261,   203,   204,   205,   206,   207,   208,   209,   210,
-     211,   212,   213,   214,     0,   262,     0,   263,   264,   265,
-       0,   266,   267,    74,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   112,     0,
-      64,    65,   -67,     0,   268,  -212,     0,   269,     0,   270,
-       0,   271,     1,     2,     0,     3,     4,     5,   254,     0,
-       0,     0,     0,   -69,     1,     2,     0,     3,     4,     5,
-       0,     0,     0,   255,   256,     6,     7,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   111,    75,
-      76,     0,     0,    77,     0,    78,   456,     8,     0,     0,
-       0,     9,     0,     0,     0,    10,     0,     0,   180,   181,
-     182,   183,   184,   185,   186,   187,   188,   189,   190,   191,
-     192,   193,   194,   257,   258,   259,   260,     0,     0,     0,
-       0,     0,     0,     0,    75,    76,     0,     0,    77,     0,
-      78,   476,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   261,   203,   204,   205,   206,   207,   208,   209,
-     210,   211,   212,   213,   214,     0,   262,     0,   263,   264,
-     265,     0,   266,   267,     0,    64,    65,     0,   107,   156,
-     157,   158,   159,   160,   161,    73,     0,     1,     2,   112,
-       3,     4,     5,     0,     0,   268,     0,     0,   269,     0,
-     270,     0,   271,     0,    64,    65,     0,   107,    67,    68,
-      69,    70,    71,    72,    73,     0,     1,     2,    74,     3,
-       4,     5,    64,    65,     0,   151,    67,    68,    69,    70,
-      71,    72,    73,     0,     1,     2,   135,     3,     4,     5,
-       0,     0,     0,     0,     0,    64,    65,    74,   107,    67,
-      68,    69,    70,    71,    72,    73,     0,     1,     2,     0,
-       3,     4,     5,    64,    65,    74,   107,   156,   157,   158,
-     159,   160,   161,    73,     0,     1,     2,   350,     3,     4,
-       5,     0,     0,     0,     0,     0,     0,     0,    74,     0,
-       0,     0,     0,     0,     0,    64,    65,     0,   107,    67,
-      68,    69,    70,    71,    72,    73,    74,     1,     2,     0,
-       3,     4,     5,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   466,     0,    75,
-      76,     0,     0,    77,     0,    78,   537,     0,    74,     0,
-     152,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    75,    76,
-       0,     0,    77,     0,    78,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    75,    76,     0,     0,
-      77,     0,    78,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    75,
-      76,     0,     0,    77,     0,    78,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    75,    76,     0,
-     372,    77,     0,    78,    64,    65,     0,   107,   156,   157,
-     158,   159,   160,   161,    73,     0,     1,     2,     0,     3,
-       4,     5,     0,     0,     0,     0,     0,     0,     0,    75,
-      76,     0,     0,    77,     0,    78,    64,    65,     0,   107,
-      67,    68,    69,    70,    71,    72,    73,    74,     1,     2,
-       0,     3,     4,     5,    64,    65,     0,    66,    67,    68,
-      69,    70,    71,    72,    73,     0,     1,     2,   588,     3,
-       4,     5,     0,     0,     0,     0,     0,    64,    65,    74,
-     107,   156,   157,   158,   159,   160,   161,    73,     0,     1,
-       2,     0,     3,     4,     5,    64,    65,    74,   151,    67,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   205,
+     206,   207,   208,   209,   210,   211,   212,   213,   214,   215,
+     216,   217,     0,   218,     0,   219,   220,   221,     0,   222,
+     223,    64,    65,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     1,     2,     0,     3,     4,     5,   292,
+       0,     0,   224,     0,     0,   225,     0,   226,     0,   227,
+       0,     0,     0,     0,   293,   294,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    64,    65,   113,
+     109,   161,   162,   163,   164,   165,   166,    73,     0,     1,
+       2,     0,     3,     4,     5,     0,     0,     0,     0,     0,
+     186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
+     196,   197,   198,   199,   200,   201,   202,   203,   204,     0,
+      74,     0,     0,     0,     0,    64,    65,     0,   109,    67,
       68,    69,    70,    71,    72,    73,     0,     1,     2,     0,
-       3,     4,     5,     0,     0,     0,     0,     0,     0,     0,
-      74,     0,     0,     0,    64,    65,     0,   107,    67,    68,
-      69,    70,    71,    72,    73,     0,     1,     2,    74,     3,
-       4,     5,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    75,    76,
-       0,   472,    77,     0,    78,     0,     0,    74,    64,    65,
-       0,   280,    67,    68,    69,    70,    71,    72,    73,     0,
-       1,     2,     0,     3,     4,     5,     0,     0,     0,     0,
-      75,    76,     0,     0,    77,     0,    78,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    75,    76,
-       0,    74,    77,     0,    78,     0,     0,     0,     0,     0,
+       3,     4,     5,     0,   205,   206,   207,   208,   209,   210,
+     211,   212,   213,   214,   215,   216,   217,   400,   218,     0,
+     219,   220,   221,     0,   222,   223,     0,     0,    74,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    75,    76,     0,     0,    77,     0,    78,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    75,
-      76,     0,     0,    77,     0,    78,    64,    65,     0,   107,
-     156,   157,   158,   159,   160,   161,    73,     0,     1,     2,
-       0,     3,     4,     5,     0,     0,     0,     0,    75,    76,
-       0,     0,    77,     0,    78,     0,     0,     0,    64,    65,
-       0,   107,   156,   157,   158,   159,   160,   161,    73,    74,
-       1,     2,     0,     3,     4,     5,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    75,    76,     0,     0,    77,     0,    78,    64,
-      65,    74,   107,    67,    68,    69,    70,    71,    72,   596,
-       0,     1,     2,     0,     3,     4,     5,    64,    65,     0,
-     107,    67,    68,    69,    70,    71,    72,   663,     0,     1,
-       2,     0,     3,     4,     5,     0,     0,     0,     0,     0,
-       0,     0,    74,     0,     0,     0,     0,     0,     0,     0,
+       0,   114,     0,    64,    65,   -67,     0,   295,     0,     0,
+     296,     0,   297,     0,   298,     1,     2,     0,     3,     4,
+       5,   292,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   293,   294,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      74,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   113,    75,    76,     0,   343,    77,     0,    78,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      75,    76,     0,     0,    77,     0,   375,     0,     0,     0,
+       0,     0,   186,   187,   188,   189,   190,   191,   192,   193,
+     194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
+     204,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      75,    76,     0,     0,    77,     0,    78,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   205,   206,   207,   208,
+     209,   210,   211,   212,   213,   214,   215,   216,   217,     0,
+     218,     0,   219,   220,   221,     0,   222,   223,     0,    64,
+      65,     0,   109,   161,   162,   163,   164,   165,   166,    73,
+       0,     1,     2,   114,     3,     4,     5,     0,     0,   295,
+       0,     0,   296,     0,   297,     0,   298,     0,    64,    65,
+       0,   109,    67,    68,    69,    70,    71,    72,    73,     0,
+       1,     2,    74,     3,     4,     5,    64,    65,     0,   109,
+      67,    68,    69,    70,    71,    72,    73,     0,     1,     2,
+     492,     3,     4,     5,     0,     0,     0,     0,     0,     0,
+       0,    74,     0,     0,     0,     0,     0,     0,   604,     0,
+       0,     0,     0,     0,     0,     0,     0,    64,    65,    74,
+      66,    67,    68,    69,    70,    71,    72,    73,     0,     1,
+       2,     0,     3,     4,     5,    64,    65,     0,   109,   161,
+     162,   163,   164,   165,   166,    73,     0,     1,     2,     0,
+       3,     4,     5,     0,     0,     0,     0,     0,    64,    65,
+      74,   156,    67,    68,    69,    70,    71,    72,    73,     0,
+       1,     2,     0,     3,     4,     5,     0,     0,    74,     0,
+       0,     0,     0,     0,    75,    76,     0,   411,    77,     0,
+      78,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    74,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    75,    76,     0,     0,    77,     0,    78,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    75,    76,     0,     0,    77,     0,    78,    64,    65,
+       0,   109,    67,    68,    69,    70,    71,    72,    73,     0,
+       1,     2,     0,     3,     4,     5,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    75,    76,     0,     0,    77,     0,   474,     0,
+       0,     0,    75,    76,     0,     0,    77,     0,    78,     0,
+       0,    74,     0,     0,     0,     0,     0,     0,     0,     0,
+      75,    76,     0,     0,    77,     0,    78,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    75,    76,     0,     0,    77,     0,    78,
+      64,    65,     0,   109,   161,   162,   163,   164,   165,   166,
+      73,     0,     1,     2,     0,     3,     4,     5,    64,    65,
+       0,   356,    67,    68,    69,    70,    71,    72,    73,     0,
+       1,     2,     0,     3,     4,     5,     0,     0,     0,     0,
+       0,    64,    65,    74,   109,   161,   162,   163,   164,   165,
+     166,    73,     0,     1,     2,     0,     3,     4,     5,     0,
+       0,    74,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    75,    76,     0,     0,    77,     0,    78,
+       0,     0,    64,    65,    74,   109,    67,    68,    69,    70,
+      71,    72,   623,     0,     1,     2,     0,     3,     4,     5,
+      64,    65,     0,   109,    67,    68,    69,    70,    71,    72,
+     677,     0,     1,     2,     0,     3,     4,     5,     0,     0,
+       0,     0,     0,     0,     0,    74,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   171,     0,     0,     0,     0,
+       0,     0,     0,    74,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    75,    76,     0,     0,    77,
+       0,   346,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,    75,    76,     0,     0,    77,     0,    78,
-       0,     0,     0,     0,     0,     0,   172,   173,     0,     0,
-       0,    75,    76,     0,     0,    77,     0,    78,   174,   175,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
-     186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
-     196,   197,   198,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   199,   200,   201,     0,     0,   202,   203,
-     204,   205,   206,   207,   208,   209,   210,   211,   212,   213,
-     214,   215,   216,   217,   218,   219,   220,   221,   222,   223
+       0,     0,     0,     0,     0,     0,    75,    76,     0,     0,
+      77,     0,   413,     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,   236,     0,
+       0,     0,     0,     0,     0,     0,     0,    75,    76,     0,
+       0,    77,     0,    78,     0,     0,     0,     0,     0,     0,
+     237,   238,     0,     0,     0,    75,    76,     0,     0,    77,
+       0,    78,   239,   240,   241,   242,   243,   244,   186,   187,
+     188,   189,   190,   191,   192,   193,   194,   195,   196,   197,
+     198,   199,   200,   245,   246,   247,   248,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   249,   250,   251,
+       0,     0,   252,   206,   207,   208,   209,   210,   211,   212,
+     213,   214,   215,   216,   217,   253,   254,   255,   256,   257,
+     258,   259,   260,   261
 };
 
 static const yytype_int16 yycheck[] =
 {
-       0,    27,   176,   164,    11,     4,   201,   452,   121,    55,
-     269,   270,   128,     0,    28,   242,    55,    17,    11,   320,
-      55,   216,   217,   218,   219,   220,    38,    55,   440,   441,
-      17,   226,   177,   154,   197,   656,   149,    21,    34,    55,
-     467,   198,    11,   164,    11,    29,   158,    53,    20,   159,
-      55,    23,    78,    11,    34,   676,   159,    55,   168,    17,
-      55,   158,    68,   165,   158,   168,    42,    43,    44,    45,
-      46,    47,    48,    49,    54,    51,   102,   159,    32,    33,
-     106,    55,    59,   228,   166,    54,   112,    54,     3,     4,
-       5,     6,   118,    93,   257,   159,   259,   159,   159,   159,
-     159,   258,   128,   260,   168,   164,   168,   168,   168,    18,
-     156,    26,    27,    55,   140,   141,   375,   156,   144,   531,
-     166,   156,   114,   115,   150,   164,     0,   162,   156,   141,
-     142,   143,   160,   578,   146,   394,   395,   396,   150,   151,
-     156,   243,   244,   338,   160,   141,   142,   143,   174,   159,
-     146,   156,   157,   167,   150,   151,   166,   164,   156,   157,
-     281,   156,   589,   284,   285,   162,   287,   612,   167,   596,
-     597,   164,   288,   199,   200,   201,   202,   153,   154,   155,
-     167,    46,   156,    48,   168,   159,   160,   117,   118,   215,
-     216,   217,   218,   219,   220,   221,   222,   223,   224,   225,
-     226,   322,   153,   154,   155,   506,   158,   402,   234,   330,
-     331,   332,   333,   334,   156,   474,   159,   159,   160,   245,
-     336,   164,    35,   418,    37,   420,   421,   422,     7,     8,
-      54,    84,    85,   660,   661,   158,   663,   664,    22,    21,
-      19,    20,    22,    22,    23,    24,   159,   548,    42,   550,
-      44,   164,   365,   366,   367,   368,   369,   370,   371,   686,
-     687,    22,   288,    41,    42,    22,   156,   380,   381,   382,
-      48,     4,   157,   299,   159,     4,    54,    62,    63,    64,
-      65,    66,    67,    37,   163,   406,   407,   408,   409,   410,
-     316,   317,   318,   163,   156,   416,   457,   121,   122,    42,
-      43,    44,   160,   157,    47,   159,     4,   534,   429,   430,
-     336,   337,   338,   614,   157,    22,   159,   141,   142,   159,
-     144,   145,   157,   147,   148,   149,     3,     4,     5,     6,
-     443,   444,   445,   446,   166,   157,   457,   159,     4,   284,
-     285,   454,   287,   141,   142,   143,   157,   156,   146,   375,
-       9,     9,   150,   151,     9,   157,   551,   159,   384,   554,
-     555,   556,    19,     9,     9,    22,   487,    24,   489,     9,
-      55,   492,    11,    57,   166,   156,   402,   322,    22,     4,
-     157,   502,   503,   156,   156,   330,   331,   332,   333,   334,
-     156,   156,   418,   419,   420,   421,   422,   156,   156,   159,
-     156,   156,   428,   516,   517,   518,   519,   156,   521,   636,
-     156,   159,   525,   526,   641,   159,   442,   159,   159,   159,
-     541,   542,   159,   544,   545,   546,   547,    38,    38,   156,
-     156,   552,   156,   156,   159,    61,    22,   159,   159,   560,
-     159,   159,   162,   159,   159,   566,   159,   159,   474,   159,
-     159,   159,   166,   159,   159,   568,   569,   570,   571,   633,
-     159,   406,   407,   408,   409,   410,   159,    38,   159,   157,
-      22,   416,    17,    17,   156,   501,   159,     4,   159,   159,
-     159,   507,     4,   657,   429,   430,   607,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   159,   159,   159,
-       4,   527,   166,   159,   156,   159,   619,   533,   621,   622,
-     159,   159,   159,   634,   635,    22,   159,   543,   159,     4,
-       4,   159,   159,   159,   166,   551,    54,   159,   554,   555,
-     556,   159,   532,   654,   157,   159,   157,   563,   157,    22,
-     162,   159,   487,   157,   489,   157,   166,   492,   164,    19,
-      17,   157,    22,   157,    24,    26,    27,   502,   503,   680,
-     681,    54,   164,   157,   685,   157,   157,   688,     4,   152,
-      22,   156,   156,   694,    17,    17,   697,   159,   159,    17,
-      17,    73,   131,   131,    54,   131,   627,    93,   590,   112,
-     106,    17,   245,    90,    57,   563,   541,   542,   447,   544,
-     545,   546,   547,   234,    -1,    -1,    -1,   552,    -1,    -1,
-      -1,   637,    -1,    -1,    -1,   560,    -1,    -1,    -1,    -1,
-      -1,   566,    -1,    -1,    -1,    -1,    -1,   627,    -1,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,    -1,     3,     4,    -1,    -1,     7,     8,
-       9,   121,   122,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      19,    20,   607,    22,    23,    24,    25,    26,    27,    -1,
-      -1,   141,   142,    -1,   144,   145,    -1,   147,   148,   149,
-      -1,    40,    41,    -1,    -1,    -1,    -1,    -1,    -1,   634,
-     635,    -1,    -1,    -1,    -1,    54,    -1,    -1,     7,     8,
-      59,    10,    11,    12,    13,    14,    15,    16,    17,   654,
-      19,    20,    -1,    22,    23,    24,    75,    76,    77,    78,
+       0,    27,   241,   370,   169,   280,     0,     4,   251,   225,
+     226,   254,   255,   256,   257,   258,    11,    17,   130,   466,
+     170,   264,    11,    17,     7,     8,   123,    10,    11,    12,
+      13,    14,    15,    16,    17,    28,    19,    20,   242,    22,
+      23,    24,   482,   483,    55,   203,    55,    60,     3,     4,
+       5,     6,    78,    11,    11,    21,    21,   154,   204,    55,
+       0,   160,   266,    29,    34,   160,   670,    50,   167,    53,
+      55,    26,    27,    20,   169,   159,    23,   493,   104,   295,
+     296,   297,   108,   687,    54,    69,    55,   245,   114,   247,
+      56,    56,    55,    55,   120,    95,    54,    54,   160,   160,
+     246,   160,   248,    55,   130,    41,    42,   169,   169,   159,
+     169,   551,    48,    18,   160,   160,   160,   159,    54,   145,
+     146,   167,   569,   149,   169,   169,    46,    11,    48,   155,
+     346,   281,   282,    17,   159,    42,    43,    44,    45,    46,
+      47,    48,    49,   159,    51,   388,   157,   158,   157,   158,
+       7,     8,   134,    10,    11,    12,    13,    14,    15,    16,
+      17,   157,    19,    20,   163,    22,    23,    24,   160,   165,
+     165,   168,   157,   165,   541,   168,   165,   159,   172,   162,
+     163,   147,   147,   166,    22,   168,   169,   169,   157,   605,
+     637,    32,    33,    50,   157,   157,    22,   413,   167,   161,
+     163,   444,    55,   169,    22,   157,    34,   623,   624,   161,
+      42,    43,    44,   239,   581,    47,   583,   460,    22,   462,
+     463,   464,   157,   249,   250,   251,   252,   253,   254,   255,
+     256,   257,   258,   259,   260,   261,   262,   263,   264,   336,
+     337,   338,   339,   340,   341,   342,   272,   154,   155,   156,
+      38,     4,   364,   235,   351,   352,   353,   283,   674,   675,
+       4,   677,   678,    37,    19,    19,   147,    22,    22,    24,
+      24,   436,   639,   160,   386,   142,   143,   144,   165,   554,
+     147,   697,   698,   160,   151,   152,     7,     8,   165,    10,
+      11,    12,    13,    14,    15,    16,    17,    38,    19,    20,
+      54,    22,    23,    24,   157,   162,   163,   160,   161,   166,
+      56,   168,   169,   164,   142,   143,   144,    55,   561,   147,
+     346,   303,   164,   151,   152,   422,   423,   424,   425,    50,
+     154,   155,   156,     4,     7,     8,   433,   157,   364,   365,
+     366,   367,   368,   586,   587,   588,    19,    20,   161,    22,
+      23,    24,   118,   119,   142,   143,   144,   116,   117,   147,
+     386,   387,   388,   151,   152,    35,    56,    37,   122,   123,
+       3,     4,     5,     6,    42,   357,    44,    38,   360,   361,
+     655,   363,   158,   160,   160,   660,    22,   413,   142,   143,
+     372,   145,   146,   419,   148,   149,   150,   158,   380,   381,
+     382,   383,   384,    84,    85,   502,   503,   504,   505,   167,
+     158,   508,   160,   652,     4,   512,   513,   157,   444,   157,
+       9,   158,   160,   161,    63,    64,    65,    66,    67,    68,
+       9,   158,   671,   160,   460,   461,   462,   463,   464,     9,
+       9,   162,   163,     9,   470,   166,     9,   168,   169,   158,
+     158,   160,   160,    55,   436,    38,    62,   157,   484,   556,
+     557,   558,   559,   157,   157,   157,   448,   449,   450,   451,
+     452,   157,   157,   157,    22,   157,   458,   157,   157,   235,
+      58,    11,   158,    22,   167,   157,    22,    38,   514,   471,
+     472,     7,     8,   157,    10,    11,    12,    13,    14,    15,
+      16,    17,     0,    19,    20,   157,    22,    23,    24,   157,
+     536,   157,     4,   160,    38,   612,   542,   614,   615,   160,
+      18,    19,    20,   160,    22,    23,    24,   553,   160,   160,
+     160,   160,    30,    31,    50,   561,   160,   160,   160,   160,
+     160,   523,   160,   525,   160,   160,   528,   303,   167,   160,
+     576,   160,   552,    38,    52,   537,   538,   160,   163,    57,
+     586,   587,   588,    61,   160,   160,    54,   593,   160,     7,
+       8,   158,    10,    11,    12,    13,    14,    15,    16,    17,
+     160,    19,    20,   160,    22,    23,    24,   160,   160,    22,
+       4,   167,   574,   575,    17,   577,   578,   579,   580,   160,
+     160,   357,   584,   160,   360,   361,   160,   363,   590,   167,
+      17,   157,    50,   160,   596,   160,   372,   160,   160,     4,
+     160,     4,   160,   160,   380,   381,   382,   383,   384,   160,
+     656,   160,   160,   160,   122,   123,   157,     4,    22,   158,
+     640,   167,   160,   160,     4,   160,   162,   163,   158,   158,
+     166,   633,   168,   169,   142,   143,   160,   145,   146,    54,
+     148,   149,   150,   158,   158,   158,   163,   158,    54,   165,
+     160,   653,   654,    17,   158,   158,    26,    27,   158,   165,
+       4,   153,   157,   157,    22,    17,   668,   160,    17,   160,
+      17,    17,   448,   449,   450,   451,   452,    74,   640,   136,
+     136,   136,   458,    95,   606,   272,   114,   108,   283,   691,
+     692,    17,    90,   593,   696,   471,   472,   699,    57,    -1,
+      -1,   457,    -1,   705,   162,   163,   708,    -1,   166,    -1,
+     168,   169,    -1,     7,     8,    -1,    10,    11,    12,    13,
+      14,    15,    16,    17,    -1,    19,    20,    -1,    22,    23,
+      24,   101,   102,   103,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,    -1,    -1,   523,    -1,   525,
+      -1,    -1,   528,    -1,    -1,    -1,    50,    -1,    -1,    -1,
+      -1,   537,   538,     7,     8,    -1,    10,    11,    12,    13,
+      14,    15,    16,    17,    -1,    19,    20,    -1,    22,    23,
+      24,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,    -1,    -1,    -1,    -1,    39,    -1,    -1,   574,   575,
+      -1,   577,   578,   579,   580,    -1,    50,    -1,   584,    -1,
+      -1,    -1,    -1,    -1,   590,    -1,    -1,    -1,    -1,    -1,
+     596,    -1,     3,     4,    -1,    -1,     7,     8,     9,    -1,
+      -1,    -1,     0,    -1,    -1,    -1,    -1,    -1,    19,    20,
+      -1,    22,    23,    24,    25,    26,    27,    -1,    -1,    -1,
+      18,    19,    20,    -1,    22,    23,    24,   633,    -1,    40,
+      41,    -1,    30,    31,    -1,    -1,    -1,    -1,   162,   163,
+      -1,    -1,   166,    54,   168,   169,    -1,   653,   654,    60,
+      -1,    -1,    -1,    -1,    52,    -1,    -1,    -1,    -1,    57,
+      -1,    -1,   668,    61,    -1,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,    93,    94,    -1,   691,   692,    -1,   162,   163,
+     696,    -1,   166,   699,   168,    -1,    -1,    -1,    -1,   705,
+      -1,    -1,   708,    -1,    -1,    -1,    -1,    -1,    -1,   120,
+     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
+     131,   132,    -1,   134,    -1,   136,   137,   138,    -1,   140,
+     141,   142,   143,    -1,   145,   146,    -1,   148,   149,   150,
+      -1,    -1,    -1,    -1,     3,     4,    -1,    -1,     7,     8,
+       9,    -1,   163,    -1,    -1,   166,    -1,   168,    -1,   170,
+      19,    20,    -1,    22,    23,    24,    25,    26,    27,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    40,    41,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
+      -1,    60,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    76,    77,    78,
       79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,   680,   681,    -1,    -1,    -1,
-     685,    50,    -1,   688,    -1,    -1,    -1,    -1,    -1,   694,
-      -1,    -1,   697,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,    -1,   133,    -1,   135,   136,   137,    -1,
-     139,   140,   141,   142,    -1,   144,   145,    -1,   147,   148,
-     149,    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,     7,
-       8,     9,    -1,   162,    -1,     0,   165,    -1,   167,    -1,
-     169,    19,    20,    -1,    22,    23,    24,    25,    26,    27,
-      -1,    -1,    -1,    18,    19,    20,    -1,    22,    23,    24,
-      -1,    -1,    40,    41,    -1,    30,    31,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    55,    -1,    -1,
-      -1,    59,   161,   162,    -1,    -1,   165,    52,   167,   168,
-      -1,    56,    -1,    -1,    -1,    60,    -1,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    -1,     7,     8,    -1,
+      89,    90,    91,    92,    93,    94,    -1,     7,     8,    -1,
       10,    11,    12,    13,    14,    15,    16,    17,    -1,    19,
       20,    -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,
-      -1,   119,   120,   121,   122,   123,   124,   125,   126,   127,
-     128,   129,   130,   131,    -1,   133,    -1,   135,   136,   137,
-      50,   139,   140,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,     3,     4,   156,    -1,
-       7,     8,     9,    -1,   162,    -1,    -1,   165,    -1,   167,
-      -1,   169,    19,    20,    -1,    22,    23,    24,    25,    26,
+      -1,   120,   121,   122,   123,   124,   125,   126,   127,   128,
+     129,   130,   131,   132,    -1,   134,    -1,   136,   137,   138,
+      50,   140,   141,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,     3,     4,   157,    -1,
+       7,     8,     9,    -1,   163,    -1,    -1,   166,    -1,   168,
+      -1,   170,    19,    20,    -1,    22,    23,    24,    25,    26,
       27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    40,    41,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       7,     8,    59,    10,    11,    12,    13,    14,    15,    16,
-      17,    -1,    19,    20,    -1,    22,    23,    24,    75,    76,
+      -1,    -1,    -1,    60,    -1,    -1,   126,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    76,
       77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    -1,    -1,    -1,
-      -1,   161,   162,    50,    -1,   165,    -1,   167,   168,    -1,
+      87,    88,    89,    90,    91,    92,    93,    94,    -1,    -1,
+      -1,    -1,   162,   163,    -1,    -1,   166,    -1,   168,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   119,   120,   121,   122,   123,   124,   125,   126,
-     127,   128,   129,   130,   131,    -1,   133,    -1,   135,   136,
-     137,    -1,   139,   140,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,     3,     4,    -1,    -1,    -1,    -1,     9,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   162,    -1,    -1,   165,    -1,
-     167,    -1,   169,    25,    26,    27,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,    41,
+      -1,    -1,    -1,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,   131,   132,    -1,   134,    -1,   136,
+     137,   138,    -1,   140,   141,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     3,     4,    -1,    -1,    -1,    -1,     9,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   163,    -1,    -1,   166,
+      -1,   168,    -1,   170,    25,    26,    27,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,
+      41,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    60,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    59,    -1,    -1,
-      -1,    -1,    -1,    -1,   161,   162,    -1,    -1,   165,    -1,
-     167,   168,    -1,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,    93,    94,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   119,   120,   121,
-     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-      -1,   133,    -1,   135,   136,   137,    -1,   139,   140,     7,
-       8,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    19,    20,    -1,    22,    23,    24,    25,    -1,    -1,
-     162,    -1,    -1,   165,    -1,   167,    -1,   169,    -1,    -1,
-      -1,    -1,    40,    41,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     7,     8,    55,    10,    11,
-      12,    13,    14,    15,    16,    17,    -1,    19,    20,    -1,
-      22,    23,    24,    -1,    -1,    -1,    -1,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    -1,    -1,    50,    -1,
-       7,     8,    -1,    10,    11,    12,    13,    14,    15,    16,
-      17,    -1,    19,    20,    -1,    22,    23,    24,    -1,    -1,
-      -1,   119,   120,   121,   122,   123,   124,   125,   126,   127,
-     128,   129,   130,   131,    -1,   133,    -1,   135,   136,   137,
-      -1,   139,   140,    50,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   156,    -1,
-       7,     8,   160,    -1,   162,     0,    -1,   165,    -1,   167,
-      -1,   169,    19,    20,    -1,    22,    23,    24,    25,    -1,
-      -1,    -1,    -1,    18,    19,    20,    -1,    22,    23,    24,
-      -1,    -1,    -1,    40,    41,    30,    31,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    55,   161,
-     162,    -1,    -1,   165,    -1,   167,   168,    52,    -1,    -1,
-      -1,    56,    -1,    -1,    -1,    60,    -1,    -1,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   161,   162,    -1,    -1,   165,    -1,
-     167,   168,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   119,   120,   121,   122,   123,   124,   125,   126,
-     127,   128,   129,   130,   131,    -1,   133,    -1,   135,   136,
-     137,    -1,   139,   140,    -1,     7,     8,    -1,    10,    11,
-      12,    13,    14,    15,    16,    17,    -1,    19,    20,   156,
-      22,    23,    24,    -1,    -1,   162,    -1,    -1,   165,    -1,
-     167,    -1,   169,    -1,     7,     8,    -1,    10,    11,    12,
-      13,    14,    15,    16,    17,    -1,    19,    20,    50,    22,
-      23,    24,     7,     8,    -1,    10,    11,    12,    13,    14,
-      15,    16,    17,    -1,    19,    20,    39,    22,    23,    24,
-      -1,    -1,    -1,    -1,    -1,     7,     8,    50,    10,    11,
-      12,    13,    14,    15,    16,    17,    -1,    19,    20,    -1,
-      22,    23,    24,     7,     8,    50,    10,    11,    12,    13,
-      14,    15,    16,    17,    -1,    19,    20,    39,    22,    23,
-      24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    50,    -1,
-      -1,    -1,    -1,    -1,    -1,     7,     8,    -1,    10,    11,
-      12,    13,    14,    15,    16,    17,    50,    19,    20,    -1,
-      22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    39,    -1,   161,
-     162,    -1,    -1,   165,    -1,   167,   168,    -1,    50,    -1,
-     125,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   161,   162,
-      -1,    -1,   165,    -1,   167,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   161,   162,    -1,    -1,
-     165,    -1,   167,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   161,
-     162,    -1,    -1,   165,    -1,   167,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   161,   162,    -1,
-     164,   165,    -1,   167,     7,     8,    -1,    10,    11,    12,
-      13,    14,    15,    16,    17,    -1,    19,    20,    -1,    22,
-      23,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   161,
-     162,    -1,    -1,   165,    -1,   167,     7,     8,    -1,    10,
-      11,    12,    13,    14,    15,    16,    17,    50,    19,    20,
-      -1,    22,    23,    24,     7,     8,    -1,    10,    11,    12,
-      13,    14,    15,    16,    17,    -1,    19,    20,    39,    22,
-      23,    24,    -1,    -1,    -1,    -1,    -1,     7,     8,    50,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   120,
+     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
+     131,   132,    -1,   134,    -1,   136,   137,   138,    -1,   140,
+     141,     7,     8,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    19,    20,    -1,    22,    23,    24,    25,
+      -1,    -1,   163,    -1,    -1,   166,    -1,   168,    -1,   170,
+      -1,    -1,    -1,    -1,    40,    41,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     7,     8,    55,
       10,    11,    12,    13,    14,    15,    16,    17,    -1,    19,
-      20,    -1,    22,    23,    24,     7,     8,    50,    10,    11,
+      20,    -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    93,    94,    -1,
+      50,    -1,    -1,    -1,    -1,     7,     8,    -1,    10,    11,
       12,    13,    14,    15,    16,    17,    -1,    19,    20,    -1,
-      22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      50,    -1,    -1,    -1,     7,     8,    -1,    10,    11,    12,
-      13,    14,    15,    16,    17,    -1,    19,    20,    50,    22,
-      23,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   161,   162,
-      -1,   164,   165,    -1,   167,    -1,    -1,    50,     7,     8,
-      -1,    10,    11,    12,    13,    14,    15,    16,    17,    -1,
-      19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,    -1,
-     161,   162,    -1,    -1,   165,    -1,   167,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   161,   162,
-      -1,    50,   165,    -1,   167,    -1,    -1,    -1,    -1,    -1,
+      22,    23,    24,    -1,   120,   121,   122,   123,   124,   125,
+     126,   127,   128,   129,   130,   131,   132,    39,   134,    -1,
+     136,   137,   138,    -1,   140,   141,    -1,    -1,    50,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   161,   162,    -1,    -1,   165,    -1,   167,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   161,
-     162,    -1,    -1,   165,    -1,   167,     7,     8,    -1,    10,
-      11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
-      -1,    22,    23,    24,    -1,    -1,    -1,    -1,   161,   162,
-      -1,    -1,   165,    -1,   167,    -1,    -1,    -1,     7,     8,
-      -1,    10,    11,    12,    13,    14,    15,    16,    17,    50,
-      19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,    -1,
+      -1,   157,    -1,     7,     8,   161,    -1,   163,    -1,    -1,
+     166,    -1,   168,    -1,   170,    19,    20,    -1,    22,    23,
+      24,    25,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    40,    41,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    55,   162,   163,    -1,   165,   166,    -1,   168,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   161,   162,    -1,    -1,   165,    -1,   167,     7,
-       8,    50,    10,    11,    12,    13,    14,    15,    16,    17,
-      -1,    19,    20,    -1,    22,    23,    24,     7,     8,    -1,
+      -1,    -1,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
+      94,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     162,   163,    -1,    -1,   166,    -1,   168,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   120,   121,   122,   123,
+     124,   125,   126,   127,   128,   129,   130,   131,   132,    -1,
+     134,    -1,   136,   137,   138,    -1,   140,   141,    -1,     7,
+       8,    -1,    10,    11,    12,    13,    14,    15,    16,    17,
+      -1,    19,    20,   157,    22,    23,    24,    -1,    -1,   163,
+      -1,    -1,   166,    -1,   168,    -1,   170,    -1,     7,     8,
+      -1,    10,    11,    12,    13,    14,    15,    16,    17,    -1,
+      19,    20,    50,    22,    23,    24,     7,     8,    -1,    10,
+      11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
+      39,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    50,    -1,    -1,    -1,    -1,    -1,    -1,    39,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     7,     8,    50,
       10,    11,    12,    13,    14,    15,    16,    17,    -1,    19,
-      20,    -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    50,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      20,    -1,    22,    23,    24,     7,     8,    -1,    10,    11,
+      12,    13,    14,    15,    16,    17,    -1,    19,    20,    -1,
+      22,    23,    24,    -1,    -1,    -1,    -1,    -1,     7,     8,
+      50,    10,    11,    12,    13,    14,    15,    16,    17,    -1,
+      19,    20,    -1,    22,    23,    24,    -1,    -1,    50,    -1,
+      -1,    -1,    -1,    -1,   162,   163,    -1,   165,   166,    -1,
+     168,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    50,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   162,   163,    -1,    -1,   166,    -1,   168,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      50,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   162,   163,    -1,    -1,   166,    -1,   168,     7,     8,
+      -1,    10,    11,    12,    13,    14,    15,    16,    17,    -1,
+      19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     161,   162,    -1,    -1,   165,    -1,   167,    -1,    -1,    -1,
+      -1,    -1,   162,   163,    -1,    -1,   166,    -1,   168,    -1,
+      -1,    50,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     162,   163,    -1,    -1,   166,    -1,   168,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   162,   163,    -1,    -1,   166,    -1,   168,
+       7,     8,    -1,    10,    11,    12,    13,    14,    15,    16,
+      17,    -1,    19,    20,    -1,    22,    23,    24,     7,     8,
+      -1,    10,    11,    12,    13,    14,    15,    16,    17,    -1,
+      19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,    -1,
+      -1,     7,     8,    50,    10,    11,    12,    13,    14,    15,
+      16,    17,    -1,    19,    20,    -1,    22,    23,    24,    -1,
+      -1,    50,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   162,   163,    -1,    -1,   166,    -1,   168,
+      -1,    -1,     7,     8,    50,    10,    11,    12,    13,    14,
+      15,    16,    17,    -1,    19,    20,    -1,    22,    23,    24,
+       7,     8,    -1,    10,    11,    12,    13,    14,    15,    16,
+      17,    -1,    19,    20,    -1,    22,    23,    24,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    50,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   161,   162,    -1,    -1,   165,    -1,   167,    -1,
+      -1,    -1,    -1,    50,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   162,   163,    -1,    -1,   166,
+      -1,   168,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   162,   163,    -1,    -1,   166,    -1,   168,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   162,   163,    -1,    -1,
+     166,    -1,   168,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    36,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   161,   162,    -1,    -1,   165,    -1,   167,
-      -1,    -1,    -1,    -1,    -1,    -1,    57,    58,    -1,    -1,
-      -1,   161,   162,    -1,    -1,   165,    -1,   167,    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,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    36,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   162,   163,    -1,
+      -1,   166,    -1,   168,    -1,    -1,    -1,    -1,    -1,    -1,
+      58,    59,    -1,    -1,    -1,   162,   163,    -1,    -1,   166,
+      -1,   168,    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,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   114,   115,   116,    -1,    -1,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,   140
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   115,   116,   117,
+      -1,    -1,   120,   121,   122,   123,   124,   125,   126,   127,
+     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
+     138,   139,   140,   141
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
-static const yytype_uint8 yystos[] =
+static const yytype_uint16 yystos[] =
 {
-       0,    19,    20,    22,    23,    24,    30,    31,    52,    56,
-      60,   178,   181,   182,   183,   184,   216,   217,   218,   220,
-     219,    53,    68,   225,   158,    59,   158,    18,   158,    42,
-      43,    44,    45,    46,    47,    48,    49,    51,   153,   154,
-     155,   185,   186,   187,     0,   218,    46,    48,   188,   235,
-      42,    43,    44,    47,   189,   232,   234,   242,   158,   158,
-     162,   226,    22,   224,     7,     8,    10,    11,    12,    13,
-      14,    15,    16,    17,    50,   161,   162,   165,   167,   178,
-     182,   203,   204,   238,   187,   187,    35,    37,   214,   187,
-     187,    21,   243,   244,    29,   168,   233,   243,    22,    22,
-      22,   227,   156,     4,     4,     4,   167,    10,   168,   204,
-     209,    55,   156,   180,   214,   214,    42,    44,   190,    32,
-      33,   213,    62,    63,    64,    65,    66,    67,   191,   230,
-     230,   181,   247,   159,   164,    39,   204,   205,   207,   208,
-     163,   163,   168,   209,   159,   168,   156,   208,   160,   213,
-     213,    10,   125,   204,   206,   215,    11,    12,    13,    14,
-      15,    16,   176,   177,   204,   210,     4,   206,    28,   167,
-     231,    36,    57,    58,    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,   114,
-     115,   116,   119,   120,   121,   122,   123,   124,   125,   126,
-     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
-     137,   138,   139,   140,   171,   172,   173,   245,   252,   253,
-     254,   255,    22,   193,   159,   157,   204,   204,   166,   168,
-     204,     4,   157,   210,   204,   156,   238,    26,    27,     3,
-       4,     5,     6,     9,    25,    40,    41,    90,    91,    92,
-      93,   119,   133,   135,   136,   137,   139,   140,   162,   165,
-     167,   169,   171,   172,   173,   211,   238,   180,   182,    57,
-      10,   204,   240,   241,    11,    17,    11,   176,   191,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   174,
-      26,    27,   100,   101,   102,   103,   104,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   175,   174,   175,   204,
-     204,   240,   204,   204,   248,   240,   240,   240,   240,   240,
-     204,   204,   204,   204,   204,   240,   191,   117,   118,    54,
-     121,   122,   141,   142,   144,   145,   147,   148,   149,   192,
-      39,   205,   195,   164,   166,   166,   157,   195,   180,   180,
-     215,   174,   175,   174,   175,   156,   156,   156,   156,   156,
-     156,   156,   164,   210,   212,   167,   212,   168,   212,    22,
-     156,   156,   156,   221,   156,     3,     4,     9,    25,    26,
-      27,    40,    41,    59,   162,   165,   167,   169,   211,   237,
-     238,   239,   159,   239,   239,   239,   206,   204,   204,   204,
-     204,   159,   198,   159,   198,   239,   162,   159,   159,   159,
-     159,   159,   159,   239,   239,   239,   239,   239,    38,   206,
-     204,   240,     4,   141,   142,   143,   146,   150,   151,   194,
-     222,   223,    38,   156,   156,   156,   156,   210,   210,   210,
-     210,   210,   210,   210,   159,   164,   168,   204,   212,   166,
-     168,   210,   210,   210,   159,   201,    39,   204,   228,   229,
-      61,   236,   164,   212,   167,   212,   168,   212,    22,   240,
-     159,   159,   239,   239,   239,   239,   239,    11,    54,    11,
-     250,   239,   162,   240,   204,   240,   240,   240,   159,   159,
-     251,   159,   159,   159,   204,   239,   239,   159,   201,   201,
-     204,   210,   210,   210,   210,   250,   159,   159,   159,   159,
-     251,   159,   210,   166,   168,   159,   159,    38,    34,    54,
-     199,   202,   193,   159,   157,    22,   164,   168,   212,   166,
-     168,    17,    17,   156,   159,   159,   159,   159,   239,     4,
-     239,   159,   159,   239,   159,   159,   159,     4,     4,   159,
-     204,   239,   239,   156,   159,   198,   204,   157,   159,   159,
-     159,   159,   157,   210,   210,   210,   210,   157,   210,   166,
-     210,   210,   204,    22,     4,   201,   178,   179,    39,   204,
-     195,   159,   166,   168,   239,   239,    17,   204,   249,   239,
-     239,   239,   239,   198,   198,   240,   239,   159,   240,   240,
-     240,     4,   239,   249,   239,   210,   210,   210,   210,   159,
-     157,   159,   159,   251,   157,   157,   157,   193,   199,   200,
-      22,   166,   159,   162,   193,   193,   157,   159,   164,   239,
-     251,   157,   198,   157,   157,   157,   157,   210,   210,   210,
-     157,   179,    54,   197,    17,   164,   176,   246,   121,   122,
-     239,   239,   195,    17,   204,   164,   195,   157,   157,   157,
-       4,   152,   196,   239,   237,   164,   176,   193,   193,    38,
-     193,   193,    22,   159,   237,    17,   239,   239,    17,   159,
-     239,   193,   193,   239,    17,    73,   239,    17,   239
+       0,    19,    20,    22,    23,    24,    30,    31,    52,    57,
+      61,   179,   182,   183,   184,   185,   217,   218,   219,   221,
+     220,    53,    69,   226,   159,    60,   159,    18,   159,    42,
+      43,    44,    45,    46,    47,    48,    49,    51,   154,   155,
+     156,   186,   187,   188,     0,   219,    46,    48,   189,   236,
+      42,    43,    44,    47,   190,   233,   235,   243,   159,   159,
+     163,   227,    22,   225,     7,     8,    10,    11,    12,    13,
+      14,    15,    16,    17,    50,   162,   163,   166,   168,   179,
+     183,   204,   205,   239,   188,   188,    35,    37,   215,   188,
+     188,    21,    56,   147,   244,   245,    29,   169,   234,   244,
+      22,    22,    22,   228,   157,     4,     4,     4,   168,    10,
+     169,   205,   210,    55,   157,   181,   215,   215,    42,    44,
+     191,    32,    33,   214,    63,    64,    65,    66,    67,    68,
+     192,   231,   231,   147,    38,    56,   182,   248,   160,   165,
+      39,   205,   206,   208,   209,   164,   164,   169,   210,   160,
+     169,   157,   209,   161,   214,   214,    10,   126,   205,   207,
+     216,    11,    12,    13,    14,    15,    16,   177,   178,   205,
+     211,     4,   207,    28,   168,   232,    56,     3,     4,     9,
+      25,    26,    27,    40,    41,    60,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132,   134,   136,
+     137,   138,   140,   141,   163,   166,   168,   170,   172,   173,
+     174,   212,   238,   239,   240,    38,    36,    58,    59,    70,
+      71,    72,    73,    74,    75,    91,    92,    93,    94,   115,
+     116,   117,   120,   133,   134,   135,   136,   137,   138,   139,
+     140,   141,   172,   173,   174,   246,   253,   254,   255,   256,
+      22,   194,   160,   158,   205,   205,   167,   169,   205,     4,
+     158,   211,   205,   157,   239,    26,    27,     3,     4,     5,
+       6,     9,    25,    40,    41,   163,   166,   168,   170,   212,
+     239,   181,   183,    38,    62,   237,    95,    96,    97,    98,
+      99,   100,   101,   102,   103,   104,   175,    26,    27,   101,
+     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
+     112,   113,   114,   176,   175,   176,   157,   157,   157,   157,
+     157,   157,   157,   165,   211,   213,   168,   213,   169,   213,
+      22,   157,   157,   157,   240,    58,    10,   205,   241,   242,
+      11,    17,    11,   177,   192,   175,   176,   175,   176,   205,
+     205,   241,   205,   205,   249,   241,   241,   241,   241,   241,
+     205,   205,   205,   205,   205,   241,   192,   118,   119,    54,
+     122,   123,   142,   143,   145,   146,   148,   149,   150,   193,
+      39,   206,   196,   165,   167,   167,   158,   196,   181,   181,
+     216,   165,   213,   168,   213,   169,   213,    22,   222,   157,
+     240,    22,   157,   157,   157,   157,   211,   211,   211,   211,
+     211,   211,   211,   160,   165,   169,   205,   213,   167,   169,
+     211,   211,   211,   240,   160,   240,   240,   240,   207,   205,
+     205,   205,   205,   160,   199,   160,   199,   240,   163,   160,
+     160,   160,   160,   160,   160,   240,   240,   240,   240,   240,
+      38,   207,   205,   241,     4,   142,   143,   144,   147,   151,
+     152,   195,   223,   224,    38,   165,   169,   213,   167,   169,
+     160,   202,    39,   205,   229,   230,   160,   211,   211,   211,
+     211,   251,   160,   160,   160,   160,   160,   252,   160,   211,
+     167,   169,   160,   160,    38,   241,   160,   160,   240,   240,
+     240,   240,   240,    11,    54,    11,   251,   240,   163,   241,
+     205,   241,   241,   241,   160,   252,   160,   160,   160,   205,
+     240,   240,   160,   202,   202,   205,   167,   169,    34,    54,
+     200,   203,   194,   160,   158,    22,   160,   160,   160,   160,
+     158,   160,   211,   211,   211,   211,     4,   158,   160,   211,
+     167,   211,   211,   205,    17,    17,   157,   160,   160,   160,
+     160,   240,     4,   240,   160,   240,   160,   160,   160,     4,
+     205,   240,   240,   157,   160,   199,   205,   158,   167,    22,
+       4,   202,   179,   180,    39,   205,   196,   211,   211,   211,
+     211,   241,   160,   158,   160,   160,     4,   252,   158,   158,
+     158,   240,   240,    17,   205,   250,   240,   240,   240,   240,
+     199,   199,   240,   160,   241,   241,   241,   240,   250,   240,
+     194,   200,   201,   158,   158,   158,   158,   211,   211,   211,
+     158,   160,   163,   194,   194,   158,   160,   165,   240,   252,
+     158,   199,   180,    54,   198,   158,   158,   158,    17,   165,
+     177,   247,   122,   123,   240,   240,   196,    17,   205,   165,
+     196,     4,   153,   197,   240,   238,   165,   177,   194,   194,
+      38,   194,   194,    22,   160,   238,    17,   240,   240,    17,
+     160,   240,   194,   194,   240,    17,    74,   240,    17,   240
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -2857,7 +2867,7 @@
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+# if YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)			\
      fprintf (File, "%d.%d-%d.%d",			\
 	      (Loc).first_line, (Loc).first_column,	\
@@ -3598,152 +3608,152 @@
   switch (yyn)
     {
         case 29:
-#line 1124 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1124 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_EQ; ;}
     break;
 
   case 30:
-#line 1124 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1124 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_NE; ;}
     break;
 
   case 31:
-#line 1125 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1125 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLT; ;}
     break;
 
   case 32:
-#line 1125 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1125 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGT; ;}
     break;
 
   case 33:
-#line 1126 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1126 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLE; ;}
     break;
 
   case 34:
-#line 1126 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1126 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGE; ;}
     break;
 
   case 35:
-#line 1127 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1127 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULT; ;}
     break;
 
   case 36:
-#line 1127 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1127 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGT; ;}
     break;
 
   case 37:
-#line 1128 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1128 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULE; ;}
     break;
 
   case 38:
-#line 1128 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1128 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGE; ;}
     break;
 
   case 39:
-#line 1132 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1132 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OEQ; ;}
     break;
 
   case 40:
-#line 1132 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1132 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ONE; ;}
     break;
 
   case 41:
-#line 1133 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1133 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLT; ;}
     break;
 
   case 42:
-#line 1133 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1133 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGT; ;}
     break;
 
   case 43:
-#line 1134 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1134 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLE; ;}
     break;
 
   case 44:
-#line 1134 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1134 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGE; ;}
     break;
 
   case 45:
-#line 1135 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1135 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ORD; ;}
     break;
 
   case 46:
-#line 1135 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1135 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNO; ;}
     break;
 
   case 47:
-#line 1136 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1136 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UEQ; ;}
     break;
 
   case 48:
-#line 1136 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1136 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNE; ;}
     break;
 
   case 49:
-#line 1137 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1137 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULT; ;}
     break;
 
   case 50:
-#line 1137 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1137 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGT; ;}
     break;
 
   case 51:
-#line 1138 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1138 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULE; ;}
     break;
 
   case 52:
-#line 1138 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1138 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGE; ;}
     break;
 
   case 53:
-#line 1139 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1139 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_TRUE; ;}
     break;
 
   case 54:
-#line 1140 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1140 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_FALSE; ;}
     break;
 
   case 65:
-#line 1149 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1149 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 66:
-#line 1151 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1151 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal)=(yyvsp[(3) - (4)].UInt64Val); ;}
     break;
 
   case 67:
-#line 1152 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1152 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal)=0; ;}
     break;
 
   case 68:
-#line 1156 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1156 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal);
     CHECK_FOR_ERROR
@@ -3751,7 +3761,7 @@
     break;
 
   case 69:
-#line 1160 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1160 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3759,7 +3769,7 @@
     break;
 
   case 73:
-#line 1168 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1168 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3767,7 +3777,7 @@
     break;
 
   case 74:
-#line 1173 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1173 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal);
     CHECK_FOR_ERROR
@@ -3775,157 +3785,157 @@
     break;
 
   case 75:
-#line 1179 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1179 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 76:
-#line 1180 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1180 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 77:
-#line 1181 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1181 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 78:
-#line 1182 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1182 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
     break;
 
   case 79:
-#line 1183 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1183 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 80:
-#line 1184 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1184 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::CommonLinkage; ;}
     break;
 
   case 81:
-#line 1188 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1188 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 82:
-#line 1189 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1189 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 83:
-#line 1190 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1190 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 84:
-#line 1194 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1194 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::DefaultVisibility;   ;}
     break;
 
   case 85:
-#line 1195 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1195 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::DefaultVisibility;   ;}
     break;
 
   case 86:
-#line 1196 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1196 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::HiddenVisibility;    ;}
     break;
 
   case 87:
-#line 1197 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1197 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::ProtectedVisibility; ;}
     break;
 
   case 88:
-#line 1201 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1201 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 89:
-#line 1202 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1202 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 90:
-#line 1203 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1203 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 91:
-#line 1207 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1207 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 92:
-#line 1208 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1208 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 93:
-#line 1209 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1209 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 94:
-#line 1210 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1210 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 95:
-#line 1211 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1211 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 96:
-#line 1215 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1215 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 97:
-#line 1216 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1216 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 98:
-#line 1217 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1217 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 99:
-#line 1220 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1220 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 100:
-#line 1221 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1221 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 101:
-#line 1222 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1222 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Fast; ;}
     break;
 
   case 102:
-#line 1223 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1223 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Cold; ;}
     break;
 
   case 103:
-#line 1224 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1224 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_StdCall; ;}
     break;
 
   case 104:
-#line 1225 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1225 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_FastCall; ;}
     break;
 
   case 105:
-#line 1226 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1226 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
                    if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val))
                      GEN_ERROR("Calling conv too large");
@@ -3935,129 +3945,129 @@
     break;
 
   case 106:
-#line 1233 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1233 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ZExt;      ;}
     break;
 
   case 107:
-#line 1234 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1234 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ZExt;      ;}
     break;
 
   case 108:
-#line 1235 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1235 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::SExt;      ;}
     break;
 
   case 109:
-#line 1236 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1236 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::SExt;      ;}
     break;
 
   case 110:
-#line 1237 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1237 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::InReg;     ;}
     break;
 
   case 111:
-#line 1238 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1238 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::StructRet; ;}
     break;
 
   case 112:
-#line 1239 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1239 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::NoAlias;   ;}
     break;
 
   case 113:
-#line 1240 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1240 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ByVal;     ;}
     break;
 
   case 114:
-#line 1241 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1241 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::Nest;      ;}
     break;
 
   case 115:
-#line 1242 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1242 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = 
                           ParamAttr::constructAlignmentFromInt((yyvsp[(2) - (2)].UInt64Val));    ;}
     break;
 
   case 116:
-#line 1246 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1246 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::None; ;}
     break;
 
   case 117:
-#line 1247 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1247 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs);
               ;}
     break;
 
   case 118:
-#line 1252 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1252 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::NoReturn; ;}
     break;
 
   case 119:
-#line 1253 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1253 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::NoUnwind; ;}
     break;
 
   case 120:
-#line 1254 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1254 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ZExt;     ;}
     break;
 
   case 121:
-#line 1255 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1255 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::SExt;     ;}
     break;
 
   case 122:
-#line 1256 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1256 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ReadNone; ;}
     break;
 
   case 123:
-#line 1257 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1257 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ReadOnly; ;}
     break;
 
   case 124:
-#line 1260 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1260 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::None; ;}
     break;
 
   case 125:
-#line 1261 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1261 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs);
               ;}
     break;
 
   case 126:
-#line 1266 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1266 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 127:
-#line 1267 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1267 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.StrVal) = (yyvsp[(2) - (2)].StrVal);
               ;}
     break;
 
   case 128:
-#line 1274 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1274 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 129:
-#line 1275 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1275 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -4067,12 +4077,12 @@
     break;
 
   case 130:
-#line 1281 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1281 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 131:
-#line 1282 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1282 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(3) - (3)].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -4082,7 +4092,7 @@
     break;
 
   case 132:
-#line 1291 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1291 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
   for (unsigned i = 0, e = (yyvsp[(2) - (2)].StrVal)->length(); i != e; ++i)
     if ((*(yyvsp[(2) - (2)].StrVal))[i] == '"' || (*(yyvsp[(2) - (2)].StrVal))[i] == '\\')
@@ -4093,27 +4103,27 @@
     break;
 
   case 133:
-#line 1299 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1299 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 134:
-#line 1300 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1300 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;}
     break;
 
   case 135:
-#line 1305 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1305 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 136:
-#line 1306 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1306 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 137:
-#line 1307 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1307 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV->setSection(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -4122,7 +4132,7 @@
     break;
 
   case 138:
-#line 1312 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1312 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(2) - (2)].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[(2) - (2)].UInt64Val)))
       GEN_ERROR("Alignment must be a power of two");
@@ -4132,7 +4142,7 @@
     break;
 
   case 146:
-#line 1328 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1328 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
@@ -4140,7 +4150,7 @@
     break;
 
   case 147:
-#line 1332 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1332 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder((yyvsp[(1) - (1)].PrimType));
     CHECK_FOR_ERROR
@@ -4148,7 +4158,7 @@
     break;
 
   case 148:
-#line 1336 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1336 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {                             // Pointer type?
     if (*(yyvsp[(1) - (3)].TypeVal) == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
@@ -4159,7 +4169,7 @@
     break;
 
   case 149:
-#line 1343 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1343 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {            // Named types are also simple types...
     const Type* tmp = getTypeVal((yyvsp[(1) - (1)].ValIDVal));
     CHECK_FOR_ERROR
@@ -4168,7 +4178,7 @@
     break;
 
   case 150:
-#line 1348 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1348 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {                   // Type UpReference
     if ((yyvsp[(2) - (2)].UInt64Val) > (uint64_t)~0U) GEN_ERROR("Value out of range");
     OpaqueType *OT = OpaqueType::get();        // Use temporary placeholder
@@ -4180,7 +4190,7 @@
     break;
 
   case 151:
-#line 1356 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1356 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4213,7 +4223,7 @@
     break;
 
   case 152:
-#line 1385 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1385 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4241,7 +4251,7 @@
     break;
 
   case 153:
-#line 1410 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1410 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {          // Sized array type?
     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[(4) - (5)].TypeVal), (yyvsp[(2) - (5)].UInt64Val))));
     delete (yyvsp[(4) - (5)].TypeVal);
@@ -4250,7 +4260,7 @@
     break;
 
   case 154:
-#line 1415 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1415 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {          // Vector type?
      const llvm::Type* ElemTy = (yyvsp[(4) - (5)].TypeVal)->get();
      if ((unsigned)(yyvsp[(2) - (5)].UInt64Val) != (yyvsp[(2) - (5)].UInt64Val))
@@ -4264,7 +4274,7 @@
     break;
 
   case 155:
-#line 1425 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1425 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {                        // Structure type?
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(2) - (3)].TypeList)->begin(),
@@ -4278,7 +4288,7 @@
     break;
 
   case 156:
-#line 1435 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1435 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {                                  // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
     CHECK_FOR_ERROR
@@ -4286,7 +4296,7 @@
     break;
 
   case 157:
-#line 1439 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1439 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(3) - (5)].TypeList)->begin(),
@@ -4300,7 +4310,7 @@
     break;
 
   case 158:
-#line 1449 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1449 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {                         // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
     CHECK_FOR_ERROR
@@ -4308,7 +4318,7 @@
     break;
 
   case 159:
-#line 1456 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1456 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4318,7 +4328,7 @@
     break;
 
   case 160:
-#line 1465 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1465 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (1)].TypeVal))->getDescription());
@@ -4329,14 +4339,14 @@
     break;
 
   case 161:
-#line 1472 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1472 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(Type::VoidTy);
   ;}
     break;
 
   case 162:
-#line 1477 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1477 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     (yyval.TypeWithAttrsList)->push_back((yyvsp[(1) - (1)].TypeWithAttrs));
@@ -4345,7 +4355,7 @@
     break;
 
   case 163:
-#line 1482 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1482 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList))->push_back((yyvsp[(3) - (3)].TypeWithAttrs));
     CHECK_FOR_ERROR
@@ -4353,7 +4363,7 @@
     break;
 
   case 165:
-#line 1490 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1490 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList);
     TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
@@ -4364,7 +4374,7 @@
     break;
 
   case 166:
-#line 1497 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1497 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList;
     TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
@@ -4375,7 +4385,7 @@
     break;
 
   case 167:
-#line 1504 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1504 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     CHECK_FOR_ERROR
@@ -4383,7 +4393,7 @@
     break;
 
   case 168:
-#line 1512 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1512 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeHolder>();
     (yyval.TypeList)->push_back(*(yyvsp[(1) - (1)].TypeVal)); 
@@ -4393,7 +4403,7 @@
     break;
 
   case 169:
-#line 1518 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1518 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back(*(yyvsp[(3) - (3)].TypeVal)); 
     delete (yyvsp[(3) - (3)].TypeVal);
@@ -4402,7 +4412,7 @@
     break;
 
   case 170:
-#line 1530 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1530 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
@@ -4434,7 +4444,7 @@
     break;
 
   case 171:
-#line 1558 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1558 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4454,7 +4464,7 @@
     break;
 
   case 172:
-#line 1574 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1574 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4485,7 +4495,7 @@
     break;
 
   case 173:
-#line 1601 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1601 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
@@ -4517,7 +4527,7 @@
     break;
 
   case 174:
-#line 1629 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1629 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (4)].TypeVal)->get());
     if (STy == 0)
@@ -4547,7 +4557,7 @@
     break;
 
   case 175:
-#line 1655 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1655 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4571,7 +4581,7 @@
     break;
 
   case 176:
-#line 1675 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1675 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (6)].TypeVal)->get());
     if (STy == 0)
@@ -4601,7 +4611,7 @@
     break;
 
   case 177:
-#line 1701 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1701 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (5)].TypeVal))->getDescription());
@@ -4625,7 +4635,7 @@
     break;
 
   case 178:
-#line 1721 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1721 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4641,7 +4651,7 @@
     break;
 
   case 179:
-#line 1733 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1733 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4652,7 +4662,7 @@
     break;
 
   case 180:
-#line 1740 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1740 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4722,7 +4732,7 @@
     break;
 
   case 181:
-#line 1806 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1806 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4736,7 +4746,7 @@
     break;
 
   case 182:
-#line 1816 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1816 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4750,7 +4760,7 @@
     break;
 
   case 183:
-#line 1826 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1826 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].SInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type");
@@ -4760,7 +4770,7 @@
     break;
 
   case 184:
-#line 1832 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1832 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     uint32_t BitWidth = cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth();
     if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) {
@@ -4774,7 +4784,7 @@
     break;
 
   case 185:
-#line 1842 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1842 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].UInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type");
@@ -4784,7 +4794,7 @@
     break;
 
   case 186:
-#line 1848 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1848 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     uint32_t BitWidth = cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth();
     if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) {
@@ -4798,7 +4808,7 @@
     break;
 
   case 187:
-#line 1858 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1858 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {                      // Boolean constants
     if (cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth() != 1)
       GEN_ERROR("Constant true must have type i1");
@@ -4808,7 +4818,7 @@
     break;
 
   case 188:
-#line 1864 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1864 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {                     // Boolean constants
     if (cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth() != 1)
       GEN_ERROR("Constant false must have type i1");
@@ -4818,7 +4828,7 @@
     break;
 
   case 189:
-#line 1870 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1870 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {                   // Floating point constants
     if (!ConstantFP::isValueValidForType((yyvsp[(1) - (2)].PrimType), *(yyvsp[(2) - (2)].FPVal)))
       GEN_ERROR("Floating point constant invalid for type");
@@ -4833,7 +4843,7 @@
     break;
 
   case 190:
-#line 1883 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1883 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (6)].TypeVal))->getDescription());
@@ -4849,7 +4859,7 @@
     break;
 
   case 191:
-#line 1895 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1895 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[(3) - (5)].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand");
@@ -4874,7 +4884,7 @@
     break;
 
   case 192:
-#line 1916 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1916 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (8)].ConstVal)->getType() != Type::Int1Ty)
       GEN_ERROR("Select condition must be of boolean type");
@@ -4886,7 +4896,7 @@
     break;
 
   case 193:
-#line 1924 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1924 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Binary operator types must match");
@@ -4896,7 +4906,7 @@
     break;
 
   case 194:
-#line 1930 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1930 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match");
@@ -4911,7 +4921,7 @@
     break;
 
   case 195:
-#line 1941 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1941 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("icmp operand types must match");
@@ -4920,7 +4930,7 @@
     break;
 
   case 196:
-#line 1946 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1946 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("fcmp operand types must match");
@@ -4929,7 +4939,7 @@
     break;
 
   case 197:
-#line 1951 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1951 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("vicmp operand types must match");
@@ -4938,7 +4948,7 @@
     break;
 
   case 198:
-#line 1956 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1956 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("vfcmp operand types must match");
@@ -4947,7 +4957,7 @@
     break;
 
   case 199:
-#line 1961 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1961 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -4957,7 +4967,7 @@
     break;
 
   case 200:
-#line 1967 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1967 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal)))
       GEN_ERROR("Invalid insertelement operands");
@@ -4967,7 +4977,7 @@
     break;
 
   case 201:
-#line 1973 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1973 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal)))
       GEN_ERROR("Invalid shufflevector operands");
@@ -4977,7 +4987,7 @@
     break;
 
   case 202:
-#line 1979 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1979 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<StructType>((yyvsp[(3) - (5)].ConstVal)->getType()) && !isa<ArrayType>((yyvsp[(3) - (5)].ConstVal)->getType()))
       GEN_ERROR("ExtractValue requires an aggregate operand");
@@ -4989,7 +4999,7 @@
     break;
 
   case 203:
-#line 1987 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1987 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<StructType>((yyvsp[(3) - (7)].ConstVal)->getType()) && !isa<ArrayType>((yyvsp[(3) - (7)].ConstVal)->getType()))
       GEN_ERROR("InsertValue requires an aggregate operand");
@@ -5001,7 +5011,7 @@
     break;
 
   case 204:
-#line 1998 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1998 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ConstVector) = (yyvsp[(1) - (3)].ConstVector))->push_back((yyvsp[(3) - (3)].ConstVal));
     CHECK_FOR_ERROR
@@ -5009,7 +5019,7 @@
     break;
 
   case 205:
-#line 2002 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2002 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVector) = new std::vector<Constant*>();
     (yyval.ConstVector)->push_back((yyvsp[(1) - (1)].ConstVal));
@@ -5018,27 +5028,27 @@
     break;
 
   case 206:
-#line 2010 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2010 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
   case 207:
-#line 2010 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2010 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
   case 208:
-#line 2013 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2013 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
   case 209:
-#line 2013 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2013 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
   case 210:
-#line 2016 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2016 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     const Type* VTy = (yyvsp[(1) - (2)].TypeVal)->get();
     Value *V = getVal(VTy, (yyvsp[(2) - (2)].ValIDVal));
@@ -5054,7 +5064,7 @@
     break;
 
   case 211:
-#line 2028 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2028 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     Constant *Val = (yyvsp[(3) - (6)].ConstVal);
     const Type *DestTy = (yyvsp[(5) - (6)].TypeVal)->get();
@@ -5070,7 +5080,7 @@
     break;
 
   case 212:
-#line 2049 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2049 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -5079,7 +5089,7 @@
     break;
 
   case 213:
-#line 2054 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2054 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -5088,12 +5098,12 @@
     break;
 
   case 216:
-#line 2067 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2067 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = false; ;}
     break;
 
   case 217:
-#line 2067 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2067 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
@@ -5101,26 +5111,26 @@
     break;
 
   case 218:
-#line 2071 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2071 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
   case 219:
-#line 2071 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2071 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 220:
-#line 2074 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2074 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 221:
-#line 2077 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2077 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (3)].TypeVal))->getDescription());
@@ -5148,7 +5158,7 @@
     break;
 
   case 222:
-#line 2101 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2101 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     ResolveTypeTo((yyvsp[(1) - (3)].StrVal), (yyvsp[(3) - (3)].PrimType));
 
@@ -5163,7 +5173,7 @@
     break;
 
   case 223:
-#line 2113 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2113 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { 
     /* "Externally Visible" Linkage */
     if ((yyvsp[(5) - (6)].ConstVal) == 0) 
@@ -5175,14 +5185,14 @@
     break;
 
   case 224:
-#line 2120 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2120 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 225:
-#line 2124 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2124 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(6) - (7)].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant");
@@ -5192,14 +5202,14 @@
     break;
 
   case 226:
-#line 2129 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2129 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 227:
-#line 2133 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2133 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(6) - (7)].TypeVal))->getDescription());
@@ -5210,7 +5220,7 @@
     break;
 
   case 228:
-#line 2139 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2139 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
@@ -5218,7 +5228,7 @@
     break;
 
   case 229:
-#line 2143 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2143 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     std::string Name;
     if ((yyvsp[(1) - (5)].StrVal)) {
@@ -5262,21 +5272,21 @@
     break;
 
   case 230:
-#line 2183 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2183 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { 
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 231:
-#line 2186 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2186 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 232:
-#line 2192 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2192 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   if (AsmSoFar.empty())
@@ -5289,7 +5299,7 @@
     break;
 
   case 233:
-#line 2202 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2202 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setTargetTriple(*(yyvsp[(3) - (3)].StrVal));
     delete (yyvsp[(3) - (3)].StrVal);
@@ -5297,7 +5307,7 @@
     break;
 
   case 234:
-#line 2206 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2206 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setDataLayout(*(yyvsp[(3) - (3)].StrVal));
     delete (yyvsp[(3) - (3)].StrVal);
@@ -5305,7 +5315,7 @@
     break;
 
   case 236:
-#line 2213 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2213 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary(*(yyvsp[(3) - (3)].StrVal));
           delete (yyvsp[(3) - (3)].StrVal);
@@ -5314,7 +5324,7 @@
     break;
 
   case 237:
-#line 2218 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2218 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary(*(yyvsp[(1) - (1)].StrVal));
           delete (yyvsp[(1) - (1)].StrVal);
@@ -5323,14 +5333,14 @@
     break;
 
   case 238:
-#line 2223 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2223 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
           CHECK_FOR_ERROR
         ;}
     break;
 
   case 239:
-#line 2232 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2232 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
@@ -5344,7 +5354,7 @@
     break;
 
   case 240:
-#line 2242 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2242 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -5358,7 +5368,7 @@
     break;
 
   case 241:
-#line 2253 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2253 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[(1) - (1)].ArgList);
     CHECK_FOR_ERROR
@@ -5366,7 +5376,7 @@
     break;
 
   case 242:
-#line 2257 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2257 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList);
     struct ArgListEntry E;
@@ -5379,7 +5389,7 @@
     break;
 
   case 243:
-#line 2266 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2266 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new ArgListType;
     struct ArgListEntry E;
@@ -5392,7 +5402,7 @@
     break;
 
   case 244:
-#line 2275 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2275 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
@@ -5400,7 +5410,7 @@
     break;
 
   case 245:
-#line 2281 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2281 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
   std::string FunctionName(*(yyvsp[(3) - (10)].StrVal));
   delete (yyvsp[(3) - (10)].StrVal);  // Free strdup'd memory!
@@ -5531,7 +5541,7 @@
     break;
 
   case 248:
-#line 2411 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2411 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = CurFun.CurrentFunction;
 
@@ -5543,7 +5553,7 @@
     break;
 
   case 251:
-#line 2422 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2422 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
   CHECK_FOR_ERROR
@@ -5551,7 +5561,7 @@
     break;
 
   case 252:
-#line 2427 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2427 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.CurrentFunction->setLinkage((yyvsp[(1) - (3)].Linkage));
     CurFun.CurrentFunction->setVisibility((yyvsp[(2) - (3)].Visibility));
@@ -5562,7 +5572,7 @@
     break;
 
   case 253:
-#line 2439 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2439 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -5570,7 +5580,7 @@
     break;
 
   case 254:
-#line 2443 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2443 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -5578,7 +5588,7 @@
     break;
 
   case 255:
-#line 2448 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2448 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {    // A reference to a direct constant
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SInt64Val));
     CHECK_FOR_ERROR
@@ -5586,7 +5596,7 @@
     break;
 
   case 256:
-#line 2452 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2452 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].UInt64Val));
     CHECK_FOR_ERROR
@@ -5594,7 +5604,7 @@
     break;
 
   case 257:
-#line 2456 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2456 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {                     // Perhaps it's an FP constant?
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].FPVal));
     CHECK_FOR_ERROR
@@ -5602,7 +5612,7 @@
     break;
 
   case 258:
-#line 2460 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2460 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
@@ -5610,7 +5620,7 @@
     break;
 
   case 259:
-#line 2464 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2464 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
@@ -5618,7 +5628,7 @@
     break;
 
   case 260:
-#line 2468 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2468 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createNull();
     CHECK_FOR_ERROR
@@ -5626,7 +5636,7 @@
     break;
 
   case 261:
-#line 2472 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2472 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
@@ -5634,7 +5644,7 @@
     break;
 
   case 262:
-#line 2476 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2476 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {     // A vector zero constant.
     (yyval.ValIDVal) = ValID::createZeroInit();
     CHECK_FOR_ERROR
@@ -5642,7 +5652,7 @@
     break;
 
   case 263:
-#line 2480 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2480 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized packed vector
     const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType();
     unsigned NumElements = (yyvsp[(2) - (3)].ConstVector)->size(); 
@@ -5668,7 +5678,7 @@
     break;
 
   case 264:
-#line 2502 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2502 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType();
     uint64_t NumElements = (yyvsp[(2) - (3)].ConstVector)->size(); 
@@ -5694,7 +5704,7 @@
     break;
 
   case 265:
-#line 2524 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2524 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     // Use undef instead of an array because it's inconvenient to determine
     // the element type at this point, there being no elements to examine.
@@ -5704,7 +5714,7 @@
     break;
 
   case 266:
-#line 2530 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2530 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     uint64_t NumElements = (yyvsp[(2) - (2)].StrVal)->length();
     const Type *ETy = Type::Int8Ty;
@@ -5721,7 +5731,7 @@
     break;
 
   case 267:
-#line 2543 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2543 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements((yyvsp[(2) - (3)].ConstVector)->size());
     for (unsigned i = 0, e = (yyvsp[(2) - (3)].ConstVector)->size(); i != e; ++i)
@@ -5737,7 +5747,7 @@
     break;
 
   case 268:
-#line 2555 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2555 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = StructType::get(std::vector<const Type*>());
     (yyval.ValIDVal) = ValID::create(ConstantStruct::get(STy, std::vector<Constant*>()));
@@ -5746,7 +5756,7 @@
     break;
 
   case 269:
-#line 2560 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2560 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements((yyvsp[(3) - (5)].ConstVector)->size());
     for (unsigned i = 0, e = (yyvsp[(3) - (5)].ConstVector)->size(); i != e; ++i)
@@ -5762,7 +5772,7 @@
     break;
 
   case 270:
-#line 2572 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2572 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = StructType::get(std::vector<const Type*>(),
                                             /*isPacked=*/true);
@@ -5772,7 +5782,7 @@
     break;
 
   case 271:
-#line 2578 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2578 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].ConstVal));
     CHECK_FOR_ERROR
@@ -5780,7 +5790,7 @@
     break;
 
   case 272:
-#line 2582 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2582 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createInlineAsm(*(yyvsp[(3) - (5)].StrVal), *(yyvsp[(5) - (5)].StrVal), (yyvsp[(2) - (5)].BoolVal));
     delete (yyvsp[(3) - (5)].StrVal);
@@ -5790,7 +5800,7 @@
     break;
 
   case 273:
-#line 2592 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2592 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {  // Is it an integer reference...?
     (yyval.ValIDVal) = ValID::createLocalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
@@ -5798,7 +5808,7 @@
     break;
 
   case 274:
-#line 2596 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2596 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
@@ -5806,7 +5816,7 @@
     break;
 
   case 275:
-#line 2600 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2600 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -5815,7 +5825,7 @@
     break;
 
   case 276:
-#line 2605 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2605 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createGlobalName(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -5824,7 +5834,7 @@
     break;
 
   case 279:
-#line 2618 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2618 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -5835,7 +5845,7 @@
     break;
 
   case 280:
-#line 2627 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2627 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = new std::vector<Value *>();
     (yyval.ValueList)->push_back((yyvsp[(1) - (1)].ValueVal)); 
@@ -5844,7 +5854,7 @@
     break;
 
   case 281:
-#line 2632 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2632 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ValueList)=(yyvsp[(1) - (3)].ValueList))->push_back((yyvsp[(3) - (3)].ValueVal)); 
     CHECK_FOR_ERROR
@@ -5852,7 +5862,7 @@
     break;
 
   case 282:
-#line 2637 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2637 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
@@ -5860,7 +5870,7 @@
     break;
 
   case 283:
-#line 2641 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2641 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { // Do not allow functions with 0 basic blocks   
     (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
@@ -5868,7 +5878,7 @@
     break;
 
   case 284:
-#line 2650 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2650 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     setValueName((yyvsp[(3) - (3)].TermInstVal), (yyvsp[(2) - (3)].StrVal));
     CHECK_FOR_ERROR
@@ -5880,7 +5890,7 @@
     break;
 
   case 285:
-#line 2659 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2659 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (CastInst *CI1 = dyn_cast<CastInst>((yyvsp[(2) - (2)].InstVal)))
       if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
@@ -5893,7 +5903,7 @@
     break;
 
   case 286:
-#line 2668 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2668 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {          // Empty space between instruction lists
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
     CHECK_FOR_ERROR
@@ -5901,17 +5911,65 @@
     break;
 
   case 287:
-#line 2672 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2672 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
+    {  // Only the unwind to block
+    (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
+    (yyval.BasicBlockVal)->setUnwindDest(getBBVal((yyvsp[(3) - (3)].ValIDVal)));
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 288:
+#line 2677 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
+    {             // Only the nounwind label
+    (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
+    (yyval.BasicBlockVal)->setDoesNotThrow();
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 289:
+#line 2682 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
+    {  // The nounwind and unwind to block
+    (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
+    (yyval.BasicBlockVal)->setUnwindDest(getBBVal((yyvsp[(4) - (4)].ValIDVal)));
+    (yyval.BasicBlockVal)->setDoesNotThrow();
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 290:
+#line 2688 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {             // Labelled (named) basic block
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal)));
     delete (yyvsp[(1) - (1)].StrVal);
     CHECK_FOR_ERROR
+  ;}
+    break;
 
+  case 291:
+#line 2693 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[(1) - (2)].StrVal)));
+    (yyval.BasicBlockVal)->setDoesNotThrow();
+    delete (yyvsp[(1) - (2)].StrVal);
+    CHECK_FOR_ERROR
   ;}
     break;
 
-  case 288:
-#line 2680 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 292:
+#line 2699 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[(1) - (5)].StrVal)));
+    (yyval.BasicBlockVal)->setUnwindDest(getBBVal((yyvsp[(5) - (5)].ValIDVal)));
+    (yyval.BasicBlockVal)->setDoesNotThrow();
+    delete (yyvsp[(1) - (5)].StrVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 293:
+#line 2708 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { // Return with a result...
     ValueList &VL = *(yyvsp[(2) - (2)].ValueList);
     assert(!VL.empty() && "Invalid ret operands!");
@@ -5921,16 +5979,16 @@
   ;}
     break;
 
-  case 289:
-#line 2687 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 294:
+#line 2715 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {                                    // Return with no result...
     (yyval.TermInstVal) = ReturnInst::Create();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 290:
-#line 2691 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 295:
+#line 2719 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {                           // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal((yyvsp[(3) - (3)].ValIDVal));
     CHECK_FOR_ERROR
@@ -5938,8 +5996,8 @@
   ;}
     break;
 
-  case 291:
-#line 2696 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 296:
+#line 2724 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {  
     if (cast<IntegerType>((yyvsp[(2) - (9)].PrimType))->getBitWidth() != 1)
       GEN_ERROR("Branch condition must have type i1");
@@ -5953,8 +6011,8 @@
   ;}
     break;
 
-  case 292:
-#line 2707 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 297:
+#line 2735 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[(2) - (9)].PrimType), (yyvsp[(3) - (9)].ValIDVal));
     CHECK_FOR_ERROR
@@ -5976,8 +6034,8 @@
   ;}
     break;
 
-  case 293:
-#line 2726 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 298:
+#line 2754 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[(2) - (8)].PrimType), (yyvsp[(3) - (8)].ValIDVal));
     CHECK_FOR_ERROR
@@ -5989,8 +6047,8 @@
   ;}
     break;
 
-  case 294:
-#line 2736 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 299:
+#line 2764 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -6078,24 +6136,24 @@
   ;}
     break;
 
-  case 295:
-#line 2821 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 300:
+#line 2849 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 296:
-#line 2825 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 301:
+#line 2853 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 297:
-#line 2832 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 302:
+#line 2860 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = (yyvsp[(1) - (6)].JumpTable);
     Constant *V = cast<Constant>(getExistingVal((yyvsp[(2) - (6)].PrimType), (yyvsp[(3) - (6)].ValIDVal)));
@@ -6109,8 +6167,8 @@
   ;}
     break;
 
-  case 298:
-#line 2843 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 303:
+#line 2871 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
     Constant *V = cast<Constant>(getExistingVal((yyvsp[(1) - (5)].PrimType), (yyvsp[(2) - (5)].ValIDVal)));
@@ -6125,8 +6183,8 @@
   ;}
     break;
 
-  case 299:
-#line 2856 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 304:
+#line 2884 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     // Is this definition named?? if so, assign the name...
     setValueName((yyvsp[(2) - (2)].InstVal), (yyvsp[(1) - (2)].StrVal));
@@ -6137,8 +6195,8 @@
   ;}
     break;
 
-  case 300:
-#line 2866 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 305:
+#line 2894 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {    // Used for PHI nodes
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (6)].TypeVal))->getDescription());
@@ -6152,8 +6210,8 @@
   ;}
     break;
 
-  case 301:
-#line 2877 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 306:
+#line 2905 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.PHIList) = (yyvsp[(1) - (7)].PHIList);
     Value* tmpVal = getVal((yyvsp[(1) - (7)].PHIList)->front().first->getType(), (yyvsp[(4) - (7)].ValIDVal));
@@ -6164,8 +6222,8 @@
   ;}
     break;
 
-  case 302:
-#line 2887 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 307:
+#line 2915 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
@@ -6179,8 +6237,8 @@
   ;}
     break;
 
-  case 303:
-#line 2898 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 308:
+#line 2926 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
     // Labels are only valid in ASMs
@@ -6191,8 +6249,8 @@
   ;}
     break;
 
-  case 304:
-#line 2906 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 309:
+#line 2934 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
@@ -6205,8 +6263,8 @@
   ;}
     break;
 
-  case 305:
-#line 2916 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 310:
+#line 2944 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
     (yyval.ParamList) = (yyvsp[(1) - (6)].ParamList);
@@ -6216,18 +6274,18 @@
   ;}
     break;
 
-  case 306:
-#line 2923 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 311:
+#line 2951 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamList) = new ParamList(); ;}
     break;
 
-  case 307:
-#line 2926 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 312:
+#line 2954 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueList) = new std::vector<Value*>(); ;}
     break;
 
-  case 308:
-#line 2927 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 313:
+#line 2955 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = (yyvsp[(1) - (3)].ValueList);
     (yyval.ValueList)->push_back((yyvsp[(3) - (3)].ValueVal));
@@ -6235,8 +6293,8 @@
   ;}
     break;
 
-  case 309:
-#line 2935 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 314:
+#line 2963 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstantList) = new std::vector<unsigned>();
     if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val))
@@ -6245,8 +6303,8 @@
   ;}
     break;
 
-  case 310:
-#line 2941 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 315:
+#line 2969 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstantList) = (yyvsp[(1) - (3)].ConstantList);
     if ((unsigned)(yyvsp[(3) - (3)].UInt64Val) != (yyvsp[(3) - (3)].UInt64Val))
@@ -6256,24 +6314,24 @@
   ;}
     break;
 
-  case 311:
-#line 2950 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 316:
+#line 2978 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 312:
-#line 2954 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 317:
+#line 2982 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 313:
-#line 2959 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 318:
+#line 2987 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6292,8 +6350,8 @@
   ;}
     break;
 
-  case 314:
-#line 2975 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 319:
+#line 3003 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6313,8 +6371,8 @@
   ;}
     break;
 
-  case 315:
-#line 2992 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 320:
+#line 3020 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6331,8 +6389,8 @@
   ;}
     break;
 
-  case 316:
-#line 3006 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 321:
+#line 3034 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6349,8 +6407,8 @@
   ;}
     break;
 
-  case 317:
-#line 3020 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 322:
+#line 3048 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6367,8 +6425,8 @@
   ;}
     break;
 
-  case 318:
-#line 3034 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 323:
+#line 3062 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6385,8 +6443,8 @@
   ;}
     break;
 
-  case 319:
-#line 3048 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 324:
+#line 3076 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
@@ -6401,8 +6459,8 @@
   ;}
     break;
 
-  case 320:
-#line 3060 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 325:
+#line 3088 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(2) - (6)].ValueVal)->getType() != Type::Int1Ty)
       GEN_ERROR("select condition must be boolean");
@@ -6413,8 +6471,8 @@
   ;}
     break;
 
-  case 321:
-#line 3068 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 326:
+#line 3096 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
@@ -6424,8 +6482,8 @@
   ;}
     break;
 
-  case 322:
-#line 3075 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 327:
+#line 3103 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[(2) - (4)].ValueVal), (yyvsp[(4) - (4)].ValueVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -6434,8 +6492,8 @@
   ;}
     break;
 
-  case 323:
-#line 3081 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 328:
+#line 3109 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal)))
       GEN_ERROR("Invalid insertelement operands");
@@ -6444,8 +6502,8 @@
   ;}
     break;
 
-  case 324:
-#line 3087 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 329:
+#line 3115 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal)))
       GEN_ERROR("Invalid shufflevector operands");
@@ -6454,8 +6512,8 @@
   ;}
     break;
 
-  case 325:
-#line 3093 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 330:
+#line 3121 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[(2) - (2)].PHIList)->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -6473,8 +6531,8 @@
   ;}
     break;
 
-  case 326:
-#line 3109 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 331:
+#line 3137 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -6566,32 +6624,32 @@
   ;}
     break;
 
-  case 327:
-#line 3198 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 332:
+#line 3226 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 328:
-#line 3203 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 333:
+#line 3231 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 329:
-#line 3207 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 334:
+#line 3235 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 330:
-#line 3214 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 335:
+#line 3242 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
@@ -6601,8 +6659,8 @@
   ;}
     break;
 
-  case 331:
-#line 3221 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 336:
+#line 3249 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
@@ -6615,8 +6673,8 @@
   ;}
     break;
 
-  case 332:
-#line 3231 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 337:
+#line 3259 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
@@ -6626,8 +6684,8 @@
   ;}
     break;
 
-  case 333:
-#line 3238 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 338:
+#line 3266 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
@@ -6640,8 +6698,8 @@
   ;}
     break;
 
-  case 334:
-#line 3248 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 339:
+#line 3276 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[(2) - (2)].ValueVal)->getType()))
       GEN_ERROR("Trying to free nonpointer type " + 
@@ -6651,8 +6709,8 @@
   ;}
     break;
 
-  case 335:
-#line 3256 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 340:
+#line 3284 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
@@ -6669,8 +6727,8 @@
   ;}
     break;
 
-  case 336:
-#line 3270 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 341:
+#line 3298 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (7)].TypeVal))->getDescription());
@@ -6690,8 +6748,8 @@
   ;}
     break;
 
-  case 337:
-#line 3287 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 342:
+#line 3315 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
   Value *TmpVal = getVal((yyvsp[(2) - (5)].TypeVal)->get(), (yyvsp[(3) - (5)].ValIDVal));
   if (!GetResultInst::isValidOperands(TmpVal, (yyvsp[(5) - (5)].UInt64Val)))
@@ -6702,8 +6760,8 @@
   ;}
     break;
 
-  case 338:
-#line 3295 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 343:
+#line 3323 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription());
@@ -6721,8 +6779,8 @@
   ;}
     break;
 
-  case 339:
-#line 3310 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 344:
+#line 3338 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription());
@@ -6740,8 +6798,8 @@
   ;}
     break;
 
-  case 340:
-#line 3325 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+  case 345:
+#line 3353 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (7)].TypeVal))->getDescription());
@@ -6763,7 +6821,7 @@
 
 
 /* Line 1267 of yacc.c.  */
-#line 6767 "llvmAsmParser.tab.c"
+#line 6825 "llvmAsmParser.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -6977,7 +7035,7 @@
 }
 
 
-#line 3344 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 3372 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
 
 
 // common code from the two 'RunVMAsmParser' functions

Modified: llvm/branches/non-call-eh/lib/AsmParser/llvmAsmParser.h.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/non-call-eh/lib/AsmParser/llvmAsmParser.h.cvs?rev=53164&r1=53163&r2=53164&view=diff

==============================================================================
--- llvm/branches/non-call-eh/lib/AsmParser/llvmAsmParser.h.cvs (original)
+++ llvm/branches/non-call-eh/lib/AsmParser/llvmAsmParser.h.cvs Sun Jul  6 16:59:11 2008
@@ -92,106 +92,107 @@
      TRIPLE = 308,
      ALIGN = 309,
      ADDRSPACE = 310,
-     DEPLIBS = 311,
-     CALL = 312,
-     TAIL = 313,
-     ASM_TOK = 314,
-     MODULE = 315,
-     SIDEEFFECT = 316,
-     CC_TOK = 317,
-     CCC_TOK = 318,
-     FASTCC_TOK = 319,
-     COLDCC_TOK = 320,
-     X86_STDCALLCC_TOK = 321,
-     X86_FASTCALLCC_TOK = 322,
-     DATALAYOUT = 323,
-     RET = 324,
-     BR = 325,
-     SWITCH = 326,
-     INVOKE = 327,
-     UNWIND = 328,
-     UNREACHABLE = 329,
-     ADD = 330,
-     SUB = 331,
-     MUL = 332,
-     UDIV = 333,
-     SDIV = 334,
-     FDIV = 335,
-     UREM = 336,
-     SREM = 337,
-     FREM = 338,
-     AND = 339,
-     OR = 340,
-     XOR = 341,
-     SHL = 342,
-     LSHR = 343,
-     ASHR = 344,
-     ICMP = 345,
-     FCMP = 346,
-     VICMP = 347,
-     VFCMP = 348,
-     EQ = 349,
-     NE = 350,
-     SLT = 351,
-     SGT = 352,
-     SLE = 353,
-     SGE = 354,
-     ULT = 355,
-     UGT = 356,
-     ULE = 357,
-     UGE = 358,
-     OEQ = 359,
-     ONE = 360,
-     OLT = 361,
-     OGT = 362,
-     OLE = 363,
-     OGE = 364,
-     ORD = 365,
-     UNO = 366,
-     UEQ = 367,
-     UNE = 368,
-     MALLOC = 369,
-     ALLOCA = 370,
-     FREE = 371,
-     LOAD = 372,
-     STORE = 373,
-     GETELEMENTPTR = 374,
-     TRUNC = 375,
-     ZEXT = 376,
-     SEXT = 377,
-     FPTRUNC = 378,
-     FPEXT = 379,
-     BITCAST = 380,
-     UITOFP = 381,
-     SITOFP = 382,
-     FPTOUI = 383,
-     FPTOSI = 384,
-     INTTOPTR = 385,
-     PTRTOINT = 386,
-     PHI_TOK = 387,
-     SELECT = 388,
-     VAARG = 389,
-     EXTRACTELEMENT = 390,
-     INSERTELEMENT = 391,
-     SHUFFLEVECTOR = 392,
-     GETRESULT = 393,
-     EXTRACTVALUE = 394,
-     INSERTVALUE = 395,
-     SIGNEXT = 396,
-     ZEROEXT = 397,
-     NORETURN = 398,
-     INREG = 399,
-     SRET = 400,
-     NOUNWIND = 401,
-     NOALIAS = 402,
-     BYVAL = 403,
-     NEST = 404,
-     READNONE = 405,
-     READONLY = 406,
-     GC = 407,
-     DEFAULT = 408,
-     HIDDEN = 409,
-     PROTECTED = 410
+     UNWINDS = 311,
+     DEPLIBS = 312,
+     CALL = 313,
+     TAIL = 314,
+     ASM_TOK = 315,
+     MODULE = 316,
+     SIDEEFFECT = 317,
+     CC_TOK = 318,
+     CCC_TOK = 319,
+     FASTCC_TOK = 320,
+     COLDCC_TOK = 321,
+     X86_STDCALLCC_TOK = 322,
+     X86_FASTCALLCC_TOK = 323,
+     DATALAYOUT = 324,
+     RET = 325,
+     BR = 326,
+     SWITCH = 327,
+     INVOKE = 328,
+     UNWIND = 329,
+     UNREACHABLE = 330,
+     ADD = 331,
+     SUB = 332,
+     MUL = 333,
+     UDIV = 334,
+     SDIV = 335,
+     FDIV = 336,
+     UREM = 337,
+     SREM = 338,
+     FREM = 339,
+     AND = 340,
+     OR = 341,
+     XOR = 342,
+     SHL = 343,
+     LSHR = 344,
+     ASHR = 345,
+     ICMP = 346,
+     FCMP = 347,
+     VICMP = 348,
+     VFCMP = 349,
+     EQ = 350,
+     NE = 351,
+     SLT = 352,
+     SGT = 353,
+     SLE = 354,
+     SGE = 355,
+     ULT = 356,
+     UGT = 357,
+     ULE = 358,
+     UGE = 359,
+     OEQ = 360,
+     ONE = 361,
+     OLT = 362,
+     OGT = 363,
+     OLE = 364,
+     OGE = 365,
+     ORD = 366,
+     UNO = 367,
+     UEQ = 368,
+     UNE = 369,
+     MALLOC = 370,
+     ALLOCA = 371,
+     FREE = 372,
+     LOAD = 373,
+     STORE = 374,
+     GETELEMENTPTR = 375,
+     TRUNC = 376,
+     ZEXT = 377,
+     SEXT = 378,
+     FPTRUNC = 379,
+     FPEXT = 380,
+     BITCAST = 381,
+     UITOFP = 382,
+     SITOFP = 383,
+     FPTOUI = 384,
+     FPTOSI = 385,
+     INTTOPTR = 386,
+     PTRTOINT = 387,
+     PHI_TOK = 388,
+     SELECT = 389,
+     VAARG = 390,
+     EXTRACTELEMENT = 391,
+     INSERTELEMENT = 392,
+     SHUFFLEVECTOR = 393,
+     GETRESULT = 394,
+     EXTRACTVALUE = 395,
+     INSERTVALUE = 396,
+     SIGNEXT = 397,
+     ZEROEXT = 398,
+     NORETURN = 399,
+     INREG = 400,
+     SRET = 401,
+     NOUNWIND = 402,
+     NOALIAS = 403,
+     BYVAL = 404,
+     NEST = 405,
+     READNONE = 406,
+     READONLY = 407,
+     GC = 408,
+     DEFAULT = 409,
+     HIDDEN = 410,
+     PROTECTED = 411
    };
 #endif
 /* Tokens.  */
@@ -248,113 +249,114 @@
 #define TRIPLE 308
 #define ALIGN 309
 #define ADDRSPACE 310
-#define DEPLIBS 311
-#define CALL 312
-#define TAIL 313
-#define ASM_TOK 314
-#define MODULE 315
-#define SIDEEFFECT 316
-#define CC_TOK 317
-#define CCC_TOK 318
-#define FASTCC_TOK 319
-#define COLDCC_TOK 320
-#define X86_STDCALLCC_TOK 321
-#define X86_FASTCALLCC_TOK 322
-#define DATALAYOUT 323
-#define RET 324
-#define BR 325
-#define SWITCH 326
-#define INVOKE 327
-#define UNWIND 328
-#define UNREACHABLE 329
-#define ADD 330
-#define SUB 331
-#define MUL 332
-#define UDIV 333
-#define SDIV 334
-#define FDIV 335
-#define UREM 336
-#define SREM 337
-#define FREM 338
-#define AND 339
-#define OR 340
-#define XOR 341
-#define SHL 342
-#define LSHR 343
-#define ASHR 344
-#define ICMP 345
-#define FCMP 346
-#define VICMP 347
-#define VFCMP 348
-#define EQ 349
-#define NE 350
-#define SLT 351
-#define SGT 352
-#define SLE 353
-#define SGE 354
-#define ULT 355
-#define UGT 356
-#define ULE 357
-#define UGE 358
-#define OEQ 359
-#define ONE 360
-#define OLT 361
-#define OGT 362
-#define OLE 363
-#define OGE 364
-#define ORD 365
-#define UNO 366
-#define UEQ 367
-#define UNE 368
-#define MALLOC 369
-#define ALLOCA 370
-#define FREE 371
-#define LOAD 372
-#define STORE 373
-#define GETELEMENTPTR 374
-#define TRUNC 375
-#define ZEXT 376
-#define SEXT 377
-#define FPTRUNC 378
-#define FPEXT 379
-#define BITCAST 380
-#define UITOFP 381
-#define SITOFP 382
-#define FPTOUI 383
-#define FPTOSI 384
-#define INTTOPTR 385
-#define PTRTOINT 386
-#define PHI_TOK 387
-#define SELECT 388
-#define VAARG 389
-#define EXTRACTELEMENT 390
-#define INSERTELEMENT 391
-#define SHUFFLEVECTOR 392
-#define GETRESULT 393
-#define EXTRACTVALUE 394
-#define INSERTVALUE 395
-#define SIGNEXT 396
-#define ZEROEXT 397
-#define NORETURN 398
-#define INREG 399
-#define SRET 400
-#define NOUNWIND 401
-#define NOALIAS 402
-#define BYVAL 403
-#define NEST 404
-#define READNONE 405
-#define READONLY 406
-#define GC 407
-#define DEFAULT 408
-#define HIDDEN 409
-#define PROTECTED 410
+#define UNWINDS 311
+#define DEPLIBS 312
+#define CALL 313
+#define TAIL 314
+#define ASM_TOK 315
+#define MODULE 316
+#define SIDEEFFECT 317
+#define CC_TOK 318
+#define CCC_TOK 319
+#define FASTCC_TOK 320
+#define COLDCC_TOK 321
+#define X86_STDCALLCC_TOK 322
+#define X86_FASTCALLCC_TOK 323
+#define DATALAYOUT 324
+#define RET 325
+#define BR 326
+#define SWITCH 327
+#define INVOKE 328
+#define UNWIND 329
+#define UNREACHABLE 330
+#define ADD 331
+#define SUB 332
+#define MUL 333
+#define UDIV 334
+#define SDIV 335
+#define FDIV 336
+#define UREM 337
+#define SREM 338
+#define FREM 339
+#define AND 340
+#define OR 341
+#define XOR 342
+#define SHL 343
+#define LSHR 344
+#define ASHR 345
+#define ICMP 346
+#define FCMP 347
+#define VICMP 348
+#define VFCMP 349
+#define EQ 350
+#define NE 351
+#define SLT 352
+#define SGT 353
+#define SLE 354
+#define SGE 355
+#define ULT 356
+#define UGT 357
+#define ULE 358
+#define UGE 359
+#define OEQ 360
+#define ONE 361
+#define OLT 362
+#define OGT 363
+#define OLE 364
+#define OGE 365
+#define ORD 366
+#define UNO 367
+#define UEQ 368
+#define UNE 369
+#define MALLOC 370
+#define ALLOCA 371
+#define FREE 372
+#define LOAD 373
+#define STORE 374
+#define GETELEMENTPTR 375
+#define TRUNC 376
+#define ZEXT 377
+#define SEXT 378
+#define FPTRUNC 379
+#define FPEXT 380
+#define BITCAST 381
+#define UITOFP 382
+#define SITOFP 383
+#define FPTOUI 384
+#define FPTOSI 385
+#define INTTOPTR 386
+#define PTRTOINT 387
+#define PHI_TOK 388
+#define SELECT 389
+#define VAARG 390
+#define EXTRACTELEMENT 391
+#define INSERTELEMENT 392
+#define SHUFFLEVECTOR 393
+#define GETRESULT 394
+#define EXTRACTVALUE 395
+#define INSERTVALUE 396
+#define SIGNEXT 397
+#define ZEROEXT 398
+#define NORETURN 399
+#define INREG 400
+#define SRET 401
+#define NOUNWIND 402
+#define NOALIAS 403
+#define BYVAL 404
+#define NEST 405
+#define READNONE 406
+#define READONLY 407
+#define GC 408
+#define DEFAULT 409
+#define HIDDEN 410
+#define PROTECTED 411
 
 
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 953 "/Volumes/Data/Code/work/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 953 "/home/nicholas/llvm-non-call-eh/lib/AsmParser/llvmAsmParser.y"
 {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -402,8 +404,8 @@
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
 }
-/* Line 1529 of yacc.c.  */
-#line 407 "llvmAsmParser.tab.h"
+/* Line 1489 of yacc.c.  */
+#line 409 "llvmAsmParser.tab.h"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1

Modified: llvm/branches/non-call-eh/lib/AsmParser/llvmAsmParser.y
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/non-call-eh/lib/AsmParser/llvmAsmParser.y?rev=53164&r1=53163&r2=53164&view=diff

==============================================================================
--- llvm/branches/non-call-eh/lib/AsmParser/llvmAsmParser.y (original)
+++ llvm/branches/non-call-eh/lib/AsmParser/llvmAsmParser.y Sun Jul  6 16:59:11 2008
@@ -1065,7 +1065,7 @@
 %token DECLARE DEFINE GLOBAL CONSTANT SECTION ALIAS VOLATILE THREAD_LOCAL
 %token TO DOTDOTDOT NULL_TOK UNDEF INTERNAL LINKONCE WEAK APPENDING
 %token DLLIMPORT DLLEXPORT EXTERN_WEAK COMMON
-%token OPAQUE EXTERNAL TARGET TRIPLE ALIGN ADDRSPACE
+%token OPAQUE EXTERNAL TARGET TRIPLE ALIGN ADDRSPACE UNWINDS
 %token DEPLIBS CALL TAIL ASM_TOK MODULE SIDEEFFECT
 %token CC_TOK CCC_TOK FASTCC_TOK COLDCC_TOK X86_STDCALLCC_TOK X86_FASTCALLCC_TOK
 %token DATALAYOUT
@@ -2670,34 +2670,35 @@
     CHECK_FOR_ERROR
   }
   | UNWINDS TO ValueRef {  // Only the unwind to block
-    $$ = defineBBVal(ValID::createLocalID(CurFun.NextValNum), getBBVal($3));
+    $$ = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
+    $$->setUnwindDest(getBBVal($3));
     CHECK_FOR_ERROR
   }
   | NOUNWIND {             // Only the nounwind label
-    $$ = defineBBVal(ValID::createLocalID(CurFun.NextValNum), 0);
+    $$ = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
     $$->setDoesNotThrow();
     CHECK_FOR_ERROR
   }
   | NOUNWIND UNWINDS TO ValueRef {  // The nounwind and unwind to block
-    $$ = defineBBVal(ValID::createLocalID(CurFun.NextValNum), getBBVal($4));
+    $$ = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
+    $$->setUnwindDest(getBBVal($4));
     $$->setDoesNotThrow();
     CHECK_FOR_ERROR
   }
- 
   | LABELSTR {             // Labelled (named) basic block
     $$ = defineBBVal(ValID::createLocalName(*$1));
     delete $1;
     CHECK_FOR_ERROR
-
   };
   | LABELSTR NOUNWIND {
-    $$ = defineBBVal(ValID::createLocalName(*$1), 0);
+    $$ = defineBBVal(ValID::createLocalName(*$1));
     $$->setDoesNotThrow();
     delete $1;
     CHECK_FOR_ERROR
   };
   | LABELSTR NOUNWIND UNWINDS TO ValueRef {
-    $$ = defineBBVal(ValID::createLocalName(*$1), getBBVal($5));
+    $$ = defineBBVal(ValID::createLocalName(*$1));
+    $$->setUnwindDest(getBBVal($5));
     $$->setDoesNotThrow();
     delete $1;
     CHECK_FOR_ERROR

Modified: llvm/branches/non-call-eh/lib/AsmParser/llvmAsmParser.y.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/non-call-eh/lib/AsmParser/llvmAsmParser.y.cvs?rev=53164&r1=53163&r2=53164&view=diff

==============================================================================
--- llvm/branches/non-call-eh/lib/AsmParser/llvmAsmParser.y.cvs (original)
+++ llvm/branches/non-call-eh/lib/AsmParser/llvmAsmParser.y.cvs Sun Jul  6 16:59:11 2008
@@ -1065,7 +1065,7 @@
 %token DECLARE DEFINE GLOBAL CONSTANT SECTION ALIAS VOLATILE THREAD_LOCAL
 %token TO DOTDOTDOT NULL_TOK UNDEF INTERNAL LINKONCE WEAK APPENDING
 %token DLLIMPORT DLLEXPORT EXTERN_WEAK COMMON
-%token OPAQUE EXTERNAL TARGET TRIPLE ALIGN ADDRSPACE
+%token OPAQUE EXTERNAL TARGET TRIPLE ALIGN ADDRSPACE UNWINDS
 %token DEPLIBS CALL TAIL ASM_TOK MODULE SIDEEFFECT
 %token CC_TOK CCC_TOK FASTCC_TOK COLDCC_TOK X86_STDCALLCC_TOK X86_FASTCALLCC_TOK
 %token DATALAYOUT
@@ -2669,11 +2669,39 @@
     $$ = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
     CHECK_FOR_ERROR
   }
+  | UNWINDS TO ValueRef {  // Only the unwind to block
+    $$ = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
+    $$->setUnwindDest(getBBVal($3));
+    CHECK_FOR_ERROR
+  }
+  | NOUNWIND {             // Only the nounwind label
+    $$ = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
+    $$->setDoesNotThrow();
+    CHECK_FOR_ERROR
+  }
+  | NOUNWIND UNWINDS TO ValueRef {  // The nounwind and unwind to block
+    $$ = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
+    $$->setUnwindDest(getBBVal($4));
+    $$->setDoesNotThrow();
+    CHECK_FOR_ERROR
+  }
   | LABELSTR {             // Labelled (named) basic block
     $$ = defineBBVal(ValID::createLocalName(*$1));
     delete $1;
     CHECK_FOR_ERROR
-
+  };
+  | LABELSTR NOUNWIND {
+    $$ = defineBBVal(ValID::createLocalName(*$1));
+    $$->setDoesNotThrow();
+    delete $1;
+    CHECK_FOR_ERROR
+  };
+  | LABELSTR NOUNWIND UNWINDS TO ValueRef {
+    $$ = defineBBVal(ValID::createLocalName(*$1));
+    $$->setUnwindDest(getBBVal($5));
+    $$->setDoesNotThrow();
+    delete $1;
+    CHECK_FOR_ERROR
   };
 
 BBTerminatorInst : 

Modified: llvm/branches/non-call-eh/lib/Bitcode/Writer/BitcodeWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/non-call-eh/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=53164&r1=53163&r2=53164&view=diff

==============================================================================
--- llvm/branches/non-call-eh/lib/Bitcode/Writer/BitcodeWriter.cpp (original)
+++ llvm/branches/non-call-eh/lib/Bitcode/Writer/BitcodeWriter.cpp Sun Jul  6 16:59:11 2008
@@ -1030,6 +1030,7 @@
       if (I->getType() != Type::VoidTy)
         ++InstID;
     }
+  }
   
   // Emit names for all the instructions etc.
   WriteValueSymbolTable(F.getValueSymbolTable(), VE, Stream);

Modified: llvm/branches/non-call-eh/lib/VMCore/BasicBlock.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/non-call-eh/lib/VMCore/BasicBlock.cpp?rev=53164&r1=53163&r2=53164&view=diff

==============================================================================
--- llvm/branches/non-call-eh/lib/VMCore/BasicBlock.cpp (original)
+++ llvm/branches/non-call-eh/lib/VMCore/BasicBlock.cpp Sun Jul  6 16:59:11 2008
@@ -75,7 +75,8 @@
 
 BasicBlock::BasicBlock(const std::string &Name, Function *NewParent,
                        BasicBlock *InsertBefore)
-  : User(Type::LabelTy, Value::BasicBlockVal, OpList?, NumOps?), Parent(0) {
+  : User(Type::LabelTy, Value::BasicBlockVal,
+         OperandTraits<BasicBlock>::op_begin(this), 0), Parent(0) {
 
   // Make sure that we get added to a function
   LeakDetector::addGarbageObject(this);
@@ -96,6 +97,7 @@
 
 BasicBlock::~BasicBlock() {
   assert(getParent() == 0 && "BasicBlock still linked into the program!");
+  NumOperands = 1;     // force User::operator delete to find the Use storage
   dropAllReferences();
   InstList.clear();
 }
@@ -120,6 +122,9 @@
 }
 
 const BasicBlock *BasicBlock::getUnwindDest() const {
+  if (getNumOperands() == 0)
+    return NULL;
+
   return getOperand(0);
 }
 
@@ -127,6 +132,9 @@
 /// instruction occurs in this block. May be null, in which case unwinding
 /// exits the function.
 BasicBlock *BasicBlock::getUnwindDest() {
+  if (getNumOperands() == 0)
+    return NULL;
+
   return getOperand(0);
 }
 





More information about the llvm-commits mailing list