Allow the new cast instructions.

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

10 files changed, 3146 insertions, 2706 deletions

diff --git a/tools/llvm-upgrade/UpgradeLexer.cpp b/tools/llvm-upgrade/UpgradeLexer.cpp
index de1ffbf..b35c029 100644
--- a/tools/llvm-upgrade/UpgradeLexer.cpp
+++ b/tools/llvm-upgrade/UpgradeLexer.cpp
@@ -317,35 +317,36 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
 	*yy_cp = '\0'; \
 	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 118
-#define YY_END_OF_BUFFER 119
-static yyconst short int yy_acclist[196] =
+#define YY_NUM_RULES 130
+#define YY_END_OF_BUFFER 131
+static yyconst short int yy_acclist[208] =
     {   0,
-      119,  117,  118,  116,  117,  118,  116,  118,  117,  118,
-      117,  118,  117,  118,  117,  118,  117,  118,  117,  118,
-      109,  117,  118,  109,  117,  118,    1,  117,  118,  117,
-      118,  117,  118,  117,  118,  117,  118,  117,  118,  117,
-      118,  117,  118,  117,  118,  117,  118,  117,  118,  117,
-      118,  117,  118,  117,  118,  117,  118,  117,  118,  117,
-      118,  117,  118,  117,  118,  117,  118,  117,  118,  117,
-      118,  108,  106,  105,  105,  112,  110,  114,  109,    1,
-       90,   38,   72,   22,  108,  105,  105,  113,  114,   19,
-      114,  115,   60,   71,   36,   31,   39,   63,    3,   51,
-
-       62,   80,   67,   89,   84,   85,   61,   73,  107,  114,
-      114,   86,   46,   81,   82,   66,   98,   70,   99,   53,
-       87,   21,  111,   65,   69,   23,    4,   59,   64,   52,
-       68,   45,   11,  114,   33,    2,    5,   55,   57,   47,
-       75,   79,   77,   78,   76,   74,   49,  100,   48,   54,
-       20,   97,   42,   56,   27,   94,   41,    7,   92,   30,
-       96,   35,   58,   83,   91,   24,   25,   93,   50,   88,
-       40,    6,   26,   34,    8,   16,    9,   10,   32,   12,
-       14,   13,   29,   37,   15,   28,   95,  101,  103,  104,
-       43,  102,   17,   44,   18
-
+      131,  129,  130,  128,  129,  130,  128,  130,  129,  130,
+      129,  130,  129,  130,  129,  130,  129,  130,  129,  130,
+      121,  129,  130,  121,  129,  130,    1,  129,  130,  129,
+      130,  129,  130,  129,  130,  129,  130,  129,  130,  129,
+      130,  129,  130,  129,  130,  129,  130,  129,  130,  129,
+      130,  129,  130,  129,  130,  129,  130,  129,  130,  129,
+      130,  129,  130,  129,  130,  129,  130,  129,  130,  129,
+      130,  120,  118,  117,  117,  124,  122,  126,  121,    1,
+      102,   38,   72,   22,  120,  117,  117,  125,  126,   19,
+      126,  127,   60,   71,   36,   31,   39,   63,    3,   51,
+
+       62,   80,   67,  101,   96,   97,   61,   73,  119,  126,
+      126,   98,   46,   81,   82,   66,  110,   70,  111,   53,
+       99,   21,  123,   65,   85,   69,   23,    4,   59,   64,
+       52,   68,   45,   11,   84,  126,   33,    2,    5,   55,
+       87,   57,   47,   75,   79,   77,   78,   76,   74,   49,
+      112,   83,   48,   54,   20,  109,   42,   56,   27,  106,
+       41,   89,   88,    7,  104,   30,  108,   35,   58,   95,
+       91,  103,   24,   25,   90,  105,   50,  100,   94,   40,
+        6,   26,   86,   34,    8,   16,    9,   93,   10,   92,
+       32,   12,   14,   13,   29,   37,   15,   28,  107,  113,
+
+      115,  116,   43,  114,   17,   44,   18
     } ;
 
-static yyconst short int yy_accept[512] =
+static yyconst short int yy_accept[557] =
     {   0,
         1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
        17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
@@ -355,55 +356,59 @@ static yyconst short int yy_accept[512] =
        81,   81,   81,   81,   81,   81,   81,   81,   81,   82,
        82,   83,   83,   83,   83,   83,   83,   83,   83,   83,
        83,   83,   83,   83,   83,   83,   83,   83,   83,   83,
-       83,   83,   83,   83,   83,   83,   83,   83,   84,   84,
+       83,   83,   83,   83,   83,   83,   83,   83,   83,   84,
        84,   84,   84,   84,   84,   84,   84,   84,   84,   84,
 
-       84,   84,   84,   85,   85,   85,   85,   85,   85,   85,
-       85,   85,   85,   85,   85,   85,   85,   85,   85,   86,
-       87,   89,   90,   91,   92,   92,   93,   94,   94,   94,
-       95,   95,   95,   96,   96,   97,   97,   97,   97,   98,
-       98,   98,   98,   98,   98,   98,   99,   99,   99,  100,
-      100,  100,  100,  100,  100,  100,  100,  100,  100,  100,
-      100,  101,  101,  101,  101,  101,  101,  101,  101,  101,
-      101,  102,  102,  102,  103,  103,  104,  105,  105,  105,
-      105,  105,  105,  105,  106,  106,  107,  107,  107,  107,
-      107,  108,  108,  108,  108,  108,  108,  108,  108,  108,
+       84,   84,   84,   84,   84,   85,   85,   85,   85,   85,
+       85,   85,   85,   85,   85,   85,   85,   85,   85,   85,
+       85,   86,   87,   89,   90,   91,   92,   92,   93,   94,
+       94,   94,   95,   95,   95,   96,   96,   97,   97,   97,
+       97,   97,   98,   98,   98,   98,   98,   98,   98,   99,
+       99,   99,  100,  100,  100,  100,  100,  100,  100,  100,
+      100,  100,  100,  100,  100,  100,  101,  101,  101,  101,
+      101,  101,  101,  101,  101,  101,  102,  102,  102,  103,
+      103,  103,  104,  105,  105,  105,  105,  105,  105,  105,
+      105,  106,  106,  107,  107,  107,  107,  107,  107,  108,
 
       108,  108,  108,  108,  108,  108,  108,  108,  108,  108,
-      108,  108,  109,  109,  110,  111,  111,  111,  111,  112,
-      112,  112,  112,  113,  113,  114,  115,  116,  116,  116,
+      108,  108,  108,  108,  108,  108,  108,  108,  108,  108,
+      108,  109,  109,  109,  110,  111,  111,  111,  111,  112,
+      112,  112,  112,  113,  113,  113,  114,  115,  116,  116,
       116,  116,  116,  116,  116,  116,  116,  116,  116,  116,
-      116,  116,  116,  117,  117,  118,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  120,  121,  122,  122,
-      122,  123,  123,  123,  124,  124,  125,  125,  125,  125,
-      125,  125,  125,  125,  125,  125,  126,  126,  126,  127,
-      127,  127,  128,  129,  129,  130,  131,  131,  131,  131,
-      131,  132,  132,  132,  133,  133,  134,  134,  134,  135,
-
-      136,  136,  136,  137,  137,  137,  137,  137,  137,  137,
-      137,  137,  137,  137,  137,  137,  137,  138,  138,  139,
-      139,  139,  139,  139,  139,  139,  140,  140,  140,  140,
-      140,  140,  140,  141,  141,  141,  142,  143,  144,  145,
-      146,  147,  148,  148,  148,  149,  149,  149,  149,  150,
-      151,  152,  152,  152,  152,  152,  152,  152,  152,  152,
-      153,  153,  154,  154,  154,  154,  154,  154,  154,  154,
-      155,  156,  157,  157,  157,  158,  158,  159,  159,  159,
-      159,  160,  160,  161,  162,  163,  164,  164,  164,  165,
-      165,  165,  166,  167,  168,  168,  169,  170,  171,  171,
-
-      171,  171,  171,  171,  171,  172,  172,  173,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      175,  175,  175,  175,  175,  175,  175,  175,  175,  176,
-      176,  176,  176,  176,  177,  177,  177,  177,  177,  178,
-      179,  179,  179,  179,  179,  180,  180,  180,  180,  181,
-      181,  182,  183,  183,  183,  183,  183,  183,  183,  183,
-      183,  183,  183,  183,  183,  184,  184,  184,  184,  184,
-      184,  184,  184,  185,  185,  185,  185,  185,  186,  186,
-      186,  186,  186,  187,  187,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  189,  189,
-
-      190,  191,  191,  192,  192,  193,  194,  195,  195,  196,
-      196
+      116,  116,  116,  116,  117,  117,  117,  117,  117,  118,
+      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
+      119,  120,  121,  122,  122,  122,  123,  123,  123,  123,
+      124,  124,  125,  125,  125,  125,  125,  125,  125,  126,
+      126,  126,  126,  126,  127,  127,  127,  128,  128,  128,
+
+      129,  129,  130,  130,  131,  132,  132,  132,  132,  132,
+      132,  133,  133,  133,  134,  134,  135,  135,  135,  136,
+      137,  138,  138,  138,  139,  139,  139,  139,  139,  139,
+      139,  139,  139,  139,  139,  139,  139,  139,  139,  140,
+      140,  141,  142,  142,  142,  142,  142,  142,  142,  142,
+      142,  142,  142,  143,  143,  143,  143,  143,  143,  143,
+      143,  144,  144,  144,  145,  146,  147,  148,  149,  150,
+      151,  151,  151,  151,  152,  152,  152,  152,  153,  154,
+      154,  155,  156,  156,  156,  156,  156,  156,  156,  156,
+      156,  157,  157,  157,  158,  158,  158,  158,  158,  158,
+
+      158,  158,  159,  160,  161,  161,  161,  162,  163,  164,
+      164,  164,  165,  165,  165,  165,  165,  166,  166,  167,
+      168,  169,  170,  170,  170,  170,  171,  171,  171,  172,
+      173,  174,  175,  176,  176,  177,  178,  179,  179,  179,
+      179,  179,  179,  180,  180,  181,  181,  182,  183,  183,
+      183,  183,  183,  183,  184,  184,  184,  184,  184,  184,
+      184,  184,  184,  185,  185,  185,  185,  185,  185,  185,
+      185,  185,  186,  186,  186,  186,  186,  187,  187,  187,
+      187,  187,  188,  189,  190,  190,  191,  191,  191,  191,
+      192,  192,  192,  192,  193,  193,  194,  195,  195,  195,
+
+      195,  195,  195,  195,  195,  195,  195,  195,  195,  195,
+      196,  196,  196,  196,  196,  196,  196,  196,  197,  197,
+      197,  197,  197,  198,  198,  198,  198,  198,  199,  199,
+      200,  200,  200,  200,  200,  200,  200,  200,  200,  200,
+      200,  200,  200,  201,  201,  202,  203,  203,  204,  204,
+      205,  206,  207,  207,  208,  208
     } ;
 
 static yyconst int yy_ec[256] =
@@ -447,129 +452,137 @@ static yyconst int yy_meta[44] =
         3,    3,    3
     } ;
 
-static yyconst short int yy_base[516] =
+static yyconst short int yy_base[561] =
     {   0,
-        0,    0, 1110, 1111, 1111, 1111, 1105, 1094,   36,   40,
+        0,    0, 1200, 1201, 1201, 1201, 1195, 1184,   36,   40,
        44,   50,   56,   62,    0,   63,   66,   81,   89,   47,
       100,   97,   76,   96,  111,   46,   48,  110,   68,  140,
-      126,  171,  119,  123,   73,  125, 1103, 1111, 1092, 1111,
+      126,  171,  120,  123,   73,  130, 1193, 1201, 1182, 1201,
         0,  159,  176,  199,  204,   95,  209,  224,  229,    0,
-      130,  165,  133,  120,  169,  151,  159,   31, 1091,  168,
-      143,  230,  189,  191,  233,  117,  145,  187,  241,  243,
-      242,  246,  244,  251,  248,  254,  255,  253,  176,  256,
-      263,  258,  267,  261,  277,  281,  283, 1090,  284,  285,
-      286,  287,  265,  290,  300,  295,  291,  308,  294,  305,
-
-      318,  320, 1089,  321,  306,  301,  322,  326,  324,  328,
-      330,  332,  213,  337,  346,  340,  327,  347, 1088,    0,
-      359,  363, 1087,  377,  394,    0, 1086,  353,  363, 1085,
-      369,  379, 1084,  370, 1083,  289,  367,  384, 1082,  389,
-      395,  396,  398,  399,  401, 1081,  402,  365,  406,  404,
-      409,  410,  385,  412,  420,  422,  424,  421,  426,  434,
-      435,  428,  436,  113,  429,  439,  440,  442,  449,  448,
-     1080,  450,  453, 1079,  454, 1078, 1077,  478,  455,  457,
-      456,  458,  489, 1076,  469, 1075,  460,  459,  491,  492,
-     1074,  493,  494,  497,  495,  496,  501,  499,  502,  503,
-
-      511,  512,  515,  517,  518,  519,  461,  523,  520,  529,
-      532, 1073,  533, 1111,  543,  551,  557,  561,  566,  567,
-      568,  569, 1072,  570, 1071, 1070, 1069,  571,  572,  573,
-      574,  576,  577,  579,  582,  585,  583,  580,  591,  592,
-      593,  594, 1068,  603, 1067, 1066,  604,  605,  607,  608,
-      609,  611,  613,  614,  618, 1065, 1064, 1063,  617,  621,
-     1062,  615,  620,    0,  622, 1061,  624,  627,  638,  640,
-      641,  642,  623,  644,  647, 1060,  648,  645, 1059,  653,
-      655, 1058, 1057,  659, 1056, 1055,  660,  665,  661,  667,
-     1054,  669,  672, 1053,  673, 1052,  676,  674,  681, 1051,
-
-      683,  681, 1050,  685,  694,  695,  700,  682,  691,  701,
-      704,  706,  707,  708,  709,  710, 1049,  711, 1048,  712,
-      713,  714,  716,  719,  725, 1047,  727,  729,  733,  732,
-      737,  742, 1046,  735,  722, 1045, 1044, 1043, 1042, 1041,
-     1040, 1039,  743,  747, 1038,  748,  749,  750, 1037, 1036,
-     1035,  754,  755,  752,  756,  764,  765,  762,  766, 1034,
-      768, 1033,  769,  771,  773,  779,  774,  776,  780, 1032,
-     1031, 1030,  787,  782, 1029,  784, 1028,  790,  793,  803,
-     1027,  797, 1026, 1025, 1024, 1023,  789,  795, 1022,  806,
-      807, 1021, 1020, 1019,  809, 1018, 1017, 1016,  811,  813,
-
-      814,  816,  819,  818, 1015,  820, 1014, 1013,  823,  824,
-      825,  827,  828,  830,  831,  832,  834,  843,  833, 1012,
-      840,  850,  853,  854,  846,  857,  856,  860, 1011,  861,
-      866,  867,  868, 1010,  872,  874,  870,  873, 1007,  997,
-      862,  883,  881,  878,  996,  894,  895,  886,  995,  880,
-      994,  992,  897,  896,  898,  904,  906,  907,  908,  910,
-      911,  912,  913,  914,  991,  916,  918,  920,  923,  929,
-      931,  924,  989,  932,  927,  935,  937,  988,  944,  925,
-      943,  945,  987,  949,  986,  951,  954,  955,  957,  958,
-      959,  960,  963,  964,  965,  969,  970,  981,  973,  980,
-
-      876,  975,  538,  976,  535,  462,  423,  978,  216, 1111,
-     1013, 1015,  226, 1019,   76
+      134,  165,  137,  124,  169,  151,  159,   31, 1181,  168,
+      210,  230,  233,  127,  241,  189,  176,  117,  242,  244,
+      240,  243,  246,  249,  252,  253,  257,  259,  263,  265,
+      266,  274,  268,  269,  273,  277,  282,  211, 1180,  287,
+      290,  293,  294,  160,  270,  295,  304,  305,  299,  306,
+
+      312,  296,  321,  324, 1179,  325,  309,  313,  333,  335,
+      318,  339,  342,  332,  350,  340,  343,  215,  356,  357,
+     1178,    0,  365,  370, 1177,  389,  406,    0, 1176,  359,
+      372, 1175,  371,  374, 1174,  381, 1173,  375,  301,  376,
+      393, 1172,  401,  396,  408,  407,  410,  411, 1171,  414,
+      413,  415,  420,  421,  422,  424,  431,  432,  433,  434,
+      441,  436,  440,  438,  439,  449,  443,  454,  383,  451,
+      459,  462,  464,  465,  466, 1170,  468,  469, 1169,  470,
+      471, 1168, 1167,  499,  476,  475,  488,  477,  503,  492,
+     1166,  510, 1165,  481,  484,  516,  513,  517, 1164,  519,
+
+      521,  522,  524,  523,  526,  525,  527,  528,  537,  530,
+      541,  544,  545,  546,  539,  549,  556,  560,  559,  478,
+     1163,  561,  563, 1201,  571,  591,  579,  595,  600,  566,
+      601,  602, 1162,  603,  604, 1161, 1160, 1159,  605,  606,
+      607,  610,  611,  613,  614,  615,  617,  618,  621,  622,
+      628,  572,  627, 1158,  624,  635,  637,  636, 1157, 1156,
+      638,  639,  642,  645,  646,  650,  648,  649,  652,  654,
+     1155, 1154, 1153,  655,  656, 1152,  657,  663,  665,    0,
+      675, 1151,  672,  680,  674,  679,  682,  689, 1150,  676,
+      690,  692,  693, 1149,  695,  706, 1148,  707,  696, 1147,
+
+      708, 1146,  709, 1145, 1144,  710,  571,  712,  714,  717,
+     1143,  721,  723, 1142,  724, 1141,  726,  725, 1140,  731,
+     1139,  732,  731, 1138,  733,  743,  735,  745,  741,  749,
+      751,  678,  753,  754,  756,  758,  759,  760, 1137,  761,
+     1136, 1135,  762,  764,  765,  769,  771,  774,  766,  779,
+      780,  783, 1134,  784,  785,  788,  791,  793,  797,  798,
+     1133,  787,  803, 1132, 1131, 1130, 1129, 1128, 1127, 1126,
+      804,  807,  808, 1125,  809,  810,  813, 1124, 1123,  812,
+     1122, 1121,  816,  820,  814,  818,  825,  830,  824,  815,
+     1120,  836,  834, 1119,  839,  841,  840,  842,  843,  844,
+
+      845, 1118, 1117, 1116,  850,  846, 1115, 1114, 1113,  852,
+      858, 1112,  861,  864,  866,  853, 1111,  860, 1110, 1109,
+     1108, 1107,  872,  875,  877, 1106,  878,  879, 1105, 1104,
+     1103, 1102, 1101,  883, 1100, 1099, 1098,  881,  880,  882,
+      884,  886, 1097,  885, 1096,  888, 1095, 1094,  891,  898,
+      899,  900,  901, 1093,  904,  905,  909,  911,  907,  914,
+      916,  917, 1092,  918,  920,  927,  921,  931,  934,  933,
+      935, 1091,  936,  939,  942,  944, 1090,  937,  947,  945,
+      948, 1089, 1088, 1087,  950, 1086,  949,  959,  955, 1083,
+      967,  970,  969, 1074,  971, 1072, 1071,  972,  976,  973,
+
+      978,  979,  951,  981,  984,  986,  987,  989,  993, 1070,
+      991,  990,  997,  999, 1000, 1002, 1003, 1068, 1008, 1010,
+     1012, 1013, 1067, 1014, 1015, 1018, 1019, 1066, 1021, 1065,
+     1020, 1030, 1029, 1024, 1032, 1033, 1034, 1040, 1043, 1045,
+     1044, 1046, 1063, 1047, 1062, 1060, 1048, 1059, 1049, 1056,
+      677,  479, 1054,  435, 1201, 1089, 1091,  124, 1095,   76
     } ;
 
