diff --git a/llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs b/llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs
index debb995..702bb09 100644
--- a/llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs
+++ b/llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs
@@ -96,122 +96,123 @@
      BEGINTOK = 287,
      ENDTOK = 288,
      DECLARE = 289,
-     GLOBAL = 290,
-     CONSTANT = 291,
-     SECTION = 292,
-     VOLATILE = 293,
-     TO = 294,
-     DOTDOTDOT = 295,
-     CONST = 296,
-     INTERNAL = 297,
-     LINKONCE = 298,
-     WEAK = 299,
-     DLLIMPORT = 300,
-     DLLEXPORT = 301,
-     EXTERN_WEAK = 302,
-     APPENDING = 303,
-     NOT = 304,
-     EXTERNAL = 305,
-     TARGET = 306,
-     TRIPLE = 307,
-     ENDIAN = 308,
-     POINTERSIZE = 309,
-     LITTLE = 310,
-     BIG = 311,
-     ALIGN = 312,
-     UNINITIALIZED = 313,
-     DEPLIBS = 314,
-     CALL = 315,
-     TAIL = 316,
-     ASM_TOK = 317,
-     MODULE = 318,
-     SIDEEFFECT = 319,
-     CC_TOK = 320,
-     CCC_TOK = 321,
-     CSRETCC_TOK = 322,
-     FASTCC_TOK = 323,
-     COLDCC_TOK = 324,
-     X86_STDCALLCC_TOK = 325,
-     X86_FASTCALLCC_TOK = 326,
-     DATALAYOUT = 327,
-     RET = 328,
-     BR = 329,
-     SWITCH = 330,
-     INVOKE = 331,
-     EXCEPT = 332,
-     UNWIND = 333,
-     UNREACHABLE = 334,
-     ADD = 335,
-     SUB = 336,
-     MUL = 337,
-     DIV = 338,
-     UDIV = 339,
-     SDIV = 340,
-     FDIV = 341,
-     REM = 342,
-     UREM = 343,
-     SREM = 344,
-     FREM = 345,
-     AND = 346,
-     OR = 347,
-     XOR = 348,
-     SETLE = 349,
-     SETGE = 350,
-     SETLT = 351,
-     SETGT = 352,
-     SETEQ = 353,
-     SETNE = 354,
-     ICMP = 355,
-     FCMP = 356,
-     EQ = 357,
-     NE = 358,
-     SLT = 359,
-     SGT = 360,
-     SLE = 361,
-     SGE = 362,
-     OEQ = 363,
-     ONE = 364,
-     OLT = 365,
-     OGT = 366,
-     OLE = 367,
-     OGE = 368,
-     ORD = 369,
-     UNO = 370,
-     UEQ = 371,
-     UNE = 372,
-     ULT = 373,
-     UGT = 374,
-     ULE = 375,
-     UGE = 376,
-     MALLOC = 377,
-     ALLOCA = 378,
-     FREE = 379,
-     LOAD = 380,
-     STORE = 381,
-     GETELEMENTPTR = 382,
-     PHI_TOK = 383,
-     SELECT = 384,
-     SHL = 385,
-     SHR = 386,
-     ASHR = 387,
-     LSHR = 388,
-     VAARG = 389,
-     EXTRACTELEMENT = 390,
-     INSERTELEMENT = 391,
-     SHUFFLEVECTOR = 392,
-     CAST = 393,
-     TRUNC = 394,
-     ZEXT = 395,
-     SEXT = 396,
-     FPTRUNC = 397,
-     FPEXT = 398,
-     FPTOUI = 399,
-     FPTOSI = 400,
-     UITOFP = 401,
-     SITOFP = 402,
-     PTRTOINT = 403,
-     INTTOPTR = 404,
-     BITCAST = 405
+     DEFINE = 290,
+     GLOBAL = 291,
+     CONSTANT = 292,
+     SECTION = 293,
+     VOLATILE = 294,
+     TO = 295,
+     DOTDOTDOT = 296,
+     CONST = 297,
+     INTERNAL = 298,
+     LINKONCE = 299,
+     WEAK = 300,
+     DLLIMPORT = 301,
+     DLLEXPORT = 302,
+     EXTERN_WEAK = 303,
+     APPENDING = 304,
+     NOT = 305,
+     EXTERNAL = 306,
+     TARGET = 307,
+     TRIPLE = 308,
+     ENDIAN = 309,
+     POINTERSIZE = 310,
+     LITTLE = 311,
+     BIG = 312,
+     ALIGN = 313,
+     UNINITIALIZED = 314,
+     DEPLIBS = 315,
+     CALL = 316,
+     TAIL = 317,
+     ASM_TOK = 318,
+     MODULE = 319,
+     SIDEEFFECT = 320,
+     CC_TOK = 321,
+     CCC_TOK = 322,
+     CSRETCC_TOK = 323,
+     FASTCC_TOK = 324,
+     COLDCC_TOK = 325,
+     X86_STDCALLCC_TOK = 326,
+     X86_FASTCALLCC_TOK = 327,
+     DATALAYOUT = 328,
+     RET = 329,
+     BR = 330,
+     SWITCH = 331,
+     INVOKE = 332,
+     EXCEPT = 333,
+     UNWIND = 334,
+     UNREACHABLE = 335,
+     ADD = 336,
+     SUB = 337,
+     MUL = 338,
+     DIV = 339,
+     UDIV = 340,
+     SDIV = 341,
+     FDIV = 342,
+     REM = 343,
+     UREM = 344,
+     SREM = 345,
+     FREM = 346,
+     AND = 347,
+     OR = 348,
+     XOR = 349,
+     SETLE = 350,
+     SETGE = 351,
+     SETLT = 352,
+     SETGT = 353,
+     SETEQ = 354,
+     SETNE = 355,
+     ICMP = 356,
+     FCMP = 357,
+     EQ = 358,
+     NE = 359,
+     SLT = 360,
+     SGT = 361,
+     SLE = 362,
+     SGE = 363,
+     OEQ = 364,
+     ONE = 365,
+     OLT = 366,
+     OGT = 367,
+     OLE = 368,
+     OGE = 369,
+     ORD = 370,
+     UNO = 371,
+     UEQ = 372,
+     UNE = 373,
+     ULT = 374,
+     UGT = 375,
+     ULE = 376,
+     UGE = 377,
+     MALLOC = 378,
+     ALLOCA = 379,
+     FREE = 380,
+     LOAD = 381,
+     STORE = 382,
+     GETELEMENTPTR = 383,
+     PHI_TOK = 384,
+     SELECT = 385,
+     SHL = 386,
+     SHR = 387,
+     ASHR = 388,
+     LSHR = 389,
+     VAARG = 390,
+     EXTRACTELEMENT = 391,
+     INSERTELEMENT = 392,
+     SHUFFLEVECTOR = 393,
+     CAST = 394,
+     TRUNC = 395,
+     ZEXT = 396,
+     SEXT = 397,
+     FPTRUNC = 398,
+     FPEXT = 399,
+     FPTOUI = 400,
+     FPTOSI = 401,
+     UITOFP = 402,
+     SITOFP = 403,
+     PTRTOINT = 404,
+     INTTOPTR = 405,
+     BITCAST = 406
    };
 #endif
 /* Tokens.  */
@@ -247,128 +248,129 @@
 #define BEGINTOK 287
 #define ENDTOK 288
 #define DECLARE 289
-#define GLOBAL 290
-#define CONSTANT 291
-#define SECTION 292
-#define VOLATILE 293
-#define TO 294
-#define DOTDOTDOT 295
-#define CONST 296
-#define INTERNAL 297
-#define LINKONCE 298
-#define WEAK 299
-#define DLLIMPORT 300
-#define DLLEXPORT 301
-#define EXTERN_WEAK 302
-#define APPENDING 303
-#define NOT 304
-#define EXTERNAL 305
-#define TARGET 306
-#define TRIPLE 307
-#define ENDIAN 308
-#define POINTERSIZE 309
-#define LITTLE 310
-#define BIG 311
-#define ALIGN 312
-#define UNINITIALIZED 313
-#define DEPLIBS 314
-#define CALL 315
-#define TAIL 316
-#define ASM_TOK 317
-#define MODULE 318
-#define SIDEEFFECT 319
-#define CC_TOK 320
-#define CCC_TOK 321
-#define CSRETCC_TOK 322
-#define FASTCC_TOK 323
-#define COLDCC_TOK 324
-#define X86_STDCALLCC_TOK 325
-#define X86_FASTCALLCC_TOK 326
-#define DATALAYOUT 327
-#define RET 328
-#define BR 329
-#define SWITCH 330
-#define INVOKE 331
-#define EXCEPT 332
-#define UNWIND 333
-#define UNREACHABLE 334
-#define ADD 335
-#define SUB 336
-#define MUL 337
-#define DIV 338
-#define UDIV 339
-#define SDIV 340
-#define FDIV 341
-#define REM 342
-#define UREM 343
-#define SREM 344
-#define FREM 345
-#define AND 346
-#define OR 347
-#define XOR 348
-#define SETLE 349
-#define SETGE 350
-#define SETLT 351
-#define SETGT 352
-#define SETEQ 353
-#define SETNE 354
-#define ICMP 355
-#define FCMP 356
-#define EQ 357
-#define NE 358
-#define SLT 359
-#define SGT 360
-#define SLE 361
-#define SGE 362
-#define OEQ 363
-#define ONE 364
-#define OLT 365
-#define OGT 366
-#define OLE 367
-#define OGE 368
-#define ORD 369
-#define UNO 370
-#define UEQ 371
-#define UNE 372
-#define ULT 373
-#define UGT 374
-#define ULE 375
-#define UGE 376
-#define MALLOC 377
-#define ALLOCA 378
-#define FREE 379
-#define LOAD 380
-#define STORE 381
-#define GETELEMENTPTR 382
-#define PHI_TOK 383
-#define SELECT 384
-#define SHL 385
-#define SHR 386
-#define ASHR 387
-#define LSHR 388
-#define VAARG 389
-#define EXTRACTELEMENT 390
-#define INSERTELEMENT 391
-#define SHUFFLEVECTOR 392
-#define CAST 393
-#define TRUNC 394
-#define ZEXT 395
-#define SEXT 396
-#define FPTRUNC 397
-#define FPEXT 398
-#define FPTOUI 399
-#define FPTOSI 400
-#define UITOFP 401
-#define SITOFP 402
-#define PTRTOINT 403
-#define INTTOPTR 404
-#define BITCAST 405
+#define DEFINE 290
+#define GLOBAL 291
+#define CONSTANT 292
+#define SECTION 293
+#define VOLATILE 294
+#define TO 295
+#define DOTDOTDOT 296
+#define CONST 297
+#define INTERNAL 298
+#define LINKONCE 299
+#define WEAK 300
+#define DLLIMPORT 301
+#define DLLEXPORT 302
+#define EXTERN_WEAK 303
+#define APPENDING 304
+#define NOT 305
+#define EXTERNAL 306
+#define TARGET 307
+#define TRIPLE 308
+#define ENDIAN 309
+#define POINTERSIZE 310
+#define LITTLE 311
+#define BIG 312
+#define ALIGN 313
+#define UNINITIALIZED 314
+#define DEPLIBS 315
+#define CALL 316
+#define TAIL 317
+#define ASM_TOK 318
+#define MODULE 319
+#define SIDEEFFECT 320
+#define CC_TOK 321
+#define CCC_TOK 322
+#define CSRETCC_TOK 323
+#define FASTCC_TOK 324
+#define COLDCC_TOK 325
+#define X86_STDCALLCC_TOK 326
+#define X86_FASTCALLCC_TOK 327
+#define DATALAYOUT 328
+#define RET 329
+#define BR 330
+#define SWITCH 331
+#define INVOKE 332
+#define EXCEPT 333
+#define UNWIND 334
+#define UNREACHABLE 335
+#define ADD 336
+#define SUB 337
+#define MUL 338
+#define DIV 339
+#define UDIV 340
+#define SDIV 341
+#define FDIV 342
+#define REM 343
+#define UREM 344
+#define SREM 345
+#define FREM 346
+#define AND 347
+#define OR 348
+#define XOR 349
+#define SETLE 350
+#define SETGE 351
+#define SETLT 352
+#define SETGT 353
+#define SETEQ 354
+#define SETNE 355
+#define ICMP 356
+#define FCMP 357
+#define EQ 358
+#define NE 359
+#define SLT 360
+#define SGT 361
+#define SLE 362
+#define SGE 363
+#define OEQ 364
+#define ONE 365
+#define OLT 366
+#define OGT 367
+#define OLE 368
+#define OGE 369
+#define ORD 370
+#define UNO 371
+#define UEQ 372
+#define UNE 373
+#define ULT 374
+#define UGT 375
+#define ULE 376
+#define UGE 377
+#define MALLOC 378
+#define ALLOCA 379
+#define FREE 380
+#define LOAD 381
+#define STORE 382
+#define GETELEMENTPTR 383
+#define PHI_TOK 384
+#define SELECT 385
+#define SHL 386
+#define SHR 387
+#define ASHR 388
+#define LSHR 389
+#define VAARG 390
+#define EXTRACTELEMENT 391
+#define INSERTELEMENT 392
+#define SHUFFLEVECTOR 393
+#define CAST 394
+#define TRUNC 395
+#define ZEXT 396
+#define SEXT 397
+#define FPTRUNC 398
+#define FPEXT 399
+#define FPTOUI 400
+#define FPTOSI 401
+#define UITOFP 402
+#define SITOFP 403
+#define PTRTOINT 404
+#define INTTOPTR 405
+#define BITCAST 406
 
 
 
 
 /* Copy the first part of user declarations.  */
-#line 14 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 14 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
 
 #include "ParserInternals.h"
 #include <llvm/ADT/StringExtras.h>
@@ -647,7 +649,7 @@
 #endif
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 275 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 275 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
 typedef union YYSTYPE {
   std::string*    String;
   TypeInfo        Type;
@@ -656,7 +658,7 @@
   ValueList*      ValList;
 } YYSTYPE;
 /* Line 196 of yacc.c.  */
-#line 660 "UpgradeParser.tab.c"
+#line 662 "UpgradeParser.tab.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -668,7 +670,7 @@
 
 
 /* Line 219 of yacc.c.  */
-#line 672 "UpgradeParser.tab.c"
+#line 674 "UpgradeParser.tab.c"
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 # define YYSIZE_T __SIZE_TYPE__
@@ -819,20 +821,20 @@
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  4
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1483
+#define YYLAST   1554
 
 /* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS  165
+#define YYNTOKENS  166
 /* YYNNTS -- Number of nonterminals. */
 #define YYNNTS  75
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  299
+#define YYNRULES  302
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  582
+#define YYNSTATES  590
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   405
+#define YYMAXUTOK   406
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -844,15 +846,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,
-     154,   155,   163,     2,   152,     2,     2,     2,     2,     2,
+     155,   156,   164,     2,   153,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     159,   151,   160,     2,     2,     2,     2,     2,     2,     2,
+     160,   152,   161,     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,   153,   158,     2,     2,     2,     2,     2,   164,
+       2,   157,   154,   159,     2,     2,     2,     2,     2,   165,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     157,     2,     2,   161,     2,   162,     2,     2,     2,     2,
+     158,     2,     2,   162,     2,   163,     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,
@@ -880,7 +882,7 @@
      115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
      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
+     145,   146,   147,   148,   149,   150,   151
 };
 
 #if YYDEBUG
@@ -901,122 +903,124 @@
      197,   200,   201,   205,   208,   209,   211,   212,   216,   218,
      221,   223,   225,   227,   229,   231,   233,   235,   237,   239,
      241,   243,   245,   247,   249,   251,   253,   255,   257,   259,
