Regenerate.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32128 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/llvm-upgrade/UpgradeLexer.cpp.cvs b/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
index f01fa15..04174a6 100644
--- a/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
+++ b/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
@@ -317,36 +317,36 @@
 	*yy_cp = '\0'; \
 	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 130
-#define YY_END_OF_BUFFER 131
-static yyconst short int yy_acclist[208] =
+#define YY_NUM_RULES 131
+#define YY_END_OF_BUFFER 132
+static yyconst short int yy_acclist[209] =
     {   0,
-      131,  129,  130,  128,  129,  130,  128,  130,  129,  130,
-      129,  130,  129,  130,  129,  130,  129,  130,  129,  130,
-      121,  129,  130,  121,  129,  130,    1,  129,  130,  129,
-      130,  129,  130,  129,  130,  129,  130,  129,  130,  129,
-      130,  129,  130,  129,  130,  129,  130,  129,  130,  129,
-      130,  129,  130,  129,  130,  129,  130,  129,  130,  129,
-      130,  129,  130,  129,  130,  129,  130,  129,  130,  129,
-      130,  120,  118,  117,  117,  124,  122,  126,  121,    1,
-      102,   38,   72,   22,  120,  117,  117,  125,  126,   19,
-      126,  127,   60,   71,   36,   31,   39,   63,    3,   51,
+      132,  130,  131,  129,  130,  131,  129,  131,  130,  131,
+      130,  131,  130,  131,  130,  131,  130,  131,  130,  131,
+      122,  130,  131,  122,  130,  131,    1,  130,  131,  130,
+      131,  130,  131,  130,  131,  130,  131,  130,  131,  130,
+      131,  130,  131,  130,  131,  130,  131,  130,  131,  130,
+      131,  130,  131,  130,  131,  130,  131,  130,  131,  130,
+      131,  130,  131,  130,  131,  130,  131,  130,  131,  130,
+      131,  121,  119,  118,  118,  125,  123,  127,  122,    1,
+      103,   39,   73,   23,  121,  118,  118,  126,  127,   20,
+      127,  128,   61,   72,   37,   32,   40,   64,    3,   52,
 
-       62,   80,   67,  101,   96,   97,   61,   73,  119,  126,
-      126,   98,   46,   81,   82,   66,  110,   70,  111,   53,
-       99,   21,  123,   65,   85,   69,   23,    4,   59,   64,
-       52,   68,   45,   11,   84,  126,   33,    2,    5,   55,
-       87,   57,   47,   75,   79,   77,   78,   76,   74,   49,
-      112,   83,   48,   54,   20,  109,   42,   56,   27,  106,
-       41,   89,   88,    7,  104,   30,  108,   35,   58,   95,
-       91,  103,   24,   25,   90,  105,   50,  100,   94,   40,
-        6,   26,   86,   34,    8,   16,    9,   93,   10,   92,
-       32,   12,   14,   13,   29,   37,   15,   28,  107,  113,
+       63,   81,   68,  102,   97,   98,   62,   74,  120,  127,
+      127,   99,   47,   82,   83,   67,  111,   71,  112,   54,
+      100,   22,  124,   66,   86,   70,   24,    4,   60,   65,
+       53,   69,   46,   11,   85,  127,   34,    2,    5,   56,
+       88,   58,   48,   76,   80,   78,   79,   77,   75,   50,
+      113,   84,   49,   55,   21,  110,   43,   57,   28,  107,
+       42,   90,   89,    7,  105,   31,  109,   36,   59,   96,
+       92,  104,   25,   26,   91,  106,   51,  101,   95,   41,
+        6,   27,   87,   35,    8,   16,    9,   94,   10,   93,
+       33,   12,   14,   13,   30,   38,   15,   29,  108,  114,
 
-      115,  116,   43,  114,   17,   44,   18
+      116,  117,   17,   44,  115,   18,   45,   19
     } ;
 
-static yyconst short int yy_accept[557] =
+static yyconst short int yy_accept[568] =
     {   0,
         1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
        17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
@@ -372,43 +372,44 @@
 
       108,  108,  108,  108,  108,  108,  108,  108,  108,  108,
       108,  108,  108,  108,  108,  108,  108,  108,  108,  108,
-      108,  109,  109,  109,  110,  111,  111,  111,  111,  112,
-      112,  112,  112,  113,  113,  113,  114,  115,  116,  116,
+      108,  108,  109,  109,  109,  110,  111,  111,  111,  111,
+      112,  112,  112,  112,  113,  113,  113,  114,  115,  116,
       116,  116,  116,  116,  116,  116,  116,  116,  116,  116,
-      116,  116,  116,  116,  117,  117,  117,  117,  117,  118,
-      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-      119,  120,  121,  122,  122,  122,  123,  123,  123,  123,
-      124,  124,  125,  125,  125,  125,  125,  125,  125,  126,
-      126,  126,  126,  126,  127,  127,  127,  128,  128,  128,
+      116,  116,  116,  116,  116,  117,  117,  117,  117,  117,
+      118,  119,  119,  119,  119,  119,  119,  119,  119,  119,
+      119,  119,  120,  121,  122,  122,  122,  123,  123,  123,
+      123,  124,  124,  125,  125,  125,  125,  125,  125,  125,
+      126,  126,  126,  126,  126,  127,  127,  127,  128,  128,
 
-      129,  129,  130,  130,  131,  132,  132,  132,  132,  132,
-      132,  133,  133,  133,  134,  134,  135,  135,  135,  136,
-      137,  138,  138,  138,  139,  139,  139,  139,  139,  139,
-      139,  139,  139,  139,  139,  139,  139,  139,  139,  140,
-      140,  141,  142,  142,  142,  142,  142,  142,  142,  142,
-      142,  142,  142,  143,  143,  143,  143,  143,  143,  143,
-      143,  144,  144,  144,  145,  146,  147,  148,  149,  150,
-      151,  151,  151,  151,  152,  152,  152,  152,  153,  154,
-      154,  155,  156,  156,  156,  156,  156,  156,  156,  156,
-      156,  157,  157,  157,  158,  158,  158,  158,  158,  158,
+      128,  129,  129,  130,  130,  131,  132,  132,  132,  132,
+      132,  132,  132,  133,  133,  133,  134,  134,  135,  135,
+      135,  136,  137,  138,  138,  138,  139,  139,  139,  139,
+      139,  139,  139,  139,  139,  139,  139,  139,  139,  139,
+      139,  140,  140,  141,  142,  142,  142,  142,  142,  142,
+      142,  142,  142,  142,  142,  143,  143,  143,  143,  143,
+      143,  143,  143,  144,  144,  144,  145,  146,  147,  148,
+      149,  150,  151,  151,  151,  151,  152,  152,  152,  152,
+      153,  154,  154,  155,  156,  156,  156,  156,  156,  156,
+      156,  156,  156,  156,  157,  157,  157,  158,  158,  158,
 
-      158,  158,  159,  160,  161,  161,  161,  162,  163,  164,
-      164,  164,  165,  165,  165,  165,  165,  166,  166,  167,
-      168,  169,  170,  170,  170,  170,  171,  171,  171,  172,
-      173,  174,  175,  176,  176,  177,  178,  179,  179,  179,
-      179,  179,  179,  180,  180,  181,  181,  182,  183,  183,
-      183,  183,  183,  183,  184,  184,  184,  184,  184,  184,
-      184,  184,  184,  185,  185,  185,  185,  185,  185,  185,
-      185,  185,  186,  186,  186,  186,  186,  187,  187,  187,
-      187,  187,  188,  189,  190,  190,  191,  191,  191,  191,
-      192,  192,  192,  192,  193,  193,  194,  195,  195,  195,
+      158,  158,  158,  158,  158,  159,  160,  161,  161,  161,
+      162,  163,  164,  164,  164,  165,  165,  165,  165,  165,
+      166,  166,  167,  168,  169,  170,  170,  170,  170,  171,
+      171,  171,  172,  173,  174,  175,  176,  176,  176,  177,
+      178,  179,  179,  179,  179,  179,  179,  180,  180,  181,
+      181,  182,  183,  183,  183,  183,  183,  183,  184,  184,
+      184,  184,  184,  184,  184,  184,  184,  185,  185,  185,
+      185,  185,  185,  185,  185,  185,  185,  186,  186,  186,
+      186,  186,  187,  187,  187,  187,  187,  188,  189,  190,
+      190,  191,  191,  191,  191,  191,  192,  192,  192,  192,
 
-      195,  195,  195,  195,  195,  195,  195,  195,  195,  195,
-      196,  196,  196,  196,  196,  196,  196,  196,  197,  197,
-      197,  197,  197,  198,  198,  198,  198,  198,  199,  199,
+      193,  193,  194,  195,  195,  195,  195,  195,  195,  195,
+      195,  195,  195,  195,  195,  195,  195,  196,  196,  196,
+      196,  196,  196,  196,  196,  197,  197,  197,  197,  197,
+      197,  198,  198,  198,  198,  198,  199,  199,  199,  200,
       200,  200,  200,  200,  200,  200,  200,  200,  200,  200,
-      200,  200,  200,  201,  201,  202,  203,  203,  204,  204,
-      205,  206,  207,  207,  208,  208
+      200,  200,  200,  201,  201,  202,  203,  204,  204,  205,
+      205,  206,  207,  208,  208,  209,  209
     } ;
 
 static yyconst int yy_ec[256] =