-static yyconst short int yy_def[516] =
+static yyconst short int yy_def[561] =
     {   0,
-      510,    1,  510,  510,  510,  510,  511,  512,  513,  510,
-      512,  512,  512,  512,  514,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  511,  510,  512,  510,
-      515,  515,  510,  510,  512,  512,  512,  512,  512,  514,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  510,  515,
-      515,  510,  512,  512,  512,   49,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,   49,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  510,  510,  510,  510,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  178,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  510,  512,
-
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-
-      512,  512,  512,  512,  512,  512,  512,  512,  512,    0,
-      510,  510,  510,  510,  510
+      555,    1,  555,  555,  555,  555,  556,  557,  558,  555,
+      557,  557,  557,  557,  559,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  556,  555,  557,  555,
+      560,  560,  555,  555,  557,  557,  557,  557,  557,  559,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      555,  560,  560,  555,  557,  557,  557,   49,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,   49,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  555,  555,  555,  555,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  184,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  555,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,    0,  555,  555,  555,  555,  555
     } ;
 
-static yyconst short int yy_nxt[1155] =
+static yyconst short int yy_nxt[1245] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   14,   14,    4,   15,    8,    8,    8,   16,   17,
@@ -577,113 +590,121 @@ static yyconst short int yy_nxt[1155] =
        26,   27,   28,    8,   29,   30,   31,   32,   33,   34,
        35,    8,   36,   42,   40,   43,   43,   43,   43,   44,
        44,   44,   44,   45,   45,   45,   45,   40,   46,   40,
-       40,   40,  136,   40,   47,   48,   48,   48,   48,   40,
-       47,   48,   48,   48,   48,   40,   40,   69,  120,   40,
-       87,   40,   88,   86,   51,  116,   40,   70,   56,   40,
-       91,   52,   57,   53,   40,   54,   49,   58,   55,   60,
-
-       59,   61,   40,  123,  117,   77,   78,   64,   40,   40,
-       40,   65,   62,   40,   79,   66,   63,   67,   71,   75,
-       68,   72,   80,   40,   40,   76,   40,   81,   73,   83,
-       40,   82,   40,   40,   74,   89,   40,  113,   40,   40,
-      254,   90,   84,   40,  102,  115,   40,  118,   85,   92,
-      114,  127,  131,   40,  130,  146,   40,  103,   40,   93,
-      104,   94,   95,  139,   40,   96,   97,  105,  121,  121,
-      121,  121,   40,  147,   98,  134,   99,  100,   40,  101,
-       92,   40,   40,  135,   40,   43,   43,   43,   43,   40,
-      106,  128,  107,  129,  132,  163,  137,  108,  133,  109,
-
-       40,  110,   40,  138,   40,  111,  112,  122,   44,   44,
-       44,   44,   47,   45,   45,   45,   45,   40,  124,  124,
-      124,  124,   40,  142,  148,  125,   40,  143,   41,   40,
-      207,  125,   47,   48,   48,   48,   48,   40,  126,  126,
-      126,  126,   40,   40,  126,  126,   40,  126,  126,  126,
-      126,  126,  126,  144,   40,   40,   40,   40,  140,   40,
-      141,   40,  149,  150,   40,  145,   40,   40,   40,   40,
-      152,   40,  154,  156,   40,  155,   40,  153,   40,  151,
-       40,  166,  170,  168,  157,  158,  164,  159,  160,  161,
-       40,  162,  165,  167,   40,  169,   40,   40,   40,   40,
-
-       40,  173,   40,   40,   40,  171,  179,   40,   40,  172,
-      174,  175,  188,   40,   40,  176,  180,  225,   40,   40,
-      181,   40,  177,  184,  191,  190,  185,  178,  182,  186,
-      189,   40,  187,   40,   40,   40,  183,   40,  197,   40,
-       40,   40,  198,   40,  192,   40,  193,  195,  199,  202,
-       40,  211,  205,   40,  194,  201,  200,  206,  196,   40,
-       40,  212,  203,  208,  210,  209,   40,  204,  121,  121,
-      121,  121,  215,  215,  215,  215,   40,  220,   40,  216,
-       40,  213,   40,   40,  236,  216,  124,  124,  124,  124,
-       40,  222,   40,  125,  221,  226,  224,   40,   40,  125,
-
-      217,  218,   40,  219,  219,  219,  219,   40,   40,   40,
-      228,   40,   40,  223,   40,   40,  231,   40,  230,   40,
-      227,  242,   40,   40,  234,   40,  238,  232,  235,  233,
-      229,  239,  237,   40,   40,   40,   40,   40,  244,   40,
-      248,   40,   40,  240,  245,  241,  247,   40,   40,   40,
-      243,  246,   40,   40,  249,   40,  250,  251,  253,  252,
-      256,   40,   40,   40,  257,  255,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,  258,  259,  261,  293,
-      268,  275,   40,  274,  263,  260,  262,  264,  264,  264,
-      264,  265,  267,  264,  264,  266,  264,  264,  264,  264,
-
-      264,  264,   40,  273,   40,   40,   40,   40,   40,   40,
-       40,  269,   40,  270,   40,   40,   40,  271,  282,  272,
-      276,  280,  279,  283,   40,   40,  277,  281,   40,  278,
-       40,   40,   40,   40,  288,  284,   40,  289,  295,  286,
-      285,  287,   40,  290,  294,   40,   40,  291,   40,  297,
-      292,   40,  215,  215,  215,  215,  296,  217,  217,  216,
-      299,  299,  299,  299,  298,  216,  299,  299,  299,  299,
-      219,  219,  219,  219,   40,  219,  219,  219,  219,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,  301,   40,
-       40,  304,   40,   40,  308,   40,   40,  300,   40,  302,
-
-      303,  313,  307,  309,   40,   40,   40,   40,  305,  306,
-      316,  311,  314,  312,  318,  317,   40,   40,   40,  310,
-       40,   40,   40,  321,   40,  315,   40,   40,   40,  322,
-       40,   40,  320,   40,   40,   40,   40,   40,  325,  319,
-       40,  326,  323,  324,  333,  327,  328,  335,  329,  330,
-      334,   40,  331,   40,   40,   40,  332,   40,   40,  342,
-       40,   40,  337,  339,  341,  346,   40,  343,   40,  344,
-      345,  336,   40,   40,   40,  347,  338,  340,   40,  352,
-       40,  349,   40,  348,  350,   40,   40,   40,  351,   40,
-      299,  299,  299,  299,   40,   40,   40,  353,   40,  357,
-
-      359,  360,  361,  354,   40,  362,  355,   40,   40,  356,
-      367,  358,  363,   40,   40,  364,  366,   40,  365,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,  370,   40,
-      374,  375,   40,  368,  376,   40,  369,  371,   40,  373,
-       40,  377,   40,  378,  372,   40,   40,  381,   40,  380,
-       40,  383,  379,  384,  385,   40,   40,  382,  389,  386,
-       40,   40,   40,   40,  387,   40,  388,   40,   40,   40,
-      391,  390,  394,  392,  395,   40,  396,   40,   40,   40,
-      398,   40,   40,  400,   40,  393,   40,   40,  397,   40,
-      399,  405,   40,   40,  403,   40,  402,   40,  401,  404,
-
-       40,  407,   40,   40,  411,  412,   40,  409,   40,  408,
-       40,  410,  415,  414,  406,  416,   40,  418,  413,   40,
-       40,  417,   40,  419,   40,  420,   40,   40,  421,   40,
-      422,   40,   40,   40,  423,  426,   40,   40,   40,  424,
-       40,   40,  427,   40,   40,   40,   40,   40,  425,  428,
-      435,  430,  436,   40,  429,  434,   40,  431,  432,   40,
-      438,  437,  439,   40,  433,  440,   40,   40,  441,   40,
-       40,  444,  443,   40,   40,   40,  445,  447,  442,   40,
-       40,   40,  446,   40,  449,   40,   40,   40,  458,   40,
-      453,   40,  448,   40,   40,  457,   40,  461,  450,   40,
-
-      454,  460,  451,  452,  455,  459,  456,   40,   40,   40,
-       40,   40,  464,  463,  462,  466,  465,   40,  467,   40,
-       40,   40,  469,   40,   40,   40,   40,   40,  472,   40,
-      475,   40,  477,   40,  468,  470,   40,   40,   40,  474,
-       40,  476,   40,  478,   40,   40,  473,  479,   40,  471,
-       40,  482,  480,  483,  485,  486,   40,   40,   40,  481,
-      484,  490,   40,  487,   40,  488,  489,   40,   40,  491,
-       40,   40,   40,   40,  495,  492,   40,   40,   40,  494,
-      493,  496,   40,   40,  502,  503,   40,  497,   40,   40,
-      499,   40,  498,   40,   40,  507,  500,  501,  508,   40,
-
-       40,   40,   40,  506,   40,   40,  505,   40,   40,   40,
-       40,  504,  509,   37,   37,   37,   37,   39,   39,   50,
-       40,   50,   50,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,  139,   40,   47,   48,   48,   48,   48,   40,
+       47,   48,   48,   48,   48,   40,   40,   69,  122,   40,
+       88,   40,   89,   87,   51,  118,   40,   70,   56,   40,
+       93,   52,   57,   53,   40,   54,   49,   58,   55,   60,
+
+       59,   61,   40,  125,  119,   78,   79,   64,   40,   40,
+       40,   65,   62,   40,   80,   66,   63,   67,   71,   76,
+       68,   72,   81,   40,   40,   77,   41,   82,   73,   84,
+       40,   83,   74,   40,   75,   90,   40,   40,  115,   40,
+       40,   91,   85,   40,  104,  117,   92,   40,   86,   94,
+       40,  116,  120,   40,  151,  129,  133,  105,  132,   95,
+      106,   96,   97,  146,   40,   98,   99,  107,  123,  123,
+      123,  123,   40,   40,  100,  136,  101,  102,   40,  103,
+       94,   40,   40,  137,   40,   43,   43,   43,   43,   40,
+      108,  130,  109,  131,  134,  138,  140,  110,  135,  111,
+
+      184,  112,   40,  141,  150,  113,  114,  124,   44,   44,
+       44,   44,   47,   45,   45,   45,   45,   40,  126,  126,
+      126,  126,   40,   40,   40,  127,  220,  149,   40,  178,
+      142,  127,   47,   48,   48,   48,   48,   40,  128,  128,
+      128,  128,   40,   40,  128,  128,   40,  128,  128,  128,
+      128,  128,  128,   40,   40,   40,   40,   40,  143,   40,
+      144,  147,   40,  152,  153,   40,   40,  145,  155,  157,
+       40,  159,   40,  148,  161,  156,   40,  158,   40,   40,
+      154,   40,   40,   40,  168,  160,   40,   40,  163,  162,
+       40,  164,  171,  173,  175,   40,  169,  174,  165,  166,
+
+       40,  167,  170,   40,  172,  176,   40,   40,   40,   40,
+      177,  185,   40,  179,   40,  199,  180,   40,   40,   40,
+      195,  186,   40,  182,  187,   40,   40,  181,  197,  236,
+      183,   40,  188,  191,   40,  196,  192,   40,   40,  193,
+      189,  205,  194,  198,  190,   40,   40,  200,   40,  210,
+      201,  203,   40,   40,  206,   40,   40,  215,  202,  207,
+      211,  219,  204,   40,  214,  208,  217,  216,  218,   40,
+       40,  209,   40,  212,  123,  123,  123,  123,  213,  225,
+      225,  225,  225,  230,   40,   40,  226,   40,   40,   40,
+      221,  222,  226,  232,   40,  235,   40,  223,  126,  126,
+
+      126,  126,   40,  231,  237,  127,   40,  234,  233,   40,
+      269,  127,  227,  228,   40,  229,  229,  229,  229,   40,
+       40,   40,  239,   40,   40,  242,   40,   40,   40,  238,
+      241,  240,  247,   40,   40,   40,  245,   40,  243,  244,
+      246,  248,  249,  250,   40,   40,   40,   40,   40,   40,
+      255,   40,   40,   40,   40,  251,   40,  252,  261,  262,
+      253,  264,   40,  259,   40,  257,  263,   40,  258,  254,
+      260,  265,   40,  256,  267,   40,  268,   40,   40,   40,
+      271,   40,   40,   40,   40,  266,  272,  270,   40,   40,
+       40,   40,   40,  274,   40,  317,  276,   40,  273,  284,
+
+      278,   40,  277,  275,  291,   40,  292,  279,  280,  280,
+      280,  280,  281,  282,  280,  280,   40,  280,  280,  280,
+      280,  280,  280,   40,  283,  285,   40,  286,  289,   40,
+       40,  287,   40,  288,   40,   40,   40,   40,   40,   40,
+       40,   40,  294,   40,  290,  300,  298,  293,  302,  297,
+       40,  295,   40,  301,   40,  296,  299,   40,   40,   40,
+      307,  303,   40,  308,  305,  304,  309,  313,  306,   40,
+      312,  310,   40,   40,   40,  311,   40,  314,  315,   40,
+      225,  225,  225,  225,   40,   40,  316,  226,  320,  320,
+      320,  320,  318,  226,  339,  381,  321,  227,  227,  319,
+
+      320,  320,  320,  320,  229,  229,  229,  229,   40,  229,
+      229,  229,  229,   40,   40,   40,   40,   40,   40,   40,
+       40,  322,  325,   40,   40,  326,   40,   40,   40,  330,
+       40,   40,  323,  324,   40,   40,  335,   40,  329,  331,
+       40,   40,  327,  328,  333,  334,  338,  340,   40,   40,
+       40,   40,   40,  336,  332,   40,  337,  347,   40,   40,
+      341,   40,   40,   40,  348,   40,  346,   40,   40,   40,
+       40,  342,  343,  345,  344,  352,   40,  353,   40,  349,
+      350,  351,  355,  354,  357,   40,  356,   40,   40,   40,
+       40,   40,   40,   40,  358,   40,  360,  361,  362,  359,
+
+      363,  365,   40,   40,  367,   40,   40,  364,   40,   40,
+      400,  369,  370,  371,  372,  366,  373,  374,  368,   40,
+       40,   40,   40,   40,  377,   40,  375,   40,  378,  376,
+       40,  379,  383,  380,   40,  382,   40,   40,   40,   40,
+      320,  320,  320,  320,   40,   40,   40,  384,   40,  388,
+      391,  390,  392,  395,   40,  385,   40,  386,   40,  397,
+      387,  389,   40,  394,   40,  396,   40,   40,  393,   40,
+      399,   40,   40,   40,   40,   40,  402,   40,   40,   40,
+      406,  407,   40,  398,   40,  401,  403,   40,  408,  405,
+      409,  411,   40,   40,  404,  410,   40,   40,   40,  412,
+
+       40,   40,  414,  413,   40,  417,   40,  419,  420,  415,
+       40,   40,  416,  421,  418,  422,   40,   40,  425,  423,
+       40,   40,   40,   40,  424,   40,   40,   40,   40,   40,
+      428,   40,  427,   40,  430,  432,  434,   40,   40,  426,
+      429,  435,  437,   40,  433,  441,  431,   40,  439,   40,
+      436,  438,   40,   40,   40,   40,   40,   40,   40,   40,
+      440,  445,  442,   40,  447,   40,   40,  451,  452,  444,
+      443,   40,  454,   40,   40,  449,  450,   40,  448,   40,
+      460,  446,  453,  456,  458,   40,  457,  455,   40,  459,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+
+      464,   40,  465,  469,   40,  462,  461,  463,  466,  467,
+      470,   40,   40,   40,   40,  468,  471,   40,   40,  473,
+       40,  472,   40,  478,   40,  474,  479,   40,  477,   40,
+       40,   40,  475,   40,   40,  480,  484,  481,  476,  482,
+       40,  483,  488,  490,   40,  489,   40,   40,   40,   40,
+       40,  485,   40,  486,  492,   40,  487,   40,   40,  494,
+       40,   40,   40,   40,   40,  499,  498,  491,   40,  493,
+      502,  504,   40,  495,  506,  496,  503,  500,  497,  505,
+       40,  501,   40,   40,   40,   40,   40,  507,  508,   40,
+      511,   40,   40,  516,   40,  509,  514,   40,  512,   40,
+
+       40,  517,   40,   40,   40,  520,   40,  510,  515,  513,
+       40,  522,   40,   40,  519,   40,   40,  521,  523,  524,
+      518,   40,  527,   40,  528,   40,   40,   40,   40,  525,
+      530,   40,   40,   40,   40,  526,  534,   40,  531,  529,
+      532,  533,   40,   40,  536,   40,   40,   40,  539,  537,
+      540,  535,  538,   40,  542,  541,   40,   40,   40,   40,
+       40,   40,   40,  547,  544,  548,  543,   40,  552,   40,
+      545,  553,   40,   40,  546,   40,   40,  551,   40,   40,
+       40,   40,  550,   40,   40,   40,  549,   40,  554,   37,
+       37,   37,   37,   39,   39,   50,   40,   50,   50,   40,
+
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
@@ -691,16 +712,18 @@ static yyconst short int yy_nxt[1155] =
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,  224,   40,   40,   40,   40,  121,   40,   38,  555,
 
