diff --git a/tools/llvm-upgrade/UpgradeLexer.cpp b/tools/llvm-upgrade/UpgradeLexer.cpp
index b0b35951fe5..de1ffbfd8d0 100644
--- a/tools/llvm-upgrade/UpgradeLexer.cpp
+++ b/tools/llvm-upgrade/UpgradeLexer.cpp
@@ -317,35 +317,35 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
 	*yy_cp = '\0'; \
 	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 117
-#define YY_END_OF_BUFFER 118
-static yyconst short int yy_acclist[195] =
+#define YY_NUM_RULES 118
+#define YY_END_OF_BUFFER 119
+static yyconst short int yy_acclist[196] =
     {   0,
-      118,  116,  117,  115,  116,  117,  115,  117,  116,  117,
-      116,  117,  116,  117,  116,  117,  116,  117,  116,  117,
-      108,  116,  117,  108,  116,  117,    1,  116,  117,  116,
-      117,  116,  117,  116,  117,  116,  117,  116,  117,  116,
-      117,  116,  117,  116,  117,  116,  117,  116,  117,  116,
-      117,  116,  117,  116,  117,  116,  117,  116,  117,  116,
-      117,  116,  117,  116,  117,  116,  117,  116,  117,  116,
-      117,  107,  105,  104,  104,  111,  109,  113,  108,    1,
-       89,   38,   72,   22,  107,  104,  104,  112,  113,   19,
-      113,  114,   60,   71,   36,   31,   39,   63,    3,   51,
+      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,   88,   84,   61,   73,  106,  113,  113,
-       86,   46,   81,   82,   66,   97,   70,   98,   53,   85,
-       21,  110,   65,   69,   23,    4,   59,   64,   52,   68,
-       45,   11,  113,   33,    2,    5,   55,   57,   47,   75,
-       79,   77,   78,   76,   74,   49,   99,   48,   54,   20,
-       96,   42,   56,   27,   93,   41,    7,   91,   30,   95,
-       35,   58,   83,   90,   24,   25,   92,   50,   87,   40,
-        6,   26,   34,    8,   16,    9,   10,   32,   12,   14,
-       13,   29,   37,   15,   28,   94,  100,  102,  103,   43,
-      101,   17,   44,   18
+       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
 
     } ;
 
-static yyconst short int yy_accept[511] =
+static yyconst short int yy_accept[512] =
     {   0,
         1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
        17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
@@ -366,43 +366,44 @@ static yyconst short int yy_accept[511] =
       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,  106,  106,  106,  106,
-      107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
+      105,  105,  105,  105,  106,  106,  107,  107,  107,  107,
+      107,  108,  108,  108,  108,  108,  108,  108,  108,  108,
 
-      107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
-      107,  108,  108,  109,  110,  110,  110,  110,  111,  111,
-      111,  111,  112,  112,  113,  114,  115,  115,  115,  115,
-      115,  115,  115,  115,  115,  115,  115,  115,  115,  115,
-      115,  115,  116,  116,  117,  118,  118,  118,  118,  118,
-      118,  118,  118,  118,  118,  119,  120,  121,  121,  121,
-      122,  122,  122,  123,  123,  124,  124,  124,  124,  124,
-      124,  124,  124,  124,  124,  125,  125,  125,  126,  126,
-      126,  127,  128,  128,  129,  130,  130,  130,  130,  130,
-      131,  131,  131,  132,  132,  133,  133,  133,  134,  135,
+      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,
+      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,
 
-      135,  135,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  137,  137,  138,  138,
-      138,  138,  138,  138,  138,  139,  139,  139,  139,  139,
-      139,  139,  140,  140,  140,  141,  142,  143,  144,  145,
-      146,  147,  147,  147,  148,  148,  148,  148,  149,  150,
-      151,  151,  151,  151,  151,  151,  151,  151,  151,  152,
-      152,  153,  153,  153,  153,  153,  153,  153,  153,  154,
-      155,  156,  156,  156,  157,  157,  158,  158,  158,  158,
-      159,  159,  160,  161,  162,  163,  163,  163,  164,  164,
-      164,  165,  166,  167,  167,  168,  169,  170,  170,  170,
+      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,
 
-      170,  170,  170,  170,  171,  171,  172,  173,  173,  173,
-      173,  173,  173,  173,  173,  173,  173,  173,  173,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  175,  175,
-      175,  175,  175,  176,  176,  176,  176,  176,  177,  178,
-      178,  178,  178,  178,  179,  179,  179,  179,  180,  180,
-      181,  182,  182,  182,  182,  182,  182,  182,  182,  182,
-      182,  182,  182,  182,  183,  183,  183,  183,  183,  183,
-      183,  183,  184,  184,  184,  184,  184,  185,  185,  185,
-      185,  185,  186,  186,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  188,  188,  189,
+      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,  190,  191,  191,  192,  193,  194,  194,  195,  195
+      190,  191,  191,  192,  192,  193,  194,  195,  195,  196,
+      196
     } ;
 
 static yyconst int yy_ec[256] =
@@ -446,129 +447,129 @@ static yyconst int yy_meta[44] =
         3,    3,    3
     } ;
 
-static yyconst short int yy_base[515] =
+static yyconst short int yy_base[516] =
     {   0,
-        0,    0, 1108, 1109, 1109, 1109, 1103, 1092,   36,   40,
+        0,    0, 1110, 1111, 1111, 1111, 1105, 1094,   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, 1101, 1109, 1090, 1109,
+      126,  171,  119,  123,   73,  125, 1103, 1111, 1092, 1111,
         0,  159,  176,  199,  204,   95,  209,  224,  229,    0,
-      130,  165,  133,  120,  169,  151,  159,   31, 1089,  168,
+      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, 1088,  284,  285,
+      263,  258,  267,  261,  277,  281,  283, 1090,  284,  285,
       286,  287,  265,  290,  300,  295,  291,  308,  294,  305,
 
-      316,  318, 1087,  320,  306,  304,  321,  324,  322,  327,
-      328,  289,  213,  330,  342,  338,  346,  349, 1086,    0,
-      358,  362, 1085,  376,  393,    0, 1084,  351,  350, 1083,
-      369,  363, 1082,  364, 1081,  366,  380,  382, 1080,  388,
-      394,  397,  398,  399,  400, 1079,  404,  401,  408,  402,
-      409,  410,  412,  419,  420,  422,  424,  423,  426,  427,
-      428,  434,  439,  113,  440,  442,  443,  445,  446,  447,
-     1078,  449,  453, 1077,  451, 1076, 1075,  478,  455,  457,
-      456,  458,  489, 1074,  469,  460,  492,  491,  472, 1073,
-      494,  495,  497,  496,  502,  503,  499,  505,  509,  514,
+      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,
 
-      516,  518,  513,  519,  520,  523,  521,  534,  533,  536,
-     1072,  524, 1109,  547,  555,  561,  565,  570,  555,  571,
-      573, 1071,  574, 1070, 1069, 1068,  575,  576,  577,  579,
-      580,  583,  581,  586,  588,  584,  587,  592,  593,  595,
-      605, 1067,  597, 1066, 1065,  601,  609,  610,  607,  611,
-      615,  618,  617,  621, 1064, 1063, 1062,  622,  623, 1061,
-      624,  626,    0,  625, 1060,  630,  637,  627,  641,  642,
-      645,  639,  646,  652, 1059,  657,  653, 1058,  658,  655,
-     1057, 1056,  659, 1055, 1054,  663,  669,  671,  672, 1053,
-      673,  675, 1052,  677, 1051,  680,  678,  685, 1050,  687,
+      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,
 
-      685, 1049,  688,  698,  697,  701,  686,  459,  699,  705,
-      708,  709,  710,  711,  712, 1048,  713, 1047,  714,  715,
-      716,  721,  722,  725, 1046,  729,  727,  731,  740,  741,
-      742, 1045,  735,  737, 1044, 1043, 1042, 1041, 1040, 1039,
-     1038,  743,  745, 1037,  747,  748,  752, 1036, 1035, 1034,
-      756,  754,  757,  764,  765,  767,  766,  768, 1033,  769,
-     1032,  770,  774,  773,  777,  776,  779,  784, 1031, 1030,
-     1029,  788,  783, 1028,  791, 1027,  790,  794,  795, 1026,
-      804, 1025, 1024, 1023, 1022,  796,  805, 1021,  809,  810,
-     1020, 1019, 1018,  812, 1017, 1016, 1015,  808,  813,  819,
+      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,
 
-      815,  814,  816, 1014,  825, 1013, 1012,  821,  826,  326,
-      829,  832,  836,  833,  834,  837,  846,  838, 1011,  840,
-      848,  851,  853,  854,  859,  858,  861, 1010,  863,  867,
-      868,  864, 1009,  869,  871,  870,  874, 1008, 1005,  876,
-      885,  875,  880,  995,  892,  895,  896,  993,  878,  992,
-      991,  897,  898,  903,  905,  904,  879,  906,  911,  912,
-      914,  915,  916,  990,  917,  922,  918,  923,  924,  932,
-      925,  988,  935,  928,  936,  939,  987,  940,  929,  942,
-      945,  983,  947,  982,  953,  950,  956,  958,  959,  960,
-      961,  964,  963,  966,  967,  971,  979,  972,  830,  631,
+      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,
 
-      974,  541,  977,  537,  462,  383,  976,  216, 1109, 1011,
-     1013,  226, 1017,   76
+      876,  975,  538,  976,  535,  462,  423,  978,  216, 1111,
+     1013, 1015,  226, 1019,   76
     } ;
 
-static yyconst short int yy_def[515] =
+static yyconst short int yy_def[516] =
     {   0,
-      509,    1,  509,  509,  509,  509,  510,  511,  512,  509,
-      511,  511,  511,  511,  513,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  510,  509,  511,  509,
-      514,  514,  509,  509,  511,  511,  511,  511,  511,  513,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      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,
 
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  509,  514,
-      514,  509,  511,  511,  511,   49,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,   49,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      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,
 
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  509,  509,  509,  509,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  178,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  509,  511,  511,
+      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,
 
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
 
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
 
-      511,  511,  511,  511,  511,  511,  511,  511,    0,  509,
-      509,  509,  509,  509
+      512,  512,  512,  512,  512,  512,  512,  512,  512,    0,
+      510,  510,  510,  510,  510
     } ;
 
-static yyconst short int yy_nxt[1153] =
+static yyconst short int yy_nxt[1155] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   14,   14,    4,   15,    8,    8,    8,   16,   17,
@@ -585,7 +586,7 @@ static yyconst short int yy_nxt[1153] =
        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,
-      253,   90,   84,   40,  102,  115,   40,  118,   85,   92,
+      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,
@@ -595,7 +596,7 @@ static yyconst short int yy_nxt[1153] =
        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,
-      206,  125,   47,   48,   48,   48,   48,   40,  126,  126,
+      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,
@@ -604,102 +605,102 @@ static yyconst short int yy_nxt[1153] =
        40,  162,  165,  167,   40,  169,   40,   40,   40,   40,
 
        40,  173,   40,   40,   40,  171,  179,   40,   40,  172,
-      174,  175,  187,   40,  205,  176,  180,   40,   40,   40,
-      181,   40,  177,  184,  190,  189,  185,  178,  182,   40,
-      188,   40,  186,   40,   40,   40,  183,   40,  196,   40,
-       40,   40,  191,   40,  192,  197,  194,  198,  201,  210,
-      204,   40,  193,  200,  199,   40,  207,  195,  208,   40,
-      209,  202,   40,   40,   40,  432,  203,  121,  121,  121,
-      121,  214,  214,  214,  214,  219,   40,   40,  215,   40,
-      211,  220,   40,  212,  215,  124,  124,  124,  124,   40,
-      223,  221,  125,   40,  224,   40,   40,  222,  125,  216,
+      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,   40,  218,  218,  218,  218,   40,   40,  225,  227,
-       40,   40,   40,   40,   40,   40,  230,   40,  226,  229,
-      235,   40,   40,   40,  237,   40,  233,  231,  232,  228,
-      234,  238,   40,   40,  236,   40,   40,   40,  243,   40,
-       40,   40,  247,  239,  244,  240,  246,   40,  241,  249,
-      250,  245,   40,   40,  248,   40,   40,  242,   40,   40,
-       40,  252,   40,  255,   40,  251,   40,  256,   40,   40,
-       40,   40,   40,   40,  258,   40,  254,  260,  366,  257,
-      267,  262,   40,  273,  259,   40,  261,  263,  263,  263,
-      263,  264,  266,  263,  263,  265,  263,  263,  263,  263,
+      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,
 
-      263,  263,   40,  272,   40,   40,  276,   40,   40,   40,
-       40,  268,   40,  269,  274,   40,   40,  270,   40,  271,
-      275,  279,   40,  278,  281,  282,   40,   40,  280,   40,
-      277,   40,   40,   40,   40,  283,   40,   40,  287,  289,
-      288,  292,  293,  284,  286,  285,   40,   40,  290,   40,
-       40,  291,  294,  296,   40,  297,  214,  214,  214,  214,
-      295,  216,  216,  215,  298,  298,  298,  298,   40,  215,
-      298,  298,  298,  298,  218,  218,  218,  218,   40,  218,
-      218,  218,  218,   40,   40,  299,   40,   40,   40,   40,
-       40,  300,   40,   40,   40,  303,   40,   40,  307,   40,
+      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,
 
-       40,   40,  312,  301,  302,   40,   40,  306,   40,  308,
-       40,  315,  304,  305,   40,  310,  311,  316,   40,  313,
-       40,  309,   40,   40,   40,  317,  314,  320,   40,  319,
-       40,   40,  321,  318,   40,   40,   40,   40,   40,   40,
-       40,  322,  324,   40,   40,  323,  325,  332,  326,  327,
-       40,  329,   40,  328,   40,   40,  333,  334,   40,   40,
-      335,  330,  331,  336,  338,   40,   40,  340,   40,  342,
-       40,   40,   40,  345,  343,  341,   40,  337,  339,  344,
-      346,  348,   40,  347,   40,   40,   40,  349,   40,  351,
-       40,   40,  350,   40,  298,  298,  298,  298,   40,   40,
+      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,
 
-       40,   40,  352,  356,  358,  359,  360,  353,  361,  354,
-       40,   40,   40,  355,   40,  357,  362,  363,   40,  364,
-      365,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-      369,  367,  373,  374,   40,   40,  375,  368,   40,  370,
-       40,  372,   40,  376,   40,  377,  371,  380,   40,  382,
-       40,  383,  379,   40,   40,   40,   40,  378,   40,  381,
-       40,   40,  384,  385,  386,   40,  387,   40,  390,   40,
-       40,  389,  391,  388,  393,  395,  394,   40,   40,   40,
-       40,   40,   40,   40,  392,  399,   40,   40,  397,   40,
-       40,  398,   40,  396,  404,  402,   40,   40,  401,  406,
+      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,
 
-      403,   40,  400,   40,   40,  410,  411,   40,   40,   40,
-      408,  407,  414,  416,  405,  409,  415,   40,   40,  412,
-      413,   40,   40,   40,  417,   40,   40,   40,   40,   40,
-      418,  420,   40,  421,   40,  419,  423,  422,   40,   40,
-      425,  426,   40,   40,  427,   40,   40,   40,  424,   40,
-       40,   40,  428,   40,  434,  430,  429,  433,  435,   40,
-      431,   40,  437,  436,   40,  438,   40,   40,  439,  443,
-      442,   40,   40,  440,   40,  444,   40,   40,  441,  446,
-       40,   40,   40,   40,   40,  448,  452,   40,   40,   40,
-      445,   40,   40,   40,  447,  459,  456,  453,   40,  460,
+       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,
 
-      449,  454,  457,  450,  451,   40,  455,  458,   40,   40,
-       40,   40,  461,  462,  464,  465,   40,   40,   40,   40,
-      466,  470,  463,  468,   40,   40,  471,   40,   40,   40,
-       40,   40,  474,  469,  476,   40,   40,   40,   40,  467,
-      473,   40,   40,  475,  477,   40,  481,  472,   40,   40,
-      479,  478,   40,   40,  482,   40,  485,  484,   40,  480,
-       40,  483,  488,   40,  486,  489,   40,  487,  490,   40,
-      494,   40,   40,   40,   40,  491,   40,   40,  492,   40,
-       40,  493,  495,  501,   40,   40,  502,   40,  496,   40,
-       40,  498,   40,  497,  506,   40,   40,  499,  500,  507,
+      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,  505,   40,   40,   40,   40,  504,   40,  503,
-      508,   37,   37,   37,   37,   39,   39,   50,   40,   50,
-       50,   40,   40,   40,   40,   40,   40,   40,   40,   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,   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,   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,  213,
 
-       40,   40,   40,   40,  119,   40,   38,  509,    3,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509
+       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
     } ;
 
-static yyconst short int yy_chk[1153] =
+static yyconst short int yy_chk[1155] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -708,7 +709,7 @@ static yyconst short int yy_chk[1153] =
         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,  514,   17,
+       14,   14,   14,   14,   14,   14,   16,   20,  515,   17,
        27,   29,   27,   26,   16,   35,   35,   20,   17,   23,
        29,   16,   17,   16,   18,   16,   13,   17,   16,   18,
 
@@ -725,7 +726,7 @@ static yyconst short int yy_chk[1153] =
 
        68,   32,   63,   60,   64,   32,   32,   44,   44,   44,
        44,   44,   45,   45,   45,   45,   45,   45,   47,   47,
-       47,   47,   47,   63,   68,   47,  113,   64,  512,  508,
+       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,
@@ -734,100 +735,100 @@ static yyconst short int yy_chk[1153] =
        83,   81,   84,   82,   75,   76,   80,   77,   78,   78,
        85,   78,   80,   81,   86,   83,   87,   89,   90,   91,
 
-       92,   87,  112,   94,   97,   85,   93,   99,   96,   86,
-       89,   90,   97,   95,  112,   91,   94,  106,  100,  105,
-       95,   98,   91,   96,  100,   99,   96,   92,   95,  101,
-       98,  102,   96,  104,  107,  109,   95,  108,  105,  410,
-      110,  111,  101,  114,  102,  106,  104,  107,  110,  116,
-      111,  116,  102,  109,  108,  115,  114,  104,  114,  117,
-      115,  110,  118,  129,  128,  410,  110,  121,  121,  121,
-      121,  122,  122,  122,  122,  128,  132,  134,  122,  136,
-      117,  129,  131,  118,  122,  124,  124,  124,  124,  124,
-      134,  131,  124,  137,  136,  138,  506,  132,  124,  125,
+       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,  140,  125,  125,  125,  125,  125,  141,  137,  140,
-      142,  143,  144,  145,  148,  150,  143,  147,  138,  142,
-      148,  149,  151,  152,  150,  153,  147,  144,  145,  141,
-      147,  151,  154,  155,  149,  156,  158,  157,  155,  159,
-      160,  161,  158,  151,  156,  152,  157,  162,  153,  160,
-      161,  156,  163,  165,  159,  166,  167,  154,  168,  169,
-      170,  163,  172,  166,  175,  162,  173,  167,  179,  181,
-      180,  182,  308,  186,  169,  505,  165,  172,  308,  168,
-      182,  175,  185,  186,  170,  189,  173,  178,  178,  178,
+      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,  188,  187,  189,  191,  192,  194,
-      193,  183,  197,  183,  187,  195,  196,  183,  198,  183,
-      188,  193,  199,  192,  195,  196,  203,  200,  194,  201,
-      191,  202,  204,  205,  207,  197,  206,  212,  201,  203,
-      202,  206,  207,  198,  200,  199,  209,  208,  204,  210,
-      504,  205,  208,  210,  502,  212,  214,  214,  214,  214,
-      209,  215,  215,  214,  215,  215,  215,  215,  219,  214,
-      216,  216,  216,  216,  217,  217,  217,  217,  217,  218,
-      218,  218,  218,  218,  220,  219,  221,  223,  227,  228,
-      229,  220,  230,  231,  233,  227,  232,  236,  231,  234,
+      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,
 
-      237,  235,  236,  221,  223,  238,  239,  230,  240,  232,
-      243,  239,  228,  229,  246,  234,  235,  240,  241,  237,
-      249,  233,  247,  248,  250,  241,  238,  247,  251,  246,
-      253,  252,  248,  243,  254,  258,  259,  261,  264,  262,
-      268,  249,  251,  266,  500,  250,  252,  264,  253,  254,
-      267,  259,  272,  258,  269,  270,  266,  267,  271,  273,
-      268,  261,  262,  269,  270,  274,  277,  271,  280,  273,
-      276,  279,  283,  277,  274,  272,  286,  269,  270,  276,
-      279,  283,  287,  280,  288,  289,  291,  286,  292,  288,
-      294,  297,  287,  296,  298,  298,  298,  298,  301,  307,
+      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,
 
-      300,  303,  289,  296,  297,  300,  301,  291,  303,  292,
-      305,  304,  309,  294,  306,  296,  304,  305,  310,  306,
-      307,  311,  312,  313,  314,  315,  317,  319,  320,  321,
-      311,  309,  315,  317,  322,  323,  319,  310,  324,  312,
-      327,  314,  326,  320,  328,  321,  313,  324,  333,  327,
-      334,  328,  323,  329,  330,  331,  342,  322,  343,  326,
-      345,  346,  329,  330,  331,  347,  333,  352,  343,  351,
-      353,  342,  345,  334,  347,  352,  351,  354,  355,  357,
-      356,  358,  360,  362,  346,  356,  364,  363,  354,  366,
-      365,  355,  367,  353,  363,  360,  373,  368,  358,  365,
+      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,
 
-      362,  372,  357,  377,  375,  372,  372,  378,  379,  386,
-      367,  366,  377,  379,  364,  368,  378,  381,  387,  373,
-      375,  398,  389,  390,  381,  394,  399,  402,  401,  403,
-      386,  389,  400,  390,  408,  387,  398,  394,  405,  409,
-      400,  401,  411,  499,  402,  412,  414,  415,  399,  413,
-      416,  418,  403,  420,  412,  408,  405,  411,  413,  417,
-      409,  421,  415,  414,  422,  416,  423,  424,  417,  422,
-      421,  426,  425,  418,  427,  423,  429,  432,  420,  425,
-      430,  431,  434,  436,  435,  427,  432,  437,  442,  440,
-      424,  449,  457,  443,  426,  442,  437,  434,  441,  443,
+      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,
 
-      429,  435,  440,  430,  431,  445,  436,  441,  446,  447,
-      452,  453,  445,  446,  449,  452,  454,  456,  455,  458,
-      453,  457,  447,  455,  459,  460,  458,  461,  462,  463,
-      465,  467,  461,  456,  463,  466,  468,  469,  471,  454,
-      460,  474,  479,  462,  465,  470,  469,  459,  473,  475,
-      467,  466,  476,  478,  470,  480,  474,  473,  481,  468,
-      483,  471,  478,  486,  475,  479,  485,  476,  480,  487,
-      486,  488,  489,  490,  491,  481,  493,  492,  483,  494,
-      495,  485,  487,  493,  496,  498,  494,  501,  488,  507,
-      503,  490,  497,  489,  501,  484,  482,  491,  492,  503,
+      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,
 
-      477,  472,  498,  464,  451,  450,  448,  496,  444,  495,
-      507,  510,  510,  510,  510,  511,  511,  513,  439,  513,
-      513,  438,  433,  428,  419,  407,  406,  404,  397,  396,
-      395,  393,  392,  391,  388,  385,  384,  383,  382,  380,
-      376,  374,  371,  370,  369,  361,  359,  350,  349,  348,
-      344,  341,  340,  339,  338,  337,  336,  335,  332,  325,
-      318,  316,  302,  299,  295,  293,  290,  285,  284,  282,
-      281,  278,  275,  265,  260,  257,  256,  255,  245,  244,
-      242,  226,  225,  224,  222,  211,  190,  184,  177,  176,
-      174,  171,  146,  139,  135,  133,  130,  127,  123,  119,
+      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,
 
-      103,   88,   59,   39,   37,    8,    7,    3,  509,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509
+      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
     } ;
 
 static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
@@ -904,7 +905,7 @@ char *yytext;
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 908 "UpgradeLexer.cpp"
+#line 909 "UpgradeLexer.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1058,7 +1059,7 @@ YY_DECL
 #line 98 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 
 
-#line 1062 "UpgradeLexer.cpp"
+#line 1063 "UpgradeLexer.cpp"
 
 	if ( yy_init )
 		{
@@ -1106,14 +1107,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 >= 510 )
+				if ( yy_current_state >= 511 )
 					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 != 509 );
+		while ( yy_current_state != 510 );
 
 yy_find_action:
 		yy_current_state = *--yy_state_ptr;
@@ -1572,7 +1573,7 @@ YY_RULE_SETUP
 case 85:
 YY_RULE_SETUP
 #line 189 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LSHR); }
+{ RET_TOK( SHR); }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
@@ -1582,32 +1583,32 @@ YY_RULE_SETUP
 case 87:
 YY_RULE_SETUP
 #line 191 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( VAARG); }