@@ -452,137 +453,141 @@
         3,    3,    3
     } ;
 
-static yyconst short int yy_base[561] =
+static yyconst short int yy_base[572] =
     {   0,
-        0,    0, 1200, 1201, 1201, 1201, 1195, 1184,   36,   40,
+        0,    0, 1222, 1223, 1223, 1223, 1217, 1206,   36,   40,
        44,   50,   56,   62,    0,   63,   66,   81,   89,   47,
       100,   97,   76,   96,  111,   46,   48,  110,   68,  140,
-      126,  171,  120,  123,   73,  130, 1193, 1201, 1182, 1201,
+      126,  171,  120,  123,   73,  130, 1215, 1223, 1204, 1223,
         0,  159,  176,  199,  204,   95,  209,  224,  229,    0,
-      134,  165,  137,  124,  169,  151,  159,   31, 1181,  168,
+      134,  165,  137,  124,  169,  151,  159,   31, 1203,  168,
       210,  230,  233,  127,  241,  189,  176,  117,  242,  244,
       240,  243,  246,  249,  252,  253,  257,  259,  263,  265,
-      266,  274,  268,  269,  273,  277,  282,  211, 1180,  287,
+      266,  274,  268,  269,  273,  277,  282,  211, 1202,  287,
       290,  293,  294,  160,  270,  295,  304,  305,  299,  306,
 
-      312,  296,  321,  324, 1179,  325,  309,  313,  333,  335,
-      318,  339,  342,  332,  350,  340,  343,  215,  356,  357,
-     1178,    0,  365,  370, 1177,  389,  406,    0, 1176,  359,
-      372, 1175,  371,  374, 1174,  381, 1173,  375,  301,  376,
-      393, 1172,  401,  396,  408,  407,  410,  411, 1171,  414,
-      413,  415,  420,  421,  422,  424,  431,  432,  433,  434,
-      441,  436,  440,  438,  439,  449,  443,  454,  383,  451,
-      459,  462,  464,  465,  466, 1170,  468,  469, 1169,  470,
-      471, 1168, 1167,  499,  476,  475,  488,  477,  503,  492,
-     1166,  510, 1165,  481,  484,  516,  513,  517, 1164,  519,
+      312,  296,  321,  324, 1201,  325,  309,  313,  333,  335,
+      318,  340,  342,  332,  339,  347,  350,  215,  354,  356,
+     1200,    0,  371,  375, 1199,  389,  406,    0, 1198,  365,
+      363, 1197,  382,  359, 1196,  394, 1195,  357,  301,  393,
+      390, 1194,  401,  395,  410,  411,  397,  414, 1193,  415,
+      420,  418,  421,  423,  425,  422,  427,  433,  434,  435,
+      439,  437,  436,  443,  440,  441,  451,  454,  457,  459,
+      460,  462,  465,  466,  467, 1192,  470,  472, 1191,  379,
+      474, 1190, 1189,  502,  479,  478,  483,  475,  513,  493,
+     1188,  494, 1187,  477,  480,  496,  517,  518, 1186,  519,
 
-      521,  522,  524,  523,  526,  525,  527,  528,  537,  530,
-      541,  544,  545,  546,  539,  549,  556,  560,  559,  478,
-     1163,  561,  563, 1201,  571,  591,  579,  595,  600,  566,
-      601,  602, 1162,  603,  604, 1161, 1160, 1159,  605,  606,
-      607,  610,  611,  613,  614,  615,  617,  618,  621,  622,
-      628,  572,  627, 1158,  624,  635,  637,  636, 1157, 1156,
-      638,  639,  642,  645,  646,  650,  648,  649,  652,  654,
-     1155, 1154, 1153,  655,  656, 1152,  657,  663,  665,    0,
-      675, 1151,  672,  680,  674,  679,  682,  689, 1150,  676,
-      690,  692,  693, 1149,  695,  706, 1148,  707,  696, 1147,
+      520,  521,  476,  527,  525,  523,  526,  529,  531,  537,
+      538,  540,  541,  543,  545,  548,  553,  555,  559,  560,
+      565, 1185,  562,  567, 1223,  574,  588,  595,  599,  604,
+      588,  568,  589, 1184,  607,  608, 1183, 1182, 1181,  609,
+      610,  611,  612,  614,  615,  617,  620,  622,  618,  621,
+      625,  626,  629,  632, 1180,  630,  635,  641,  642, 1179,
+     1178,  645,  643,  647,  649,  650,  651,  654,  652,  655,
+      657, 1177, 1176, 1175,  659,  661, 1174,  662,  664,  674,
+        0,  675, 1173,  678,  681,  679,  680,  685,  693, 1172,
+      682,  690,  695,  696, 1171,  698,  709, 1170,  701,  697,
 
-      708, 1146,  709, 1145, 1144,  710,  571,  712,  714,  717,
-     1143,  721,  723, 1142,  724, 1141,  726,  725, 1140,  731,
-     1139,  732,  731, 1138,  733,  743,  735,  745,  741,  749,
-      751,  678,  753,  754,  756,  758,  759,  760, 1137,  761,
-     1136, 1135,  762,  764,  765,  769,  771,  774,  766,  779,
-      780,  783, 1134,  784,  785,  788,  791,  793,  797,  798,
-     1133,  787,  803, 1132, 1131, 1130, 1129, 1128, 1127, 1126,
-      804,  807,  808, 1125,  809,  810,  813, 1124, 1123,  812,
-     1122, 1121,  816,  820,  814,  818,  825,  830,  824,  815,
-     1120,  836,  834, 1119,  839,  841,  840,  842,  843,  844,
+     1169,  711, 1168,  713, 1167, 1166,  714,  715,  717,  719,
+      720,  721, 1165,  723,  728, 1164,  729, 1163,  731,  730,
+     1162,  737, 1161,  737,  739, 1160,  740,  748,  745,  751,
+      754,  746,  757,  756,  760,  761,  764,  765,  766,  769,
+     1159,  771, 1158, 1157,  772,  773,  774,  768,  780,  782,
+      784,  787,  789,  790, 1156,  792,  793,  794,  796,  797,
+      803,  800, 1155,  810,  811, 1154, 1153, 1152, 1151, 1150,
+     1149, 1148,  814,  815,  816, 1147,  818,  817,  822, 1146,
+     1145,  819, 1144, 1143,  820,  826,  824,  821,  836,  837,
+      841,  839,  842, 1142,  845,  848, 1141,  849,  853,  823,
 
-      845, 1118, 1117, 1116,  850,  846, 1115, 1114, 1113,  852,
-      858, 1112,  861,  864,  866,  853, 1111,  860, 1110, 1109,
-     1108, 1107,  872,  875,  877, 1106,  878,  879, 1105, 1104,
-     1103, 1102, 1101,  883, 1100, 1099, 1098,  881,  880,  882,
-      884,  886, 1097,  885, 1096,  888, 1095, 1094,  891,  898,
-      899,  900,  901, 1093,  904,  905,  909,  911,  907,  914,
-      916,  917, 1092,  918,  920,  927,  921,  931,  934,  933,
-      935, 1091,  936,  939,  942,  944, 1090,  937,  947,  945,
-      948, 1089, 1088, 1087,  950, 1086,  949,  959,  955, 1083,
-      967,  970,  969, 1074,  971, 1072, 1071,  972,  976,  973,
+      852,  854,  855,  856, 1140, 1139, 1138,  863,  857, 1137,
+     1136, 1135,  865,  869, 1134,  870,  875,  877,  864, 1133,
+      881, 1132, 1131, 1130, 1129,  878,  883,  886, 1128,  889,
+      891, 1127, 1126, 1125, 1124, 1123,  892,  890, 1122, 1121,
+     1120,  893,  894,  896,  897,  895, 1119,  906, 1118,  907,
+     1117, 1116,  909,  911,  913,  918,  914, 1115,  915,  917,
+      920,  921,  919,  922,  926,  927, 1114,  928,  937,  938,
+      942,  945,  941,  944,  949,  952, 1113,  955,  957,  958,
+      956, 1112,  959,  960,  961,  962, 1111, 1110, 1107,  969,
+     1097,  966,  976,  970,  967, 1096,  986,  987,  978, 1095,
 
-      978,  979,  951,  981,  984,  986,  987,  989,  993, 1070,
-      991,  990,  997,  999, 1000, 1002, 1003, 1068, 1008, 1010,
-     1012, 1013, 1067, 1014, 1015, 1018, 1019, 1066, 1021, 1065,
-     1020, 1030, 1029, 1024, 1032, 1033, 1034, 1040, 1043, 1045,
-     1044, 1046, 1063, 1047, 1062, 1060, 1048, 1059, 1049, 1056,
-      677,  479, 1054,  435, 1201, 1089, 1091,  124, 1095,   76
+      988, 1094, 1092,  989,  990,  995,  996,  997,  998, 1000,
+     1002, 1003, 1004, 1005, 1006, 1009, 1091, 1008, 1012, 1015,
+     1017, 1020, 1023, 1024, 1089, 1026, 1030, 1031, 1033, 1035,
+     1088, 1036, 1037, 1038, 1041, 1084, 1043, 1044, 1082, 1042,
+     1049, 1052, 1054, 1059, 1063, 1062, 1066, 1064, 1067, 1068,
+     1069, 1070, 1079, 1073,  968,  827,  683, 1076,  579, 1077,
+      578,  576,  490, 1078,  488, 1223, 1113, 1115,  124, 1119,
+       76
     } ;
 