-       40,  214,   40,   40,   40,   40,  119,   40,   38,  510,
-        3,  510,  510,  510,  510,  510,  510,  510,  510,  510,
-      510,  510,  510,  510,  510,  510,  510,  510,  510,  510,
-      510,  510,  510,  510,  510,  510,  510,  510,  510,  510,
-      510,  510,  510,  510,  510,  510,  510,  510,  510,  510,
-      510,  510,  510,  510
+        3,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555
     } ;
 
-static yyconst short int yy_chk[1155] =
+static yyconst short int yy_chk[1245] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -709,126 +732,136 @@ static yyconst short int yy_chk[1155] =
         1,    1,    1,    9,   58,    9,    9,    9,    9,   10,
        10,   10,   10,   11,   11,   11,   11,   11,   12,   26,
        20,   27,   58,   12,   13,   13,   13,   13,   13,   13,
-       14,   14,   14,   14,   14,   14,   16,   20,  515,   17,
+       14,   14,   14,   14,   14,   14,   16,   20,  560,   17,
        27,   29,   27,   26,   16,   35,   35,   20,   17,   23,
        29,   16,   17,   16,   18,   16,   13,   17,   16,   18,
 
        17,   18,   19,   46,   35,   23,   23,   19,   46,   24,
        22,   19,   18,   21,   24,   19,   18,   19,   21,   22,
-       19,   21,   24,   28,   25,   22,  164,   24,   21,   25,
-       66,   24,   33,   54,   21,   28,   34,   33,   36,   31,
-      164,   28,   25,   51,   31,   34,   53,   36,   25,   30,
-       33,   51,   54,   30,   53,   66,   61,   31,   67,   30,
-       31,   30,   30,   61,   56,   30,   30,   31,   42,   42,
-       42,   42,   57,   67,   30,   56,   30,   30,   52,   30,
-       32,   60,   55,   57,   32,   43,   43,   43,   43,   79,
-       32,   52,   32,   52,   55,   79,   60,   32,   55,   32,
-
-       68,   32,   63,   60,   64,   32,   32,   44,   44,   44,
+       19,   21,   24,   28,   25,   22,  558,   24,   21,   25,
+       68,   24,   21,   33,   21,   28,   34,   54,   33,   31,
+       64,   28,   25,   36,   31,   34,   28,   51,   25,   30,
+       53,   33,   36,   30,   68,   51,   54,   31,   53,   30,
+       31,   30,   30,   64,   56,   30,   30,   31,   42,   42,
+       42,   42,   57,   94,   30,   56,   30,   30,   52,   30,
+       32,   60,   55,   57,   32,   43,   43,   43,   43,   67,
+       32,   52,   32,   52,   55,   57,   60,   32,   55,   32,
+
+       94,   32,   66,   60,   67,   32,   32,   44,   44,   44,
        44,   44,   45,   45,   45,   45,   45,   45,   47,   47,
-       47,   47,   47,   63,   68,   47,  113,   64,  513,  509,
-      113,   47,   48,   48,   48,   48,   48,   48,   49,   49,
-       49,   49,   49,   62,   49,   49,   65,   49,   49,   49,
-       49,   49,   49,   65,   69,   71,   70,   73,   62,   72,
-       62,   75,   69,   70,   74,   65,   78,   76,   77,   80,
-       71,   82,   72,   74,   84,   73,   81,   71,   93,   70,
-       83,   81,   84,   82,   75,   76,   80,   77,   78,   78,
-       85,   78,   80,   81,   86,   83,   87,   89,   90,   91,
-
-       92,   87,  136,   94,   97,   85,   93,   99,   96,   86,
-       89,   90,   97,   95,  106,   91,   94,  136,  100,  105,
-       95,   98,   91,   96,  100,   99,   96,   92,   95,   96,
-       98,  101,   96,  102,  104,  107,   95,  109,  105,  108,
-      117,  110,  106,  111,  101,  112,  102,  104,  107,  110,
-      114,  116,  111,  116,  102,  109,  108,  112,  104,  115,
-      118,  117,  110,  114,  115,  114,  128,  110,  121,  121,
-      121,  121,  122,  122,  122,  122,  129,  128,  148,  122,
-      137,  118,  131,  134,  148,  122,  124,  124,  124,  124,
-      124,  131,  132,  124,  129,  137,  134,  138,  153,  124,
-
-      125,  125,  140,  125,  125,  125,  125,  125,  141,  142,
-      140,  143,  144,  132,  145,  147,  143,  150,  142,  149,
-      138,  153,  151,  152,  147,  154,  150,  144,  147,  145,
-      141,  151,  149,  155,  158,  156,  507,  157,  155,  159,
-      158,  162,  165,  151,  156,  152,  157,  160,  161,  163,
-      154,  156,  166,  167,  159,  168,  160,  161,  163,  162,
-      166,  170,  169,  172,  167,  165,  173,  175,  179,  181,
-      180,  182,  188,  187,  207,  506,  168,  169,  172,  207,
-      182,  188,  185,  187,  175,  170,  173,  178,  178,  178,
-      178,  179,  181,  178,  178,  180,  178,  178,  178,  178,
-
-      178,  178,  183,  185,  189,  190,  192,  193,  195,  196,
-      194,  183,  198,  183,  197,  199,  200,  183,  196,  183,
-      189,  194,  193,  197,  201,  202,  190,  195,  203,  192,
-      204,  205,  206,  209,  202,  198,  208,  203,  209,  200,
-      199,  201,  210,  204,  208,  211,  213,  205,  505,  211,
-      206,  503,  215,  215,  215,  215,  210,  216,  216,  215,
-      216,  216,  216,  216,  213,  215,  217,  217,  217,  217,
-      218,  218,  218,  218,  218,  219,  219,  219,  219,  219,
-      220,  221,  222,  224,  228,  229,  230,  231,  221,  232,
-      233,  228,  234,  238,  232,  235,  237,  220,  236,  222,
-
-      224,  237,  231,  233,  239,  240,  241,  242,  229,  230,
-      240,  235,  238,  236,  242,  241,  244,  247,  248,  234,
-      249,  250,  251,  248,  252,  239,  253,  254,  262,  249,
-      259,  255,  247,  263,  260,  265,  273,  267,  252,  244,
-      268,  253,  250,  251,  265,  254,  255,  268,  259,  260,
-      267,  269,  262,  270,  271,  272,  263,  274,  278,  273,
-      275,  277,  270,  271,  272,  278,  280,  274,  281,  275,
-      277,  269,  284,  287,  289,  280,  270,  271,  288,  289,
-      290,  284,  292,  281,  287,  293,  295,  298,  288,  297,
-      299,  299,  299,  299,  302,  308,  301,  290,  304,  297,
-
-      298,  301,  302,  292,  309,  304,  293,  305,  306,  295,
-      309,  297,  305,  307,  310,  306,  308,  311,  307,  312,
-      313,  314,  315,  316,  318,  320,  321,  322,  312,  323,
-      316,  318,  324,  310,  320,  335,  311,  313,  325,  315,
-      327,  321,  328,  322,  314,  330,  329,  325,  334,  324,
-      331,  328,  323,  329,  330,  332,  343,  327,  335,  331,
-      344,  346,  347,  348,  332,  354,  334,  352,  353,  355,
-      344,  343,  348,  346,  352,  358,  353,  356,  357,  359,
-      355,  361,  363,  357,  364,  347,  365,  367,  354,  368,
-      356,  364,  366,  369,  361,  374,  359,  376,  358,  363,
-
-      373,  366,  387,  378,  373,  373,  379,  368,  388,  367,
-      382,  369,  378,  376,  365,  379,  380,  382,  374,  390,
-      391,  380,  395,  387,  399,  388,  400,  401,  390,  402,
-      391,  404,  403,  406,  395,  401,  409,  410,  411,  399,
-      412,  413,  402,  414,  415,  416,  419,  417,  400,  403,
-      413,  406,  414,  421,  404,  412,  418,  409,  410,  425,
-      416,  415,  417,  422,  411,  418,  423,  424,  419,  427,
-      426,  423,  422,  428,  430,  441,  424,  426,  421,  431,
-      432,  433,  425,  437,  428,  435,  438,  436,  441,  501,
-      433,  444,  427,  450,  443,  438,  442,  444,  430,  448,
-
-      435,  443,  431,  432,  436,  442,  437,  446,  447,  454,
-      453,  455,  448,  447,  446,  453,  450,  456,  454,  457,
-      458,  459,  456,  460,  461,  462,  463,  464,  459,  466,
-      462,  467,  464,  468,  455,  457,  469,  472,  480,  461,
-      475,  463,  470,  466,  471,  474,  460,  467,  476,  458,
-      477,  470,  468,  471,  474,  475,  481,  479,  482,  469,
-      472,  480,  484,  476,  486,  477,  479,  487,  488,  481,
-      489,  490,  491,  492,  487,  482,  493,  494,  495,  486,
-      484,  488,  496,  497,  494,  495,  499,  489,  502,  504,
-      491,  508,  490,  500,  498,  502,  492,  493,  504,  485,
-
-      483,  478,  473,  499,  465,  452,  497,  451,  449,  445,
-      440,  496,  508,  511,  511,  511,  511,  512,  512,  514,
-      439,  514,  514,  434,  429,  420,  408,  407,  405,  398,
-      397,  396,  394,  393,  392,  389,  386,  385,  384,  383,
-      381,  377,  375,  372,  371,  370,  362,  360,  351,  350,
-      349,  345,  342,  341,  340,  339,  338,  337,  336,  333,
-      326,  319,  317,  303,  300,  296,  294,  291,  286,  285,
-      283,  282,  279,  276,  266,  261,  258,  257,  256,  246,
-      245,  243,  227,  226,  225,  223,  212,  191,  186,  184,
-      177,  176,  174,  171,  146,  139,  135,  133,  130,  127,
-
-      123,  119,  103,   88,   59,   39,   37,    8,    7,    3,
-      510,  510,  510,  510,  510,  510,  510,  510,  510,  510,
-      510,  510,  510,  510,  510,  510,  510,  510,  510,  510,
-      510,  510,  510,  510,  510,  510,  510,  510,  510,  510,
-      510,  510,  510,  510,  510,  510,  510,  510,  510,  510,
-      510,  510,  510,  510
+       47,   47,   47,   61,   88,   47,  118,   66,  118,   88,
+       61,   47,   48,   48,   48,   48,   48,   48,   49,   49,
+       49,   49,   49,   62,   49,   49,   63,   49,   49,   49,
+       49,   49,   49,   71,   65,   69,   72,   70,   62,   73,
+       62,   65,   74,   69,   70,   75,   76,   63,   71,   72,
+       77,   74,   78,   65,   75,   71,   79,   73,   80,   81,
+       70,   83,   84,   95,   80,   74,   85,   82,   77,   76,
+       86,   78,   82,   83,   85,   87,   81,   84,   79,   79,
+
+       90,   79,   81,   91,   82,   86,   92,   93,   96,  102,
+       87,   95,   99,   90,  139,  102,   91,   97,   98,  100,
+       99,   96,  107,   93,   97,  101,  108,   92,  100,  139,
+       93,  111,   97,   98,  103,   99,   98,  104,  106,   98,
+       97,  107,   98,  101,   97,  114,  109,  103,  110,  111,
+      104,  106,  112,  116,  108,  113,  117,  114,  104,  109,
+      112,  117,  106,  115,  113,  110,  116,  115,  116,  119,
+      120,  110,  130,  112,  123,  123,  123,  123,  112,  124,
+      124,  124,  124,  130,  133,  131,  124,  134,  138,  140,
+      119,  120,  124,  133,  136,  138,  169,  120,  126,  126,
+
+      126,  126,  126,  131,  140,  126,  141,  136,  134,  144,
+      169,  126,  127,  127,  143,  127,  127,  127,  127,  127,
+      146,  145,  143,  147,  148,  146,  151,  150,  152,  141,
+      145,  144,  151,  153,  154,  155,  150,  156,  147,  148,
+      150,  152,  153,  154,  157,  158,  159,  160,  554,  162,
+      158,  164,  165,  163,  161,  154,  167,  155,  162,  163,
+      156,  165,  166,  161,  170,  160,  164,  168,  160,  157,
+      161,  166,  171,  159,  167,  172,  168,  173,  174,  175,
+      171,  177,  178,  180,  181,  166,  172,  170,  186,  185,
+      188,  220,  552,  174,  194,  220,  177,  195,  173,  188,
+
+      180,  187,  178,  175,  194,  190,  195,  181,  184,  184,
+      184,  184,  185,  186,  184,  184,  189,  184,  184,  184,
+      184,  184,  184,  192,  187,  189,  197,  189,  190,  196,
+      198,  189,  200,  189,  201,  202,  204,  203,  206,  205,
+      207,  208,  197,  210,  192,  204,  202,  196,  205,  201,
+      209,  198,  215,  204,  211,  200,  203,  212,  213,  214,
+      210,  206,  216,  211,  208,  207,  212,  216,  209,  217,
+      215,  213,  219,  218,  222,  214,  223,  217,  218,  230,
+      225,  225,  225,  225,  307,  252,  219,  225,  227,  227,
+      227,  227,  222,  225,  252,  307,  230,  226,  226,  223,
+
+      226,  226,  226,  226,  228,  228,  228,  228,  228,  229,
+      229,  229,  229,  229,  231,  232,  234,  235,  239,  240,
+      241,  231,  235,  242,  243,  239,  244,  245,  246,  243,
+      247,  248,  232,  234,  249,  250,  248,  255,  242,  244,
+      253,  251,  240,  241,  246,  247,  251,  253,  256,  258,
+      257,  261,  262,  249,  245,  263,  250,  262,  264,  265,
+      255,  267,  268,  266,  263,  269,  261,  270,  274,  275,
+      277,  256,  257,  258,  257,  267,  278,  268,  279,  264,
+      265,  266,  270,  269,  275,  283,  274,  285,  281,  290,
+      551,  332,  286,  284,  277,  287,  279,  281,  283,  278,
+
+      284,  286,  288,  291,  287,  292,  293,  285,  295,  299,
+      332,  288,  290,  291,  292,  286,  293,  295,  287,  296,
+      298,  301,  303,  306,  299,  308,  296,  309,  301,  298,
+      310,  303,  309,  306,  312,  308,  313,  315,  318,  317,
+      320,  320,  320,  320,  323,  322,  325,  310,  327,  317,
+      322,  318,  323,  327,  329,  312,  326,  313,  328,  329,
+      315,  317,  330,  326,  331,  328,  333,  334,  325,  335,
+      331,  336,  337,  338,  340,  343,  334,  344,  345,  349,
+      338,  340,  346,  330,  347,  333,  335,  348,  343,  337,
+      344,  346,  350,  351,  336,  345,  352,  354,  355,  347,
+
+      362,  356,  349,  348,  357,  352,  358,  355,  356,  350,
+      359,  360,  351,  357,  354,  358,  363,  371,  362,  359,
+      372,  373,  375,  376,  360,  380,  377,  385,  390,  383,
+      372,  386,  371,  384,  375,  377,  383,  389,  387,  363,
+      373,  384,  386,  388,  380,  390,  376,  393,  388,  392,
+      385,  387,  395,  397,  396,  398,  399,  400,  401,  406,
+      389,  396,  392,  405,  398,  410,  416,  405,  405,  395,
+      393,  411,  410,  418,  413,  400,  401,  414,  399,  415,
+      418,  397,  406,  413,  415,  423,  414,  411,  424,  416,
+      425,  427,  428,  439,  438,  440,  434,  441,  444,  442,
+
+      427,  446,  428,  440,  449,  424,  423,  425,  434,  438,
+      441,  450,  451,  452,  453,  439,  442,  455,  456,  446,
+      459,  444,  457,  453,  458,  449,  455,  460,  452,  461,
+      462,  464,  450,  465,  467,  456,  460,  457,  451,  458,
+      466,  459,  465,  467,  468,  466,  470,  469,  471,  473,
+      478,  461,  474,  462,  469,  475,  464,  476,  480,  471,
+      479,  481,  487,  485,  503,  478,  476,  468,  489,  470,
+      481,  487,  488,  473,  489,  474,  485,  479,  475,  488,
+      491,  480,  493,  492,  495,  498,  500,  491,  492,  499,
+      498,  501,  502,  503,  504,  493,  501,  505,  499,  506,
+
+      507,  504,  508,  512,  511,  507,  509,  495,  502,  500,
+      513,  509,  514,  515,  506,  516,  517,  508,  511,  512,
+      505,  519,  515,  520,  516,  521,  522,  524,  525,  513,
+      519,  526,  527,  531,  529,  514,  524,  534,  520,  517,
+      521,  522,  533,  532,  526,  535,  536,  537,  531,  527,
+      532,  525,  529,  538,  534,  533,  539,  541,  540,  542,
+      544,  547,  549,  539,  536,  540,  535,  553,  547,  550,
+      537,  549,  548,  546,  538,  545,  543,  544,  530,  528,
+      523,  518,  542,  510,  497,  496,  541,  494,  553,  556,
+      556,  556,  556,  557,  557,  559,  490,  559,  559,  486,
+
+      484,  483,  482,  477,  472,  463,  454,  448,  447,  445,
+      443,  437,  436,  435,  433,  432,  431,  430,  429,  426,
+      422,  421,  420,  419,  417,  412,  409,  408,  407,  404,
+      403,  402,  394,  391,  382,  381,  379,  378,  374,  370,
+      369,  368,  367,  366,  365,  364,  361,  353,  342,  341,
+      339,  324,  321,  319,  316,  314,  311,  305,  304,  302,
+      300,  297,  294,  289,  282,  276,  273,  272,  271,  260,
+      259,  254,  238,  237,  236,  233,  221,  199,  193,  191,
+      183,  182,  179,  176,  149,  142,  137,  135,  132,  129,
+      125,  121,  105,   89,   59,   39,   37,    8,    7,    3,
+
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555
     } ;
 
 static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