+{ RET_TOK( LSHR); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
 #line 192 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( RET); }
+{ RET_TOK( VAARG); }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
 #line 193 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( BR); }
+{ RET_TOK( RET); }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
 #line 194 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SWITCH); }
+{ RET_TOK( BR); }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
 #line 195 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( INVOKE); }
+{ RET_TOK( SWITCH); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
 #line 196 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UNWIND); }
+{ RET_TOK( INVOKE); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
@@ -1617,62 +1618,62 @@ YY_RULE_SETUP
 case 94:
 YY_RULE_SETUP
 #line 198 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UNREACHABLE); }
+{ RET_TOK( UNWIND); }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 200 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( MALLOC); }
+#line 199 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UNREACHABLE); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
 #line 201 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ALLOCA); }
+{ RET_TOK( MALLOC); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
 #line 202 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FREE); }
+{ RET_TOK( ALLOCA); }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
 #line 203 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LOAD); }
+{ RET_TOK( FREE); }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
 #line 204 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( STORE); }
+{ RET_TOK( LOAD); }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
 #line 205 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( GETELEMENTPTR); }
+{ RET_TOK( STORE); }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 207 "/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( GETELEMENTPTR); }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
 #line 208 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( INSERTELEMENT); }
+{ RET_TOK( EXTRACTELEMENT); }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
 #line 209 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SHUFFLEVECTOR); }
+{ RET_TOK( INSERTELEMENT); }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 212 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( VAR_ID); }
+#line 210 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SHUFFLEVECTOR); }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
 #line 213 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LABELSTR); }
+{ RET_TOK( VAR_ID); }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
@@ -1682,45 +1683,50 @@ YY_RULE_SETUP
 case 107:
 YY_RULE_SETUP
 #line 215 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( STRINGCONSTANT ); }
+{ RET_TOK( LABELSTR); }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
 #line 216 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( EUINT64VAL ); }
+{ RET_TOK( STRINGCONSTANT ); }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
 #line 217 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ESINT64VAL ); }
+{ RET_TOK( EUINT64VAL ); }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
 #line 218 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( yytext[0] == 's' ? ESINT64VAL : EUINT64VAL ); }
+{ RET_TOK( ESINT64VAL ); }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
 #line 219 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UINTVAL); }
+{ RET_TOK( yytext[0] == 's' ? ESINT64VAL : EUINT64VAL ); }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
 #line 220 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SINTVAL); }
+{ RET_TOK( UINTVAL); }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
 #line 221 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FPVAL); }
+{ RET_TOK( SINTVAL); }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
 #line 222 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( FPVAL); }
 	YY_BREAK
-case YY_STATE_EOF(INITIAL):
+case 115:
+YY_RULE_SETUP
 #line 223 "/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"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
@@ -1729,22 +1735,22 @@ case YY_STATE_EOF(INITIAL):
                   return EOF;
                 }
 	YY_BREAK
-case 115:
-YY_RULE_SETUP
-#line 231 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ /* Ignore whitespace */ }
-	YY_BREAK
 case 116:
 YY_RULE_SETUP
 #line 232 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ return yytext[0]; }
+{ /* Ignore whitespace */ }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 234 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 233 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ return yytext[0]; }
+	YY_BREAK
+case 118:
+YY_RULE_SETUP
+#line 235 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 1748 "UpgradeLexer.cpp"
+#line 1754 "UpgradeLexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2031,7 +2037,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 >= 510 )
+			if ( yy_current_state >= 511 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2061,11 +2067,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 >= 510 )
+		if ( yy_current_state >= 511 )
 			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 == 509);
+	yy_is_jam = (yy_current_state == 510);
 	if ( ! yy_is_jam )
 		*yy_state_ptr++ = yy_current_state;
 
@@ -2622,5 +2628,5 @@ int main()
 	return 0;
 	}
 #endif
-#line 234 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 235 "/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 b0b35951fe5..de1ffbfd8d0 100644
--- a/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
+++ b/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
@@ -317,35 +317,35 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
 	*yy_cp = '\0'; \
 	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 117
-#define YY_END_OF_BUFFER 118
-static yyconst short int yy_acclist[195] =
+#define YY_NUM_RULES 118
+#define YY_END_OF_BUFFER 119
+static yyconst short int yy_acclist[196] =
     {   0,
-      118,  116,  117,  115,  116,  117,  115,  117,  116,  117,
-      116,  117,  116,  117,  116,  117,  116,  117,  116,  117,
-      108,  116,  117,  108,  116,  117,    1,  116,  117,  116,
-      117,  116,  117,  116,  117,  116,  117,  116,  117,  116,
-      117,  116,  117,  116,  117,  116,  117,  116,  117,  116,
-      117,  116,  117,  116,  117,  116,  117,  116,  117,  116,
-      117,  116,  117,  116,  117,  116,  117,  116,  117,  116,
-      117,  107,  105,  104,  104,  111,  109,  113,  108,    1,
-       89,   38,   72,   22,  107,  104,  104,  112,  113,   19,
-      113,  114,   60,   71,   36,   31,   39,   63,    3,   51,
+      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,   88,   84,   61,   73,  106,  113,  113,
-       86,   46,   81,   82,   66,   97,   70,   98,   53,   85,
-       21,  110,   65,   69,   23,    4,   59,   64,   52,   68,
-       45,   11,  113,   33,    2,    5,   55,   57,   47,   75,
-       79,   77,   78,   76,   74,   49,   99,   48,   54,   20,
-       96,   42,   56,   27,   93,   41,    7,   91,   30,   95,
-       35,   58,   83,   90,   24,   25,   92,   50,   87,   40,
-        6,   26,   34,    8,   16,    9,   10,   32,   12,   14,
-       13,   29,   37,   15,   28,   94,  100,  102,  103,   43,
-      101,   17,   44,   18
+       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
 
     } ;
 
-static yyconst short int yy_accept[511] =
+static yyconst short int yy_accept[512] =
     {   0,
         1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
        17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
@@ -366,43 +366,44 @@ static yyconst short int yy_accept[511] =
       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,  106,  106,  106,  106,
-      107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
+      105,  105,  105,  105,  106,  106,  107,  107,  107,  107,
+      107,  108,  108,  108,  108,  108,  108,  108,  108,  108,
 
-      107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
-      107,  108,  108,  109,  110,  110,  110,  110,  111,  111,
-      111,  111,  112,  112,  113,  114,  115,  115,  115,  115,
-      115,  115,  115,  115,  115,  115,  115,  115,  115,  115,
-      115,  115,  116,  116,  117,  118,  118,  118,  118,  118,
-      118,  118,  118,  118,  118,  119,  120,  121,  121,  121,
-      122,  122,  122,  123,  123,  124,  124,  124,  124,  124,
-      124,  124,  124,  124,  124,  125,  125,  125,  126,  126,
-      126,  127,  128,  128,  129,  130,  130,  130,  130,  130,
-      131,  131,  131,  132,  132,  133,  133,  133,  134,  135,
+      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,
+      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,
 
-      135,  135,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  137,  137,  138,  138,
-      138,  138,  138,  138,  138,  139,  139,  139,  139,  139,
-      139,  139,  140,  140,  140,  141,  142,  143,  144,  145,
-      146,  147,  147,  147,  148,  148,  148,  148,  149,  150,
-      151,  151,  151,  151,  151,  151,  151,  151,  151,  152,
-      152,  153,  153,  153,  153,  153,  153,  153,  153,  154,
-      155,  156,  156,  156,  157,  157,  158,  158,  158,  158,
-      159,  159,  160,  161,  162,  163,  163,  163,  164,  164,
-      164,  165,  166,  167,  167,  168,  169,  170,  170,  170,
+      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,
 
-      170,  170,  170,  170,  171,  171,  172,  173,  173,  173,
-      173,  173,  173,  173,  173,  173,  173,  173,  173,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  175,  175,
-      175,  175,  175,  176,  176,  176,  176,  176,  177,  178,
-      178,  178,  178,  178,  179,  179,  179,  179,  180,  180,
-      181,  182,  182,  182,  182,  182,  182,  182,  182,  182,
-      182,  182,  182,  182,  183,  183,  183,  183,  183,  183,
-      183,  183,  184,  184,  184,  184,  184,  185,  185,  185,
-      185,  185,  186,  186,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  188,  188,  189,
+      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,  190,  191,  191,  192,  193,  194,  194,  195,  195
+      190,  191,  191,  192,  192,  193,  194,  195,  195,  196,
+      196
     } ;
 
 static yyconst int yy_ec[256] =
@@ -446,129 +447,129 @@ static yyconst int yy_meta[44] =
         3,    3,    3
     } ;
 
-static yyconst short int yy_base[515] =
+static yyconst short int yy_base[516] =
     {   0,
-        0,    0, 1108, 1109, 1109, 1109, 1103, 1092,   36,   40,
+        0,    0, 1110, 1111, 1111, 1111, 1105, 1094,   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, 1101, 1109, 1090, 1109,
+      126,  171,  119,  123,   73,  125, 1103, 1111, 1092, 1111,
         0,  159,  176,  199,  204,   95,  209,  224,  229,    0,
-      130,  165,  133,  120,  169,  151,  159,   31, 1089,  168,
+      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, 1088,  284,  285,
+      263,  258,  267,  261,  277,  281,  283, 1090,  284,  285,
       286,  287,  265,  290,  300,  295,  291,  308,  294,  305,
 
-      316,  318, 1087,  320,  306,  304,  321,  324,  322,  327,
-      328,  289,  213,  330,  342,  338,  346,  349, 1086,    0,
-      358,  362, 1085,  376,  393,    0, 1084,  351,  350, 1083,
-      369,  363, 1082,  364, 1081,  366,  380,  382, 1080,  388,
-      394,  397,  398,  399,  400, 1079,  404,  401,  408,  402,
-      409,  410,  412,  419,  420,  422,  424,  423,  426,  427,
-      428,  434,  439,  113,  440,  442,  443,  445,  446,  447,
-     1078,  449,  453, 1077,  451, 1076, 1075,  478,  455,  457,
-      456,  458,  489, 1074,  469,  460,  492,  491,  472, 1073,
-      494,  495,  497,  496,  502,  503,  499,  505,  509,  514,
+      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,
 
-      516,  518,  513,  519,  520,  523,  521,  534,  533,  536,
-     1072,  524, 1109,  547,  555,  561,  565,  570,  555,  571,
-      573, 1071,  574, 1070, 1069, 1068,  575,  576,  577,  579,
-      580,  583,  581,  586,  588,  584,  587,  592,  593,  595,
-      605, 1067,  597, 1066, 1065,  601,  609,  610,  607,  611,
-      615,  618,  617,  621, 1064, 1063, 1062,  622,  623, 1061,
-      624,  626,    0,  625, 1060,  630,  637,  627,  641,  642,
-      645,  639,  646,  652, 1059,  657,  653, 1058,  658,  655,
-     1057, 1056,  659, 1055, 1054,  663,  669,  671,  672, 1053,
-      673,  675, 1052,  677, 1051,  680,  678,  685, 1050,  687,
+      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,
 
-      685, 1049,  688,  698,  697,  701,  686,  459,  699,  705,
-      708,  709,  710,  711,  712, 1048,  713, 1047,  714,  715,
-      716,  721,  722,  725, 1046,  729,  727,  731,  740,  741,
-      742, 1045,  735,  737, 1044, 1043, 1042, 1041, 1040, 1039,
-     1038,  743,  745, 1037,  747,  748,  752, 1036, 1035, 1034,
-      756,  754,  757,  764,  765,  767,  766,  768, 1033,  769,
-     1032,  770,  774,  773,  777,  776,  779,  784, 1031, 1030,
-     1029,  788,  783, 1028,  791, 1027,  790,  794,  795, 1026,
-      804, 1025, 1024, 1023, 1022,  796,  805, 1021,  809,  810,
-     1020, 1019, 1018,  812, 1017, 1016, 1015,  808,  813,  819,
+      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,
 
-      815,  814,  816, 1014,  825, 1013, 1012,  821,  826,  326,
-      829,  832,  836,  833,  834,  837,  846,  838, 1011,  840,
-      848,  851,  853,  854,  859,  858,  861, 1010,  863,  867,
-      868,  864, 1009,  869,  871,  870,  874, 1008, 1005,  876,
-      885,  875,  880,  995,  892,  895,  896,  993,  878,  992,
-      991,  897,  898,  903,  905,  904,  879,  906,  911,  912,
-      914,  915,  916,  990,  917,  922,  918,  923,  924,  932,
-      925,  988,  935,  928,  936,  939,  987,  940,  929,  942,
-      945,  983,  947,  982,  953,  950,  956,  958,  959,  960,
-      961,  964,  963,  966,  967,  971,  979,  972,  830,  631,
+      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,
 
-      974,  541,  977,  537,  462,  383,  976,  216, 1109, 1011,
-     1013,  226, 1017,   76
+      876,  975,  538,  976,  535,  462,  423,  978,  216, 1111,
+     1013, 1015,  226, 1019,   76
     } ;
 
-static yyconst short int yy_def[515] =
+static yyconst short int yy_def[516] =
     {   0,
-      509,    1,  509,  509,  509,  509,  510,  511,  512,  509,
-      511,  511,  511,  511,  513,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  510,  509,  511,  509,
-      514,  514,  509,  509,  511,  511,  511,  511,  511,  513,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      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,
 
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  509,  514,
-      514,  509,  511,  511,  511,   49,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,   49,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      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,
 
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  509,  509,  509,  509,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  178,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  509,  511,  511,
+      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,
 
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
 
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
 
-      511,  511,  511,  511,  511,  511,  511,  511,    0,  509,
-      509,  509,  509,  509
+      512,  512,  512,  512,  512,  512,  512,  512,  512,    0,
+      510,  510,  510,  510,  510
     } ;
 
-static yyconst short int yy_nxt[1153] =
+static yyconst short int yy_nxt[1155] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   14,   14,    4,   15,    8,    8,    8,   16,   17,
@@ -585,7 +586,7 @@ static yyconst short int yy_nxt[1153] =
        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,
-      253,   90,   84,   40,  102,  115,   40,  118,   85,   92,
+      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,
@@ -595,7 +596,7 @@ static yyconst short int yy_nxt[1153] =
        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,
-      206,  125,   47,   48,   48,   48,   48,   40,  126,  126,
+      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,
@@ -604,102 +605,102 @@ static yyconst short int yy_nxt[1153] =
        40,  162,  165,  167,   40,  169,   40,   40,   40,   40,
 
        40,  173,   40,   40,   40,  171,  179,   40,   40,  172,
-      174,  175,  187,   40,  205,  176,  180,   40,   40,   40,
-      181,   40,  177,  184,  190,  189,  185,  178,  182,   40,
-      188,   40,  186,   40,   40,   40,  183,   40,  196,   40,
-       40,   40,  191,   40,  192,  197,  194,  198,  201,  210,
-      204,   40,  193,  200,  199,   40,  207,  195,  208,   40,
-      209,  202,   40,   40,   40,  432,  203,  121,  121,  121,
-      121,  214,  214,  214,  214,  219,   40,   40,  215,   40,
-      211,  220,   40,  212,  215,  124,  124,  124,  124,   40,
-      223,  221,  125,   40,  224,   40,   40,  222,  125,  216,
+      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,   40,  218,  218,  218,  218,   40,   40,  225,  227,
-       40,   40,   40,   40,   40,   40,  230,   40,  226,  229,
-      235,   40,   40,   40,  237,   40,  233,  231,  232,  228,
-      234,  238,   40,   40,  236,   40,   40,   40,  243,   40,
-       40,   40,  247,  239,  244,  240,  246,   40,  241,  249,
-      250,  245,   40,   40,  248,   40,   40,  242,   40,   40,
-       40,  252,   40,  255,   40,  251,   40,  256,   40,   40,
-       40,   40,   40,   40,  258,   40,  254,  260,  366,  257,
-      267,  262,   40,  273,  259,   40,  261,  263,  263,  263,
-      263,  264,  266,  263,  263,  265,  263,  263,  263,  263,
+      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,
 
-      263,  263,   40,  272,   40,   40,  276,   40,   40,   40,
-       40,  268,   40,  269,  274,   40,   40,  270,   40,  271,
-      275,  279,   40,  278,  281,  282,   40,   40,  280,   40,
-      277,   40,   40,   40,   40,  283,   40,   40,  287,  289,
-      288,  292,  293,  284,  286,  285,   40,   40,  290,   40,
-       40,  291,  294,  296,   40,  297,  214,  214,  214,  214,
-      295,  216,  216,  215,  298,  298,  298,  298,   40,  215,
-      298,  298,  298,  298,  218,  218,  218,  218,   40,  218,
-      218,  218,  218,   40,   40,  299,   40,   40,   40,   40,
-       40,  300,   40,   40,   40,  303,   40,   40,  307,   40,
+      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,
 
-       40,   40,  312,  301,  302,   40,   40,  306,   40,  308,
-       40,  315,  304,  305,   40,  310,  311,  316,   40,  313,
-       40,  309,   40,   40,   40,  317,  314,  320,   40,  319,
-       40,   40,  321,  318,   40,   40,   40,   40,   40,   40,
-       40,  322,  324,   40,   40,  323,  325,  332,  326,  327,
-       40,  329,   40,  328,   40,   40,  333,  334,   40,   40,
-      335,  330,  331,  336,  338,   40,   40,  340,   40,  342,
-       40,   40,   40,  345,  343,  341,   40,  337,  339,  344,
-      346,  348,   40,  347,   40,   40,   40,  349,   40,  351,
-       40,   40,  350,   40,  298,  298,  298,  298,   40,   40,
+      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,
 
-       40,   40,  352,  356,  358,  359,  360,  353,  361,  354,
-       40,   40,   40,  355,   40,  357,  362,  363,   40,  364,
-      365,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-      369,  367,  373,  374,   40,   40,  375,  368,   40,  370,
-       40,  372,   40,  376,   40,  377,  371,  380,   40,  382,
-       40,  383,  379,   40,   40,   40,   40,  378,   40,  381,
-       40,   40,  384,  385,  386,   40,  387,   40,  390,   40,
-       40,  389,  391,  388,  393,  395,  394,   40,   40,   40,
-       40,   40,   40,   40,  392,  399,   40,   40,  397,   40,
-       40,  398,   40,  396,  404,  402,   40,   40,  401,  406,
+      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,
 
-      403,   40,  400,   40,   40,  410,  411,   40,   40,   40,
-      408,  407,  414,  416,  405,  409,  415,   40,   40,  412,
-      413,   40,   40,   40,  417,   40,   40,   40,   40,   40,
-      418,  420,   40,  421,   40,  419,  423,  422,   40,   40,
-      425,  426,   40,   40,  427,   40,   40,   40,  424,   40,
-       40,   40,  428,   40,  434,  430,  429,  433,  435,   40,
-      431,   40,  437,  436,   40,  438,   40,   40,  439,  443,
-      442,   40,   40,  440,   40,  444,   40,   40,  441,  446,
-       40,   40,   40,   40,   40,  448,  452,   40,   40,   40,
-      445,   40,   40,   40,  447,  459,  456,  453,   40,  460,
+       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,
 
-      449,  454,  457,  450,  451,   40,  455,  458,   40,   40,
-       40,   40,  461,  462,  464,  465,   40,   40,   40,   40,
-      466,  470,  463,  468,   40,   40,  471,   40,   40,   40,
-       40,   40,  474,  469,  476,   40,   40,   40,   40,  467,
-      473,   40,   40,  475,  477,   40,  481,  472,   40,   40,
-      479,  478,   40,   40,  482,   40,  485,  484,   40,  480,
-       40,  483,  488,   40,  486,  489,   40,  487,  490,   40,
-      494,   40,   40,   40,   40,  491,   40,   40,  492,   40,
-       40,  493,  495,  501,   40,   40,  502,   40,  496,   40,
-       40,  498,   40,  497,  506,   40,   40,  499,  500,  507,
+      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,  505,   40,   40,   40,   40,  504,   40,  503,
-      508,   37,   37,   37,   37,   39,   39,   50,   40,   50,
-       50,   40,   40,   40,   40,   40,   40,   40,   40,   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,   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,   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,  213,
 
-       40,   40,   40,   40,  119,   40,   38,  509,    3,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509
+       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
     } ;
 
-static yyconst short int yy_chk[1153] =
+static yyconst short int yy_chk[1155] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -708,7 +709,7 @@ static yyconst short int yy_chk[1153] =
         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,  514,   17,
+       14,   14,   14,   14,   14,   14,   16,   20,  515,   17,
        27,   29,   27,   26,   16,   35,   35,   20,   17,   23,
        29,   16,   17,   16,   18,   16,   13,   17,   16,   18,
 
@@ -725,7 +726,7 @@ static yyconst short int yy_chk[1153] =
 
        68,   32,   63,   60,   64,   32,   32,   44,   44,   44,
        44,   44,   45,   45,   45,   45,   45,   45,   47,   47,
-       47,   47,   47,   63,   68,   47,  113,   64,  512,  508,
+       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,
@@ -734,100 +735,100 @@ static yyconst short int yy_chk[1153] =
        83,   81,   84,   82,   75,   76,   80,   77,   78,   78,
        85,   78,   80,   81,   86,   83,   87,   89,   90,   91,
 
-       92,   87,  112,   94,   97,   85,   93,   99,   96,   86,
-       89,   90,   97,   95,  112,   91,   94,  106,  100,  105,
-       95,   98,   91,   96,  100,   99,   96,   92,   95,  101,
-       98,  102,   96,  104,  107,  109,   95,  108,  105,  410,
-      110,  111,  101,  114,  102,  106,  104,  107,  110,  116,
-      111,  116,  102,  109,  108,  115,  114,  104,  114,  117,
-      115,  110,  118,  129,  128,  410,  110,  121,  121,  121,
-      121,  122,  122,  122,  122,  128,  132,  134,  122,  136,
-      117,  129,  131,  118,  122,  124,  124,  124,  124,  124,
-      134,  131,  124,  137,  136,  138,  506,  132,  124,  125,
+       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,  140,  125,  125,  125,  125,  125,  141,  137,  140,
-      142,  143,  144,  145,  148,  150,  143,  147,  138,  142,
-      148,  149,  151,  152,  150,  153,  147,  144,  145,  141,
-      147,  151,  154,  155,  149,  156,  158,  157,  155,  159,
-      160,  161,  158,  151,  156,  152,  157,  162,  153,  160,
-      161,  156,  163,  165,  159,  166,  167,  154,  168,  169,
-      170,  163,  172,  166,  175,  162,  173,  167,  179,  181,
-      180,  182,  308,  186,  169,  505,  165,  172,  308,  168,
-      182,  175,  185,  186,  170,  189,  173,  178,  178,  178,
+      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,  188,  187,  189,  191,  192,  194,
-      193,  183,  197,  183,  187,  195,  196,  183,  198,  183,
-      188,  193,  199,  192,  195,  196,  203,  200,  194,  201,
-      191,  202,  204,  205,  207,  197,  206,  212,  201,  203,
-      202,  206,  207,  198,  200,  199,  209,  208,  204,  210,
-      504,  205,  208,  210,  502,  212,  214,  214,  214,  214,
-      209,  215,  215,  214,  215,  215,  215,  215,  219,  214,
-      216,  216,  216,  216,  217,  217,  217,  217,  217,  218,
-      218,  218,  218,  218,  220,  219,  221,  223,  227,  228,
-      229,  220,  230,  231,  233,  227,  232,  236,  231,  234,
+      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,
 
-      237,  235,  236,  221,  223,  238,  239,  230,  240,  232,
-      243,  239,  228,  229,  246,  234,  235,  240,  241,  237,
-      249,  233,  247,  248,  250,  241,  238,  247,  251,  246,
-      253,  252,  248,  243,  254,  258,  259,  261,  264,  262,
-      268,  249,  251,  266,  500,  250,  252,  264,  253,  254,
-      267,  259,  272,  258,  269,  270,  266,  267,  271,  273,
-      268,  261,  262,  269,  270,  274,  277,  271,  280,  273,
-      276,  279,  283,  277,  274,  272,  286,  269,  270,  276,
-      279,  283,  287,  280,  288,  289,  291,  286,  292,  288,
-      294,  297,  287,  296,  298,  298,  298,  298,  301,  307,
+      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,
 
-      300,  303,  289,  296,  297,  300,  301,  291,  303,  292,
-      305,  304,  309,  294,  306,  296,  304,  305,  310,  306,
-      307,  311,  312,  313,  314,  315,  317,  319,  320,  321,
-      311,  309,  315,  317,  322,  323,  319,  310,  324,  312,
-      327,  314,  326,  320,  328,  321,  313,  324,  333,  327,
-      334,  328,  323,  329,  330,  331,  342,  322,  343,  326,
-      345,  346,  329,  330,  331,  347,  333,  352,  343,  351,
-      353,  342,  345,  334,  347,  352,  351,  354,  355,  357,
-      356,  358,  360,  362,  346,  356,  364,  363,  354,  366,
-      365,  355,  367,  353,  363,  360,  373,  368,  358,  365,
+      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,
 
-      362,  372,  357,  377,  375,  372,  372,  378,  379,  386,
-      367,  366,  377,  379,  364,  368,  378,  381,  387,  373,
-      375,  398,  389,  390,  381,  394,  399,  402,  401,  403,
-      386,  389,  400,  390,  408,  387,  398,  394,  405,  409,
-      400,  401,  411,  499,  402,  412,  414,  415,  399,  413,
-      416,  418,  403,  420,  412,  408,  405,  411,  413,  417,
-      409,  421,  415,  414,  422,  416,  423,  424,  417,  422,
-      421,  426,  425,  418,  427,  423,  429,  432,  420,  425,
-      430,  431,  434,  436,  435,  427,  432,  437,  442,  440,
-      424,  449,  457,  443,  426,  442,  437,  434,  441,  443,
+      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,
 
-      429,  435,  440,  430,  431,  445,  436,  441,  446,  447,
-      452,  453,  445,  446,  449,  452,  454,  456,  455,  458,
-      453,  457,  447,  455,  459,  460,  458,  461,  462,  463,
-      465,  467,  461,  456,  463,  466,  468,  469,  471,  454,
-      460,  474,  479,  462,  465,  470,  469,  459,  473,  475,
-      467,  466,  476,  478,  470,  480,  474,  473,  481,  468,
-      483,  471,  478,  486,  475,  479,  485,  476,  480,  487,
-      486,  488,  489,  490,  491,  481,  493,  492,  483,  494,
-      495,  485,  487,  493,  496,  498,  494,  501,  488,  507,
-      503,  490,  497,  489,  501,  484,  482,  491,  492,  503,
+      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,
 
-      477,  472,  498,  464,  451,  450,  448,  496,  444,  495,
-      507,  510,  510,  510,  510,  511,  511,  513,  439,  513,
-      513,  438,  433,  428,  419,  407,  406,  404,  397,  396,
-      395,  393,  392,  391,  388,  385,  384,  383,  382,  380,
-      376,  374,  371,  370,  369,  361,  359,  350,  349,  348,
-      344,  341,  340,  339,  338,  337,  336,  335,  332,  325,
-      318,  316,  302,  299,  295,  293,  290,  285,  284,  282,
-      281,  278,  275,  265,  260,  257,  256,  255,  245,  244,
-      242,  226,  225,  224,  222,  211,  190,  184,  177,  176,
-      174,  171,  146,  139,  135,  133,  130,  127,  123,  119,
+      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,
 