-static yyconst short int yy_def[561] =
+static yyconst short int yy_def[572] =
     {   0,
-      555,    1,  555,  555,  555,  555,  556,  557,  558,  555,
-      557,  557,  557,  557,  559,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  556,  555,  557,  555,
-      560,  560,  555,  555,  557,  557,  557,  557,  557,  559,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      566,    1,  566,  566,  566,  566,  567,  568,  569,  566,
+      568,  568,  568,  568,  570,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  567,  566,  568,  566,
+      571,  571,  566,  566,  568,  568,  568,  568,  568,  570,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
 
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      555,  560,  560,  555,  557,  557,  557,   49,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,   49,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      566,  571,  571,  566,  568,  568,  568,   49,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,   49,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
 
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  555,  555,  555,  555,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  184,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  566,  566,  566,  566,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      184,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
 
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  555,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  566,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
 
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
 
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,  557,  557,  557,  557,  557,  557,
-      557,  557,  557,  557,    0,  555,  555,  555,  555,  555
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,    0,  566,  566,  566,  566,
+      566
     } ;
 
-static yyconst short int yy_nxt[1245] =
+static yyconst short int yy_nxt[1267] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   14,   14,    4,   15,    8,    8,    8,   16,   17,
@@ -608,7 +613,7 @@
 
       184,  112,   40,  141,  150,  113,  114,  124,   44,   44,
        44,   44,   47,   45,   45,   45,   45,   40,  126,  126,
-      126,  126,   40,   40,   40,  127,  220,  149,   40,  178,
+      126,  126,   40,   40,   40,  127,  221,  149,   40,  178,
       142,  127,   47,   48,   48,   48,   48,   40,  128,  128,
       128,  128,   40,   40,  128,  128,   40,  128,  128,  128,
       128,  128,  128,   40,   40,   40,   40,   40,  143,   40,
@@ -619,111 +624,113 @@
 
        40,  167,  170,   40,  172,  176,   40,   40,   40,   40,
       177,  185,   40,  179,   40,  199,  180,   40,   40,   40,
-      195,  186,   40,  182,  187,   40,   40,  181,  197,  236,
+      195,  186,   40,  182,  187,   40,   40,  181,  197,  237,
       183,   40,  188,  191,   40,  196,  192,   40,   40,  193,
       189,  205,  194,  198,  190,   40,   40,  200,   40,  210,
-      201,  203,   40,   40,  206,   40,   40,  215,  202,  207,
-      211,  219,  204,   40,  214,  208,  217,  216,  218,   40,
-       40,  209,   40,  212,  123,  123,  123,  123,  213,  225,
-      225,  225,  225,  230,   40,   40,  226,   40,   40,   40,
-      221,  222,  226,  232,   40,  235,   40,  223,  126,  126,
+      201,  203,   40,   40,  206,   40,  217,  216,  202,  207,
+       40,  211,  204,   40,  215,  208,  212,   40,  220,   40,
+       40,  209,   40,  218,  213,  219,   40,  236,   40,  214,
+      123,  123,  123,  123,  226,  226,  226,  226,  222,  231,
+      223,  227,   40,  234,  232,   40,  224,  227,  126,  126,
 
-      126,  126,   40,  231,  237,  127,   40,  234,  233,   40,
-      269,  127,  227,  228,   40,  229,  229,  229,  229,   40,
-       40,   40,  239,   40,   40,  242,   40,   40,   40,  238,
-      241,  240,  247,   40,   40,   40,  245,   40,  243,  244,
-      246,  248,  249,  250,   40,   40,   40,   40,   40,   40,
-      255,   40,   40,   40,   40,  251,   40,  252,  261,  262,
-      253,  264,   40,  259,   40,  257,  263,   40,  258,  254,
-      260,  265,   40,  256,  267,   40,  268,   40,   40,   40,
-      271,   40,   40,   40,   40,  266,  272,  270,   40,   40,
-       40,   40,   40,  274,   40,  317,  276,   40,  273,  284,
+      126,  126,   40,   40,  233,  127,   40,   40,   40,  279,
+       40,  127,  228,  229,   40,  230,  230,  230,  230,   40,
+      235,  238,  240,   40,   40,  244,  239,   40,   40,  243,
+      241,   40,  242,   40,   40,   40,   40,  246,   40,  248,
+       40,  247,  245,  250,  249,  251,   40,   40,   40,   40,
+       40,  256,   40,   40,   40,  263,   40,  252,  254,  262,
+      253,  260,  265,  266,   40,  255,  258,   40,  261,  259,
+       40,  264,   40,   40,  257,   40,  269,  267,   40,   40,
+       40,  272,  268,   40,  270,   40,  273,   40,   40,   40,
+       40,   40,   40,   40,  275,  271,   40,  285,  277,  274,
 