@@ -905,7 +938,7 @@ char *yytext;
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 909 "UpgradeLexer.cpp"
+#line 942 "UpgradeLexer.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1059,7 +1092,7 @@ YY_DECL
 #line 98 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 
 
-#line 1063 "UpgradeLexer.cpp"
+#line 1096 "UpgradeLexer.cpp"
 
 	if ( yy_init )
 		{
@@ -1107,14 +1140,14 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 511 )
+				if ( yy_current_state >= 556 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			*yy_state_ptr++ = yy_current_state;
 			++yy_cp;
 			}
-		while ( yy_current_state != 510 );
+		while ( yy_current_state != 555 );
 
 yy_find_action:
 		yy_current_state = *--yy_state_ptr;
@@ -1563,170 +1596,230 @@ YY_RULE_SETUP
 case 83:
 YY_RULE_SETUP
 #line 187 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SELECT); }
+{ RET_TOK( TRUNC); }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
 #line 188 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SHL); }
+{ RET_TOK( ZEXT); }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
 #line 189 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SHR); }
+{ RET_TOK( SEXT); }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
 #line 190 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ASHR); }
+{ RET_TOK( FPTRUNC); }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
 #line 191 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LSHR); }
+{ RET_TOK( FPEXT); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
 #line 192 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( VAARG); }
+{ RET_TOK( FPTOUI); }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
 #line 193 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( RET); }
+{ RET_TOK( FPTOSI); }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
 #line 194 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( BR); }
+{ RET_TOK( UITOFP); }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
 #line 195 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SWITCH); }
+{ RET_TOK( SITOFP); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
 #line 196 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( INVOKE); }
+{ RET_TOK( PTRTOINT); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
 #line 197 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UNWIND); }
+{ RET_TOK( INTTOPTR); }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
 #line 198 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UNWIND); }
+{ RET_TOK( BITCAST); }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
 #line 199 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UNREACHABLE); }
+{ RET_TOK( SELECT); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 201 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( MALLOC); }
+#line 200 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SHL); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 202 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ALLOCA); }
+#line 201 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SHR); }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 203 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FREE); }
+#line 202 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ASHR); }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 204 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LOAD); }
+#line 203 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( LSHR); }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 205 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( STORE); }
+#line 204 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( VAARG); }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 206 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( GETELEMENTPTR); }
+#line 205 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( RET); }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 208 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( EXTRACTELEMENT); }
+#line 206 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( BR); }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 209 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( INSERTELEMENT); }
+#line 207 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SWITCH); }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 210 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SHUFFLEVECTOR); }
+#line 208 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( INVOKE); }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 213 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( VAR_ID); }
+#line 209 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UNWIND); }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 214 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LABELSTR); }
+#line 210 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UNWIND); }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 215 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LABELSTR); }
+#line 211 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UNREACHABLE); }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 216 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( STRINGCONSTANT ); }
+#line 213 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( MALLOC); }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 217 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( EUINT64VAL ); }
+#line 214 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ALLOCA); }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 218 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ESINT64VAL ); }
+#line 215 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FREE); }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 219 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( yytext[0] == 's' ? ESINT64VAL : EUINT64VAL ); }
+#line 216 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( LOAD); }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 220 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UINTVAL); }
+#line 217 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( STORE); }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 221 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SINTVAL); }
+#line 218 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( GETELEMENTPTR); }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
+#line 220 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( EXTRACTELEMENT); }
+	YY_BREAK
+case 115:
+YY_RULE_SETUP
+#line 221 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( INSERTELEMENT); }
+	YY_BREAK
+case 116:
+YY_RULE_SETUP
 #line 222 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SHUFFLEVECTOR); }
+	YY_BREAK
+case 117:
+YY_RULE_SETUP
+#line 225 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( VAR_ID); }
+	YY_BREAK
+case 118:
+YY_RULE_SETUP
+#line 226 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( LABELSTR); }
+	YY_BREAK
+case 119:
+YY_RULE_SETUP
+#line 227 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( LABELSTR); }
+	YY_BREAK
+case 120:
+YY_RULE_SETUP
+#line 228 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( STRINGCONSTANT ); }
+	YY_BREAK
+case 121:
+YY_RULE_SETUP
+#line 229 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( EUINT64VAL ); }
+	YY_BREAK
+case 122:
+YY_RULE_SETUP
+#line 230 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ESINT64VAL ); }
+	YY_BREAK
+case 123:
+YY_RULE_SETUP
+#line 231 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( yytext[0] == 's' ? ESINT64VAL : EUINT64VAL ); }
+	YY_BREAK
+case 124:
+YY_RULE_SETUP
+#line 232 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UINTVAL); }
+	YY_BREAK
+case 125:
+YY_RULE_SETUP
+#line 233 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SINTVAL); }
+	YY_BREAK
+case 126:
+YY_RULE_SETUP
+#line 234 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( FPVAL); }
 	YY_BREAK
-case 115:
+case 127:
 YY_RULE_SETUP
-#line 223 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 235 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( FPVAL); }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 224 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 236 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
@@ -1735,22 +1828,22 @@ case YY_STATE_EOF(INITIAL):
                   return EOF;
                 }
 	YY_BREAK
-case 116:
+case 128:
 YY_RULE_SETUP
-#line 232 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 244 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { /* Ignore whitespace */ }
 	YY_BREAK
-case 117:
+case 129:
 YY_RULE_SETUP
-#line 233 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 245 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { return yytext[0]; }
 	YY_BREAK
-case 118:
+case 130:
 YY_RULE_SETUP
-#line 235 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 247 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 1754 "UpgradeLexer.cpp"
+#line 1847 "UpgradeLexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2037,7 +2130,7 @@ static yy_state_type yy_get_previous_state()
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 511 )
+			if ( yy_current_state >= 556 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2067,11 +2160,11 @@ yy_state_type yy_current_state;
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 511 )
+		if ( yy_current_state >= 556 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 510);
+	yy_is_jam = (yy_current_state == 555);
 	if ( ! yy_is_jam )
 		*yy_state_ptr++ = yy_current_state;
 
@@ -2628,5 +2721,5 @@ int main()
 	return 0;
 	}
 #endif
-#line 235 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 247 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 
diff --git a/tools/llvm-upgrade/UpgradeLexer.cpp.cvs b/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
index de1ffbf..b35c029 100644
--- a/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
+++ b/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
@@ -317,35 +317,36 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
 	*yy_cp = '\0'; \
 	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 118
-#define YY_END_OF_BUFFER 119
-static yyconst short int yy_acclist[196] =
+#define YY_NUM_RULES 130
+#define YY_END_OF_BUFFER 131
+static yyconst short int yy_acclist[208] =
     {   0,
-      119,  117,  118,  116,  117,  118,  116,  118,  117,  118,
-      117,  118,  117,  118,  117,  118,  117,  118,  117,  118,
-      109,  117,  118,  109,  117,  118,    1,  117,  118,  117,
-      118,  117,  118,  117,  118,  117,  118,  117,  118,  117,
-      118,  117,  118,  117,  118,  117,  118,  117,  118,  117,
-      118,  117,  118,  117,  118,  117,  118,  117,  118,  117,
-      118,  117,  118,  117,  118,  117,  118,  117,  118,  117,
-      118,  108,  106,  105,  105,  112,  110,  114,  109,    1,
-       90,   38,   72,   22,  108,  105,  105,  113,  114,   19,
-      114,  115,   60,   71,   36,   31,   39,   63,    3,   51,
-
-       62,   80,   67,   89,   84,   85,   61,   73,  107,  114,
-      114,   86,   46,   81,   82,   66,   98,   70,   99,   53,
-       87,   21,  111,   65,   69,   23,    4,   59,   64,   52,
-       68,   45,   11,  114,   33,    2,    5,   55,   57,   47,
-       75,   79,   77,   78,   76,   74,   49,  100,   48,   54,
-       20,   97,   42,   56,   27,   94,   41,    7,   92,   30,
-       96,   35,   58,   83,   91,   24,   25,   93,   50,   88,
-       40,    6,   26,   34,    8,   16,    9,   10,   32,   12,
-       14,   13,   29,   37,   15,   28,   95,  101,  103,  104,
-       43,  102,   17,   44,   18
-
+      131,  129,  130,  128,  129,  130,  128,  130,  129,  130,
+      129,  130,  129,  130,  129,  130,  129,  130,  129,  130,
+      121,  129,  130,  121,  129,  130,    1,  129,  130,  129,
+      130,  129,  130,  129,  130,  129,  130,  129,  130,  129,
+      130,  129,  130,  129,  130,  129,  130,  129,  130,  129,
+      130,  129,  130,  129,  130,  129,  130,  129,  130,  129,
+      130,  129,  130,  129,  130,  129,  130,  129,  130,  129,
+      130,  120,  118,  117,  117,  124,  122,  126,  121,    1,
+      102,   38,   72,   22,  120,  117,  117,  125,  126,   19,
+      126,  127,   60,   71,   36,   31,   39,   63,    3,   51,
+
+       62,   80,   67,  101,   96,   97,   61,   73,  119,  126,
+      126,   98,   46,   81,   82,   66,  110,   70,  111,   53,
+       99,   21,  123,   65,   85,   69,   23,    4,   59,   64,
+       52,   68,   45,   11,   84,  126,   33,    2,    5,   55,
+       87,   57,   47,   75,   79,   77,   78,   76,   74,   49,
+      112,   83,   48,   54,   20,  109,   42,   56,   27,  106,
+       41,   89,   88,    7,  104,   30,  108,   35,   58,   95,
+       91,  103,   24,   25,   90,  105,   50,  100,   94,   40,
+        6,   26,   86,   34,    8,   16,    9,   93,   10,   92,
+       32,   12,   14,   13,   29,   37,   15,   28,  107,  113,
+
+      115,  116,   43,  114,   17,   44,   18
     } ;
 
-static yyconst short int yy_accept[512] =
+static yyconst short int yy_accept[557] =
     {   0,
         1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
        17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
@@ -355,55 +356,59 @@ static yyconst short int yy_accept[512] =
        81,   81,   81,   81,   81,   81,   81,   81,   81,   82,
        82,   83,   83,   83,   83,   83,   83,   83,   83,   83,
        83,   83,   83,   83,   83,   83,   83,   83,   83,   83,
-       83,   83,   83,   83,   83,   83,   83,   83,   84,   84,
+       83,   83,   83,   83,   83,   83,   83,   83,   83,   84,
        84,   84,   84,   84,   84,   84,   84,   84,   84,   84,
 
-       84,   84,   84,   85,   85,   85,   85,   85,   85,   85,
-       85,   85,   85,   85,   85,   85,   85,   85,   85,   86,
-       87,   89,   90,   91,   92,   92,   93,   94,   94,   94,
-       95,   95,   95,   96,   96,   97,   97,   97,   97,   98,
-       98,   98,   98,   98,   98,   98,   99,   99,   99,  100,
-      100,  100,  100,  100,  100,  100,  100,  100,  100,  100,
-      100,  101,  101,  101,  101,  101,  101,  101,  101,  101,
-      101,  102,  102,  102,  103,  103,  104,  105,  105,  105,
-      105,  105,  105,  105,  106,  106,  107,  107,  107,  107,
-      107,  108,  108,  108,  108,  108,  108,  108,  108,  108,
+       84,   84,   84,   84,   84,   85,   85,   85,   85,   85,
+       85,   85,   85,   85,   85,   85,   85,   85,   85,   85,
+       85,   86,   87,   89,   90,   91,   92,   92,   93,   94,
+       94,   94,   95,   95,   95,   96,   96,   97,   97,   97,
+       97,   97,   98,   98,   98,   98,   98,   98,   98,   99,
+       99,   99,  100,  100,  100,  100,  100,  100,  100,  100,
+      100,  100,  100,  100,  100,  100,  101,  101,  101,  101,
+      101,  101,  101,  101,  101,  101,  102,  102,  102,  103,
+      103,  103,  104,  105,  105,  105,  105,  105,  105,  105,
+      105,  106,  106,  107,  107,  107,  107,  107,  107,  108,
 
       108,  108,  108,  108,  108,  108,  108,  108,  108,  108,
-      108,  108,  109,  109,  110,  111,  111,  111,  111,  112,
-      112,  112,  112,  113,  113,  114,  115,  116,  116,  116,
+      108,  108,  108,  108,  108,  108,  108,  108,  108,  108,
+      108,  109,  109,  109,  110,  111,  111,  111,  111,  112,
+      112,  112,  112,  113,  113,  113,  114,  115,  116,  116,
       116,  116,  116,  116,  116,  116,  116,  116,  116,  116,
-      116,  116,  116,  117,  117,  118,  119,  119,  119,  119,
-      119,  119,  119,  119,  119,  119,  120,  121,  122,  122,
-      122,  123,  123,  123,  124,  124,  125,  125,  125,  125,
-      125,  125,  125,  125,  125,  125,  126,  126,  126,  127,
-      127,  127,  128,  129,  129,  130,  131,  131,  131,  131,
-      131,  132,  132,  132,  133,  133,  134,  134,  134,  135,
-
-      136,  136,  136,  137,  137,  137,  137,  137,  137,  137,
-      137,  137,  137,  137,  137,  137,  137,  138,  138,  139,
-      139,  139,  139,  139,  139,  139,  140,  140,  140,  140,
-      140,  140,  140,  141,  141,  141,  142,  143,  144,  145,
-      146,  147,  148,  148,  148,  149,  149,  149,  149,  150,
-      151,  152,  152,  152,  152,  152,  152,  152,  152,  152,
-      153,  153,  154,  154,  154,  154,  154,  154,  154,  154,
-      155,  156,  157,  157,  157,  158,  158,  159,  159,  159,
-      159,  160,  160,  161,  162,  163,  164,  164,  164,  165,
-      165,  165,  166,  167,  168,  168,  169,  170,  171,  171,
-
-      171,  171,  171,  171,  171,  172,  172,  173,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      175,  175,  175,  175,  175,  175,  175,  175,  175,  176,
-      176,  176,  176,  176,  177,  177,  177,  177,  177,  178,
-      179,  179,  179,  179,  179,  180,  180,  180,  180,  181,
-      181,  182,  183,  183,  183,  183,  183,  183,  183,  183,
-      183,  183,  183,  183,  183,  184,  184,  184,  184,  184,
-      184,  184,  184,  185,  185,  185,  185,  185,  186,  186,
-      186,  186,  186,  187,  187,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  189,  189,
-
-      190,  191,  191,  192,  192,  193,  194,  195,  195,  196,
-      196
+      116,  116,  116,  116,  117,  117,  117,  117,  117,  118,
+      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
+      119,  120,  121,  122,  122,  122,  123,  123,  123,  123,
+      124,  124,  125,  125,  125,  125,  125,  125,  125,  126,
+      126,  126,  126,  126,  127,  127,  127,  128,  128,  128,
+
+      129,  129,  130,  130,  131,  132,  132,  132,  132,  132,
+      132,  133,  133,  133,  134,  134,  135,  135,  135,  136,
+      137,  138,  138,  138,  139,  139,  139,  139,  139,  139,
+      139,  139,  139,  139,  139,  139,  139,  139,  139,  140,
+      140,  141,  142,  142,  142,  142,  142,  142,  142,  142,
+      142,  142,  142,  143,  143,  143,  143,  143,  143,  143,
+      143,  144,  144,  144,  145,  146,  147,  148,  149,  150,
+      151,  151,  151,  151,  152,  152,  152,  152,  153,  154,
+      154,  155,  156,  156,  156,  156,  156,  156,  156,  156,
+      156,  157,  157,  157,  158,  158,  158,  158,  158,  158,
+
+      158,  158,  159,  160,  161,  161,  161,  162,  163,  164,
+      164,  164,  165,  165,  165,  165,  165,  166,  166,  167,
+      168,  169,  170,  170,  170,  170,  171,  171,  171,  172,
+      173,  174,  175,  176,  176,  177,  178,  179,  179,  179,
+      179,  179,  179,  180,  180,  181,  181,  182,  183,  183,
+      183,  183,  183,  183,  184,  184,  184,  184,  184,  184,
+      184,  184,  184,  185,  185,  185,  185,  185,  185,  185,
+      185,  185,  186,  186,  186,  186,  186,  187,  187,  187,
+      187,  187,  188,  189,  190,  190,  191,  191,  191,  191,
+      192,  192,  192,  192,  193,  193,  194,  195,  195,  195,
+
+      195,  195,  195,  195,  195,  195,  195,  195,  195,  195,
+      196,  196,  196,  196,  196,  196,  196,  196,  197,  197,
+      197,  197,  197,  198,  198,  198,  198,  198,  199,  199,
+      200,  200,  200,  200,  200,  200,  200,  200,  200,  200,
+      200,  200,  200,  201,  201,  202,  203,  203,  204,  204,
+      205,  206,  207,  207,  208,  208
     } ;
 
 static yyconst int yy_ec[256] =
