diff --git a/llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs b/llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs
index 06c25c2..6ac134a 100644
--- a/llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs
+++ b/llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs
@@ -173,7 +173,19 @@
      EXTRACTELEMENT = 364,
      INSERTELEMENT = 365,
      SHUFFLEVECTOR = 366,
-     CAST = 367
+     CAST = 367,
+     TRUNC = 368,
+     ZEXT = 369,
+     SEXT = 370,
+     FPTRUNC = 371,
+     FPEXT = 372,
+     FPTOUI = 373,
+     FPTOSI = 374,
+     UITOFP = 375,
+     SITOFP = 376,
+     PTRTOINT = 377,
+     INTTOPTR = 378,
+     BITCAST = 379
    };
 #endif
 /* Tokens.  */
@@ -287,6 +299,18 @@
 #define INSERTELEMENT 365
 #define SHUFFLEVECTOR 366
 #define CAST 367
+#define TRUNC 368
+#define ZEXT 369
+#define SEXT 370
+#define FPTRUNC 371
+#define FPEXT 372
+#define FPTOUI 373
+#define FPTOSI 374
+#define UITOFP 375
+#define SITOFP 376
+#define PTRTOINT 377
+#define INTTOPTR 378
+#define BITCAST 379
 
 
 
@@ -434,7 +458,7 @@
   ConstInfo       Const;
 } YYSTYPE;
 /* Line 196 of yacc.c.  */
-#line 438 "UpgradeParser.tab.c"
+#line 462 "UpgradeParser.tab.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -446,7 +470,7 @@
 
 
 /* Line 219 of yacc.c.  */
-#line 450 "UpgradeParser.tab.c"
+#line 474 "UpgradeParser.tab.c"
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 # define YYSIZE_T __SIZE_TYPE__
@@ -597,20 +621,20 @@
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  4
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1150
+#define YYLAST   1335
 
 /* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS  127
+#define YYNTOKENS  139
 /* YYNNTS -- Number of nonterminals. */
-#define YYNNTS  70
+#define YYNNTS  71
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  250
+#define YYNRULES  263
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  509
+#define YYNSTATES  522
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   367
+#define YYMAXUTOK   379
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -622,15 +646,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,
-     116,   117,   125,     2,   114,     2,     2,     2,     2,     2,
+     128,   129,   137,     2,   126,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     121,   113,   122,     2,     2,     2,     2,     2,     2,     2,
+     133,   125,   134,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   118,   115,   120,     2,     2,     2,     2,     2,   126,
+       2,   130,   127,   132,     2,     2,     2,     2,     2,   138,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     119,     2,     2,   123,     2,   124,     2,     2,     2,     2,
+     131,     2,     2,   135,     2,   136,     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,
@@ -654,7 +678,8 @@
       75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
       85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
       95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124
 };
 
 #if YYDEBUG
@@ -666,145 +691,150 @@
       19,    21,    23,    25,    27,    29,    31,    33,    35,    37,
       39,    41,    43,    45,    47,    49,    51,    53,    55,    57,
       59,    61,    63,    65,    67,    69,    71,    73,    75,    77,
-      79,    82,    83,    85,    87,    89,    91,    93,    95,    97,
-      98,   100,   102,   104,   106,   108,   110,   113,   114,   115,
-     118,   119,   123,   126,   127,   129,   130,   134,   136,   139,
-     141,   143,   145,   147,   149,   151,   153,   155,   157,   159,
-     161,   163,   165,   167,   169,   171,   173,   175,   177,   179,
-     182,   187,   193,   199,   203,   206,   209,   211,   215,   217,
-     221,   223,   224,   229,   233,   237,   242,   247,   251,   254,
-     257,   260,   263,   266,   269,   272,   275,   278,   281,   288,
-     294,   303,   310,   317,   324,   331,   338,   347,   356,   360,
-     362,   364,   366,   368,   371,   374,   379,   382,   384,   389,
-     392,   397,   404,   411,   418,   425,   429,   434,   435,   437,
-     439,   441,   445,   449,   453,   457,   461,   465,   467,   468,
-     470,   472,   474,   475,   478,   482,   484,   486,   490,   492,
-     493,   502,   504,   506,   510,   512,   514,   518,   519,   521,
-     523,   527,   528,   530,   532,   534,   536,   538,   540,   542,
-     544,   546,   550,   552,   558,   560,   562,   564,   566,   569,
-     572,   574,   577,   580,   581,   583,   586,   589,   593,   603,
-     613,   622,   637,   639,   641,   648,   654,   657,   664,   672,
-     674,   678,   680,   681,   684,   686,   692,   698,   704,   707,
-     712,   717,   724,   729,   734,   741,   748,   751,   759,   761,
-     764,   765,   767,   768,   772,   779,   783,   790,   793,   798,
-     805
+      79,    81,    83,    85,    87,    89,    91,    93,    95,    97,
+      99,   101,   103,   105,   108,   109,   111,   113,   115,   117,
+     119,   121,   123,   124,   126,   128,   130,   132,   134,   136,
+     139,   140,   141,   144,   145,   149,   152,   153,   155,   156,
+     160,   162,   165,   167,   169,   171,   173,   175,   177,   179,
+     181,   183,   185,   187,   189,   191,   193,   195,   197,   199,
+     201,   203,   205,   208,   213,   219,   225,   229,   232,   235,
+     237,   241,   243,   247,   249,   250,   255,   259,   263,   268,
+     273,   277,   280,   283,   286,   289,   292,   295,   298,   301,
+     304,   307,   314,   320,   329,   336,   343,   350,   357,   364,
+     373,   382,   386,   388,   390,   392,   394,   397,   400,   405,
+     408,   410,   415,   418,   423,   430,   437,   444,   451,   455,
+     460,   461,   463,   465,   467,   471,   475,   479,   483,   487,
+     491,   493,   494,   496,   498,   500,   501,   504,   508,   510,
+     512,   516,   518,   519,   528,   530,   532,   536,   538,   540,
+     544,   545,   547,   549,   553,   554,   556,   558,   560,   562,
+     564,   566,   568,   570,   572,   576,   578,   584,   586,   588,
+     590,   592,   595,   598,   600,   603,   606,   607,   609,   612,
+     615,   619,   629,   639,   648,   663,   665,   667,   674,   680,
+     683,   690,   698,   700,   704,   706,   707,   710,   712,   718,
+     724,   730,   733,   738,   743,   750,   755,   760,   767,   774,
+     777,   785,   787,   790,   791,   793,   794,   798,   805,   809,
+     816,   819,   824,   831
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
 static const short int yyrhs[] =
 {
-     158,     0,    -1,    19,    -1,    20,    -1,    17,    -1,    18,
+     171,     0,    -1,    19,    -1,    20,    -1,    17,    -1,    18,
       -1,    78,    -1,    79,    -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,   104,    -1,   105,
-      -1,   106,    -1,   107,    -1,    11,    -1,     9,    -1,     7,
-      -1,     5,    -1,    12,    -1,    10,    -1,     8,    -1,     6,
-      -1,   134,    -1,   135,    -1,    13,    -1,    14,    -1,   166,
-     113,    -1,    -1,    42,    -1,    43,    -1,    44,    -1,    48,
-      -1,    45,    -1,    46,    -1,    47,    -1,    -1,    65,    -1,
-      66,    -1,    67,    -1,    68,    -1,    69,    -1,    70,    -1,
-      64,    18,    -1,    -1,    -1,    57,    18,    -1,    -1,   114,
-      57,    18,    -1,    37,    30,    -1,    -1,   143,    -1,    -1,
-     114,   146,   145,    -1,   143,    -1,    57,    18,    -1,   149,
-      -1,     3,    -1,   151,    -1,     3,    -1,   151,    -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,   150,    -1,   180,    -1,   115,
-      18,    -1,   148,   116,   153,   117,    -1,   118,    18,   119,
-     151,   120,    -1,   121,    18,   119,   151,   122,    -1,   123,
-     152,   124,    -1,   123,   124,    -1,   151,   125,    -1,   151,
-      -1,   152,   114,   151,    -1,   152,    -1,   152,   114,    40,
-      -1,    40,    -1,    -1,   149,   118,   156,   120,    -1,   149,
-     118,   120,    -1,   149,   126,    30,    -1,   149,   121,   156,
-     122,    -1,   149,   123,   156,   124,    -1,   149,   123,   124,
-      -1,   149,    22,    -1,   149,    23,    -1,   149,   180,    -1,
-     149,   155,    -1,   149,    24,    -1,   134,   129,    -1,   135,
-      18,    -1,     4,    25,    -1,     4,    26,    -1,   137,    21,
-      -1,   112,   116,   154,    39,   149,   117,    -1,   101,   116,
-     154,   194,   117,    -1,   103,   116,   154,   114,   154,   114,
-     154,   117,    -1,   130,   116,   154,   114,   154,   117,    -1,
-     131,   116,   154,   114,   154,   117,    -1,   132,   116,   154,
-     114,   154,   117,    -1,   133,   116,   154,   114,   154,   117,
-      -1,   109,   116,   154,   114,   154,   117,    -1,   110,   116,
-     154,   114,   154,   114,   154,   117,    -1,   111,   116,   154,
-     114,   154,   114,   154,   117,    -1,   156,   114,   154,    -1,
-     154,    -1,    35,    -1,    36,    -1,   159,    -1,   159,   175,
-      -1,   159,   177,    -1,   159,    62,    61,   161,    -1,   159,
-      31,    -1,   160,    -1,   160,   138,    27,   147,    -1,   160,
-     177,    -1,   160,    62,    61,   161,    -1,   160,   138,   139,
-     157,   154,   145,    -1,   160,   138,    50,   157,   149,   145,
-      -1,   160,   138,    45,   157,   149,   145,    -1,   160,   138,
-      47,   157,   149,   145,    -1,   160,    51,   163,    -1,   160,
-      58,   113,   164,    -1,    -1,    30,    -1,    56,    -1,    55,
-      -1,    53,   113,   162,    -1,    54,   113,    18,    -1,    52,
-     113,    30,    -1,    71,   113,    30,    -1,   118,   165,   120,
-      -1,   165,   114,    30,    -1,    30,    -1,    -1,    28,    -1,
-      30,    -1,   166,    -1,    -1,   149,   167,    -1,   169,   114,
-     168,    -1,   168,    -1,   169,    -1,   169,   114,    40,    -1,
-      40,    -1,    -1,   140,   147,   166,   116,   170,   117,   144,
-     141,    -1,    32,    -1,   123,    -1,   139,   171,   172,    -1,
-      33,    -1,   124,    -1,   173,   183,   174,    -1,    -1,    45,
-      -1,    47,    -1,    34,   176,   171,    -1,    -1,    63,    -1,
-      17,    -1,    18,    -1,    21,    -1,    25,    -1,    26,    -1,
-      22,    -1,    23,    -1,    24,    -1,   121,   156,   122,    -1,
-     155,    -1,    61,   178,    30,   114,    30,    -1,   128,    -1,
-     166,    -1,   180,    -1,   179,    -1,   149,   181,    -1,   183,
-     184,    -1,   184,    -1,   185,   186,    -1,   185,   188,    -1,
-      -1,    29,    -1,    72,   182,    -1,    72,     3,    -1,    73,
-      15,   181,    -1,    73,     4,   181,   114,    15,   181,   114,
-      15,   181,    -1,    74,   136,   181,   114,    15,   181,   118,
-     187,   120,    -1,    74,   136,   181,   114,    15,   181,   118,
-     120,    -1,   138,    75,   140,   147,   181,   116,   191,   117,
-      39,    15,   181,    76,    15,   181,    -1,    76,    -1,    77,
-      -1,   187,   136,   179,   114,    15,   181,    -1,   136,   179,
-     114,    15,   181,    -1,   138,   193,    -1,   149,   118,   181,
-     114,   181,   120,    -1,   189,   114,   118,   181,   114,   181,
-     120,    -1,   182,    -1,   190,   114,   182,    -1,   190,    -1,
-      -1,    60,    59,    -1,    59,    -1,   130,   149,   181,   114,
-     181,    -1,   131,   149,   181,   114,   181,    -1,   132,   149,
-     181,   114,   181,    -1,    49,   182,    -1,   133,   182,   114,
-     182,    -1,   112,   182,    39,   149,    -1,   103,   182,   114,
-     182,   114,   182,    -1,   108,   182,   114,   149,    -1,   109,
-     182,   114,   182,    -1,   110,   182,   114,   182,   114,   182,
-      -1,   111,   182,   114,   182,   114,   182,    -1,   102,   189,
-      -1,   192,   140,   147,   181,   116,   191,   117,    -1,   196,
-      -1,   114,   190,    -1,    -1,    38,    -1,    -1,    96,   149,
-     142,    -1,    96,   149,   114,    10,   181,   142,    -1,    97,
-     149,   142,    -1,    97,   149,   114,    10,   181,   142,    -1,
-      98,   182,    -1,   195,    99,   149,   181,    -1,   195,   100,
-     182,   114,   149,   181,    -1,   101,   149,   181,   194,    -1
+      -1,   106,    -1,   107,    -1,   113,    -1,   114,    -1,   115,
+      -1,   116,    -1,   117,    -1,   118,    -1,   119,    -1,   120,
+      -1,   121,    -1,   122,    -1,   123,    -1,   124,    -1,   112,
+      -1,    11,    -1,     9,    -1,     7,    -1,     5,    -1,    12,
+      -1,    10,    -1,     8,    -1,     6,    -1,   147,    -1,   148,
+      -1,    13,    -1,    14,    -1,   179,   125,    -1,    -1,    42,
+      -1,    43,    -1,    44,    -1,    48,    -1,    45,    -1,    46,
+      -1,    47,    -1,    -1,    65,    -1,    66,    -1,    67,    -1,
+      68,    -1,    69,    -1,    70,    -1,    64,    18,    -1,    -1,
+      -1,    57,    18,    -1,    -1,   126,    57,    18,    -1,    37,
+      30,    -1,    -1,   156,    -1,    -1,   126,   159,   158,    -1,
+     156,    -1,    57,    18,    -1,   162,    -1,     3,    -1,   164,
+      -1,     3,    -1,   164,    -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,   163,    -1,   193,    -1,   127,    18,    -1,   161,   128,
+     166,   129,    -1,   130,    18,   131,   164,   132,    -1,   133,
+      18,   131,   164,   134,    -1,   135,   165,   136,    -1,   135,
+     136,    -1,   164,   137,    -1,   164,    -1,   165,   126,   164,
+      -1,   165,    -1,   165,   126,    40,    -1,    40,    -1,    -1,
+     162,   130,   169,   132,    -1,   162,   130,   132,    -1,   162,
+     138,    30,    -1,   162,   133,   169,   134,    -1,   162,   135,
+     169,   136,    -1,   162,   135,   136,    -1,   162,    22,    -1,
+     162,    23,    -1,   162,   193,    -1,   162,   168,    -1,   162,
+      24,    -1,   147,   141,    -1,   148,    18,    -1,     4,    25,
+      -1,     4,    26,    -1,   150,    21,    -1,   146,   128,   167,
+      39,   162,   129,    -1,   101,   128,   167,   207,   129,    -1,
+     103,   128,   167,   126,   167,   126,   167,   129,    -1,   142,
+     128,   167,   126,   167,   129,    -1,   143,   128,   167,   126,
+     167,   129,    -1,   144,   128,   167,   126,   167,   129,    -1,
+     145,   128,   167,   126,   167,   129,    -1,   109,   128,   167,
+     126,   167,   129,    -1,   110,   128,   167,   126,   167,   126,
+     167,   129,    -1,   111,   128,   167,   126,   167,   126,   167,
+     129,    -1,   169,   126,   167,    -1,   167,    -1,    35,    -1,
+      36,    -1,   172,    -1,   172,   188,    -1,   172,   190,    -1,
+     172,    62,    61,   174,    -1,   172,    31,    -1,   173,    -1,
+     173,   151,    27,   160,    -1,   173,   190,    -1,   173,    62,
+      61,   174,    -1,   173,   151,   152,   170,   167,   158,    -1,
+     173,   151,    50,   170,   162,   158,    -1,   173,   151,    45,
+     170,   162,   158,    -1,   173,   151,    47,   170,   162,   158,
+      -1,   173,    51,   176,    -1,   173,    58,   125,   177,    -1,
+      -1,    30,    -1,    56,    -1,    55,    -1,    53,   125,   175,
+      -1,    54,   125,    18,    -1,    52,   125,    30,    -1,    71,
+     125,    30,    -1,   130,   178,   132,    -1,   178,   126,    30,
+      -1,    30,    -1,    -1,    28,    -1,    30,    -1,   179,    -1,
+      -1,   162,   180,    -1,   182,   126,   181,    -1,   181,    -1,
+     182,    -1,   182,   126,    40,    -1,    40,    -1,    -1,   153,
+     160,   179,   128,   183,   129,   157,   154,    -1,    32,    -1,
+     135,    -1,   152,   184,   185,    -1,    33,    -1,   136,    -1,
+     186,   196,   187,    -1,    -1,    45,    -1,    47,    -1,    34,
+     189,   184,    -1,    -1,    63,    -1,    17,    -1,    18,    -1,
+      21,    -1,    25,    -1,    26,    -1,    22,    -1,    23,    -1,
+      24,    -1,   133,   169,   134,    -1,   168,    -1,    61,   191,
+      30,   126,    30,    -1,   140,    -1,   179,    -1,   193,    -1,
+     192,    -1,   162,   194,    -1,   196,   197,    -1,   197,    -1,
+     198,   199,    -1,   198,   201,    -1,    -1,    29,    -1,    72,
+     195,    -1,    72,     3,    -1,    73,    15,   194,    -1,    73,
+       4,   194,   126,    15,   194,   126,    15,   194,    -1,    74,
+     149,   194,   126,    15,   194,   130,   200,   132,    -1,    74,
+     149,   194,   126,    15,   194,   130,   132,    -1,   151,    75,
+     153,   160,   194,   128,   204,   129,    39,    15,   194,    76,
+      15,   194,    -1,    76,    -1,    77,    -1,   200,   149,   192,
+     126,    15,   194,    -1,   149,   192,   126,    15,   194,    -1,
+     151,   206,    -1,   162,   130,   194,   126,   194,   132,    -1,
+     202,   126,   130,   194,   126,   194,   132,    -1,   195,    -1,
+     203,   126,   195,    -1,   203,    -1,    -1,    60,    59,    -1,
+      59,    -1,   142,   162,   194,   126,   194,    -1,   143,   162,
+     194,   126,   194,    -1,   144,   162,   194,   126,   194,    -1,
+      49,   195,    -1,   145,   195,   126,   195,    -1,   146,   195,
+      39,   162,    -1,   103,   195,   126,   195,   126,   195,    -1,
+     108,   195,   126,   162,    -1,   109,   195,   126,   195,    -1,
+     110,   195,   126,   195,   126,   195,    -1,   111,   195,   126,
+     195,   126,   195,    -1,   102,   202,    -1,   205,   153,   160,
+     194,   128,   204,   129,    -1,   209,    -1,   126,   203,    -1,
+      -1,    38,    -1,    -1,    96,   162,   155,    -1,    96,   162,
+     126,    10,   194,   155,    -1,    97,   162,   155,    -1,    97,
+     162,   126,    10,   194,   155,    -1,    98,   195,    -1,   208,
+      99,   162,   194,    -1,   208,   100,   195,   126,   162,   194,
+      -1,   101,   162,   194,   207,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
-       0,   188,   188,   188,   189,   189,   193,   193,   193,   193,
-     193,   193,   193,   193,   193,   194,   194,   194,   195,   195,
-     195,   195,   195,   195,   196,   196,   196,   196,   200,   200,
-     200,   200,   201,   201,   201,   201,   202,   202,   203,   203,
-     206,   210,   215,   215,   215,   215,   215,   215,   216,   217,
-     220,   220,   220,   220,   220,   221,   222,   227,   232,   233,
-     236,   237,   245,   251,   252,   255,   256,   265,   266,   279,
-     279,   280,   280,   281,   285,   285,   285,   285,   285,   285,
-     285,   286,   286,   286,   286,   286,   287,   287,   288,   294,
-     299,   305,   312,   319,   325,   329,   339,   342,   350,   351,
-     356,   359,   369,   375,   380,   386,   392,   398,   403,   409,
-     415,   421,   427,   433,   439,   445,   451,   457,   465,   472,
-     478,   483,   488,   493,   498,   506,   511,   516,   526,   531,
-     536,   536,   546,   551,   554,   559,   563,   567,   570,   575,
-     580,   585,   591,   597,   603,   609,   614,   619,   624,   626,
-     626,   629,   634,   641,   646,   653,   660,   665,   666,   674,
-     674,   675,   675,   677,   684,   688,   692,   695,   700,   703,
-     705,   725,   728,   732,   741,   742,   744,   752,   753,   754,
-     758,   771,   772,   775,   775,   775,   775,   775,   775,   775,
-     776,   777,   782,   783,   792,   792,   795,   795,   801,   808,
-     811,   819,   823,   828,   831,   837,   842,   847,   852,   859,
-     865,   871,   884,   889,   895,   900,   908,   915,   921,   929,
-     930,   938,   939,   943,   948,   951,   956,   961,   966,   971,
-     979,   986,   991,   996,  1001,  1006,  1011,  1016,  1025,  1030,
-    1034,  1038,  1039,  1042,  1049,  1056,  1063,  1070,  1075,  1082,
-    1089
+       0,   189,   189,   189,   190,   190,   194,   194,   194,   194,
+     194,   194,   194,   194,   194,   195,   195,   195,   196,   196,
+     196,   196,   196,   196,   197,   197,   197,   197,   198,   198,
+     198,   198,   198,   198,   198,   199,   199,   199,   199,   199,
+     199,   204,   204,   204,   204,   205,   205,   205,   205,   206,
+     206,   207,   207,   210,   214,   219,   219,   219,   219,   219,
+     219,   220,   221,   224,   224,   224,   224,   224,   225,   226,
+     231,   236,   237,   240,   241,   249,   255,   256,   259,   260,
+     269,   270,   283,   283,   284,   284,   285,   289,   289,   289,
+     289,   289,   289,   289,   290,   290,   290,   290,   290,   291,
+     291,   292,   298,   303,   309,   316,   323,   329,   333,   343,
+     346,   354,   355,   360,   363,   373,   379,   384,   390,   396,
+     402,   407,   413,   419,   425,   431,   437,   443,   449,   455,
+     461,   469,   478,   484,   489,   494,   499,   504,   512,   517,
+     522,   532,   537,   542,   542,   552,   557,   560,   565,   569,
+     573,   576,   581,   586,   591,   597,   603,   609,   615,   620,
+     625,   630,   632,   632,   635,   640,   647,   652,   659,   666,
+     671,   672,   680,   680,   681,   681,   683,   690,   694,   698,
+     701,   706,   709,   711,   731,   734,   738,   747,   748,   750,
+     758,   759,   760,   764,   777,   778,   781,   781,   781,   781,
+     781,   781,   781,   782,   783,   788,   789,   798,   798,   801,
+     801,   807,   814,   817,   825,   829,   834,   837,   843,   848,
+     853,   858,   865,   871,   877,   890,   895,   901,   906,   914,
+     921,   927,   935,   936,   944,   945,   949,   954,   957,   962,
+     967,   972,   977,   985,   994,   999,  1004,  1009,  1014,  1019,
+    1024,  1033,  1038,  1042,  1046,  1047,  1050,  1057,  1064,  1071,
+    1078,  1083,  1090,  1097
 };
 #endif
 