-     261,   264,   269,   275,   281,   285,   288,   291,   293,   297,
-     299,   303,   305,   306,   311,   315,   319,   324,   329,   333,
-     336,   339,   342,   345,   348,   351,   354,   357,   360,   363,
-     370,   376,   385,   392,   399,   406,   414,   422,   429,   436,
-     445,   454,   458,   460,   462,   464,   466,   469,   472,   477,
-     480,   482,   484,   486,   491,   494,   499,   506,   513,   520,
-     527,   531,   536,   537,   539,   541,   543,   547,   551,   555,
-     559,   563,   567,   569,   570,   572,   574,   576,   577,   580,
-     584,   586,   588,   592,   594,   595,   604,   606,   608,   612,
-     614,   616,   620,   621,   623,   625,   629,   630,   632,   634,
-     636,   638,   640,   642,   644,   646,   648,   652,   654,   660,
-     662,   664,   666,   668,   671,   674,   676,   679,   682,   683,
-     685,   687,   689,   692,   695,   699,   709,   719,   728,   743,
-     745,   747,   754,   760,   763,   770,   778,   780,   784,   786,
-     787,   790,   792,   798,   804,   810,   818,   826,   829,   834,
-     839,   846,   851,   856,   863,   870,   873,   881,   883,   886,
-     887,   889,   890,   894,   901,   905,   912,   915,   920,   927
+     261,   264,   269,   275,   281,   285,   288,   294,   299,   302,
+     304,   308,   310,   314,   316,   317,   322,   326,   330,   335,
+     340,   344,   347,   350,   353,   356,   359,   362,   365,   368,
+     371,   374,   381,   387,   396,   403,   410,   417,   425,   433,
+     440,   447,   456,   465,   469,   471,   473,   475,   477,   480,
+     483,   488,   491,   493,   495,   497,   502,   505,   510,   517,
+     524,   531,   538,   542,   547,   548,   550,   552,   554,   558,
+     562,   566,   570,   574,   578,   580,   581,   583,   585,   587,
+     588,   591,   595,   597,   599,   603,   605,   606,   615,   617,
+     619,   623,   628,   630,   632,   636,   637,   639,   641,   645,
+     646,   648,   650,   652,   654,   656,   658,   660,   662,   664,
+     668,   670,   676,   678,   680,   682,   684,   687,   690,   692,
+     695,   698,   699,   701,   703,   705,   708,   711,   715,   725,
+     735,   744,   759,   761,   763,   770,   776,   779,   786,   794,
+     796,   800,   802,   803,   806,   808,   814,   820,   826,   833,
+     840,   843,   848,   853,   860,   865,   870,   877,   884,   887,
+     895,   897,   900,   901,   903,   904,   908,   915,   919,   926,
+     929,   934,   941
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
 static const short int yyrhs[] =
 {
-     199,     0,    -1,    19,    -1,    20,    -1,    17,    -1,    18,
-      -1,    80,    -1,    81,    -1,    82,    -1,    83,    -1,    84,
-      -1,    85,    -1,    86,    -1,    87,    -1,    88,    -1,    89,
-      -1,    90,    -1,    91,    -1,    92,    -1,    93,    -1,    94,
-      -1,    95,    -1,    96,    -1,    97,    -1,    98,    -1,    99,
-      -1,   102,    -1,   103,    -1,   104,    -1,   105,    -1,   106,
-      -1,   107,    -1,   118,    -1,   119,    -1,   120,    -1,   121,
-      -1,   108,    -1,   109,    -1,   110,    -1,   111,    -1,   112,
-      -1,   113,    -1,   114,    -1,   115,    -1,   116,    -1,   117,
-      -1,   118,    -1,   119,    -1,   120,    -1,   121,    -1,    25,
-      -1,    26,    -1,   130,    -1,   131,    -1,   132,    -1,   133,
-      -1,   139,    -1,   140,    -1,   141,    -1,   142,    -1,   143,
-      -1,   144,    -1,   145,    -1,   146,    -1,   147,    -1,   148,
-      -1,   149,    -1,   150,    -1,   138,    -1,    11,    -1,     9,
+     200,     0,    -1,    19,    -1,    20,    -1,    17,    -1,    18,
+      -1,    81,    -1,    82,    -1,    83,    -1,    84,    -1,    85,
+      -1,    86,    -1,    87,    -1,    88,    -1,    89,    -1,    90,
+      -1,    91,    -1,    92,    -1,    93,    -1,    94,    -1,    95,
+      -1,    96,    -1,    97,    -1,    98,    -1,    99,    -1,   100,
+      -1,   103,    -1,   104,    -1,   105,    -1,   106,    -1,   107,
+      -1,   108,    -1,   119,    -1,   120,    -1,   121,    -1,   122,
+      -1,   109,    -1,   110,    -1,   111,    -1,   112,    -1,   113,
+      -1,   114,    -1,   115,    -1,   116,    -1,   117,    -1,   118,
+      -1,   119,    -1,   120,    -1,   121,    -1,   122,    -1,    25,
+      -1,    26,    -1,   131,    -1,   132,    -1,   133,    -1,   134,
+      -1,   140,    -1,   141,    -1,   142,    -1,   143,    -1,   144,
+      -1,   145,    -1,   146,    -1,   147,    -1,   148,    -1,   149,
+      -1,   150,    -1,   151,    -1,   139,    -1,    11,    -1,     9,
       -1,     7,    -1,     5,    -1,    12,    -1,    10,    -1,     8,
-      -1,     6,    -1,   175,    -1,   176,    -1,    13,    -1,    14,
-      -1,   208,   151,    -1,    -1,    42,    -1,    43,    -1,    44,
-      -1,    48,    -1,    45,    -1,    46,    -1,    47,    -1,    -1,
-      66,    -1,    67,    -1,    68,    -1,    69,    -1,    70,    -1,
-      71,    -1,    65,    18,    -1,    -1,    -1,    57,    18,    -1,
-      -1,   152,    57,    18,    -1,    37,    30,    -1,    -1,   184,
-      -1,    -1,   152,   187,   186,    -1,   184,    -1,    57,    18,
-      -1,   190,    -1,     3,    -1,   192,    -1,     3,    -1,   192,
+      -1,     6,    -1,   176,    -1,   177,    -1,    13,    -1,    14,
+      -1,   209,   152,    -1,    -1,    43,    -1,    44,    -1,    45,
+      -1,    49,    -1,    46,    -1,    47,    -1,    48,    -1,    -1,
+      67,    -1,    68,    -1,    69,    -1,    70,    -1,    71,    -1,
+      72,    -1,    66,    18,    -1,    -1,    -1,    58,    18,    -1,
+      -1,   153,    58,    18,    -1,    38,    30,    -1,    -1,   185,
+      -1,    -1,   153,   188,   187,    -1,   185,    -1,    58,    18,
+      -1,   191,    -1,     3,    -1,   193,    -1,     3,    -1,   193,
       -1,     4,    -1,     5,    -1,     6,    -1,     7,    -1,     8,
       -1,     9,    -1,    10,    -1,    11,    -1,    12,    -1,    13,
-      -1,    14,    -1,    15,    -1,    16,    -1,   222,    -1,   191,
-      -1,   153,    18,    -1,   189,   154,   194,   155,    -1,   156,
-      18,   157,   192,   158,    -1,   159,    18,   157,   192,   160,
-      -1,   161,   193,   162,    -1,   161,   162,    -1,   192,   163,
-      -1,   192,    -1,   193,   152,   192,    -1,   193,    -1,   193,
-     152,    40,    -1,    40,    -1,    -1,   190,   156,   197,   158,
-      -1,   190,   156,   158,    -1,   190,   164,    30,    -1,   190,
-     159,   197,   160,    -1,   190,   161,   197,   162,    -1,   190,
-     161,   162,    -1,   190,    22,    -1,   190,    23,    -1,   190,
-     222,    -1,   190,   196,    -1,   190,    24,    -1,   175,   167,
-      -1,   176,    18,    -1,     4,    25,    -1,     4,    26,    -1,
-     178,    21,    -1,   174,   154,   195,    39,   190,   155,    -1,
-     127,   154,   195,   237,   155,    -1,   129,   154,   195,   152,
-     195,   152,   195,   155,    -1,   168,   154,   195,   152,   195,
-     155,    -1,   169,   154,   195,   152,   195,   155,    -1,   170,
-     154,   195,   152,   195,   155,    -1,   100,   171,   154,   195,
-     152,   195,   155,    -1,   101,   172,   154,   195,   152,   195,
-     155,    -1,   173,   154,   195,   152,   195,   155,    -1,   135,
-     154,   195,   152,   195,   155,    -1,   136,   154,   195,   152,
-     195,   152,   195,   155,    -1,   137,   154,   195,   152,   195,
-     152,   195,   155,    -1,   197,   152,   195,    -1,   195,    -1,
-      35,    -1,    36,    -1,   200,    -1,   200,   217,    -1,   200,
-     219,    -1,   200,    63,    62,   203,    -1,   200,    31,    -1,
-     202,    -1,    50,    -1,    58,    -1,   202,   179,    27,   188,
-      -1,   202,   219,    -1,   202,    63,    62,   203,    -1,   202,
-     179,   180,   198,   195,   186,    -1,   202,   179,   201,   198,
-     190,   186,    -1,   202,   179,    45,   198,   190,   186,    -1,
-     202,   179,    47,   198,   190,   186,    -1,   202,    51,   205,
-      -1,   202,    59,   151,   206,    -1,    -1,    30,    -1,    56,
-      -1,    55,    -1,    53,   151,   204,    -1,    54,   151,    18,
-      -1,    52,   151,    30,    -1,    72,   151,    30,    -1,   156,
-     207,   158,    -1,   207,   152,    30,    -1,    30,    -1,    -1,
-      28,    -1,    30,    -1,   208,    -1,    -1,   190,   209,    -1,
-     211,   152,   210,    -1,   210,    -1,   211,    -1,   211,   152,
-      40,    -1,    40,    -1,    -1,   181,   188,   208,   154,   212,
-     155,   185,   182,    -1,    32,    -1,   161,    -1,   180,   213,
-     214,    -1,    33,    -1,   162,    -1,   215,   225,   216,    -1,
-      -1,    45,    -1,    47,    -1,    34,   218,   213,    -1,    -1,
-      64,    -1,    17,    -1,    18,    -1,    21,    -1,    25,    -1,
-      26,    -1,    22,    -1,    23,    -1,    24,    -1,   159,   197,
-     160,    -1,   196,    -1,    62,   220,    30,   152,    30,    -1,
-     166,    -1,   208,    -1,   222,    -1,   221,    -1,   190,   223,
-      -1,   225,   226,    -1,   226,    -1,   227,   229,    -1,   227,
-     231,    -1,    -1,    29,    -1,    78,    -1,    77,    -1,    73,
-     224,    -1,    73,     3,    -1,    74,    15,   223,    -1,    74,
-       4,   223,   152,    15,   223,   152,    15,   223,    -1,    75,
-     177,   223,   152,    15,   223,   156,   230,   158,    -1,    75,
-     177,   223,   152,    15,   223,   156,   158,    -1,   179,    76,
-     181,   188,   223,   154,   234,   155,    39,    15,   223,   228,
-      15,   223,    -1,   228,    -1,    79,    -1,   230,   177,   221,
-     152,    15,   223,    -1,   177,   221,   152,    15,   223,    -1,
-     179,   236,    -1,   190,   156,   223,   152,   223,   158,    -1,
-     232,   152,   156,   223,   152,   223,   158,    -1,   224,    -1,
-     233,   152,   224,    -1,   233,    -1,    -1,    61,    60,    -1,
-      60,    -1,   168,   190,   223,   152,   223,    -1,   169,   190,
-     223,   152,   223,    -1,   170,   190,   223,   152,   223,    -1,
-     100,   171,   190,   223,   152,   223,   155,    -1,   101,   172,
-     190,   223,   152,   223,   155,    -1,    49,   224,    -1,   173,
-     224,   152,   224,    -1,   174,   224,    39,   190,    -1,   129,
-     224,   152,   224,   152,   224,    -1,   134,   224,   152,   190,
-      -1,   135,   224,   152,   224,    -1,   136,   224,   152,   224,
-     152,   224,    -1,   137,   224,   152,   224,   152,   224,    -1,
-     128,   232,    -1,   235,   181,   188,   223,   154,   234,   155,
-      -1,   239,    -1,   152,   233,    -1,    -1,    38,    -1,    -1,
-     122,   190,   183,    -1,   122,   190,   152,    10,   223,   183,
-      -1,   123,   190,   183,    -1,   123,   190,   152,    10,   223,
-     183,    -1,   124,   224,    -1,   238,   125,   190,   223,    -1,
-     238,   126,   224,   152,   190,   223,    -1,   127,   190,   223,
-     237,    -1
+      -1,    14,    -1,    15,    -1,    16,    -1,   223,    -1,   192,
+      -1,   154,    18,    -1,   190,   155,   195,   156,    -1,   157,
+      18,   158,   193,   159,    -1,   160,    18,   158,   193,   161,
+      -1,   162,   194,   163,    -1,   162,   163,    -1,   160,   162,
+     194,   163,   161,    -1,   160,   162,   163,   161,    -1,   193,
+     164,    -1,   193,    -1,   194,   153,   193,    -1,   194,    -1,
+     194,   153,    41,    -1,    41,    -1,    -1,   191,   157,   198,
+     159,    -1,   191,   157,   159,    -1,   191,   165,    30,    -1,
+     191,   160,   198,   161,    -1,   191,   162,   198,   163,    -1,
+     191,   162,   163,    -1,   191,    22,    -1,   191,    23,    -1,
+     191,   223,    -1,   191,   197,    -1,   191,    24,    -1,   176,
+     168,    -1,   177,    18,    -1,     4,    25,    -1,     4,    26,
+      -1,   179,    21,    -1,   175,   155,   196,    40,   191,   156,
+      -1,   128,   155,   196,   238,   156,    -1,   130,   155,   196,
+     153,   196,   153,   196,   156,    -1,   169,   155,   196,   153,
+     196,   156,    -1,   170,   155,   196,   153,   196,   156,    -1,
+     171,   155,   196,   153,   196,   156,    -1,   101,   172,   155,
+     196,   153,   196,   156,    -1,   102,   173,   155,   196,   153,
+     196,   156,    -1,   174,   155,   196,   153,   196,   156,    -1,
+     136,   155,   196,   153,   196,   156,    -1,   137,   155,   196,
+     153,   196,   153,   196,   156,    -1,   138,   155,   196,   153,
+     196,   153,   196,   156,    -1,   198,   153,   196,    -1,   196,
+      -1,    36,    -1,    37,    -1,   201,    -1,   201,   218,    -1,
+     201,   220,    -1,   201,    64,    63,   204,    -1,   201,    31,
+      -1,   203,    -1,    51,    -1,    59,    -1,   203,   180,    27,
+     189,    -1,   203,   220,    -1,   203,    64,    63,   204,    -1,
+     203,   180,   181,   199,   196,   187,    -1,   203,   180,   202,
+     199,   191,   187,    -1,   203,   180,    46,   199,   191,   187,
+      -1,   203,   180,    48,   199,   191,   187,    -1,   203,    52,
+     206,    -1,   203,    60,   152,   207,    -1,    -1,    30,    -1,
+      57,    -1,    56,    -1,    54,   152,   205,    -1,    55,   152,
+      18,    -1,    53,   152,    30,    -1,    73,   152,    30,    -1,
+     157,   208,   159,    -1,   208,   153,    30,    -1,    30,    -1,
+      -1,    28,    -1,    30,    -1,   209,    -1,    -1,   191,   210,
+      -1,   212,   153,   211,    -1,   211,    -1,   212,    -1,   212,
+     153,    41,    -1,    41,    -1,    -1,   182,   189,   209,   155,
+     213,   156,   186,   183,    -1,    32,    -1,   162,    -1,   181,
+     214,   215,    -1,    35,   181,   214,   215,    -1,    33,    -1,
+     163,    -1,   216,   226,   217,    -1,    -1,    46,    -1,    48,
+      -1,    34,   219,   214,    -1,    -1,    65,    -1,    17,    -1,
+      18,    -1,    21,    -1,    25,    -1,    26,    -1,    22,    -1,
+      23,    -1,    24,    -1,   160,   198,   161,    -1,   197,    -1,
+      63,   221,    30,   153,    30,    -1,   167,    -1,   209,    -1,
+     223,    -1,   222,    -1,   191,   224,    -1,   226,   227,    -1,
+     227,    -1,   228,   230,    -1,   228,   232,    -1,    -1,    29,
+      -1,    79,    -1,    78,    -1,    74,   225,    -1,    74,     3,
+      -1,    75,    15,   224,    -1,    75,     4,   224,   153,    15,
+     224,   153,    15,   224,    -1,    76,   178,   224,   153,    15,
+     224,   157,   231,   159,    -1,    76,   178,   224,   153,    15,
+     224,   157,   159,    -1,   180,    77,   182,   189,   224,   155,
+     235,   156,    40,    15,   224,   229,    15,   224,    -1,   229,
+      -1,    80,    -1,   231,   178,   222,   153,    15,   224,    -1,
+     178,   222,   153,    15,   224,    -1,   180,   237,    -1,   191,
+     157,   224,   153,   224,   159,    -1,   233,   153,   157,   224,
+     153,   224,   159,    -1,   225,    -1,   234,   153,   225,    -1,
+     234,    -1,    -1,    62,    61,    -1,    61,    -1,   169,   191,
+     224,   153,   224,    -1,   170,   191,   224,   153,   224,    -1,
+     171,   191,   224,   153,   224,    -1,   101,   172,   191,   224,
+     153,   224,    -1,   102,   173,   191,   224,   153,   224,    -1,
+      50,   225,    -1,   174,   225,   153,   225,    -1,   175,   225,
+      40,   191,    -1,   130,   225,   153,   225,   153,   225,    -1,
+     135,   225,   153,   191,    -1,   136,   225,   153,   225,    -1,
+     137,   225,   153,   225,   153,   225,    -1,   138,   225,   153,
+     225,   153,   225,    -1,   129,   233,    -1,   236,   182,   189,
+     224,   155,   235,   156,    -1,   240,    -1,   153,   234,    -1,
+      -1,    39,    -1,    -1,   123,   191,   184,    -1,   123,   191,
+     153,    10,   224,   184,    -1,   124,   191,   184,    -1,   124,
+     191,   153,    10,   224,   184,    -1,   125,   225,    -1,   239,
+     126,   191,   224,    -1,   239,   127,   225,   153,   191,   224,
+      -1,   128,   191,   224,   238,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -1035,23 +1039,24 @@
      389,   392,   393,   401,   407,   408,   411,   412,   421,   422,
      435,   435,   436,   436,   437,   441,   441,   441,   441,   441,
      441,   441,   442,   442,   442,   442,   442,   444,   448,   452,
-     455,   460,   466,   474,   482,   488,   492,   503,   506,   514,
-     515,   520,   523,   533,   539,   544,   550,   556,   562,   567,
-     573,   579,   585,   591,   597,   603,   609,   615,   621,   629,
-     643,   655,   660,   666,   671,   677,   682,   687,   695,   700,
-     705,   715,   720,   725,   725,   735,   740,   743,   748,   752,
-     756,   758,   758,   761,   773,   778,   783,   792,   801,   810,
-     819,   824,   829,   834,   836,   836,   839,   844,   851,   856,
-     863,   870,   875,   876,   884,   884,   885,   885,   887,   894,
-     898,   902,   905,   910,   913,   915,   935,   936,   938,   947,
-     948,   950,   958,   959,   960,   964,   977,   978,   981,   981,
-     981,   981,   981,   981,   981,   982,   983,   988,   989,   998,
-     998,  1002,  1008,  1019,  1025,  1028,  1036,  1040,  1045,  1048,
-    1054,  1054,  1056,  1061,  1066,  1071,  1079,  1086,  1092,  1112,
-    1117,  1123,  1128,  1136,  1145,  1152,  1160,  1164,  1171,  1172,
-    1176,  1181,  1184,  1190,  1195,  1201,  1206,  1211,  1216,  1224,
-    1238,  1243,  1248,  1253,  1258,  1263,  1268,  1285,  1290,  1291,
-    1295,  1296,  1299,  1306,  1313,  1320,  1327,  1332,  1339,  1346
+     455,   460,   466,   474,   482,   488,   492,   498,   502,   513,
+     516,   524,   525,   530,   533,   543,   549,   554,   560,   566,
+     572,   577,   583,   589,   595,   601,   607,   613,   619,   625,
+     631,   639,   653,   665,   670,   676,   681,   687,   692,   697,
+     705,   710,   715,   725,   730,   735,   735,   745,   750,   753,
+     758,   762,   766,   768,   768,   771,   783,   788,   793,   802,
+     811,   820,   829,   834,   839,   844,   846,   846,   849,   854,
+     861,   866,   873,   880,   885,   886,   894,   894,   895,   895,
+     897,   904,   908,   912,   915,   920,   923,   925,   945,   946,
+     949,   958,   969,   970,   972,   980,   981,   982,   986,   999,
+    1000,  1003,  1003,  1003,  1003,  1003,  1003,  1003,  1004,  1005,
+    1010,  1011,  1020,  1020,  1024,  1030,  1041,  1047,  1050,  1058,
+    1062,  1067,  1070,  1076,  1076,  1078,  1083,  1088,  1093,  1101,
+    1108,  1114,  1134,  1139,  1145,  1150,  1158,  1167,  1174,  1182,
+    1186,  1193,  1194,  1198,  1203,  1206,  1212,  1217,  1223,  1228,
+    1233,  1238,  1246,  1260,  1265,  1270,  1275,  1280,  1285,  1290,
+    1307,  1312,  1313,  1317,  1318,  1321,  1328,  1335,  1342,  1349,
+    1354,  1361,  1368
 };
 #endif
 
@@ -1065,12 +1070,12 @@
   "LABEL", "OPAQUE", "ESINT64VAL", "EUINT64VAL", "SINTVAL", "UINTVAL",
   "FPVAL", "NULL_TOK", "UNDEF", "ZEROINITIALIZER", "TRUETOK", "FALSETOK",
   "TYPE", "VAR_ID", "LABELSTR", "STRINGCONSTANT", "IMPLEMENTATION",
-  "BEGINTOK", "ENDTOK", "DECLARE", "GLOBAL", "CONSTANT", "SECTION",
-  "VOLATILE", "TO", "DOTDOTDOT", "CONST", "INTERNAL", "LINKONCE", "WEAK",
-  "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "APPENDING", "NOT", "EXTERNAL",
-  "TARGET", "TRIPLE", "ENDIAN", "POINTERSIZE", "LITTLE", "BIG", "ALIGN",
-  "UNINITIALIZED", "DEPLIBS", "CALL", "TAIL", "ASM_TOK", "MODULE",
-  "SIDEEFFECT", "CC_TOK", "CCC_TOK", "CSRETCC_TOK", "FASTCC_TOK",
+  "BEGINTOK", "ENDTOK", "DECLARE", "DEFINE", "GLOBAL", "CONSTANT",
+  "SECTION", "VOLATILE", "TO", "DOTDOTDOT", "CONST", "INTERNAL",
+  "LINKONCE", "WEAK", "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "APPENDING",
+  "NOT", "EXTERNAL", "TARGET", "TRIPLE", "ENDIAN", "POINTERSIZE", "LITTLE",
+  "BIG", "ALIGN", "UNINITIALIZED", "DEPLIBS", "CALL", "TAIL", "ASM_TOK",
+  "MODULE", "SIDEEFFECT", "CC_TOK", "CCC_TOK", "CSRETCC_TOK", "FASTCC_TOK",
   "COLDCC_TOK", "X86_STDCALLCC_TOK", "X86_FASTCALLCC_TOK", "DATALAYOUT",
   "RET", "BR", "SWITCH", "INVOKE", "EXCEPT", "UNWIND", "UNREACHABLE",
   "ADD", "SUB", "MUL", "DIV", "UDIV", "SDIV", "FDIV", "REM", "UREM",