@@ -447,129 +452,137 @@ static yyconst int yy_meta[44] =
         3,    3,    3
     } ;
 
-static yyconst short int yy_base[516] =
+static yyconst short int yy_base[561] =
     {   0,
-        0,    0, 1110, 1111, 1111, 1111, 1105, 1094,   36,   40,
+        0,    0, 1200, 1201, 1201, 1201, 1195, 1184,   36,   40,
        44,   50,   56,   62,    0,   63,   66,   81,   89,   47,
       100,   97,   76,   96,  111,   46,   48,  110,   68,  140,
-      126,  171,  119,  123,   73,  125, 1103, 1111, 1092, 1111,
+      126,  171,  120,  123,   73,  130, 1193, 1201, 1182, 1201,
         0,  159,  176,  199,  204,   95,  209,  224,  229,    0,
-      130,  165,  133,  120,  169,  151,  159,   31, 1091,  168,
-      143,  230,  189,  191,  233,  117,  145,  187,  241,  243,
-      242,  246,  244,  251,  248,  254,  255,  253,  176,  256,
-      263,  258,  267,  261,  277,  281,  283, 1090,  284,  285,
-      286,  287,  265,  290,  300,  295,  291,  308,  294,  305,
-
-      318,  320, 1089,  321,  306,  301,  322,  326,  324,  328,
-      330,  332,  213,  337,  346,  340,  327,  347, 1088,    0,
-      359,  363, 1087,  377,  394,    0, 1086,  353,  363, 1085,
-      369,  379, 1084,  370, 1083,  289,  367,  384, 1082,  389,
-      395,  396,  398,  399,  401, 1081,  402,  365,  406,  404,
-      409,  410,  385,  412,  420,  422,  424,  421,  426,  434,
-      435,  428,  436,  113,  429,  439,  440,  442,  449,  448,
-     1080,  450,  453, 1079,  454, 1078, 1077,  478,  455,  457,
-      456,  458,  489, 1076,  469, 1075,  460,  459,  491,  492,
-     1074,  493,  494,  497,  495,  496,  501,  499,  502,  503,
-
-      511,  512,  515,  517,  518,  519,  461,  523,  520,  529,
-      532, 1073,  533, 1111,  543,  551,  557,  561,  566,  567,
-      568,  569, 1072,  570, 1071, 1070, 1069,  571,  572,  573,
-      574,  576,  577,  579,  582,  585,  583,  580,  591,  592,
-      593,  594, 1068,  603, 1067, 1066,  604,  605,  607,  608,
-      609,  611,  613,  614,  618, 1065, 1064, 1063,  617,  621,
-     1062,  615,  620,    0,  622, 1061,  624,  627,  638,  640,
-      641,  642,  623,  644,  647, 1060,  648,  645, 1059,  653,
-      655, 1058, 1057,  659, 1056, 1055,  660,  665,  661,  667,
-     1054,  669,  672, 1053,  673, 1052,  676,  674,  681, 1051,
-
-      683,  681, 1050,  685,  694,  695,  700,  682,  691,  701,
-      704,  706,  707,  708,  709,  710, 1049,  711, 1048,  712,
-      713,  714,  716,  719,  725, 1047,  727,  729,  733,  732,
-      737,  742, 1046,  735,  722, 1045, 1044, 1043, 1042, 1041,
-     1040, 1039,  743,  747, 1038,  748,  749,  750, 1037, 1036,
-     1035,  754,  755,  752,  756,  764,  765,  762,  766, 1034,
-      768, 1033,  769,  771,  773,  779,  774,  776,  780, 1032,
-     1031, 1030,  787,  782, 1029,  784, 1028,  790,  793,  803,
-     1027,  797, 1026, 1025, 1024, 1023,  789,  795, 1022,  806,
-      807, 1021, 1020, 1019,  809, 1018, 1017, 1016,  811,  813,
-
-      814,  816,  819,  818, 1015,  820, 1014, 1013,  823,  824,
-      825,  827,  828,  830,  831,  832,  834,  843,  833, 1012,
-      840,  850,  853,  854,  846,  857,  856,  860, 1011,  861,
-      866,  867,  868, 1010,  872,  874,  870,  873, 1007,  997,
-      862,  883,  881,  878,  996,  894,  895,  886,  995,  880,
-      994,  992,  897,  896,  898,  904,  906,  907,  908,  910,
-      911,  912,  913,  914,  991,  916,  918,  920,  923,  929,
-      931,  924,  989,  932,  927,  935,  937,  988,  944,  925,
-      943,  945,  987,  949,  986,  951,  954,  955,  957,  958,
-      959,  960,  963,  964,  965,  969,  970,  981,  973,  980,
-
-      876,  975,  538,  976,  535,  462,  423,  978,  216, 1111,
-     1013, 1015,  226, 1019,   76
+      134,  165,  137,  124,  169,  151,  159,   31, 1181,  168,
+      210,  230,  233,  127,  241,  189,  176,  117,  242,  244,
+      240,  243,  246,  249,  252,  253,  257,  259,  263,  265,
+      266,  274,  268,  269,  273,  277,  282,  211, 1180,  287,
+      290,  293,  294,  160,  270,  295,  304,  305,  299,  306,
+
+      312,  296,  321,  324, 1179,  325,  309,  313,  333,  335,
+      318,  339,  342,  332,  350,  340,  343,  215,  356,  357,
+     1178,    0,  365,  370, 1177,  389,  406,    0, 1176,  359,
+      372, 1175,  371,  374, 1174,  381, 1173,  375,  301,  376,
+      393, 1172,  401,  396,  408,  407,  410,  411, 1171,  414,
+      413,  415,  420,  421,  422,  424,  431,  432,  433,  434,
+      441,  436,  440,  438,  439,  449,  443,  454,  383,  451,
+      459,  462,  464,  465,  466, 1170,  468,  469, 1169,  470,
+      471, 1168, 1167,  499,  476,  475,  488,  477,  503,  492,
+     1166,  510, 1165,  481,  484,  516,  513,  517, 1164,  519,
+
+      521,  522,  524,  523,  526,  525,  527,  528,  537,  530,
+      541,  544,  545,  546,  539,  549,  556,  560,  559,  478,
+     1163,  561,  563, 1201,  571,  591,  579,  595,  600,  566,
+      601,  602, 1162,  603,  604, 1161, 1160, 1159,  605,  606,
+      607,  610,  611,  613,  614,  615,  617,  618,  621,  622,
+      628,  572,  627, 1158,  624,  635,  637,  636, 1157, 1156,
+      638,  639,  642,  645,  646,  650,  648,  649,  652,  654,
+     1155, 1154, 1153,  655,  656, 1152,  657,  663,  665,    0,
+      675, 1151,  672,  680,  674,  679,  682,  689, 1150,  676,
+      690,  692,  693, 1149,  695,  706, 1148,  707,  696, 1147,
+
+      708, 1146,  709, 1145, 1144,  710,  571,  712,  714,  717,
+     1143,  721,  723, 1142,  724, 1141,  726,  725, 1140,  731,
+     1139,  732,  731, 1138,  733,  743,  735,  745,  741,  749,
+      751,  678,  753,  754,  756,  758,  759,  760, 1137,  761,
+     1136, 1135,  762,  764,  765,  769,  771,  774,  766,  779,
+      780,  783, 1134,  784,  785,  788,  791,  793,  797,  798,
+     1133,  787,  803, 1132, 1131, 1130, 1129, 1128, 1127, 1126,
+      804,  807,  808, 1125,  809,  810,  813, 1124, 1123,  812,
+     1122, 1121,  816,  820,  814,  818,  825,  830,  824,  815,
+     1120,  836,  834, 1119,  839,  841,  840,  842,  843,  844,
+
+      845, 1118, 1117, 1116,  850,  846, 1115, 1114, 1113,  852,
+      858, 1112,  861,  864,  866,  853, 1111,  860, 1110, 1109,
+     1108, 1107,  872,  875,  877, 1106,  878,  879, 1105, 1104,
+     1103, 1102, 1101,  883, 1100, 1099, 1098,  881,  880,  882,
+      884,  886, 1097,  885, 1096,  888, 1095, 1094,  891,  898,
+      899,  900,  901, 1093,  904,  905,  909,  911,  907,  914,
+      916,  917, 1092,  918,  920,  927,  921,  931,  934,  933,
+      935, 1091,  936,  939,  942,  944, 1090,  937,  947,  945,
+      948, 1089, 1088, 1087,  950, 1086,  949,  959,  955, 1083,
+      967,  970,  969, 1074,  971, 1072, 1071,  972,  976,  973,
+
+      978,  979,  951,  981,  984,  986,  987,  989,  993, 1070,
+      991,  990,  997,  999, 1000, 1002, 1003, 1068, 1008, 1010,
+     1012, 1013, 1067, 1014, 1015, 1018, 1019, 1066, 1021, 1065,
+     1020, 1030, 1029, 1024, 1032, 1033, 1034, 1040, 1043, 1045,
+     1044, 1046, 1063, 1047, 1062, 1060, 1048, 1059, 1049, 1056,
+      677,  479, 1054,  435, 1201, 1089, 1091,  124, 1095,   76
     } ;
 
-static yyconst short int yy_def[516] =
+static yyconst short int yy_def[561] =
     {   0,
-      510,    1,  510,  510,  510,  510,  511,  512,  513,  510,
-      512,  512,  512,  512,  514,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  511,  510,  512,  510,
-      515,  515,  510,  510,  512,  512,  512,  512,  512,  514,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  510,  515,
-      515,  510,  512,  512,  512,   49,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,   49,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  510,  510,  510,  510,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  178,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  510,  512,
-
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-
-      512,  512,  512,  512,  512,  512,  512,  512,  512,    0,
-      510,  510,  510,  510,  510
+      555,    1,  555,  555,  555,  555,  556,  557,  558,  555,
+      557,  557,  557,  557,  559,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  556,  555,  557,  555,
+      560,  560,  555,  555,  557,  557,  557,  557,  557,  559,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      555,  560,  560,  555,  557,  557,  557,   49,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,   49,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  555,  555,  555,  555,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  184,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  555,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      557,  557,  557,  557,    0,  555,  555,  555,  555,  555
     } ;
 
-static yyconst short int yy_nxt[1155] =
+static yyconst short int yy_nxt[1245] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   14,   14,    4,   15,    8,    8,    8,   16,   17,
@@ -577,113 +590,121 @@ static yyconst short int yy_nxt[1155] =
        26,   27,   28,    8,   29,   30,   31,   32,   33,   34,
        35,    8,   36,   42,   40,   43,   43,   43,   43,   44,
        44,   44,   44,   45,   45,   45,   45,   40,   46,   40,