@@ -830,10 +860,12 @@
   "SETGE", "SETLT", "SETGT", "SETEQ", "SETNE", "MALLOC", "ALLOCA", "FREE",
   "LOAD", "STORE", "GETELEMENTPTR", "PHI_TOK", "SELECT", "SHL", "SHR",
   "ASHR", "LSHR", "VAARG", "EXTRACTELEMENT", "INSERTELEMENT",
-  "SHUFFLEVECTOR", "CAST", "'='", "','", "'\\\\'", "'('", "')'", "'['",
-  "'x'", "']'", "'<'", "'>'", "'{'", "'}'", "'*'", "'c'", "$accept",
-  "IntVal", "EInt64Val", "ArithmeticOps", "LogicalOps", "SetCondOps",
-  "ShiftOps", "SIntType", "UIntType", "IntType", "FPType", "OptAssign",
+  "SHUFFLEVECTOR", "CAST", "TRUNC", "ZEXT", "SEXT", "FPTRUNC", "FPEXT",
+  "FPTOUI", "FPTOSI", "UITOFP", "SITOFP", "PTRTOINT", "INTTOPTR",
+  "BITCAST", "'='", "','", "'\\\\'", "'('", "')'", "'['", "'x'", "']'",
+  "'<'", "'>'", "'{'", "'}'", "'*'", "'c'", "$accept", "IntVal",
+  "EInt64Val", "ArithmeticOps", "LogicalOps", "SetCondOps", "ShiftOps",
+  "CastOps", "SIntType", "UIntType", "IntType", "FPType", "OptAssign",
   "OptLinkage", "OptCallingConv", "OptAlign", "OptCAlign", "SectionString",
   "OptSection", "GlobalVarAttributes", "GlobalVarAttribute", "TypesV",
   "UpRTypesV", "Types", "PrimType", "UpRTypes", "TypeListI",
@@ -866,40 +898,42 @@
      335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
      345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
      355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
-     365,   366,   367,    61,    44,    92,    40,    41,    91,   120,
-      93,    60,    62,   123,   125,    42,    99
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,   377,   378,   379,    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,   127,   128,   128,   129,   129,   130,   130,   130,   130,
-     130,   130,   130,   130,   130,   131,   131,   131,   132,   132,
-     132,   132,   132,   132,   133,   133,   133,   133,   134,   134,
-     134,   134,   135,   135,   135,   135,   136,   136,   137,   137,
-     138,   138,   139,   139,   139,   139,   139,   139,   139,   139,
-     140,   140,   140,   140,   140,   140,   140,   140,   141,   141,
-     142,   142,   143,   144,   144,   145,   145,   146,   146,   147,
-     147,   148,   148,   149,   150,   150,   150,   150,   150,   150,
-     150,   150,   150,   150,   150,   150,   151,   151,   151,   151,
-     151,   151,   151,   151,   151,   151,   152,   152,   153,   153,
-     153,   153,   154,   154,   154,   154,   154,   154,   154,   154,
-     154,   154,   154,   154,   154,   154,   154,   154,   155,   155,
-     155,   155,   155,   155,   155,   155,   155,   155,   156,   156,
-     157,   157,   158,   159,   159,   159,   159,   159,   160,   160,
-     160,   160,   160,   160,   160,   160,   160,   160,   161,   162,
-     162,   163,   163,   163,   163,   164,   165,   165,   165,   166,
-     166,   167,   167,   168,   169,   169,   170,   170,   170,   170,
-     171,   172,   172,   173,   174,   174,   175,   176,   176,   176,
-     177,   178,   178,   179,   179,   179,   179,   179,   179,   179,
-     179,   179,   179,   179,   180,   180,   181,   181,   182,   183,
-     183,   184,   185,   185,   185,   186,   186,   186,   186,   186,
-     186,   186,   186,   186,   187,   187,   188,   189,   189,   190,
-     190,   191,   191,   192,   192,   193,   193,   193,   193,   193,
-     193,   193,   193,   193,   193,   193,   193,   193,   193,   194,
-     194,   195,   195,   196,   196,   196,   196,   196,   196,   196,
-     196
+       0,   139,   140,   140,   141,   141,   142,   142,   142,   142,
+     142,   142,   142,   142,   142,   143,   143,   143,   144,   144,
+     144,   144,   144,   144,   145,   145,   145,   145,   146,   146,
+     146,   146,   146,   146,   146,   146,   146,   146,   146,   146,
+     146,   147,   147,   147,   147,   148,   148,   148,   148,   149,
+     149,   150,   150,   151,   151,   152,   152,   152,   152,   152,
+     152,   152,   152,   153,   153,   153,   153,   153,   153,   153,
+     153,   154,   154,   155,   155,   156,   157,   157,   158,   158,
+     159,   159,   160,   160,   161,   161,   162,   163,   163,   163,
+     163,   163,   163,   163,   163,   163,   163,   163,   163,   164,
+     164,   164,   164,   164,   164,   164,   164,   164,   164,   165,
+     165,   166,   166,   166,   166,   167,   167,   167,   167,   167,
+     167,   167,   167,   167,   167,   167,   167,   167,   167,   167,
+     167,   168,   168,   168,   168,   168,   168,   168,   168,   168,
+     168,   169,   169,   170,   170,   171,   172,   172,   172,   172,
+     172,   173,   173,   173,   173,   173,   173,   173,   173,   173,
+     173,   174,   175,   175,   176,   176,   176,   176,   177,   178,
+     178,   178,   179,   179,   180,   180,   181,   182,   182,   183,
+     183,   183,   183,   184,   185,   185,   186,   187,   187,   188,
+     189,   189,   189,   190,   191,   191,   192,   192,   192,   192,
+     192,   192,   192,   192,   192,   192,   192,   193,   193,   194,
+     194,   195,   196,   196,   197,   198,   198,   198,   199,   199,
+     199,   199,   199,   199,   199,   199,   199,   200,   200,   201,
+     202,   202,   203,   203,   204,   204,   205,   205,   206,   206,
+     206,   206,   206,   206,   206,   206,   206,   206,   206,   206,
+     206,   206,   207,   207,   208,   208,   209,   209,   209,   209,
+     209,   209,   209,   209
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -909,470 +943,515 @@
        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,