-      278,   40,  277,  275,  291,   40,  292,  279,  280,  280,
-      280,  280,  281,  282,  280,  280,   40,  280,  280,  280,
-      280,  280,  280,   40,  283,  285,   40,  286,  289,   40,
-       40,  287,   40,  288,   40,   40,   40,   40,   40,   40,
-       40,   40,  294,   40,  290,  300,  298,  293,  302,  297,
-       40,  295,   40,  301,   40,  296,  299,   40,   40,   40,
-      307,  303,   40,  308,  305,  304,  309,  313,  306,   40,
-      312,  310,   40,   40,   40,  311,   40,  314,  315,   40,
-      225,  225,  225,  225,   40,   40,  316,  226,  320,  320,
-      320,  320,  318,  226,  339,  381,  321,  227,  227,  319,
+      292,   40,  293,   40,  276,  278,   40,   40,  300,   40,
+      280,  281,  281,  281,  281,  282,  283,  281,  281,  284,
+      281,  281,  281,  281,  281,  281,   40,  294,  291,  290,
+       40,   40,   40,   40,   40,  286,   40,  287,   40,   40,
+       40,  288,   40,  289,   40,  299,  295,  303,  298,  301,
+       40,   40,  296,   40,   40,  297,   40,  302,   40,  304,
+      309,   40,  307,  311,  305,  306,   40,  308,   40,  312,
+      310,  315,   40,   40,  313,   40,  316,  317,   40,  314,
+       40,   40,  319,  226,  226,  226,  226,  318,  324,   40,
+      227,   40,   40,  320,  228,  228,  227,  322,  322,  322,
 
-      320,  320,  320,  320,  229,  229,  229,  229,   40,  229,
-      229,  229,  229,   40,   40,   40,   40,   40,   40,   40,
-       40,  322,  325,   40,   40,  326,   40,   40,   40,  330,
-       40,   40,  323,  324,   40,   40,  335,   40,  329,  331,
-       40,   40,  327,  328,  333,  334,  338,  340,   40,   40,
-       40,   40,   40,  336,  332,   40,  337,  347,   40,   40,
-      341,   40,   40,   40,  348,   40,  346,   40,   40,   40,
-       40,  342,  343,  345,  344,  352,   40,  353,   40,  349,
-      350,  351,  355,  354,  357,   40,  356,   40,   40,   40,
-       40,   40,   40,   40,  358,   40,  360,  361,  362,  359,
+      322,   40,   40,  321,  322,  322,  322,  322,  230,  230,
+      230,  230,   40,  230,  230,  230,  230,   40,  323,  325,
+       40,   40,   40,   40,   40,   40,  327,   40,   40,  328,
+       40,   40,  332,   40,   40,   40,  337,  326,   40,   40,
+      331,  333,   40,   40,  340,   40,  329,  330,   40,  335,
+      336,  341,  342,  338,   40,   40,   40,  334,   40,  339,
+       40,  349,   40,   40,   40,   40,  343,   40,   40,  350,
+       40,  344,   40,  348,   40,   40,  345,   40,  346,  347,
+      355,  354,  353,  351,  352,  357,  356,   40,   40,  359,
+      358,   40,   40,   40,   40,   40,   40,  363,   40,  360,
 
-      363,  365,   40,   40,  367,   40,   40,  364,   40,   40,
-      400,  369,  370,  371,  372,  366,  373,  374,  368,   40,
-       40,   40,   40,   40,  377,   40,  375,   40,  378,  376,
-       40,  379,  383,  380,   40,  382,   40,   40,   40,   40,
-      320,  320,  320,  320,   40,   40,   40,  384,   40,  388,
-      391,  390,  392,  395,   40,  385,   40,  386,   40,  397,
-      387,  389,   40,  394,   40,  396,   40,   40,  393,   40,
-      399,   40,   40,   40,   40,   40,  402,   40,   40,   40,
-      406,  407,   40,  398,   40,  401,  403,   40,  408,  405,
-      409,  411,   40,   40,  404,  410,   40,   40,   40,  412,
+      361,  365,  367,   40,  364,  362,   40,  369,   40,   40,
+       40,   40,  366,  373,   40,  371,  368,  374,  372,  375,
+      376,  370,   40,  378,   40,  379,   40,   40,   40,  377,
+       40,  380,   40,   40,   40,  381,   40,  382,  386,  383,
+      384,   40,   40,   40,   40,  385,  322,  322,  322,  322,
+       40,  387,   40,   40,  391,  394,  393,  388,   40,   40,
+      395,   40,  389,  398,   40,  390,  392,   40,  397,   40,
+       40,  399,  400,   40,   40,  396,  402,   40,   40,   40,
+      401,   40,   40,  405,   40,   40,   40,   40,  403,  409,
+      414,  410,  404,   40,  406,   40,  408,   40,  411,  412,
 
-       40,   40,  414,  413,   40,  417,   40,  419,  420,  415,
-       40,   40,  416,  421,  418,  422,   40,   40,  425,  423,
-       40,   40,   40,   40,  424,   40,   40,   40,   40,   40,
-      428,   40,  427,   40,  430,  432,  434,   40,   40,  426,
-      429,  435,  437,   40,  433,  441,  431,   40,  439,   40,
-      436,  438,   40,   40,   40,   40,   40,   40,   40,   40,
-      440,  445,  442,   40,  447,   40,   40,  451,  452,  444,
-      443,   40,  454,   40,   40,  449,  450,   40,  448,   40,
-      460,  446,  453,  456,  458,   40,  457,  455,   40,  459,
+       40,  407,   40,   40,  413,   40,   40,   40,  415,   40,
+       40,  416,  420,   40,  423,  422,   40,  418,  424,  425,
+      417,  419,  421,   40,   40,  426,  427,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,  431,   40,
+       40,  428,  430,  433,  435,  439,  438,  429,  432,   40,
+       40,  436,   40,  434,   40,   40,  437,  440,   40,  443,
+      441,   40,   40,  442,  450,   40,   40,   40,   40,   40,
+       40,  446,  445,  449,  451,  444,   40,   40,   40,  448,
+      455,  456,   40,   40,  447,  458,  453,  454,   40,  452,
+       40,   40,  460,  457,   40,  462,   40,  461,  459,   40,
+
+      463,  464,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,  468,  465,  466,  469,  471,  467,  474,  470,   40,
+       40,  472,   40,  475,   40,  476,   40,   40,   40,  473,
+       40,   40,   40,   40,   40,   40,  483,  484,  478,   40,
+       40,   40,  477,  479,  489,  480,  482,  485,  486,  487,
+       40,   40,  481,  488,   40,   40,  494,   40,   40,  493,
+      495,  490,   40,  491,  498,   40,  492,  496,   40,   40,
+       40,   40,   40,   40,   40,   40,  500,  497,  504,   40,
+       40,   40,   40,   40,  508,  499,  513,  505,  510,   40,
+      506,   40,  501,  502,  503,  509,  511,  507,  512,   40,
+
+       40,   40,   40,   40,  516,  515,  514,  518,   40,   40,
+       40,   40,  519,   40,  521,   40,   40,   40,   40,   40,
+      524,   40,   40,  528,  517,   40,  522,  530,   40,  526,
+       40,  520,  527,   40,  529,  531,   40,   40,  525,   40,
+      523,  532,  535,   40,   40,  536,   40,  533,   40,   40,
+       40,   40,  539,  534,   40,   40,   40,   40,  543,  540,
+      537,  541,   40,  542,  545,   40,  548,   40,  538,  550,
+      549,  546,   40,  544,  547,   40,   40,   40,  551,   40,
+       40,   40,   40,   40,  552,  557,   40,  558,  559,   40,
+       40,   40,   40,  553,  554,   40,  563,   40,  555,  564,
+
+      556,   40,   40,  562,   40,   40,  561,   40,   40,   40,
+       40,  560,  565,   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,
 