@@ -1122,44 +1127,45 @@
      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,    61,    44,    92,    40,    41,    91,   120,    93,    60,
-      62,   123,   125,    42,    99
+     405,   406,    61,    44,    92,    40,    41,    91,   120,    93,
+      60,    62,   123,   125,    42,    99
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const unsigned char yyr1[] =
 {
-       0,   165,   166,   166,   167,   167,   168,   168,   168,   168,
-     168,   168,   168,   168,   168,   168,   168,   169,   169,   169,
-     170,   170,   170,   170,   170,   170,   171,   171,   171,   171,
+       0,   166,   167,   167,   168,   168,   169,   169,   169,   169,
+     169,   169,   169,   169,   169,   169,   169,   170,   170,   170,
      171,   171,   171,   171,   171,   171,   172,   172,   172,   172,
-     172,   172,   172,   172,   172,   172,   172,   172,   172,   172,
-     172,   172,   173,   173,   173,   173,   174,   174,   174,   174,
-     174,   174,   174,   174,   174,   174,   174,   174,   174,   175,
-     175,   175,   175,   176,   176,   176,   176,   177,   177,   178,
-     178,   179,   179,   180,   180,   180,   180,   180,   180,   180,
-     180,   181,   181,   181,   181,   181,   181,   181,   181,   182,
-     182,   183,   183,   184,   185,   185,   186,   186,   187,   187,
-     188,   188,   189,   189,   190,   191,   191,   191,   191,   191,
-     191,   191,   191,   191,   191,   191,   191,   192,   192,   192,
-     192,   192,   192,   192,   192,   192,   192,   193,   193,   194,
-     194,   194,   194,   195,   195,   195,   195,   195,   195,   195,
-     195,   195,   195,   195,   195,   195,   195,   195,   195,   196,
+     172,   172,   172,   172,   172,   172,   173,   173,   173,   173,
+     173,   173,   173,   173,   173,   173,   173,   173,   173,   173,
+     173,   173,   174,   174,   174,   174,   175,   175,   175,   175,
+     175,   175,   175,   175,   175,   175,   175,   175,   175,   176,
+     176,   176,   176,   177,   177,   177,   177,   178,   178,   179,
+     179,   180,   180,   181,   181,   181,   181,   181,   181,   181,
+     181,   182,   182,   182,   182,   182,   182,   182,   182,   183,
+     183,   184,   184,   185,   186,   186,   187,   187,   188,   188,
+     189,   189,   190,   190,   191,   192,   192,   192,   192,   192,
+     192,   192,   192,   192,   192,   192,   192,   193,   193,   193,
+     193,   193,   193,   193,   193,   193,   193,   193,   193,   194,
+     194,   195,   195,   195,   195,   196,   196,   196,   196,   196,
      196,   196,   196,   196,   196,   196,   196,   196,   196,   196,
-     196,   197,   197,   198,   198,   199,   200,   200,   200,   200,
-     200,   201,   201,   202,   202,   202,   202,   202,   202,   202,
-     202,   202,   202,   203,   204,   204,   205,   205,   205,   205,
-     206,   207,   207,   207,   208,   208,   209,   209,   210,   211,
-     211,   212,   212,   212,   212,   213,   214,   214,   215,   216,
-     216,   217,   218,   218,   218,   219,   220,   220,   221,   221,
-     221,   221,   221,   221,   221,   221,   221,   221,   221,   222,
-     222,   223,   223,   224,   225,   225,   226,   227,   227,   227,
-     228,   228,   229,   229,   229,   229,   229,   229,   229,   229,
-     229,   230,   230,   231,   232,   232,   233,   233,   234,   234,
-     235,   235,   236,   236,   236,   236,   236,   236,   236,   236,
-     236,   236,   236,   236,   236,   236,   236,   236,   237,   237,
-     238,   238,   239,   239,   239,   239,   239,   239,   239,   239
+     196,   197,   197,   197,   197,   197,   197,   197,   197,   197,
+     197,   197,   197,   198,   198,   199,   199,   200,   201,   201,
+     201,   201,   201,   202,   202,   203,   203,   203,   203,   203,
+     203,   203,   203,   203,   203,   204,   205,   205,   206,   206,
+     206,   206,   207,   208,   208,   208,   209,   209,   210,   210,
+     211,   212,   212,   213,   213,   213,   213,   214,   215,   215,
+     216,   216,   217,   217,   218,   219,   219,   219,   220,   221,
+     221,   222,   222,   222,   222,   222,   222,   222,   222,   222,
+     222,   222,   223,   223,   224,   224,   225,   226,   226,   227,
+     228,   228,   228,   229,   229,   230,   230,   230,   230,   230,
+     230,   230,   230,   230,   231,   231,   232,   233,   233,   234,
+     234,   235,   235,   236,   236,   237,   237,   237,   237,   237,
+     237,   237,   237,   237,   237,   237,   237,   237,   237,   237,
+     237,   238,   238,   239,   239,   240,   240,   240,   240,   240,
+     240,   240,   240
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -1178,23 +1184,24 @@
        2,     0,     3,     2,     0,     1,     0,     3,     1,     2,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       2,     4,     5,     5,     3,     2,     2,     1,     3,     1,
-       3,     1,     0,     4,     3,     3,     4,     4,     3,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     6,
-       5,     8,     6,     6,     6,     7,     7,     6,     6,     8,
-       8,     3,     1,     1,     1,     1,     2,     2,     4,     2,
-       1,     1,     1,     4,     2,     4,     6,     6,     6,     6,
-       3,     4,     0,     1,     1,     1,     3,     3,     3,     3,
-       3,     3,     1,     0,     1,     1,     1,     0,     2,     3,
-       1,     1,     3,     1,     0,     8,     1,     1,     3,     1,
-       1,     3,     0,     1,     1,     3,     0,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     3,     1,     5,     1,
-       1,     1,     1,     2,     2,     1,     2,     2,     0,     1,
-       1,     1,     2,     2,     3,     9,     9,     8,    14,     1,
-       1,     6,     5,     2,     6,     7,     1,     3,     1,     0,
-       2,     1,     5,     5,     5,     7,     7,     2,     4,     4,
-       6,     4,     4,     6,     6,     2,     7,     1,     2,     0,
-       1,     0,     3,     6,     3,     6,     2,     4,     6,     4
+       2,     4,     5,     5,     3,     2,     5,     4,     2,     1,
+       3,     1,     3,     1,     0,     4,     3,     3,     4,     4,
+       3,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     6,     5,     8,     6,     6,     6,     7,     7,     6,
+       6,     8,     8,     3,     1,     1,     1,     1,     2,     2,
+       4,     2,     1,     1,     1,     4,     2,     4,     6,     6,
+       6,     6,     3,     4,     0,     1,     1,     1,     3,     3,
+       3,     3,     3,     3,     1,     0,     1,     1,     1,     0,
+       2,     3,     1,     1,     3,     1,     0,     8,     1,     1,
+       3,     4,     1,     1,     3,     0,     1,     1,     3,     0,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     3,
+       1,     5,     1,     1,     1,     1,     2,     2,     1,     2,
+       2,     0,     1,     1,     1,     2,     2,     3,     9,     9,
+       8,    14,     1,     1,     6,     5,     2,     6,     7,     1,
+       3,     1,     0,     2,     1,     5,     5,     5,     6,     6,
+       2,     4,     4,     6,     4,     4,     6,     6,     2,     7,
+       1,     2,     0,     1,     0,     3,     6,     3,     6,     2,
+       4,     6,     4
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -1202,533 +1209,547 @@
    means the default is an error.  */
 static const unsigned short int yydefact[] =
 {
-     192,     0,    90,   180,     1,   179,   222,    83,    84,    85,
-      87,    88,    89,    86,     0,    98,   248,   176,   177,   204,
-     205,     0,     0,     0,    90,     0,   184,   223,   224,    98,
-       0,     0,    91,    92,    93,    94,    95,    96,     0,     0,
-     249,   248,   245,    82,     0,     0,     0,     0,   190,     0,
-       0,     0,     0,     0,   181,   182,     0,     0,    81,   225,
-     193,   178,    97,   111,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,     2,     3,     0,
-       0,     0,     0,   239,     0,     0,   110,   129,   114,   240,
-     128,   216,   217,   218,   219,   220,   221,   244,     0,     0,
-       0,   251,   250,   260,   291,   259,   246,   247,     0,     0,
-       0,     0,   203,   191,   185,   183,   173,   174,     0,     0,
-       0,     0,   130,     0,     0,   113,   135,   137,     0,     0,
-     142,   136,   253,     0,   252,     0,     0,    72,    76,    71,
-      75,    70,    74,    69,    73,    77,    78,     0,   290,     0,
-     271,     0,    98,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,     0,     0,     0,     0,     0,     0,     0,
-       0,    52,    53,    54,    55,     0,     0,     0,     0,    68,
-      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-      66,    67,     0,     0,     0,     0,     0,    98,   263,     0,
-     287,   198,   195,   194,   196,   197,   199,   202,     0,   106,
-     106,   115,   116,   117,   118,   119,   120,   121,   122,   123,
-     124,   125,     0,     0,     0,     0,   106,   106,     0,     0,
-       0,   134,   214,   141,   139,     0,   228,   229,   230,   233,
-     234,   235,   231,   232,   226,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   237,   242,
-     241,   243,     0,   254,     0,   277,   270,     0,    26,    27,
-      28,    29,    30,    31,    32,    33,    34,    35,     0,    50,
-      51,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,     0,   101,   101,   296,     0,
-       0,   285,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   200,     0,   188,   189,
-     156,   157,     4,     5,   154,   155,   158,   149,   150,   153,
-       0,     0,     0,     0,   152,   151,   186,   187,   112,   112,
-     138,   213,   207,   210,   211,     0,     0,   131,   227,     0,
-       0,     0,     0,     0,     0,     0,     0,   172,     0,     0,
+     194,     0,    90,   182,     1,   181,   225,    90,    83,    84,
+      85,    87,    88,    89,    86,     0,    98,   251,   178,   179,
+     206,   207,     0,     0,     0,    90,     0,   186,   226,   227,
+      98,    98,     0,     0,    91,    92,    93,    94,    95,    96,
+       0,     0,   252,   251,   248,    82,     0,     0,     0,     0,
+     192,     0,     0,     0,     0,     0,   183,   184,     0,     0,
+      81,   228,     0,   195,   180,    97,   111,   115,   116,   117,
+     118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
+       2,     3,     0,     0,     0,     0,   242,     0,     0,   110,
+     129,   114,   243,   128,   218,   219,   220,   222,   223,   224,
+     247,     0,     0,     0,   254,   253,   263,   294,   262,   249,
+     250,     0,     0,     0,     0,   205,   193,   187,   185,   175,
+     176,     0,     0,     0,     0,   221,   130,     0,     0,     0,
+     113,   135,   139,     0,     0,   144,   138,   256,     0,   255,
+       0,     0,    72,    76,    71,    75,    70,    74,    69,    73,
+      77,    78,     0,   293,     0,   274,     0,    98,     6,     7,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,     0,     0,
+       0,     0,     0,     0,     0,     0,    52,    53,    54,    55,
+       0,     0,     0,     0,    68,    56,    57,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,     0,     0,     0,
+       0,     0,    98,   266,     0,   290,   200,   197,   196,   198,
+     199,   201,   204,     0,   106,   106,   115,   116,   117,   118,
+     119,   120,   121,   122,   123,   124,   125,     0,     0,     0,
+       0,   106,   106,     0,     0,     0,     0,     0,   134,   216,
+     143,   141,     0,   231,   232,   233,   236,   237,   238,   234,
+     235,   229,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   240,   245,   244,   246,     0,
+     257,     0,   280,   273,     0,    26,    27,    28,    29,    30,
+      31,    32,    33,    34,    35,     0,    50,    51,    36,    37,
+      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,     0,   101,   101,   299,     0,     0,   288,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     292,     0,   294,   289,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   201,
-       0,     0,   108,   106,   144,     0,     0,   148,     0,   145,
-     132,   133,   206,   208,     0,   104,   140,     0,     0,     0,
-     289,     0,     0,     0,     0,     0,   236,     0,     0,     0,
+       0,     0,     0,   202,     0,   190,   191,   158,   159,     4,
+       5,   156,   157,   160,   151,   152,   155,     0,     0,     0,
+       0,   154,   153,   188,   189,   112,   112,   137,     0,   140,
+     215,   209,   212,   213,     0,     0,   131,   230,     0,     0,
+       0,     0,     0,     0,     0,     0,   174,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   295,
+       0,   297,   292,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   203,     0,
+       0,   108,   106,   146,     0,     0,   150,     0,   147,   132,
+     133,   136,   208,   210,     0,   104,   142,     0,     0,     0,
+     292,     0,     0,     0,     0,     0,   239,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   299,     0,     0,     0,   281,   282,     0,     0,     0,
-       0,     0,   278,   279,     0,   297,     0,   103,   109,   107,
-     143,   146,   147,   212,   209,   105,    99,     0,     0,     0,
-       0,     0,     0,     0,     0,   171,     0,     0,     0,     0,
-       0,     0,     0,   269,     0,     0,   101,   102,   101,   266,
-     288,     0,     0,     0,     0,     0,   272,   273,   274,   269,
-       0,     0,   215,   238,     0,     0,   160,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   268,     0,
-       0,     0,     0,   293,   295,     0,     0,     0,   280,   283,
-     284,     0,   298,   100,     0,     0,     0,   168,     0,     0,
-     162,   163,   164,   167,   159,     0,   257,     0,     0,     0,
-     275,   276,   267,   264,     0,   286,   165,   166,     0,     0,
-       0,   255,     0,   256,     0,     0,   265,   161,   169,   170,
-       0,     0,     0,     0,     0,     0,   262,     0,     0,   261,
-       0,   258
+       0,   302,     0,     0,     0,   284,   285,     0,     0,     0,
+       0,     0,   281,   282,     0,   300,     0,   103,   109,   107,
+     145,   148,   149,   214,   211,   105,    99,     0,     0,     0,
+       0,     0,     0,     0,     0,   173,     0,     0,     0,     0,
+       0,     0,     0,   272,     0,     0,   101,   102,   101,   269,
+     291,     0,     0,     0,     0,     0,   275,   276,   277,   272,
+       0,     0,   217,   241,     0,     0,   162,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   271,     0,
+     278,   279,     0,   296,   298,     0,     0,     0,   283,   286,
+     287,     0,   301,   100,     0,     0,     0,   170,     0,     0,
+     164,   165,   166,   169,   161,     0,   260,     0,     0,     0,
+     270,   267,     0,   289,   167,   168,     0,     0,     0,   258,
+       0,   259,     0,     0,   268,   163,   171,   172,     0,     0,
+       0,     0,     0,     0,   265,     0,     0,   264,     0,   261
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
 static const short int yydefgoto[] =
 {
-      -1,    83,   334,   263,   264,   265,   288,   305,   266,   267,
-     232,   233,   147,   234,    24,    15,    38,   502,   380,   402,
-     466,   328,   403,    84,    85,   235,    87,    88,   128,   245,
-     367,   268,   368,   118,     1,     2,    57,     3,    61,   214,
-      48,   113,   218,    89,   413,   353,   354,   355,    39,    93,
-      16,    96,    17,    29,    18,   359,   269,    90,   271,   489,
-      41,    42,    43,   105,   106,   548,   107,   311,   518,   519,
-     207,   208,   441,   209,   210
+      -1,    86,   341,   270,   271,   272,   295,   312,   273,   274,
+     237,   238,   152,   239,    25,    16,    40,   512,   389,   411,
+     476,   335,   412,    87,    88,   240,    90,    91,   133,   252,
+     376,   275,   377,   121,     1,     2,    59,     3,    64,   219,
+      50,   116,   223,    92,   423,   362,   363,   364,    41,    96,
+      17,    99,    18,    30,    19,   368,   276,    93,   278,   499,
+      43,    44,    45,   108,   109,   558,   110,   318,   528,   529,
+     212,   213,   451,   214,   215
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -501
+#define YYPACT_NINF -543
 static const short int yypact[] =
 {
-    -501,    82,     9,   975,  -501,  -501,    72,  -501,  -501,  -501,
-    -501,  -501,  -501,  -501,    29,    34,    94,  -501,  -501,  -501,
-    -501,   -28,   -42,    66,   127,    25,  -501,  -501,  -501,    34,
-     122,   199,  -501,  -501,  -501,  -501,  -501,  -501,   839,   -17,
-    -501,   -19,  -501,    47,    67,    68,    69,    75,  -501,    71,
-     122,   839,    11,    11,  -501,  -501,    11,    11,  -501,  -501,
-    -501,  -501,  -501,    76,  -501,  -501,  -501,  -501,  -501,  -501,
-    -501,  -501,  -501,  -501,  -501,  -501,  -501,  -501,  -501,   207,
-     210,   211,   518,  -501,   123,    77,  -501,  -501,   -84,  -501,
-    -501,  -501,  -501,  -501,  -501,  -501,  -501,  -501,   876,     8,
-     253,  -501,  -501,  -501,  1333,  -501,  -501,  -501,   203,    80,
-     217,   206,   208,  -501,  -501,  -501,  -501,  -501,   922,   922,
-     960,   922,  -501,    83,    84,  -501,  -501,   -84,  -134,    88,
-     604,  -501,    76,  1131,  -501,  1131,  1131,  -501,  -501,  -501,
-    -501,  -501,  -501,  -501,  -501,  -501,  -501,  1131,  -501,   922,
-    -501,   177,    34,  -501,  -501,  -501,  -501,  -501,  -501,  -501,
-    -501,  -501,  -501,  -501,  -501,  -501,  -501,  -501,  -501,  -501,
-    -501,  -501,  -501,   103,    81,   922,   922,   922,   922,   922,
-     922,  -501,  -501,  -501,  -501,   922,   922,   922,   922,  -501,
-    -501,  -501,  -501,  -501,  -501,  -501,  -501,  -501,  -501,  -501,
-    -501,  -501,   922,   922,   922,   922,   922,    34,  -501,    20,
-    -501,  -501,  -501,  -501,  -501,  -501,  -501,  -501,   -44,    91,
-      91,   130,   143,   226,   145,   227,   161,   230,   163,   231,
-     232,   233,   165,   234,   245,  1042,    91,    91,   922,   922,
-     922,  -501,   679,  -501,    99,   113,  -501,  -501,  -501,  -501,
-    -501,  -501,  -501,  -501,   205,   103,    81,   119,   120,   125,
-     128,   129,   960,   133,   134,   135,   139,   140,  -501,  -501,
-    -501,  -501,   124,  -501,   149,  -501,  -501,   839,  -501,  -501,
-    -501,  -501,  -501,  -501,  -501,  -501,  -501,  -501,   922,  -501,
-    -501,  -501,  -501,  -501,  -501,  -501,  -501,  -501,  -501,  -501,
-    -501,  -501,  -501,  -501,  -501,   922,   150,   151,  -501,  1131,
-     136,   153,   154,   155,   156,   157,   158,  1131,  1131,  1131,
-     159,   241,   839,   922,   922,   251,  -501,   -18,  -501,  -501,
-    -501,  -501,  -501,  -501,  -501,  -501,  -501,  -501,  -501,  -501,
-     717,   960,   549,   265,  -501,  -501,  -501,  -501,   -69,   -50,
-     -84,  -501,   123,  -501,   160,   142,   763,  -501,  -501,   283,
-     164,   166,   960,   960,   960,   960,   960,  -501,  -110,   960,
-     960,   960,   960,   960,   302,   304,  1131,  1131,  1131,     1,
-    -501,    12,  -501,   169,  1131,   167,   922,   922,   922,   922,
-     922,   172,   173,   176,   922,   922,  1131,  1131,   178,  -501,
-     299,   314,  -501,    91,  -501,   -40,   -68,  -501,   -74,  -501,
-    -501,  -501,  -501,  -501,   801,   301,  -501,   184,   960,   960,
-     169,   187,   188,   189,   190,   960,  -501,   194,   195,   201,
-     209,   316,  1131,  1131,   204,   212,   213,  1131,   341,  1131,
-     922,  -501,   214,  1131,   215,  -501,  -501,   216,   220,  1131,
-    1131,  1131,  -501,  -501,   219,  -501,   922,  -501,  -501,  -501,
-    -501,  -501,  -501,  -501,  -501,  -501,   303,   332,   222,   228,
-     229,   960,   960,   960,   960,  -501,   960,   960,   960,   960,
-     922,   238,   235,   922,  1131,  1131,   240,  -501,   240,  -501,
-     243,  1131,   244,   922,   922,   922,  -501,  -501,  -501,   922,
-    1131,   345,  -501,  -501,   960,   960,  -501,   246,   242,   247,
-     248,   252,   254,   255,   256,   257,   354,    26,   243,   258,
-     259,   260,   325,  -501,  -501,   922,   225,  1131,  -501,  -501,
-    -501,   261,  -501,  -501,   262,   269,   960,  -501,   960,   960,
-    -501,  -501,  -501,  -501,  -501,  1131,  -501,  1220,    56,   347,
-    -501,  -501,  -501,  -501,   250,  -501,  -501,  -501,   270,   271,
-     272,  -501,   249,  -501,  1220,   378,  -501,  -501,  -501,  -501,
-     391,   276,  1131,  1131,   415,   138,  -501,  1131,   416,  -501,
-    1131,  -501
+    -543,    41,    25,   215,  -543,  -543,    82,   277,  -543,  -543,
+    -543,  -543,  -543,  -543,  -543,   -10,   300,    62,  -543,  -543,
+    -543,  -543,    22,   -95,    57,    78,    30,  -543,  -543,  -543,
+     300,   300,   156,   170,  -543,  -543,  -543,  -543,  -543,  -543,
+     887,   -26,  -543,   -17,  -543,    37,    39,    42,    46,    48,
+    -543,    77,   156,   887,    43,    43,  -543,  -543,    43,    43,
+    -543,  -543,   -26,  -543,  -543,  -543,    53,  -543,  -543,  -543,
+    -543,  -543,  -543,  -543,  -543,  -543,  -543,  -543,  -543,  -543,
+    -543,  -543,   188,   196,    -8,   561,  -543,   153,    81,  -543,
+    -543,   -70,  -543,  -543,  -543,  -543,  -543,  -543,  -543,  -543,
+    -543,   924,    13,   307,  -543,  -543,  -543,  1403,  -543,  -543,
+    -543,   207,   101,   220,   210,   211,  -543,  -543,  -543,  -543,
+    -543,   969,   969,  1008,   969,  -543,  -543,    88,    89,   603,
+    -543,  -543,   -70,   -75,    93,   676,  -543,    53,  1201,  -543,
+    1201,  1201,  -543,  -543,  -543,  -543,  -543,  -543,  -543,  -543,
+    -543,  -543,  1201,  -543,   969,  -543,   189,   300,  -543,  -543,
+    -543,  -543,  -543,  -543,  -543,  -543,  -543,  -543,  -543,  -543,
+    -543,  -543,  -543,  -543,  -543,  -543,  -543,  -543,    58,   109,
+     969,   969,   969,   969,   969,   969,  -543,  -543,  -543,  -543,
+     969,   969,   969,   969,  -543,  -543,  -543,  -543,  -543,  -543,
+    -543,  -543,  -543,  -543,  -543,  -543,  -543,   969,   969,   969,
+     969,   969,   300,  -543,   -19,  -543,  -543,  -543,  -543,  -543,
+    -543,  -543,  -543,  -133,   100,   100,   149,   167,   236,   179,
+     238,   185,   239,   187,   247,   248,   249,   193,   250,   252,
+    1052,   100,   100,   969,   969,   110,   -66,   969,  -543,   723,
+    -543,   128,   127,  -543,  -543,  -543,  -543,  -543,  -543,  -543,
+    -543,   221,    58,   109,   130,   132,   133,   137,   138,  1008,
+     140,   143,   144,   145,   146,  -543,  -543,  -543,  -543,   151,
+    -543,   155,  -543,  -543,   887,  -543,  -543,  -543,  -543,  -543,
+    -543,  -543,  -543,  -543,  -543,   969,  -543,  -543,  -543,  -543,
+    -543,  -543,  -543,  -543,  -543,  -543,  -543,  -543,  -543,  -543,
+    -543,  -543,   969,   157,   174,  -543,  1201,   152,   175,   176,
+     177,   178,   182,   183,  1201,  1201,  1201,   184,   262,   887,
+     969,   969,   302,  -543,    45,  -543,  -543,  -543,  -543,  -543,
+    -543,  -543,  -543,  -543,  -543,  -543,  -543,   764,  1008,   647,
+     309,  -543,  -543,  -543,  -543,    -4,    -5,  -543,   180,   -70,
+    -543,   153,  -543,   190,   186,   809,  -543,  -543,   315,   191,
+     192,  1008,  1008,  1008,  1008,  1008,  -543,  -134,  1008,  1008,
+    1008,  1008,  1008,   333,   334,  1201,  1201,  1201,    -3,  -543,
+       8,  -543,   200,  1201,   197,   969,   969,   969,   969,   969,
+     208,   209,   223,   969,   969,  1201,  1201,   224,  -543,   348,
+     361,  -543,   100,  -543,   -21,   -57,  -543,   -61,  -543,  -543,
+    -543,  -543,  -543,  -543,   848,   342,  -543,   228,  1008,  1008,
+     200,   229,   230,   234,   235,  1008,  -543,   237,   240,   241,
+     242,   349,  1201,  1201,   243,   244,   246,  1201,   373,  1201,
+     969,  -543,   251,  1201,   253,  -543,  -543,   254,   255,  1201,
+    1201,  1201,  -543,  -543,   245,  -543,   969,  -543,  -543,  -543,
+    -543,  -543,  -543,  -543,  -543,  -543,   338,   372,   256,   261,
+     259,  1008,  1008,  1008,  1008,  -543,  1008,  1008,  1008,  1008,
+     969,   263,   260,   969,  1201,  1201,   265,  -543,   265,  -543,
+     266,  1201,   267,   969,   969,   969,  -543,  -543,  -543,   969,
+    1201,   385,  -543,  -543,  1008,  1008,  -543,   268,   273,   269,
+     270,   274,   275,   276,   281,   282,   390,    28,   266,   283,
+    -543,  -543,   366,  -543,  -543,   969,   285,  1201,  -543,  -543,
+    -543,   284,  -543,  -543,   289,   291,  1008,  -543,  1008,  1008,
+    -543,  -543,  -543,  -543,  -543,  1201,  -543,  1290,    40,   393,
+    -543,  -543,   290,  -543,  -543,  -543,   292,   295,   296,  -543,
+     288,  -543,  1290,   442,  -543,  -543,  -543,  -543,   444,   308,
+    1201,  1201,   445,   134,  -543,  1201,   447,  -543,  1201,  -543
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -501,  -501,  -501,   328,   329,   330,   181,   185,   333,   336,
-     -98,   -97,  -500,  -501,   400,   420,  -136,  -501,  -300,    31,
-    -501,  -216,  -501,   -45,  -501,   -38,  -501,   -81,   317,  -501,
-     126,   218,  -208,    74,  -501,  -501,  -501,  -501,   398,  -501,
-    -501,  -501,  -501,     2,  -501,    35,  -501,  -501,   423,  -501,
-    -501,  -501,  -501,  -501,   451,  -501,  -471,  -106,   -62,   -90,
-    -501,   417,  -501,  -116,  -501,  -501,  -501,  -501,    22,   -39,
-    -501,  -501,    43,  -501,  -501
+    -543,  -543,  -543,   359,   360,   363,   206,   212,   367,   370,
+    -102,  -100,  -504,  -543,   428,    17,  -149,  -543,  -303,    55,
+    -543,  -220,  -543,   -49,  -543,   -40,  -543,   -71,     4,  -543,
+     159,   257,  -200,    51,  -543,  -543,  -543,  -543,   426,  -543,
+    -543,  -543,  -543,    -1,  -543,    59,  -543,  -543,   202,   419,
+    -543,  -543,  -543,  -543,   479,  -543,  -542,  -109,    49,   -92,
+    -543,   441,  -543,   -98,  -543,  -543,  -543,  -543,    36,   -22,
+    -543,  -543,    60,  -543,  -543
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -176
+#define YYTABLE_NINF -178
 static const short int yytable[] =
 {
-      86,   127,   145,   146,   329,    25,   115,   382,   134,  -175,
-      40,   437,   135,    86,    94,    91,   277,   547,   240,   400,
-     346,   347,   439,   136,    44,    45,    46,   270,   241,   270,
-     270,   137,   138,   139,   140,   141,   142,   143,   144,   401,
-       5,   270,   425,     6,    47,    25,   116,   117,   564,   127,
-     426,     7,     8,     9,    10,    11,    12,    13,   438,   275,
-     133,   137,   138,   139,   140,   141,   142,   143,   144,   438,
-    -112,   322,    14,   272,   273,    19,   562,    20,   425,   131,
-     219,   220,     4,   237,   425,   274,   129,   308,   462,   410,
-     312,    30,   461,   571,   131,   313,   314,   315,   316,    31,
-      32,    33,    34,    35,    36,    37,   289,   290,   325,    49,
-     411,   133,   425,   131,   326,   320,   321,    27,   460,    28,
-      98,    99,   100,    40,   101,   102,   103,   119,    50,   345,
-     120,   121,   405,   406,   408,   212,   213,   306,   307,   133,
-     309,   310,   133,    95,    92,   323,   324,   133,   133,   133,
-     133,    19,    60,    20,    51,   330,   331,   348,   349,   350,
-     -72,   -72,   -71,   -71,   317,   318,   319,   133,   133,     7,
-       8,     9,    52,    11,    53,    13,    58,    54,   -70,   -70,
-     -69,   -69,   332,   333,   546,    55,   523,   459,   524,   291,
-     292,   293,   294,   295,   296,   297,   298,   299,   300,   301,
-     302,   303,   304,   270,   352,   278,   279,   280,   281,   282,
-     283,   270,   270,   270,   563,   101,   102,    62,   108,   109,
-     110,   284,   285,   286,   287,   122,   111,   112,   123,   124,
-    -113,   130,   376,   211,   398,   215,   216,   276,   217,    86,
-     238,   239,   242,   327,   -76,   -75,   236,   383,   -74,   -73,
-     377,   356,   335,   -79,   -80,   391,   392,   393,   137,   138,
-     139,   140,   141,   142,   143,   144,   336,   378,   357,   358,
-     270,   270,   270,   362,   363,   350,   374,   396,   270,   364,
-     395,   399,   365,   366,    86,   397,   133,   369,   370,   371,
-     270,   270,   384,   372,   373,   409,   444,   415,   446,   447,
-     448,   375,   379,   381,   452,   385,   386,   387,   388,   389,
-     390,   394,   414,   417,   434,   435,   436,   432,   418,   433,
-     419,   440,   442,   443,   449,   450,   270,   270,   451,   457,
-     456,   270,   458,   270,   454,   455,   467,   270,   400,   471,
-     472,   473,   474,   270,   270,   270,   476,   477,   133,   445,
-     133,   133,   133,   478,   412,   480,   133,   453,   483,   487,
-     501,   479,   503,   533,   484,   485,   491,   493,   494,   545,
-     481,   482,   495,   499,   504,   486,   352,   488,   270,   270,
-     505,   492,   438,   553,   506,   270,   565,   496,   497,   498,
-     516,   517,   522,   572,   270,   525,   527,   537,   536,   538,
-     539,   570,   133,   528,   529,   530,   573,   540,   566,   541,
-     542,   543,   544,   549,   550,   551,   555,   556,   500,   145,
-     146,   270,   520,   521,   557,   567,   568,   569,   574,   526,
-     577,   580,   202,   203,   204,   552,   360,   205,   532,   270,
-     206,   361,   515,   104,    56,   133,   465,   244,   114,   464,
-     145,   146,    59,   344,    26,   133,   133,   133,    97,   578,
-     531,   133,   490,   470,     0,   554,   270,   270,     0,     0,
-       0,   270,     0,     0,   270,     0,     0,     0,     0,     0,
-       0,     0,     0,   561,     0,     0,     0,   133,   420,   421,
-     422,   423,   424,     0,     0,   427,   428,   429,   430,   431,
+      89,   150,    26,   151,   118,   336,    94,   447,   284,   139,
+     128,   391,    42,    89,   132,   570,    97,   140,   449,   435,
+     332,   353,   354,   557,    31,  -177,   333,   436,   141,   277,
+     579,   277,   277,   142,   143,   144,   145,   146,   147,   148,
+     149,     4,    58,   277,    26,   142,   143,   144,   145,   146,
+     147,   148,   149,    32,   572,   448,     5,    51,   132,     6,
+       7,   138,   282,   329,   132,    20,   448,    21,     8,     9,
+      10,    11,    12,    13,    14,    46,    47,    48,   247,   119,
+     120,   224,   225,   409,   242,  -112,   134,   247,   248,    15,
+     315,    42,   435,   319,   136,    49,   435,   358,   320,   321,
+     322,   323,   472,   410,   471,    53,   122,   330,   331,   123,
+     124,   101,   102,   103,   138,   104,   105,   106,   327,   328,
+      52,     8,     9,    10,    54,    12,    55,    14,    28,    56,
+      29,   352,   435,   246,   296,   297,    95,    57,   470,   251,
+     313,   314,   138,   316,   317,   138,    98,   414,   415,   417,
+     138,   138,   138,   138,   129,   419,   420,   217,   218,   136,
+     136,   285,   286,   287,   288,   289,   290,   324,   325,   326,
+     138,   138,   355,   356,   337,   338,   359,   291,   292,   293,
+     294,    20,    60,    21,   -72,   -72,    63,   556,    65,   279,
+     280,   111,   469,   533,   112,   534,   -71,   -71,   113,   571,
+     114,   281,   -70,   -70,   -69,   -69,   126,   277,  -113,   361,
+     339,   340,   104,   105,   127,   277,   277,   277,   298,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,   309,
+     310,   311,    61,    62,   115,   385,   135,   216,   220,   407,
+     221,   222,   -82,    20,    89,    21,   243,   244,   249,     6,
+     283,   -82,   -82,   334,   -76,   386,   -75,   -74,   -82,   -82,
+     -82,   -82,   -82,   -82,   -82,   -73,   -82,    22,   342,   -79,
+     -80,   357,   387,   343,   -82,    23,   277,   277,   277,    24,
+     405,   365,   241,   366,   277,   371,   367,   372,   373,    89,
+     406,   138,   374,   375,   359,   378,   277,   277,   379,   380,
+     381,   382,   404,   454,   383,   456,   457,   458,   384,   393,
+     388,   462,   142,   143,   144,   145,   146,   147,   148,   149,
+       8,     9,    10,    11,    12,    13,    14,   390,   394,   395,
+     396,   397,   408,   277,   277,   398,   399,   403,   277,   418,
+     277,   421,   425,   424,   277,   427,   428,   429,   442,   443,
+     277,   277,   277,   450,   453,   138,   455,   138,   138,   138,
+     422,   459,   460,   138,   463,   392,    33,    34,    35,    36,
+      37,    38,    39,   400,   401,   402,   461,   466,   467,   468,
+     409,   477,   481,   482,   361,   277,   277,   483,   484,   490,
+     486,   497,   277,   487,   488,   489,   511,   494,   493,   495,
+     509,   277,   513,   543,   501,   555,   503,   504,   505,   514,
+     138,   538,   539,   540,   515,   516,   526,   527,   532,   535,
+     537,   546,   548,   549,   448,   150,   510,   151,   277,   547,
+     550,   551,   552,   573,   444,   445,   446,   553,   554,   559,
+     563,   578,   452,   560,   561,   564,   277,   565,   575,   574,
+     525,   576,   577,   138,   464,   465,   150,   580,   151,   581,
+     585,   582,   588,   138,   138,   138,   207,   208,   369,   138,
+     209,   277,   277,   107,   210,   370,   277,   211,   117,   277,
+     475,   125,    27,   474,   100,   586,   500,   541,     0,     0,
+     480,   491,   492,     0,     0,   138,   496,   351,   498,     0,
+       0,     0,   502,     0,     0,     0,     0,     0,   506,   507,
+     508,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     575,   576,     0,     0,     0,   579,     0,     0,   581,     0,
-       0,   125,    64,    65,    66,    67,    68,    69,    70,    71,
-      72,    73,    74,    75,    76,     0,     0,    77,    78,     0,
-       0,     0,     0,     0,   468,   469,    19,     0,    20,     0,
-       0,   475,   125,   221,   222,   223,   224,   225,   226,   227,
-     228,   229,   230,   231,    75,    76,     0,     0,    77,    78,
-       0,     0,     0,     0,     0,     0,     0,    19,     0,    20,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   507,   508,   509,
-     510,     0,   511,   512,   513,   514,     0,   125,    64,    65,
-      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,     0,     0,    77,    78,     0,     0,     0,     0,     0,
-     534,   535,    19,     0,    20,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   243,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   558,     0,   559,   560,     0,     0,     0,     0,
-       0,    79,     0,     0,    80,     0,     0,    81,     0,    82,
-     126,     0,   125,    64,    65,    66,    67,    68,    69,    70,
-      71,    72,    73,    74,    75,    76,     0,     0,    77,    78,
-       0,     0,    79,     0,     0,    80,     0,    19,    81,    20,
-      82,   407,     0,     0,     0,     0,     0,     0,     0,   351,
-     125,   221,   222,   223,   224,   225,   226,   227,   228,   229,
-     230,   231,    75,    76,     0,     0,    77,    78,     0,     0,
-       0,     0,     0,     0,     0,    19,     0,    20,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    79,     0,     0,
-      80,     0,     0,    81,     0,    82,   125,    64,    65,    66,
+     430,   431,   432,   433,   434,     0,     0,   437,   438,   439,
+     440,   441,     0,   530,   531,     0,     0,     0,     0,     0,
+     536,     0,     0,     0,     0,     0,     0,     0,     0,   542,
+       0,     0,     0,     0,   130,    67,    68,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,     0,     0,
+      80,    81,     0,     0,     0,     0,   562,   478,   479,    20,
+       0,    21,     0,     0,   485,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   569,     0,   130,    67,    68,    69,
+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+       0,     0,    80,    81,     0,     0,     0,     0,     0,   583,
+     584,    20,     0,    21,   587,     0,     0,   589,     0,     0,
+     517,   518,   519,   520,     0,   521,   522,   523,   524,     0,
+     130,   226,   227,   228,   229,   230,   231,   232,   233,   234,
+     235,   236,    78,    79,     0,     0,    80,    81,     0,     0,
+       0,     0,     0,   544,   545,    20,     0,    21,     0,   130,
       67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-       0,     0,    77,    78,     0,     0,     0,     0,     0,     0,
-       0,    19,     0,    20,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   416,   125,    64,    65,    66,    67,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,     0,     0,
-      77,    78,     0,     0,     0,     0,     0,     0,     0,    19,
-       0,    20,    79,     0,     0,    80,     0,     0,    81,     0,
-      82,   463,    63,    64,    65,    66,    67,    68,    69,    70,
-      71,    72,    73,    74,    75,    76,     0,     0,    77,    78,
-       0,     0,     0,     0,     0,     0,     0,    19,     0,    20,
-      79,     0,     0,    80,     0,   404,    81,     0,    82,   132,
-      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
-      74,    75,    76,     0,     0,    77,    78,     0,     0,     0,
-       0,     0,     0,     0,    19,     0,    20,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    79,     0,     0,    80,
-       0,     0,    81,     0,    82,   125,    64,    65,    66,    67,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,     0,
-       0,    77,    78,     0,     0,     0,     0,     0,     0,     0,
-      19,     0,    20,     0,    79,     0,     0,    80,     0,     0,
-      81,     0,    82,   125,   221,   222,   223,   224,   225,   226,
-     227,   228,   229,   230,   231,    75,    76,     0,     0,    77,
-      78,     0,     0,     0,     0,     0,     0,     0,    19,     0,
-      20,     0,    79,     0,     0,    80,     0,     0,    81,     0,
-      82,     0,   -82,    19,     0,    20,     0,     0,     0,     6,
-     -82,   -82,     0,     0,     0,     0,     0,   -82,   -82,   -82,
-     -82,   -82,   -82,   -82,     0,   -82,    21,     0,     0,    79,
-       0,     0,    80,   -82,    22,    81,     0,    82,    23,     0,
+      77,    78,    79,     0,     0,    80,    81,     0,     0,     0,
+       0,     0,     0,     0,    20,   566,    21,   567,   568,     0,
+       0,     0,     0,     0,     0,    82,     0,   250,    83,     0,
+       0,    84,     0,    85,   131,     0,   130,    67,    68,    69,
+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+       0,     0,    80,    81,     0,     0,     0,     0,     0,     0,
+       0,    20,     0,    21,     0,     0,     0,    82,     0,     0,
+      83,     0,     0,    84,   360,    85,   245,   130,   226,   227,
+     228,   229,   230,   231,   232,   233,   234,   235,   236,    78,
+      79,     0,     0,    80,    81,     0,     0,     0,     0,     0,
+       0,     0,    20,     0,    21,     0,     0,     0,     0,     0,
+       0,    82,     0,     0,    83,     0,     0,    84,     0,    85,
+     416,     0,   130,    67,    68,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,     0,     0,    80,    81,
+      82,     0,     0,    83,     0,     0,    84,    20,    85,    21,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     426,   130,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,     0,     0,    80,    81,     0,
+       0,     0,     0,     0,     0,     0,    20,    82,    21,     0,
+      83,     0,     0,    84,     0,    85,     0,     0,     0,   473,
+      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,     0,     0,    80,    81,     0,     0,
+       0,     0,     0,     0,     0,    20,     0,    21,    82,     0,
+       0,    83,     0,   413,    84,     0,    85,   137,    67,    68,
+      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
+      79,     0,     0,    80,    81,     0,     0,     0,     0,     0,
+       0,     0,    20,     0,    21,     0,     0,     0,     0,     0,
+       0,     0,     0,    82,     0,     0,    83,     0,     0,    84,
+       0,    85,   130,    67,    68,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,     0,     0,    80,    81,
+       0,     0,     0,     0,     0,     0,     0,    20,     0,    21,
+       0,     0,    82,     0,     0,    83,     0,     0,    84,     0,
+      85,   130,   226,   227,   228,   229,   230,   231,   232,   233,
+     234,   235,   236,    78,    79,     0,     0,    80,    81,     0,
+       0,     0,     0,     0,     0,     0,    20,     0,    21,     0,
+       0,    82,     0,     0,    83,     0,     0,    84,     0,    85,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    77,    78,     0,   337,   338,   339,     0,     0,     0,
-      19,     0,    20,     0,     0,    79,     0,     0,    80,     0,
-       0,    81,     0,    82,     0,     0,     0,     0,     0,     0,
+       0,    80,    81,     0,   344,   345,   346,     0,    82,     0,
+      20,    83,    21,     0,    84,     0,    85,     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,     0,    79,     0,     0,    80,     0,     0,    81,
-       0,    82,   153,   154,   155,   156,   157,   158,   159,   160,
-     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
-     171,   172,   255,   256,     0,     0,     0,     0,   246,   247,
-      77,    78,   248,   249,   250,   251,   252,   253,     0,    19,
-       0,    20,     0,     0,     0,     0,     0,     0,     0,   257,
-       0,   258,   181,   182,   183,   184,     0,   259,   260,   261,
-     189,   190,   191,   192,   193,   194,   195,   196,   197,   198,
-     199,   200,   201,   254,     0,     0,     0,     0,   340,     0,
-       0,   341,     0,   342,     0,     0,   343,     0,     0,     0,
-       0,   153,   154,   155,   156,   157,   158,   159,   160,   161,
-     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
-     172,   255,   256,     0,     0,     0,     0,   246,   247,     0,
-       0,   248,   249,   250,   251,   252,   253,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   257,     0,
-     258,   181,   182,   183,   184,     0,   259,   260,   261,   189,
-     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
-     200,   201,   254,     0,     0,     0,     0,     0,     0,     0,
-     262,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     153,   154,   155,   156,   157,   158,   159,   160,   161,   162,
-     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
-     255,   256,     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,   257,     0,   258,
-     181,   182,   183,   184,     0,   259,   260,   261,   189,   190,
-     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
-     201,   148,     0,     0,     0,     0,     0,     0,     0,   262,
-       0,     0,   149,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   150,   151,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   152,
-       0,     0,     0,   153,   154,   155,   156,   157,   158,   159,
-     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
-     170,   171,   172,   173,   174,     0,     0,     0,     0,     0,
+       0,     0,     0,    82,     0,     0,    83,     0,     0,    84,
+       0,    85,     0,   158,   159,   160,   161,   162,   163,   164,
+     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   262,   263,     0,     0,     0,     0,     0,
+       0,     0,    82,     0,     0,    83,     0,     0,    84,     0,
+      85,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     264,     0,   265,   186,   187,   188,   189,     0,   266,   267,
+     268,   194,   195,   196,   197,   198,   199,   200,   201,   202,
+     203,   204,   205,   206,     0,     0,     0,     0,     0,   347,
+       0,     0,   348,     0,   349,     0,     0,   350,   253,   254,
+      80,    81,   255,   256,   257,   258,   259,   260,     0,    20,
+       0,    21,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   175,   176,   177,     0,     0,
-     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
-     188,   189,   190,   191,   192,   193,   194,   195,   196,   197,
-     198,   199,   200,   201
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   261,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   158,   159,   160,   161,   162,   163,   164,   165,
+     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
+     176,   177,   262,   263,     0,     0,     0,   253,   254,     0,
+       0,   255,   256,   257,   258,   259,   260,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   264,
+       0,   265,   186,   187,   188,   189,     0,   266,   267,   268,
+     194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
+     204,   205,   206,   261,     0,     0,     0,     0,     0,     0,
+       0,   269,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   158,   159,   160,   161,   162,   163,   164,   165,   166,
+     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   262,   263,     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,   264,     0,
+     265,   186,   187,   188,   189,     0,   266,   267,   268,   194,
+     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   153,     0,     0,     0,     0,     0,     0,     0,
+     269,     0,     0,   154,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   155,   156,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     157,     0,     0,     0,   158,   159,   160,   161,   162,   163,
+     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
+     174,   175,   176,   177,   178,   179,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   180,   181,   182,     0,
+       0,   183,   184,   185,   186,   187,   188,   189,   190,   191,
+     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
+     202,   203,   204,   205,   206
 };
 
 static const short int yycheck[] =
 {
-      38,    82,   100,   100,   220,     3,    51,   307,    98,     0,
-      29,    10,     4,    51,    33,    32,   152,   517,   152,    37,
-     236,   237,    10,    15,    52,    53,    54,   133,   162,   135,
-     136,     5,     6,     7,     8,     9,    10,    11,    12,    57,
-      31,   147,   152,    34,    72,    43,    35,    36,   548,   130,
-     160,    42,    43,    44,    45,    46,    47,    48,    57,   149,
-      98,     5,     6,     7,     8,     9,    10,    11,    12,    57,
-     154,   207,    63,   135,   136,    28,   547,    30,   152,   163,
-     118,   119,     0,   121,   152,   147,    84,   177,   162,   158,
-     180,    62,   160,   564,   163,   185,   186,   187,   188,    65,
-      66,    67,    68,    69,    70,    71,    25,    26,   152,   151,
-     160,   149,   152,   163,   158,   205,   206,    45,   158,    47,
-      73,    74,    75,    29,    77,    78,    79,    53,    62,   235,
-      56,    57,   340,   341,   342,    55,    56,   175,   176,   177,
-     178,   179,   180,   162,   161,   125,   126,   185,   186,   187,
-     188,    28,    30,    30,    27,    25,    26,   238,   239,   240,
-      17,    18,    17,    18,   202,   203,   204,   205,   206,    42,
-      43,    44,    45,    46,    47,    48,   151,    50,    17,    18,
-      17,    18,    17,    18,   158,    58,   486,   403,   488,   108,
-     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   309,   242,   102,   103,   104,   105,   106,
-     107,   317,   318,   319,   158,    77,    78,    18,   151,   151,
-     151,   118,   119,   120,   121,    18,   151,   156,    18,    18,
-     154,   154,   277,    30,   324,    18,    30,    60,    30,   277,
-     157,   157,   154,   152,    18,    18,   120,   309,    18,    18,
-     288,   152,    18,    21,    21,   317,   318,   319,     5,     6,
-       7,     8,     9,    10,    11,    12,    21,   305,   155,    64,
-     376,   377,   378,   154,   154,   356,   152,   322,   384,   154,
-      39,    30,   154,   154,   322,   323,   324,   154,   154,   154,
-     396,   397,   156,   154,   154,    30,   386,   155,   388,   389,
-     390,   152,   152,   152,   394,   152,   152,   152,   152,   152,
-     152,   152,   152,    30,   376,   377,   378,    15,   154,    15,
-     154,   152,   384,   156,   152,   152,   432,   433,   152,    30,
-     152,   437,    18,   439,   396,   397,   152,   443,    37,   152,
-     152,   152,   152,   449,   450,   451,   152,   152,   386,   387,
-     388,   389,   390,   152,   352,    39,   394,   395,   154,    18,
-      57,   152,    30,    18,   152,   152,   152,   152,   152,    15,
-     432,   433,   152,   154,   152,   437,   414,   439,   484,   485,
-     152,   443,    57,   158,   155,   491,    39,   449,   450,   451,
-     152,   156,   152,    15,   500,   152,   152,   155,   152,   152,
-     152,   152,   440,   493,   494,   495,    15,   155,   158,   155,
-     155,   155,   155,   155,   155,   155,   155,   155,   456,   517,
-     517,   527,   484,   485,   155,   155,   155,   155,   152,   491,
-      15,    15,   104,   104,   104,   525,   255,   104,   500,   545,
-     104,   256,   480,    43,    24,   483,   415,   130,    50,   414,
-     548,   548,    29,   235,     3,   493,   494,   495,    41,   575,
-     499,   499,   440,   420,    -1,   527,   572,   573,    -1,    -1,
-      -1,   577,    -1,    -1,   580,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   545,    -1,    -1,    -1,   525,   362,   363,
-     364,   365,   366,    -1,    -1,   369,   370,   371,   372,   373,
+      40,   103,     3,   103,    53,   225,    32,    10,   157,   101,
+      18,   314,    29,    53,    85,   557,    33,     4,    10,   153,
+     153,   241,   242,   527,     7,     0,   159,   161,    15,   138,
+     572,   140,   141,     5,     6,     7,     8,     9,    10,    11,
+      12,     0,    25,   152,    45,     5,     6,     7,     8,     9,
+      10,    11,    12,    63,   558,    58,    31,   152,   129,    34,
+      35,   101,   154,   212,   135,    28,    58,    30,    43,    44,
+      45,    46,    47,    48,    49,    53,    54,    55,   153,    36,
+      37,   121,   122,    38,   124,   155,    87,   153,   163,    64,
+     182,    29,   153,   185,   164,    73,   153,   163,   190,   191,
+     192,   193,   163,    58,   161,    27,    55,   126,   127,    58,
+      59,    74,    75,    76,   154,    78,    79,    80,   210,   211,
+      63,    43,    44,    45,    46,    47,    48,    49,    46,    51,
+      48,   240,   153,   129,    25,    26,   162,    59,   159,   135,
+     180,   181,   182,   183,   184,   185,   163,   347,   348,   349,
+     190,   191,   192,   193,   162,   159,   161,    56,    57,   164,
+     164,   103,   104,   105,   106,   107,   108,   207,   208,   209,
+     210,   211,   243,   244,    25,    26,   247,   119,   120,   121,
+     122,    28,   152,    30,    17,    18,    30,   159,    18,   140,
+     141,   152,   412,   496,   152,   498,    17,    18,   152,   159,
+     152,   152,    17,    18,    17,    18,    18,   316,   155,   249,
+      17,    18,    78,    79,    18,   324,   325,   326,   109,   110,
+     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
+     121,   122,    30,    31,   157,   284,   155,    30,    18,   331,
+      30,    30,    27,    28,   284,    30,   158,   158,   155,    34,
+      61,    36,    37,   153,    18,   295,    18,    18,    43,    44,
+      45,    46,    47,    48,    49,    18,    51,    52,    18,    21,
+      21,   161,   312,    21,    59,    60,   385,   386,   387,    64,
+     329,   153,   123,   156,   393,   155,    65,   155,   155,   329,
+     330,   331,   155,   155,   365,   155,   405,   406,   155,   155,
+     155,   155,    40,   395,   153,   397,   398,   399,   153,   157,
+     153,   403,     5,     6,     7,     8,     9,    10,    11,    12,
+      43,    44,    45,    46,    47,    48,    49,   153,   153,   153,
+     153,   153,    30,   442,   443,   153,   153,   153,   447,    30,
+     449,   161,   156,   153,   453,    30,   155,   155,    15,    15,
+     459,   460,   461,   153,   157,   395,   396,   397,   398,   399,
+     361,   153,   153,   403,   404,   316,    66,    67,    68,    69,
+      70,    71,    72,   324,   325,   326,   153,   153,    30,    18,
+      38,   153,   153,   153,   424,   494,   495,   153,   153,    40,
+     153,    18,   501,   153,   153,   153,    58,   153,   155,   153,
+     155,   510,    30,    18,   153,    15,   153,   153,   153,   153,
+     450,   503,   504,   505,   153,   156,   153,   157,   153,   153,
+     153,   153,   153,   153,    58,   527,   466,   527,   537,   156,
+     156,   156,   156,    40,   385,   386,   387,   156,   156,   156,
+     156,   153,   393,   535,   159,   156,   555,   156,   156,   159,
+     490,   156,   156,   493,   405,   406,   558,    15,   558,    15,
+      15,   153,    15,   503,   504,   505,   107,   107,   262,   509,
+     107,   580,   581,    45,   107,   263,   585,   107,    52,   588,
+     425,    62,     3,   424,    43,   583,   450,   509,    -1,    -1,
+     430,   442,   443,    -1,    -1,   535,   447,   240,   449,    -1,
+      -1,    -1,   453,    -1,    -1,    -1,    -1,    -1,   459,   460,
+     461,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     572,   573,    -1,    -1,    -1,   577,    -1,    -1,   580,    -1,
-      -1,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    -1,    -1,    19,    20,    -1,
-      -1,    -1,    -1,    -1,   418,   419,    28,    -1,    30,    -1,
-      -1,   425,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    -1,    -1,    19,    20,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    28,    -1,    30,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   471,   472,   473,
-     474,    -1,   476,   477,   478,   479,    -1,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    -1,    -1,    19,    20,    -1,    -1,    -1,    -1,    -1,
-     504,   505,    28,    -1,    30,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   536,    -1,   538,   539,    -1,    -1,    -1,    -1,
-      -1,   153,    -1,    -1,   156,    -1,    -1,   159,    -1,   161,
-     162,    -1,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    -1,    -1,    19,    20,
-      -1,    -1,   153,    -1,    -1,   156,    -1,    28,   159,    30,
-     161,   162,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,
+     371,   372,   373,   374,   375,    -1,    -1,   378,   379,   380,
+     381,   382,    -1,   494,   495,    -1,    -1,    -1,    -1,    -1,
+     501,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   510,
+      -1,    -1,    -1,    -1,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    -1,    -1,
+      19,    20,    -1,    -1,    -1,    -1,   537,   428,   429,    28,
+      -1,    30,    -1,    -1,   435,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   555,    -1,     3,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      -1,    -1,    19,    20,    -1,    -1,    -1,    -1,    -1,   580,
+     581,    28,    -1,    30,   585,    -1,    -1,   588,    -1,    -1,
+     481,   482,   483,   484,    -1,   486,   487,   488,   489,    -1,
        3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
       13,    14,    15,    16,    -1,    -1,    19,    20,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    28,    -1,    30,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   153,    -1,    -1,
-     156,    -1,    -1,   159,    -1,   161,     3,     4,     5,     6,
-       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      -1,    -1,    19,    20,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    28,    -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    40,     3,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    -1,    -1,
-      19,    20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    28,
-      -1,    30,   153,    -1,    -1,   156,    -1,    -1,   159,    -1,
-     161,    40,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    -1,    -1,    19,    20,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    28,    -1,    30,
-     153,    -1,    -1,   156,    -1,   158,   159,    -1,   161,     3,
+      -1,    -1,    -1,   514,   515,    28,    -1,    30,    -1,     3,
        4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
       14,    15,    16,    -1,    -1,    19,    20,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    28,    -1,    30,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   153,    -1,    -1,   156,
-      -1,    -1,   159,    -1,   161,     3,     4,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    -1,
-      -1,    19,    20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      28,    -1,    30,    -1,   153,    -1,    -1,   156,    -1,    -1,
-     159,    -1,   161,     3,     4,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    -1,    -1,    19,
-      20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    28,    -1,
-      30,    -1,   153,    -1,    -1,   156,    -1,    -1,   159,    -1,
-     161,    -1,    27,    28,    -1,    30,    -1,    -1,    -1,    34,
-      35,    36,    -1,    -1,    -1,    -1,    -1,    42,    43,    44,
-      45,    46,    47,    48,    -1,    50,    51,    -1,    -1,   153,
-      -1,    -1,   156,    58,    59,   159,    -1,   161,    63,    -1,
+      -1,    -1,    -1,    -1,    28,   546,    30,   548,   549,    -1,
+      -1,    -1,    -1,    -1,    -1,   154,    -1,    41,   157,    -1,
+      -1,   160,    -1,   162,   163,    -1,     3,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      -1,    -1,    19,    20,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    28,    -1,    30,    -1,    -1,    -1,   154,    -1,    -1,
+     157,    -1,    -1,   160,    41,   162,   163,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    -1,    -1,    19,    20,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    28,    -1,    30,    -1,    -1,    -1,    -1,    -1,
+      -1,   154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,
+     163,    -1,     3,     4,     5,     6,     7,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    -1,    -1,    19,    20,
+     154,    -1,    -1,   157,    -1,    -1,   160,    28,   162,    30,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      41,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    -1,    -1,    19,    20,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    28,   154,    30,    -1,
+     157,    -1,    -1,   160,    -1,   162,    -1,    -1,    -1,    41,
+       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    -1,    -1,    19,    20,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    28,    -1,    30,   154,    -1,
+      -1,   157,    -1,   159,   160,    -1,   162,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    -1,    -1,    19,    20,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    28,    -1,    30,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   154,    -1,    -1,   157,    -1,    -1,   160,
+      -1,   162,     3,     4,     5,     6,     7,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    -1,    -1,    19,    20,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    28,    -1,    30,
+      -1,    -1,   154,    -1,    -1,   157,    -1,    -1,   160,    -1,
+     162,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    -1,    -1,    19,    20,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    28,    -1,    30,    -1,
+      -1,   154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,
-      28,    -1,    30,    -1,    -1,   153,    -1,    -1,   156,    -1,
-      -1,   159,    -1,   161,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    19,    20,    -1,    22,    23,    24,    -1,   154,    -1,
+      28,   157,    30,    -1,   160,    -1,   162,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   153,    -1,    -1,   156,    -1,    -1,   159,
-      -1,   161,    80,    81,    82,    83,    84,    85,    86,    87,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   154,    -1,    -1,   157,    -1,    -1,   160,
+      -1,   162,    -1,    81,    82,    83,    84,    85,    86,    87,
       88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
-      98,    99,   100,   101,    -1,    -1,    -1,    -1,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    -1,    28,
-      -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   127,
-      -1,   129,   130,   131,   132,   133,    -1,   135,   136,   137,
+      98,    99,   100,   101,   102,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   154,    -1,    -1,   157,    -1,    -1,   160,    -1,
+     162,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     128,    -1,   130,   131,   132,   133,   134,    -1,   136,   137,
      138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
-     148,   149,   150,    62,    -1,    -1,    -1,    -1,   156,    -1,
-      -1,   159,    -1,   161,    -1,    -1,   164,    -1,    -1,    -1,
-      -1,    80,    81,    82,    83,    84,    85,    86,    87,    88,
+     148,   149,   150,   151,    -1,    -1,    -1,    -1,    -1,   157,
+      -1,    -1,   160,    -1,   162,    -1,    -1,   165,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    -1,    28,
+      -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    63,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    81,    82,    83,    84,    85,    86,    87,    88,
       89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,    -1,    -1,    -1,    -1,    17,    18,    -1,
+      99,   100,   101,   102,    -1,    -1,    -1,    17,    18,    -1,
       -1,    21,    22,    23,    24,    25,    26,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   127,    -1,
-     129,   130,   131,   132,   133,    -1,   135,   136,   137,   138,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   128,
+      -1,   130,   131,   132,   133,   134,    -1,   136,   137,   138,
      139,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,    62,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     159,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+     149,   150,   151,    63,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   160,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    81,    82,    83,    84,    85,    86,    87,    88,    89,
       90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
-     100,   101,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     100,   101,   102,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   127,    -1,   129,
-     130,   131,   132,   133,    -1,   135,   136,   137,   138,   139,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   128,    -1,
+     130,   131,   132,   133,   134,    -1,   136,   137,   138,   139,
      140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
-     150,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   159,
-      -1,    -1,    49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    60,    61,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    76,
-      -1,    -1,    -1,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,    -1,    -1,    -1,    -1,    -1,
+     150,   151,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     160,    -1,    -1,    50,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    61,    62,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   122,   123,   124,    -1,    -1,
-     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+      77,    -1,    -1,    -1,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   123,   124,   125,    -1,
+      -1,   128,   129,   130,   131,   132,   133,   134,   135,   136,
      137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,   148,   149,   150
+     147,   148,   149,   150,   151
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const unsigned char yystos[] =
 {
-       0,   199,   200,   202,     0,    31,    34,    42,    43,    44,
-      45,    46,    47,    48,    63,   180,   215,   217,   219,    28,
-      30,    51,    59,    63,   179,   208,   219,    45,    47,   218,
-      62,    65,    66,    67,    68,    69,    70,    71,   181,   213,
-      29,   225,   226,   227,    52,    53,    54,    72,   205,   151,
-      62,    27,    45,    47,    50,    58,   180,   201,   151,   213,
-      30,   203,    18,     3,     4,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    19,    20,   153,
-     156,   159,   161,   166,   188,   189,   190,   191,   192,   208,
-     222,    32,   161,   214,    33,   162,   216,   226,    73,    74,
-      75,    77,    78,    79,   179,   228,   229,   231,   151,   151,
-     151,   151,   156,   206,   203,   188,    35,    36,   198,   198,
-     198,   198,    18,    18,    18,     3,   162,   192,   193,   208,
-     154,   163,     3,   190,   224,     4,    15,     5,     6,     7,
-       8,     9,    10,    11,    12,   175,   176,   177,    38,    49,
-      60,    61,    76,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   122,   123,   124,   127,   128,
-     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
-     139,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,   168,   169,   170,   173,   174,   235,   236,   238,
-     239,    30,    55,    56,   204,    18,    30,    30,   207,   190,
-     190,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,   175,   176,   178,   190,   195,   190,   157,   157,
-     152,   162,   154,    40,   193,   194,    17,    18,    21,    22,
-      23,    24,    25,    26,    62,   100,   101,   127,   129,   135,
-     136,   137,   159,   168,   169,   170,   173,   174,   196,   221,
-     222,   223,   223,   223,   223,   224,    60,   181,   102,   103,
-     104,   105,   106,   107,   118,   119,   120,   121,   171,    25,
-      26,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,   121,   172,   190,   190,   224,   190,
-     190,   232,   224,   224,   224,   224,   224,   190,   190,   190,
-     224,   224,   181,   125,   126,   152,   158,   152,   186,   186,
-      25,    26,    17,    18,   167,    18,    21,    22,    23,    24,
-     156,   159,   161,   164,   196,   222,   186,   186,   192,   192,
-     192,    40,   190,   210,   211,   212,   152,   155,    64,   220,
-     171,   172,   154,   154,   154,   154,   154,   195,   197,   154,
-     154,   154,   154,   154,   152,   152,   188,   190,   190,   152,
-     183,   152,   183,   223,   156,   152,   152,   152,   152,   152,
-     152,   223,   223,   223,   152,    39,   188,   190,   224,    30,
-      37,    57,   184,   187,   158,   197,   197,   162,   197,    30,
-     158,   160,   208,   209,   152,   155,    40,    30,   154,   154,
-     195,   195,   195,   195,   195,   152,   160,   195,   195,   195,
-     195,   195,    15,    15,   223,   223,   223,    10,    57,    10,
-     152,   237,   223,   156,   224,   190,   224,   224,   224,   152,
-     152,   152,   224,   190,   223,   223,   152,    30,    18,   186,
-     158,   160,   162,    40,   210,   184,   185,   152,   195,   195,
-     237,   152,   152,   152,   152,   195,   152,   152,   152,   152,
-      39,   223,   223,   154,   152,   152,   223,    18,   223,   224,
-     233,   152,   223,   152,   152,   152,   223,   223,   223,   154,
-     190,    57,   182,    30,   152,   152,   155,   195,   195,   195,
-     195,   195,   195,   195,   195,   190,   152,   156,   233,   234,
-     223,   223,   152,   183,   183,   152,   223,   152,   224,   224,
-     224,   234,   223,    18,   195,   195,   152,   155,   152,   152,
-     155,   155,   155,   155,   155,    15,   158,   177,   230,   155,
-     155,   155,   224,   158,   223,   155,   155,   155,   195,   195,
-     195,   223,   221,   158,   177,    39,   158,   155,   155,   155,
-     152,   221,    15,    15,   152,   223,   223,    15,   228,   223,
-      15,   223
+       0,   200,   201,   203,     0,    31,    34,    35,    43,    44,
+      45,    46,    47,    48,    49,    64,   181,   216,   218,   220,
+      28,    30,    52,    60,    64,   180,   209,   220,    46,    48,
+     219,   181,    63,    66,    67,    68,    69,    70,    71,    72,
+     182,   214,    29,   226,   227,   228,    53,    54,    55,    73,
+     206,   152,    63,    27,    46,    48,    51,    59,   181,   202,
+     152,   214,   214,    30,   204,    18,     3,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      19,    20,   154,   157,   160,   162,   167,   189,   190,   191,
+     192,   193,   209,   223,    32,   162,   215,    33,   163,   217,
+     227,    74,    75,    76,    78,    79,    80,   180,   229,   230,
+     232,   152,   152,   152,   152,   157,   207,   204,   189,    36,
+      37,   199,   199,   199,   199,   215,    18,    18,    18,   162,
+       3,   163,   193,   194,   209,   155,   164,     3,   191,   225,
+       4,    15,     5,     6,     7,     8,     9,    10,    11,    12,
+     176,   177,   178,    39,    50,    61,    62,    77,    81,    82,
+      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
+      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
+     123,   124,   125,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   169,   170,   171,
+     174,   175,   236,   237,   239,   240,    30,    56,    57,   205,
+      18,    30,    30,   208,   191,   191,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    13,    14,   176,   177,   179,
+     191,   196,   191,   158,   158,   163,   194,   153,   163,   155,
+      41,   194,   195,    17,    18,    21,    22,    23,    24,    25,
+      26,    63,   101,   102,   128,   130,   136,   137,   138,   160,
+     169,   170,   171,   174,   175,   197,   222,   223,   224,   224,
+     224,   224,   225,    61,   182,   103,   104,   105,   106,   107,
+     108,   119,   120,   121,   122,   172,    25,    26,   109,   110,
+     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
+     121,   122,   173,   191,   191,   225,   191,   191,   233,   225,
+     225,   225,   225,   225,   191,   191,   191,   225,   225,   182,
+     126,   127,   153,   159,   153,   187,   187,    25,    26,    17,
+      18,   168,    18,    21,    22,    23,    24,   157,   160,   162,
+     165,   197,   223,   187,   187,   193,   193,   161,   163,   193,
+      41,   191,   211,   212,   213,   153,   156,    65,   221,   172,
+     173,   155,   155,   155,   155,   155,   196,   198,   155,   155,
+     155,   155,   155,   153,   153,   189,   191,   191,   153,   184,
+     153,   184,   224,   157,   153,   153,   153,   153,   153,   153,
+     224,   224,   224,   153,    40,   189,   191,   225,    30,    38,
+      58,   185,   188,   159,   198,   198,   163,   198,    30,   159,
+     161,   161,   209,   210,   153,   156,    41,    30,   155,   155,
+     196,   196,   196,   196,   196,   153,   161,   196,   196,   196,
+     196,   196,    15,    15,   224,   224,   224,    10,    58,    10,
+     153,   238,   224,   157,   225,   191,   225,   225,   225,   153,
+     153,   153,   225,   191,   224,   224,   153,    30,    18,   187,
+     159,   161,   163,    41,   211,   185,   186,   153,   196,   196,
+     238,   153,   153,   153,   153,   196,   153,   153,   153,   153,
+      40,   224,   224,   155,   153,   153,   224,    18,   224,   225,
+     234,   153,   224,   153,   153,   153,   224,   224,   224,   155,
+     191,    58,   183,    30,   153,   153,   156,   196,   196,   196,
+     196,   196,   196,   196,   196,   191,   153,   157,   234,   235,
+     224,   224,   153,   184,   184,   153,   224,   153,   225,   225,
+     225,   235,   224,    18,   196,   196,   153,   156,   153,   153,
+     156,   156,   156,   156,   156,    15,   159,   178,   231,   156,
+     225,   159,   224,   156,   156,   156,   196,   196,   196,   224,
+     222,   159,   178,    40,   159,   156,   156,   156,   153,   222,
+      15,    15,   153,   224,   224,    15,   229,   224,    15,   224
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -2398,26 +2419,26 @@
   switch (yyn)
     {
         case 81:
-#line 363 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 363 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[-1].String);
   ;}
     break;
 
   case 82:
-#line 366 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 366 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = new std::string(""); 
   ;}
     break;
 
   case 90:
-#line 373 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 373 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(""); ;}
     break;
 
   case 97:
-#line 378 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 378 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { 
     *(yyvsp[-1].String) += *(yyvsp[0].String); 
     delete (yyvsp[0].String);
@@ -2426,27 +2447,27 @@
     break;
 
   case 98:
-#line 383 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 383 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(""); ;}
     break;
 
   case 99:
-#line 388 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 388 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 100:
-#line 389 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 389 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); (yyval.String) = (yyvsp[-1].String); ;}
     break;
 
   case 101:
-#line 392 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 392 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 102:
-#line 393 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 393 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyvsp[-1].String)->insert(0, ", "); 
     *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
@@ -2456,7 +2477,7 @@
     break;
 
   case 103:
-#line 401 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 401 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { 
     *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -2465,17 +2486,17 @@
     break;
 
   case 104:
-#line 407 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 407 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 106:
-#line 411 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 411 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 107:
-#line 412 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 412 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
       (yyvsp[-1].String)->insert(0, ", ");
       if (!(yyvsp[0].String)->empty())
@@ -2486,7 +2507,7 @@
     break;
 
   case 109:
-#line 422 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 422 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
       *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
       delete (yyvsp[0].String);
@@ -2495,7 +2516,7 @@
     break;
 
   case 127:
-#line 444 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 444 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyval.Type).newTy = (yyvsp[0].String); 
     (yyval.Type).oldTy = OpaqueTy; 
@@ -2503,7 +2524,7 @@
     break;
 
   case 128:
-#line 448 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 448 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyval.Type).newTy = (yyvsp[0].String);
     (yyval.Type).oldTy = UnresolvedTy;
@@ -2511,14 +2532,14 @@
     break;
 
   case 129:
-#line 452 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 452 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyval.Type) = (yyvsp[0].Type); 
   ;}
     break;
 
   case 130:
-#line 455 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 455 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {                   // Type UpReference
     (yyvsp[0].String)->insert(0, "\\");
     (yyval.Type).newTy = (yyvsp[0].String);
@@ -2527,7 +2548,7 @@
     break;
 
   case 131:
-#line 460 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 460 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {           // Function derived type?
     *(yyvsp[-3].Type).newTy += "( " + *(yyvsp[-1].String) + " )";
     delete (yyvsp[-1].String);
@@ -2537,7 +2558,7 @@
     break;
 
   case 132:
-#line 466 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 466 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {          // Sized array type?
     (yyvsp[-3].String)->insert(0,"[ ");
     *(yyvsp[-3].String) += " x " + *(yyvsp[-1].Type).newTy + " ]";
@@ -2549,7 +2570,7 @@
     break;
 
   case 133:
-#line 474 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 474 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {          // Packed array type?
     (yyvsp[-3].String)->insert(0,"< ");
     *(yyvsp[-3].String) += " x " + *(yyvsp[-1].Type).newTy + " >";
@@ -2561,7 +2582,7 @@
     break;
 
   case 134:
-#line 482 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 482 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {                        // Structure type?
     (yyvsp[-1].String)->insert(0, "{ ");
     *(yyvsp[-1].String) += " }";
@@ -2571,7 +2592,7 @@
     break;
 
   case 135:
-#line 488 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 488 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {                                  // Empty structure type?
     (yyval.Type).newTy = new std::string("{}");
     (yyval.Type).oldTy = StructTy;
@@ -2579,7 +2600,25 @@
     break;
 
   case 136:
-#line 492 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 492 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {                // Packed Structure type?
+    (yyvsp[-2].String)->insert(0, "<{ ");
+    *(yyvsp[-2].String) += " }>";
+    (yyval.Type).newTy = (yyvsp[-2].String);
+    (yyval.Type).oldTy = StructTy;
+  ;}
+    break;
+
+  case 137:
+#line 498 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {                          // Empty packed structure type?
+    (yyval.Type).newTy = new std::string("<{}>");
+    (yyval.Type).oldTy = StructTy;
+  ;}
+    break;
+
+  case 138:
+#line 502 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {                             // Pointer type?
     *(yyvsp[-1].Type).newTy += '*';
     (yyval.Type).elemTy = (yyvsp[-1].Type).oldTy;
@@ -2588,15 +2627,15 @@
   ;}
     break;
 
-  case 137:
-#line 503 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 139:
+#line 513 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].Type).newTy;
   ;}
     break;
 