-       40,   40,  136,   40,   47,   48,   48,   48,   48,   40,
-       47,   48,   48,   48,   48,   40,   40,   69,  120,   40,
-       87,   40,   88,   86,   51,  116,   40,   70,   56,   40,
-       91,   52,   57,   53,   40,   54,   49,   58,   55,   60,
-
-       59,   61,   40,  123,  117,   77,   78,   64,   40,   40,
-       40,   65,   62,   40,   79,   66,   63,   67,   71,   75,
-       68,   72,   80,   40,   40,   76,   40,   81,   73,   83,
-       40,   82,   40,   40,   74,   89,   40,  113,   40,   40,
-      254,   90,   84,   40,  102,  115,   40,  118,   85,   92,
-      114,  127,  131,   40,  130,  146,   40,  103,   40,   93,
-      104,   94,   95,  139,   40,   96,   97,  105,  121,  121,
-      121,  121,   40,  147,   98,  134,   99,  100,   40,  101,
-       92,   40,   40,  135,   40,   43,   43,   43,   43,   40,
-      106,  128,  107,  129,  132,  163,  137,  108,  133,  109,
-
-       40,  110,   40,  138,   40,  111,  112,  122,   44,   44,
-       44,   44,   47,   45,   45,   45,   45,   40,  124,  124,
-      124,  124,   40,  142,  148,  125,   40,  143,   41,   40,
-      207,  125,   47,   48,   48,   48,   48,   40,  126,  126,
-      126,  126,   40,   40,  126,  126,   40,  126,  126,  126,
-      126,  126,  126,  144,   40,   40,   40,   40,  140,   40,
-      141,   40,  149,  150,   40,  145,   40,   40,   40,   40,
-      152,   40,  154,  156,   40,  155,   40,  153,   40,  151,
-       40,  166,  170,  168,  157,  158,  164,  159,  160,  161,
-       40,  162,  165,  167,   40,  169,   40,   40,   40,   40,
-
-       40,  173,   40,   40,   40,  171,  179,   40,   40,  172,
-      174,  175,  188,   40,   40,  176,  180,  225,   40,   40,
-      181,   40,  177,  184,  191,  190,  185,  178,  182,  186,
-      189,   40,  187,   40,   40,   40,  183,   40,  197,   40,
-       40,   40,  198,   40,  192,   40,  193,  195,  199,  202,
-       40,  211,  205,   40,  194,  201,  200,  206,  196,   40,
-       40,  212,  203,  208,  210,  209,   40,  204,  121,  121,
-      121,  121,  215,  215,  215,  215,   40,  220,   40,  216,
-       40,  213,   40,   40,  236,  216,  124,  124,  124,  124,
-       40,  222,   40,  125,  221,  226,  224,   40,   40,  125,
-
-      217,  218,   40,  219,  219,  219,  219,   40,   40,   40,
-      228,   40,   40,  223,   40,   40,  231,   40,  230,   40,
-      227,  242,   40,   40,  234,   40,  238,  232,  235,  233,
-      229,  239,  237,   40,   40,   40,   40,   40,  244,   40,
-      248,   40,   40,  240,  245,  241,  247,   40,   40,   40,
-      243,  246,   40,   40,  249,   40,  250,  251,  253,  252,
-      256,   40,   40,   40,  257,  255,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,  258,  259,  261,  293,
-      268,  275,   40,  274,  263,  260,  262,  264,  264,  264,
-      264,  265,  267,  264,  264,  266,  264,  264,  264,  264,
-
-      264,  264,   40,  273,   40,   40,   40,   40,   40,   40,
-       40,  269,   40,  270,   40,   40,   40,  271,  282,  272,
-      276,  280,  279,  283,   40,   40,  277,  281,   40,  278,
-       40,   40,   40,   40,  288,  284,   40,  289,  295,  286,
-      285,  287,   40,  290,  294,   40,   40,  291,   40,  297,
-      292,   40,  215,  215,  215,  215,  296,  217,  217,  216,
-      299,  299,  299,  299,  298,  216,  299,  299,  299,  299,
-      219,  219,  219,  219,   40,  219,  219,  219,  219,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,  301,   40,
-       40,  304,   40,   40,  308,   40,   40,  300,   40,  302,
-
-      303,  313,  307,  309,   40,   40,   40,   40,  305,  306,
-      316,  311,  314,  312,  318,  317,   40,   40,   40,  310,
-       40,   40,   40,  321,   40,  315,   40,   40,   40,  322,
-       40,   40,  320,   40,   40,   40,   40,   40,  325,  319,
-       40,  326,  323,  324,  333,  327,  328,  335,  329,  330,
-      334,   40,  331,   40,   40,   40,  332,   40,   40,  342,
-       40,   40,  337,  339,  341,  346,   40,  343,   40,  344,
-      345,  336,   40,   40,   40,  347,  338,  340,   40,  352,
-       40,  349,   40,  348,  350,   40,   40,   40,  351,   40,
-      299,  299,  299,  299,   40,   40,   40,  353,   40,  357,
-
-      359,  360,  361,  354,   40,  362,  355,   40,   40,  356,
-      367,  358,  363,   40,   40,  364,  366,   40,  365,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,  370,   40,
-      374,  375,   40,  368,  376,   40,  369,  371,   40,  373,
-       40,  377,   40,  378,  372,   40,   40,  381,   40,  380,
-       40,  383,  379,  384,  385,   40,   40,  382,  389,  386,
-       40,   40,   40,   40,  387,   40,  388,   40,   40,   40,
-      391,  390,  394,  392,  395,   40,  396,   40,   40,   40,
-      398,   40,   40,  400,   40,  393,   40,   40,  397,   40,
-      399,  405,   40,   40,  403,   40,  402,   40,  401,  404,
-
-       40,  407,   40,   40,  411,  412,   40,  409,   40,  408,
-       40,  410,  415,  414,  406,  416,   40,  418,  413,   40,
-       40,  417,   40,  419,   40,  420,   40,   40,  421,   40,
-      422,   40,   40,   40,  423,  426,   40,   40,   40,  424,
-       40,   40,  427,   40,   40,   40,   40,   40,  425,  428,
-      435,  430,  436,   40,  429,  434,   40,  431,  432,   40,
-      438,  437,  439,   40,  433,  440,   40,   40,  441,   40,
-       40,  444,  443,   40,   40,   40,  445,  447,  442,   40,
-       40,   40,  446,   40,  449,   40,   40,   40,  458,   40,
-      453,   40,  448,   40,   40,  457,   40,  461,  450,   40,
-
-      454,  460,  451,  452,  455,  459,  456,   40,   40,   40,
-       40,   40,  464,  463,  462,  466,  465,   40,  467,   40,
-       40,   40,  469,   40,   40,   40,   40,   40,  472,   40,
-      475,   40,  477,   40,  468,  470,   40,   40,   40,  474,
-       40,  476,   40,  478,   40,   40,  473,  479,   40,  471,
-       40,  482,  480,  483,  485,  486,   40,   40,   40,  481,
-      484,  490,   40,  487,   40,  488,  489,   40,   40,  491,
-       40,   40,   40,   40,  495,  492,   40,   40,   40,  494,
-      493,  496,   40,   40,  502,  503,   40,  497,   40,   40,
-      499,   40,  498,   40,   40,  507,  500,  501,  508,   40,
-
-       40,   40,   40,  506,   40,   40,  505,   40,   40,   40,
-       40,  504,  509,   37,   37,   37,   37,   39,   39,   50,
-       40,   50,   50,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,  139,   40,   47,   48,   48,   48,   48,   40,
+       47,   48,   48,   48,   48,   40,   40,   69,  122,   40,
+       88,   40,   89,   87,   51,  118,   40,   70,   56,   40,
+       93,   52,   57,   53,   40,   54,   49,   58,   55,   60,
+
+       59,   61,   40,  125,  119,   78,   79,   64,   40,   40,
+       40,   65,   62,   40,   80,   66,   63,   67,   71,   76,
+       68,   72,   81,   40,   40,   77,   41,   82,   73,   84,
+       40,   83,   74,   40,   75,   90,   40,   40,  115,   40,
+       40,   91,   85,   40,  104,  117,   92,   40,   86,   94,
+       40,  116,  120,   40,  151,  129,  133,  105,  132,   95,
+      106,   96,   97,  146,   40,   98,   99,  107,  123,  123,
+      123,  123,   40,   40,  100,  136,  101,  102,   40,  103,
+       94,   40,   40,  137,   40,   43,   43,   43,   43,   40,
+      108,  130,  109,  131,  134,  138,  140,  110,  135,  111,
+
+      184,  112,   40,  141,  150,  113,  114,  124,   44,   44,
+       44,   44,   47,   45,   45,   45,   45,   40,  126,  126,
+      126,  126,   40,   40,   40,  127,  220,  149,   40,  178,
+      142,  127,   47,   48,   48,   48,   48,   40,  128,  128,
+      128,  128,   40,   40,  128,  128,   40,  128,  128,  128,
+      128,  128,  128,   40,   40,   40,   40,   40,  143,   40,
+      144,  147,   40,  152,  153,   40,   40,  145,  155,  157,
+       40,  159,   40,  148,  161,  156,   40,  158,   40,   40,
+      154,   40,   40,   40,  168,  160,   40,   40,  163,  162,
+       40,  164,  171,  173,  175,   40,  169,  174,  165,  166,
+
+       40,  167,  170,   40,  172,  176,   40,   40,   40,   40,
+      177,  185,   40,  179,   40,  199,  180,   40,   40,   40,
+      195,  186,   40,  182,  187,   40,   40,  181,  197,  236,
+      183,   40,  188,  191,   40,  196,  192,   40,   40,  193,
+      189,  205,  194,  198,  190,   40,   40,  200,   40,  210,
+      201,  203,   40,   40,  206,   40,   40,  215,  202,  207,
+      211,  219,  204,   40,  214,  208,  217,  216,  218,   40,
+       40,  209,   40,  212,  123,  123,  123,  123,  213,  225,
+      225,  225,  225,  230,   40,   40,  226,   40,   40,   40,
+      221,  222,  226,  232,   40,  235,   40,  223,  126,  126,
+
+      126,  126,   40,  231,  237,  127,   40,  234,  233,   40,
+      269,  127,  227,  228,   40,  229,  229,  229,  229,   40,
+       40,   40,  239,   40,   40,  242,   40,   40,   40,  238,
+      241,  240,  247,   40,   40,   40,  245,   40,  243,  244,
+      246,  248,  249,  250,   40,   40,   40,   40,   40,   40,
+      255,   40,   40,   40,   40,  251,   40,  252,  261,  262,
+      253,  264,   40,  259,   40,  257,  263,   40,  258,  254,
+      260,  265,   40,  256,  267,   40,  268,   40,   40,   40,
+      271,   40,   40,   40,   40,  266,  272,  270,   40,   40,
+       40,   40,   40,  274,   40,  317,  276,   40,  273,  284,
+
+      278,   40,  277,  275,  291,   40,  292,  279,  280,  280,
+      280,  280,  281,  282,  280,  280,   40,  280,  280,  280,
+      280,  280,  280,   40,  283,  285,   40,  286,  289,   40,
+       40,  287,   40,  288,   40,   40,   40,   40,   40,   40,
+       40,   40,  294,   40,  290,  300,  298,  293,  302,  297,
+       40,  295,   40,  301,   40,  296,  299,   40,   40,   40,
+      307,  303,   40,  308,  305,  304,  309,  313,  306,   40,
+      312,  310,   40,   40,   40,  311,   40,  314,  315,   40,
+      225,  225,  225,  225,   40,   40,  316,  226,  320,  320,
+      320,  320,  318,  226,  339,  381,  321,  227,  227,  319,
+
+      320,  320,  320,  320,  229,  229,  229,  229,   40,  229,
+      229,  229,  229,   40,   40,   40,   40,   40,   40,   40,
+       40,  322,  325,   40,   40,  326,   40,   40,   40,  330,
+       40,   40,  323,  324,   40,   40,  335,   40,  329,  331,
+       40,   40,  327,  328,  333,  334,  338,  340,   40,   40,
+       40,   40,   40,  336,  332,   40,  337,  347,   40,   40,
+      341,   40,   40,   40,  348,   40,  346,   40,   40,   40,
+       40,  342,  343,  345,  344,  352,   40,  353,   40,  349,
+      350,  351,  355,  354,  357,   40,  356,   40,   40,   40,
+       40,   40,   40,   40,  358,   40,  360,  361,  362,  359,
+
+      363,  365,   40,   40,  367,   40,   40,  364,   40,   40,
+      400,  369,  370,  371,  372,  366,  373,  374,  368,   40,
+       40,   40,   40,   40,  377,   40,  375,   40,  378,  376,
+       40,  379,  383,  380,   40,  382,   40,   40,   40,   40,
+      320,  320,  320,  320,   40,   40,   40,  384,   40,  388,
+      391,  390,  392,  395,   40,  385,   40,  386,   40,  397,
+      387,  389,   40,  394,   40,  396,   40,   40,  393,   40,
+      399,   40,   40,   40,   40,   40,  402,   40,   40,   40,
+      406,  407,   40,  398,   40,  401,  403,   40,  408,  405,
+      409,  411,   40,   40,  404,  410,   40,   40,   40,  412,
+
+       40,   40,  414,  413,   40,  417,   40,  419,  420,  415,
+       40,   40,  416,  421,  418,  422,   40,   40,  425,  423,
+       40,   40,   40,   40,  424,   40,   40,   40,   40,   40,
+      428,   40,  427,   40,  430,  432,  434,   40,   40,  426,
+      429,  435,  437,   40,  433,  441,  431,   40,  439,   40,
+      436,  438,   40,   40,   40,   40,   40,   40,   40,   40,
+      440,  445,  442,   40,  447,   40,   40,  451,  452,  444,
+      443,   40,  454,   40,   40,  449,  450,   40,  448,   40,
+      460,  446,  453,  456,  458,   40,  457,  455,   40,  459,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+
+      464,   40,  465,  469,   40,  462,  461,  463,  466,  467,
+      470,   40,   40,   40,   40,  468,  471,   40,   40,  473,
+       40,  472,   40,  478,   40,  474,  479,   40,  477,   40,
+       40,   40,  475,   40,   40,  480,  484,  481,  476,  482,
+       40,  483,  488,  490,   40,  489,   40,   40,   40,   40,
+       40,  485,   40,  486,  492,   40,  487,   40,   40,  494,
+       40,   40,   40,   40,   40,  499,  498,  491,   40,  493,
+      502,  504,   40,  495,  506,  496,  503,  500,  497,  505,
+       40,  501,   40,   40,   40,   40,   40,  507,  508,   40,
+      511,   40,   40,  516,   40,  509,  514,   40,  512,   40,
+
+       40,  517,   40,   40,   40,  520,   40,  510,  515,  513,
+       40,  522,   40,   40,  519,   40,   40,  521,  523,  524,
+      518,   40,  527,   40,  528,   40,   40,   40,   40,  525,
+      530,   40,   40,   40,   40,  526,  534,   40,  531,  529,
+      532,  533,   40,   40,  536,   40,   40,   40,  539,  537,
+      540,  535,  538,   40,  542,  541,   40,   40,   40,   40,
+       40,   40,   40,  547,  544,  548,  543,   40,  552,   40,
+      545,  553,   40,   40,  546,   40,   40,  551,   40,   40,
+       40,   40,  550,   40,   40,   40,  549,   40,  554,   37,
+       37,   37,   37,   39,   39,   50,   40,   50,   50,   40,
+
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
@@ -691,16 +712,18 @@ static yyconst short int yy_nxt[1155] =
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,  224,   40,   40,   40,   40,  121,   40,   38,  555,
 
-       40,  214,   40,   40,   40,   40,  119,   40,   38,  510,
-        3,  510,  510,  510,  510,  510,  510,  510,  510,  510,
-      510,  510,  510,  510,  510,  510,  510,  510,  510,  510,
-      510,  510,  510,  510,  510,  510,  510,  510,  510,  510,
-      510,  510,  510,  510,  510,  510,  510,  510,  510,  510,
-      510,  510,  510,  510
+        3,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555
     } ;
 
-static yyconst short int yy_chk[1155] =
+static yyconst short int yy_chk[1245] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -709,126 +732,136 @@ static yyconst short int yy_chk[1155] =
         1,    1,    1,    9,   58,    9,    9,    9,    9,   10,
        10,   10,   10,   11,   11,   11,   11,   11,   12,   26,
        20,   27,   58,   12,   13,   13,   13,   13,   13,   13,
-       14,   14,   14,   14,   14,   14,   16,   20,  515,   17,
+       14,   14,   14,   14,   14,   14,   16,   20,  560,   17,
        27,   29,   27,   26,   16,   35,   35,   20,   17,   23,
        29,   16,   17,   16,   18,   16,   13,   17,   16,   18,
 
        17,   18,   19,   46,   35,   23,   23,   19,   46,   24,
        22,   19,   18,   21,   24,   19,   18,   19,   21,   22,
-       19,   21,   24,   28,   25,   22,  164,   24,   21,   25,
-       66,   24,   33,   54,   21,   28,   34,   33,   36,   31,
-      164,   28,   25,   51,   31,   34,   53,   36,   25,   30,
-       33,   51,   54,   30,   53,   66,   61,   31,   67,   30,
-       31,   30,   30,   61,   56,   30,   30,   31,   42,   42,
-       42,   42,   57,   67,   30,   56,   30,   30,   52,   30,
-       32,   60,   55,   57,   32,   43,   43,   43,   43,   79,
-       32,   52,   32,   52,   55,   79,   60,   32,   55,   32,
-
-       68,   32,   63,   60,   64,   32,   32,   44,   44,   44,
+       19,   21,   24,   28,   25,   22,  558,   24,   21,   25,
+       68,   24,   21,   33,   21,   28,   34,   54,   33,   31,
+       64,   28,   25,   36,   31,   34,   28,   51,   25,   30,
+       53,   33,   36,   30,   68,   51,   54,   31,   53,   30,
+       31,   30,   30,   64,   56,   30,   30,   31,   42,   42,
+       42,   42,   57,   94,   30,   56,   30,   30,   52,   30,
+       32,   60,   55,   57,   32,   43,   43,   43,   43,   67,
+       32,   52,   32,   52,   55,   57,   60,   32,   55,   32,
+
+       94,   32,   66,   60,   67,   32,   32,   44,   44,   44,
        44,   44,   45,   45,   45,   45,   45,   45,   47,   47,