-      464,   40,  465,  469,   40,  462,  461,  463,  466,  467,
-      470,   40,   40,   40,   40,  468,  471,   40,   40,  473,
-       40,  472,   40,  478,   40,  474,  479,   40,  477,   40,
-       40,   40,  475,   40,   40,  480,  484,  481,  476,  482,
-       40,  483,  488,  490,   40,  489,   40,   40,   40,   40,
-       40,  485,   40,  486,  492,   40,  487,   40,   40,  494,
-       40,   40,   40,   40,   40,  499,  498,  491,   40,  493,
-      502,  504,   40,  495,  506,  496,  503,  500,  497,  505,
-       40,  501,   40,   40,   40,   40,   40,  507,  508,   40,
-      511,   40,   40,  516,   40,  509,  514,   40,  512,   40,
-
-       40,  517,   40,   40,   40,  520,   40,  510,  515,  513,
-       40,  522,   40,   40,  519,   40,   40,  521,  523,  524,
-      518,   40,  527,   40,  528,   40,   40,   40,   40,  525,
-      530,   40,   40,   40,   40,  526,  534,   40,  531,  529,
-      532,  533,   40,   40,  536,   40,   40,   40,  539,  537,
-      540,  535,  538,   40,  542,  541,   40,   40,   40,   40,
-       40,   40,   40,  547,  544,  548,  543,   40,  552,   40,
-      545,  553,   40,   40,  546,   40,   40,  551,   40,   40,
-       40,   40,  550,   40,   40,   40,  549,   40,  554,   37,
-       37,   37,   37,   39,   39,   50,   40,   50,   50,   40,
-
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       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,  224,   40,   40,   40,   40,  121,   40,   38,  555,
-
-        3,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555
+       40,   40,   40,  225,   40,   40,   40,   40,  121,   40,
+       38,  566,    3,  566,  566,  566,  566,  566,  566,  566,
+      566,  566,  566,  566,  566,  566,  566,  566,  566,  566,
+      566,  566,  566,  566,  566,  566,  566,  566,  566,  566,
+      566,  566,  566,  566,  566,  566,  566,  566,  566,  566,
+      566,  566,  566,  566,  566,  566
     } ;
 
-static yyconst short int yy_chk[1245] =
+static yyconst short int yy_chk[1267] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -732,13 +739,13 @@
         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,  560,   17,
+       14,   14,   14,   14,   14,   14,   16,   20,  571,   17,
        27,   29,   27,   26,   16,   35,   35,   20,   17,   23,
        29,   16,   17,   16,   18,   16,   13,   17,   16,   18,
 
        17,   18,   19,   46,   35,   23,   23,   19,   46,   24,
        22,   19,   18,   21,   24,   19,   18,   19,   21,   22,
-       19,   21,   24,   28,   25,   22,  558,   24,   21,   25,
+       19,   21,   24,   28,   25,   22,  569,   24,   21,   25,
        68,   24,   21,   33,   21,   28,   34,   54,   33,   31,
        64,   28,   25,   36,   31,   34,   28,   51,   25,   30,
        53,   33,   36,   30,   68,   51,   54,   31,   53,   30,
@@ -763,105 +770,107 @@
        99,   96,  107,   93,   97,  101,  108,   92,  100,  139,
        93,  111,   97,   98,  103,   99,   98,  104,  106,   98,
        97,  107,   98,  101,   97,  114,  109,  103,  110,  111,
-      104,  106,  112,  116,  108,  113,  117,  114,  104,  109,
-      112,  117,  106,  115,  113,  110,  116,  115,  116,  119,
-      120,  110,  130,  112,  123,  123,  123,  123,  112,  124,
-      124,  124,  124,  130,  133,  131,  124,  134,  138,  140,
-      119,  120,  124,  133,  136,  138,  169,  120,  126,  126,
+      104,  106,  115,  112,  108,  113,  115,  114,  104,  109,
+      116,  112,  106,  117,  113,  110,  112,  119,  117,  120,
+      138,  110,  134,  116,  112,  116,  131,  138,  130,  112,
+      123,  123,  123,  123,  124,  124,  124,  124,  119,  130,
+      120,  124,  180,  134,  131,  133,  120,  124,  126,  126,
 
-      126,  126,  126,  131,  140,  126,  141,  136,  134,  144,
-      169,  126,  127,  127,  143,  127,  127,  127,  127,  127,
-      146,  145,  143,  147,  148,  146,  151,  150,  152,  141,
-      145,  144,  151,  153,  154,  155,  150,  156,  147,  148,
-      150,  152,  153,  154,  157,  158,  159,  160,  554,  162,
-      158,  164,  165,  163,  161,  154,  167,  155,  162,  163,
-      156,  165,  166,  161,  170,  160,  164,  168,  160,  157,
-      161,  166,  171,  159,  167,  172,  168,  173,  174,  175,
-      171,  177,  178,  180,  181,  166,  172,  170,  186,  185,
-      188,  220,  552,  174,  194,  220,  177,  195,  173,  188,
+      126,  126,  126,  141,  133,  126,  140,  136,  144,  180,
+      147,  126,  127,  127,  143,  127,  127,  127,  127,  127,
+      136,  140,  143,  145,  146,  147,  141,  148,  150,  146,
+      144,  152,  145,  151,  153,  156,  154,  150,  155,  151,
+      157,  150,  148,  153,  152,  154,  158,  159,  160,  163,
+      162,  158,  161,  165,  166,  163,  164,  154,  156,  162,
+      155,  161,  165,  166,  167,  157,  160,  168,  161,  160,
+      169,  164,  170,  171,  159,  172,  168,  166,  173,  174,
+      175,  171,  167,  177,  169,  178,  172,  181,  188,  203,
+      194,  186,  185,  195,  174,  170,  187,  188,  177,  173,
 
-      180,  187,  178,  175,  194,  190,  195,  181,  184,  184,
-      184,  184,  185,  186,  184,  184,  189,  184,  184,  184,
-      184,  184,  184,  192,  187,  189,  197,  189,  190,  196,
-      198,  189,  200,  189,  201,  202,  204,  203,  206,  205,
-      207,  208,  197,  210,  192,  204,  202,  196,  205,  201,
-      209,  198,  215,  204,  211,  200,  203,  212,  213,  214,
-      210,  206,  216,  211,  208,  207,  212,  216,  209,  217,
-      215,  213,  219,  218,  222,  214,  223,  217,  218,  230,
-      225,  225,  225,  225,  307,  252,  219,  225,  227,  227,
-      227,  227,  222,  225,  252,  307,  230,  226,  226,  223,
+      194,  565,  195,  563,  175,  178,  190,  192,  203,  196,
+      181,  184,  184,  184,  184,  185,  186,  184,  184,  187,
+      184,  184,  184,  184,  184,  184,  189,  196,  192,  190,
+      197,  198,  200,  201,  202,  189,  206,  189,  205,  207,
+      204,  189,  208,  189,  209,  202,  197,  205,  201,  204,
+      210,  211,  198,  212,  213,  200,  214,  204,  215,  206,
+      211,  216,  209,  213,  207,  208,  217,  210,  218,  214,
+      212,  217,  219,  220,  215,  223,  218,  219,  221,  216,
+      224,  232,  221,  226,  226,  226,  226,  220,  232,  562,
+      226,  561,  559,  223,  227,  227,  226,  227,  227,  227,
 