-  case 138:
-#line 506 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 140:
+#line 516 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].Type).newTy;
     delete (yyvsp[0].Type).newTy;
@@ -2604,8 +2643,8 @@
   ;}
     break;
 
-  case 140:
-#line 515 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 142:
+#line 525 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", ...";
     delete (yyvsp[0].String);
@@ -2613,22 +2652,22 @@
   ;}
     break;
 
-  case 141:
-#line 520 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 143:
+#line 530 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].String);
   ;}
     break;
 
-  case 142:
-#line 523 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 144:
+#line 533 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = new std::string();
   ;}
     break;
 
-  case 143:
-#line 533 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 145:
+#line 543 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { // Nonempty unsized arr
     (yyval.Const).type = (yyvsp[-3].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy);
@@ -2637,8 +2676,8 @@
   ;}
     break;
 
-  case 144:
-#line 539 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 146:
+#line 549 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-2].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy);
@@ -2646,8 +2685,8 @@
   ;}
     break;
 
-  case 145:
-#line 544 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 147:
+#line 554 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-2].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy);
@@ -2656,8 +2695,8 @@
   ;}
     break;
 
-  case 146:
-#line 550 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 148:
+#line 560 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { // Nonempty unsized arr
     (yyval.Const).type = (yyvsp[-3].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy);