-       2,     0,     1,     1,     1,     1,     1,     1,     1,     0,
-       1,     1,     1,     1,     1,     1,     2,     0,     0,     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,     6,     6,     8,     8,     3,     1,
-       1,     1,     1,     2,     2,     4,     2,     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,     2,     2,     3,     9,     9,
-       8,    14,     1,     1,     6,     5,     2,     6,     7,     1,
-       3,     1,     0,     2,     1,     5,     5,     5,     2,     4,
-       4,     6,     4,     4,     6,     6,     2,     7,     1,     2,
-       0,     1,     0,     3,     6,     3,     6,     2,     4,     6,
-       4
+       1,     1,     1,     2,     0,     1,     1,     1,     1,     1,
+       1,     1,     0,     1,     1,     1,     1,     1,     1,     2,
+       0,     0,     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,     6,     6,     8,
+       8,     3,     1,     1,     1,     1,     2,     2,     4,     2,
+       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,     2,     2,
+       3,     9,     9,     8,    14,     1,     1,     6,     5,     2,
+       6,     7,     1,     3,     1,     0,     2,     1,     5,     5,
+       5,     2,     4,     4,     6,     4,     4,     6,     6,     2,
+       7,     1,     2,     0,     1,     0,     3,     6,     3,     6,
+       2,     4,     6,     4
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
    STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