-      226,  226,  226,  226,  228,  228,  228,  228,  228,  229,
-      229,  229,  229,  229,  231,  232,  234,  235,  239,  240,
-      241,  231,  235,  242,  243,  239,  244,  245,  246,  243,
-      247,  248,  232,  234,  249,  250,  248,  255,  242,  244,
-      253,  251,  240,  241,  246,  247,  251,  253,  256,  258,
-      257,  261,  262,  249,  245,  263,  250,  262,  264,  265,
-      255,  267,  268,  266,  263,  269,  261,  270,  274,  275,
-      277,  256,  257,  258,  257,  267,  278,  268,  279,  264,
-      265,  266,  270,  269,  275,  283,  274,  285,  281,  290,
-      551,  332,  286,  284,  277,  287,  279,  281,  283,  278,
+      227,  231,  233,  224,  228,  228,  228,  228,  229,  229,
+      229,  229,  229,  230,  230,  230,  230,  230,  231,  233,
+      235,  236,  240,  241,  242,  243,  236,  244,  245,  240,
+      246,  249,  244,  247,  250,  248,  249,  235,  251,  252,
+      243,  245,  253,  256,  252,  254,  241,  242,  257,  247,
+      248,  253,  254,  250,  258,  259,  263,  246,  262,  251,
+      264,  263,  265,  266,  267,  269,  256,  268,  270,  264,
+      271,  257,  275,  262,  276,  278,  258,  279,  258,  259,
+      269,  268,  267,  265,  266,  271,  270,  280,  282,  276,
+      275,  284,  286,  287,  285,  291,  557,  282,  288,  278,
 
-      284,  286,  288,  291,  287,  292,  293,  285,  295,  299,
-      332,  288,  290,  291,  292,  286,  293,  295,  287,  296,
-      298,  301,  303,  306,  299,  308,  296,  309,  301,  298,
-      310,  303,  309,  306,  312,  308,  313,  315,  318,  317,
-      320,  320,  320,  320,  323,  322,  325,  310,  327,  317,
-      322,  318,  323,  327,  329,  312,  326,  313,  328,  329,
-      315,  317,  330,  326,  331,  328,  333,  334,  325,  335,
-      331,  336,  337,  338,  340,  343,  334,  344,  345,  349,
-      338,  340,  346,  330,  347,  333,  335,  348,  343,  337,
-      344,  346,  350,  351,  336,  345,  352,  354,  355,  347,
+      279,  285,  287,  292,  284,  280,  289,  288,  293,  294,
+      300,  296,  286,  292,  299,  289,  287,  293,  291,  294,
+      296,  288,  297,  299,  302,  300,  304,  307,  308,  297,
+      309,  302,  310,  311,  312,  304,  314,  307,  311,  308,
+      309,  315,  317,  320,  319,  310,  322,  322,  322,  322,
+      324,  312,  325,  327,  319,  324,  320,  314,  329,  332,
+      325,  328,  315,  329,  330,  317,  319,  331,  328,  334,
+      333,  330,  331,  335,  336,  327,  333,  337,  338,  339,
+      332,  348,  340,  336,  342,  345,  346,  347,  334,  340,
+      348,  342,  335,  349,  337,  350,  339,  351,  345,  346,
 
-      362,  356,  349,  348,  357,  352,  358,  355,  356,  350,
-      359,  360,  351,  357,  354,  358,  363,  371,  362,  359,
-      372,  373,  375,  376,  360,  380,  377,  385,  390,  383,
-      372,  386,  371,  384,  375,  377,  383,  389,  387,  363,
-      373,  384,  386,  388,  380,  390,  376,  393,  388,  392,
-      385,  387,  395,  397,  396,  398,  399,  400,  401,  406,
-      389,  396,  392,  405,  398,  410,  416,  405,  405,  395,
-      393,  411,  410,  418,  413,  400,  401,  414,  399,  415,
-      418,  397,  406,  413,  415,  423,  414,  411,  424,  416,
-      425,  427,  428,  439,  438,  440,  434,  441,  444,  442,
+      352,  338,  353,  354,  347,  356,  357,  358,  349,  359,
+      360,  350,  354,  362,  358,  357,  361,  352,  359,  360,
+      351,  353,  356,  364,  365,  361,  362,  373,  374,  375,
+      378,  377,  382,  385,  388,  379,  400,  387,  374,  386,
+      556,  364,  373,  377,  379,  387,  386,  365,  375,  389,
+      390,  382,  392,  378,  391,  393,  385,  388,  395,  391,
+      389,  396,  398,  390,  400,  401,  399,  402,  403,  404,
+      409,  395,  393,  399,  401,  392,  408,  419,  413,  398,
+      408,  408,  414,  416,  396,  413,  403,  404,  417,  402,
+      418,  426,  416,  409,  421,  418,  427,  417,  414,  428,
 
-      427,  446,  428,  440,  449,  424,  423,  425,  434,  438,
-      441,  450,  451,  452,  453,  439,  442,  455,  456,  446,
-      459,  444,  457,  453,  458,  449,  455,  460,  452,  461,
-      462,  464,  450,  465,  467,  456,  460,  457,  451,  458,
-      466,  459,  465,  467,  468,  466,  470,  469,  471,  473,
-      478,  461,  474,  462,  469,  475,  464,  476,  480,  471,
-      479,  481,  487,  485,  503,  478,  476,  468,  489,  470,
-      481,  487,  488,  473,  489,  474,  485,  479,  475,  488,
-      491,  480,  493,  492,  495,  498,  500,  491,  492,  499,
-      498,  501,  502,  503,  504,  493,  501,  505,  499,  506,
+      419,  421,  430,  438,  431,  437,  442,  443,  446,  444,
+      445,  430,  426,  427,  431,  438,  428,  444,  437,  448,
+      450,  442,  453,  445,  454,  446,  455,  457,  459,  443,
+      460,  456,  463,  461,  462,  464,  457,  459,  450,  465,
+      466,  468,  448,  453,  464,  454,  456,  460,  461,  462,
+      469,  470,  455,  463,  473,  471,  470,  474,  472,  469,
+      471,  465,  475,  466,  474,  476,  468,  472,  478,  481,
+      479,  480,  483,  484,  485,  486,  476,  473,  481,  492,
+      495,  555,  490,  494,  486,  475,  495,  483,  492,  493,
+      484,  499,  478,  479,  480,  490,  493,  485,  494,  497,
 