@@ -2666,8 +2705,8 @@
   ;}
     break;
 
-  case 147:
-#line 556 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 149:
+#line 566 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-3].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy);
@@ -2676,8 +2715,8 @@
   ;}
     break;
 
-  case 148:
-#line 562 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 150:
+#line 572 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-2].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy);
@@ -2685,8 +2724,8 @@
   ;}
     break;
 
-  case 149:
-#line 567 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 151:
+#line 577 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
@@ -2695,28 +2734,8 @@
   ;}
     break;
 
-  case 150:
-#line 573 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    (yyval.Const).type = (yyvsp[-1].Type);
-    (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
-    *(yyval.Const).cnst += " " + *(yyvsp[0].String);
-    delete (yyvsp[0].String);
-  ;}
-    break;
-
-  case 151:
-#line 579 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    (yyval.Const).type = (yyvsp[-1].Type);
-    (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
-    *(yyval.Const).cnst += " " + *(yyvsp[0].String);
-    delete (yyvsp[0].String);
-  ;}
-    break;
-
   case 152:
-#line 585 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 583 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
@@ -2726,7 +2745,7 @@
     break;
 
   case 153:
-#line 591 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 589 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
@@ -2736,8 +2755,8 @@
     break;
 
   case 154:
-#line 597 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {      // integral constants
+#line 595 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
     *(yyval.Const).cnst += " " + *(yyvsp[0].String);