-      103,   88,   59,   39,   37,    8,    7,    3,  509,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509
+      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
     } ;
 
 static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
@@ -904,7 +905,7 @@ char *yytext;
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 908 "UpgradeLexer.cpp"
+#line 909 "UpgradeLexer.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1058,7 +1059,7 @@ YY_DECL
 #line 98 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 
 
-#line 1062 "UpgradeLexer.cpp"
+#line 1063 "UpgradeLexer.cpp"
 
 	if ( yy_init )
 		{
@@ -1106,14 +1107,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 >= 510 )
+				if ( yy_current_state >= 511 )
 					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 != 509 );
+		while ( yy_current_state != 510 );
 
 yy_find_action:
 		yy_current_state = *--yy_state_ptr;
@@ -1572,7 +1573,7 @@ YY_RULE_SETUP
 case 85:
 YY_RULE_SETUP
 #line 189 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LSHR); }
+{ RET_TOK( SHR); }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
@@ -1582,32 +1583,32 @@ YY_RULE_SETUP
 case 87:
 YY_RULE_SETUP
 #line 191 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( VAARG); }
+{ RET_TOK( LSHR); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
 #line 192 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( RET); }
+{ RET_TOK( VAARG); }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
 #line 193 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( BR); }
+{ RET_TOK( RET); }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
 #line 194 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SWITCH); }
+{ RET_TOK( BR); }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
 #line 195 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( INVOKE); }
+{ RET_TOK( SWITCH); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
 #line 196 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UNWIND); }
+{ RET_TOK( INVOKE); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
@@ -1617,62 +1618,62 @@ YY_RULE_SETUP
 case 94:
 YY_RULE_SETUP
 #line 198 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UNREACHABLE); }
+{ RET_TOK( UNWIND); }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 200 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( MALLOC); }
+#line 199 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UNREACHABLE); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
 #line 201 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ALLOCA); }
+{ RET_TOK( MALLOC); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
 #line 202 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FREE); }
+{ RET_TOK( ALLOCA); }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
 #line 203 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LOAD); }
+{ RET_TOK( FREE); }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
 #line 204 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( STORE); }
+{ RET_TOK( LOAD); }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
 #line 205 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( GETELEMENTPTR); }
+{ RET_TOK( STORE); }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 207 "/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( GETELEMENTPTR); }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
 #line 208 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( INSERTELEMENT); }
+{ RET_TOK( EXTRACTELEMENT); }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
 #line 209 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SHUFFLEVECTOR); }
+{ RET_TOK( INSERTELEMENT); }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 212 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( VAR_ID); }
+#line 210 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SHUFFLEVECTOR); }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
 #line 213 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LABELSTR); }
+{ RET_TOK( VAR_ID); }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
@@ -1682,45 +1683,50 @@ YY_RULE_SETUP
 case 107:
 YY_RULE_SETUP
 #line 215 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( STRINGCONSTANT ); }
+{ RET_TOK( LABELSTR); }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
 #line 216 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( EUINT64VAL ); }
+{ RET_TOK( STRINGCONSTANT ); }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
 #line 217 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ESINT64VAL ); }
+{ RET_TOK( EUINT64VAL ); }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
 #line 218 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( yytext[0] == 's' ? ESINT64VAL : EUINT64VAL ); }
+{ RET_TOK( ESINT64VAL ); }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
 #line 219 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UINTVAL); }
+{ RET_TOK( yytext[0] == 's' ? ESINT64VAL : EUINT64VAL ); }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
 #line 220 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SINTVAL); }
+{ RET_TOK( UINTVAL); }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
 #line 221 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FPVAL); }
+{ RET_TOK( SINTVAL); }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
 #line 222 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( FPVAL); }
 	YY_BREAK
-case YY_STATE_EOF(INITIAL):
+case 115:
+YY_RULE_SETUP
 #line 223 "/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"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
@@ -1729,22 +1735,22 @@ case YY_STATE_EOF(INITIAL):
                   return EOF;
                 }
 	YY_BREAK
-case 115:
-YY_RULE_SETUP
-#line 231 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ /* Ignore whitespace */ }
-	YY_BREAK
 case 116:
 YY_RULE_SETUP
 #line 232 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ return yytext[0]; }
+{ /* Ignore whitespace */ }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 234 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 233 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ return yytext[0]; }
+	YY_BREAK
+case 118:
+YY_RULE_SETUP
+#line 235 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 1748 "UpgradeLexer.cpp"
+#line 1754 "UpgradeLexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2031,7 +2037,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 >= 510 )
+			if ( yy_current_state >= 511 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2061,11 +2067,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 >= 510 )
+		if ( yy_current_state >= 511 )
 			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 == 509);
+	yy_is_jam = (yy_current_state == 510);
 	if ( ! yy_is_jam )
 		*yy_state_ptr++ = yy_current_state;
 
@@ -2622,5 +2628,5 @@ int main()
 	return 0;
 	}
 #endif
-#line 234 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 235 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 
diff --git a/tools/llvm-upgrade/UpgradeLexer.l b/tools/llvm-upgrade/UpgradeLexer.l
index 293220a3d66..b3e1264058b 100644
--- a/tools/llvm-upgrade/UpgradeLexer.l
+++ b/tools/llvm-upgrade/UpgradeLexer.l
@@ -186,8 +186,9 @@ call            { RET_TOK( CALL); }
 cast            { RET_TOK( CAST); }
 select          { RET_TOK( SELECT); }
 shl             { RET_TOK( SHL); }
-lshr            { RET_TOK( LSHR); }
+shr             { RET_TOK( SHR); }
 ashr            { RET_TOK( ASHR); }
+lshr            { RET_TOK( LSHR); }
 va_arg          { RET_TOK( VAARG); }
 ret             { RET_TOK( RET); }
 br              { RET_TOK( BR); }
diff --git a/tools/llvm-upgrade/UpgradeLexer.l.cvs b/tools/llvm-upgrade/UpgradeLexer.l.cvs
index 293220a3d66..b3e1264058b 100644
--- a/tools/llvm-upgrade/UpgradeLexer.l.cvs
+++ b/tools/llvm-upgrade/UpgradeLexer.l.cvs
@@ -186,8 +186,9 @@ call            { RET_TOK( CALL); }
 cast            { RET_TOK( CAST); }
 select          { RET_TOK( SELECT); }
 shl             { RET_TOK( SHL); }
-lshr            { RET_TOK( LSHR); }
+shr             { RET_TOK( SHR); }
 ashr            { RET_TOK( ASHR); }
+lshr            { RET_TOK( LSHR); }
 va_arg          { RET_TOK( VAARG); }
 ret             { RET_TOK( RET); }
 br              { RET_TOK( BR); }
diff --git a/tools/llvm-upgrade/UpgradeParser.cpp b/tools/llvm-upgrade/UpgradeParser.cpp
index 68a8423b76c..06c25c2f813 100644
--- a/tools/llvm-upgrade/UpgradeParser.cpp
+++ b/tools/llvm-upgrade/UpgradeParser.cpp
@@ -166,13 +166,14 @@
      PHI_TOK = 357,
      SELECT = 358,
      SHL = 359,
-     LSHR = 360,
+     SHR = 360,
      ASHR = 361,
-     VAARG = 362,
-     EXTRACTELEMENT = 363,
-     INSERTELEMENT = 364,
-     SHUFFLEVECTOR = 365,
-     CAST = 366
+     LSHR = 362,
+     VAARG = 363,
+     EXTRACTELEMENT = 364,
+     INSERTELEMENT = 365,
+     SHUFFLEVECTOR = 366,
+     CAST = 367
    };
 #endif
 /* Tokens.  */
@@ -278,13 +279,14 @@
 #define PHI_TOK 357
 #define SELECT 358
 #define SHL 359
-#define LSHR 360
+#define SHR 360
 #define ASHR 361
-#define VAARG 362
-#define EXTRACTELEMENT 363
-#define INSERTELEMENT 364
-#define SHUFFLEVECTOR 365
-#define CAST 366
+#define LSHR 362
+#define VAARG 363
+#define EXTRACTELEMENT 364
+#define INSERTELEMENT 365
+#define SHUFFLEVECTOR 366
+#define CAST 367
 
 
 
@@ -432,7 +434,7 @@ typedef union YYSTYPE {
   ConstInfo       Const;
 } YYSTYPE;
 /* Line 196 of yacc.c.  */
-#line 436 "UpgradeParser.tab.c"
+#line 438 "UpgradeParser.tab.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -444,7 +446,7 @@ typedef union YYSTYPE {
 
 
 /* Line 219 of yacc.c.  */
-#line 448 "UpgradeParser.tab.c"
+#line 450 "UpgradeParser.tab.c"
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 # define YYSIZE_T __SIZE_TYPE__
@@ -595,20 +597,20 @@ union yyalloc
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  4
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1142
+#define YYLAST   1150
 
 /* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS  126
+#define YYNTOKENS  127
 /* YYNNTS -- Number of nonterminals. */
 #define YYNNTS  70
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  249
+#define YYNRULES  250
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  508
+#define YYNSTATES  509
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   366
+#define YYMAXUTOK   367
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -620,15 +622,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,
-     115,   116,   124,     2,   113,     2,     2,     2,     2,     2,
+     116,   117,   125,     2,   114,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     120,   112,   121,     2,     2,     2,     2,     2,     2,     2,
+     121,   113,   122,     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,   117,   114,   119,     2,     2,     2,     2,     2,   125,
+       2,   118,   115,   120,     2,     2,     2,     2,     2,   126,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     118,     2,     2,   122,     2,   123,     2,     2,     2,     2,
+     119,     2,     2,   123,     2,   124,     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,
@@ -652,7 +654,7 @@ 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
+     105,   106,   107,   108,   109,   110,   111,   112
 };
 
 #if YYDEBUG
@@ -664,113 +666,114 @@ 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,
-      80,    81,    83,    85,    87,    89,    91,    93,    95,    96,
-      98,   100,   102,   104,   106,   108,   111,   112,   113,   116,
-     117,   121,   124,   125,   127,   128,   132,   134,   137,   139,
+      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,   180,
-     185,   191,   197,   201,   204,   207,   209,   213,   215,   219,
-     221,   222,   227,   231,   235,   240,   245,   249,   252,   255,
-     258,   261,   264,   267,   270,   273,   276,   279,   286,   292,
-     301,   308,   315,   322,   329,   336,   345,   354,   358,   360,
-     362,   364,   366,   369,   372,   377,   380,   382,   387,   390,
-     395,   402,   409,   416,   423,   427,   432,   433,   435,   437,
-     439,   443,   447,   451,   455,   459,   463,   465,   466,   468,
-     470,   472,   473,   476,   480,   482,   484,   488,   490,   491,
-     500,   502,   504,   508,   510,   512,   516,   517,   519,   521,
-     525,   526,   528,   530,   532,   534,   536,   538,   540,   542,
-     544,   548,   550,   556,   558,   560,   562,   564,   567,   570,
-     572,   575,   578,   579,   581,   584,   587,   591,   601,   611,
-     620,   635,   637,   639,   646,   652,   655,   662,   670,   672,
-     676,   678,   679,   682,   684,   690,   696,   702,   705,   710,
-     715,   722,   727,   732,   739,   746,   749,   757,   759,   762,
-     763,   765,   766,   770,   777,   781,   788,   791,   796,   803
+     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
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
 static const short int yyrhs[] =
 {
-     157,     0,    -1,    19,    -1,    20,    -1,    17,    -1,    18,
+     158,     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,    11,    -1,     9,    -1,     7,    -1,     5,
-      -1,    12,    -1,    10,    -1,     8,    -1,     6,    -1,   133,
-      -1,   134,    -1,    13,    -1,    14,    -1,   165,   112,    -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,   113,    57,    18,
-      -1,    37,    30,    -1,    -1,   142,    -1,    -1,   113,   145,
-     144,    -1,   142,    -1,    57,    18,    -1,   148,    -1,     3,
-      -1,   150,    -1,     3,    -1,   150,    -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,   149,    -1,   179,    -1,   114,    18,    -1,
-     147,   115,   152,   116,    -1,   117,    18,   118,   150,   119,
-      -1,   120,    18,   118,   150,   121,    -1,   122,   151,   123,
-      -1,   122,   123,    -1,   150,   124,    -1,   150,    -1,   151,
-     113,   150,    -1,   151,    -1,   151,   113,    40,    -1,    40,
-      -1,    -1,   148,   117,   155,   119,    -1,   148,   117,   119,
-      -1,   148,   125,    30,    -1,   148,   120,   155,   121,    -1,
-     148,   122,   155,   123,    -1,   148,   122,   123,    -1,   148,
-      22,    -1,   148,    23,    -1,   148,   179,    -1,   148,   154,
-      -1,   148,    24,    -1,   133,   128,    -1,   134,    18,    -1,
-       4,    25,    -1,     4,    26,    -1,   136,    21,    -1,   111,
-     115,   153,    39,   148,   116,    -1,   101,   115,   153,   193,
-     116,    -1,   103,   115,   153,   113,   153,   113,   153,   116,
-      -1,   129,   115,   153,   113,   153,   116,    -1,   130,   115,
-     153,   113,   153,   116,    -1,   131,   115,   153,   113,   153,
-     116,    -1,   132,   115,   153,   113,   153,   116,    -1,   108,
-     115,   153,   113,   153,   116,    -1,   109,   115,   153,   113,
-     153,   113,   153,   116,    -1,   110,   115,   153,   113,   153,
-     113,   153,   116,    -1,   155,   113,   153,    -1,   153,    -1,
-      35,    -1,    36,    -1,   158,    -1,   158,   174,    -1,   158,
-     176,    -1,   158,    62,    61,   160,    -1,   158,    31,    -1,
-     159,    -1,   159,   137,    27,   146,    -1,   159,   176,    -1,
-     159,    62,    61,   160,    -1,   159,   137,   138,   156,   153,
-     144,    -1,   159,   137,    50,   156,   148,   144,    -1,   159,
-     137,    45,   156,   148,   144,    -1,   159,   137,    47,   156,
-     148,   144,    -1,   159,    51,   162,    -1,   159,    58,   112,
-     163,    -1,    -1,    30,    -1,    56,    -1,    55,    -1,    53,
-     112,   161,    -1,    54,   112,    18,    -1,    52,   112,    30,
-      -1,    71,   112,    30,    -1,   117,   164,   119,    -1,   164,
-     113,    30,    -1,    30,    -1,    -1,    28,    -1,    30,    -1,
-     165,    -1,    -1,   148,   166,    -1,   168,   113,   167,    -1,
-     167,    -1,   168,    -1,   168,   113,    40,    -1,    40,    -1,
-      -1,   139,   146,   165,   115,   169,   116,   143,   140,    -1,
-      32,    -1,   122,    -1,   138,   170,   171,    -1,    33,    -1,
-     123,    -1,   172,   182,   173,    -1,    -1,    45,    -1,    47,
-      -1,    34,   175,   170,    -1,    -1,    63,    -1,    17,    -1,
-      18,    -1,    21,    -1,    25,    -1,    26,    -1,    22,    -1,
-      23,    -1,    24,    -1,   120,   155,   121,    -1,   154,    -1,
-      61,   177,    30,   113,    30,    -1,   127,    -1,   165,    -1,
-     179,    -1,   178,    -1,   148,   180,    -1,   182,   183,    -1,
-     183,    -1,   184,   185,    -1,   184,   187,    -1,    -1,    29,
-      -1,    72,   181,    -1,    72,     3,    -1,    73,    15,   180,
-      -1,    73,     4,   180,   113,    15,   180,   113,    15,   180,
-      -1,    74,   135,   180,   113,    15,   180,   117,   186,   119,
-      -1,    74,   135,   180,   113,    15,   180,   117,   119,    -1,
-     137,    75,   139,   146,   180,   115,   190,   116,    39,    15,
-     180,    76,    15,   180,    -1,    76,    -1,    77,    -1,   186,
-     135,   178,   113,    15,   180,    -1,   135,   178,   113,    15,
-     180,    -1,   137,   192,    -1,   148,   117,   180,   113,   180,
-     119,    -1,   188,   113,   117,   180,   113,   180,   119,    -1,
-     181,    -1,   189,   113,   181,    -1,   189,    -1,    -1,    60,
-      59,    -1,    59,    -1,   129,   148,   180,   113,   180,    -1,
-     130,   148,   180,   113,   180,    -1,   131,   148,   180,   113,
-     180,    -1,    49,   181,    -1,   132,   181,   113,   181,    -1,
-     111,   181,    39,   148,    -1,   103,   181,   113,   181,   113,
-     181,    -1,   107,   181,   113,   148,    -1,   108,   181,   113,
-     181,    -1,   109,   181,   113,   181,   113,   181,    -1,   110,
-     181,   113,   181,   113,   181,    -1,   102,   188,    -1,   191,
-     139,   146,   180,   115,   190,   116,    -1,   195,    -1,   113,
-     189,    -1,    -1,    38,    -1,    -1,    96,   148,   141,    -1,
-      96,   148,   113,    10,   180,   141,    -1,    97,   148,   141,
-      -1,    97,   148,   113,    10,   180,   141,    -1,    98,   181,
-      -1,   194,    99,   148,   180,    -1,   194,   100,   181,   113,
-     148,   180,    -1,   101,   148,   180,   193,    -1
+      -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
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -778,29 +781,30 @@ 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,   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,   503,   508,   513,   523,   528,   533,
-     533,   543,   548,   551,   556,   560,   564,   567,   572,   577,
-     582,   588,   594,   600,   606,   611,   616,   621,   623,   623,
-     626,   631,   638,   643,   650,   657,   662,   663,   671,   671,
-     672,   672,   674,   681,   685,   689,   692,   697,   700,   702,
-     722,   725,   729,   738,   739,   741,   749,   750,   751,   755,
-     768,   769,   772,   772,   772,   772,   772,   772,   772,   773,
-     774,   779,   780,   789,   789,   792,   792,   798,   805,   808,
-     816,   820,   825,   828,   834,   839,   844,   849,   856,   862,
-     868,   881,   886,   892,   897,   905,   912,   918,   926,   927,
-     935,   936,   940,   945,   948,   953,   958,   963,   968,   973,
-     980,   985,   990,   995,  1000,  1005,  1010,  1019,  1024,  1028,
-    1032,  1033,  1036,  1043,  1050,  1057,  1064,  1069,  1076,  1083
+     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
 };
 #endif
 
@@ -824,24 +828,25 @@ static const char *const yytname[] =
   "SWITCH", "INVOKE", "UNWIND", "UNREACHABLE", "ADD", "SUB", "MUL", "UDIV",
   "SDIV", "FDIV", "UREM", "SREM", "FREM", "AND", "OR", "XOR", "SETLE",
   "SETGE", "SETLT", "SETGT", "SETEQ", "SETNE", "MALLOC", "ALLOCA", "FREE",
-  "LOAD", "STORE", "GETELEMENTPTR", "PHI_TOK", "SELECT", "SHL", "LSHR",
-  "ASHR", "VAARG", "EXTRACTELEMENT", "INSERTELEMENT", "SHUFFLEVECTOR",
-  "CAST", "'='", "','", "'\\\\'", "'('", "')'", "'['", "'x'", "']'", "'<'",
-  "'>'", "'{'", "'}'", "'*'", "'c'", "$accept", "IntVal", "EInt64Val",
-  "ArithmeticOps", "LogicalOps", "SetCondOps", "ShiftOps", "SIntType",
-  "UIntType", "IntType", "FPType", "OptAssign", "OptLinkage",
-  "OptCallingConv", "OptAlign", "OptCAlign", "SectionString", "OptSection",
-  "GlobalVarAttributes", "GlobalVarAttribute", "TypesV", "UpRTypesV",
-  "Types", "PrimType", "UpRTypes", "TypeListI", "ArgTypeListI", "ConstVal",
-  "ConstExpr", "ConstVector", "GlobalType", "Module", "DefinitionList",
-  "ConstPool", "AsmBlock", "BigOrLittle", "TargetDefinition",
-  "LibrariesDefinition", "LibList", "Name", "OptName", "ArgVal",
-  "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN", "FunctionHeader",
-  "END", "Function", "FnDeclareLinkage", "FunctionProto", "OptSideEffect",
-  "ConstValueRef", "SymbolicValueRef", "ValueRef", "ResolvedVal",
-  "BasicBlockList", "BasicBlock", "InstructionList", "BBTerminatorInst",
-  "JumpTable", "Inst", "PHIList", "ValueRefList", "ValueRefListE",
-  "OptTailCall", "InstVal", "IndexList", "OptVolatile", "MemoryInst", 0
+  "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",
+  "OptLinkage", "OptCallingConv", "OptAlign", "OptCAlign", "SectionString",
+  "OptSection", "GlobalVarAttributes", "GlobalVarAttribute", "TypesV",
+  "UpRTypesV", "Types", "PrimType", "UpRTypes", "TypeListI",
+  "ArgTypeListI", "ConstVal", "ConstExpr", "ConstVector", "GlobalType",
+  "Module", "DefinitionList", "ConstPool", "AsmBlock", "BigOrLittle",
+  "TargetDefinition", "LibrariesDefinition", "LibList", "Name", "OptName",
+  "ArgVal", "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN",
+  "FunctionHeader", "END", "Function", "FnDeclareLinkage", "FunctionProto",
+  "OptSideEffect", "ConstValueRef", "SymbolicValueRef", "ValueRef",
+  "ResolvedVal", "BasicBlockList", "BasicBlock", "InstructionList",
+  "BBTerminatorInst", "JumpTable", "Inst", "PHIList", "ValueRefList",
+  "ValueRefListE", "OptTailCall", "InstVal", "IndexList", "OptVolatile",
+  "MemoryInst", 0
 };
 #endif
 
@@ -861,39 +866,40 @@ 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,    61,    44,    92,    40,    41,    91,   120,    93,
-      60,    62,   123,   125,    42,    99
+     365,   366,   367,    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,   126,   127,   127,   128,   128,   129,   129,   129,   129,
-     129,   129,   129,   129,   129,   130,   130,   130,   131,   131,
-     131,   131,   131,   131,   132,   132,   132,   133,   133,   133,
-     133,   134,   134,   134,   134,   135,   135,   136,   136,   137,
-     137,   138,   138,   138,   138,   138,   138,   138,   138,   139,
-     139,   139,   139,   139,   139,   139,   139,   140,   140,   141,
-     141,   142,   143,   143,   144,   144,   145,   145,   146,   146,
-     147,   147,   148,   149,   149,   149,   149,   149,   149,   149,
-     149,   149,   149,   149,   149,   150,   150,   150,   150,   150,
-     150,   150,   150,   150,   150,   151,   151,   152,   152,   152,
-     152,   153,   153,   153,   153,   153,   153,   153,   153,   153,
-     153,   153,   153,   153,   153,   153,   153,   154,   154,   154,
-     154,   154,   154,   154,   154,   154,   154,   155,   155,   156,
-     156,   157,   158,   158,   158,   158,   158,   159,   159,   159,
-     159,   159,   159,   159,   159,   159,   159,   160,   161,   161,
-     162,   162,   162,   162,   163,   164,   164,   164,   165,   165,
-     166,   166,   167,   168,   168,   169,   169,   169,   169,   170,
-     171,   171,   172,   173,   173,   174,   175,   175,   175,   176,
-     177,   177,   178,   178,   178,   178,   178,   178,   178,   178,
-     178,   178,   178,   179,   179,   180,   180,   181,   182,   182,
-     183,   184,   184,   184,   185,   185,   185,   185,   185,   185,
-     185,   185,   185,   186,   186,   187,   188,   188,   189,   189,
-     190,   190,   191,   191,   192,   192,   192,   192,   192,   192,
-     192,   192,   192,   192,   192,   192,   192,   192,   193,   193,
-     194,   194,   195,   195,   195,   195,   195,   195,   195,   195
+       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
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -902,28 +908,29 @@ static const unsigned char yyr2[] =
        0,     2,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        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