-      507,  504,  508,  512,  511,  507,  509,  495,  502,  500,
-      513,  509,  514,  515,  506,  516,  517,  508,  511,  512,
-      505,  519,  515,  520,  516,  521,  522,  524,  525,  513,
-      519,  526,  527,  531,  529,  514,  524,  534,  520,  517,
-      521,  522,  533,  532,  526,  535,  536,  537,  531,  527,
-      532,  525,  529,  538,  534,  533,  539,  541,  540,  542,
-      544,  547,  549,  539,  536,  540,  535,  553,  547,  550,
-      537,  549,  548,  546,  538,  545,  543,  544,  530,  528,
-      523,  518,  542,  510,  497,  496,  541,  494,  553,  556,
-      556,  556,  556,  557,  557,  559,  490,  559,  559,  486,
+      498,  501,  504,  505,  499,  498,  497,  504,  506,  507,
+      508,  509,  505,  510,  507,  511,  512,  513,  514,  515,
+      510,  518,  516,  514,  501,  519,  508,  516,  520,  512,
+      521,  506,  513,  522,  515,  518,  523,  524,  511,  526,
+      509,  519,  522,  527,  528,  523,  529,  520,  530,  532,
+      533,  534,  527,  521,  535,  540,  537,  538,  532,  528,
+      524,  529,  541,  530,  534,  542,  538,  543,  526,  541,
+      540,  535,  544,  533,  537,  546,  545,  548,  542,  547,
+      549,  550,  551,  552,  543,  548,  554,  549,  550,  558,
+      560,  564,  553,  544,  545,  539,  558,  536,  546,  560,
 
-      484,  483,  482,  477,  472,  463,  454,  448,  447,  445,
-      443,  437,  436,  435,  433,  432,  431,  430,  429,  426,
-      422,  421,  420,  419,  417,  412,  409,  408,  407,  404,
-      403,  402,  394,  391,  382,  381,  379,  378,  374,  370,
-      369,  368,  367,  366,  365,  364,  361,  353,  342,  341,
-      339,  324,  321,  319,  316,  314,  311,  305,  304,  302,
-      300,  297,  294,  289,  282,  276,  273,  272,  271,  260,
-      259,  254,  238,  237,  236,  233,  221,  199,  193,  191,
-      183,  182,  179,  176,  149,  142,  137,  135,  132,  129,
-      125,  121,  105,   89,   59,   39,   37,    8,    7,    3,
+      547,  531,  525,  554,  517,  503,  552,  502,  500,  496,
+      491,  551,  564,  567,  567,  567,  567,  568,  568,  570,
+      489,  570,  570,  488,  487,  482,  477,  467,  458,  452,
+      451,  449,  447,  441,  440,  439,  436,  435,  434,  433,
+      432,  429,  425,  424,  423,  422,  420,  415,  412,  411,
+      410,  407,  406,  405,  397,  394,  384,  383,  381,  380,
+      376,  372,  371,  370,  369,  368,  367,  366,  363,  355,
+      344,  343,  341,  326,  323,  321,  318,  316,  313,  306,
+      305,  303,  301,  298,  295,  290,  283,  277,  274,  273,
+      272,  261,  260,  255,  239,  238,  237,  234,  222,  199,
 
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555
+      193,  191,  183,  182,  179,  176,  149,  142,  137,  135,
+      132,  129,  125,  121,  105,   89,   59,   39,   37,    8,
+        7,    3,  566,  566,  566,  566,  566,  566,  566,  566,
+      566,  566,  566,  566,  566,  566,  566,  566,  566,  566,
+      566,  566,  566,  566,  566,  566,  566,  566,  566,  566,
+      566,  566,  566,  566,  566,  566,  566,  566,  566,  566,
+      566,  566,  566,  566,  566,  566
     } ;
 
 static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
@@ -919,6 +928,7 @@
 #define RET_TY(sym,OldTY,NewTY,sign) \
   Upgradelval.Type.newTy = new std::string(NewTY); \
   Upgradelval.Type.oldTy = OldTY; \
+  Upgradelval.Type.elemTy = VoidTy; \
   return sym
 
 #define YY_NEVER_INTERACTIVE 1
@@ -938,7 +948,7 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 942 "UpgradeLexer.cpp"
+#line 952 "UpgradeLexer.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1089,10 +1099,10 @@
 	register char *yy_cp = NULL, *yy_bp = NULL;
 	register int yy_act;
 
-#line 98 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 99 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 
 
-#line 1096 "UpgradeLexer.cpp"
+#line 1106 "UpgradeLexer.cpp"
 
 	if ( yy_init )
 		{
@@ -1140,14 +1150,14 @@
 			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 >= 556 )
+				if ( yy_current_state >= 567 )
 					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 != 555 );
+		while ( yy_current_state != 566 );
 
 yy_find_action:
 		yy_current_state = *--yy_state_ptr;
@@ -1185,641 +1195,646 @@
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 100 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 101 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { /* Ignore comments for now */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 102 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 103 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( BEGINTOK); }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 103 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 104 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( ENDTOK); }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 104 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 105 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( TRUETOK);  }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 105 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 106 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( FALSETOK); }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 106 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 107 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( DECLARE); }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 107 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 108 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( GLOBAL); }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 108 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 109 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( CONSTANT); }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 109 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 110 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( INTERNAL); }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 110 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 111 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( LINKONCE); }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 111 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 112 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( WEAK); }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 112 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 113 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( APPENDING); }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 113 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 114 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( DLLIMPORT); }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 114 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 115 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( DLLEXPORT); }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 115 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 116 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( EXTERN_WEAK); }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 116 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 117 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( EXTERNAL); }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 117 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( IMPLEMENTATION); }
+#line 118 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UNINITIALIZED); }  // alias for external
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 118 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ZEROINITIALIZER); }
+#line 119 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( IMPLEMENTATION); }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 119 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( DOTDOTDOT); }
+#line 120 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ZEROINITIALIZER); }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 120 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UNDEF); }
+#line 121 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( DOTDOTDOT); }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 121 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( NULL_TOK); }
+#line 122 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UNDEF); }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 122 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( TO); }
+#line 123 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( NULL_TOK); }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 123 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( TAIL); }
+#line 124 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( TO); }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 124 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( TARGET); }
+#line 125 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( TAIL); }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 125 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( TRIPLE); }
+#line 126 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( TARGET); }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 126 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( DEPLIBS); }
+#line 127 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( TRIPLE); }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 127 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ENDIAN); }
+#line 128 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( DEPLIBS); }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 128 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( POINTERSIZE); }
+#line 129 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ENDIAN); }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 129 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( DATALAYOUT); }
+#line 130 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( POINTERSIZE); }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 130 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LITTLE); }
+#line 131 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( DATALAYOUT); }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 131 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( BIG); }
+#line 132 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( LITTLE); }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 132 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( VOLATILE); }
+#line 133 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( BIG); }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 133 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ALIGN);  }
+#line 134 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( VOLATILE); }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 134 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SECTION); }
+#line 135 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ALIGN);  }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 135 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( MODULE); }
+#line 136 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SECTION); }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 136 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ASM_TOK); }
+#line 137 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( MODULE); }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 137 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SIDEEFFECT); }
+#line 138 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ASM_TOK); }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
 #line 139 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( CC_TOK); }
+{ RET_TOK( SIDEEFFECT); }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 140 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( CCC_TOK); }
+#line 141 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( CC_TOK); }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 141 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( CSRETCC_TOK); }
+#line 142 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( CCC_TOK); }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 142 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FASTCC_TOK); }
+#line 143 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( CSRETCC_TOK); }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 143 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( COLDCC_TOK); }
+#line 144 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FASTCC_TOK); }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 144 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( X86_STDCALLCC_TOK); }
+#line 145 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( COLDCC_TOK); }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 145 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( X86_FASTCALLCC_TOK); }
+#line 146 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( X86_STDCALLCC_TOK); }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
 #line 147 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(VOID,VoidTy,"void",false); }