@@ -2746,8 +2765,8 @@
     break;
 
   case 155:
-#line 603 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {            // integral constants
+#line 601 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
     *(yyval.Const).cnst += " " + *(yyvsp[0].String);
@@ -2756,8 +2775,8 @@
     break;
 
   case 156:
-#line 609 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {                      // Boolean constants
+#line 607 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {      // integral constants
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
     *(yyval.Const).cnst += " " + *(yyvsp[0].String);
@@ -2766,8 +2785,8 @@
     break;
 
   case 157:
-#line 615 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {                     // Boolean constants
+#line 613 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {            // integral constants
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
     *(yyval.Const).cnst += " " + *(yyvsp[0].String);
@@ -2776,8 +2795,8 @@
     break;
 
   case 158:
-#line 621 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {                   // Float & Double constants
+#line 619 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {                      // Boolean constants
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
     *(yyval.Const).cnst += " " + *(yyvsp[0].String);
@@ -2786,7 +2805,27 @@
     break;
 
   case 159:
-#line 629 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 625 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {                     // Boolean constants
+    (yyval.Const).type = (yyvsp[-1].Type);
+    (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
+    *(yyval.Const).cnst += " " + *(yyvsp[0].String);
+    delete (yyvsp[0].String);
+  ;}
+    break;
+
+  case 160:
+#line 631 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {                   // Float & Double constants
+    (yyval.Const).type = (yyvsp[-1].Type);
+    (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
+    *(yyval.Const).cnst += " " + *(yyvsp[0].String);
+    delete (yyvsp[0].String);
+  ;}
+    break;
+
+  case 161:
+#line 639 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     std::string source = *(yyvsp[-3].Const).cnst;
     TypeInfo DstTy = (yyvsp[-1].Type);