+       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
@@ -931,439 +938,441 @@ static const unsigned char yyr2[] =
    means the default is an error.  */
 static const unsigned char yydefact[] =
 {
-     146,     0,    48,   136,     1,   135,   176,    41,    42,    43,
-      45,    46,    47,    44,     0,    56,   202,   132,   133,   158,
-     159,     0,     0,     0,    48,     0,   138,   177,   178,    56,
-       0,     0,    49,    50,    51,    52,    53,    54,     0,     0,
-     203,   202,   199,    40,     0,     0,     0,     0,   144,     0,
-       0,     0,     0,     0,     0,     0,    39,   179,   147,   134,
-      55,    69,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,     2,     3,     0,     0,     0,
-       0,   193,     0,     0,    68,    86,    72,   194,    87,   170,
-     171,   172,   173,   174,   175,   198,     0,     0,     0,   211,
-     212,   241,   200,   201,     0,     0,     0,     0,   157,   145,
-     139,   137,   129,   130,     0,     0,     0,     0,    88,     0,
-       0,    71,    93,    95,     0,     0,   100,    94,   205,     0,
-     204,     0,     0,    30,    34,    29,    33,    28,    32,    27,
-      31,    35,    36,     0,   240,     0,   223,     0,    56,     6,
+     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,
        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,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    56,   215,     0,   237,   152,
-     149,   148,   150,   151,   153,   156,     0,    64,    64,    64,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,     0,     0,     0,     0,    64,     0,     0,     0,    92,
-     168,    99,    97,     0,   182,   183,   184,   187,   188,   189,
-     185,   186,   180,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   191,   196,   195,   197,     0,   206,
-       0,   227,   222,     0,    59,    59,   246,     0,     0,   235,
+       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,   154,     0,   142,   143,   141,   114,
-     115,     4,     5,   112,   113,   116,   107,   108,   111,     0,
-       0,     0,     0,   110,   109,   140,    70,    70,    96,   167,
-     161,   164,   165,     0,     0,    89,   181,     0,     0,     0,
-       0,     0,     0,     0,   128,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   242,     0,   244,   239,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   155,     0,     0,    66,    64,   102,     0,
-       0,   106,     0,   103,    90,    91,   160,   162,     0,    62,
-      98,     0,   239,     0,     0,     0,     0,     0,     0,   190,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   249,     0,     0,     0,   231,   232,     0,     0,   229,
-       0,     0,     0,   228,     0,   247,     0,    61,    67,    65,
-     101,   104,   105,   166,   163,    63,    57,     0,     0,     0,
-       0,     0,     0,     0,   127,     0,     0,     0,     0,     0,
-       0,   221,    59,    60,    59,   218,   238,     0,     0,     0,
-       0,     0,   224,   225,   226,   221,     0,     0,   169,   192,
-     118,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   220,     0,     0,   243,   245,     0,     0,     0,
-     230,   233,   234,     0,   248,    58,     0,   124,     0,     0,
-     117,   120,   121,   122,   123,     0,   209,     0,     0,     0,
-     219,   216,     0,   236,     0,     0,     0,   207,     0,   208,
-       0,     0,   217,   119,   125,   126,     0,     0,     0,     0,
-       0,     0,   214,     0,     0,   213,     0,   210
+       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
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
 static const short int yydefgoto[] =
 {
-      -1,    81,   283,   240,   241,   242,   243,   211,   212,   143,
-     213,    24,    15,    38,   438,   324,   346,   406,   276,   347,
-      82,    83,   214,    85,    86,   124,   223,   314,   244,   315,
-     114,     1,     2,     3,    59,   192,    48,   109,   196,    87,
-     357,   301,   302,   303,    39,    91,    16,    94,    17,    29,
-      18,   307,   245,    88,   247,   425,    41,    42,    43,   102,
-     478,   103,   259,   452,   453,   185,   186,   381,   187,   188
+      -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
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -442
+#define YYPACT_NINF -462
 static const short int yypact[] =
 {
-    -442,    61,   222,   381,  -442,  -442,   106,  -442,  -442,  -442,
-    -442,  -442,  -442,  -442,   -25,   283,    43,  -442,  -442,  -442,
-    -442,    10,   -14,    40,   197,     4,  -442,  -442,  -442,   283,
-      79,   101,  -442,  -442,  -442,  -442,  -442,  -442,   685,   -10,
-    -442,    -2,  -442,    41,    15,    38,    48,    50,  -442,    53,
-      79,   685,    44,    44,    44,    44,  -442,  -442,  -442,  -442,
-    -442,    57,  -442,  -442,  -442,  -442,  -442,  -442,  -442,  -442,
-    -442,  -442,  -442,  -442,  -442,  -442,  -442,   172,   174,   175,
-     468,  -442,   131,    81,  -442,  -442,   -85,  -442,  -442,  -442,
-    -442,  -442,  -442,  -442,  -442,  -442,   714,    20,   320,  -442,
-    -442,  1031,  -442,  -442,   165,   100,   180,   169,   186,  -442,
-    -442,  -442,  -442,  -442,   743,   743,   743,   773,  -442,    83,
-      92,  -442,  -442,   -85,   -57,   102,    80,  -442,    57,   927,
-    -442,   927,   927,  -442,  -442,  -442,  -442,  -442,  -442,  -442,
-    -442,  -442,  -442,   927,  -442,   743,  -442,   159,   283,  -442,
-    -442,  -442,  -442,  -442,  -442,  -442,  -442,  -442,  -442,  -442,
-    -442,  -442,  -442,  -442,  -442,  -442,  -442,   743,   743,   743,
-     743,   743,   743,  -442,  -442,  -442,   743,   743,   743,   743,
-     743,   743,   743,   743,   743,   283,  -442,    36,  -442,  -442,
-    -442,  -442,  -442,  -442,  -442,  -442,   -81,   107,   107,   107,
-     141,   151,   203,   157,   205,   160,   209,   163,   210,   208,
-     215,   171,   212,   225,   818,   107,   743,   743,   743,  -442,
-     526,  -442,   118,   132,  -442,  -442,  -442,  -442,  -442,  -442,
-    -442,  -442,   187,   134,   137,   139,   140,   142,   143,   773,
-     144,   158,   162,   166,  -442,  -442,  -442,  -442,   170,  -442,
-     173,  -442,  -442,   685,   177,   178,  -442,   927,   161,   185,
-     189,   190,   195,   196,   201,   236,   927,   927,   927,   202,
-     685,   743,   743,   252,  -442,    -3,  -442,  -442,  -442,  -442,
-    -442,  -442,  -442,  -442,  -442,  -442,  -442,  -442,  -442,   564,
-     773,   498,   255,  -442,  -442,  -442,   -22,   -51,   -85,  -442,
-     131,  -442,   204,   183,   594,  -442,  -442,   288,   773,   773,
-     773,   773,   773,   773,  -442,   -80,   773,   773,   773,   773,
-     304,   306,   927,    -5,  -442,    -4,  -442,   223,   927,   206,
-     743,   743,   743,   743,   743,   743,   230,   231,   232,   743,
-     927,   927,   244,  -442,   308,   341,  -442,   107,  -442,   -45,
-     -54,  -442,   -48,  -442,  -442,  -442,  -442,  -442,   647,   323,
-    -442,   249,   223,   253,   254,   257,   261,   326,   773,  -442,
-     263,   265,   266,   267,   927,   927,   272,   927,   370,   927,
-     743,  -442,   276,   927,   277,  -442,  -442,   281,   285,  -442,
-     927,   927,   927,  -442,   284,  -442,   743,  -442,  -442,  -442,
-    -442,  -442,  -442,  -442,  -442,  -442,   344,   372,   289,   773,
-     773,   773,   773,   743,  -442,   773,   773,   773,   773,   291,
-     290,   743,   293,  -442,   293,  -442,   297,   927,   299,   743,
-     743,   743,  -442,  -442,  -442,   743,   927,   395,  -442,  -442,
-    -442,   301,   302,   307,   309,   317,   318,   319,   324,   325,
-     427,     9,   297,   328,   388,  -442,  -442,   743,   327,   927,
-    -442,  -442,  -442,   331,  -442,  -442,   773,  -442,   773,   773,
-    -442,  -442,  -442,  -442,  -442,   927,  -442,   973,    39,   409,
-    -442,  -442,   330,  -442,   334,   335,   336,  -442,   342,  -442,
-     973,   439,  -442,  -442,  -442,  -442,   441,   345,   927,   927,
-     442,   383,  -442,   927,   445,  -442,   927,  -442
+    -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
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -442,  -442,  -442,   360,   361,   362,   364,   -97,   -96,  -441,
-    -442,   423,   443,  -125,  -442,  -251,   109,  -442,  -190,  -442,
-     -44,  -442,   -38,  -442,   -69,   359,  -442,  -105,   256,  -185,
-      69,  -442,  -442,  -442,   436,  -442,  -442,  -442,  -442,     0,
-    -442,   133,  -442,  -442,   460,  -442,  -442,  -442,  -442,  -442,
-     487,  -442,  -435,  -103,    -6,     7,  -442,   453,  -442,  -442,
-    -442,  -442,  -442,   115,    64,  -442,  -442,   153,  -442,  -442
+    -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
 };
 
 /* 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 -132
+#define YYTABLE_NINF -133
 static const short int yytable[] =
 {
-      84,   141,   142,    25,   326,   377,   379,   111,   277,   278,
-     477,   123,   215,    84,   133,   134,   135,   136,   137,   138,
-     139,   140,    89,   253,   131,   295,   246,    40,   246,   246,
-     -70,    92,   273,   368,   344,   132,    30,   490,   274,   127,
-     246,   369,   488,    25,   133,   134,   135,   136,   137,   138,
-     139,   140,   378,   378,   345,   497,   218,   123,   129,   368,
-     270,     4,    44,    45,    46,   368,   219,   401,   368,    19,
-     355,    20,    40,   127,   400,   402,   197,   198,   199,   112,
-     113,    47,   125,   121,    62,    63,    64,    65,    66,    67,
-      68,    69,    70,    71,    72,    73,    74,   354,    49,    75,
-      76,    50,   127,   130,   349,   350,   352,   129,    19,    58,
-      20,   294,    90,    96,    97,    98,    56,    99,   100,    60,
-     221,    93,   115,   116,   117,   248,   249,   104,   476,   254,
-     255,   129,   257,   258,   129,   271,   272,   250,   129,   129,
-     129,   129,   129,   266,   267,   268,   129,   296,   297,   298,
-     105,    27,   251,    28,   246,   190,   191,   399,   489,    19,
-     106,    20,   107,   246,   246,   246,   279,   280,   -30,   -30,
-     108,   455,   -71,   456,   -29,   -29,   256,   -28,   -28,   260,
-     -27,   -27,   300,   261,   262,   263,   264,   265,   281,   282,
-     118,   269,   119,   120,    77,   189,   126,    78,   193,   194,
-      79,   216,    80,   362,   363,   364,   365,   366,   367,   322,
-     217,   370,   371,   372,   373,    84,   195,   220,   252,   246,
-     275,   -34,  -131,   -33,    51,   246,   340,   -32,   -31,   -37,
-     284,   304,    84,   341,   129,   298,   -38,   246,   246,     7,
-       8,     9,    52,    11,    53,    13,   285,    54,   305,   308,
-     306,   327,   309,     5,   310,   311,     6,   312,   313,   316,
-     336,   337,   338,   414,     7,     8,     9,    10,    11,    12,
-      13,   246,   246,   317,   246,   335,   246,   318,   328,   342,
-     246,   319,   343,   320,    14,   353,   321,   246,   246,   246,
-     323,   325,   129,   385,   129,   129,   129,   389,   329,   359,
-     356,   129,   330,   331,   441,   442,   443,   444,   332,   333,
-     446,   447,   448,   449,   334,   339,   376,   358,   361,   374,
-     300,   375,   382,   383,   246,   133,   134,   135,   136,   137,
-     138,   139,   140,   246,   394,   395,   380,   384,   397,   386,
-     387,   388,   129,   390,   391,   392,   393,    31,    32,    33,
-      34,    35,    36,    37,   141,   142,   246,   396,   436,   398,
-     344,   484,   407,   485,   486,   413,   409,   410,   419,   420,
-     411,   422,   246,   424,   412,   445,   415,   428,   416,   417,
-     418,   141,   142,   129,   432,   433,   434,   421,   423,   427,
-     429,   129,   129,   129,   430,   246,   246,   129,   431,   435,
-     246,   437,   439,   246,   450,   440,   454,   451,   -40,    19,
-     457,    20,   459,   465,   466,     6,   -40,   -40,   467,   129,
-     468,   458,   469,   -40,   -40,   -40,   -40,   -40,   -40,   -40,
-     464,   -40,    21,   470,   471,   472,   460,   461,   462,    22,
-     473,   474,   475,    23,   479,   378,   481,   483,   491,   492,
-     493,   494,   495,   482,   498,   496,   499,   503,   500,   504,
-     506,   181,   182,   183,   480,   184,   101,    55,   405,   487,
-     293,   121,    62,    63,    64,    65,    66,    67,    68,    69,
-      70,    71,    72,    73,    74,   222,   110,    75,    76,    57,
-      26,   404,   501,   502,    95,   426,    19,   505,    20,   463,
-     507,   121,   200,   201,   202,   203,   204,   205,   206,   207,
-     208,   209,   210,    73,    74,   408,     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,   299,   121,   200,   201,
-     202,   203,   204,   205,   206,   207,   208,   209,   210,    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,   351,    19,     0,    20,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   360,     0,     0,     0,     0,     0,
-      77,     0,     0,    78,     0,     0,    79,     0,    80,     0,
+      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,    77,     0,
-       0,    78,     0,   348,    79,     0,    80,   403,    61,    62,
+       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,
+      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,     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,
+      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,     0,    20,     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,
-       0,    19,     0,    20,     0,     0,   121,   200,   201,   202,
-     203,   204,   205,   206,   207,   208,   209,   210,    73,    74,
-       0,     0,    75,    76,     0,     0,     0,     0,     0,    77,
-       0,    19,    78,    20,     0,    79,     0,    80,     0,     0,
+       0,     0,    19,    77,    20,     0,    78,     0,     0,    79,
+       0,    80,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    77,     0,
-       0,    78,     0,     0,    79,     0,    80,    75,    76,     0,
-     286,   287,   288,     0,     0,     0,    19,     0,    20,     0,
-       0,     0,     0,     0,     0,     0,     0,    77,     0,     0,
-      78,     0,     0,    79,     0,    80,     0,     0,     0,     0,
+       0,     0,    77,     0,     0,    78,     0,     0,    79,     0,
+      80,    75,    76,     0,   287,   288,   289,     0,     0,     0,
+      19,     0,    20,     0,     0,     0,     0,     0,     0,     0,
+      77,     0,     0,    78,     0,     0,    79,     0,    80,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    77,     0,     0,
-      78,     0,     0,    79,     0,    80,   149,   150,   151,   152,
+       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,
+     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,     0,     0,     0,     0,     0,   233,
-       0,   234,   173,   174,   175,     0,   235,   236,   237,   238,
-       0,     0,     0,     0,     0,   289,     0,     0,   290,     0,
-     291,     0,     0,   292,   224,   225,    75,    76,   226,   227,
-     228,   229,   230,   231,     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,   232,     0,
-     224,   225,     0,     0,   226,   227,   228,   229,   230,   231,
-       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,   233,     0,
-     234,   173,   174,   175,   232,   235,   236,   237,   238,     0,
-       0,     0,     0,     0,     0,     0,     0,   239,     0,     0,
-       0,   149,   150,   151,   152,   153,   154,   155,   156,   157,
-     158,   159,   160,   161,   162,   163,   164,   165,   166,   144,
-       0,     0,     0,     0,   233,     0,   234,   173,   174,   175,
-     145,   235,   236,   237,   238,     0,     0,     0,     0,     0,
-     146,   147,     0,   239,     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
+     163,   164,   165,   166,   167,   168,   169,     0,     0,   170,
+     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
+     181
 };
 
 static const short int yycheck[] =
 {
-      38,    98,    98,     3,   255,    10,    10,    51,   198,   199,
-     451,    80,   117,    51,     5,     6,     7,     8,     9,    10,
-      11,    12,    32,   148,     4,   215,   129,    29,   131,   132,
-     115,    33,   113,   113,    37,    15,    61,   478,   119,   124,
-     143,   121,   477,    43,     5,     6,     7,     8,     9,    10,
-      11,    12,    57,    57,    57,   490,   113,   126,    96,   113,
-     185,     0,    52,    53,    54,   113,   123,   121,   113,    28,
-     121,    30,    29,   124,   119,   123,   114,   115,   116,    35,
-      36,    71,    82,     3,     4,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,   119,   112,    19,
-      20,    61,   124,    96,   289,   290,   291,   145,    28,    30,
-      30,   214,   122,    72,    73,    74,   112,    76,    77,    18,
-      40,   123,    53,    54,    55,   131,   132,   112,   119,   167,
-     168,   169,   170,   171,   172,    99,   100,   143,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,   216,   217,   218,
-     112,    45,   145,    47,   257,    55,    56,   347,   119,    28,
-     112,    30,   112,   266,   267,   268,    25,    26,    17,    18,
-     117,   422,   115,   424,    17,    18,   169,    17,    18,   172,
-      17,    18,   220,   176,   177,   178,   179,   180,    17,    18,
-      18,   184,    18,    18,   114,    30,   115,   117,    18,    30,
-     120,   118,   122,   308,   309,   310,   311,   312,   313,   253,
-     118,   316,   317,   318,   319,   253,    30,   115,    59,   322,
-     113,    18,     0,    18,    27,   328,   270,    18,    18,    21,
-      18,   113,   270,   271,   272,   304,    21,   340,   341,    42,
-      43,    44,    45,    46,    47,    48,    21,    50,   116,   115,
-      63,   257,   115,    31,   115,   115,    34,   115,   115,   115,
-     266,   267,   268,   368,    42,    43,    44,    45,    46,    47,
-      48,   374,   375,   115,   377,    39,   379,   115,   117,   272,
-     383,   115,    30,   113,    62,    30,   113,   390,   391,   392,
-     113,   113,   330,   331,   332,   333,   334,   335,   113,   116,
-     300,   339,   113,   113,   409,   410,   411,   412,   113,   113,
-     415,   416,   417,   418,   113,   113,   322,   113,    30,    15,
-     358,    15,   328,   117,   427,     5,     6,     7,     8,     9,
-      10,    11,    12,   436,   340,   341,   113,   330,    30,   332,
-     333,   334,   380,   113,   113,   113,   339,    64,    65,    66,
-      67,    68,    69,    70,   451,   451,   459,   113,   396,    18,
-      37,   466,   113,   468,   469,    39,   113,   113,   374,   375,
-     113,   377,   475,   379,   113,   413,   113,   383,   113,   113,
-     113,   478,   478,   421,   390,   391,   392,   115,    18,   113,
-     113,   429,   430,   431,   113,   498,   499,   435,   113,   115,
-     503,    57,    30,   506,   113,   116,   113,   117,    27,    28,
-     113,    30,   113,    18,   113,    34,    35,    36,   116,   457,
-     113,   427,   113,    42,    43,    44,    45,    46,    47,    48,
-     436,    50,    51,   116,   116,   116,   429,   430,   431,    58,
-     116,   116,    15,    62,   116,    57,   119,   116,    39,   119,
-     116,   116,   116,   459,    15,   113,    15,    15,   113,    76,
-      15,   101,   101,   101,   457,   101,    43,    24,   359,   475,
-     214,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,   126,    50,    19,    20,    29,
-       3,   358,   498,   499,    41,   380,    28,   503,    30,   435,
-     506,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,   362,    -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,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    -1,   114,    19,    20,   117,    -1,    -1,   120,    -1,
-     122,   123,    28,    -1,    30,    -1,    -1,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    -1,   114,    19,    20,   117,    -1,    -1,   120,    -1,
-     122,   123,    28,    -1,    30,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
-     114,    -1,    -1,   117,    -1,    -1,   120,    -1,   122,    -1,
+      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,   114,    -1,
-      -1,   117,    -1,   119,   120,    -1,   122,    40,     3,     4,
+      -1,    -1,    -1,    -1,    -1,    28,    -1,    30,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,    -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,     3,
+       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    -1,   115,    19,    20,   118,    -1,    -1,
+     121,    -1,   123,   124,    28,    -1,    30,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,
+      -1,    -1,   115,    -1,    -1,   118,    -1,    -1,   121,    -1,
+     123,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    -1,    -1,    19,    20,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    28,    -1,    30,    -1,
+      -1,   115,    -1,    -1,   118,    -1,   120,   121,    40,   123,
+      -1,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    -1,    -1,    19,    20,    -1,
+      -1,   115,    -1,    -1,   118,    -1,    28,   121,    30,   123,
+       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    -1,    -1,    19,    20,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    28,    -1,    30,     3,     4,
        5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    -1,    -1,    19,    20,    -1,    -1,   114,    -1,
-      -1,   117,    -1,    28,   120,    30,   122,     3,     4,     5,
+      15,    16,    -1,   115,    19,    20,   118,    -1,    -1,   121,
+      -1,   123,    -1,    28,    -1,    30,    -1,     3,     4,     5,
        6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
       16,    -1,    -1,    19,    20,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    28,    -1,    30,    -1,     3,     4,     5,     6,
-       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      -1,   114,    19,    20,   117,    -1,    -1,   120,    -1,   122,
-      -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,    -1,    -1,    -1,   114,
-      -1,    28,   117,    30,    -1,   120,    -1,   122,    -1,    -1,
+      -1,    -1,    28,   115,    30,    -1,   118,    -1,    -1,   121,
+      -1,   123,    -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,   114,    -1,
-      -1,   117,    -1,    -1,   120,    -1,   122,    19,    20,    -1,
-      22,    23,    24,    -1,    -1,    -1,    28,    -1,    30,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   114,    -1,    -1,
-     117,    -1,    -1,   120,    -1,   122,    -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,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   114,    -1,    -1,
-     117,    -1,    -1,   120,    -1,   122,    78,    79,    80,    81,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   115,
+      -1,    -1,   118,    -1,    -1,   121,    -1,   123,    -1,    -1,
+      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    95,    -1,    -1,
+      -1,    -1,    -1,   101,    -1,   103,   104,   105,   106,   107,
+      -1,   109,   110,   111,   112,    -1,    -1,    -1,    -1,    -1,
+     118,    -1,    -1,   121,    -1,   123,    -1,    -1,   126,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    -1,
+      28,    -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -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,    -1,    -1,    -1,    -1,    -1,   101,
-      -1,   103,   104,   105,   106,    -1,   108,   109,   110,   111,
-      -1,    -1,    -1,    -1,    -1,   117,    -1,    -1,   120,    -1,
-     122,    -1,    -1,   125,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    -1,    28,    -1,    30,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    61,    -1,
-      17,    18,    -1,    -1,    21,    22,    23,    24,    25,    26,
-      -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,    61,   108,   109,   110,   111,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   120,    -1,    -1,
-      -1,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    38,
-      -1,    -1,    -1,    -1,   101,    -1,   103,   104,   105,   106,
-      49,   108,   109,   110,   111,    -1,    -1,    -1,    -1,    -1,
-      59,    60,    -1,   120,    -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
+      92,    93,    94,    95,    96,    97,    98,    -1,    -1,   101,
+     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
+     112
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const unsigned char yystos[] =
 {
-       0,   157,   158,   159,     0,    31,    34,    42,    43,    44,
-      45,    46,    47,    48,    62,   138,   172,   174,   176,    28,
-      30,    51,    58,    62,   137,   165,   176,    45,    47,   175,
-      61,    64,    65,    66,    67,    68,    69,    70,   139,   170,
-      29,   182,   183,   184,    52,    53,    54,    71,   162,   112,
-      61,    27,    45,    47,    50,   138,   112,   170,    30,   160,
+       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,
       18,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    19,    20,   114,   117,   120,
-     122,   127,   146,   147,   148,   149,   150,   165,   179,    32,
-     122,   171,    33,   123,   173,   183,    72,    73,    74,    76,
-      77,   137,   185,   187,   112,   112,   112,   112,   117,   163,
-     160,   146,    35,    36,   156,   156,   156,   156,    18,    18,
-      18,     3,   123,   150,   151,   165,   115,   124,     3,   148,
-     181,     4,    15,     5,     6,     7,     8,     9,    10,    11,
-      12,   133,   134,   135,    38,    49,    59,    60,    75,    78,
+      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,
       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,   129,   130,   131,   132,   191,   192,   194,   195,    30,
-      55,    56,   161,    18,    30,    30,   164,   148,   148,   148,
-       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      14,   133,   134,   136,   148,   153,   118,   118,   113,   123,
-     115,    40,   151,   152,    17,    18,    21,    22,    23,    24,
-      25,    26,    61,   101,   103,   108,   109,   110,   111,   120,
-     129,   130,   131,   132,   154,   178,   179,   180,   180,   180,
-     180,   181,    59,   139,   148,   148,   181,   148,   148,   188,
-     181,   181,   181,   181,   181,   181,   148,   148,   148,   181,
-     139,    99,   100,   113,   119,   113,   144,   144,   144,    25,
-      26,    17,    18,   128,    18,    21,    22,    23,    24,   117,
-     120,   122,   125,   154,   179,   144,   150,   150,   150,    40,
-     148,   167,   168,   169,   113,   116,    63,   177,   115,   115,
-     115,   115,   115,   115,   153,   155,   115,   115,   115,   115,
-     113,   113,   146,   113,   141,   113,   141,   180,   117,   113,
-     113,   113,   113,   113,   113,    39,   180,   180,   180,   113,
-     146,   148,   181,    30,    37,    57,   142,   145,   119,   155,
-     155,   123,   155,    30,   119,   121,   165,   166,   113,   116,
-      40,    30,   153,   153,   153,   153,   153,   153,   113,   121,
-     153,   153,   153,   153,    15,    15,   180,    10,    57,    10,
-     113,   193,   180,   117,   181,   148,   181,   181,   181,   148,
-     113,   113,   113,   181,   180,   180,   113,    30,    18,   144,
-     119,   121,   123,    40,   167,   142,   143,   113,   193,   113,
-     113,   113,   113,    39,   153,   113,   113,   113,   113,   180,
-     180,   115,   180,    18,   180,   181,   189,   113,   180,   113,
-     113,   113,   180,   180,   180,   115,   148,    57,   140,    30,
-     116,   153,   153,   153,   153,   148,   153,   153,   153,   153,
-     113,   117,   189,   190,   113,   141,   141,   113,   180,   113,
-     181,   181,   181,   190,   180,    18,   113,   116,   113,   113,
-     116,   116,   116,   116,   116,    15,   119,   135,   186,   116,
-     181,   119,   180,   116,   153,   153,   153,   180,   178,   119,
-     135,    39,   119,   116,   116,   116,   113,   178,    15,    15,
-     113,   180,   180,    15,    76,   180,    15,   180
+     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
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -2032,7 +2041,7 @@ yyreduce:
   YY_REDUCE_PRINT (yyn);
   switch (yyn)
     {
-        case 39:
+        case 40:
 #line 206 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " = ";
@@ -2040,19 +2049,19 @@ yyreduce:
   ;}
     break;
 
-  case 40:
+  case 41:
 #line 210 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = new std::string(""); 
   ;}
     break;
 
-  case 48:
+  case 49:
 #line 217 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(""); ;}
     break;
 
-  case 55:
+  case 56:
 #line 222 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     *(yyvsp[-1].String) += *(yyvsp[0].String); 
@@ -2061,27 +2070,27 @@ yyreduce:
     ;}
     break;
 
-  case 56:
+  case 57:
 #line 227 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(""); ;}
     break;
 
-  case 57:
+  case 58:
 #line 232 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 58:
+  case 59:
 #line 233 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); (yyval.String) = (yyvsp[-1].String); ;}
     break;
 
-  case 59:
+  case 60:
 #line 236 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 60:
+  case 61:
 #line 237 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyvsp[-1].String)->insert(0, ", "); 
@@ -2091,7 +2100,7 @@ yyreduce:
   ;}
     break;
 
-  case 61:
+  case 62:
 #line 245 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
@@ -2100,17 +2109,17 @@ yyreduce:
   ;}
     break;
 
-  case 62:
+  case 63:
 #line 251 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 64:
+  case 65:
 #line 255 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 65:
+  case 66:
 #line 256 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
       (yyvsp[-1].String)->insert(0, ", ");
@@ -2121,7 +2130,7 @@ yyreduce:
     ;}
     break;
 
-  case 67:
+  case 68:
 #line 266 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
       *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
@@ -2130,14 +2139,14 @@ yyreduce:
     ;}
     break;
 
-  case 87:
+  case 88:
 #line 288 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
            (yyval.Type).newTy = (yyvsp[0].String); (yyval.Type).oldTy = OpaqueTy;
          ;}
     break;
 
-  case 88:
+  case 89:
 #line 294 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                   // Type UpReference
     (yyvsp[0].String)->insert(0, "\\");
@@ -2146,7 +2155,7 @@ yyreduce:
   ;}
     break;
 
-  case 89:
+  case 90:
 #line 299 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {           // Function derived type?
     *(yyvsp[-3].Type).newTy += "( " + *(yyvsp[-1].String) + " )";
@@ -2156,7 +2165,7 @@ yyreduce:
   ;}
     break;
 
-  case 90:
+  case 91:
 #line 305 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {          // Sized array type?
     (yyvsp[-3].String)->insert(0,"[ ");
@@ -2167,7 +2176,7 @@ yyreduce:
   ;}
     break;
 
-  case 91:
+  case 92:
 #line 312 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {          // Packed array type?
     (yyvsp[-3].String)->insert(0,"< ");
@@ -2178,7 +2187,7 @@ yyreduce:
   ;}
     break;
 
-  case 92:
+  case 93:
 #line 319 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                        // Structure type?
     (yyvsp[-1].String)->insert(0, "{ ");
@@ -2188,7 +2197,7 @@ yyreduce:
   ;}
     break;
 
-  case 93:
+  case 94:
 #line 325 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                                  // Empty structure type?
     (yyval.Type).newTy = new std::string("{ }");
@@ -2196,7 +2205,7 @@ yyreduce:
   ;}
     break;
 
-  case 94:
+  case 95:
 #line 329 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                             // Pointer type?
     *(yyvsp[-1].Type).newTy += '*';
@@ -2205,14 +2214,14 @@ yyreduce:
   ;}
     break;
 
-  case 95:
+  case 96:
 #line 339 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].Type).newTy;
   ;}
     break;
 
-  case 96:
+  case 97:
 #line 342 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].Type).newTy;
@@ -2221,7 +2230,7 @@ yyreduce:
   ;}
     break;
 
-  case 98:
+  case 99:
 #line 351 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", ...";
@@ -2230,21 +2239,21 @@ yyreduce:
   ;}
     break;
 
-  case 99:
+  case 100:
 #line 356 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].String);
   ;}
     break;
 
-  case 100:
+  case 101:
 #line 359 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = new std::string();
   ;}
     break;
 
-  case 101:
+  case 102:
 #line 369 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { // Nonempty unsized arr
     (yyval.Const).type = (yyvsp[-3].Type);
@@ -2254,7 +2263,7 @@ yyreduce:
   ;}
     break;
 
-  case 102:
+  case 103:
 #line 375 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-2].Type);
@@ -2263,7 +2272,7 @@ yyreduce:
   ;}
     break;
 
-  case 103:
+  case 104:
 #line 380 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-2].Type);
@@ -2273,7 +2282,7 @@ yyreduce:
   ;}
     break;
 
-  case 104:
+  case 105:
 #line 386 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { // Nonempty unsized arr
     (yyval.Const).type = (yyvsp[-3].Type);
@@ -2283,7 +2292,7 @@ yyreduce:
   ;}
     break;
 
-  case 105:
+  case 106:
 #line 392 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-3].Type);
@@ -2293,7 +2302,7 @@ yyreduce:
   ;}
     break;
 
-  case 106:
+  case 107:
 #line 398 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-2].Type);
@@ -2302,7 +2311,7 @@ yyreduce:
   ;}
     break;
 
-  case 107:
+  case 108:
 #line 403 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
@@ -2312,7 +2321,7 @@ yyreduce:
   ;}
     break;
 
-  case 108:
+  case 109:
 #line 409 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
@@ -2322,7 +2331,7 @@ yyreduce:
   ;}
     break;
 
-  case 109:
+  case 110:
 #line 415 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
@@ -2332,7 +2341,7 @@ yyreduce:
   ;}
     break;
 
-  case 110:
+  case 111:
 #line 421 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
@@ -2342,7 +2351,7 @@ yyreduce:
   ;}
     break;
 
-  case 111:
+  case 112:
 #line 427 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
@@ -2352,7 +2361,7 @@ yyreduce:
   ;}
     break;
 
-  case 112:
+  case 113:
 #line 433 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {      // integral constants
     (yyval.Const).type = (yyvsp[-1].Type);
@@ -2362,7 +2371,7 @@ yyreduce:
   ;}
     break;
 
-  case 113:
+  case 114:
 #line 439 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {            // integral constants
     (yyval.Const).type = (yyvsp[-1].Type);
@@ -2372,7 +2381,7 @@ yyreduce:
   ;}
     break;
 
-  case 114:
+  case 115:
 #line 445 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                      // Boolean constants
     (yyval.Const).type = (yyvsp[-1].Type);
@@ -2382,7 +2391,7 @@ yyreduce:
   ;}
     break;
 
-  case 115:
+  case 116:
 #line 451 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                     // Boolean constants
     (yyval.Const).type = (yyvsp[-1].Type);
@@ -2392,7 +2401,7 @@ yyreduce:
   ;}
     break;
 
-  case 116:
+  case 117:
 #line 457 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                   // Float & Double constants
     (yyval.Const).type = (yyvsp[-1].Type);
@@ -2402,7 +2411,7 @@ yyreduce:
   ;}
     break;
 
-  case 117:
+  case 118:
 #line 465 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     // We must infer the cast opcode from the types of the operands. 
@@ -2413,7 +2422,7 @@ yyreduce:
   ;}
     break;
 
-  case 118:
+  case 119:
 #line 472 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-4].String) += "(" + *(yyvsp[-2].Const).cnst + " " + *(yyvsp[-1].String) + ")";
@@ -2423,7 +2432,7 @@ yyreduce:
   ;}
     break;
 
-  case 119:
+  case 120:
 #line 478 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
@@ -2432,7 +2441,7 @@ yyreduce:
   ;}
     break;
 
-  case 120:
+  case 121:
 #line 483 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
@@ -2441,7 +2450,7 @@ yyreduce:
   ;}
     break;
 
-  case 121:
+  case 122:
 #line 488 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
@@ -2450,7 +2459,7 @@ yyreduce:
   ;}
     break;
 
-  case 122:
+  case 123:
 #line 493 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
@@ -2459,35 +2468,29 @@ yyreduce:
   ;}
     break;
 
-  case 123:
+  case 124:
 #line 498 "/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();
-    (yyval.String) = (yyvsp[-5].String);
-  ;}
-    break;
-
-  case 124:
-#line 503 "/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();
-    (yyval.String) = (yyvsp[-5].String);
+    const char* shiftop = (yyvsp[-5].String)->c_str();
+    if (*(yyvsp[-5].String) == "shr")
+      shiftop = ((yyvsp[-3].Const).type.isUnsigned()) ? "lshr" : "ashr";
+    (yyval.String) = new std::string(shiftop);
+    *(yyval.String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
+    delete (yyvsp[-5].String); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
   ;}
     break;
 
   case 125:
-#line 508 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 506 "/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();
-    (yyval.String) = (yyvsp[-7].String);
+    *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
+    (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
+    (yyval.String) = (yyvsp[-5].String);
   ;}
     break;
 
   case 126:
-#line 513 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 511 "/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();
@@ -2496,7 +2499,16 @@ yyreduce:
     break;
 
   case 127:
-#line 523 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 516 "/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();
+    (yyval.String) = (yyvsp[-7].String);
+  ;}
+    break;
+
+  case 128:
+#line 526 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].Const).cnst;
     (yyvsp[0].Const).destroy();
@@ -2504,26 +2516,26 @@ yyreduce:
   ;}
     break;
 
-  case 128:
-#line 528 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 129:
+#line 531 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(*(yyvsp[0].Const).cnst); (yyvsp[0].Const).destroy(); ;}
     break;
 
-  case 131:
-#line 543 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 132:
+#line 546 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
 ;}
     break;
 
-  case 132:
-#line 548 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 133:
+#line 551 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = 0;
   ;}
     break;
 
-  case 133:
-#line 551 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 134:
+#line 554 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -2531,24 +2543,24 @@ yyreduce:
   ;}
     break;
 
-  case 134:
-#line 556 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 135:
+#line 559 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "module asm " << " " << *(yyvsp[0].String) << "\n";
     (yyval.String) = 0;
   ;}
     break;
 
-  case 135:
-#line 560 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 136:
+#line 563 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "implementation\n";
     (yyval.String) = 0;
   ;}
     break;
 
-  case 137:
-#line 567 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 138:
+#line 570 "/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();
@@ -2556,8 +2568,8 @@ yyreduce:
   ;}
     break;
 
-  case 138:
-#line 572 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 139:
+#line 575 "/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);
@@ -2565,8 +2577,8 @@ yyreduce:
   ;}
     break;
 
-  case 139:
-#line 577 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 140:
+#line 580 "/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); 
@@ -2574,8 +2586,8 @@ yyreduce:
   ;}
     break;
 
-  case 140:
-#line 582 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 141:
+#line 585 "/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";
@@ -2584,18 +2596,8 @@ yyreduce:
   ;}
     break;
 
-  case 141:
-#line 588 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *O << *(yyvsp[-4].String) << " " << *(yyvsp[-3].String) << " " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy 
-       << " " << *(yyvsp[0].String) << "\n";
-    delete (yyvsp[-4].String); delete (yyvsp[-3].String); delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
-    (yyval.String) = 0;
-  ;}
-    break;
-
   case 142:
-#line 594 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 591 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[-4].String) << " " << *(yyvsp[-3].String) << " " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy 
        << " " << *(yyvsp[0].String) << "\n";
@@ -2605,7 +2607,7 @@ yyreduce:
     break;
 
   case 143:
-#line 600 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#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";
@@ -2615,7 +2617,17 @@ yyreduce:
     break;
 
   case 144:
-#line 606 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#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";
+    delete (yyvsp[-4].String); delete (yyvsp[-3].String); delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
+    (yyval.String) = 0;
+  ;}
+    break;
+
+  case 145:
+#line 609 "/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);
@@ -2623,8 +2635,8 @@ yyreduce:
   ;}
     break;
 
-  case 145:
-#line 611 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 146:
+#line 614 "/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);
@@ -2632,15 +2644,15 @@ yyreduce:
   ;}
     break;
 
-  case 146:
-#line 616 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 147:
+#line 619 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyval.String) = 0;
   ;}
     break;
 
-  case 150:
-#line 626 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 151:
+#line 629 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -2648,8 +2660,8 @@ yyreduce:
   ;}
     break;
 
-  case 151:
-#line 631 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 152:
+#line 634 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
     if (*(yyvsp[0].String) == "64")
@@ -2659,17 +2671,8 @@ yyreduce:
   ;}
     break;
 
-  case 152:
-#line 638 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
-    delete (yyvsp[0].String);
-    (yyval.String) = (yyvsp[-2].String);
-  ;}
-    break;
-
   case 153:
-#line 643 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 641 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -2678,7 +2681,16 @@ yyreduce:
     break;
 
   case 154:
-#line 650 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 646 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
+    delete (yyvsp[0].String);
+    (yyval.String) = (yyvsp[-2].String);
+  ;}
+    break;
+
+  case 155:
+#line 653 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-1].String)->insert(0, "[ ");
     *(yyvsp[-1].String) += " ]";
@@ -2686,8 +2698,8 @@ yyreduce:
   ;}
     break;
 
-  case 155:
-#line 657 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 156:
+#line 660 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -2695,20 +2707,20 @@ yyreduce:
   ;}
     break;
 
-  case 157:
-#line 663 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 158:
+#line 666 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = new std::string();
   ;}
     break;
 
-  case 161:
-#line 672 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 162:
+#line 675 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 162:
-#line 674 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 163:
+#line 677 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
   (yyval.String) = (yyvsp[-1].Type).newTy;
   if (!(yyvsp[0].String)->empty())
@@ -2717,23 +2729,16 @@ yyreduce:
 ;}
     break;
 
-  case 163:
-#line 681 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 164:
+#line 684 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
   ;}
     break;
 
-  case 164:
-#line 685 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    (yyval.String) = (yyvsp[0].String);
-  ;}
-    break;
-
   case 165:
-#line 689 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 688 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].String);
   ;}
@@ -2741,6 +2746,13 @@ yyreduce:
 
   case 166:
 #line 692 "/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"
     {
     *(yyvsp[-2].String) += ", ...";
     (yyval.String) = (yyvsp[-2].String);
@@ -2748,20 +2760,20 @@ yyreduce:
   ;}
     break;
 
-  case 167:
-#line 697 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 168:
+#line 700 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].String);
   ;}
     break;
 
-  case 168:
-#line 700 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 169:
+#line 703 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 169:
-#line 703 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 170:
+#line 706 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-7].String)->empty()) {
       *(yyvsp[-7].String) += " ";
@@ -2782,22 +2794,22 @@ yyreduce:
   ;}
     break;
 
-  case 170:
-#line 722 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 171:
+#line 725 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = new std::string("begin");
   ;}
     break;
 
-  case 171:
-#line 725 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 172:
+#line 728 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyval.String) = new std::string ("{");
   ;}
     break;
 
-  case 172:
-#line 729 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 173:
+#line 732 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
   if (!(yyvsp[-2].String)->empty()) {
     *O << *(yyvsp[-2].String) << " ";
@@ -2808,18 +2820,18 @@ yyreduce:
 ;}
     break;
 
-  case 173:
-#line 738 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 174:
+#line 741 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string("end"); ;}
     break;
 
-  case 174:
-#line 739 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 175:
+#line 742 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string("}"); ;}
     break;
 
-  case 175:
-#line 741 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 176:
+#line 744 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
   if ((yyvsp[-1].String))
     *O << *(yyvsp[-1].String);
@@ -2828,13 +2840,13 @@ yyreduce:
 ;}
     break;
 
-  case 176:
-#line 749 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 177:
+#line 752 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 179:
-#line 755 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 180:
+#line 758 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     if (!(yyvsp[-1].String)->empty())
       *(yyvsp[-2].String) += " " + *(yyvsp[-1].String);
@@ -2845,13 +2857,13 @@ yyreduce:
   ;}
     break;
 
-  case 180:
-#line 768 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 181:
+#line 771 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 190:
-#line 774 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 191:
+#line 777 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyvsp[-1].String)->insert(0, "<");
     *(yyvsp[-1].String) += ">";
@@ -2859,8 +2871,8 @@ yyreduce:
   ;}
     break;
 
-  case 192:
-#line 780 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 193:
+#line 783 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-3].String)->empty()) {
       *(yyvsp[-4].String) += " " + *(yyvsp[-3].String);
@@ -2871,8 +2883,8 @@ yyreduce:
   ;}
     break;
 
-  case 197:
-#line 798 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 198:
+#line 801 "/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 + " ");
@@ -2881,29 +2893,29 @@ yyreduce:
   ;}
     break;
 
-  case 198:
-#line 805 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    (yyval.String) = 0;
-  ;}
-    break;
-
   case 199:
 #line 808 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    { // Do not allow functions with 0 basic blocks   
+    {
     (yyval.String) = 0;
   ;}
     break;
 
   case 200:
-#line 816 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    {
+#line 811 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+    { // Do not allow functions with 0 basic blocks   
     (yyval.String) = 0;
   ;}
     break;
 
   case 201:
-#line 820 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 819 "/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"
     {
     *O << "    " << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -2911,15 +2923,15 @@ yyreduce:
   ;}
     break;
 
-  case 202:
-#line 825 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 203:
+#line 828 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = 0;
   ;}
     break;
 
-  case 203:
-#line 828 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 204:
+#line 831 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -2927,8 +2939,8 @@ yyreduce:
   ;}
     break;
 
-  case 204:
-#line 834 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 205:
+#line 837 "/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();
@@ -2936,8 +2948,8 @@ yyreduce:
   ;}
     break;
 
-  case 205:
-#line 839 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 206:
+#line 842 "/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();
@@ -2945,8 +2957,8 @@ yyreduce:
   ;}
     break;
 
-  case 206:
-#line 844 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 207:
+#line 847 "/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);
@@ -2954,8 +2966,8 @@ yyreduce:
   ;}
     break;
 
-  case 207:
-#line 849 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 208:
+#line 852 "/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";
@@ -2965,8 +2977,8 @@ yyreduce:
   ;}
     break;
 
-  case 208:
-#line 856 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 209:
+#line 859 "/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";
@@ -2975,8 +2987,8 @@ yyreduce:
   ;}
     break;
 
-  case 209:
-#line 862 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 210:
+#line 865 "/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";
@@ -2985,8 +2997,8 @@ yyreduce:
   ;}
     break;
 
-  case 210:
-#line 869 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 211:
+#line 872 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "    ";
     if (!(yyvsp[-13].String)->empty())
@@ -3001,17 +3013,8 @@ yyreduce:
   ;}
     break;
 
-  case 211:
-#line 881 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *O << "    " << *(yyvsp[0].String) << "\n";
-    delete (yyvsp[0].String);
-    (yyval.String) = 0;
-  ;}
-    break;
-
   case 212:
-#line 886 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 884 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "    " << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -3020,7 +3023,16 @@ yyreduce:
     break;
 
   case 213:
-#line 892 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 889 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *O << "    " << *(yyvsp[0].String) << "\n";
+    delete (yyvsp[0].String);
+    (yyval.String) = 0;
+  ;}
+    break;
+
+  case 214:
+#line 895 "/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);
@@ -3028,8 +3040,8 @@ yyreduce:
   ;}
     break;
 
-  case 214:
-#line 897 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 215:
+#line 900 "/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);
@@ -3038,8 +3050,8 @@ yyreduce:
   ;}
     break;
 
-  case 215:
-#line 905 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 216:
+#line 908 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -3047,8 +3059,8 @@ yyreduce:
   ;}
     break;
 
-  case 216:
-#line 912 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 217:
+#line 915 "/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) + "]";
@@ -3057,8 +3069,8 @@ yyreduce:
   ;}
     break;
 
-  case 217:
-#line 918 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 218:
+#line 921 "/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);
@@ -3066,13 +3078,13 @@ yyreduce:
   ;}
     break;
 
-  case 218:
-#line 926 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 219:
+#line 929 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(*(yyvsp[0].Value).val); (yyvsp[0].Value).destroy(); ;}
     break;
 
-  case 219:
-#line 927 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 220:
+#line 930 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].Value).val;
     (yyvsp[0].Value).destroy();
@@ -3080,13 +3092,13 @@ yyreduce:
   ;}
     break;
 
-  case 221:
-#line 936 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 222:
+#line 939 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 222:
-#line 940 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 223:
+#line 943 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -3094,17 +3106,8 @@ yyreduce:
   ;}
     break;
 
-  case 224:
-#line 948 "/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);
-    (yyval.String) = (yyvsp[-4].String);
-  ;}
-    break;
-
   case 225:
-#line 953 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 951 "/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);
@@ -3113,7 +3116,7 @@ yyreduce:
     break;
 
   case 226:
-#line 958 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 956 "/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);
@@ -3122,7 +3125,16 @@ yyreduce:
     break;
 
   case 227:
-#line 963 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 961 "/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);
+    (yyval.String) = (yyvsp[-4].String);
+  ;}
+    break;
+
+  case 228:
+#line 966 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val;
     (yyvsp[0].Value).destroy();
@@ -3130,17 +3142,20 @@ yyreduce:
   ;}
     break;
 
-  case 228:
-#line 968 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 229:
+#line 971 "/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();
-    (yyval.String) = (yyvsp[-3].String);
+    const char* shiftop = (yyvsp[-3].String)->c_str();
+    if (*(yyvsp[-3].String) == "shr")
+      shiftop = ((yyvsp[-2].Value).type.isUnsigned()) ? "lshr" : "ashr";
+    (yyval.String) = new std::string(shiftop);
+    *(yyval.String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
+    delete (yyvsp[-3].String); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
   ;}
     break;
 
-  case 229:
-#line 973 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 230:
+#line 979 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     const char *opcode = getCastOpcode((yyvsp[-2].Value).type, (yyvsp[0].Type));
     (yyval.String) = new std::string(opcode);
@@ -3150,8 +3165,8 @@ yyreduce:
   ;}
     break;
 
-  case 230:
-#line 980 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 231:
+#line 986 "/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();
@@ -3159,8 +3174,8 @@ yyreduce:
   ;}
     break;
 
-  case 231:
-#line 985 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 232:
+#line 991 "/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();
@@ -3168,8 +3183,8 @@ yyreduce:
   ;}
     break;
 
-  case 232:
-#line 990 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 233:
+#line 996 "/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();
@@ -3177,17 +3192,8 @@ yyreduce:
   ;}
     break;
 
-  case 233:
-#line 995 "/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();
-    (yyval.String) = (yyvsp[-5].String);
-  ;}
-    break;
-
   case 234:
-#line 1000 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1001 "/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();
@@ -3196,7 +3202,16 @@ yyreduce:
     break;
 
   case 235:
-#line 1005 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1006 "/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();
+    (yyval.String) = (yyvsp[-5].String);
+  ;}
+    break;
+
+  case 236:
+#line 1011 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -3204,8 +3219,8 @@ yyreduce:
   ;}
     break;
 
-  case 236:
-#line 1010 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 237:
+#line 1016 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-5].String)->empty())
       *(yyvsp[-6].String) += " " + *(yyvsp[-5].String);
@@ -3217,26 +3232,26 @@ yyreduce:
   ;}
     break;
 
-  case 238:
-#line 1024 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 239:
+#line 1030 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyvsp[0].String)->insert(0, ", ");
     (yyval.String) = (yyvsp[0].String);
   ;}
     break;
 
-  case 239:
-#line 1028 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 240:
+#line 1034 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {  (yyval.String) = new std::string(); ;}
     break;
 
-  case 241:
-#line 1033 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 242:
+#line 1039 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 242:
-#line 1036 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 243:
+#line 1042 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy;
     if (!(yyvsp[0].String)->empty())
@@ -3246,30 +3261,8 @@ yyreduce:
   ;}
     break;
 
-  case 243:
-#line 1043 "/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())
-      *(yyvsp[-5].String) += " " + *(yyvsp[0].String);
-    (yyvsp[-4].Type).destroy(); (yyvsp[-2].Type).destroy(); delete (yyvsp[-1].String); delete (yyvsp[0].String);
-    (yyval.String) = (yyvsp[-5].String);
-  ;}
-    break;
-
   case 244:
-#line 1050 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy;
-    if (!(yyvsp[0].String)->empty())
-      *(yyvsp[-2].String) += " " + *(yyvsp[0].String);
-    (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
-    (yyval.String) = (yyvsp[-2].String);
-  ;}
-    break;
-
-  case 245:
-#line 1057 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1049 "/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())
@@ -3279,8 +3272,30 @@ yyreduce:
   ;}
     break;
 
+  case 245:
+#line 1056 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy;
+    if (!(yyvsp[0].String)->empty())
+      *(yyvsp[-2].String) += " " + *(yyvsp[0].String);
+    (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
+    (yyval.String) = (yyvsp[-2].String);
+  ;}
+    break;
+
   case 246:
-#line 1064 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1063 "/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())
+      *(yyvsp[-5].String) += " " + *(yyvsp[0].String);
+    (yyvsp[-4].Type).destroy(); (yyvsp[-2].Type).destroy(); delete (yyvsp[-1].String); delete (yyvsp[0].String);
+    (yyval.String) = (yyvsp[-5].String);
+  ;}
+    break;
+
+  case 247:
+#line 1070 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val;
     (yyvsp[0].Value).destroy();
@@ -3288,8 +3303,8 @@ yyreduce:
   ;}
     break;
 
-  case 247:
-#line 1069 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 248:
+#line 1075 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-3].String)->empty())
       *(yyvsp[-3].String) += " ";
@@ -3299,8 +3314,8 @@ yyreduce:
   ;}
     break;
 
-  case 248:
-#line 1076 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 249:
+#line 1082 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-5].String)->empty())
       *(yyvsp[-5].String) += " ";
@@ -3310,8 +3325,8 @@ yyreduce:
   ;}
     break;
 
-  case 249:
-#line 1083 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 250:
+#line 1089 "/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);
@@ -3324,7 +3339,7 @@ yyreduce:
     }
 
 /* Line 1126 of yacc.c.  */
-#line 3328 "UpgradeParser.tab.c"
+#line 3343 "UpgradeParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -3592,7 +3607,7 @@ yyreturn:
 }
 
 
-#line 1089 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1095 "/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 68a8423b76c..06c25c2f813 100644
--- a/tools/llvm-upgrade/UpgradeParser.cpp.cvs
+++ b/tools/llvm-upgrade/UpgradeParser.cpp.cvs
@@ -166,13 +166,14 @@
      PHI_TOK = 357,
      SELECT = 358,
      SHL = 359,
-     LSHR = 360,
+     SHR = 360,
      ASHR = 361,
-     VAARG = 362,
-     EXTRACTELEMENT = 363,
-     INSERTELEMENT = 364,
-     SHUFFLEVECTOR = 365,
-     CAST = 366
+     LSHR = 362,
+     VAARG = 363,
+     EXTRACTELEMENT = 364,
+     INSERTELEMENT = 365,
+     SHUFFLEVECTOR = 366,
+     CAST = 367
    };
 #endif
 /* Tokens.  */