-static const unsigned char yydefact[] =
+static const unsigned short int yydefact[] =
 {
-     147,     0,    49,   137,     1,   136,   177,    42,    43,    44,
-      46,    47,    48,    45,     0,    57,   203,   133,   134,   159,
-     160,     0,     0,     0,    49,     0,   139,   178,   179,    57,
-       0,     0,    50,    51,    52,    53,    54,    55,     0,     0,
-     204,   203,   200,    41,     0,     0,     0,     0,   145,     0,
-       0,     0,     0,     0,     0,     0,    40,   180,   148,   135,
-      56,    70,    74,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,     2,     3,     0,     0,     0,
-       0,   194,     0,     0,    69,    87,    73,   195,    88,   171,
-     172,   173,   174,   175,   176,   199,     0,     0,     0,   212,
-     213,   242,   201,   202,     0,     0,     0,     0,   158,   146,
-     140,   138,   130,   131,     0,     0,     0,     0,    89,     0,
-       0,    72,    94,    96,     0,     0,   101,    95,   206,     0,
-     205,     0,     0,    31,    35,    30,    34,    29,    33,    28,
-      32,    36,    37,     0,   241,     0,   224,     0,    57,     6,
+     160,     0,    62,   150,     1,   149,   190,    55,    56,    57,
+      59,    60,    61,    58,     0,    70,   216,   146,   147,   172,
+     173,     0,     0,     0,    62,     0,   152,   191,   192,    70,
+       0,     0,    63,    64,    65,    66,    67,    68,     0,     0,
+     217,   216,   213,    54,     0,     0,     0,     0,   158,     0,
+       0,     0,     0,     0,     0,     0,    53,   193,   161,   148,
+      69,    83,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,     2,     3,     0,     0,     0,
+       0,   207,     0,     0,    82,   100,    86,   208,   101,   184,
+     185,   186,   187,   188,   189,   212,     0,     0,     0,   225,
+     226,   255,   214,   215,     0,     0,     0,     0,   171,   159,
+     153,   151,   143,   144,     0,     0,     0,     0,   102,     0,
+       0,    85,   107,   109,     0,     0,   114,   108,   219,     0,
+     218,     0,     0,    44,    48,    43,    47,    42,    46,    41,
+      45,    49,    50,     0,   254,     0,   237,     0,    70,     6,
        7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
       17,    18,    19,    20,    21,    22,    23,     0,     0,     0,
        0,     0,     0,    24,    25,    26,    27,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    57,   216,     0,   238,
-     153,   150,   149,   151,   152,   154,   157,     0,    65,    65,
-      65,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,     0,     0,     0,     0,    65,     0,     0,     0,
-      93,   169,   100,    98,     0,   183,   184,   185,   188,   189,
-     190,   186,   187,   181,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   192,   197,   196,   198,     0,
-     207,     0,   228,   223,     0,    60,    60,   247,     0,     0,
-     236,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   155,     0,   143,   144,   142,
-     115,   116,     4,     5,   113,   114,   117,   108,   109,   112,
-       0,     0,     0,     0,   111,   110,   141,    71,    71,    97,
-     168,   162,   165,   166,     0,     0,    90,   182,     0,     0,
-       0,     0,     0,     0,     0,   129,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   243,     0,   245,   240,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   156,     0,     0,    67,    65,   103,
-       0,     0,   107,     0,   104,    91,    92,   161,   163,     0,
-      63,    99,     0,   240,     0,     0,     0,     0,     0,     0,
-     191,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   250,     0,     0,     0,   232,   233,     0,     0,
-     230,     0,     0,     0,   229,     0,   248,     0,    62,    68,
-      66,   102,   105,   106,   167,   164,    64,    58,     0,     0,
-       0,     0,     0,     0,     0,   128,     0,     0,     0,     0,
-       0,     0,   222,    60,    61,    60,   219,   239,     0,     0,
-       0,     0,     0,   225,   226,   227,   222,     0,     0,   170,
-     193,   119,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   221,     0,     0,   244,   246,     0,     0,
-       0,   231,   234,   235,     0,   249,    59,     0,   125,     0,
-       0,   118,   121,   122,   123,   124,     0,   210,     0,     0,
-       0,   220,   217,     0,   237,     0,     0,     0,   208,     0,
-     209,     0,     0,   218,   120,   126,   127,     0,     0,     0,
-       0,     0,     0,   215,     0,     0,   214,     0,   211
+       0,    40,    28,    29,    30,    31,    32,    33,    34,    35,
+      36,    37,    38,    39,     0,     0,     0,     0,     0,    70,
+     229,     0,   251,   166,   163,   162,   164,   165,   167,   170,
+       0,    78,    78,    78,    87,    88,    89,    90,    91,    92,
+      93,    94,    95,    96,    97,     0,     0,     0,     0,    78,
+       0,     0,     0,   106,   182,   113,   111,     0,   196,   197,
+     198,   201,   202,   203,   199,   200,   194,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   205,   210,
+     209,   211,     0,   220,     0,   241,   236,     0,    73,    73,
+     260,     0,     0,   249,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   168,     0,
+     156,   157,   155,   128,   129,     4,     5,   126,   127,   130,
+     121,   122,   125,     0,     0,     0,     0,   124,   123,   154,
+      84,    84,   110,   181,   175,   178,   179,     0,     0,   103,
+     195,     0,     0,     0,     0,     0,     0,   142,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   256,     0,
+     258,   253,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   169,     0,     0,
+      80,    78,   116,     0,     0,   120,     0,   117,   104,   105,
+     174,   176,     0,    76,   112,     0,   253,     0,     0,     0,
+       0,     0,   204,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   263,     0,     0,     0,   245,
+     246,     0,     0,     0,     0,     0,   242,   243,     0,   261,
+       0,    75,    81,    79,   115,   118,   119,   180,   177,    77,
+      71,     0,     0,     0,     0,     0,     0,   141,     0,     0,
+       0,     0,     0,     0,     0,   235,    73,    74,    73,   232,
+     252,     0,     0,     0,     0,     0,   238,   239,   240,   235,
+       0,     0,   183,   206,   132,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   234,     0,     0,   257,
+     259,     0,     0,     0,   244,   247,   248,     0,   262,    72,
+       0,   138,     0,     0,   134,   135,   136,   137,   131,     0,
+     223,     0,     0,     0,   233,   230,     0,   250,     0,     0,
+       0,   221,     0,   222,     0,     0,   231,   133,   139,   140,
+       0,     0,     0,     0,     0,     0,   228,     0,     0,   227,
+       0,   224
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
 static const short int yydefgoto[] =
 {
-      -1,    81,   284,   241,   242,   243,   244,   212,   213,   143,
-     214,    24,    15,    38,   439,   325,   347,   407,   277,   348,
-      82,    83,   215,    85,    86,   124,   224,   315,   245,   316,
-     114,     1,     2,     3,    59,   193,    48,   109,   197,    87,
-     358,   302,   303,   304,    39,    91,    16,    94,    17,    29,
-      18,   308,   246,    88,   248,   426,    41,    42,    43,   102,
-     479,   103,   260,   453,   454,   186,   187,   382,   188,   189
+      -1,    81,   297,   253,   254,   255,   256,   257,   225,   226,
+     143,   227,    24,    15,    38,   452,   338,   360,   420,   290,
+     361,    82,    83,   228,    85,    86,   124,   237,   327,   258,
+     328,   114,     1,     2,     3,    59,   206,    48,   109,   210,
+      87,   371,   315,   316,   317,    39,    91,    16,    94,    17,
+      29,    18,   321,   259,    88,   261,   439,    41,    42,    43,
+     102,   492,   103,   273,   466,   467,   199,   200,   395,   201,
+     202
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -462
+#define YYPACT_NINF -472
 static const short int yypact[] =
 {
-    -462,    20,   223,   382,  -462,  -462,    74,  -462,  -462,  -462,
-    -462,  -462,  -462,  -462,   -37,   262,    13,  -462,  -462,  -462,
-    -462,    64,   -82,     9,    -9,   -15,  -462,  -462,  -462,   262,
-      79,   110,  -462,  -462,  -462,  -462,  -462,  -462,   688,   -17,
-    -462,   -19,  -462,    -5,    38,    40,    50,    59,  -462,    57,
-      79,   688,   132,   132,   132,   132,  -462,  -462,  -462,  -462,
-    -462,    66,  -462,  -462,  -462,  -462,  -462,  -462,  -462,  -462,
-    -462,  -462,  -462,  -462,  -462,  -462,  -462,   173,   184,   193,
-     469,  -462,   108,   103,  -462,  -462,    -3,  -462,  -462,  -462,
-    -462,  -462,  -462,  -462,  -462,  -462,   717,    17,   235,  -462,
-    -462,  1038,  -462,  -462,   191,   114,   204,   194,   195,  -462,
-    -462,  -462,  -462,  -462,   745,   745,   745,   774,  -462,   109,
-     111,  -462,  -462,    -3,   -13,   113,    80,  -462,    66,   932,
-    -462,   932,   932,  -462,  -462,  -462,  -462,  -462,  -462,  -462,
-    -462,  -462,  -462,   932,  -462,   745,  -462,   178,   262,  -462,
-    -462,  -462,  -462,  -462,  -462,  -462,  -462,  -462,  -462,  -462,
-    -462,  -462,  -462,  -462,  -462,  -462,  -462,   745,   745,   745,
-     745,   745,   745,  -462,  -462,  -462,  -462,   745,   745,   745,
-     745,   745,   745,   745,   745,   745,   262,  -462,    78,  -462,
-    -462,  -462,  -462,  -462,  -462,  -462,  -462,   -40,   117,   117,
-     117,   155,   172,   214,   176,   230,   179,   231,   182,   232,
-     234,   237,   200,   233,   238,   822,   117,   745,   745,   745,
-    -462,   527,  -462,   139,   143,  -462,  -462,  -462,  -462,  -462,
-    -462,  -462,  -462,   211,   140,   160,   162,   163,   166,   167,
-     774,   168,   170,   171,   175,  -462,  -462,  -462,  -462,   185,
-    -462,   186,  -462,  -462,   688,   189,   190,  -462,   932,   174,
-     196,   201,   202,   205,   206,   208,   270,   932,   932,   932,
-     210,   688,   745,   745,   288,  -462,    16,  -462,  -462,  -462,
-    -462,  -462,  -462,  -462,  -462,  -462,  -462,  -462,  -462,  -462,
-     566,   774,   499,   303,  -462,  -462,  -462,   -23,     2,    -3,
-    -462,   108,  -462,   225,   220,   596,  -462,  -462,   314,   774,
-     774,   774,   774,   774,   774,  -462,   -95,   774,   774,   774,
-     774,   330,   331,   932,    -2,  -462,    -1,  -462,   236,   932,
-     240,   745,   745,   745,   745,   745,   745,   239,   246,   247,
-     745,   932,   932,   249,  -462,   318,   333,  -462,   117,  -462,
-     -39,     1,  -462,   -10,  -462,  -462,  -462,  -462,  -462,   648,
-     312,  -462,   252,   236,   253,   254,   257,   261,   313,   774,
-    -462,   263,   265,   266,   267,   932,   932,   272,   932,   336,
-     932,   745,  -462,   275,   932,   276,  -462,  -462,   277,   281,
-    -462,   932,   932,   932,  -462,   283,  -462,   745,  -462,  -462,
-    -462,  -462,  -462,  -462,  -462,  -462,  -462,   343,   372,   286,
-     774,   774,   774,   774,   745,  -462,   774,   774,   774,   774,
-     291,   289,   745,   292,  -462,   292,  -462,   294,   932,   297,
-     745,   745,   745,  -462,  -462,  -462,   745,   932,   395,  -462,
-    -462,  -462,   300,   298,   305,   307,   306,   317,   319,   324,
-     325,   420,    39,   294,   326,   388,  -462,  -462,   745,   327,
-     932,  -462,  -462,  -462,   329,  -462,  -462,   774,  -462,   774,
-     774,  -462,  -462,  -462,  -462,  -462,   932,  -462,   979,    54,
-     409,  -462,  -462,   332,  -462,   334,   338,   339,  -462,   335,
-    -462,   979,   435,  -462,  -462,  -462,  -462,   438,   344,   932,
-     932,   442,   383,  -462,   932,   445,  -462,   932,  -462
+    -472,    38,   138,  1015,  -472,  -472,    59,  -472,  -472,  -472,
+    -472,  -472,  -472,  -472,    -2,    80,    35,  -472,  -472,  -472,
+    -472,   -29,   -50,    18,   174,   -37,  -472,  -472,  -472,    80,
+      73,    93,  -472,  -472,  -472,  -472,  -472,  -472,   744,   -22,
+    -472,   -21,  -472,     9,     3,    12,    54,    64,  -472,    37,
+      73,   744,    84,    84,    84,    84,  -472,  -472,  -472,  -472,
+    -472,    62,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,
+    -472,  -472,  -472,  -472,  -472,  -472,  -472,   173,   176,   177,
+     431,  -472,    86,    69,  -472,  -472,  -106,  -472,  -472,  -472,
+    -472,  -472,  -472,  -472,  -472,  -472,   772,    28,   343,  -472,
+    -472,  1211,  -472,  -472,   162,    66,   180,   169,   172,  -472,
+    -472,  -472,  -472,  -472,   802,   802,   802,   831,  -472,    72,
+      74,  -472,  -472,  -106,   -46,    76,   504,  -472,    62,  1011,
+    -472,  1011,  1011,  -472,  -472,  -472,  -472,  -472,  -472,  -472,
+    -472,  -472,  -472,  1011,  -472,   802,  -472,   148,    80,  -472,
+    -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,
+    -472,  -472,  -472,  -472,  -472,  -472,  -472,   802,   802,   802,
+     802,   802,   802,  -472,  -472,  -472,  -472,   802,   802,   802,
+     802,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,
+    -472,  -472,  -472,  -472,   802,   802,   802,   802,   802,    80,
+    -472,    24,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,
+     -70,    83,    83,    83,   101,   118,   192,   137,   193,   147,
+     194,   153,   195,   204,   207,   170,   197,   209,   889,    83,
+     802,   802,   802,  -472,   565,  -472,   105,   103,  -472,  -472,
+    -472,  -472,  -472,  -472,  -472,  -472,   171,   107,   108,   109,
+     110,   113,   831,   114,   115,   116,   117,   122,  -472,  -472,
+    -472,  -472,   127,  -472,   128,  -472,  -472,   744,   129,   130,
+    -472,  1011,   132,   131,   133,   144,   145,   152,   154,  1011,
+    1011,  1011,   155,   219,   744,   802,   802,   243,  -472,   -16,
+    -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,
+    -472,  -472,  -472,   610,   831,   476,   244,  -472,  -472,  -472,
+    -102,   -32,  -106,  -472,    86,  -472,   156,   150,   638,  -472,
+    -472,   253,   831,   831,   831,   831,   831,  -472,   -90,   831,
+     831,   831,   831,   831,   269,   272,  1011,     4,  -472,    17,
+    -472,   163,  1011,   161,   802,   802,   802,   802,   802,   166,
+     167,   178,   802,   802,  1011,  1011,   179,  -472,   265,   278,
+    -472,    83,  -472,   -39,   -71,  -472,   -35,  -472,  -472,  -472,
+    -472,  -472,   698,   260,  -472,   185,   163,   186,   203,   205,
+     206,   831,  -472,   210,   211,   213,   214,   259,  1011,  1011,
+     175,  1011,   281,  1011,   802,  -472,   215,  1011,   216,  -472,
+    -472,   217,   218,  1011,  1011,  1011,  -472,  -472,   202,  -472,
+     802,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,
+     266,   303,   228,   831,   831,   831,   831,  -472,   831,   831,
+     831,   831,   802,   220,   229,   802,   232,  -472,   232,  -472,
+     234,  1011,   236,   802,   802,   802,  -472,  -472,  -472,   802,
+    1011,   317,  -472,  -472,  -472,   240,   238,   245,   247,   246,
+     248,   249,   250,   251,   359,    42,   234,   252,   325,  -472,
+    -472,   802,   255,  1011,  -472,  -472,  -472,   254,  -472,  -472,
+     831,  -472,   831,   831,  -472,  -472,  -472,  -472,  -472,  1011,
+    -472,  1124,    61,   349,  -472,  -472,   258,  -472,   264,   270,
+     271,  -472,   275,  -472,  1124,   383,  -472,  -472,  -472,  -472,
+     387,   277,  1011,  1011,   389,   332,  -472,  1011,   397,  -472,
+    1011,  -472
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -462,  -462,  -462,   360,   361,   362,   363,   -97,   -96,  -400,
-    -462,   423,   443,  -132,  -462,  -252,   126,  -462,  -194,  -462,
-     -44,  -462,   -38,  -462,   -69,   342,  -462,  -105,   256,  -134,
-     107,  -462,  -462,  -462,   419,  -462,  -462,  -462,  -462,     0,
-    -462,   128,  -462,  -462,   461,  -462,  -462,  -462,  -462,  -462,
-     488,  -462,  -461,  -103,    -6,     7,  -462,   451,  -462,  -462,
-    -462,  -462,  -462,   115,    81,  -462,  -462,   137,  -462,  -462
+    -472,  -472,  -472,   312,   314,   315,   321,   326,   -97,   -96,
+    -446,  -472,   385,   405,  -139,  -472,  -263,    57,  -472,  -195,
+    -472,   -44,  -472,   -38,  -472,   -69,   305,  -472,    -5,   221,
+    -209,    55,  -472,  -472,  -472,   382,  -472,  -472,  -472,  -472,
+       2,  -472,    81,  -472,  -472,   419,  -472,  -472,  -472,  -472,
+    -472,   449,  -472,  -471,  -103,  -128,   -80,  -472,   413,  -472,
+    -472,  -472,  -472,  -472,    63,     6,  -472,  -472,    82,  -472,
+    -472
 };
 
 /* 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 -133
+#define YYTABLE_NINF -146
 static const short int yytable[] =
 {
-      84,   141,   142,    25,   327,   278,   279,   111,   378,   380,
-      40,   123,   216,    84,    92,    89,   254,   489,    51,   369,
-       4,   131,   296,    19,    30,    20,   247,   370,   247,   247,
-     498,    49,   132,     7,     8,     9,    52,    11,    53,    13,
-     247,    54,    40,    25,   133,   134,   135,   136,   137,   138,
-     139,   140,   478,   345,   271,   379,   379,   123,   129,   133,
-     134,   135,   136,   137,   138,   139,   140,    96,    97,    98,
-      50,    99,   100,   346,   274,   369,   198,   199,   200,   491,
-     275,   401,   125,   121,    62,    63,    64,    65,    66,    67,
-      68,    69,    70,    71,    72,    73,    74,   355,    56,    75,
-      76,   219,   127,   130,   369,    93,    90,   129,    19,    58,
-      20,   220,   295,   -71,   403,   369,    44,    45,    46,    27,
-     222,    28,   127,   402,   356,   249,   250,   127,    60,   255,
-     256,   129,   258,   259,   129,    47,    19,   251,    20,   129,
-     129,   129,   129,   129,   267,   268,   269,   129,   297,   298,
-     299,   104,   252,   105,   400,   247,   350,   351,   353,   477,
-     115,   116,   117,   106,   247,   247,   247,   112,   113,   191,
-     192,   456,   107,   457,   490,   108,   257,   272,   273,   261,
-     280,   281,   -72,   301,   262,   263,   264,   265,   266,   -31,
-     -31,   118,   270,   -30,   -30,    77,   -29,   -29,    78,   -28,
-     -28,    79,   119,    80,   363,   364,   365,   366,   367,   368,
-     323,   120,   371,   372,   373,   374,    84,   282,   283,   126,
-     247,   190,   194,  -132,   195,   196,   247,   341,   217,   221,
-     218,   276,   -35,    84,   342,   129,   299,   253,   247,   247,
-     133,   134,   135,   136,   137,   138,   139,   140,   -34,   -33,
-     -32,   285,   328,   305,     5,   -38,   309,     6,   -39,   286,
-     306,   337,   338,   339,   415,     7,     8,     9,    10,    11,
-      12,    13,   247,   247,   307,   247,   310,   247,   311,   312,
-     343,   247,   313,   314,   317,    14,   318,   319,   247,   247,
-     247,   320,   329,   129,   386,   129,   129,   129,   390,   321,
-     322,   357,   129,   324,   326,   442,   443,   444,   445,   336,
-     330,   447,   448,   449,   450,   331,   332,   377,   344,   333,
-     334,   301,   335,   383,   340,   247,    31,    32,    33,    34,
-      35,    36,    37,   354,   247,   395,   396,   360,   385,   359,
-     387,   388,   389,   129,   362,   375,   376,   394,   398,   345,
-     381,   399,   414,   391,   424,   141,   142,   247,   384,   437,
-     392,   393,   485,   397,   486,   487,   408,   410,   411,   420,
-     421,   412,   423,   247,   425,   413,   446,   416,   429,   417,
-     418,   419,   141,   142,   129,   433,   434,   435,   422,   428,
-     430,   431,   129,   129,   129,   432,   247,   247,   129,   436,
-     438,   247,   440,   441,   247,   451,   455,   452,   458,   -41,
-      19,   460,    20,   466,   467,   468,     6,   -41,   -41,   469,
-     129,   470,   459,   471,   -41,   -41,   -41,   -41,   -41,   -41,
-     -41,   465,   -41,    21,   472,   476,   473,   461,   462,   463,
-      22,   474,   475,   480,    23,   379,   484,   482,   492,   497,
-     499,   494,   493,   500,   483,   495,   496,   504,   501,   505,
-     507,   182,   183,   184,   185,   481,   101,    55,   223,   110,
-     488,   294,   121,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,    71,    72,    73,    74,   406,   405,    75,    76,
-      57,    26,    95,   502,   503,     0,   427,    19,   506,    20,
-     409,   508,   121,   201,   202,   203,   204,   205,   206,   207,
-     208,   209,   210,   211,    73,    74,     0,   464,    75,    76,
-       0,     0,     0,     0,     0,     0,     0,    19,     0,    20,
-     121,    62,    63,    64,    65,    66,    67,    68,    69,    70,
-      71,    72,    73,    74,     0,     0,    75,    76,     0,     0,
-       0,     0,     0,     0,     0,    19,     0,    20,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   300,     0,   121,
-     201,   202,   203,   204,   205,   206,   207,   208,   209,   210,
-     211,    73,    74,     0,    77,    75,    76,    78,     0,     0,
-      79,     0,    80,   122,    19,     0,    20,     0,     0,   121,
-      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
-      72,    73,    74,     0,    77,    75,    76,    78,     0,     0,
-      79,     0,    80,   352,    19,     0,    20,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   361,     0,     0,     0,
+      84,   141,   142,   262,   263,    25,   340,   111,    40,   267,
+      89,   123,    92,    84,   391,   264,   130,   291,   292,   491,
+     502,   358,   -84,    44,    45,    46,   260,   393,   260,   260,
+     368,   127,   131,   511,   309,   127,   381,    19,     4,    20,
+     260,   359,    47,   132,   382,    25,   504,   133,   134,   135,
+     136,   137,   138,   139,   140,   381,   287,   123,   129,    30,
+     284,   392,   288,   415,    40,   265,   133,   134,   135,   136,
+     137,   138,   139,   140,   392,    49,   211,   212,   213,    50,
+     232,    96,    97,    98,   125,    99,   100,   381,    56,   270,
+     233,   381,   274,   414,   363,   364,   366,   275,   276,   277,
+     278,   416,   369,    58,    27,   127,    28,   129,   115,   116,
+     117,    60,   229,    90,    19,    93,    20,   282,   283,   112,
+     113,   204,   205,   285,   286,   308,   293,   294,   104,   268,
+     269,   129,   271,   272,   129,   -44,   -44,   105,  -145,   129,
+     129,   129,   129,   341,    31,    32,    33,    34,    35,    36,
+      37,   349,   350,   351,   -43,   -43,   279,   280,   281,   129,
+     129,   310,   311,   312,   -42,   -42,   413,   108,   260,     5,
+     -41,   -41,     6,   469,   490,   470,   260,   260,   260,   106,
+       7,     8,     9,    10,    11,    12,    13,   295,   296,   107,
+     -85,   118,   203,   503,   119,   120,   314,   126,   207,   208,
+      14,    51,   209,   230,   234,   231,   356,   266,   390,   289,
+     -48,   -47,   -46,   -45,   396,   298,     7,     8,     9,    52,
+      11,    53,    13,   336,    54,   -51,   408,   409,   -52,    84,
+     299,   318,   319,   260,   320,   322,   323,   324,   325,   260,
+     354,   326,   329,   330,   331,   332,    84,   355,   129,   312,
+     333,   260,   260,   334,   335,   337,   339,   343,   353,   344,
+     433,   434,   342,   436,   398,   438,   400,   401,   402,   442,
+     345,   346,   406,   357,   367,   446,   447,   448,   347,   373,
+     348,   352,   372,   375,   388,   260,   260,   389,   260,   394,
+     260,   397,   403,   404,   260,   411,   412,   358,   432,   437,
+     260,   260,   260,   435,   405,   410,   129,   399,   129,   129,
+     129,   421,   423,   472,   129,   407,   370,   376,   377,   378,
+     379,   380,   478,   451,   383,   384,   385,   386,   387,   424,
+     449,   425,   426,   453,   314,   479,   428,   429,   260,   430,
+     431,   441,   443,   444,   445,   496,   464,   260,   133,   134,
+     135,   136,   137,   138,   139,   140,   129,   454,   468,   465,
+     471,   501,   473,   474,   475,   476,   480,   481,   141,   142,
+     260,   482,   450,   483,   489,   484,   427,   485,   486,   487,
+     488,   493,   392,   497,   515,   516,   260,   495,   505,   519,
+     506,   494,   521,   507,   463,   141,   142,   129,   512,   508,
+     509,   510,   513,   514,   517,   129,   129,   129,   518,   260,
+     260,   129,   520,   194,   260,   195,   196,   260,   455,   456,
+     457,   458,   197,   459,   460,   461,   462,   198,   101,    55,
+     419,   236,   110,   129,   121,    62,    63,    64,    65,    66,
+      67,    68,    69,    70,    71,    72,    73,    74,    57,   307,
+      75,    76,    26,   418,    95,   477,     0,   440,   422,    19,
+       0,    20,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   498,     0,   499,   500,   121,
+     214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
+     224,    73,    74,     0,     0,    75,    76,     0,     0,     0,
+       0,     0,     0,     0,    19,     0,    20,   121,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,     0,     0,    75,    76,     0,     0,     0,     0,     0,
+       0,     0,    19,     0,    20,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   235,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    77,     0,
+       0,    78,     0,     0,    79,     0,    80,   122,   121,    62,
+      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
+      73,    74,     0,     0,    75,    76,     0,     0,     0,     0,
+       0,     0,     0,    19,     0,    20,     0,     0,     0,     0,
+       0,     0,     0,    77,     0,   313,    78,     0,     0,    79,
+       0,    80,   365,   121,   214,   215,   216,   217,   218,   219,
+     220,   221,   222,   223,   224,    73,    74,     0,     0,    75,
+      76,    77,     0,     0,    78,     0,     0,    79,    19,    80,
+      20,   121,    62,    63,    64,    65,    66,    67,    68,    69,
+      70,    71,    72,    73,    74,     0,     0,    75,    76,     0,
+       0,     0,     0,     0,     0,     0,    19,     0,    20,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   374,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,    77,     0,     0,    78,     0,     0,    79,     0,
       80,   121,    62,    63,    64,    65,    66,    67,    68,    69,
       70,    71,    72,    73,    74,     0,     0,    75,    76,     0,
        0,     0,     0,     0,     0,     0,    19,     0,    20,     0,
-       0,    77,     0,     0,    78,     0,   349,    79,   404,    80,
-       0,    61,    62,    63,    64,    65,    66,    67,    68,    69,
-      70,    71,    72,    73,    74,     0,     0,    75,    76,     0,
-       0,    77,     0,     0,    78,     0,    19,    79,    20,    80,
-     128,    62,    63,    64,    65,    66,    67,    68,    69,    70,
-      71,    72,    73,    74,     0,     0,    75,    76,     0,     0,
-       0,     0,     0,     0,     0,    19,     0,    20,   121,    62,
-      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
-      73,    74,     0,    77,    75,    76,    78,     0,     0,    79,
-       0,    80,     0,    19,     0,    20,     0,   121,   201,   202,
-     203,   204,   205,   206,   207,   208,   209,   210,   211,    73,
-      74,     0,     0,    75,    76,     0,     0,     0,     0,     0,
-       0,     0,    19,    77,    20,     0,    78,     0,     0,    79,
-       0,    80,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    77,     0,     0,    78,     0,     0,    79,     0,
-      80,    75,    76,     0,   287,   288,   289,     0,     0,     0,
-      19,     0,    20,     0,     0,     0,     0,     0,     0,     0,
-      77,     0,     0,    78,     0,     0,    79,     0,    80,     0,
+       0,     0,     0,     0,     0,     0,     0,    77,   417,     0,
+      78,     0,   362,    79,     0,    80,     0,    61,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,     0,     0,    75,    76,    77,     0,     0,    78,     0,
+       0,    79,    19,    80,    20,   128,    62,    63,    64,    65,
+      66,    67,    68,    69,    70,    71,    72,    73,    74,     0,
+       0,    75,    76,     0,     0,     0,     0,     0,     0,     0,
+      19,     0,    20,     0,     0,   121,    62,    63,    64,    65,
+      66,    67,    68,    69,    70,    71,    72,    73,    74,     0,
+       0,    75,    76,     0,     0,    77,     0,     0,    78,     0,
+      19,    79,    20,    80,   121,   214,   215,   216,   217,   218,
+     219,   220,   221,   222,   223,   224,    73,    74,     0,     0,
+      75,    76,     0,     0,     0,     0,     0,     0,     0,    19,
+       0,    20,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    77,     0,     0,    78,     0,     0,    79,     0,    80,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,    77,
+       0,     0,    78,     0,     0,    79,     0,    80,    75,    76,
+       0,   300,   301,   302,     0,     0,     0,    19,     0,    20,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    77,
        0,     0,    78,     0,     0,    79,     0,    80,     0,     0,
-     149,   150,   151,   152,   153,   154,   155,   156,   157,   158,
-     159,   160,   161,   162,   163,   164,   165,   166,     0,     0,
-       0,     0,     0,   234,     0,   235,   173,   174,   175,   176,
-       0,   236,   237,   238,   239,     0,     0,     0,     0,     0,
-     290,     0,     0,   291,     0,   292,     0,     0,   293,   225,
-     226,    75,    76,   227,   228,   229,   230,   231,   232,     0,
-      19,     0,    20,     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,     0,
-       0,     0,     0,   233,     0,     0,   225,   226,     0,     0,
-     227,   228,   229,   230,   231,   232,     0,     0,     0,     0,
-     149,   150,   151,   152,   153,   154,   155,   156,   157,   158,
-     159,   160,   161,   162,   163,   164,   165,   166,     0,     0,
-       0,     0,     0,   234,     0,   235,   173,   174,   175,   176,
-     233,   236,   237,   238,   239,     0,     0,     0,     0,     0,
-       0,     0,     0,   240,     0,     0,     0,   149,   150,   151,
+       0,     0,     0,     0,     0,     0,     0,     0,    77,     0,
+       0,    78,     0,     0,    79,     0,    80,   149,   150,   151,
      152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
-     162,   163,   164,   165,   166,     0,   144,     0,     0,     0,
-     234,     0,   235,   173,   174,   175,   176,   145,   236,   237,
-     238,   239,     0,     0,     0,     0,     0,   146,   147,     0,
-     240,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   148,     0,     0,   149,   150,   151,   152,
-     153,   154,   155,   156,   157,   158,   159,   160,   161,   162,
-     163,   164,   165,   166,   167,   168,   169,     0,     0,   170,
-     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
-     181
+     162,   163,   164,   165,   166,     0,     0,     0,     0,     0,
+     247,     0,   248,   173,   174,   175,   176,     0,   249,   250,
+     251,   181,   182,   183,   184,   185,   186,   187,   188,   189,
+     190,   191,   192,   193,     0,     0,     0,     0,     0,   303,
+       0,     0,   304,     0,   305,     0,     0,   306,   238,   239,
+      75,    76,   240,   241,   242,   243,   244,   245,     0,    19,
+       0,    20,   -54,    19,     0,    20,     0,     0,     0,     6,
+     -54,   -54,     0,     0,     0,     0,     0,   -54,   -54,   -54,
+     -54,   -54,   -54,   -54,     0,   -54,    21,     0,     0,     0,
+       0,     0,   246,    22,     0,     0,     0,    23,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   149,
+     150,   151,   152,   153,   154,   155,   156,   157,   158,   159,
+     160,   161,   162,   163,   164,   165,   166,     0,     0,     0,
+       0,     0,   247,     0,   248,   173,   174,   175,   176,     0,
+     249,   250,   251,   181,   182,   183,   184,   185,   186,   187,
+     188,   189,   190,   191,   192,   193,     0,     0,     0,     0,
+       0,   238,   239,     0,   252,   240,   241,   242,   243,   244,
+     245,     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,     0,     0,     0,
+       0,     0,     0,     0,     0,   246,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   149,   150,   151,   152,   153,   154,   155,   156,
+     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
+       0,     0,     0,     0,     0,   247,     0,   248,   173,   174,
+     175,   176,     0,   249,   250,   251,   181,   182,   183,   184,
+     185,   186,   187,   188,   189,   190,   191,   192,   193,   144,
+       0,     0,     0,     0,     0,     0,     0,   252,     0,     0,
+     145,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     146,   147,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   148,     0,     0,   149,
+     150,   151,   152,   153,   154,   155,   156,   157,   158,   159,
+     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
+       0,     0,   170,   171,   172,   173,   174,   175,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
+     188,   189,   190,   191,   192,   193
 };
 
 static const short int yycheck[] =
 {
-      38,    98,    98,     3,   256,   199,   200,    51,    10,    10,
-      29,    80,   117,    51,    33,    32,   148,   478,    27,   114,
-       0,     4,   216,    28,    61,    30,   129,   122,   131,   132,
-     491,   113,    15,    42,    43,    44,    45,    46,    47,    48,
-     143,    50,    29,    43,     5,     6,     7,     8,     9,    10,
-      11,    12,   452,    37,   186,    57,    57,   126,    96,     5,
-       6,     7,     8,     9,    10,    11,    12,    72,    73,    74,
-      61,    76,    77,    57,   114,   114,   114,   115,   116,   479,
-     120,   120,    82,     3,     4,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,   120,   113,    19,
-      20,   114,   125,    96,   114,   124,   123,   145,    28,    30,
-      30,   124,   215,   116,   124,   114,    52,    53,    54,    45,
-      40,    47,   125,   122,   122,   131,   132,   125,    18,   167,
-     168,   169,   170,   171,   172,    71,    28,   143,    30,   177,
-     178,   179,   180,   181,   182,   183,   184,   185,   217,   218,
-     219,   113,   145,   113,   348,   258,   290,   291,   292,   120,
-      53,    54,    55,   113,   267,   268,   269,    35,    36,    55,
-      56,   423,   113,   425,   120,   118,   169,    99,   100,   172,
-      25,    26,   116,   221,   177,   178,   179,   180,   181,    17,
-      18,    18,   185,    17,    18,   115,    17,    18,   118,    17,
-      18,   121,    18,   123,   309,   310,   311,   312,   313,   314,
-     254,    18,   317,   318,   319,   320,   254,    17,    18,   116,
-     323,    30,    18,     0,    30,    30,   329,   271,   119,   116,
-     119,   114,    18,   271,   272,   273,   305,    59,   341,   342,
-       5,     6,     7,     8,     9,    10,    11,    12,    18,    18,
-      18,    18,   258,   114,    31,    21,   116,    34,    21,    21,
-     117,   267,   268,   269,   369,    42,    43,    44,    45,    46,
-      47,    48,   375,   376,    63,   378,   116,   380,   116,   116,
-     273,   384,   116,   116,   116,    62,   116,   116,   391,   392,
-     393,   116,   118,   331,   332,   333,   334,   335,   336,   114,
-     114,   301,   340,   114,   114,   410,   411,   412,   413,    39,
-     114,   416,   417,   418,   419,   114,   114,   323,    30,   114,
-     114,   359,   114,   329,   114,   428,    64,    65,    66,    67,
-      68,    69,    70,    30,   437,   341,   342,   117,   331,   114,
-     333,   334,   335,   381,    30,    15,    15,   340,    30,    37,
-     114,    18,    39,   114,    18,   452,   452,   460,   118,   397,
-     114,   114,   467,   114,   469,   470,   114,   114,   114,   375,
-     376,   114,   378,   476,   380,   114,   414,   114,   384,   114,
-     114,   114,   479,   479,   422,   391,   392,   393,   116,   114,
-     114,   114,   430,   431,   432,   114,   499,   500,   436,   116,
-      57,   504,    30,   117,   507,   114,   114,   118,   114,    27,
-      28,   114,    30,    18,   114,   117,    34,    35,    36,   114,
-     458,   114,   428,   117,    42,    43,    44,    45,    46,    47,
-      48,   437,    50,    51,   117,    15,   117,   430,   431,   432,
-      58,   117,   117,   117,    62,    57,   117,   120,    39,   114,
-      15,   117,   120,    15,   460,   117,   117,    15,   114,    76,
-      15,   101,   101,   101,   101,   458,    43,    24,   126,    50,
-     476,   215,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,   360,   359,    19,    20,
-      29,     3,    41,   499,   500,    -1,   381,    28,   504,    30,
-     363,   507,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    -1,   436,    19,    20,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    28,    -1,    30,
-       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,    -1,     3,
+      38,    98,    98,   131,   132,     3,   269,    51,    29,   148,
+      32,    80,    33,    51,    10,   143,    96,   212,   213,   465,
+     491,    37,   128,    52,    53,    54,   129,    10,   131,   132,
+     132,   137,     4,   504,   229,   137,   126,    28,     0,    30,
+     143,    57,    71,    15,   134,    43,   492,     5,     6,     7,
+       8,     9,    10,    11,    12,   126,   126,   126,    96,    61,
+     199,    57,   132,   134,    29,   145,     5,     6,     7,     8,
+       9,    10,    11,    12,    57,   125,   114,   115,   116,    61,
+     126,    72,    73,    74,    82,    76,    77,   126,   125,   169,
+     136,   126,   172,   132,   303,   304,   305,   177,   178,   179,
+     180,   136,   134,    30,    45,   137,    47,   145,    53,    54,
+      55,    18,   117,   135,    28,   136,    30,   197,   198,    35,
+      36,    55,    56,    99,   100,   228,    25,    26,   125,   167,
+     168,   169,   170,   171,   172,    17,    18,   125,     0,   177,
+     178,   179,   180,   271,    64,    65,    66,    67,    68,    69,
+      70,   279,   280,   281,    17,    18,   194,   195,   196,   197,
+     198,   230,   231,   232,    17,    18,   361,   130,   271,    31,
+      17,    18,    34,   436,   132,   438,   279,   280,   281,   125,
+      42,    43,    44,    45,    46,    47,    48,    17,    18,   125,
+     128,    18,    30,   132,    18,    18,   234,   128,    18,    30,
+      62,    27,    30,   131,   128,   131,   286,    59,   336,   126,
+      18,    18,    18,    18,   342,    18,    42,    43,    44,    45,
+      46,    47,    48,   267,    50,    21,   354,   355,    21,   267,
+      21,   126,   129,   336,    63,   128,   128,   128,   128,   342,
+     284,   128,   128,   128,   128,   128,   284,   285,   286,   318,
+     128,   354,   355,   126,   126,   126,   126,   126,    39,   126,
+     388,   389,   130,   391,   344,   393,   346,   347,   348,   397,
+     126,   126,   352,    30,    30,   403,   404,   405,   126,   129,
+     126,   126,   126,    30,    15,   388,   389,    15,   391,   126,
+     393,   130,   126,   126,   397,    30,    18,    37,    39,    18,
+     403,   404,   405,   128,   126,   126,   344,   345,   346,   347,
+     348,   126,   126,   441,   352,   353,   314,   322,   323,   324,
+     325,   326,   450,    57,   329,   330,   331,   332,   333,   126,
+     128,   126,   126,    30,   372,    18,   126,   126,   441,   126,
+     126,   126,   126,   126,   126,   473,   126,   450,     5,     6,
+       7,     8,     9,    10,    11,    12,   394,   129,   126,   130,
+     126,   489,   126,   443,   444,   445,   126,   129,   465,   465,
+     473,   126,   410,   126,    15,   129,   381,   129,   129,   129,
+     129,   129,    57,   129,   512,   513,   489,   132,    39,   517,
+     132,   471,   520,   129,   432,   492,   492,   435,    15,   129,
+     129,   126,    15,   126,    15,   443,   444,   445,    76,   512,
+     513,   449,    15,   101,   517,   101,   101,   520,   423,   424,
+     425,   426,   101,   428,   429,   430,   431,   101,    43,    24,
+     373,   126,    50,   471,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    29,   228,
+      19,    20,     3,   372,    41,   449,    -1,   394,   376,    28,
+      -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   480,    -1,   482,   483,     3,
        4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    -1,   115,    19,    20,   118,    -1,    -1,
-     121,    -1,   123,   124,    28,    -1,    30,    -1,    -1,     3,
-       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    -1,   115,    19,    20,   118,    -1,    -1,
-     121,    -1,   123,   124,    28,    -1,    30,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,
-      -1,    -1,   115,    -1,    -1,   118,    -1,    -1,   121,    -1,
-     123,     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,   115,    -1,    -1,   118,    -1,   120,   121,    40,   123,
-      -1,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    -1,    -1,    19,    20,    -1,
-      -1,   115,    -1,    -1,   118,    -1,    28,   121,    30,   123,
-       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,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    -1,   115,    19,    20,   118,    -1,    -1,   121,
-      -1,   123,    -1,    28,    -1,    30,    -1,     3,     4,     5,
+      14,    15,    16,    -1,    -1,    19,    20,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    28,    -1,    30,     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,   115,    30,    -1,   118,    -1,    -1,   121,
-      -1,   123,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    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,   127,    -1,
+      -1,   130,    -1,    -1,   133,    -1,   135,   136,     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,   127,    -1,    40,   130,    -1,    -1,   133,
+      -1,   135,   136,     3,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    -1,    -1,    19,
+      20,   127,    -1,    -1,   130,    -1,    -1,   133,    28,   135,
+      30,     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,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   115,    -1,    -1,   118,    -1,    -1,   121,    -1,
-     123,    19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,
-      28,    -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     115,    -1,    -1,   118,    -1,    -1,   121,    -1,   123,    -1,
+      -1,    -1,   127,    -1,    -1,   130,    -1,    -1,   133,    -1,
+     135,     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,   127,    40,    -1,
+     130,    -1,   132,   133,    -1,   135,    -1,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    -1,    -1,    19,    20,   127,    -1,    -1,   130,    -1,
+      -1,   133,    28,   135,    30,     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,     3,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    -1,
+      -1,    19,    20,    -1,    -1,   127,    -1,    -1,   130,    -1,
+      28,   133,    30,   135,     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,   127,    -1,    -1,   130,    -1,    -1,   133,    -1,   135,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   115,
-      -1,    -1,   118,    -1,    -1,   121,    -1,   123,    -1,    -1,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    94,    95,    -1,    -1,
-      -1,    -1,    -1,   101,    -1,   103,   104,   105,   106,   107,
-      -1,   109,   110,   111,   112,    -1,    -1,    -1,    -1,    -1,
-     118,    -1,    -1,   121,    -1,   123,    -1,    -1,   126,    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,   127,
+      -1,    -1,   130,    -1,    -1,   133,    -1,   135,    19,    20,
+      -1,    22,    23,    24,    -1,    -1,    -1,    28,    -1,    30,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   127,
+      -1,    -1,   130,    -1,    -1,   133,    -1,   135,    -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,    61,    -1,    -1,    17,    18,    -1,    -1,
-      21,    22,    23,    24,    25,    26,    -1,    -1,    -1,    -1,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    94,    95,    -1,    -1,
-      -1,    -1,    -1,   101,    -1,   103,   104,   105,   106,   107,
-      61,   109,   110,   111,   112,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   121,    -1,    -1,    -1,    78,    79,    80,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   127,    -1,
+      -1,   130,    -1,    -1,   133,    -1,   135,    78,    79,    80,
       81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    -1,    38,    -1,    -1,    -1,
-     101,    -1,   103,   104,   105,   106,   107,    49,   109,   110,
-     111,   112,    -1,    -1,    -1,    -1,    -1,    59,    60,    -1,
-     121,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    75,    -1,    -1,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    94,    95,    96,    97,    98,    -1,    -1,   101,
-     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
-     112
+      91,    92,    93,    94,    95,    -1,    -1,    -1,    -1,    -1,
+     101,    -1,   103,   104,   105,   106,   107,    -1,   109,   110,
+     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
+     121,   122,   123,   124,    -1,    -1,    -1,    -1,    -1,   130,
+      -1,    -1,   133,    -1,   135,    -1,    -1,   138,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    -1,    28,
+      -1,    30,    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,    -1,
+      -1,    -1,    61,    58,    -1,    -1,    -1,    62,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,
+      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
+      89,    90,    91,    92,    93,    94,    95,    -1,    -1,    -1,
+      -1,    -1,   101,    -1,   103,   104,   105,   106,   107,    -1,
+     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
+     119,   120,   121,   122,   123,   124,    -1,    -1,    -1,    -1,
+      -1,    17,    18,    -1,   133,    21,    22,    23,    24,    25,
+      26,    -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,    -1,    -1,    61,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
+      -1,    -1,    -1,    -1,    -1,   101,    -1,   103,   104,   105,
+     106,   107,    -1,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,   123,   124,    38,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   133,    -1,    -1,
+      49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      59,    60,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    75,    -1,    -1,    78,
+      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
+      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
+      -1,    -1,   101,   102,   103,   104,   105,   106,   107,   108,
+     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
+     119,   120,   121,   122,   123,   124
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const unsigned char yystos[] =
 {
-       0,   158,   159,   160,     0,    31,    34,    42,    43,    44,
-      45,    46,    47,    48,    62,   139,   173,   175,   177,    28,
-      30,    51,    58,    62,   138,   166,   177,    45,    47,   176,
-      61,    64,    65,    66,    67,    68,    69,    70,   140,   171,
-      29,   183,   184,   185,    52,    53,    54,    71,   163,   113,
-      61,    27,    45,    47,    50,   139,   113,   171,    30,   161,
+       0,   171,   172,   173,     0,    31,    34,    42,    43,    44,
+      45,    46,    47,    48,    62,   152,   186,   188,   190,    28,
+      30,    51,    58,    62,   151,   179,   190,    45,    47,   189,
+      61,    64,    65,    66,    67,    68,    69,    70,   153,   184,
+      29,   196,   197,   198,    52,    53,    54,    71,   176,   125,
+      61,    27,    45,    47,    50,   152,   125,   184,    30,   174,
       18,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    19,    20,   115,   118,   121,
-     123,   128,   147,   148,   149,   150,   151,   166,   180,    32,
-     123,   172,    33,   124,   174,   184,    72,    73,    74,    76,
-      77,   138,   186,   188,   113,   113,   113,   113,   118,   164,
-     161,   147,    35,    36,   157,   157,   157,   157,    18,    18,
-      18,     3,   124,   151,   152,   166,   116,   125,     3,   149,
-     182,     4,    15,     5,     6,     7,     8,     9,    10,    11,
-      12,   134,   135,   136,    38,    49,    59,    60,    75,    78,
+      12,    13,    14,    15,    16,    19,    20,   127,   130,   133,
+     135,   140,   160,   161,   162,   163,   164,   179,   193,    32,
+     135,   185,    33,   136,   187,   197,    72,    73,    74,    76,
+      77,   151,   199,   201,   125,   125,   125,   125,   130,   177,
+     174,   160,    35,    36,   170,   170,   170,   170,    18,    18,
+      18,     3,   136,   164,   165,   179,   128,   137,     3,   162,
+     195,     4,    15,     5,     6,     7,     8,     9,    10,    11,
+      12,   147,   148,   149,    38,    49,    59,    60,    75,    78,
       79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
       89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
      101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   130,   131,   132,   133,   192,   193,   195,   196,
-      30,    55,    56,   162,    18,    30,    30,   165,   149,   149,
-     149,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,   134,   135,   137,   149,   154,   119,   119,   114,
-     124,   116,    40,   152,   153,    17,    18,    21,    22,    23,
-      24,    25,    26,    61,   101,   103,   109,   110,   111,   112,
-     121,   130,   131,   132,   133,   155,   179,   180,   181,   181,
-     181,   181,   182,    59,   140,   149,   149,   182,   149,   149,
-     189,   182,   182,   182,   182,   182,   182,   149,   149,   149,
-     182,   140,    99,   100,   114,   120,   114,   145,   145,   145,
-      25,    26,    17,    18,   129,    18,    21,    22,    23,    24,
-     118,   121,   123,   126,   155,   180,   145,   151,   151,   151,
-      40,   149,   168,   169,   170,   114,   117,    63,   178,   116,
-     116,   116,   116,   116,   116,   154,   156,   116,   116,   116,
-     116,   114,   114,   147,   114,   142,   114,   142,   181,   118,
-     114,   114,   114,   114,   114,   114,    39,   181,   181,   181,
-     114,   147,   149,   182,    30,    37,    57,   143,   146,   120,
-     156,   156,   124,   156,    30,   120,   122,   166,   167,   114,
-     117,    40,    30,   154,   154,   154,   154,   154,   154,   114,
-     122,   154,   154,   154,   154,    15,    15,   181,    10,    57,
-      10,   114,   194,   181,   118,   182,   149,   182,   182,   182,
-     149,   114,   114,   114,   182,   181,   181,   114,    30,    18,
-     145,   120,   122,   124,    40,   168,   143,   144,   114,   194,
-     114,   114,   114,   114,    39,   154,   114,   114,   114,   114,
-     181,   181,   116,   181,    18,   181,   182,   190,   114,   181,
-     114,   114,   114,   181,   181,   181,   116,   149,    57,   141,
-      30,   117,   154,   154,   154,   154,   149,   154,   154,   154,
-     154,   114,   118,   190,   191,   114,   142,   142,   114,   181,
-     114,   182,   182,   182,   191,   181,    18,   114,   117,   114,
-     114,   117,   117,   117,   117,   117,    15,   120,   136,   187,
-     117,   182,   120,   181,   117,   154,   154,   154,   181,   179,
-     120,   136,    39,   120,   117,   117,   117,   114,   179,    15,
-      15,   114,   181,   181,    15,    76,   181,    15,   181
+     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
+     121,   122,   123,   124,   142,   143,   144,   145,   146,   205,
+     206,   208,   209,    30,    55,    56,   175,    18,    30,    30,
+     178,   162,   162,   162,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    14,   147,   148,   150,   162,   167,
+     131,   131,   126,   136,   128,    40,   165,   166,    17,    18,
+      21,    22,    23,    24,    25,    26,    61,   101,   103,   109,
+     110,   111,   133,   142,   143,   144,   145,   146,   168,   192,
+     193,   194,   194,   194,   194,   195,    59,   153,   162,   162,
+     195,   162,   162,   202,   195,   195,   195,   195,   195,   162,
+     162,   162,   195,   195,   153,    99,   100,   126,   132,   126,
+     158,   158,   158,    25,    26,    17,    18,   141,    18,    21,
+      22,    23,    24,   130,   133,   135,   138,   168,   193,   158,
+     164,   164,   164,    40,   162,   181,   182,   183,   126,   129,
+      63,   191,   128,   128,   128,   128,   128,   167,   169,   128,
+     128,   128,   128,   128,   126,   126,   160,   126,   155,   126,
+     155,   194,   130,   126,   126,   126,   126,   126,   126,   194,
+     194,   194,   126,    39,   160,   162,   195,    30,    37,    57,
+     156,   159,   132,   169,   169,   136,   169,    30,   132,   134,
+     179,   180,   126,   129,    40,    30,   167,   167,   167,   167,
+     167,   126,   134,   167,   167,   167,   167,   167,    15,    15,
+     194,    10,    57,    10,   126,   207,   194,   130,   195,   162,
+     195,   195,   195,   126,   126,   126,   195,   162,   194,   194,
+     126,    30,    18,   158,   132,   134,   136,    40,   181,   156,
+     157,   126,   207,   126,   126,   126,   126,   167,   126,   126,
+     126,   126,    39,   194,   194,   128,   194,    18,   194,   195,
+     203,   126,   194,   126,   126,   126,   194,   194,   194,   128,
+     162,    57,   154,    30,   129,   167,   167,   167,   167,   167,
+     167,   167,   167,   162,   126,   130,   203,   204,   126,   155,
+     155,   126,   194,   126,   195,   195,   195,   204,   194,    18,
+     126,   129,   126,   126,   129,   129,   129,   129,   129,    15,
+     132,   149,   200,   129,   195,   132,   194,   129,   167,   167,
+     167,   194,   192,   132,   149,    39,   132,   129,   129,   129,
+     126,   192,    15,    15,   126,   194,   194,    15,    76,   194,
+      15,   194
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -2041,28 +2120,28 @@
   YY_REDUCE_PRINT (yyn);
   switch (yyn)
     {
-        case 40:
-#line 206 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+        case 53:
+#line 210 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " = ";
     (yyval.String) = (yyvsp[-1].String);
   ;}
     break;
 
-  case 41:
-#line 210 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 54:
+#line 214 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = new std::string(""); 
   ;}
     break;
 
-  case 49:
-#line 217 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 62:
+#line 221 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(""); ;}
     break;
 
-  case 56:
-#line 222 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 69:
+#line 226 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     *(yyvsp[-1].String) += *(yyvsp[0].String); 
     delete (yyvsp[0].String);
@@ -2070,28 +2149,28 @@
     ;}
     break;
 
-  case 57:
-#line 227 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 70:
+#line 231 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(""); ;}
     break;
 
-  case 58:
-#line 232 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    { (yyval.String) = new std::string(); ;}
-    break;
-
-  case 59:
-#line 233 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); (yyval.String) = (yyvsp[-1].String); ;}
-    break;
-
-  case 60:
+  case 71:
 #line 236 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 61:
+  case 72:
 #line 237 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+    { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); (yyval.String) = (yyvsp[-1].String); ;}
+    break;
+
+  case 73:
+#line 240 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.String) = new std::string(); ;}
+    break;
+
+  case 74:
+#line 241 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyvsp[-1].String)->insert(0, ", "); 
     *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
@@ -2100,8 +2179,8 @@
   ;}
     break;
 
-  case 62:
-#line 245 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 75:
+#line 249 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -2109,18 +2188,18 @@
   ;}
     break;
 
-  case 63:
-#line 251 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    { (yyval.String) = new std::string(); ;}
-    break;
-
-  case 65:
+  case 76:
 #line 255 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 66:
-#line 256 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 78:
+#line 259 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.String) = new std::string(); ;}
+    break;
+
+  case 79:
+#line 260 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
       (yyvsp[-1].String)->insert(0, ", ");
       if (!(yyvsp[0].String)->empty())
@@ -2130,8 +2209,8 @@
     ;}
     break;
 
-  case 68:
-#line 266 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 81:
+#line 270 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
       *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
       delete (yyvsp[0].String);
@@ -2139,15 +2218,15 @@
     ;}
     break;
 
-  case 88:
-#line 288 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 101:
+#line 292 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
            (yyval.Type).newTy = (yyvsp[0].String); (yyval.Type).oldTy = OpaqueTy;
          ;}
     break;
 
-  case 89:
-#line 294 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 102:
+#line 298 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                   // Type UpReference
     (yyvsp[0].String)->insert(0, "\\");
     (yyval.Type).newTy = (yyvsp[0].String);
@@ -2155,8 +2234,8 @@
   ;}
     break;
 
-  case 90:
-#line 299 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 103:
+#line 303 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {           // Function derived type?
     *(yyvsp[-3].Type).newTy += "( " + *(yyvsp[-1].String) + " )";
     delete (yyvsp[-1].String);
@@ -2165,8 +2244,8 @@
   ;}
     break;
 
-  case 91:
-#line 305 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 104:
+#line 309 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {          // Sized array type?
     (yyvsp[-3].String)->insert(0,"[ ");
     *(yyvsp[-3].String) += " x " + *(yyvsp[-1].Type).newTy + " ]";
@@ -2176,8 +2255,8 @@
   ;}
     break;
 
-  case 92:
-#line 312 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 105:
+#line 316 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {          // Packed array type?
     (yyvsp[-3].String)->insert(0,"< ");
     *(yyvsp[-3].String) += " x " + *(yyvsp[-1].Type).newTy + " >";
@@ -2187,8 +2266,8 @@
   ;}
     break;
 
-  case 93:
-#line 319 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 106:
+#line 323 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                        // Structure type?
     (yyvsp[-1].String)->insert(0, "{ ");
     *(yyvsp[-1].String) += " }";
@@ -2197,16 +2276,16 @@
   ;}
     break;
 
-  case 94:
-#line 325 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 107:
+#line 329 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                                  // Empty structure type?
     (yyval.Type).newTy = new std::string("{ }");
     (yyval.Type).oldTy = StructTy;
   ;}
     break;
 
-  case 95:
-#line 329 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 108:
+#line 333 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                             // Pointer type?
     *(yyvsp[-1].Type).newTy += '*';
     (yyvsp[-1].Type).oldTy = PointerTy;
@@ -2214,15 +2293,15 @@
   ;}
     break;
 
-  case 96:
-#line 339 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 109:
+#line 343 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].Type).newTy;
   ;}
     break;
 
-  case 97:
-#line 342 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 110:
+#line 346 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].Type).newTy;
     delete (yyvsp[0].Type).newTy;
@@ -2230,8 +2309,8 @@
   ;}
     break;
 
-  case 99:
-#line 351 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 112:
+#line 355 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", ...";
     delete (yyvsp[0].String);
@@ -2239,22 +2318,22 @@
   ;}
     break;
 
-  case 100:
-#line 356 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 113:
+#line 360 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].String);
   ;}
     break;
 
-  case 101:
-#line 359 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 114:
+#line 363 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = new std::string();
   ;}
     break;
 
-  case 102:
-#line 369 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 115:
+#line 373 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { // Nonempty unsized arr
     (yyval.Const).type = (yyvsp[-3].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy);
@@ -2263,8 +2342,8 @@
   ;}
     break;
 
-  case 103:
-#line 375 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 116:
+#line 379 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-2].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy);
@@ -2272,8 +2351,8 @@
   ;}
     break;
 
-  case 104:
-#line 380 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 117:
+#line 384 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-2].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy);
@@ -2282,8 +2361,8 @@
   ;}
     break;
 
-  case 105:
-#line 386 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 118:
+#line 390 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { // Nonempty unsized arr
     (yyval.Const).type = (yyvsp[-3].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy);
@@ -2292,8 +2371,8 @@
   ;}
     break;
 
-  case 106:
-#line 392 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 119:
+#line 396 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-3].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy);
@@ -2302,8 +2381,8 @@
   ;}
     break;
 
-  case 107:
-#line 398 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 120:
+#line 402 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-2].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy);
@@ -2311,8 +2390,8 @@
   ;}
     break;
 
-  case 108:
-#line 403 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 121:
+#line 407 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
@@ -2321,8 +2400,8 @@
   ;}
     break;
 
-  case 109:
-#line 409 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 122:
+#line 413 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
@@ -2331,8 +2410,8 @@
   ;}
     break;
 
-  case 110:
-#line 415 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 123:
+#line 419 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
@@ -2341,8 +2420,8 @@
   ;}
     break;
 
-  case 111:
-#line 421 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 124:
+#line 425 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
@@ -2351,8 +2430,8 @@
   ;}
     break;
 
-  case 112:
-#line 427 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 125:
+#line 431 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
@@ -2361,8 +2440,8 @@
   ;}
     break;
 
-  case 113:
-#line 433 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 126:
+#line 437 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {      // integral constants
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
@@ -2371,8 +2450,8 @@
   ;}
     break;
 
-  case 114:
-#line 439 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 127:
+#line 443 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {            // integral constants
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
@@ -2381,8 +2460,8 @@
   ;}
     break;
 
-  case 115:
-#line 445 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 128:
+#line 449 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                      // Boolean constants
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
@@ -2391,8 +2470,8 @@
   ;}
     break;
 
-  case 116:
-#line 451 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 129:
+#line 455 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                     // Boolean constants
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
@@ -2401,8 +2480,8 @@
   ;}
     break;
 
-  case 117:
-#line 457 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 130:
+#line 461 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                   // Float & Double constants
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
@@ -2411,19 +2490,21 @@
   ;}
     break;
 
-  case 118:
-#line 465 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 131:
+#line 469 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     // We must infer the cast opcode from the types of the operands. 
-    const char *opcode = getCastOpcode((yyvsp[-3].Const).type, (yyvsp[-1].Type));
+    const char *opcode = (yyvsp[-5].String)->c_str();
+    if (*(yyvsp[-5].String) == "cast")
+      opcode = getCastOpcode((yyvsp[-3].Const).type, (yyvsp[-1].Type));
     (yyval.String) = new std::string(opcode);
     *(yyval.String) += "(" + *(yyvsp[-3].Const).cnst + " " + *(yyvsp[-2].String) + " " + *(yyvsp[-1].Type).newTy + ")";
     delete (yyvsp[-5].String); (yyvsp[-3].Const).destroy(); delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy();
   ;}
     break;
 
-  case 119:
-#line 472 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 132:
+#line 478 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-4].String) += "(" + *(yyvsp[-2].Const).cnst + " " + *(yyvsp[-1].String) + ")";
     (yyval.String) = (yyvsp[-4].String);
@@ -2432,8 +2513,8 @@
   ;}
     break;
 
-  case 120:
-#line 478 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 133:
+#line 484 "/proj/llvm/llvm-4/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();
@@ -2441,8 +2522,8 @@
   ;}
     break;
 
-  case 121:
-#line 483 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 134:
+#line 489 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
     (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
@@ -2450,8 +2531,8 @@
   ;}
     break;
 
-  case 122:
-#line 488 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 135:
+#line 494 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
     (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
@@ -2459,8 +2540,8 @@
   ;}
     break;
 
-  case 123:
-#line 493 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 136:
+#line 499 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
     (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
@@ -2468,8 +2549,8 @@
   ;}
     break;
 
-  case 124:
-#line 498 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 137:
+#line 504 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     const char* shiftop = (yyvsp[-5].String)->c_str();
     if (*(yyvsp[-5].String) == "shr")
@@ -2480,8 +2561,8 @@
   ;}
     break;
 
-  case 125:
-#line 506 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 138:
+#line 512 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
     (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
@@ -2489,8 +2570,8 @@
   ;}
     break;
 
-  case 126:
-#line 511 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 139:
+#line 517 "/proj/llvm/llvm-4/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();
@@ -2498,8 +2579,8 @@
   ;}
     break;
 
-  case 127:
-#line 516 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 140:
+#line 522 "/proj/llvm/llvm-4/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();
@@ -2507,8 +2588,8 @@
   ;}
     break;
 
-  case 128:
-#line 526 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 141:
+#line 532 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].Const).cnst;
     (yyvsp[0].Const).destroy();
@@ -2516,26 +2597,26 @@
   ;}
     break;
 
-  case 129:
-#line 531 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 142:
+#line 537 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(*(yyvsp[0].Const).cnst); (yyvsp[0].Const).destroy(); ;}
     break;
 
-  case 132:
-#line 546 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 145:
+#line 552 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
 ;}
     break;
 
-  case 133:
-#line 551 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 146:
+#line 557 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = 0;
   ;}
     break;
 
-  case 134:
-#line 554 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 147:
+#line 560 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -2543,24 +2624,24 @@
   ;}
     break;
 
-  case 135:
-#line 559 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 148:
+#line 565 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "module asm " << " " << *(yyvsp[0].String) << "\n";
     (yyval.String) = 0;
   ;}
     break;
 
-  case 136:
-#line 563 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 149:
+#line 569 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "implementation\n";
     (yyval.String) = 0;
   ;}
     break;
 
-  case 138:
-#line 570 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 151:
+#line 576 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[-2].String) << " " << *(yyvsp[-1].String) << " " << *(yyvsp[0].Type).newTy << "\n";
     // delete $2; delete $3; $4.destroy();
@@ -2568,8 +2649,8 @@
   ;}
     break;
 
-  case 139:
-#line 575 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 152:
+#line 581 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {       // Function prototypes can be in const pool
     *O << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -2577,8 +2658,8 @@
   ;}
     break;
 
-  case 140:
-#line 580 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 153:
+#line 586 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {  // Asm blocks can be in the const pool
     *O << *(yyvsp[-2].String) << " " << *(yyvsp[-1].String) << " " << *(yyvsp[0].String) << "\n";
     delete (yyvsp[-2].String); delete (yyvsp[-1].String); delete (yyvsp[0].String); 
@@ -2586,8 +2667,8 @@
   ;}
     break;
 
-  case 141:
-#line 585 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 154:
+#line 591 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[-4].String) << " " << *(yyvsp[-3].String) << " " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Const).cnst << " " 
        << *(yyvsp[0].String) << "\n";
@@ -2596,17 +2677,7 @@
   ;}
     break;
 
-  case 142:
-#line 591 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *O << *(yyvsp[-4].String) << " " << *(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 143:
+  case 155:
 #line 597 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[-4].String) << " " << *(yyvsp[-3].String) << " " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy 
@@ -2616,7 +2687,7 @@
   ;}
     break;
 
-  case 144:
+  case 156:
 #line 603 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[-4].String) << " " << *(yyvsp[-3].String) << " " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy 
@@ -2626,8 +2697,18 @@
   ;}
     break;
 
-  case 145:
+  case 157:
 #line 609 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *O << *(yyvsp[-4].String) << " " << *(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 158:
+#line 615 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     *O << *(yyvsp[-1].String) << " " << *(yyvsp[0].String) << "\n";
     delete (yyvsp[-1].String); delete (yyvsp[0].String);
@@ -2635,8 +2716,8 @@
   ;}
     break;
 
-  case 146:
-#line 614 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 159:
+#line 620 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[-2].String) << " = " << *(yyvsp[0].String) << "\n";
     delete (yyvsp[-2].String); delete (yyvsp[0].String);
@@ -2644,15 +2725,15 @@
   ;}
     break;
 
-  case 147:
-#line 619 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 160:
+#line 625 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyval.String) = 0;
   ;}
     break;
 
-  case 151:
-#line 629 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 164:
+#line 635 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -2660,8 +2741,8 @@
   ;}
     break;
 
-  case 152:
-#line 634 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 165:
+#line 640 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
     if (*(yyvsp[0].String) == "64")
@@ -2671,8 +2752,8 @@
   ;}
     break;
 
-  case 153:
-#line 641 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 166:
+#line 647 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -2680,8 +2761,8 @@
   ;}
     break;
 
-  case 154:
-#line 646 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 167:
+#line 652 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -2689,8 +2770,8 @@
   ;}
     break;
 
-  case 155:
-#line 653 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 168:
+#line 659 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-1].String)->insert(0, "[ ");
     *(yyvsp[-1].String) += " ]";
@@ -2698,8 +2779,8 @@
   ;}
     break;
 
-  case 156:
-#line 660 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 169:
+#line 666 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -2707,20 +2788,20 @@
   ;}
     break;
 
-  case 158:
-#line 666 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 171:
+#line 672 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = new std::string();
   ;}
     break;
 
-  case 162:
-#line 675 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 175:
+#line 681 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 163:
-#line 677 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 176:
+#line 683 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
   (yyval.String) = (yyvsp[-1].Type).newTy;
   if (!(yyvsp[0].String)->empty())
@@ -2729,30 +2810,30 @@
 ;}
     break;
 
-  case 164:
-#line 684 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 177:
+#line 690 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
   ;}
     break;
 
-  case 165:
-#line 688 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 178:
+#line 694 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].String);
   ;}
     break;
 
-  case 166:
-#line 692 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 179:
+#line 698 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].String);
   ;}
     break;
 
-  case 167:
-#line 695 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 180:
+#line 701 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", ...";
     (yyval.String) = (yyvsp[-2].String);
@@ -2760,20 +2841,20 @@
   ;}
     break;
 
-  case 168:
-#line 700 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 181:
+#line 706 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].String);
   ;}
     break;
 
-  case 169:
-#line 703 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 182:
+#line 709 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 170:
-#line 706 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 183:
+#line 712 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-7].String)->empty()) {
       *(yyvsp[-7].String) += " ";
@@ -2794,22 +2875,22 @@
   ;}
     break;
 
-  case 171:
-#line 725 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 184:
+#line 731 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = new std::string("begin");
   ;}
     break;
 
-  case 172:
-#line 728 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 185:
+#line 734 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyval.String) = new std::string ("{");
   ;}
     break;
 
-  case 173:
-#line 732 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 186:
+#line 738 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
   if (!(yyvsp[-2].String)->empty()) {
     *O << *(yyvsp[-2].String) << " ";
@@ -2820,18 +2901,18 @@
 ;}
     break;
 
-  case 174:
-#line 741 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 187:
+#line 747 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string("end"); ;}
     break;
 
-  case 175:
-#line 742 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 188:
+#line 748 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string("}"); ;}
     break;
 
-  case 176:
-#line 744 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 189:
+#line 750 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
   if ((yyvsp[-1].String))
     *O << *(yyvsp[-1].String);
@@ -2840,13 +2921,13 @@
 ;}
     break;
 
-  case 177:
-#line 752 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 190:
+#line 758 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 180:
-#line 758 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 193:
+#line 764 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     if (!(yyvsp[-1].String)->empty())
       *(yyvsp[-2].String) += " " + *(yyvsp[-1].String);
@@ -2857,13 +2938,13 @@
   ;}
     break;
 
-  case 181:
-#line 771 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 194:
+#line 777 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 191:
-#line 777 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 204:
+#line 783 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyvsp[-1].String)->insert(0, "<");
     *(yyvsp[-1].String) += ">";
@@ -2871,8 +2952,8 @@
   ;}
     break;
 
-  case 193:
-#line 783 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 206:
+#line 789 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-3].String)->empty()) {
       *(yyvsp[-4].String) += " " + *(yyvsp[-3].String);
@@ -2883,8 +2964,8 @@
   ;}
     break;
 
-  case 198:
-#line 801 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 211:
+#line 807 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Value).type = (yyvsp[-1].Type);
     (yyval.Value).val = new std::string(*(yyvsp[-1].Type).newTy + " ");
@@ -2893,29 +2974,29 @@
   ;}
     break;
 
-  case 199:
-#line 808 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 212:
+#line 814 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = 0;
   ;}
     break;
 
-  case 200:
-#line 811 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 213:
+#line 817 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { // Do not allow functions with 0 basic blocks   
     (yyval.String) = 0;
   ;}
     break;
 
-  case 201:
-#line 819 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 214:
+#line 825 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = 0;
   ;}
     break;
 
-  case 202:
-#line 823 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 215:
+#line 829 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "    " << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -2923,15 +3004,15 @@
   ;}
     break;
 
-  case 203:
-#line 828 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 216:
+#line 834 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = 0;
   ;}
     break;
 
-  case 204:
-#line 831 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 217:
+#line 837 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -2939,8 +3020,8 @@
   ;}
     break;
 
-  case 205:
-#line 837 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 218:
+#line 843 "/proj/llvm/llvm-4/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();
@@ -2948,8 +3029,8 @@
   ;}
     break;
 
-  case 206:
-#line 842 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 219:
+#line 848 "/proj/llvm/llvm-4/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();
@@ -2957,8 +3038,8 @@
   ;}
     break;
 
-  case 207:
-#line 847 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 220:
+#line 853 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                         // Unconditional Branch...
     *O << "    " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy << " " << *(yyvsp[0].String) << "\n";
     delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
@@ -2966,8 +3047,8 @@
   ;}
     break;
 
-  case 208:
-#line 852 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 221:
+#line 858 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {  
     *O << "    " << *(yyvsp[-8].String) << " " << *(yyvsp[-7].Type).newTy << " " << *(yyvsp[-6].String) << ", " 
        << *(yyvsp[-4].Type).newTy << " " << *(yyvsp[-3].String) << ", " << *(yyvsp[-1].Type).newTy << " " << *(yyvsp[0].String) << "\n";
@@ -2977,8 +3058,8 @@
   ;}
     break;
 
-  case 209:
-#line 859 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 222:
+#line 865 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "    " << *(yyvsp[-8].String) << " " << *(yyvsp[-7].Type).newTy << " " << *(yyvsp[-6].String) << ", " << *(yyvsp[-4].Type).newTy 
        << " " << *(yyvsp[-3].String) << " [" << *(yyvsp[-1].String) << " ]\n";
@@ -2987,8 +3068,8 @@
   ;}
     break;
 
-  case 210:
-#line 865 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 223:
+#line 871 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "    " << *(yyvsp[-7].String) << " " << *(yyvsp[-6].Type).newTy << " " << *(yyvsp[-5].String) << ", " 
        << *(yyvsp[-3].Type).newTy << " " << *(yyvsp[-2].String) << "[]\n";
@@ -2997,8 +3078,8 @@
   ;}
     break;
 
-  case 211:
-#line 872 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 224:
+#line 878 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "    ";
     if (!(yyvsp[-13].String)->empty())
@@ -3013,8 +3094,8 @@
   ;}
     break;
 
-  case 212:
-#line 884 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 225:
+#line 890 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "    " << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -3022,26 +3103,26 @@
   ;}
     break;
 
-  case 213:
-#line 889 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *O << "    " << *(yyvsp[0].String) << "\n";
-    delete (yyvsp[0].String);
-    (yyval.String) = 0;
-  ;}
-    break;
-
-  case 214:
+  case 226:
 #line 895 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
+    *O << "    " << *(yyvsp[0].String) << "\n";
+    delete (yyvsp[0].String);
+    (yyval.String) = 0;
+  ;}
+    break;
+
+  case 227:
+#line 901 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+    {
     *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + " " + *(yyvsp[-3].String) + ", " + *(yyvsp[-1].Type).newTy + " " + *(yyvsp[0].String);
     (yyvsp[-4].Type).destroy(); delete (yyvsp[-3].String); (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
     (yyval.String) = (yyvsp[-5].String);
   ;}
     break;
 
-  case 215:
-#line 900 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 228:
+#line 906 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-3].String)->insert(0, *(yyvsp[-4].Type).newTy + " " );
     *(yyvsp[-3].String) += ", " + *(yyvsp[-1].Type).newTy + " " + *(yyvsp[0].String);
@@ -3050,8 +3131,8 @@
   ;}
     break;
 
-  case 216:
-#line 908 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 229:
+#line 914 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -3059,8 +3140,8 @@
   ;}
     break;
 
-  case 217:
-#line 915 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 230:
+#line 921 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {    // Used for PHI nodes
     (yyvsp[-3].String)->insert(0, *(yyvsp[-5].Type).newTy + "[");
     *(yyvsp[-3].String) += "," + *(yyvsp[-1].String) + "]";
@@ -3069,8 +3150,8 @@
   ;}
     break;
 
-  case 218:
-#line 921 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 231:
+#line 927 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-6].String) += ", [" + *(yyvsp[-3].String) + "," + *(yyvsp[-1].String) + "]";
     delete (yyvsp[-3].String); delete (yyvsp[-1].String);
@@ -3078,13 +3159,13 @@
   ;}
     break;
 
-  case 219:
-#line 929 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 232:
+#line 935 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(*(yyvsp[0].Value).val); (yyvsp[0].Value).destroy(); ;}
     break;
 
-  case 220:
-#line 930 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 233:
+#line 936 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].Value).val;
     (yyvsp[0].Value).destroy();
@@ -3092,13 +3173,13 @@
   ;}
     break;
 
-  case 222:
-#line 939 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 235:
+#line 945 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 223:
-#line 943 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 236:
+#line 949 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -3106,8 +3187,8 @@
   ;}
     break;
 
-  case 225:
-#line 951 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 238:
+#line 957 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-4].String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].String) + ", " + *(yyvsp[0].String);
     (yyvsp[-3].Type).destroy(); delete (yyvsp[-2].String); delete (yyvsp[0].String);
@@ -3115,8 +3196,8 @@
   ;}
     break;
 
-  case 226:
-#line 956 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 239:
+#line 962 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-4].String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].String) + ", " + *(yyvsp[0].String);
     (yyvsp[-3].Type).destroy(); delete (yyvsp[-2].String); delete (yyvsp[0].String);
@@ -3124,8 +3205,8 @@
   ;}
     break;
 
-  case 227:
-#line 961 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 240:
+#line 967 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-4].String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].String) + ", " + *(yyvsp[0].String);
     (yyvsp[-3].Type).destroy(); delete (yyvsp[-2].String); delete (yyvsp[0].String);
@@ -3133,8 +3214,8 @@
   ;}
     break;
 
-  case 228:
-#line 966 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 241:
+#line 972 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val;
     (yyvsp[0].Value).destroy();
@@ -3142,8 +3223,8 @@
   ;}
     break;
 
-  case 229:
-#line 971 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 242:
+#line 977 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     const char* shiftop = (yyvsp[-3].String)->c_str();
     if (*(yyvsp[-3].String) == "shr")
@@ -3154,10 +3235,12 @@
   ;}
     break;
 
-  case 230:
-#line 979 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 243:
+#line 985 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
-    const char *opcode = getCastOpcode((yyvsp[-2].Value).type, (yyvsp[0].Type));
+    const char *opcode = (yyvsp[-3].String)->c_str();
+    if (*(yyvsp[-3].String) == "cast")
+      opcode = getCastOpcode((yyvsp[-2].Value).type, (yyvsp[0].Type));
     (yyval.String) = new std::string(opcode);
     *(yyval.String) += *(yyvsp[-2].Value).val + " " + *(yyvsp[-1].String) + " " + *(yyvsp[0].Type).newTy; 
     delete (yyvsp[-3].String); (yyvsp[-2].Value).destroy();
@@ -3165,8 +3248,8 @@
   ;}
     break;
 
-  case 231:
-#line 986 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 244:
+#line 994 "/proj/llvm/llvm-4/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();
@@ -3174,8 +3257,8 @@
   ;}
     break;
 
-  case 232:
-#line 991 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 245:
+#line 999 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Type).newTy;
     (yyvsp[-2].Value).destroy(); (yyvsp[0].Type).destroy();
@@ -3183,8 +3266,8 @@
   ;}
     break;
 
-  case 233:
-#line 996 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 246:
+#line 1004 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
     (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
@@ -3192,8 +3275,8 @@
   ;}
     break;
 
-  case 234:
-#line 1001 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 247:
+#line 1009 "/proj/llvm/llvm-4/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();
@@ -3201,8 +3284,8 @@
   ;}
     break;
 
-  case 235:
-#line 1006 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 248:
+#line 1014 "/proj/llvm/llvm-4/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();
@@ -3210,8 +3293,8 @@
   ;}
     break;
 
-  case 236:
-#line 1011 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 249:
+#line 1019 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -3219,8 +3302,8 @@
   ;}
     break;
 
-  case 237:
-#line 1016 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 250:
+#line 1024 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-5].String)->empty())
       *(yyvsp[-6].String) += " " + *(yyvsp[-5].String);
@@ -3232,26 +3315,26 @@
   ;}
     break;
 
-  case 239:
-#line 1030 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 252:
+#line 1038 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyvsp[0].String)->insert(0, ", ");
     (yyval.String) = (yyvsp[0].String);
   ;}
     break;
 
-  case 240:
-#line 1034 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 253:
+#line 1042 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {  (yyval.String) = new std::string(); ;}
     break;
 
-  case 242:
-#line 1039 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 255:
+#line 1047 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 243:
-#line 1042 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 256:
+#line 1050 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy;
     if (!(yyvsp[0].String)->empty())
@@ -3261,8 +3344,8 @@
   ;}
     break;
 
-  case 244:
-#line 1049 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 257:
+#line 1057 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + ", " + *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].String);
     if (!(yyvsp[0].String)->empty())
@@ -3272,8 +3355,8 @@
   ;}
     break;
 
-  case 245:
-#line 1056 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 258:
+#line 1064 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy;
     if (!(yyvsp[0].String)->empty())
@@ -3283,8 +3366,8 @@
   ;}
     break;
 
-  case 246:
-#line 1063 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 259:
+#line 1071 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + ", " + *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].String);
     if (!(yyvsp[0].String)->empty())
@@ -3294,8 +3377,8 @@
   ;}
     break;
 
-  case 247:
-#line 1070 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 260:
+#line 1078 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val;
     (yyvsp[0].Value).destroy();
@@ -3303,8 +3386,8 @@
   ;}
     break;
 
-  case 248:
-#line 1075 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 261:
+#line 1083 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-3].String)->empty())
       *(yyvsp[-3].String) += " ";
@@ -3314,8 +3397,8 @@
   ;}
     break;
 
-  case 249:
-#line 1082 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 262:
+#line 1090 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-5].String)->empty())
       *(yyvsp[-5].String) += " ";
@@ -3325,8 +3408,8 @@
   ;}
     break;
 
-  case 250:
-#line 1089 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 263:
+#line 1097 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-3].String) += *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].String) + " " + *(yyvsp[0].String);
     (yyvsp[-2].Type).destroy(); delete (yyvsp[-1].String); delete (yyvsp[0].String);
@@ -3339,7 +3422,7 @@
     }
 
 /* Line 1126 of yacc.c.  */
-#line 3343 "UpgradeParser.tab.c"
+#line 3426 "UpgradeParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -3607,7 +3690,7 @@
 }
 
 
-#line 1095 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1103 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
 
 
 int yyerror(const char *ErrorMsg) {