@@ -2803,8 +2842,8 @@
   ;}
     break;
 
-  case 160:
-#line 643 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 162:
+#line 653 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-4].String) += "(" + *(yyvsp[-2].Const).cnst;
     for (unsigned i = 0; i < (yyvsp[-1].ValList)->size(); ++i) {
@@ -2819,8 +2858,8 @@
   ;}
     break;
 
-  case 161:
-#line 655 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 163:
+#line 665 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
     (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
@@ -2828,8 +2867,8 @@
   ;}
     break;
 
-  case 162:
-#line 660 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 164:
+#line 670 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const char* op = getDivRemOpcode(*(yyvsp[-5].String), (yyvsp[-3].Const).type); 
     (yyval.String) = new std::string(op);
@@ -2838,8 +2877,8 @@
   ;}
     break;
 
-  case 163:
-#line 666 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 165:
+#line 676 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
     (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
@@ -2847,8 +2886,8 @@
   ;}
     break;
 
-  case 164:
-#line 671 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 166:
+#line 681 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) = getCompareOp(*(yyvsp[-5].String), (yyvsp[-3].Const).type);
     *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
@@ -2857,26 +2896,26 @@
   ;}
     break;
 
-  case 165:
-#line 677 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *(yyvsp[-6].String) += "(" + *(yyvsp[-5].String) + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
-    delete (yyvsp[-5].String); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
-    (yyval.String) = (yyvsp[-6].String);
-  ;}
-    break;
-
-  case 166:
-#line 682 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *(yyvsp[-6].String) += "(" + *(yyvsp[-5].String) + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
-    delete (yyvsp[-5].String); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
-    (yyval.String) = (yyvsp[-6].String);
-  ;}
-    break;
-
   case 167:
-#line 687 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 687 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *(yyvsp[-6].String) += "(" + *(yyvsp[-5].String) + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
+    delete (yyvsp[-5].String); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
+    (yyval.String) = (yyvsp[-6].String);
+  ;}
+    break;
+
+  case 168:
+#line 692 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *(yyvsp[-6].String) += "(" + *(yyvsp[-5].String) + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
+    delete (yyvsp[-5].String); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
+    (yyval.String) = (yyvsp[-6].String);
+  ;}
+    break;
+
+  case 169:
+#line 697 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const char* shiftop = (yyvsp[-5].String)->c_str();
     if (*(yyvsp[-5].String) == "shr")
@@ -2887,8 +2926,8 @@
   ;}
     break;
 
-  case 168:
-#line 695 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 170:
+#line 705 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
     (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
@@ -2896,26 +2935,26 @@
   ;}
     break;
 
-  case 169:
-#line 700 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
-    (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
-    (yyval.String) = (yyvsp[-7].String);
-  ;}
-    break;
-
-  case 170:
-#line 705 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
-    (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
-    (yyval.String) = (yyvsp[-7].String);
-  ;}
-    break;
-
   case 171:
-#line 715 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 710 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
+    (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
+    (yyval.String) = (yyvsp[-7].String);
+  ;}
+    break;
+
+  case 172:
+#line 715 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
+    (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
+    (yyval.String) = (yyvsp[-7].String);
+  ;}
+    break;
+
+  case 173:
+#line 725 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].Const).cnst;
     (yyvsp[0].Const).destroy();
@@ -2923,61 +2962,61 @@
   ;}
     break;
 
-  case 172:
-#line 720 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 174:
+#line 730 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(*(yyvsp[0].Const).cnst); (yyvsp[0].Const).destroy(); ;}
     break;
 
-  case 175:
-#line 735 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 177:
+#line 745 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
 ;}
     break;
 
-  case 176:
-#line 740 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    (yyval.String) = 0;
-  ;}
-    break;
-
-  case 177:
-#line 743 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *O << *(yyvsp[0].String) << "\n";
-    delete (yyvsp[0].String);
-    (yyval.String) = 0;
-  ;}
-    break;
-
   case 178:
-#line 748 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 750 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
-    *O << "module asm " << " " << *(yyvsp[0].String) << "\n";
     (yyval.String) = 0;
   ;}
     break;
 
   case 179:
-#line 752 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 753 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *O << *(yyvsp[0].String) << '\n';
+    delete (yyvsp[0].String);
+    (yyval.String) = 0;
+  ;}
+    break;
+
+  case 180:
+#line 758 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *O << "module asm " << ' ' << *(yyvsp[0].String) << '\n';
+    (yyval.String) = 0;
+  ;}
+    break;
+
+  case 181:
+#line 762 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "implementation\n";
     (yyval.String) = 0;
   ;}
     break;
 
-  case 180:
-#line 756 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 182:
+#line 766 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = 0; ;}
     break;
 
-  case 182:
-#line 758 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 184:
+#line 768 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = (yyvsp[0].String); *(yyval.String) = "external"; ;}
     break;
 
-  case 183:
-#line 761 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 185:
+#line 771 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     EnumeratedTypes.push_back((yyvsp[0].Type));
     if (!(yyvsp[-2].String)->empty()) {
@@ -2986,109 +3025,109 @@
       NamedTypes[*(yyvsp[-2].String)].elemTy = (yyvsp[0].Type).elemTy;
       *O << *(yyvsp[-2].String) << " = ";
     }
-    *O << "type " << *(yyvsp[0].Type).newTy << "\n";
+    *O << "type " << *(yyvsp[0].Type).newTy << '\n';
     delete (yyvsp[-2].String); delete (yyvsp[-1].String); (yyvsp[0].Type).destroy();
     (yyval.String) = 0;
   ;}
     break;
 
-  case 184:
-#line 773 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 186:
+#line 783 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {       // Function prototypes can be in const pool
-    *O << *(yyvsp[0].String) << "\n";
+    *O << *(yyvsp[0].String) << '\n';
     delete (yyvsp[0].String);
     (yyval.String) = 0;
   ;}
     break;
 
-  case 185:
-#line 778 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 187:
+#line 788 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {  // Asm blocks can be in the const pool
-    *O << *(yyvsp[-2].String) << " " << *(yyvsp[-1].String) << " " << *(yyvsp[0].String) << "\n";
+    *O << *(yyvsp[-2].String) << ' ' << *(yyvsp[-1].String) << ' ' << *(yyvsp[0].String) << '\n';
     delete (yyvsp[-2].String); delete (yyvsp[-1].String); delete (yyvsp[0].String); 
     (yyval.String) = 0;
   ;}
     break;
 
-  case 186:
-#line 783 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 188:
+#line 793 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-4].String)->empty()) {
       *O << *(yyvsp[-4].String) << " = ";
       Globals[*(yyvsp[-4].String)] = (yyvsp[-1].Const).type.clone();
     }
-    *O << *(yyvsp[-3].String) << " " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Const).cnst << " " << *(yyvsp[0].String) << "\n";
+    *O << *(yyvsp[-3].String) << ' ' << *(yyvsp[-2].String) << ' ' << *(yyvsp[-1].Const).cnst << ' ' << *(yyvsp[0].String) << '\n';
     delete (yyvsp[-4].String); delete (yyvsp[-3].String); delete (yyvsp[-2].String); (yyvsp[-1].Const).destroy(); delete (yyvsp[0].String); 
     (yyval.String) = 0;
   ;}
     break;
 
-  case 187:
-#line 792 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    if (!(yyvsp[-4].String)->empty()) {
-      *O << *(yyvsp[-4].String) << " = ";
-      Globals[*(yyvsp[-4].String)] = (yyvsp[-1].Type).clone();
-    }
-    *O <<  *(yyvsp[-3].String) << " " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy << " " << *(yyvsp[0].String) << "\n";
-    delete (yyvsp[-4].String); delete (yyvsp[-3].String); delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
-    (yyval.String) = 0;
-  ;}
-    break;
-
-  case 188:
-#line 801 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    if (!(yyvsp[-4].String)->empty()) {
-      *O << *(yyvsp[-4].String) << " = ";
-      Globals[*(yyvsp[-4].String)] = (yyvsp[-1].Type).clone();
-    }
-    *O << *(yyvsp[-3].String) << " " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy << " " << *(yyvsp[0].String) << "\n";
-    delete (yyvsp[-4].String); delete (yyvsp[-3].String); delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
-    (yyval.String) = 0;
-  ;}
-    break;
-
   case 189:
-#line 810 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 802 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-4].String)->empty()) {
       *O << *(yyvsp[-4].String) << " = ";
       Globals[*(yyvsp[-4].String)] = (yyvsp[-1].Type).clone();
     }
-    *O << *(yyvsp[-3].String) << " " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy << " " << *(yyvsp[0].String) << "\n";
+    *O <<  *(yyvsp[-3].String) << ' ' << *(yyvsp[-2].String) << ' ' << *(yyvsp[-1].Type).newTy << ' ' << *(yyvsp[0].String) << '\n';
     delete (yyvsp[-4].String); delete (yyvsp[-3].String); delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
     (yyval.String) = 0;
   ;}
     break;
 
   case 190:
-#line 819 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    { 
-    *O << *(yyvsp[-1].String) << " " << *(yyvsp[0].String) << "\n";
-    delete (yyvsp[-1].String); delete (yyvsp[0].String);
+#line 811 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    if (!(yyvsp[-4].String)->empty()) {
+      *O << *(yyvsp[-4].String) << " = ";
+      Globals[*(yyvsp[-4].String)] = (yyvsp[-1].Type).clone();
+    }
+    *O << *(yyvsp[-3].String) << ' ' << *(yyvsp[-2].String) << ' ' << *(yyvsp[-1].Type).newTy << ' ' << *(yyvsp[0].String) << '\n';
+    delete (yyvsp[-4].String); delete (yyvsp[-3].String); delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
     (yyval.String) = 0;
   ;}
     break;
 
   case 191:
-#line 824 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 820 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
-    *O << *(yyvsp[-2].String) << " = " << *(yyvsp[0].String) << "\n";
-    delete (yyvsp[-2].String); delete (yyvsp[0].String);
+    if (!(yyvsp[-4].String)->empty()) {
+      *O << *(yyvsp[-4].String) << " = ";
+      Globals[*(yyvsp[-4].String)] = (yyvsp[-1].Type).clone();
+    }
+    *O << *(yyvsp[-3].String) << ' ' << *(yyvsp[-2].String) << ' ' << *(yyvsp[-1].Type).newTy << ' ' << *(yyvsp[0].String) << '\n';
+    delete (yyvsp[-4].String); delete (yyvsp[-3].String); delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
     (yyval.String) = 0;
   ;}
     break;
 
   case 192:
-#line 829 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 829 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    { 
+    *O << *(yyvsp[-1].String) << ' ' << *(yyvsp[0].String) << '\n';
+    delete (yyvsp[-1].String); delete (yyvsp[0].String);
+    (yyval.String) = 0;
+  ;}
+    break;
+
+  case 193:
+#line 834 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *O << *(yyvsp[-2].String) << " = " << *(yyvsp[0].String) << '\n';
+    delete (yyvsp[-2].String); delete (yyvsp[0].String);
+    (yyval.String) = 0;
+  ;}
+    break;
+
+  case 194:
+#line 839 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyval.String) = 0;
   ;}
     break;
 
-  case 196:
-#line 839 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 198:
+#line 849 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -3096,8 +3135,8 @@
   ;}
     break;
 
-  case 197:
-#line 844 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 199:
+#line 854 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
     if (*(yyvsp[0].String) == "64")
@@ -3107,26 +3146,26 @@
   ;}
     break;
 
-  case 198:
-#line 851 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
-    delete (yyvsp[0].String);
-    (yyval.String) = (yyvsp[-2].String);
-  ;}
-    break;
-
-  case 199:
-#line 856 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
-    delete (yyvsp[0].String);
-    (yyval.String) = (yyvsp[-2].String);
-  ;}
-    break;
-
   case 200:
-#line 863 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 861 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
+    delete (yyvsp[0].String);
+    (yyval.String) = (yyvsp[-2].String);
+  ;}
+    break;
+
+  case 201:
+#line 866 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
+    delete (yyvsp[0].String);
+    (yyval.String) = (yyvsp[-2].String);
+  ;}
+    break;
+
+  case 202:
+#line 873 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-1].String)->insert(0, "[ ");
     *(yyvsp[-1].String) += " ]";
@@ -3134,8 +3173,8 @@
   ;}
     break;
 
-  case 201:
-#line 870 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 203:
+#line 880 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -3143,20 +3182,20 @@
   ;}
     break;
 
-  case 203:
-#line 876 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 205:
+#line 886 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = new std::string();
   ;}
     break;
 
-  case 207:
-#line 885 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 209:
+#line 895 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 208:
-#line 887 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 210:
+#line 897 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
   (yyval.String) = (yyvsp[-1].Type).newTy;
   if (!(yyvsp[0].String)->empty())
@@ -3165,30 +3204,30 @@
 ;}
     break;
 
-  case 209:
-#line 894 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 211:
+#line 904 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
   ;}
     break;
 
-  case 210:
-#line 898 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    (yyval.String) = (yyvsp[0].String);
-  ;}
-    break;
-
-  case 211:
-#line 902 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    (yyval.String) = (yyvsp[0].String);
-  ;}
-    break;
-
   case 212:
-#line 905 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 908 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.String) = (yyvsp[0].String);
+  ;}
+    break;
+
+  case 213:
+#line 912 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.String) = (yyvsp[0].String);
+  ;}
+    break;
+
+  case 214:
+#line 915 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", ...";
     (yyval.String) = (yyvsp[-2].String);
@@ -3196,20 +3235,20 @@
   ;}
     break;
 
-  case 213:
-#line 910 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 215:
+#line 920 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].String);
   ;}
     break;
 
-  case 214:
-#line 913 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 216:
+#line 923 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 215:
-#line 916 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 217:
+#line 926 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-7].String)->empty()) {
       *(yyvsp[-7].String) += " ";
@@ -3230,55 +3269,69 @@
   ;}
     break;
 
-  case 216:
-#line 935 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 218:
+#line 945 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string("{"); delete (yyvsp[0].String); ;}
     break;
 
-  case 217:
-#line 936 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 219:
+#line 946 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string ("{"); ;}
     break;
 
-  case 218:
-#line 938 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-  if (!(yyvsp[-2].String)->empty()) {
-    *O << *(yyvsp[-2].String) << " ";
-  }
-  *O << *(yyvsp[-1].String) << " " << *(yyvsp[0].String) << "\n";
-  delete (yyvsp[-2].String); delete (yyvsp[-1].String); delete (yyvsp[0].String);
-  (yyval.String) = 0;
-;}
-    break;
-
-  case 219:
-#line 947 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    { (yyval.String) = new std::string("}"); delete (yyvsp[0].String); ;}
-    break;
-
   case 220:
-#line 948 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    { (yyval.String) = new std::string("}"); ;}
+#line 949 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *O << "define ";
+    if (!(yyvsp[-2].String)->empty()) {
+      *O << *(yyvsp[-2].String) << ' ';
+    }
+    *O << *(yyvsp[-1].String) << ' ' << *(yyvsp[0].String) << '\n';
+    delete (yyvsp[-2].String); delete (yyvsp[-1].String); delete (yyvsp[0].String);
+    (yyval.String) = 0;
+  ;}
     break;
 
   case 221:
-#line 950 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 958 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *O << *(yyvsp[-3].String) << ' ';
+    if (!(yyvsp[-2].String)->empty()) {
+      *O << *(yyvsp[-2].String) << ' ';
+    }
+    *O << *(yyvsp[-1].String) << ' ' << *(yyvsp[0].String) << '\n';
+    delete (yyvsp[-3].String); delete (yyvsp[-2].String); delete (yyvsp[-1].String); delete (yyvsp[0].String);
+    (yyval.String) = 0;
+  ;}
+    break;
+
+  case 222:
+#line 969 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.String) = new std::string("}"); delete (yyvsp[0].String); ;}
+    break;
+
+  case 223:
+#line 970 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.String) = new std::string("}"); ;}
+    break;
+
+  case 224:
+#line 972 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
   if ((yyvsp[-1].String))
     *O << *(yyvsp[-1].String);
-  *O << '\n' << *(yyvsp[0].String) << "\n";
+  *O << '\n' << *(yyvsp[0].String) << '\n';
   (yyval.String) = 0;
 ;}
     break;
 
-  case 222:
-#line 958 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 225:
+#line 980 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 225:
-#line 964 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 228:
+#line 986 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { 
     if (!(yyvsp[-1].String)->empty())
       *(yyvsp[-2].String) += " " + *(yyvsp[-1].String);
@@ -3289,13 +3342,13 @@
   ;}
     break;
 
-  case 226:
-#line 977 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 229:
+#line 999 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 236:
-#line 983 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 239:
+#line 1005 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyvsp[-1].String)->insert(0, "<");
     *(yyvsp[-1].String) += ">";
@@ -3303,8 +3356,8 @@
   ;}
     break;
 
-  case 238:
-#line 989 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 241:
+#line 1011 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-3].String)->empty()) {
       *(yyvsp[-4].String) += " " + *(yyvsp[-3].String);
@@ -3315,8 +3368,8 @@
   ;}
     break;
 
-  case 241:
-#line 1002 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 244:
+#line 1024 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Value).val = (yyvsp[0].String);
     (yyval.Value).constant = false;
@@ -3325,8 +3378,8 @@
   ;}
     break;
 
-  case 242:
-#line 1008 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 245:
+#line 1030 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Value).val = (yyvsp[0].String);
     (yyval.Value).constant = true;
@@ -3335,8 +3388,8 @@
   ;}
     break;
 
-  case 243:
-#line 1019 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 246:
+#line 1041 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Value) = (yyvsp[0].Value);
     (yyval.Value).type = (yyvsp[-1].Type);
@@ -3344,124 +3397,124 @@
   ;}
     break;
 
-  case 244:
-#line 1025 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    (yyval.String) = 0;
-  ;}
-    break;
-
-  case 245:
-#line 1028 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    { // Do not allow functions with 0 basic blocks   
-    (yyval.String) = 0;
-  ;}
-    break;
-
-  case 246:
-#line 1036 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    (yyval.String) = 0;
-  ;}
-    break;
-
   case 247:
-#line 1040 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 1047 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
-    *O << "    " << *(yyvsp[0].String) << "\n";
-    delete (yyvsp[0].String);
     (yyval.String) = 0;
   ;}
     break;
 
   case 248:
-#line 1045 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
+#line 1050 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    { // Do not allow functions with 0 basic blocks   
     (yyval.String) = 0;
   ;}
     break;
 
   case 249:
-#line 1048 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 1058 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
-    *O << *(yyvsp[0].String) << "\n";
+    (yyval.String) = 0;
+  ;}
+    break;
+
+  case 250:
+#line 1062 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *O << "    " << *(yyvsp[0].String) << '\n';
     delete (yyvsp[0].String);
     (yyval.String) = 0;
   ;}
     break;
 
   case 251:
-#line 1054 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    { (yyval.String) = (yyvsp[0].String); *(yyval.String) = "unwind"; ;}
-    break;
-
-  case 252:
-#line 1056 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {              // Return with a result...
-    *O << "    " << *(yyvsp[-1].String) << " " << *(yyvsp[0].Value).val << "\n";
-    delete (yyvsp[-1].String); (yyvsp[0].Value).destroy();
+#line 1067 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
     (yyval.String) = 0;
   ;}
     break;
 
-  case 253:
-#line 1061 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {                                       // Return with no result...
-    *O << "    " << *(yyvsp[-1].String) << " " << *(yyvsp[0].Type).newTy << "\n";
-    delete (yyvsp[-1].String); (yyvsp[0].Type).destroy();
+  case 252:
+#line 1070 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *O << *(yyvsp[0].String) << '\n';
+    delete (yyvsp[0].String);
     (yyval.String) = 0;
   ;}
     break;
 
   case 254:
-#line 1066 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 1076 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.String) = (yyvsp[0].String); *(yyval.String) = "unwind"; ;}
+    break;
+
+  case 255:
+#line 1078 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {              // Return with a result...
+    *O << "    " << *(yyvsp[-1].String) << ' ' << *(yyvsp[0].Value).val << '\n';
+    delete (yyvsp[-1].String); (yyvsp[0].Value).destroy();
+    (yyval.String) = 0;
+  ;}
+    break;
+
+  case 256:
+#line 1083 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {                                       // Return with no result...
+    *O << "    " << *(yyvsp[-1].String) << ' ' << *(yyvsp[0].Type).newTy << '\n';
+    delete (yyvsp[-1].String); (yyvsp[0].Type).destroy();
+    (yyval.String) = 0;
+  ;}
+    break;
+
+  case 257:
+#line 1088 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {                         // Unconditional Branch...
-    *O << "    " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy << " " << *(yyvsp[0].Value).val << "\n";
+    *O << "    " << *(yyvsp[-2].String) << ' ' << *(yyvsp[-1].Type).newTy << ' ' << *(yyvsp[0].Value).val << '\n';
     delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); (yyvsp[0].Value).destroy();
     (yyval.String) = 0;
   ;}
     break;
 
-  case 255:
-#line 1071 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 258:
+#line 1093 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {  
-    *O << "    " << *(yyvsp[-8].String) << " " << *(yyvsp[-7].Type).newTy << " " << *(yyvsp[-6].Value).val << ", " 
-       << *(yyvsp[-4].Type).newTy << " " << *(yyvsp[-3].Value).val << ", " << *(yyvsp[-1].Type).newTy << " " 
-       << *(yyvsp[0].Value).val << "\n";
+    *O << "    " << *(yyvsp[-8].String) << ' ' << *(yyvsp[-7].Type).newTy << ' ' << *(yyvsp[-6].Value).val << ", " 
+       << *(yyvsp[-4].Type).newTy << ' ' << *(yyvsp[-3].Value).val << ", " << *(yyvsp[-1].Type).newTy << ' ' 
+       << *(yyvsp[0].Value).val << '\n';
     delete (yyvsp[-8].String); (yyvsp[-7].Type).destroy(); (yyvsp[-6].Value).destroy(); (yyvsp[-4].Type).destroy(); (yyvsp[-3].Value).destroy(); 
     (yyvsp[-1].Type).destroy(); (yyvsp[0].Value).destroy();
     (yyval.String) = 0;
   ;}
     break;
 
-  case 256:
-#line 1079 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 259:
+#line 1101 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
-    *O << "    " << *(yyvsp[-8].String) << " " << *(yyvsp[-7].Type).newTy << " " << *(yyvsp[-6].Value).val << ", " 
-       << *(yyvsp[-4].Type).newTy << " " << *(yyvsp[-3].Value).val << " [" << *(yyvsp[-1].String) << " ]\n";
+    *O << "    " << *(yyvsp[-8].String) << ' ' << *(yyvsp[-7].Type).newTy << ' ' << *(yyvsp[-6].Value).val << ", " 
+       << *(yyvsp[-4].Type).newTy << ' ' << *(yyvsp[-3].Value).val << " [" << *(yyvsp[-1].String) << " ]\n";
     delete (yyvsp[-8].String); (yyvsp[-7].Type).destroy(); (yyvsp[-6].Value).destroy(); (yyvsp[-4].Type).destroy(); (yyvsp[-3].Value).destroy(); 
     delete (yyvsp[-1].String);
     (yyval.String) = 0;
   ;}
     break;
 
-  case 257:
-#line 1086 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 260:
+#line 1108 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
-    *O << "    " << *(yyvsp[-7].String) << " " << *(yyvsp[-6].Type).newTy << " " << *(yyvsp[-5].Value).val << ", " 
-       << *(yyvsp[-3].Type).newTy << " " << *(yyvsp[-2].Value).val << "[]\n";
+    *O << "    " << *(yyvsp[-7].String) << ' ' << *(yyvsp[-6].Type).newTy << ' ' << *(yyvsp[-5].Value).val << ", " 
+       << *(yyvsp[-3].Type).newTy << ' ' << *(yyvsp[-2].Value).val << "[]\n";
     delete (yyvsp[-7].String); (yyvsp[-6].Type).destroy(); (yyvsp[-5].Value).destroy(); (yyvsp[-3].Type).destroy(); (yyvsp[-2].Value).destroy();
     (yyval.String) = 0;
   ;}
     break;
 
-  case 258:
-#line 1093 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 261:
+#line 1115 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "    ";
     if (!(yyvsp[-13].String)->empty())
       *O << *(yyvsp[-13].String) << " = ";
-    *O << *(yyvsp[-12].String) << " " << *(yyvsp[-11].String) << " " << *(yyvsp[-10].Type).newTy << " " << *(yyvsp[-9].Value).val << " (";
+    *O << *(yyvsp[-12].String) << ' ' << *(yyvsp[-11].String) << ' ' << *(yyvsp[-10].Type).newTy << ' ' << *(yyvsp[-9].Value).val << " (";
     for (unsigned i = 0; i < (yyvsp[-7].ValList)->size(); ++i) {
       ValueInfo& VI = (*(yyvsp[-7].ValList))[i];
       *O << *VI.val;
@@ -3469,8 +3522,8 @@
         *O << ", ";
       VI.destroy();
     }
-    *O << ") " << *(yyvsp[-5].String) << " " << *(yyvsp[-4].Type).newTy << " " << *(yyvsp[-3].Value).val << " " 
-       << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy << " " << *(yyvsp[0].Value).val << "\n";
+    *O << ") " << *(yyvsp[-5].String) << ' ' << *(yyvsp[-4].Type).newTy << ' ' << *(yyvsp[-3].Value).val << ' ' 
+       << *(yyvsp[-2].String) << ' ' << *(yyvsp[-1].Type).newTy << ' ' << *(yyvsp[0].Value).val << '\n';
     delete (yyvsp[-13].String); delete (yyvsp[-12].String); delete (yyvsp[-11].String); (yyvsp[-10].Type).destroy(); (yyvsp[-9].Value).destroy(); delete (yyvsp[-7].ValList); 
     delete (yyvsp[-5].String); (yyvsp[-4].Type).destroy(); (yyvsp[-3].Value).destroy(); delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); 
     (yyvsp[0].Value).destroy(); 
@@ -3478,26 +3531,26 @@
   ;}
     break;
 
-  case 259:
-#line 1112 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 262:
+#line 1134 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
-    *O << "    " << *(yyvsp[0].String) << "\n";
+    *O << "    " << *(yyvsp[0].String) << '\n';
     delete (yyvsp[0].String);
     (yyval.String) = 0;
   ;}
     break;
 
-  case 260:
-#line 1117 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 263:
+#line 1139 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
-    *O << "    " << *(yyvsp[0].String) << "\n";
+    *O << "    " << *(yyvsp[0].String) << '\n';
     delete (yyvsp[0].String);
     (yyval.String) = 0;
   ;}
     break;
 
-  case 261:
-#line 1123 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 264:
+#line 1145 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + " " + *(yyvsp[-3].String) + ", " + *(yyvsp[-1].Type).newTy + " " + *(yyvsp[0].Value).val;
     (yyvsp[-4].Type).destroy(); delete (yyvsp[-3].String); (yyvsp[-1].Type).destroy(); (yyvsp[0].Value).destroy();
@@ -3505,8 +3558,8 @@
   ;}
     break;
 
-  case 262:
-#line 1128 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 265:
+#line 1150 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-3].String)->insert(0, *(yyvsp[-4].Type).newTy + " " );
     *(yyvsp[-3].String) += ", " + *(yyvsp[-1].Type).newTy + " " + *(yyvsp[0].Value).val;
@@ -3515,8 +3568,8 @@
   ;}
     break;
 
-  case 263:
-#line 1136 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 266:
+#line 1158 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-1].String)->empty())
       *(yyvsp[-1].String) += " = ";
@@ -3526,8 +3579,8 @@
   ;}
     break;
 
-  case 264:
-#line 1145 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 267:
+#line 1167 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {    // Used for PHI nodes
     (yyvsp[-3].Value).val->insert(0, *(yyvsp[-5].Type).newTy + "[");
     *(yyvsp[-3].Value).val += "," + *(yyvsp[-1].Value).val + "]";
@@ -3537,8 +3590,8 @@
   ;}
     break;
 
-  case 265:
-#line 1152 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 268:
+#line 1174 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-6].String) += ", [" + *(yyvsp[-3].Value).val + "," + *(yyvsp[-1].Value).val + "]";
     (yyvsp[-3].Value).destroy(); (yyvsp[-1].Value).destroy();
@@ -3546,34 +3599,34 @@
   ;}
     break;
 
-  case 266:
-#line 1160 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 269:
+#line 1182 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyval.ValList) = new ValueList();
     (yyval.ValList)->push_back((yyvsp[0].Value));
   ;}
     break;
 
-  case 267:
-#line 1164 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 270:
+#line 1186 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-2].ValList)->push_back((yyvsp[0].Value));
     (yyval.ValList) = (yyvsp[-2].ValList);
   ;}
     break;
 
-  case 268:
-#line 1171 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 271:
+#line 1193 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValList) = (yyvsp[0].ValList); ;}
     break;
 
-  case 269:
-#line 1172 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 272:
+#line 1194 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValList) = new ValueList(); ;}
     break;
 
-  case 270:
-#line 1176 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 273:
+#line 1198 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -3581,8 +3634,8 @@
   ;}
     break;
 
-  case 272:
-#line 1184 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 275:
+#line 1206 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const char* op = getDivRemOpcode(*(yyvsp[-4].String), (yyvsp[-3].Type)); 
     (yyval.String) = new std::string(op);
@@ -3591,8 +3644,8 @@
   ;}
     break;
 
-  case 273:
-#line 1190 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 276:
+#line 1212 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-4].String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
     (yyvsp[-3].Type).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
@@ -3600,8 +3653,8 @@
   ;}
     break;
 
-  case 274:
-#line 1195 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 277:
+#line 1217 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-4].String) = getCompareOp(*(yyvsp[-4].String), (yyvsp[-3].Type));
     *(yyvsp[-4].String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
@@ -3610,26 +3663,26 @@
   ;}
     break;
 
-  case 275:
-#line 1201 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 278:
+#line 1223 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
-    *(yyvsp[-6].String) += " " + *(yyvsp[-5].String) + " " + *(yyvsp[-3].Value).val + "," + *(yyvsp[-1].Value).val + ")";
-    delete (yyvsp[-5].String); (yyvsp[-3].Value).destroy(); (yyvsp[-1].Value).destroy();
-    (yyval.String) = (yyvsp[-6].String);
+    *(yyvsp[-5].String) += " " + *(yyvsp[-4].String) + " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + "," + *(yyvsp[0].Value).val;
+    delete (yyvsp[-4].String); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
+    (yyval.String) = (yyvsp[-5].String);
   ;}
     break;
 
-  case 276:
-#line 1206 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 279:
+#line 1228 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
-    *(yyvsp[-6].String) += " " + *(yyvsp[-5].String) + " " + *(yyvsp[-3].Value).val + "," + *(yyvsp[-1].Value).val + ")";
-    delete (yyvsp[-5].String); (yyvsp[-3].Value).destroy(); (yyvsp[-1].Value).destroy();
-    (yyval.String) = (yyvsp[-6].String);
+    *(yyvsp[-5].String) += " " + *(yyvsp[-4].String) + " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + "," + *(yyvsp[0].Value).val;
+    delete (yyvsp[-4].String); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
+    (yyval.String) = (yyvsp[-5].String);
   ;}
     break;
 
-  case 277:
-#line 1211 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 280:
+#line 1233 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val;
     (yyvsp[0].Value).destroy();
@@ -3637,8 +3690,8 @@
   ;}
     break;
 
-  case 278:
-#line 1216 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 281:
+#line 1238 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const char* shiftop = (yyvsp[-3].String)->c_str();
     if (*(yyvsp[-3].String) == "shr")
@@ -3649,8 +3702,8 @@
   ;}
     break;
 
-  case 279:
-#line 1224 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 282:
+#line 1246 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     std::string source = *(yyvsp[-2].Value).val;
     TypeInfo SrcTy = (yyvsp[-2].Value).type;
@@ -3667,35 +3720,8 @@
   ;}
     break;
 
-  case 280:
-#line 1238 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
-    (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
-    (yyval.String) = (yyvsp[-5].String);
-  ;}
-    break;
-
-  case 281:
-#line 1243 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Type).newTy;
-    (yyvsp[-2].Value).destroy(); (yyvsp[0].Type).destroy();
-    (yyval.String) = (yyvsp[-3].String);
-  ;}
-    break;
-
-  case 282:
-#line 1248 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
-    (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
-    (yyval.String) = (yyvsp[-3].String);
-  ;}
-    break;
-
   case 283:
-#line 1253 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 1260 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
     (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
@@ -3704,7 +3730,25 @@
     break;
 
   case 284:
-#line 1258 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 1265 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Type).newTy;
+    (yyvsp[-2].Value).destroy(); (yyvsp[0].Type).destroy();
+    (yyval.String) = (yyvsp[-3].String);
+  ;}
+    break;
+
+  case 285:
+#line 1270 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
+    (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
+    (yyval.String) = (yyvsp[-3].String);
+  ;}
+    break;
+
+  case 286:
+#line 1275 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
     (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
@@ -3712,8 +3756,17 @@
   ;}
     break;
 
-  case 285:
-#line 1263 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 287:
+#line 1280 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
+    (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
+    (yyval.String) = (yyvsp[-5].String);
+  ;}
+    break;
+
+  case 288:
+#line 1285 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -3721,8 +3774,8 @@
   ;}
     break;
 
-  case 286:
-#line 1268 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 289:
+#line 1290 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-5].String)->empty())
       *(yyvsp[-6].String) += " " + *(yyvsp[-5].String);
@@ -3742,67 +3795,67 @@
   ;}
     break;
 
-  case 288:
-#line 1290 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 291:
+#line 1312 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValList) = (yyvsp[0].ValList); ;}
     break;
 
-  case 289:
-#line 1291 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 292:
+#line 1313 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {  (yyval.ValList) = new ValueList(); ;}
     break;
 
-  case 291:
-#line 1296 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 294:
+#line 1318 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 292:
-#line 1299 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy;
-    if (!(yyvsp[0].String)->empty())
-      *(yyvsp[-2].String) += " " + *(yyvsp[0].String);
-    (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
-    (yyval.String) = (yyvsp[-2].String);
-  ;}
-    break;
-
-  case 293:
-#line 1306 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + ", " + *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].Value).val;
-    if (!(yyvsp[0].String)->empty())
-      *(yyvsp[-5].String) += " " + *(yyvsp[0].String);
-    (yyvsp[-4].Type).destroy(); (yyvsp[-2].Type).destroy(); (yyvsp[-1].Value).destroy(); delete (yyvsp[0].String);
-    (yyval.String) = (yyvsp[-5].String);
-  ;}
-    break;
-
-  case 294:
-#line 1313 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy;
-    if (!(yyvsp[0].String)->empty())
-      *(yyvsp[-2].String) += " " + *(yyvsp[0].String);
-    (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
-    (yyval.String) = (yyvsp[-2].String);
-  ;}
-    break;
-
   case 295:
-#line 1320 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 1321 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
-    *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + ", " + *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].Value).val;
+    *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy;
     if (!(yyvsp[0].String)->empty())
-      *(yyvsp[-5].String) += " " + *(yyvsp[0].String);
-    (yyvsp[-4].Type).destroy(); (yyvsp[-2].Type).destroy(); (yyvsp[-1].Value).destroy(); delete (yyvsp[0].String);
-    (yyval.String) = (yyvsp[-5].String);
+      *(yyvsp[-2].String) += " " + *(yyvsp[0].String);
+    (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
+    (yyval.String) = (yyvsp[-2].String);
   ;}
     break;
 
   case 296:
-#line 1327 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 1328 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + ", " + *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].Value).val;
+    if (!(yyvsp[0].String)->empty())
+      *(yyvsp[-5].String) += " " + *(yyvsp[0].String);
+    (yyvsp[-4].Type).destroy(); (yyvsp[-2].Type).destroy(); (yyvsp[-1].Value).destroy(); delete (yyvsp[0].String);
+    (yyval.String) = (yyvsp[-5].String);
+  ;}
+    break;
+
+  case 297:
+#line 1335 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy;
+    if (!(yyvsp[0].String)->empty())
+      *(yyvsp[-2].String) += " " + *(yyvsp[0].String);
+    (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
+    (yyval.String) = (yyvsp[-2].String);
+  ;}
+    break;
+
+  case 298:
+#line 1342 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + ", " + *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].Value).val;
+    if (!(yyvsp[0].String)->empty())
+      *(yyvsp[-5].String) += " " + *(yyvsp[0].String);
+    (yyvsp[-4].Type).destroy(); (yyvsp[-2].Type).destroy(); (yyvsp[-1].Value).destroy(); delete (yyvsp[0].String);
+    (yyval.String) = (yyvsp[-5].String);
+  ;}
+    break;
+
+  case 299:
+#line 1349 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val;
     (yyvsp[0].Value).destroy();
@@ -3810,8 +3863,8 @@
   ;}
     break;
 
-  case 297:
-#line 1332 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 300:
+#line 1354 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-3].String)->empty())
       *(yyvsp[-3].String) += " ";
@@ -3821,8 +3874,8 @@
   ;}
     break;
 
-  case 298:
-#line 1339 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 301:
+#line 1361 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-5].String)->empty())
       *(yyvsp[-5].String) += " ";
@@ -3832,8 +3885,8 @@
   ;}
     break;
 
-  case 299:
-#line 1346 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+  case 302:
+#line 1368 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     // Upgrade the indices
     for (unsigned i = 0; i < (yyvsp[0].ValList)->size(); ++i) {
@@ -3864,7 +3917,7 @@
     }
 
 /* Line 1126 of yacc.c.  */
-#line 3868 "UpgradeParser.tab.c"
+#line 3921 "UpgradeParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -4132,7 +4185,7 @@
 }
 
 
-#line 1370 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 1392 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
 
 
 int yyerror(const char *ErrorMsg) {