@@ -278,13 +279,14 @@
 #define PHI_TOK 357
 #define SELECT 358
 #define SHL 359
-#define LSHR 360
+#define SHR 360
 #define ASHR 361
-#define VAARG 362
-#define EXTRACTELEMENT 363
-#define INSERTELEMENT 364
-#define SHUFFLEVECTOR 365
-#define CAST 366
+#define LSHR 362
+#define VAARG 363
+#define EXTRACTELEMENT 364
+#define INSERTELEMENT 365
+#define SHUFFLEVECTOR 366
+#define CAST 367
 
 
 
@@ -432,7 +434,7 @@ typedef union YYSTYPE {
   ConstInfo       Const;
 } YYSTYPE;
 /* Line 196 of yacc.c.  */
-#line 436 "UpgradeParser.tab.c"
+#line 438 "UpgradeParser.tab.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -444,7 +446,7 @@ typedef union YYSTYPE {
 
 
 /* Line 219 of yacc.c.  */
-#line 448 "UpgradeParser.tab.c"
+#line 450 "UpgradeParser.tab.c"
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 # define YYSIZE_T __SIZE_TYPE__
@@ -595,20 +597,20 @@ union yyalloc
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  4
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1142
+#define YYLAST   1150
 
 /* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS  126
+#define YYNTOKENS  127
 /* YYNNTS -- Number of nonterminals. */
 #define YYNNTS  70
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  249
+#define YYNRULES  250
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  508
+#define YYNSTATES  509
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   366
+#define YYMAXUTOK   367
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -620,15 +622,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,
-     115,   116,   124,     2,   113,     2,     2,     2,     2,     2,
+     116,   117,   125,     2,   114,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     120,   112,   121,     2,     2,     2,     2,     2,     2,     2,
+     121,   113,   122,     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,   117,   114,   119,     2,     2,     2,     2,     2,   125,
+       2,   118,   115,   120,     2,     2,     2,     2,     2,   126,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     118,     2,     2,   122,     2,   123,     2,     2,     2,     2,
+     119,     2,     2,   123,     2,   124,     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,
@@ -652,7 +654,7 @@ 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
+     105,   106,   107,   108,   109,   110,   111,   112
 };
 
 #if YYDEBUG