-       47,   47,   47,   63,   68,   47,  113,   64,  513,  509,
-      113,   47,   48,   48,   48,   48,   48,   48,   49,   49,
-       49,   49,   49,   62,   49,   49,   65,   49,   49,   49,
-       49,   49,   49,   65,   69,   71,   70,   73,   62,   72,
-       62,   75,   69,   70,   74,   65,   78,   76,   77,   80,
-       71,   82,   72,   74,   84,   73,   81,   71,   93,   70,
-       83,   81,   84,   82,   75,   76,   80,   77,   78,   78,
-       85,   78,   80,   81,   86,   83,   87,   89,   90,   91,
-
-       92,   87,  136,   94,   97,   85,   93,   99,   96,   86,
-       89,   90,   97,   95,  106,   91,   94,  136,  100,  105,
-       95,   98,   91,   96,  100,   99,   96,   92,   95,   96,
-       98,  101,   96,  102,  104,  107,   95,  109,  105,  108,
-      117,  110,  106,  111,  101,  112,  102,  104,  107,  110,
-      114,  116,  111,  116,  102,  109,  108,  112,  104,  115,
-      118,  117,  110,  114,  115,  114,  128,  110,  121,  121,
-      121,  121,  122,  122,  122,  122,  129,  128,  148,  122,
-      137,  118,  131,  134,  148,  122,  124,  124,  124,  124,
-      124,  131,  132,  124,  129,  137,  134,  138,  153,  124,
-
-      125,  125,  140,  125,  125,  125,  125,  125,  141,  142,
-      140,  143,  144,  132,  145,  147,  143,  150,  142,  149,
-      138,  153,  151,  152,  147,  154,  150,  144,  147,  145,
-      141,  151,  149,  155,  158,  156,  507,  157,  155,  159,
-      158,  162,  165,  151,  156,  152,  157,  160,  161,  163,
-      154,  156,  166,  167,  159,  168,  160,  161,  163,  162,
-      166,  170,  169,  172,  167,  165,  173,  175,  179,  181,
-      180,  182,  188,  187,  207,  506,  168,  169,  172,  207,
-      182,  188,  185,  187,  175,  170,  173,  178,  178,  178,
-      178,  179,  181,  178,  178,  180,  178,  178,  178,  178,
-
-      178,  178,  183,  185,  189,  190,  192,  193,  195,  196,
-      194,  183,  198,  183,  197,  199,  200,  183,  196,  183,
-      189,  194,  193,  197,  201,  202,  190,  195,  203,  192,
-      204,  205,  206,  209,  202,  198,  208,  203,  209,  200,
-      199,  201,  210,  204,  208,  211,  213,  205,  505,  211,
-      206,  503,  215,  215,  215,  215,  210,  216,  216,  215,
-      216,  216,  216,  216,  213,  215,  217,  217,  217,  217,
-      218,  218,  218,  218,  218,  219,  219,  219,  219,  219,
-      220,  221,  222,  224,  228,  229,  230,  231,  221,  232,
-      233,  228,  234,  238,  232,  235,  237,  220,  236,  222,
-
-      224,  237,  231,  233,  239,  240,  241,  242,  229,  230,
-      240,  235,  238,  236,  242,  241,  244,  247,  248,  234,
-      249,  250,  251,  248,  252,  239,  253,  254,  262,  249,
-      259,  255,  247,  263,  260,  265,  273,  267,  252,  244,
-      268,  253,  250,  251,  265,  254,  255,  268,  259,  260,
-      267,  269,  262,  270,  271,  272,  263,  274,  278,  273,
-      275,  277,  270,  271,  272,  278,  280,  274,  281,  275,
-      277,  269,  284,  287,  289,  280,  270,  271,  288,  289,
-      290,  284,  292,  281,  287,  293,  295,  298,  288,  297,
-      299,  299,  299,  299,  302,  308,  301,  290,  304,  297,
-
-      298,  301,  302,  292,  309,  304,  293,  305,  306,  295,
-      309,  297,  305,  307,  310,  306,  308,  311,  307,  312,
-      313,  314,  315,  316,  318,  320,  321,  322,  312,  323,
-      316,  318,  324,  310,  320,  335,  311,  313,  325,  315,
-      327,  321,  328,  322,  314,  330,  329,  325,  334,  324,
-      331,  328,  323,  329,  330,  332,  343,  327,  335,  331,
-      344,  346,  347,  348,  332,  354,  334,  352,  353,  355,
-      344,  343,  348,  346,  352,  358,  353,  356,  357,  359,
-      355,  361,  363,  357,  364,  347,  365,  367,  354,  368,
-      356,  364,  366,  369,  361,  374,  359,  376,  358,  363,
-
-      373,  366,  387,  378,  373,  373,  379,  368,  388,  367,
-      382,  369,  378,  376,  365,  379,  380,  382,  374,  390,
-      391,  380,  395,  387,  399,  388,  400,  401,  390,  402,
-      391,  404,  403,  406,  395,  401,  409,  410,  411,  399,
-      412,  413,  402,  414,  415,  416,  419,  417,  400,  403,
-      413,  406,  414,  421,  404,  412,  418,  409,  410,  425,
-      416,  415,  417,  422,  411,  418,  423,  424,  419,  427,
-      426,  423,  422,  428,  430,  441,  424,  426,  421,  431,
-      432,  433,  425,  437,  428,  435,  438,  436,  441,  501,
-      433,  444,  427,  450,  443,  438,  442,  444,  430,  448,
-
-      435,  443,  431,  432,  436,  442,  437,  446,  447,  454,
-      453,  455,  448,  447,  446,  453,  450,  456,  454,  457,
-      458,  459,  456,  460,  461,  462,  463,  464,  459,  466,
-      462,  467,  464,  468,  455,  457,  469,  472,  480,  461,
-      475,  463,  470,  466,  471,  474,  460,  467,  476,  458,
-      477,  470,  468,  471,  474,  475,  481,  479,  482,  469,
-      472,  480,  484,  476,  486,  477,  479,  487,  488,  481,
-      489,  490,  491,  492,  487,  482,  493,  494,  495,  486,
-      484,  488,  496,  497,  494,  495,  499,  489,  502,  504,
-      491,  508,  490,  500,  498,  502,  492,  493,  504,  485,
-
-      483,  478,  473,  499,  465,  452,  497,  451,  449,  445,
-      440,  496,  508,  511,  511,  511,  511,  512,  512,  514,
-      439,  514,  514,  434,  429,  420,  408,  407,  405,  398,
-      397,  396,  394,  393,  392,  389,  386,  385,  384,  383,
-      381,  377,  375,  372,  371,  370,  362,  360,  351,  350,
-      349,  345,  342,  341,  340,  339,  338,  337,  336,  333,
-      326,  319,  317,  303,  300,  296,  294,  291,  286,  285,
-      283,  282,  279,  276,  266,  261,  258,  257,  256,  246,
-      245,  243,  227,  226,  225,  223,  212,  191,  186,  184,
-      177,  176,  174,  171,  146,  139,  135,  133,  130,  127,
-
-      123,  119,  103,   88,   59,   39,   37,    8,    7,    3,
-      510,  510,  510,  510,  510,  510,  510,  510,  510,  510,
-      510,  510,  510,  510,  510,  510,  510,  510,  510,  510,
-      510,  510,  510,  510,  510,  510,  510,  510,  510,  510,
-      510,  510,  510,  510,  510,  510,  510,  510,  510,  510,
-      510,  510,  510,  510
+       47,   47,   47,   61,   88,   47,  118,   66,  118,   88,
+       61,   47,   48,   48,   48,   48,   48,   48,   49,   49,
+       49,   49,   49,   62,   49,   49,   63,   49,   49,   49,
+       49,   49,   49,   71,   65,   69,   72,   70,   62,   73,
+       62,   65,   74,   69,   70,   75,   76,   63,   71,   72,
+       77,   74,   78,   65,   75,   71,   79,   73,   80,   81,
+       70,   83,   84,   95,   80,   74,   85,   82,   77,   76,
+       86,   78,   82,   83,   85,   87,   81,   84,   79,   79,
+
+       90,   79,   81,   91,   82,   86,   92,   93,   96,  102,
+       87,   95,   99,   90,  139,  102,   91,   97,   98,  100,
+       99,   96,  107,   93,   97,  101,  108,   92,  100,  139,
+       93,  111,   97,   98,  103,   99,   98,  104,  106,   98,
+       97,  107,   98,  101,   97,  114,  109,  103,  110,  111,
+      104,  106,  112,  116,  108,  113,  117,  114,  104,  109,
+      112,  117,  106,  115,  113,  110,  116,  115,  116,  119,
+      120,  110,  130,  112,  123,  123,  123,  123,  112,  124,
+      124,  124,  124,  130,  133,  131,  124,  134,  138,  140,
+      119,  120,  124,  133,  136,  138,  169,  120,  126,  126,
+
+      126,  126,  126,  131,  140,  126,  141,  136,  134,  144,
+      169,  126,  127,  127,  143,  127,  127,  127,  127,  127,
+      146,  145,  143,  147,  148,  146,  151,  150,  152,  141,
+      145,  144,  151,  153,  154,  155,  150,  156,  147,  148,
+      150,  152,  153,  154,  157,  158,  159,  160,  554,  162,
+      158,  164,  165,  163,  161,  154,  167,  155,  162,  163,
+      156,  165,  166,  161,  170,  160,  164,  168,  160,  157,
+      161,  166,  171,  159,  167,  172,  168,  173,  174,  175,
+      171,  177,  178,  180,  181,  166,  172,  170,  186,  185,
+      188,  220,  552,  174,  194,  220,  177,  195,  173,  188,
+
+      180,  187,  178,  175,  194,  190,  195,  181,  184,  184,
+      184,  184,  185,  186,  184,  184,  189,  184,  184,  184,
+      184,  184,  184,  192,  187,  189,  197,  189,  190,  196,
+      198,  189,  200,  189,  201,  202,  204,  203,  206,  205,
+      207,  208,  197,  210,  192,  204,  202,  196,  205,  201,
+      209,  198,  215,  204,  211,  200,  203,  212,  213,  214,
+      210,  206,  216,  211,  208,  207,  212,  216,  209,  217,
+      215,  213,  219,  218,  222,  214,  223,  217,  218,  230,
+      225,  225,  225,  225,  307,  252,  219,  225,  227,  227,
+      227,  227,  222,  225,  252,  307,  230,  226,  226,  223,
+
+      226,  226,  226,  226,  228,  228,  228,  228,  228,  229,
+      229,  229,  229,  229,  231,  232,  234,  235,  239,  240,
+      241,  231,  235,  242,  243,  239,  244,  245,  246,  243,
+      247,  248,  232,  234,  249,  250,  248,  255,  242,  244,
+      253,  251,  240,  241,  246,  247,  251,  253,  256,  258,
+      257,  261,  262,  249,  245,  263,  250,  262,  264,  265,
+      255,  267,  268,  266,  263,  269,  261,  270,  274,  275,
+      277,  256,  257,  258,  257,  267,  278,  268,  279,  264,
+      265,  266,  270,  269,  275,  283,  274,  285,  281,  290,
+      551,  332,  286,  284,  277,  287,  279,  281,  283,  278,
+
+      284,  286,  288,  291,  287,  292,  293,  285,  295,  299,
+      332,  288,  290,  291,  292,  286,  293,  295,  287,  296,
+      298,  301,  303,  306,  299,  308,  296,  309,  301,  298,
+      310,  303,  309,  306,  312,  308,  313,  315,  318,  317,
+      320,  320,  320,  320,  323,  322,  325,  310,  327,  317,
+      322,  318,  323,  327,  329,  312,  326,  313,  328,  329,
+      315,  317,  330,  326,  331,  328,  333,  334,  325,  335,
+      331,  336,  337,  338,  340,  343,  334,  344,  345,  349,
+      338,  340,  346,  330,  347,  333,  335,  348,  343,  337,
+      344,  346,  350,  351,  336,  345,  352,  354,  355,  347,
+
+      362,  356,  349,  348,  357,  352,  358,  355,  356,  350,
+      359,  360,  351,  357,  354,  358,  363,  371,  362,  359,
+      372,  373,  375,  376,  360,  380,  377,  385,  390,  383,
+      372,  386,  371,  384,  375,  377,  383,  389,  387,  363,
+      373,  384,  386,  388,  380,  390,  376,  393,  388,  392,
+      385,  387,  395,  397,  396,  398,  399,  400,  401,  406,
+      389,  396,  392,  405,  398,  410,  416,  405,  405,  395,
+      393,  411,  410,  418,  413,  400,  401,  414,  399,  415,
+      418,  397,  406,  413,  415,  423,  414,  411,  424,  416,
+      425,  427,  428,  439,  438,  440,  434,  441,  444,  442,
+
+      427,  446,  428,  440,  449,  424,  423,  425,  434,  438,
+      441,  450,  451,  452,  453,  439,  442,  455,  456,  446,
+      459,  444,  457,  453,  458,  449,  455,  460,  452,  461,
+      462,  464,  450,  465,  467,  456,  460,  457,  451,  458,
+      466,  459,  465,  467,  468,  466,  470,  469,  471,  473,
+      478,  461,  474,  462,  469,  475,  464,  476,  480,  471,
+      479,  481,  487,  485,  503,  478,  476,  468,  489,  470,
+      481,  487,  488,  473,  489,  474,  485,  479,  475,  488,
+      491,  480,  493,  492,  495,  498,  500,  491,  492,  499,
+      498,  501,  502,  503,  504,  493,  501,  505,  499,  506,
+
+      507,  504,  508,  512,  511,  507,  509,  495,  502,  500,
+      513,  509,  514,  515,  506,  516,  517,  508,  511,  512,
+      505,  519,  515,  520,  516,  521,  522,  524,  525,  513,
+      519,  526,  527,  531,  529,  514,  524,  534,  520,  517,
+      521,  522,  533,  532,  526,  535,  536,  537,  531,  527,
+      532,  525,  529,  538,  534,  533,  539,  541,  540,  542,
+      544,  547,  549,  539,  536,  540,  535,  553,  547,  550,
+      537,  549,  548,  546,  538,  545,  543,  544,  530,  528,
+      523,  518,  542,  510,  497,  496,  541,  494,  553,  556,
+      556,  556,  556,  557,  557,  559,  490,  559,  559,  486,
+
+      484,  483,  482,  477,  472,  463,  454,  448,  447,  445,
+      443,  437,  436,  435,  433,  432,  431,  430,  429,  426,
+      422,  421,  420,  419,  417,  412,  409,  408,  407,  404,
+      403,  402,  394,  391,  382,  381,  379,  378,  374,  370,
+      369,  368,  367,  366,  365,  364,  361,  353,  342,  341,
+      339,  324,  321,  319,  316,  314,  311,  305,  304,  302,
+      300,  297,  294,  289,  282,  276,  273,  272,  271,  260,
+      259,  254,  238,  237,  236,  233,  221,  199,  193,  191,
+      183,  182,  179,  176,  149,  142,  137,  135,  132,  129,
+      125,  121,  105,   89,   59,   39,   37,    8,    7,    3,
+
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555
     } ;
 
 static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
@@ -905,7 +938,7 @@ char *yytext;
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 909 "UpgradeLexer.cpp"
+#line 942 "UpgradeLexer.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1059,7 +1092,7 @@ YY_DECL
 #line 98 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 
 
-#line 1063 "UpgradeLexer.cpp"
+#line 1096 "UpgradeLexer.cpp"
 
 	if ( yy_init )
 		{
@@ -1107,14 +1140,14 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 511 )
+				if ( yy_current_state >= 556 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			*yy_state_ptr++ = yy_current_state;
 			++yy_cp;
 			}
-		while ( yy_current_state != 510 );
+		while ( yy_current_state != 555 );
 
 yy_find_action:
 		yy_current_state = *--yy_state_ptr;
@@ -1563,170 +1596,230 @@ YY_RULE_SETUP
 case 83:
 YY_RULE_SETUP
 #line 187 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SELECT); }
+{ RET_TOK( TRUNC); }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
 #line 188 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SHL); }
+{ RET_TOK( ZEXT); }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
 #line 189 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SHR); }
+{ RET_TOK( SEXT); }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
 #line 190 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ASHR); }
+{ RET_TOK( FPTRUNC); }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
 #line 191 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LSHR); }
+{ RET_TOK( FPEXT); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
 #line 192 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( VAARG); }
+{ RET_TOK( FPTOUI); }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
 #line 193 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( RET); }
+{ RET_TOK( FPTOSI); }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
 #line 194 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( BR); }
+{ RET_TOK( UITOFP); }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
 #line 195 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SWITCH); }
+{ RET_TOK( SITOFP); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
 #line 196 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( INVOKE); }
+{ RET_TOK( PTRTOINT); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
 #line 197 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UNWIND); }
+{ RET_TOK( INTTOPTR); }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
 #line 198 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UNWIND); }
+{ RET_TOK( BITCAST); }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
 #line 199 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UNREACHABLE); }
+{ RET_TOK( SELECT); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 201 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( MALLOC); }
+#line 200 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SHL); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 202 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ALLOCA); }
+#line 201 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SHR); }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 203 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FREE); }
+#line 202 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ASHR); }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 204 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LOAD); }
+#line 203 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( LSHR); }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 205 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( STORE); }
+#line 204 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( VAARG); }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 206 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( GETELEMENTPTR); }
+#line 205 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( RET); }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 208 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( EXTRACTELEMENT); }
+#line 206 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( BR); }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 209 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( INSERTELEMENT); }
+#line 207 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SWITCH); }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 210 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SHUFFLEVECTOR); }
+#line 208 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( INVOKE); }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 213 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( VAR_ID); }
+#line 209 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UNWIND); }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 214 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LABELSTR); }
+#line 210 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UNWIND); }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 215 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LABELSTR); }
+#line 211 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UNREACHABLE); }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 216 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( STRINGCONSTANT ); }
+#line 213 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( MALLOC); }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 217 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( EUINT64VAL ); }
+#line 214 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ALLOCA); }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 218 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ESINT64VAL ); }
+#line 215 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FREE); }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 219 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( yytext[0] == 's' ? ESINT64VAL : EUINT64VAL ); }
+#line 216 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( LOAD); }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 220 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UINTVAL); }
+#line 217 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( STORE); }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 221 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SINTVAL); }
+#line 218 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( GETELEMENTPTR); }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
+#line 220 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( EXTRACTELEMENT); }
+	YY_BREAK
+case 115:
+YY_RULE_SETUP
+#line 221 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( INSERTELEMENT); }
+	YY_BREAK
+case 116:
+YY_RULE_SETUP
 #line 222 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SHUFFLEVECTOR); }
+	YY_BREAK
+case 117:
+YY_RULE_SETUP
+#line 225 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( VAR_ID); }
+	YY_BREAK
+case 118:
+YY_RULE_SETUP
+#line 226 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( LABELSTR); }
+	YY_BREAK
+case 119:
+YY_RULE_SETUP
+#line 227 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( LABELSTR); }
+	YY_BREAK
+case 120:
+YY_RULE_SETUP
+#line 228 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( STRINGCONSTANT ); }
+	YY_BREAK
+case 121:
+YY_RULE_SETUP
+#line 229 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( EUINT64VAL ); }
+	YY_BREAK
+case 122:
+YY_RULE_SETUP
+#line 230 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ESINT64VAL ); }
+	YY_BREAK
+case 123:
+YY_RULE_SETUP
+#line 231 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( yytext[0] == 's' ? ESINT64VAL : EUINT64VAL ); }
+	YY_BREAK
+case 124:
+YY_RULE_SETUP
+#line 232 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UINTVAL); }
+	YY_BREAK
+case 125:
+YY_RULE_SETUP
+#line 233 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SINTVAL); }
+	YY_BREAK
+case 126:
+YY_RULE_SETUP
+#line 234 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( FPVAL); }
 	YY_BREAK
-case 115:
+case 127:
 YY_RULE_SETUP
-#line 223 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 235 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( FPVAL); }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 224 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 236 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
@@ -1735,22 +1828,22 @@ case YY_STATE_EOF(INITIAL):
                   return EOF;
                 }
 	YY_BREAK
-case 116:
+case 128:
 YY_RULE_SETUP
-#line 232 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 244 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { /* Ignore whitespace */ }
 	YY_BREAK
-case 117:
+case 129:
 YY_RULE_SETUP
-#line 233 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 245 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { return yytext[0]; }
 	YY_BREAK
-case 118:
+case 130:
 YY_RULE_SETUP
-#line 235 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 247 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 1754 "UpgradeLexer.cpp"
+#line 1847 "UpgradeLexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2037,7 +2130,7 @@ static yy_state_type yy_get_previous_state()
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 511 )
+			if ( yy_current_state >= 556 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2067,11 +2160,11 @@ yy_state_type yy_current_state;
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 511 )
+		if ( yy_current_state >= 556 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 510);
+	yy_is_jam = (yy_current_state == 555);
 	if ( ! yy_is_jam )
 		*yy_state_ptr++ = yy_current_state;
 
@@ -2628,5 +2721,5 @@ int main()
 	return 0;
 	}
 #endif