+{ RET_TOK( X86_FASTCALLCC_TOK); }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 148 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(BOOL,BoolTy,"bool",false); }
+#line 149 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(VOID,VoidTy,"void",false); }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 149 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(SBYTE,SByteTy,"sbyte",true); }
+#line 150 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(BOOL,BoolTy,"bool",false); }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 150 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(UBYTE,UByteTy,"ubyte",false); }
+#line 151 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(SBYTE,SByteTy,"sbyte",true); }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 151 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(SHORT,ShortTy,"short",true); }
+#line 152 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(UBYTE,UByteTy,"ubyte",false); }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 152 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(USHORT,UShortTy,"ushort",false); }
+#line 153 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(SHORT,ShortTy,"short",true); }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 153 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(INT,IntTy,"int",true);   }
+#line 154 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(USHORT,UShortTy,"ushort",false); }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 154 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(UINT,UIntTy,"uint",false);  }
+#line 155 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(INT,IntTy,"int",true);   }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 155 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(LONG,LongTy,"long",true);  }
+#line 156 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(UINT,UIntTy,"uint",false);  }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 156 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(ULONG,ULongTy,"ulong",false); }
+#line 157 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(LONG,LongTy,"long",true);  }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 157 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(FLOAT,FloatTy,"float",false); }
+#line 158 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(ULONG,ULongTy,"ulong",false); }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 158 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(DOUBLE,DoubleTy,"double",false); }
+#line 159 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(FLOAT,FloatTy,"float",false); }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 159 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(LABEL,LabelTy,"label",false); }
+#line 160 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(DOUBLE,DoubleTy,"double",false); }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 160 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(OPAQUE); }
+#line 161 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(LABEL,LabelTy,"label",false); }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 161 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(TYPE);   }
+#line 162 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(OPAQUE); }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
 #line 163 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ADD); }
+{ RET_TOK(TYPE);   }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 164 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SUB); }
+#line 165 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ADD); }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 165 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( MUL); }
+#line 166 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SUB); }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 166 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UDIV); }
+#line 167 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( MUL); }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 167 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UDIV); }
+#line 168 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( DIV); }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 168 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SDIV); }
+#line 169 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UDIV); }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 169 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FDIV); }
+#line 170 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SDIV); }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 170 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UREM); }
+#line 171 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FDIV); }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 171 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UREM); }
+#line 172 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( REM);  }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 172 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SREM); }
+#line 173 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UREM); }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 173 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FREM); }
+#line 174 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SREM); }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 174 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( AND); }
+#line 175 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FREM); }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 175 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( OR); }
+#line 176 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( AND); }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 176 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( XOR); }
+#line 177 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( OR); }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 177 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SETNE); }
+#line 178 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( XOR); }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 178 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SETEQ); }
+#line 179 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SETNE); }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 179 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SETLT); }
+#line 180 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SETEQ); }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 180 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SETGT); }
+#line 181 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SETLT); }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 181 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SETLE); }
+#line 182 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SETGT); }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 182 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SETGE); }
+#line 183 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SETLE); }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
 #line 184 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( PHI_TOK); }
+{ RET_TOK( SETGE); }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 185 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( CALL); }
+#line 186 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( PHI_TOK); }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 186 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( CAST); }
+#line 187 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( CALL); }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 187 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( TRUNC); }
+#line 188 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( CAST); }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 188 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ZEXT); }
+#line 189 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( TRUNC); }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 189 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SEXT); }
+#line 190 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ZEXT); }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 190 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FPTRUNC); }
+#line 191 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SEXT); }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 191 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FPEXT); }
+#line 192 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FPTRUNC); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 192 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FPTOUI); }
+#line 193 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FPEXT); }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 193 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FPTOSI); }
+#line 194 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FPTOUI); }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 194 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UITOFP); }
+#line 195 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FPTOSI); }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 195 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SITOFP); }
+#line 196 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UITOFP); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 196 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( PTRTOINT); }
+#line 197 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SITOFP); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 197 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( INTTOPTR); }
+#line 198 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( PTRTOINT); }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 198 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( BITCAST); }
+#line 199 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( INTTOPTR); }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 199 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SELECT); }
+#line 200 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( BITCAST); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 200 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SHL); }
+#line 201 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SELECT); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 201 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SHR); }
+#line 202 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SHL); }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 202 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ASHR); }
+#line 203 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SHR); }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 203 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LSHR); }
+#line 204 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ASHR); }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 204 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( VAARG); }
+#line 205 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( LSHR); }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 205 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( RET); }
+#line 206 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( VAARG); }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 206 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( BR); }
+#line 207 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( RET); }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 207 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SWITCH); }
+#line 208 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( BR); }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 208 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( INVOKE); }
+#line 209 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SWITCH); }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 209 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UNWIND); }
+#line 210 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( INVOKE); }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 210 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 211 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( UNWIND); }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 211 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UNREACHABLE); }
+#line 212 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( EXCEPT); } // alias for unwind
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
 #line 213 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( MALLOC); }
+{ RET_TOK( UNREACHABLE); }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 214 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ALLOCA); }
+#line 215 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( MALLOC); }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 215 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FREE); }
+#line 216 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ALLOCA); }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 216 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LOAD); }
+#line 217 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FREE); }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 217 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( STORE); }
+#line 218 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( LOAD); }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 218 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( GETELEMENTPTR); }
+#line 219 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( STORE); }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
 #line 220 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( EXTRACTELEMENT); }
+{ RET_TOK( GETELEMENTPTR); }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 221 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( INSERTELEMENT); }
+#line 222 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( EXTRACTELEMENT); }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 222 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SHUFFLEVECTOR); }
+#line 223 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( INSERTELEMENT); }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 225 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( VAR_ID); }
+#line 224 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SHUFFLEVECTOR); }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 226 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LABELSTR); }
+#line 227 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( VAR_ID); }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 227 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 228 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( LABELSTR); }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 228 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( STRINGCONSTANT ); }
+#line 229 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( LABELSTR); }
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 229 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( EUINT64VAL ); }
+#line 230 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( STRINGCONSTANT ); }
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 230 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ESINT64VAL ); }
+#line 231 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( EUINT64VAL ); }
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 231 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( yytext[0] == 's' ? ESINT64VAL : EUINT64VAL ); }
+#line 232 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ESINT64VAL ); }
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 232 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UINTVAL); }
+#line 233 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( yytext[0] == 's' ? ESINT64VAL : EUINT64VAL ); }
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 233 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SINTVAL); }
+#line 234 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UINTVAL); }
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 234 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FPVAL); }
+#line 235 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SINTVAL); }
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 235 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 236 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FPVAL); }
+	YY_BREAK
+case 128:
+YY_RULE_SETUP
+#line 237 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( FPVAL); }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 236 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 238 "/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!
@@ -1828,22 +1843,22 @@
                   return EOF;
                 }
 	YY_BREAK
-case 128:
-YY_RULE_SETUP
-#line 244 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ /* Ignore whitespace */ }
-	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 245 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ return yytext[0]; }
+#line 246 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ /* Ignore whitespace */ }
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
 #line 247 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ return yytext[0]; }
+	YY_BREAK
+case 131:
+YY_RULE_SETUP
+#line 249 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 1847 "UpgradeLexer.cpp"
+#line 1862 "UpgradeLexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2130,7 +2145,7 @@
 		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 >= 556 )
+			if ( yy_current_state >= 567 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2160,11 +2175,11 @@
 	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 >= 556 )
+		if ( yy_current_state >= 567 )
 			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 == 555);
+	yy_is_jam = (yy_current_state == 566);
 	if ( ! yy_is_jam )
 		*yy_state_ptr++ = yy_current_state;
 
@@ -2721,5 +2736,5 @@
 	return 0;
 	}
 #endif
-#line 247 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 249 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"