@@ -664,113 +666,114 @@ 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,
-      80,    81,    83,    85,    87,    89,    91,    93,    95,    96,
-      98,   100,   102,   104,   106,   108,   111,   112,   113,   116,
-     117,   121,   124,   125,   127,   128,   132,   134,   137,   139,
+      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,   180,
-     185,   191,   197,   201,   204,   207,   209,   213,   215,   219,
-     221,   222,   227,   231,   235,   240,   245,   249,   252,   255,
-     258,   261,   264,   267,   270,   273,   276,   279,   286,   292,
-     301,   308,   315,   322,   329,   336,   345,   354,   358,   360,
-     362,   364,   366,   369,   372,   377,   380,   382,   387,   390,
-     395,   402,   409,   416,   423,   427,   432,   433,   435,   437,
-     439,   443,   447,   451,   455,   459,   463,   465,   466,   468,
-     470,   472,   473,   476,   480,   482,   484,   488,   490,   491,
-     500,   502,   504,   508,   510,   512,   516,   517,   519,   521,
-     525,   526,   528,   530,   532,   534,   536,   538,   540,   542,
-     544,   548,   550,   556,   558,   560,   562,   564,   567,   570,
-     572,   575,   578,   579,   581,   584,   587,   591,   601,   611,
-     620,   635,   637,   639,   646,   652,   655,   662,   670,   672,
-     676,   678,   679,   682,   684,   690,   696,   702,   705,   710,
-     715,   722,   727,   732,   739,   746,   749,   757,   759,   762,
-     763,   765,   766,   770,   777,   781,   788,   791,   796,   803
+     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
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
 static const short int yyrhs[] =
 {
-     157,     0,    -1,    19,    -1,    20,    -1,    17,    -1,    18,
+     158,     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,    11,    -1,     9,    -1,     7,    -1,     5,
-      -1,    12,    -1,    10,    -1,     8,    -1,     6,    -1,   133,
-      -1,   134,    -1,    13,    -1,    14,    -1,   165,   112,    -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,   113,    57,    18,
-      -1,    37,    30,    -1,    -1,   142,    -1,    -1,   113,   145,
-     144,    -1,   142,    -1,    57,    18,    -1,   148,    -1,     3,
-      -1,   150,    -1,     3,    -1,   150,    -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,   149,    -1,   179,    -1,   114,    18,    -1,
-     147,   115,   152,   116,    -1,   117,    18,   118,   150,   119,
-      -1,   120,    18,   118,   150,   121,    -1,   122,   151,   123,
-      -1,   122,   123,    -1,   150,   124,    -1,   150,    -1,   151,
-     113,   150,    -1,   151,    -1,   151,   113,    40,    -1,    40,
-      -1,    -1,   148,   117,   155,   119,    -1,   148,   117,   119,
-      -1,   148,   125,    30,    -1,   148,   120,   155,   121,    -1,
-     148,   122,   155,   123,    -1,   148,   122,   123,    -1,   148,
-      22,    -1,   148,    23,    -1,   148,   179,    -1,   148,   154,
-      -1,   148,    24,    -1,   133,   128,    -1,   134,    18,    -1,
-       4,    25,    -1,     4,    26,    -1,   136,    21,    -1,   111,
-     115,   153,    39,   148,   116,    -1,   101,   115,   153,   193,
-     116,    -1,   103,   115,   153,   113,   153,   113,   153,   116,
-      -1,   129,   115,   153,   113,   153,   116,    -1,   130,   115,
-     153,   113,   153,   116,    -1,   131,   115,   153,   113,   153,
-     116,    -1,   132,   115,   153,   113,   153,   116,    -1,   108,
-     115,   153,   113,   153,   116,    -1,   109,   115,   153,   113,
-     153,   113,   153,   116,    -1,   110,   115,   153,   113,   153,
-     113,   153,   116,    -1,   155,   113,   153,    -1,   153,    -1,
-      35,    -1,    36,    -1,   158,    -1,   158,   174,    -1,   158,
-     176,    -1,   158,    62,    61,   160,    -1,   158,    31,    -1,
-     159,    -1,   159,   137,    27,   146,    -1,   159,   176,    -1,
-     159,    62,    61,   160,    -1,   159,   137,   138,   156,   153,
-     144,    -1,   159,   137,    50,   156,   148,   144,    -1,   159,
-     137,    45,   156,   148,   144,    -1,   159,   137,    47,   156,
-     148,   144,    -1,   159,    51,   162,    -1,   159,    58,   112,
-     163,    -1,    -1,    30,    -1,    56,    -1,    55,    -1,    53,
-     112,   161,    -1,    54,   112,    18,    -1,    52,   112,    30,
-      -1,    71,   112,    30,    -1,   117,   164,   119,    -1,   164,
-     113,    30,    -1,    30,    -1,    -1,    28,    -1,    30,    -1,
-     165,    -1,    -1,   148,   166,    -1,   168,   113,   167,    -1,
-     167,    -1,   168,    -1,   168,   113,    40,    -1,    40,    -1,
-      -1,   139,   146,   165,   115,   169,   116,   143,   140,    -1,
-      32,    -1,   122,    -1,   138,   170,   171,    -1,    33,    -1,
-     123,    -1,   172,   182,   173,    -1,    -1,    45,    -1,    47,
-      -1,    34,   175,   170,    -1,    -1,    63,    -1,    17,    -1,
-      18,    -1,    21,    -1,    25,    -1,    26,    -1,    22,    -1,
-      23,    -1,    24,    -1,   120,   155,   121,    -1,   154,    -1,
-      61,   177,    30,   113,    30,    -1,   127,    -1,   165,    -1,
-     179,    -1,   178,    -1,   148,   180,    -1,   182,   183,    -1,
-     183,    -1,   184,   185,    -1,   184,   187,    -1,    -1,    29,
-      -1,    72,   181,    -1,    72,     3,    -1,    73,    15,   180,
-      -1,    73,     4,   180,   113,    15,   180,   113,    15,   180,
-      -1,    74,   135,   180,   113,    15,   180,   117,   186,   119,
-      -1,    74,   135,   180,   113,    15,   180,   117,   119,    -1,
-     137,    75,   139,   146,   180,   115,   190,   116,    39,    15,
-     180,    76,    15,   180,    -1,    76,    -1,    77,    -1,   186,
-     135,   178,   113,    15,   180,    -1,   135,   178,   113,    15,
-     180,    -1,   137,   192,    -1,   148,   117,   180,   113,   180,
-     119,    -1,   188,   113,   117,   180,   113,   180,   119,    -1,
-     181,    -1,   189,   113,   181,    -1,   189,    -1,    -1,    60,
-      59,    -1,    59,    -1,   129,   148,   180,   113,   180,    -1,
-     130,   148,   180,   113,   180,    -1,   131,   148,   180,   113,
-     180,    -1,    49,   181,    -1,   132,   181,   113,   181,    -1,
-     111,   181,    39,   148,    -1,   103,   181,   113,   181,   113,
-     181,    -1,   107,   181,   113,   148,    -1,   108,   181,   113,
-     181,    -1,   109,   181,   113,   181,   113,   181,    -1,   110,
-     181,   113,   181,   113,   181,    -1,   102,   188,    -1,   191,
-     139,   146,   180,   115,   190,   116,    -1,   195,    -1,   113,
-     189,    -1,    -1,    38,    -1,    -1,    96,   148,   141,    -1,
-      96,   148,   113,    10,   180,   141,    -1,    97,   148,   141,
-      -1,    97,   148,   113,    10,   180,   141,    -1,    98,   181,
-      -1,   194,    99,   148,   180,    -1,   194,   100,   181,   113,
-     148,   180,    -1,   101,   148,   180,   193,    -1
+      -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
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -778,29 +781,30 @@ 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,   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,   503,   508,   513,   523,   528,   533,
-     533,   543,   548,   551,   556,   560,   564,   567,   572,   577,
-     582,   588,   594,   600,   606,   611,   616,   621,   623,   623,
-     626,   631,   638,   643,   650,   657,   662,   663,   671,   671,
-     672,   672,   674,   681,   685,   689,   692,   697,   700,   702,
-     722,   725,   729,   738,   739,   741,   749,   750,   751,   755,
-     768,   769,   772,   772,   772,   772,   772,   772,   772,   773,
-     774,   779,   780,   789,   789,   792,   792,   798,   805,   808,
-     816,   820,   825,   828,   834,   839,   844,   849,   856,   862,
-     868,   881,   886,   892,   897,   905,   912,   918,   926,   927,
-     935,   936,   940,   945,   948,   953,   958,   963,   968,   973,
-     980,   985,   990,   995,  1000,  1005,  1010,  1019,  1024,  1028,
-    1032,  1033,  1036,  1043,  1050,  1057,  1064,  1069,  1076,  1083
+     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
 };
 #endif
 
@@ -824,24 +828,25 @@ static const char *const yytname[] =
   "SWITCH", "INVOKE", "UNWIND", "UNREACHABLE", "ADD", "SUB", "MUL", "UDIV",
   "SDIV", "FDIV", "UREM", "SREM", "FREM", "AND", "OR", "XOR", "SETLE",
   "SETGE", "SETLT", "SETGT", "SETEQ", "SETNE", "MALLOC", "ALLOCA", "FREE",
-  "LOAD", "STORE", "GETELEMENTPTR", "PHI_TOK", "SELECT", "SHL", "LSHR",
-  "ASHR", "VAARG", "EXTRACTELEMENT", "INSERTELEMENT", "SHUFFLEVECTOR",
-  "CAST", "'='", "','", "'\\\\'", "'('", "')'", "'['", "'x'", "']'", "'<'",
-  "'>'", "'{'", "'}'", "'*'", "'c'", "$accept", "IntVal", "EInt64Val",
-  "ArithmeticOps", "LogicalOps", "SetCondOps", "ShiftOps", "SIntType",
-  "UIntType", "IntType", "FPType", "OptAssign", "OptLinkage",
-  "OptCallingConv", "OptAlign", "OptCAlign", "SectionString", "OptSection",
-  "GlobalVarAttributes", "GlobalVarAttribute", "TypesV", "UpRTypesV",
-  "Types", "PrimType", "UpRTypes", "TypeListI", "ArgTypeListI", "ConstVal",
-  "ConstExpr", "ConstVector", "GlobalType", "Module", "DefinitionList",
-  "ConstPool", "AsmBlock", "BigOrLittle", "TargetDefinition",
-  "LibrariesDefinition", "LibList", "Name", "OptName", "ArgVal",
-  "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN", "FunctionHeader",
-  "END", "Function", "FnDeclareLinkage", "FunctionProto", "OptSideEffect",
-  "ConstValueRef", "SymbolicValueRef", "ValueRef", "ResolvedVal",
-  "BasicBlockList", "BasicBlock", "InstructionList", "BBTerminatorInst",
-  "JumpTable", "Inst", "PHIList", "ValueRefList", "ValueRefListE",
-  "OptTailCall", "InstVal", "IndexList", "OptVolatile", "MemoryInst", 0
+  "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",
+  "OptLinkage", "OptCallingConv", "OptAlign", "OptCAlign", "SectionString",
+  "OptSection", "GlobalVarAttributes", "GlobalVarAttribute", "TypesV",
+  "UpRTypesV", "Types", "PrimType", "UpRTypes", "TypeListI",
+  "ArgTypeListI", "ConstVal", "ConstExpr", "ConstVector", "GlobalType",
+  "Module", "DefinitionList", "ConstPool", "AsmBlock", "BigOrLittle",
+  "TargetDefinition", "LibrariesDefinition", "LibList", "Name", "OptName",
+  "ArgVal", "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN",
+  "FunctionHeader", "END", "Function", "FnDeclareLinkage", "FunctionProto",
+  "OptSideEffect", "ConstValueRef", "SymbolicValueRef", "ValueRef",
+  "ResolvedVal", "BasicBlockList", "BasicBlock", "InstructionList",
+  "BBTerminatorInst", "JumpTable", "Inst", "PHIList", "ValueRefList",
+  "ValueRefListE", "OptTailCall", "InstVal", "IndexList", "OptVolatile",
+  "MemoryInst", 0
 };
 #endif
 
@@ -861,39 +866,40 @@ 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,    61,    44,    92,    40,    41,    91,   120,    93,
-      60,    62,   123,   125,    42,    99
+     365,   366,   367,    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,   126,   127,   127,   128,   128,   129,   129,   129,   129,
-     129,   129,   129,   129,   129,   130,   130,   130,   131,   131,
-     131,   131,   131,   131,   132,   132,   132,   133,   133,   133,
-     133,   134,   134,   134,   134,   135,   135,   136,   136,   137,
-     137,   138,   138,   138,   138,   138,   138,   138,   138,   139,
-     139,   139,   139,   139,   139,   139,   139,   140,   140,   141,
-     141,   142,   143,   143,   144,   144,   145,   145,   146,   146,
-     147,   147,   148,   149,   149,   149,   149,   149,   149,   149,
-     149,   149,   149,   149,   149,   150,   150,   150,   150,   150,
-     150,   150,   150,   150,   150,   151,   151,   152,   152,   152,
-     152,   153,   153,   153,   153,   153,   153,   153,   153,   153,
-     153,   153,   153,   153,   153,   153,   153,   154,   154,   154,
-     154,   154,   154,   154,   154,   154,   154,   155,   155,   156,
-     156,   157,   158,   158,   158,   158,   158,   159,   159,   159,
-     159,   159,   159,   159,   159,   159,   159,   160,   161,   161,
-     162,   162,   162,   162,   163,   164,   164,   164,   165,   165,
-     166,   166,   167,   168,   168,   169,   169,   169,   169,   170,
-     171,   171,   172,   173,   173,   174,   175,   175,   175,   176,
-     177,   177,   178,   178,   178,   178,   178,   178,   178,   178,
-     178,   178,   178,   179,   179,   180,   180,   181,   182,   182,
-     183,   184,   184,   184,   185,   185,   185,   185,   185,   185,
-     185,   185,   185,   186,   186,   187,   188,   188,   189,   189,
-     190,   190,   191,   191,   192,   192,   192,   192,   192,   192,
-     192,   192,   192,   192,   192,   192,   192,   192,   193,   193,
-     194,   194,   195,   195,   195,   195,   195,   195,   195,   195
+       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
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -902,28 +908,29 @@ static const unsigned char yyr2[] =
        0,     2,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        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