-#line 235 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 247 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 
diff --git a/tools/llvm-upgrade/UpgradeLexer.l b/tools/llvm-upgrade/UpgradeLexer.l
index b3e1264..867041d 100644
--- a/tools/llvm-upgrade/UpgradeLexer.l
+++ b/tools/llvm-upgrade/UpgradeLexer.l
@@ -184,6 +184,18 @@ setge           { RET_TOK( SETGE); }
 phi             { RET_TOK( PHI_TOK); }
 call            { RET_TOK( CALL); }
 cast            { RET_TOK( CAST); }
+trunc           { RET_TOK( TRUNC); }
+zext            { RET_TOK( ZEXT); }
+sext            { RET_TOK( SEXT); }
+fptrunc         { RET_TOK( FPTRUNC); }
+fpext           { RET_TOK( FPEXT); }
+fptoui          { RET_TOK( FPTOUI); }
+fptosi          { RET_TOK( FPTOSI); }
+uitofp          { RET_TOK( UITOFP); }
+sitofp          { RET_TOK( SITOFP); }
+ptrtoint        { RET_TOK( PTRTOINT); }
+inttoptr        { RET_TOK( INTTOPTR); }
+bitcast         { RET_TOK( BITCAST); }
 select          { RET_TOK( SELECT); }
 shl             { RET_TOK( SHL); }
 shr             { RET_TOK( SHR); }
diff --git a/tools/llvm-upgrade/UpgradeLexer.l.cvs b/tools/llvm-upgrade/UpgradeLexer.l.cvs
index b3e1264..867041d 100644
--- a/tools/llvm-upgrade/UpgradeLexer.l.cvs
+++ b/tools/llvm-upgrade/UpgradeLexer.l.cvs
@@ -184,6 +184,18 @@ setge           { RET_TOK( SETGE); }
 phi             { RET_TOK( PHI_TOK); }
 call            { RET_TOK( CALL); }
 cast            { RET_TOK( CAST); }
+trunc           { RET_TOK( TRUNC); }
+zext            { RET_TOK( ZEXT); }
+sext            { RET_TOK( SEXT); }
+fptrunc         { RET_TOK( FPTRUNC); }
+fpext           { RET_TOK( FPEXT); }
+fptoui          { RET_TOK( FPTOUI); }
+fptosi          { RET_TOK( FPTOSI); }
+uitofp          { RET_TOK( UITOFP); }
+sitofp          { RET_TOK( SITOFP); }
+ptrtoint        { RET_TOK( PTRTOINT); }
+inttoptr        { RET_TOK( INTTOPTR); }
+bitcast         { RET_TOK( BITCAST); }
 select          { RET_TOK( SELECT); }
 shl             { RET_TOK( SHL); }
 shr             { RET_TOK( SHR); }
diff --git a/tools/llvm-upgrade/UpgradeParser.cpp b/tools/llvm-upgrade/UpgradeParser.cpp
index 06c25c2..6ac134a 100644
--- a/tools/llvm-upgrade/UpgradeParser.cpp
+++ b/tools/llvm-upgrade/UpgradeParser.cpp
@@ -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 @@ typedef union YYSTYPE {
   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 @@ typedef union YYSTYPE {
 
 
 /* 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 @@ union yyalloc
 /* 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 @@ static const unsigned char yytranslate[] =
        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 @@ static const unsigned char yytranslate[] =
       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 @@ static const unsigned short int yyprhs[] =
       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 @@ static const char *const yytname[] =
   "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 @@ static const unsigned short int yytoknum[] =
      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 @@ static const unsigned char yyr2[] =
        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,
-       0,     0,    77,     0,     0,    78,     0,     0,    79,     0,
-      80,   121,    62,    63,    64,    65,    66,    67,    68,    69,
+      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,    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,   374,     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,
+      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,     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,
+      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,    -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,   115,    -1,    -1,   118,    -1,   120,   121,    40,   123,
-      -1,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      -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,     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,
+      -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,    -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,
+      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,   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,    -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,   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,   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,    -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,    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,
-      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
+      -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 @@ yyreduce:
   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 @@ yyreduce:
     ;}
     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"
+  case 71:
+#line 236 "/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"
+  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 60:
-#line 236 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 73:
+#line 240 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 61:
-#line 237 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     break;
 
-  case 63:
-#line 251 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 76:
+#line 255 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 65:
-#line 255 "/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 66:
-#line 256 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  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 @@ yyreduce:
     ;}
     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 @@ yyreduce:
     ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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,8 +2677,8 @@ yyreduce:
   ;}
     break;
 
-  case 142:
-#line 591 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  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 
        << " " << *(yyvsp[0].String) << "\n";
@@ -2606,8 +2687,8 @@ yyreduce:
   ;}
     break;
 
-  case 143:
-#line 597 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  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 
        << " " << *(yyvsp[0].String) << "\n";
@@ -2616,8 +2697,8 @@ yyreduce:
   ;}
     break;
 
-  case 144:
-#line 603 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  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";
@@ -2626,8 +2707,8 @@ yyreduce:
   ;}
     break;
 
-  case 145:
-#line 609 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
 ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
 ;}
     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 @@ yyreduce:
 ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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,8 +3103,8 @@ yyreduce:
   ;}
     break;
 
-  case 213:
-#line 889 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 226:
+#line 895 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "    " << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -3031,8 +3112,8 @@ yyreduce:
   ;}
     break;
 
-  case 214:
-#line 895 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  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);
@@ -3040,8 +3121,8 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
     }
 
 /* Line 1126 of yacc.c.  */
-#line 3343 "UpgradeParser.tab.c"
+#line 3426 "UpgradeParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -3607,7 +3690,7 @@ yyreturn:
 }
 
 
-#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) {
diff --git a/tools/llvm-upgrade/UpgradeParser.cpp.cvs b/tools/llvm-upgrade/UpgradeParser.cpp.cvs
index 06c25c2..6ac134a 100644
--- a/tools/llvm-upgrade/UpgradeParser.cpp.cvs
+++ b/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 @@ typedef union YYSTYPE {
   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 @@ typedef union YYSTYPE {
 
 
 /* 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 @@ union yyalloc
 /* 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 @@ static const unsigned char yytranslate[] =
        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 @@ static const unsigned char yytranslate[] =
       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 @@ static const unsigned short int yyprhs[] =
       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 @@ static const char *const yytname[] =
   "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 @@ static const unsigned short int yytoknum[] =
      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 @@ static const unsigned char yyr2[] =
        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,
-       0,     0,    77,     0,     0,    78,     0,     0,    79,     0,
-      80,   121,    62,    63,    64,    65,    66,    67,    68,    69,
+      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,    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,   374,     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,
+      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,     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,
+      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,    -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,   115,    -1,    -1,   118,    -1,   120,   121,    40,   123,
-      -1,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      -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,     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,
+      -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,    -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,
+      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,   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,    -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,   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,   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,    -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,    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,
-      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
+      -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 @@ yyreduce:
   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 @@ yyreduce:
     ;}
     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"
+  case 71:
+#line 236 "/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"
+  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 60:
-#line 236 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 73:
+#line 240 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 61:
-#line 237 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     break;
 
-  case 63:
-#line 251 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 76:
+#line 255 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 65:
-#line 255 "/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 66:
-#line 256 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  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 @@ yyreduce:
     ;}
     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 @@ yyreduce:
     ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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,8 +2677,8 @@ yyreduce:
   ;}
     break;
 
-  case 142:
-#line 591 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  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 
        << " " << *(yyvsp[0].String) << "\n";
@@ -2606,8 +2687,8 @@ yyreduce:
   ;}
     break;
 
-  case 143:
-#line 597 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  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 
        << " " << *(yyvsp[0].String) << "\n";
@@ -2616,8 +2697,8 @@ yyreduce:
   ;}
     break;
 
-  case 144:
-#line 603 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  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";
@@ -2626,8 +2707,8 @@ yyreduce:
   ;}
     break;
 
-  case 145:
-#line 609 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
 ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
 ;}
     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 @@ yyreduce:
 ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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,8 +3103,8 @@ yyreduce:
   ;}
     break;
 
-  case 213:
-#line 889 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 226:
+#line 895 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "    " << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -3031,8 +3112,8 @@ yyreduce:
   ;}
     break;
 
-  case 214:
-#line 895 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  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);
@@ -3040,8 +3121,8 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
   ;}
     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 @@ yyreduce:
     }
 
 /* Line 1126 of yacc.c.  */
-#line 3343 "UpgradeParser.tab.c"
+#line 3426 "UpgradeParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -3607,7 +3690,7 @@ yyreturn:
 }
 
 
-#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) {
diff --git a/tools/llvm-upgrade/UpgradeParser.h b/tools/llvm-upgrade/UpgradeParser.h
index b1335d5..d403211 100644
--- a/tools/llvm-upgrade/UpgradeParser.h
+++ b/tools/llvm-upgrade/UpgradeParser.h
@@ -138,7 +138,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.  */
@@ -252,6 +264,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
 
 
 
@@ -265,7 +289,7 @@ typedef union YYSTYPE {
   ConstInfo       Const;
 } YYSTYPE;
 /* Line 1447 of yacc.c.  */
-#line 269 "UpgradeParser.tab.h"
+#line 293 "UpgradeParser.tab.h"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
diff --git a/tools/llvm-upgrade/UpgradeParser.h.cvs b/tools/llvm-upgrade/UpgradeParser.h.cvs
index b1335d5..d403211 100644
--- a/tools/llvm-upgrade/UpgradeParser.h.cvs
+++ b/tools/llvm-upgrade/UpgradeParser.h.cvs
@@ -138,7 +138,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.  */
@@ -252,6 +264,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
 
 
 
@@ -265,7 +289,7 @@ typedef union YYSTYPE {
   ConstInfo       Const;
 } YYSTYPE;
 /* Line 1447 of yacc.c.  */
-#line 269 "UpgradeParser.tab.h"
+#line 293 "UpgradeParser.tab.h"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
diff --git a/tools/llvm-upgrade/UpgradeParser.y b/tools/llvm-upgrade/UpgradeParser.y
index 4574977..79c1d94 100644
--- a/tools/llvm-upgrade/UpgradeParser.y
+++ b/tools/llvm-upgrade/UpgradeParser.y
@@ -155,7 +155,8 @@ const char* getCastOpcode(TypeInfo& SrcTy, TypeInfo&DstTy) {
 %token <String> MALLOC ALLOCA FREE LOAD STORE GETELEMENTPTR
 %token <String> PHI_TOK SELECT SHL SHR ASHR LSHR VAARG
 %token <String> EXTRACTELEMENT INSERTELEMENT SHUFFLEVECTOR
-%token <String> CAST
+%token <String> CAST TRUNC ZEXT SEXT FPTRUNC FPEXT FPTOUI FPTOSI UITOFP SITOFP 
+%token <String> PTRTOINT INTTOPTR BITCAST
 
 %type <String> OptAssign OptLinkage OptCallingConv OptAlign OptCAlign 
 %type <String> SectionString OptSection GlobalVarAttributes GlobalVarAttribute
@@ -167,8 +168,8 @@ const char* getCastOpcode(TypeInfo& SrcTy, TypeInfo&DstTy) {
 %type <String> ValueRefList OptTailCall InstVal IndexList OptVolatile
 %type <String> MemoryInst SymbolicValueRef OptSideEffect GlobalType
 %type <String> FnDeclareLinkage BasicBlockList BigOrLittle AsmBlock
-%type <String> Name ValueRef ValueRefListE
-%type <String> ShiftOps SetCondOps LogicalOps ArithmeticOps ConstValueRef 
+%type <String> Name ValueRef ValueRefListE ConstValueRef 
+%type <String> ShiftOps SetCondOps LogicalOps ArithmeticOps CastOps 
 
 %type <String> ConstVector
 
@@ -194,6 +195,9 @@ ArithmeticOps: ADD | SUB | MUL | UDIV | SDIV | FDIV | UREM | SREM | FREM;
 LogicalOps   : AND | OR | XOR;
 SetCondOps   : SETLE | SETGE | SETLT | SETGT | SETEQ | SETNE;
 ShiftOps     : SHL | SHR | ASHR | LSHR;
+CastOps      : TRUNC | ZEXT | SEXT | FPTRUNC | FPEXT | FPTOUI | FPTOSI | 
+               UITOFP | SITOFP | PTRTOINT | INTTOPTR | BITCAST | CAST
+             ;
 
 // These are some types that allow classification if we only want a particular 
 // thing... for example, only a signed, unsigned, or integral type.
@@ -462,9 +466,11 @@ ConstVal: Types '[' ConstVector ']' { // Nonempty unsized arr
   };
 
 
-ConstExpr: CAST '(' ConstVal TO Types ')' {
+ConstExpr: CastOps '(' ConstVal TO Types ')' {
     // We must infer the cast opcode from the types of the operands. 
-    const char *opcode = getCastOpcode($3.type, $5);
+    const char *opcode = $1->c_str();
+    if (*$1 == "cast")
+      opcode = getCastOpcode($3.type, $5);
     $$ = new std::string(opcode);
     *$$ += "(" + *$3.cnst + " " + *$4 + " " + *$5.newTy + ")";
     delete $1; $3.destroy(); delete $4; $5.destroy();
@@ -976,8 +982,10 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef {
     *$$ += " " + *$2.val + ", " + *$4.val;
     delete $1; $2.destroy(); $4.destroy();
   }
-  | CAST ResolvedVal TO Types {
-    const char *opcode = getCastOpcode($2.type, $4);
+  | CastOps ResolvedVal TO Types {
+    const char *opcode = $1->c_str();
+    if (*$1 == "cast")
+      opcode = getCastOpcode($2.type, $4);
     $$ = new std::string(opcode);
     *$$ += *$2.val + " " + *$3 + " " + *$4.newTy; 
     delete $1; $2.destroy();
diff --git a/tools/llvm-upgrade/UpgradeParser.y.cvs b/tools/llvm-upgrade/UpgradeParser.y.cvs
index 4574977..79c1d94 100644
--- a/tools/llvm-upgrade/UpgradeParser.y.cvs
+++ b/tools/llvm-upgrade/UpgradeParser.y.cvs
@@ -155,7 +155,8 @@ const char* getCastOpcode(TypeInfo& SrcTy, TypeInfo&DstTy) {
 %token <String> MALLOC ALLOCA FREE LOAD STORE GETELEMENTPTR
 %token <String> PHI_TOK SELECT SHL SHR ASHR LSHR VAARG
 %token <String> EXTRACTELEMENT INSERTELEMENT SHUFFLEVECTOR
-%token <String> CAST
+%token <String> CAST TRUNC ZEXT SEXT FPTRUNC FPEXT FPTOUI FPTOSI UITOFP SITOFP 
+%token <String> PTRTOINT INTTOPTR BITCAST
 
 %type <String> OptAssign OptLinkage OptCallingConv OptAlign OptCAlign 
 %type <String> SectionString OptSection GlobalVarAttributes GlobalVarAttribute
@@ -167,8 +168,8 @@ const char* getCastOpcode(TypeInfo& SrcTy, TypeInfo&DstTy) {
 %type <String> ValueRefList OptTailCall InstVal IndexList OptVolatile
 %type <String> MemoryInst SymbolicValueRef OptSideEffect GlobalType
 %type <String> FnDeclareLinkage BasicBlockList BigOrLittle AsmBlock
-%type <String> Name ValueRef ValueRefListE
-%type <String> ShiftOps SetCondOps LogicalOps ArithmeticOps ConstValueRef 
+%type <String> Name ValueRef ValueRefListE ConstValueRef 
+%type <String> ShiftOps SetCondOps LogicalOps ArithmeticOps CastOps 
 
 %type <String> ConstVector
 
@@ -194,6 +195,9 @@ ArithmeticOps: ADD | SUB | MUL | UDIV | SDIV | FDIV | UREM | SREM | FREM;
 LogicalOps   : AND | OR | XOR;
 SetCondOps   : SETLE | SETGE | SETLT | SETGT | SETEQ | SETNE;
 ShiftOps     : SHL | SHR | ASHR | LSHR;
+CastOps      : TRUNC | ZEXT | SEXT | FPTRUNC | FPEXT | FPTOUI | FPTOSI | 
+               UITOFP | SITOFP | PTRTOINT | INTTOPTR | BITCAST | CAST
+             ;
 
 // These are some types that allow classification if we only want a particular 
 // thing... for example, only a signed, unsigned, or integral type.
@@ -462,9 +466,11 @@ ConstVal: Types '[' ConstVector ']' { // Nonempty unsized arr
   };
 
 
-ConstExpr: CAST '(' ConstVal TO Types ')' {
+ConstExpr: CastOps '(' ConstVal TO Types ')' {
     // We must infer the cast opcode from the types of the operands. 
-    const char *opcode = getCastOpcode($3.type, $5);
+    const char *opcode = $1->c_str();
+    if (*$1 == "cast")
+      opcode = getCastOpcode($3.type, $5);
     $$ = new std::string(opcode);
     *$$ += "(" + *$3.cnst + " " + *$4 + " " + *$5.newTy + ")";
     delete $1; $3.destroy(); delete $4; $5.destroy();
@@ -976,8 +982,10 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef {
     *$$ += " " + *$2.val + ", " + *$4.val;
     delete $1; $2.destroy(); $4.destroy();
   }
-  | CAST ResolvedVal TO Types {
-    const char *opcode = getCastOpcode($2.type, $4);
+  | CastOps ResolvedVal TO Types {
+    const char *opcode = $1->c_str();
+    if (*$1 == "cast")
+      opcode = getCastOpcode($2.type, $4);
     $$ = new std::string(opcode);
     *$$ += *$2.val + " " + *$3 + " " + *$4.newTy; 
     delete $1; $2.destroy();