+       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
@@ -931,439 +938,441 @@ static const unsigned char yyr2[] =
    means the default is an error.  */
 static const unsigned char yydefact[] =
 {
-     146,     0,    48,   136,     1,   135,   176,    41,    42,    43,
-      45,    46,    47,    44,     0,    56,   202,   132,   133,   158,
-     159,     0,     0,     0,    48,     0,   138,   177,   178,    56,
-       0,     0,    49,    50,    51,    52,    53,    54,     0,     0,
-     203,   202,   199,    40,     0,     0,     0,     0,   144,     0,
-       0,     0,     0,     0,     0,     0,    39,   179,   147,   134,
-      55,    69,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,     2,     3,     0,     0,     0,
-       0,   193,     0,     0,    68,    86,    72,   194,    87,   170,
-     171,   172,   173,   174,   175,   198,     0,     0,     0,   211,
-     212,   241,   200,   201,     0,     0,     0,     0,   157,   145,
-     139,   137,   129,   130,     0,     0,     0,     0,    88,     0,
-       0,    71,    93,    95,     0,     0,   100,    94,   205,     0,
-     204,     0,     0,    30,    34,    29,    33,    28,    32,    27,
-      31,    35,    36,     0,   240,     0,   223,     0,    56,     6,
+     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,
        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,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    56,   215,     0,   237,   152,
-     149,   148,   150,   151,   153,   156,     0,    64,    64,    64,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,     0,     0,     0,     0,    64,     0,     0,     0,    92,
-     168,    99,    97,     0,   182,   183,   184,   187,   188,   189,
-     185,   186,   180,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   191,   196,   195,   197,     0,   206,
-       0,   227,   222,     0,    59,    59,   246,     0,     0,   235,
+       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,   154,     0,   142,   143,   141,   114,
-     115,     4,     5,   112,   113,   116,   107,   108,   111,     0,
-       0,     0,     0,   110,   109,   140,    70,    70,    96,   167,
-     161,   164,   165,     0,     0,    89,   181,     0,     0,     0,
-       0,     0,     0,     0,   128,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   242,     0,   244,   239,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   155,     0,     0,    66,    64,   102,     0,
-       0,   106,     0,   103,    90,    91,   160,   162,     0,    62,
-      98,     0,   239,     0,     0,     0,     0,     0,     0,   190,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   249,     0,     0,     0,   231,   232,     0,     0,   229,
-       0,     0,     0,   228,     0,   247,     0,    61,    67,    65,
-     101,   104,   105,   166,   163,    63,    57,     0,     0,     0,
-       0,     0,     0,     0,   127,     0,     0,     0,     0,     0,
-       0,   221,    59,    60,    59,   218,   238,     0,     0,     0,
-       0,     0,   224,   225,   226,   221,     0,     0,   169,   192,
-     118,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   220,     0,     0,   243,   245,     0,     0,     0,
-     230,   233,   234,     0,   248,    58,     0,   124,     0,     0,
-     117,   120,   121,   122,   123,     0,   209,     0,     0,     0,
-     219,   216,     0,   236,     0,     0,     0,   207,     0,   208,
-       0,     0,   217,   119,   125,   126,     0,     0,     0,     0,
-       0,     0,   214,     0,     0,   213,     0,   210
+       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
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
 static const short int yydefgoto[] =
 {
-      -1,    81,   283,   240,   241,   242,   243,   211,   212,   143,
-     213,    24,    15,    38,   438,   324,   346,   406,   276,   347,
-      82,    83,   214,    85,    86,   124,   223,   314,   244,   315,
-     114,     1,     2,     3,    59,   192,    48,   109,   196,    87,
-     357,   301,   302,   303,    39,    91,    16,    94,    17,    29,
-      18,   307,   245,    88,   247,   425,    41,    42,    43,   102,
-     478,   103,   259,   452,   453,   185,   186,   381,   187,   188
+      -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
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -442
+#define YYPACT_NINF -462
 static const short int yypact[] =
 {
-    -442,    61,   222,   381,  -442,  -442,   106,  -442,  -442,  -442,
-    -442,  -442,  -442,  -442,   -25,   283,    43,  -442,  -442,  -442,
-    -442,    10,   -14,    40,   197,     4,  -442,  -442,  -442,   283,
-      79,   101,  -442,  -442,  -442,  -442,  -442,  -442,   685,   -10,
-    -442,    -2,  -442,    41,    15,    38,    48,    50,  -442,    53,
-      79,   685,    44,    44,    44,    44,  -442,  -442,  -442,  -442,
-    -442,    57,  -442,  -442,  -442,  -442,  -442,  -442,  -442,  -442,
-    -442,  -442,  -442,  -442,  -442,  -442,  -442,   172,   174,   175,
-     468,  -442,   131,    81,  -442,  -442,   -85,  -442,  -442,  -442,
-    -442,  -442,  -442,  -442,  -442,  -442,   714,    20,   320,  -442,
-    -442,  1031,  -442,  -442,   165,   100,   180,   169,   186,  -442,
-    -442,  -442,  -442,  -442,   743,   743,   743,   773,  -442,    83,
-      92,  -442,  -442,   -85,   -57,   102,    80,  -442,    57,   927,
-    -442,   927,   927,  -442,  -442,  -442,  -442,  -442,  -442,  -442,
-    -442,  -442,  -442,   927,  -442,   743,  -442,   159,   283,  -442,
-    -442,  -442,  -442,  -442,  -442,  -442,  -442,  -442,  -442,  -442,
-    -442,  -442,  -442,  -442,  -442,  -442,  -442,   743,   743,   743,
-     743,   743,   743,  -442,  -442,  -442,   743,   743,   743,   743,
-     743,   743,   743,   743,   743,   283,  -442,    36,  -442,  -442,
-    -442,  -442,  -442,  -442,  -442,  -442,   -81,   107,   107,   107,
-     141,   151,   203,   157,   205,   160,   209,   163,   210,   208,
-     215,   171,   212,   225,   818,   107,   743,   743,   743,  -442,
-     526,  -442,   118,   132,  -442,  -442,  -442,  -442,  -442,  -442,
-    -442,  -442,   187,   134,   137,   139,   140,   142,   143,   773,
-     144,   158,   162,   166,  -442,  -442,  -442,  -442,   170,  -442,
-     173,  -442,  -442,   685,   177,   178,  -442,   927,   161,   185,
-     189,   190,   195,   196,   201,   236,   927,   927,   927,   202,
-     685,   743,   743,   252,  -442,    -3,  -442,  -442,  -442,  -442,
-    -442,  -442,  -442,  -442,  -442,  -442,  -442,  -442,  -442,   564,
-     773,   498,   255,  -442,  -442,  -442,   -22,   -51,   -85,  -442,
-     131,  -442,   204,   183,   594,  -442,  -442,   288,   773,   773,
-     773,   773,   773,   773,  -442,   -80,   773,   773,   773,   773,
-     304,   306,   927,    -5,  -442,    -4,  -442,   223,   927,   206,
-     743,   743,   743,   743,   743,   743,   230,   231,   232,   743,
-     927,   927,   244,  -442,   308,   341,  -442,   107,  -442,   -45,
-     -54,  -442,   -48,  -442,  -442,  -442,  -442,  -442,   647,   323,
-    -442,   249,   223,   253,   254,   257,   261,   326,   773,  -442,
-     263,   265,   266,   267,   927,   927,   272,   927,   370,   927,
-     743,  -442,   276,   927,   277,  -442,  -442,   281,   285,  -442,
-     927,   927,   927,  -442,   284,  -442,   743,  -442,  -442,  -442,
-    -442,  -442,  -442,  -442,  -442,  -442,   344,   372,   289,   773,
-     773,   773,   773,   743,  -442,   773,   773,   773,   773,   291,
-     290,   743,   293,  -442,   293,  -442,   297,   927,   299,   743,
-     743,   743,  -442,  -442,  -442,   743,   927,   395,  -442,  -442,
-    -442,   301,   302,   307,   309,   317,   318,   319,   324,   325,
-     427,     9,   297,   328,   388,  -442,  -442,   743,   327,   927,
-    -442,  -442,  -442,   331,  -442,  -442,   773,  -442,   773,   773,
-    -442,  -442,  -442,  -442,  -442,   927,  -442,   973,    39,   409,
-    -442,  -442,   330,  -442,   334,   335,   336,  -442,   342,  -442,
-     973,   439,  -442,  -442,  -442,  -442,   441,   345,   927,   927,
-     442,   383,  -442,   927,   445,  -442,   927,  -442
+    -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
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -442,  -442,  -442,   360,   361,   362,   364,   -97,   -96,  -441,
-    -442,   423,   443,  -125,  -442,  -251,   109,  -442,  -190,  -442,
-     -44,  -442,   -38,  -442,   -69,   359,  -442,  -105,   256,  -185,
-      69,  -442,  -442,  -442,   436,  -442,  -442,  -442,  -442,     0,
-    -442,   133,  -442,  -442,   460,  -442,  -442,  -442,  -442,  -442,
-     487,  -442,  -435,  -103,    -6,     7,  -442,   453,  -442,  -442,
-    -442,  -442,  -442,   115,    64,  -442,  -442,   153,  -442,  -442
+    -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
 };
 
 /* 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 -132
+#define YYTABLE_NINF -133
 static const short int yytable[] =
 {
-      84,   141,   142,    25,   326,   377,   379,   111,   277,   278,
-     477,   123,   215,    84,   133,   134,   135,   136,   137,   138,
-     139,   140,    89,   253,   131,   295,   246,    40,   246,   246,
-     -70,    92,   273,   368,   344,   132,    30,   490,   274,   127,
-     246,   369,   488,    25,   133,   134,   135,   136,   137,   138,
-     139,   140,   378,   378,   345,   497,   218,   123,   129,   368,
-     270,     4,    44,    45,    46,   368,   219,   401,   368,    19,
-     355,    20,    40,   127,   400,   402,   197,   198,   199,   112,
-     113,    47,   125,   121,    62,    63,    64,    65,    66,    67,
-      68,    69,    70,    71,    72,    73,    74,   354,    49,    75,
-      76,    50,   127,   130,   349,   350,   352,   129,    19,    58,
-      20,   294,    90,    96,    97,    98,    56,    99,   100,    60,
-     221,    93,   115,   116,   117,   248,   249,   104,   476,   254,
-     255,   129,   257,   258,   129,   271,   272,   250,   129,   129,
-     129,   129,   129,   266,   267,   268,   129,   296,   297,   298,
-     105,    27,   251,    28,   246,   190,   191,   399,   489,    19,
-     106,    20,   107,   246,   246,   246,   279,   280,   -30,   -30,
-     108,   455,   -71,   456,   -29,   -29,   256,   -28,   -28,   260,
-     -27,   -27,   300,   261,   262,   263,   264,   265,   281,   282,
-     118,   269,   119,   120,    77,   189,   126,    78,   193,   194,
-      79,   216,    80,   362,   363,   364,   365,   366,   367,   322,
-     217,   370,   371,   372,   373,    84,   195,   220,   252,   246,
-     275,   -34,  -131,   -33,    51,   246,   340,   -32,   -31,   -37,
-     284,   304,    84,   341,   129,   298,   -38,   246,   246,     7,
-       8,     9,    52,    11,    53,    13,   285,    54,   305,   308,
-     306,   327,   309,     5,   310,   311,     6,   312,   313,   316,
-     336,   337,   338,   414,     7,     8,     9,    10,    11,    12,
-      13,   246,   246,   317,   246,   335,   246,   318,   328,   342,
-     246,   319,   343,   320,    14,   353,   321,   246,   246,   246,
-     323,   325,   129,   385,   129,   129,   129,   389,   329,   359,
-     356,   129,   330,   331,   441,   442,   443,   444,   332,   333,
-     446,   447,   448,   449,   334,   339,   376,   358,   361,   374,
-     300,   375,   382,   383,   246,   133,   134,   135,   136,   137,
-     138,   139,   140,   246,   394,   395,   380,   384,   397,   386,
-     387,   388,   129,   390,   391,   392,   393,    31,    32,    33,
-      34,    35,    36,    37,   141,   142,   246,   396,   436,   398,
-     344,   484,   407,   485,   486,   413,   409,   410,   419,   420,
-     411,   422,   246,   424,   412,   445,   415,   428,   416,   417,
-     418,   141,   142,   129,   432,   433,   434,   421,   423,   427,
-     429,   129,   129,   129,   430,   246,   246,   129,   431,   435,
-     246,   437,   439,   246,   450,   440,   454,   451,   -40,    19,
-     457,    20,   459,   465,   466,     6,   -40,   -40,   467,   129,
-     468,   458,   469,   -40,   -40,   -40,   -40,   -40,   -40,   -40,
-     464,   -40,    21,   470,   471,   472,   460,   461,   462,    22,
-     473,   474,   475,    23,   479,   378,   481,   483,   491,   492,
-     493,   494,   495,   482,   498,   496,   499,   503,   500,   504,
-     506,   181,   182,   183,   480,   184,   101,    55,   405,   487,
-     293,   121,    62,    63,    64,    65,    66,    67,    68,    69,
-      70,    71,    72,    73,    74,   222,   110,    75,    76,    57,
-      26,   404,   501,   502,    95,   426,    19,   505,    20,   463,
-     507,   121,   200,   201,   202,   203,   204,   205,   206,   207,
-     208,   209,   210,    73,    74,   408,     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,   299,   121,   200,   201,
-     202,   203,   204,   205,   206,   207,   208,   209,   210,    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,   351,    19,     0,    20,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   360,     0,     0,     0,     0,     0,
-      77,     0,     0,    78,     0,     0,    79,     0,    80,     0,
+      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,    77,     0,
-       0,    78,     0,   348,    79,     0,    80,   403,    61,    62,
+       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,
+      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,     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,
+      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,     0,    20,     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,
-       0,    19,     0,    20,     0,     0,   121,   200,   201,   202,
-     203,   204,   205,   206,   207,   208,   209,   210,    73,    74,
-       0,     0,    75,    76,     0,     0,     0,     0,     0,    77,
-       0,    19,    78,    20,     0,    79,     0,    80,     0,     0,
+       0,     0,    19,    77,    20,     0,    78,     0,     0,    79,
+       0,    80,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    77,     0,
-       0,    78,     0,     0,    79,     0,    80,    75,    76,     0,
-     286,   287,   288,     0,     0,     0,    19,     0,    20,     0,
-       0,     0,     0,     0,     0,     0,     0,    77,     0,     0,
-      78,     0,     0,    79,     0,    80,     0,     0,     0,     0,
+       0,     0,    77,     0,     0,    78,     0,     0,    79,     0,
+      80,    75,    76,     0,   287,   288,   289,     0,     0,     0,
+      19,     0,    20,     0,     0,     0,     0,     0,     0,     0,
+      77,     0,     0,    78,     0,     0,    79,     0,    80,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    77,     0,     0,
-      78,     0,     0,    79,     0,    80,   149,   150,   151,   152,
+       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,
+     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,     0,     0,     0,     0,     0,   233,
-       0,   234,   173,   174,   175,     0,   235,   236,   237,   238,
-       0,     0,     0,     0,     0,   289,     0,     0,   290,     0,
-     291,     0,     0,   292,   224,   225,    75,    76,   226,   227,
-     228,   229,   230,   231,     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,   232,     0,
-     224,   225,     0,     0,   226,   227,   228,   229,   230,   231,
-       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,   233,     0,
-     234,   173,   174,   175,   232,   235,   236,   237,   238,     0,
-       0,     0,     0,     0,     0,     0,     0,   239,     0,     0,
-       0,   149,   150,   151,   152,   153,   154,   155,   156,   157,
-     158,   159,   160,   161,   162,   163,   164,   165,   166,   144,
-       0,     0,     0,     0,   233,     0,   234,   173,   174,   175,
-     145,   235,   236,   237,   238,     0,     0,     0,     0,     0,
-     146,   147,     0,   239,     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
+     163,   164,   165,   166,   167,   168,   169,     0,     0,   170,
+     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
+     181
 };
 
 static const short int yycheck[] =
 {
-      38,    98,    98,     3,   255,    10,    10,    51,   198,   199,
-     451,    80,   117,    51,     5,     6,     7,     8,     9,    10,
-      11,    12,    32,   148,     4,   215,   129,    29,   131,   132,
-     115,    33,   113,   113,    37,    15,    61,   478,   119,   124,
-     143,   121,   477,    43,     5,     6,     7,     8,     9,    10,
-      11,    12,    57,    57,    57,   490,   113,   126,    96,   113,
-     185,     0,    52,    53,    54,   113,   123,   121,   113,    28,
-     121,    30,    29,   124,   119,   123,   114,   115,   116,    35,
-      36,    71,    82,     3,     4,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,   119,   112,    19,
-      20,    61,   124,    96,   289,   290,   291,   145,    28,    30,
-      30,   214,   122,    72,    73,    74,   112,    76,    77,    18,
-      40,   123,    53,    54,    55,   131,   132,   112,   119,   167,
-     168,   169,   170,   171,   172,    99,   100,   143,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,   216,   217,   218,
-     112,    45,   145,    47,   257,    55,    56,   347,   119,    28,
-     112,    30,   112,   266,   267,   268,    25,    26,    17,    18,
-     117,   422,   115,   424,    17,    18,   169,    17,    18,   172,
-      17,    18,   220,   176,   177,   178,   179,   180,    17,    18,
-      18,   184,    18,    18,   114,    30,   115,   117,    18,    30,
-     120,   118,   122,   308,   309,   310,   311,   312,   313,   253,
-     118,   316,   317,   318,   319,   253,    30,   115,    59,   322,
-     113,    18,     0,    18,    27,   328,   270,    18,    18,    21,
-      18,   113,   270,   271,   272,   304,    21,   340,   341,    42,
-      43,    44,    45,    46,    47,    48,    21,    50,   116,   115,
-      63,   257,   115,    31,   115,   115,    34,   115,   115,   115,
-     266,   267,   268,   368,    42,    43,    44,    45,    46,    47,
-      48,   374,   375,   115,   377,    39,   379,   115,   117,   272,
-     383,   115,    30,   113,    62,    30,   113,   390,   391,   392,
-     113,   113,   330,   331,   332,   333,   334,   335,   113,   116,
-     300,   339,   113,   113,   409,   410,   411,   412,   113,   113,
-     415,   416,   417,   418,   113,   113,   322,   113,    30,    15,
-     358,    15,   328,   117,   427,     5,     6,     7,     8,     9,
-      10,    11,    12,   436,   340,   341,   113,   330,    30,   332,
-     333,   334,   380,   113,   113,   113,   339,    64,    65,    66,
-      67,    68,    69,    70,   451,   451,   459,   113,   396,    18,
-      37,   466,   113,   468,   469,    39,   113,   113,   374,   375,
-     113,   377,   475,   379,   113,   413,   113,   383,   113,   113,
-     113,   478,   478,   421,   390,   391,   392,   115,    18,   113,
-     113,   429,   430,   431,   113,   498,   499,   435,   113,   115,
-     503,    57,    30,   506,   113,   116,   113,   117,    27,    28,
-     113,    30,   113,    18,   113,    34,    35,    36,   116,   457,
-     113,   427,   113,    42,    43,    44,    45,    46,    47,    48,
-     436,    50,    51,   116,   116,   116,   429,   430,   431,    58,
-     116,   116,    15,    62,   116,    57,   119,   116,    39,   119,
-     116,   116,   116,   459,    15,   113,    15,    15,   113,    76,
-      15,   101,   101,   101,   457,   101,    43,    24,   359,   475,
-     214,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,   126,    50,    19,    20,    29,
-       3,   358,   498,   499,    41,   380,    28,   503,    30,   435,
-     506,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,   362,    -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,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    -1,   114,    19,    20,   117,    -1,    -1,   120,    -1,
-     122,   123,    28,    -1,    30,    -1,    -1,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    -1,   114,    19,    20,   117,    -1,    -1,   120,    -1,
-     122,   123,    28,    -1,    30,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
-     114,    -1,    -1,   117,    -1,    -1,   120,    -1,   122,    -1,
+      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,   114,    -1,
-      -1,   117,    -1,   119,   120,    -1,   122,    40,     3,     4,
+      -1,    -1,    -1,    -1,    -1,    28,    -1,    30,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,    -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,     3,
+       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    -1,   115,    19,    20,   118,    -1,    -1,
+     121,    -1,   123,   124,    28,    -1,    30,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,
+      -1,    -1,   115,    -1,    -1,   118,    -1,    -1,   121,    -1,
+     123,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    -1,    -1,    19,    20,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    28,    -1,    30,    -1,
+      -1,   115,    -1,    -1,   118,    -1,   120,   121,    40,   123,
+      -1,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    -1,    -1,    19,    20,    -1,
+      -1,   115,    -1,    -1,   118,    -1,    28,   121,    30,   123,
+       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    -1,    -1,    19,    20,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    28,    -1,    30,     3,     4,
        5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    -1,    -1,    19,    20,    -1,    -1,   114,    -1,
-      -1,   117,    -1,    28,   120,    30,   122,     3,     4,     5,
+      15,    16,    -1,   115,    19,    20,   118,    -1,    -1,   121,
+      -1,   123,    -1,    28,    -1,    30,    -1,     3,     4,     5,
        6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
       16,    -1,    -1,    19,    20,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    28,    -1,    30,    -1,     3,     4,     5,     6,
-       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      -1,   114,    19,    20,   117,    -1,    -1,   120,    -1,   122,
-      -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,    -1,    -1,    -1,   114,
-      -1,    28,   117,    30,    -1,   120,    -1,   122,    -1,    -1,
+      -1,    -1,    28,   115,    30,    -1,   118,    -1,    -1,   121,
+      -1,   123,    -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,   114,    -1,
-      -1,   117,    -1,    -1,   120,    -1,   122,    19,    20,    -1,
-      22,    23,    24,    -1,    -1,    -1,    28,    -1,    30,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   114,    -1,    -1,
-     117,    -1,    -1,   120,    -1,   122,    -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,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   114,    -1,    -1,
-     117,    -1,    -1,   120,    -1,   122,    78,    79,    80,    81,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   115,
+      -1,    -1,   118,    -1,    -1,   121,    -1,   123,    -1,    -1,
+      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    95,    -1,    -1,
+      -1,    -1,    -1,   101,    -1,   103,   104,   105,   106,   107,
+      -1,   109,   110,   111,   112,    -1,    -1,    -1,    -1,    -1,
+     118,    -1,    -1,   121,    -1,   123,    -1,    -1,   126,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    -1,
+      28,    -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -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,    -1,    -1,    -1,    -1,    -1,   101,
-      -1,   103,   104,   105,   106,    -1,   108,   109,   110,   111,
-      -1,    -1,    -1,    -1,    -1,   117,    -1,    -1,   120,    -1,
-     122,    -1,    -1,   125,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    -1,    28,    -1,    30,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    61,    -1,
-      17,    18,    -1,    -1,    21,    22,    23,    24,    25,    26,
-      -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,    61,   108,   109,   110,   111,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   120,    -1,    -1,
-      -1,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    38,
-      -1,    -1,    -1,    -1,   101,    -1,   103,   104,   105,   106,
-      49,   108,   109,   110,   111,    -1,    -1,    -1,    -1,    -1,
-      59,    60,    -1,   120,    -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
+      92,    93,    94,    95,    96,    97,    98,    -1,    -1,   101,
+     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
+     112
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const unsigned char yystos[] =
 {
-       0,   157,   158,   159,     0,    31,    34,    42,    43,    44,
-      45,    46,    47,    48,    62,   138,   172,   174,   176,    28,
-      30,    51,    58,    62,   137,   165,   176,    45,    47,   175,
-      61,    64,    65,    66,    67,    68,    69,    70,   139,   170,
-      29,   182,   183,   184,    52,    53,    54,    71,   162,   112,
-      61,    27,    45,    47,    50,   138,   112,   170,    30,   160,
+       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,
       18,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    19,    20,   114,   117,   120,
-     122,   127,   146,   147,   148,   149,   150,   165,   179,    32,
-     122,   171,    33,   123,   173,   183,    72,    73,    74,    76,
-      77,   137,   185,   187,   112,   112,   112,   112,   117,   163,
-     160,   146,    35,    36,   156,   156,   156,   156,    18,    18,
-      18,     3,   123,   150,   151,   165,   115,   124,     3,   148,
-     181,     4,    15,     5,     6,     7,     8,     9,    10,    11,
-      12,   133,   134,   135,    38,    49,    59,    60,    75,    78,
+      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,
       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,   129,   130,   131,   132,   191,   192,   194,   195,    30,
-      55,    56,   161,    18,    30,    30,   164,   148,   148,   148,
-       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      14,   133,   134,   136,   148,   153,   118,   118,   113,   123,
-     115,    40,   151,   152,    17,    18,    21,    22,    23,    24,
-      25,    26,    61,   101,   103,   108,   109,   110,   111,   120,
-     129,   130,   131,   132,   154,   178,   179,   180,   180,   180,
-     180,   181,    59,   139,   148,   148,   181,   148,   148,   188,
-     181,   181,   181,   181,   181,   181,   148,   148,   148,   181,
-     139,    99,   100,   113,   119,   113,   144,   144,   144,    25,
-      26,    17,    18,   128,    18,    21,    22,    23,    24,   117,
-     120,   122,   125,   154,   179,   144,   150,   150,   150,    40,
-     148,   167,   168,   169,   113,   116,    63,   177,   115,   115,
-     115,   115,   115,   115,   153,   155,   115,   115,   115,   115,
-     113,   113,   146,   113,   141,   113,   141,   180,   117,   113,
-     113,   113,   113,   113,   113,    39,   180,   180,   180,   113,
-     146,   148,   181,    30,    37,    57,   142,   145,   119,   155,
-     155,   123,   155,    30,   119,   121,   165,   166,   113,   116,
-      40,    30,   153,   153,   153,   153,   153,   153,   113,   121,
-     153,   153,   153,   153,    15,    15,   180,    10,    57,    10,
-     113,   193,   180,   117,   181,   148,   181,   181,   181,   148,
-     113,   113,   113,   181,   180,   180,   113,    30,    18,   144,
-     119,   121,   123,    40,   167,   142,   143,   113,   193,   113,
-     113,   113,   113,    39,   153,   113,   113,   113,   113,   180,
-     180,   115,   180,    18,   180,   181,   189,   113,   180,   113,
-     113,   113,   180,   180,   180,   115,   148,    57,   140,    30,
-     116,   153,   153,   153,   153,   148,   153,   153,   153,   153,
-     113,   117,   189,   190,   113,   141,   141,   113,   180,   113,
-     181,   181,   181,   190,   180,    18,   113,   116,   113,   113,
-     116,   116,   116,   116,   116,    15,   119,   135,   186,   116,
-     181,   119,   180,   116,   153,   153,   153,   180,   178,   119,
-     135,    39,   119,   116,   116,   116,   113,   178,    15,    15,
-     113,   180,   180,    15,    76,   180,    15,   180
+     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
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -2032,7 +2041,7 @@ yyreduce:
   YY_REDUCE_PRINT (yyn);
   switch (yyn)
     {
-        case 39:
+        case 40:
 #line 206 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " = ";
@@ -2040,19 +2049,19 @@ yyreduce:
   ;}
     break;
 
-  case 40:
+  case 41:
 #line 210 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = new std::string(""); 
   ;}
     break;
 
-  case 48:
+  case 49:
 #line 217 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(""); ;}
     break;
 
-  case 55:
+  case 56:
 #line 222 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     *(yyvsp[-1].String) += *(yyvsp[0].String); 
@@ -2061,27 +2070,27 @@ yyreduce:
     ;}
     break;
 
-  case 56:
+  case 57:
 #line 227 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(""); ;}
     break;
 
-  case 57:
+  case 58:
 #line 232 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 58:
+  case 59:
 #line 233 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); (yyval.String) = (yyvsp[-1].String); ;}
     break;
 
-  case 59:
+  case 60:
 #line 236 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 60:
+  case 61:
 #line 237 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyvsp[-1].String)->insert(0, ", "); 
@@ -2091,7 +2100,7 @@ yyreduce:
   ;}
     break;
 
-  case 61:
+  case 62:
 #line 245 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
@@ -2100,17 +2109,17 @@ yyreduce:
   ;}
     break;
 
-  case 62:
+  case 63:
 #line 251 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 64:
+  case 65:
 #line 255 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 65:
+  case 66:
 #line 256 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
       (yyvsp[-1].String)->insert(0, ", ");
@@ -2121,7 +2130,7 @@ yyreduce:
     ;}
     break;
 
-  case 67:
+  case 68:
 #line 266 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
       *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
@@ -2130,14 +2139,14 @@ yyreduce:
     ;}
     break;
 
-  case 87:
+  case 88:
 #line 288 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
            (yyval.Type).newTy = (yyvsp[0].String); (yyval.Type).oldTy = OpaqueTy;
          ;}
     break;
 
-  case 88:
+  case 89:
 #line 294 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                   // Type UpReference
     (yyvsp[0].String)->insert(0, "\\");
@@ -2146,7 +2155,7 @@ yyreduce:
   ;}
     break;
 
-  case 89:
+  case 90:
 #line 299 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {           // Function derived type?
     *(yyvsp[-3].Type).newTy += "( " + *(yyvsp[-1].String) + " )";
@@ -2156,7 +2165,7 @@ yyreduce:
   ;}
     break;
 
-  case 90:
+  case 91:
 #line 305 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {          // Sized array type?
     (yyvsp[-3].String)->insert(0,"[ ");
@@ -2167,7 +2176,7 @@ yyreduce:
   ;}
     break;
 
-  case 91:
+  case 92:
 #line 312 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {          // Packed array type?
     (yyvsp[-3].String)->insert(0,"< ");
@@ -2178,7 +2187,7 @@ yyreduce:
   ;}
     break;
 
-  case 92:
+  case 93:
 #line 319 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                        // Structure type?
     (yyvsp[-1].String)->insert(0, "{ ");
@@ -2188,7 +2197,7 @@ yyreduce:
   ;}
     break;
 
-  case 93:
+  case 94:
 #line 325 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                                  // Empty structure type?
     (yyval.Type).newTy = new std::string("{ }");
@@ -2196,7 +2205,7 @@ yyreduce:
   ;}
     break;
 
-  case 94:
+  case 95:
 #line 329 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                             // Pointer type?
     *(yyvsp[-1].Type).newTy += '*';
@@ -2205,14 +2214,14 @@ yyreduce:
   ;}
     break;
 
-  case 95:
+  case 96:
 #line 339 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].Type).newTy;
   ;}
     break;
 
-  case 96:
+  case 97:
 #line 342 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].Type).newTy;
@@ -2221,7 +2230,7 @@ yyreduce:
   ;}
     break;
 
-  case 98:
+  case 99:
 #line 351 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", ...";
@@ -2230,21 +2239,21 @@ yyreduce:
   ;}
     break;
 
-  case 99:
+  case 100:
 #line 356 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].String);
   ;}
     break;
 
-  case 100:
+  case 101:
 #line 359 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = new std::string();
   ;}
     break;
 
-  case 101:
+  case 102:
 #line 369 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { // Nonempty unsized arr
     (yyval.Const).type = (yyvsp[-3].Type);
@@ -2254,7 +2263,7 @@ yyreduce:
   ;}
     break;
 
-  case 102:
+  case 103:
 #line 375 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-2].Type);
@@ -2263,7 +2272,7 @@ yyreduce:
   ;}
     break;
 
-  case 103:
+  case 104:
 #line 380 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-2].Type);
@@ -2273,7 +2282,7 @@ yyreduce:
   ;}
     break;
 
-  case 104:
+  case 105:
 #line 386 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { // Nonempty unsized arr
     (yyval.Const).type = (yyvsp[-3].Type);
@@ -2283,7 +2292,7 @@ yyreduce:
   ;}
     break;
 
-  case 105:
+  case 106:
 #line 392 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-3].Type);
@@ -2293,7 +2302,7 @@ yyreduce:
   ;}
     break;
 
-  case 106:
+  case 107:
 #line 398 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-2].Type);
@@ -2302,7 +2311,7 @@ yyreduce:
   ;}
     break;
 
-  case 107:
+  case 108:
 #line 403 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
@@ -2312,7 +2321,7 @@ yyreduce:
   ;}
     break;
 
-  case 108:
+  case 109:
 #line 409 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
@@ -2322,7 +2331,7 @@ yyreduce:
   ;}
     break;
 
-  case 109:
+  case 110:
 #line 415 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
@@ -2332,7 +2341,7 @@ yyreduce:
   ;}
     break;
 
-  case 110:
+  case 111:
 #line 421 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
@@ -2342,7 +2351,7 @@ yyreduce:
   ;}
     break;
 
-  case 111:
+  case 112:
 #line 427 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
@@ -2352,7 +2361,7 @@ yyreduce:
   ;}
     break;
 
-  case 112:
+  case 113:
 #line 433 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {      // integral constants
     (yyval.Const).type = (yyvsp[-1].Type);
@@ -2362,7 +2371,7 @@ yyreduce:
   ;}
     break;
 
-  case 113:
+  case 114:
 #line 439 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {            // integral constants
     (yyval.Const).type = (yyvsp[-1].Type);
@@ -2372,7 +2381,7 @@ yyreduce:
   ;}
     break;
 
-  case 114:
+  case 115:
 #line 445 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                      // Boolean constants
     (yyval.Const).type = (yyvsp[-1].Type);
@@ -2382,7 +2391,7 @@ yyreduce:
   ;}
     break;
 
-  case 115:
+  case 116:
 #line 451 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                     // Boolean constants
     (yyval.Const).type = (yyvsp[-1].Type);
@@ -2392,7 +2401,7 @@ yyreduce:
   ;}
     break;
 
-  case 116:
+  case 117:
 #line 457 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                   // Float & Double constants
     (yyval.Const).type = (yyvsp[-1].Type);
@@ -2402,7 +2411,7 @@ yyreduce:
   ;}
     break;
 
-  case 117:
+  case 118:
 #line 465 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     // We must infer the cast opcode from the types of the operands. 
@@ -2413,7 +2422,7 @@ yyreduce:
   ;}
     break;
 
-  case 118:
+  case 119:
 #line 472 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-4].String) += "(" + *(yyvsp[-2].Const).cnst + " " + *(yyvsp[-1].String) + ")";
@@ -2423,7 +2432,7 @@ yyreduce:
   ;}
     break;
 
-  case 119:
+  case 120:
 #line 478 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
@@ -2432,7 +2441,7 @@ yyreduce:
   ;}
     break;
 
-  case 120:
+  case 121:
 #line 483 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
@@ -2441,7 +2450,7 @@ yyreduce:
   ;}
     break;
 
-  case 121:
+  case 122:
 #line 488 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
@@ -2450,7 +2459,7 @@ yyreduce:
   ;}
     break;
 
-  case 122:
+  case 123:
 #line 493 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
@@ -2459,35 +2468,29 @@ yyreduce:
   ;}
     break;
 
-  case 123:
+  case 124:
 #line 498 "/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();
-    (yyval.String) = (yyvsp[-5].String);
-  ;}
-    break;
-
-  case 124:
-#line 503 "/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();
-    (yyval.String) = (yyvsp[-5].String);
+    const char* shiftop = (yyvsp[-5].String)->c_str();
+    if (*(yyvsp[-5].String) == "shr")
+      shiftop = ((yyvsp[-3].Const).type.isUnsigned()) ? "lshr" : "ashr";
+    (yyval.String) = new std::string(shiftop);
+    *(yyval.String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
+    delete (yyvsp[-5].String); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
   ;}
     break;
 
   case 125:
-#line 508 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 506 "/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();
-    (yyval.String) = (yyvsp[-7].String);
+    *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
+    (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
+    (yyval.String) = (yyvsp[-5].String);
   ;}
     break;
 
   case 126:
-#line 513 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 511 "/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();
@@ -2496,7 +2499,16 @@ yyreduce:
     break;
 
   case 127:
-#line 523 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 516 "/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();
+    (yyval.String) = (yyvsp[-7].String);
+  ;}
+    break;
+
+  case 128:
+#line 526 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].Const).cnst;
     (yyvsp[0].Const).destroy();
@@ -2504,26 +2516,26 @@ yyreduce:
   ;}
     break;
 
-  case 128:
-#line 528 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 129:
+#line 531 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(*(yyvsp[0].Const).cnst); (yyvsp[0].Const).destroy(); ;}
     break;
 
-  case 131:
-#line 543 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 132:
+#line 546 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
 ;}
     break;
 
-  case 132:
-#line 548 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 133:
+#line 551 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = 0;
   ;}
     break;
 
-  case 133:
-#line 551 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 134:
+#line 554 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -2531,24 +2543,24 @@ yyreduce:
   ;}
     break;
 
-  case 134:
-#line 556 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 135:
+#line 559 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "module asm " << " " << *(yyvsp[0].String) << "\n";
     (yyval.String) = 0;
   ;}
     break;
 
-  case 135:
-#line 560 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 136:
+#line 563 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "implementation\n";
     (yyval.String) = 0;
   ;}
     break;
 
-  case 137:
-#line 567 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 138:
+#line 570 "/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();
@@ -2556,8 +2568,8 @@ yyreduce:
   ;}
     break;
 
-  case 138:
-#line 572 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 139:
+#line 575 "/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);
@@ -2565,8 +2577,8 @@ yyreduce:
   ;}
     break;
 
-  case 139:
-#line 577 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 140:
+#line 580 "/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); 
@@ -2574,8 +2586,8 @@ yyreduce:
   ;}
     break;
 
-  case 140:
-#line 582 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 141:
+#line 585 "/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";
@@ -2584,18 +2596,8 @@ yyreduce:
   ;}
     break;
 
-  case 141:
-#line 588 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *O << *(yyvsp[-4].String) << " " << *(yyvsp[-3].String) << " " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy 
-       << " " << *(yyvsp[0].String) << "\n";
-    delete (yyvsp[-4].String); delete (yyvsp[-3].String); delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
-    (yyval.String) = 0;
-  ;}
-    break;
-
   case 142:
-#line 594 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 591 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[-4].String) << " " << *(yyvsp[-3].String) << " " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy 
        << " " << *(yyvsp[0].String) << "\n";
@@ -2605,7 +2607,7 @@ yyreduce:
     break;
 
   case 143:
-#line 600 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#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";
@@ -2615,7 +2617,17 @@ yyreduce:
     break;
 
   case 144:
-#line 606 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#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";
+    delete (yyvsp[-4].String); delete (yyvsp[-3].String); delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
+    (yyval.String) = 0;
+  ;}
+    break;
+
+  case 145:
+#line 609 "/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);
@@ -2623,8 +2635,8 @@ yyreduce:
   ;}
     break;
 
-  case 145:
-#line 611 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 146:
+#line 614 "/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);
@@ -2632,15 +2644,15 @@ yyreduce:
   ;}
     break;
 
-  case 146:
-#line 616 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 147:
+#line 619 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyval.String) = 0;
   ;}
     break;
 
-  case 150:
-#line 626 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 151:
+#line 629 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -2648,8 +2660,8 @@ yyreduce:
   ;}
     break;
 
-  case 151:
-#line 631 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 152:
+#line 634 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
     if (*(yyvsp[0].String) == "64")
@@ -2659,17 +2671,8 @@ yyreduce:
   ;}
     break;
 
-  case 152:
-#line 638 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
-    delete (yyvsp[0].String);
-    (yyval.String) = (yyvsp[-2].String);
-  ;}
-    break;
-
   case 153:
-#line 643 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 641 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -2678,7 +2681,16 @@ yyreduce:
     break;
 
   case 154:
-#line 650 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 646 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
+    delete (yyvsp[0].String);
+    (yyval.String) = (yyvsp[-2].String);
+  ;}
+    break;
+
+  case 155:
+#line 653 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-1].String)->insert(0, "[ ");
     *(yyvsp[-1].String) += " ]";
@@ -2686,8 +2698,8 @@ yyreduce:
   ;}
     break;
 
-  case 155:
-#line 657 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 156:
+#line 660 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -2695,20 +2707,20 @@ yyreduce:
   ;}
     break;
 
-  case 157:
-#line 663 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 158:
+#line 666 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = new std::string();
   ;}
     break;
 
-  case 161:
-#line 672 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 162:
+#line 675 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 162:
-#line 674 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 163:
+#line 677 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
   (yyval.String) = (yyvsp[-1].Type).newTy;
   if (!(yyvsp[0].String)->empty())
@@ -2717,23 +2729,16 @@ yyreduce:
 ;}
     break;
 
-  case 163:
-#line 681 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 164:
+#line 684 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
   ;}
     break;
 
-  case 164:
-#line 685 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    (yyval.String) = (yyvsp[0].String);
-  ;}
-    break;
-
   case 165:
-#line 689 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 688 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].String);
   ;}
@@ -2741,6 +2746,13 @@ yyreduce:
 
   case 166:
 #line 692 "/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"
     {
     *(yyvsp[-2].String) += ", ...";
     (yyval.String) = (yyvsp[-2].String);
@@ -2748,20 +2760,20 @@ yyreduce:
   ;}
     break;
 
-  case 167:
-#line 697 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 168:
+#line 700 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].String);
   ;}
     break;
 
-  case 168:
-#line 700 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 169:
+#line 703 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 169:
-#line 703 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 170:
+#line 706 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-7].String)->empty()) {
       *(yyvsp[-7].String) += " ";
@@ -2782,22 +2794,22 @@ yyreduce:
   ;}
     break;
 
-  case 170:
-#line 722 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 171:
+#line 725 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = new std::string("begin");
   ;}
     break;
 
-  case 171:
-#line 725 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 172:
+#line 728 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyval.String) = new std::string ("{");
   ;}
     break;
 
-  case 172:
-#line 729 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 173:
+#line 732 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
   if (!(yyvsp[-2].String)->empty()) {
     *O << *(yyvsp[-2].String) << " ";
@@ -2808,18 +2820,18 @@ yyreduce:
 ;}
     break;
 
-  case 173:
-#line 738 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 174:
+#line 741 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string("end"); ;}
     break;
 
-  case 174:
-#line 739 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 175:
+#line 742 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string("}"); ;}
     break;
 
-  case 175:
-#line 741 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 176:
+#line 744 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
   if ((yyvsp[-1].String))
     *O << *(yyvsp[-1].String);
@@ -2828,13 +2840,13 @@ yyreduce:
 ;}
     break;
 
-  case 176:
-#line 749 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 177:
+#line 752 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 179:
-#line 755 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 180:
+#line 758 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     if (!(yyvsp[-1].String)->empty())
       *(yyvsp[-2].String) += " " + *(yyvsp[-1].String);
@@ -2845,13 +2857,13 @@ yyreduce:
   ;}
     break;
 
-  case 180:
-#line 768 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 181:
+#line 771 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 190:
-#line 774 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 191:
+#line 777 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyvsp[-1].String)->insert(0, "<");
     *(yyvsp[-1].String) += ">";
@@ -2859,8 +2871,8 @@ yyreduce:
   ;}
     break;
 
-  case 192:
-#line 780 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 193:
+#line 783 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-3].String)->empty()) {
       *(yyvsp[-4].String) += " " + *(yyvsp[-3].String);
@@ -2871,8 +2883,8 @@ yyreduce:
   ;}
     break;
 
-  case 197:
-#line 798 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 198:
+#line 801 "/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 + " ");
@@ -2881,29 +2893,29 @@ yyreduce:
   ;}
     break;
 
-  case 198:
-#line 805 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    (yyval.String) = 0;
-  ;}
-    break;
-
   case 199:
 #line 808 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    { // Do not allow functions with 0 basic blocks   
+    {
     (yyval.String) = 0;
   ;}
     break;
 
   case 200:
-#line 816 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    {
+#line 811 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+    { // Do not allow functions with 0 basic blocks   
     (yyval.String) = 0;
   ;}
     break;
 
   case 201:
-#line 820 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 819 "/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"
     {
     *O << "    " << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -2911,15 +2923,15 @@ yyreduce:
   ;}
     break;
 
-  case 202:
-#line 825 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 203:
+#line 828 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = 0;
   ;}
     break;
 
-  case 203:
-#line 828 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 204:
+#line 831 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -2927,8 +2939,8 @@ yyreduce:
   ;}
     break;
 
-  case 204:
-#line 834 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 205:
+#line 837 "/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();
@@ -2936,8 +2948,8 @@ yyreduce:
   ;}
     break;
 
-  case 205:
-#line 839 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 206:
+#line 842 "/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();
@@ -2945,8 +2957,8 @@ yyreduce:
   ;}
     break;
 
-  case 206:
-#line 844 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 207:
+#line 847 "/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);
@@ -2954,8 +2966,8 @@ yyreduce:
   ;}
     break;
 
-  case 207:
-#line 849 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 208:
+#line 852 "/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";
@@ -2965,8 +2977,8 @@ yyreduce:
   ;}
     break;
 
-  case 208:
-#line 856 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 209:
+#line 859 "/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";
@@ -2975,8 +2987,8 @@ yyreduce:
   ;}
     break;
 
-  case 209:
-#line 862 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 210:
+#line 865 "/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";
@@ -2985,8 +2997,8 @@ yyreduce:
   ;}
     break;
 
-  case 210:
-#line 869 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 211:
+#line 872 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "    ";
     if (!(yyvsp[-13].String)->empty())
@@ -3001,17 +3013,8 @@ yyreduce:
   ;}
     break;
 
-  case 211:
-#line 881 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *O << "    " << *(yyvsp[0].String) << "\n";
-    delete (yyvsp[0].String);
-    (yyval.String) = 0;
-  ;}
-    break;
-
   case 212:
-#line 886 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 884 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "    " << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -3020,7 +3023,16 @@ yyreduce:
     break;
 
   case 213:
-#line 892 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 889 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *O << "    " << *(yyvsp[0].String) << "\n";
+    delete (yyvsp[0].String);
+    (yyval.String) = 0;
+  ;}
+    break;
+
+  case 214:
+#line 895 "/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);
@@ -3028,8 +3040,8 @@ yyreduce:
   ;}
     break;
 
-  case 214:
-#line 897 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 215:
+#line 900 "/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);
@@ -3038,8 +3050,8 @@ yyreduce:
   ;}
     break;
 
-  case 215:
-#line 905 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 216:
+#line 908 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -3047,8 +3059,8 @@ yyreduce:
   ;}
     break;
 
-  case 216:
-#line 912 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 217:
+#line 915 "/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) + "]";
@@ -3057,8 +3069,8 @@ yyreduce:
   ;}
     break;
 
-  case 217:
-#line 918 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 218:
+#line 921 "/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);
@@ -3066,13 +3078,13 @@ yyreduce:
   ;}
     break;
 
-  case 218:
-#line 926 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 219:
+#line 929 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(*(yyvsp[0].Value).val); (yyvsp[0].Value).destroy(); ;}
     break;
 
-  case 219:
-#line 927 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 220:
+#line 930 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].Value).val;
     (yyvsp[0].Value).destroy();
@@ -3080,13 +3092,13 @@ yyreduce:
   ;}
     break;
 
-  case 221:
-#line 936 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 222:
+#line 939 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 222:
-#line 940 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 223:
+#line 943 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -3094,17 +3106,8 @@ yyreduce:
   ;}
     break;
 
-  case 224:
-#line 948 "/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);
-    (yyval.String) = (yyvsp[-4].String);
-  ;}
-    break;
-
   case 225:
-#line 953 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 951 "/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);
@@ -3113,7 +3116,7 @@ yyreduce:
     break;
 
   case 226:
-#line 958 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 956 "/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);
@@ -3122,7 +3125,16 @@ yyreduce:
     break;
 
   case 227:
-#line 963 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 961 "/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);
+    (yyval.String) = (yyvsp[-4].String);
+  ;}
+    break;
+
+  case 228:
+#line 966 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val;
     (yyvsp[0].Value).destroy();
@@ -3130,17 +3142,20 @@ yyreduce:
   ;}
     break;
 
-  case 228:
-#line 968 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 229:
+#line 971 "/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();
-    (yyval.String) = (yyvsp[-3].String);
+    const char* shiftop = (yyvsp[-3].String)->c_str();
+    if (*(yyvsp[-3].String) == "shr")
+      shiftop = ((yyvsp[-2].Value).type.isUnsigned()) ? "lshr" : "ashr";
+    (yyval.String) = new std::string(shiftop);
+    *(yyval.String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
+    delete (yyvsp[-3].String); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
   ;}
     break;
 
-  case 229:
-#line 973 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 230:
+#line 979 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     const char *opcode = getCastOpcode((yyvsp[-2].Value).type, (yyvsp[0].Type));
     (yyval.String) = new std::string(opcode);
@@ -3150,8 +3165,8 @@ yyreduce:
   ;}
     break;
 
-  case 230:
-#line 980 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 231:
+#line 986 "/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();
@@ -3159,8 +3174,8 @@ yyreduce:
   ;}
     break;
 
-  case 231:
-#line 985 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 232:
+#line 991 "/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();
@@ -3168,8 +3183,8 @@ yyreduce:
   ;}
     break;
 
-  case 232:
-#line 990 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 233:
+#line 996 "/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();
@@ -3177,17 +3192,8 @@ yyreduce:
   ;}
     break;
 
-  case 233:
-#line 995 "/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();
-    (yyval.String) = (yyvsp[-5].String);
-  ;}
-    break;
-
   case 234:
-#line 1000 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1001 "/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();
@@ -3196,7 +3202,16 @@ yyreduce:
     break;
 
   case 235:
-#line 1005 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1006 "/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();
+    (yyval.String) = (yyvsp[-5].String);
+  ;}
+    break;
+
+  case 236:
+#line 1011 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -3204,8 +3219,8 @@ yyreduce:
   ;}
     break;
 
-  case 236:
-#line 1010 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 237:
+#line 1016 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-5].String)->empty())
       *(yyvsp[-6].String) += " " + *(yyvsp[-5].String);
@@ -3217,26 +3232,26 @@ yyreduce:
   ;}
     break;
 
-  case 238:
-#line 1024 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 239:
+#line 1030 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyvsp[0].String)->insert(0, ", ");
     (yyval.String) = (yyvsp[0].String);
   ;}
     break;
 
-  case 239:
-#line 1028 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 240:
+#line 1034 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {  (yyval.String) = new std::string(); ;}
     break;
 
-  case 241:
-#line 1033 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 242:
+#line 1039 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 242:
-#line 1036 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 243:
+#line 1042 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy;
     if (!(yyvsp[0].String)->empty())
@@ -3246,30 +3261,8 @@ yyreduce:
   ;}
     break;
 
-  case 243:
-#line 1043 "/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())
-      *(yyvsp[-5].String) += " " + *(yyvsp[0].String);
-    (yyvsp[-4].Type).destroy(); (yyvsp[-2].Type).destroy(); delete (yyvsp[-1].String); delete (yyvsp[0].String);
-    (yyval.String) = (yyvsp[-5].String);
-  ;}
-    break;
-
   case 244:
-#line 1050 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy;
-    if (!(yyvsp[0].String)->empty())
-      *(yyvsp[-2].String) += " " + *(yyvsp[0].String);
-    (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
-    (yyval.String) = (yyvsp[-2].String);
-  ;}
-    break;
-
-  case 245:
-#line 1057 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1049 "/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())
@@ -3279,8 +3272,30 @@ yyreduce:
   ;}
     break;
 
+  case 245:
+#line 1056 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy;
+    if (!(yyvsp[0].String)->empty())
+      *(yyvsp[-2].String) += " " + *(yyvsp[0].String);
+    (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
+    (yyval.String) = (yyvsp[-2].String);
+  ;}
+    break;
+
   case 246:
-#line 1064 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1063 "/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())
+      *(yyvsp[-5].String) += " " + *(yyvsp[0].String);
+    (yyvsp[-4].Type).destroy(); (yyvsp[-2].Type).destroy(); delete (yyvsp[-1].String); delete (yyvsp[0].String);
+    (yyval.String) = (yyvsp[-5].String);
+  ;}
+    break;
+
+  case 247:
+#line 1070 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val;
     (yyvsp[0].Value).destroy();
@@ -3288,8 +3303,8 @@ yyreduce:
   ;}
     break;
 
-  case 247:
-#line 1069 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 248:
+#line 1075 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-3].String)->empty())
       *(yyvsp[-3].String) += " ";
@@ -3299,8 +3314,8 @@ yyreduce:
   ;}
     break;
 
-  case 248:
-#line 1076 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 249:
+#line 1082 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-5].String)->empty())
       *(yyvsp[-5].String) += " ";
@@ -3310,8 +3325,8 @@ yyreduce:
   ;}
     break;
 
-  case 249:
-#line 1083 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+  case 250:
+#line 1089 "/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);
@@ -3324,7 +3339,7 @@ yyreduce:
     }
 
 /* Line 1126 of yacc.c.  */
-#line 3328 "UpgradeParser.tab.c"
+#line 3343 "UpgradeParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -3592,7 +3607,7 @@ yyreturn:
 }
 
 
-#line 1089 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1095 "/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 26ab73d61c0..b1335d51892 100644
--- a/tools/llvm-upgrade/UpgradeParser.h
+++ b/tools/llvm-upgrade/UpgradeParser.h
@@ -131,13 +131,14 @@
      PHI_TOK = 357,
      SELECT = 358,
      SHL = 359,
-     LSHR = 360,
+     SHR = 360,
      ASHR = 361,
-     VAARG = 362,
-     EXTRACTELEMENT = 363,
-     INSERTELEMENT = 364,
-     SHUFFLEVECTOR = 365,
-     CAST = 366
+     LSHR = 362,
+     VAARG = 363,
+     EXTRACTELEMENT = 364,
+     INSERTELEMENT = 365,
+     SHUFFLEVECTOR = 366,
+     CAST = 367
    };
 #endif
 /* Tokens.  */
@@ -243,13 +244,14 @@
 #define PHI_TOK 357
 #define SELECT 358
 #define SHL 359
-#define LSHR 360
+#define SHR 360
 #define ASHR 361
-#define VAARG 362
-#define EXTRACTELEMENT 363
-#define INSERTELEMENT 364
-#define SHUFFLEVECTOR 365
-#define CAST 366
+#define LSHR 362
+#define VAARG 363
+#define EXTRACTELEMENT 364
+#define INSERTELEMENT 365
+#define SHUFFLEVECTOR 366
+#define CAST 367
 
 
 
@@ -263,7 +265,7 @@ typedef union YYSTYPE {
   ConstInfo       Const;
 } YYSTYPE;
 /* Line 1447 of yacc.c.  */
-#line 267 "UpgradeParser.tab.h"
+#line 269 "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 26ab73d61c0..b1335d51892 100644
--- a/tools/llvm-upgrade/UpgradeParser.h.cvs
+++ b/tools/llvm-upgrade/UpgradeParser.h.cvs
@@ -131,13 +131,14 @@
      PHI_TOK = 357,
      SELECT = 358,
      SHL = 359,
-     LSHR = 360,
+     SHR = 360,
      ASHR = 361,
-     VAARG = 362,
-     EXTRACTELEMENT = 363,
-     INSERTELEMENT = 364,
-     SHUFFLEVECTOR = 365,
-     CAST = 366
+     LSHR = 362,
+     VAARG = 363,
+     EXTRACTELEMENT = 364,
+     INSERTELEMENT = 365,
+     SHUFFLEVECTOR = 366,
+     CAST = 367
    };
 #endif
 /* Tokens.  */
@@ -243,13 +244,14 @@
 #define PHI_TOK 357
 #define SELECT 358
 #define SHL 359
-#define LSHR 360
+#define SHR 360
 #define ASHR 361
-#define VAARG 362
-#define EXTRACTELEMENT 363
-#define INSERTELEMENT 364
-#define SHUFFLEVECTOR 365
-#define CAST 366
+#define LSHR 362
+#define VAARG 363
+#define EXTRACTELEMENT 364
+#define INSERTELEMENT 365
+#define SHUFFLEVECTOR 366
+#define CAST 367
 
 
 
@@ -263,7 +265,7 @@ typedef union YYSTYPE {
   ConstInfo       Const;
 } YYSTYPE;
 /* Line 1447 of yacc.c.  */
-#line 267 "UpgradeParser.tab.h"
+#line 269 "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 77cdb41322a..45749777c63 100644
--- a/tools/llvm-upgrade/UpgradeParser.y
+++ b/tools/llvm-upgrade/UpgradeParser.y
@@ -153,7 +153,7 @@ const char* getCastOpcode(TypeInfo& SrcTy, TypeInfo&DstTy) {
 %token <String> ADD SUB MUL UDIV SDIV FDIV UREM SREM FREM AND OR XOR
 %token <String> SETLE SETGE SETLT SETGT SETEQ SETNE  // Binary Comparators
 %token <String> MALLOC ALLOCA FREE LOAD STORE GETELEMENTPTR
-%token <String> PHI_TOK SELECT SHL LSHR ASHR VAARG
+%token <String> PHI_TOK SELECT SHL SHR ASHR LSHR VAARG
 %token <String> EXTRACTELEMENT INSERTELEMENT SHUFFLEVECTOR
 %token <String> CAST
 
@@ -193,7 +193,7 @@ EInt64Val : ESINT64VAL | EUINT64VAL;
 ArithmeticOps: ADD | SUB | MUL | UDIV | SDIV | FDIV | UREM | SREM | FREM;
 LogicalOps   : AND | OR | XOR;
 SetCondOps   : SETLE | SETGE | SETLT | SETGT | SETEQ | SETNE;
-ShiftOps     : SHL | LSHR | ASHR;
+ShiftOps     : SHL | SHR | ASHR | LSHR;
 
 // These are some types that allow classification if we only want a particular 
 // thing... for example, only a signed, unsigned, or integral type.
@@ -496,9 +496,12 @@ ConstExpr: CAST '(' ConstVal TO Types ')' {
     $$ = $1;
   }
   | ShiftOps '(' ConstVal ',' ConstVal ')' {
-    *$1 += "(" + *$3.cnst + "," + *$5.cnst + ")";
-    $3.destroy(); $5.destroy();
-    $$ = $1;
+    const char* shiftop = $1->c_str();
+    if (*$1 == "shr")
+      shiftop = ($3.type.isUnsigned()) ? "lshr" : "ashr";
+    $$ = new std::string(shiftop);
+    *$$ += "(" + *$3.cnst + "," + *$5.cnst + ")";
+    delete $1; $3.destroy(); $5.destroy();
   }
   | EXTRACTELEMENT '(' ConstVal ',' ConstVal ')' {
     *$1 += "(" + *$3.cnst + "," + *$5.cnst + ")";
@@ -966,9 +969,12 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef {
     $$ = $1;
   }
   | ShiftOps ResolvedVal ',' ResolvedVal {
-    *$1 += " " + *$2.val + ", " + *$4.val;
-    $2.destroy(); $4.destroy();
-    $$ = $1;
+    const char* shiftop = $1->c_str();
+    if (*$1 == "shr")
+      shiftop = ($2.type.isUnsigned()) ? "lshr" : "ashr";
+    $$ = new std::string(shiftop);
+    *$$ += " " + *$2.val + ", " + *$4.val;
+    delete $1; $2.destroy(); $4.destroy();
   }
   | CAST ResolvedVal TO Types {
     const char *opcode = getCastOpcode($2.type, $4);
diff --git a/tools/llvm-upgrade/UpgradeParser.y.cvs b/tools/llvm-upgrade/UpgradeParser.y.cvs
index 77cdb41322a..45749777c63 100644
--- a/tools/llvm-upgrade/UpgradeParser.y.cvs
+++ b/tools/llvm-upgrade/UpgradeParser.y.cvs
@@ -153,7 +153,7 @@ const char* getCastOpcode(TypeInfo& SrcTy, TypeInfo&DstTy) {
 %token <String> ADD SUB MUL UDIV SDIV FDIV UREM SREM FREM AND OR XOR
 %token <String> SETLE SETGE SETLT SETGT SETEQ SETNE  // Binary Comparators
 %token <String> MALLOC ALLOCA FREE LOAD STORE GETELEMENTPTR
-%token <String> PHI_TOK SELECT SHL LSHR ASHR VAARG
+%token <String> PHI_TOK SELECT SHL SHR ASHR LSHR VAARG
 %token <String> EXTRACTELEMENT INSERTELEMENT SHUFFLEVECTOR
 %token <String> CAST
 
@@ -193,7 +193,7 @@ EInt64Val : ESINT64VAL | EUINT64VAL;
 ArithmeticOps: ADD | SUB | MUL | UDIV | SDIV | FDIV | UREM | SREM | FREM;
 LogicalOps   : AND | OR | XOR;
 SetCondOps   : SETLE | SETGE | SETLT | SETGT | SETEQ | SETNE;
-ShiftOps     : SHL | LSHR | ASHR;
+ShiftOps     : SHL | SHR | ASHR | LSHR;
 
 // These are some types that allow classification if we only want a particular 
 // thing... for example, only a signed, unsigned, or integral type.
@@ -496,9 +496,12 @@ ConstExpr: CAST '(' ConstVal TO Types ')' {
     $$ = $1;
   }
   | ShiftOps '(' ConstVal ',' ConstVal ')' {
-    *$1 += "(" + *$3.cnst + "," + *$5.cnst + ")";
-    $3.destroy(); $5.destroy();
-    $$ = $1;
+    const char* shiftop = $1->c_str();
+    if (*$1 == "shr")
+      shiftop = ($3.type.isUnsigned()) ? "lshr" : "ashr";
+    $$ = new std::string(shiftop);
+    *$$ += "(" + *$3.cnst + "," + *$5.cnst + ")";
+    delete $1; $3.destroy(); $5.destroy();
   }
   | EXTRACTELEMENT '(' ConstVal ',' ConstVal ')' {
     *$1 += "(" + *$3.cnst + "," + *$5.cnst + ")";
@@ -966,9 +969,12 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef {
     $$ = $1;
   }
   | ShiftOps ResolvedVal ',' ResolvedVal {
-    *$1 += " " + *$2.val + ", " + *$4.val;
-    $2.destroy(); $4.destroy();
-    $$ = $1;
+    const char* shiftop = $1->c_str();
+    if (*$1 == "shr")
+      shiftop = ($2.type.isUnsigned()) ? "lshr" : "ashr";
+    $$ = new std::string(shiftop);
+    *$$ += " " + *$2.val + ", " + *$4.val;
+    delete $1; $2.destroy(); $4.destroy();
   }
   | CAST ResolvedVal TO Types {
     const char *opcode = getCastOpcode($2.type, $4);