Regenerate.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32140 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/llvm-upgrade/UpgradeLexer.cpp b/tools/llvm-upgrade/UpgradeLexer.cpp
index 04174a6..f7cebbe 100644
--- a/tools/llvm-upgrade/UpgradeLexer.cpp
+++ b/tools/llvm-upgrade/UpgradeLexer.cpp
@@ -317,36 +317,38 @@
 	*yy_cp = '\0'; \
 	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 131
-#define YY_END_OF_BUFFER 132
-static yyconst short int yy_acclist[209] =
+#define YY_NUM_RULES 153
+#define YY_END_OF_BUFFER 154
+static yyconst short int yy_acclist[231] =
     {   0,
-      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,
+      154,  152,  153,  151,  152,  153,  151,  153,  152,  153,
+      152,  153,  152,  153,  152,  153,  152,  153,  152,  153,
+      144,  152,  153,  144,  152,  153,    1,  152,  153,  152,
+      153,  152,  153,  152,  153,  152,  153,  152,  153,  152,
+      153,  152,  153,  152,  153,  152,  153,  152,  153,  152,
+      153,  152,  153,  152,  153,  152,  153,  152,  153,  152,
+      153,  152,  153,  152,  153,  152,  153,  152,  153,  152,
+      153,  143,  141,  140,  140,  147,  145,  149,  144,    1,
+      125,   39,   83,   84,   73,   23,  143,  140,  140,  148,
+      149,   20,  149,  150,   61,   72,   37,   32,   40,   64,
 
-       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,
+        3,   52,   63,   89,   94,   92,   93,   91,   90,   95,
+      103,   68,  124,   88,   86,  119,  120,   87,   85,   62,
+       97,  102,  100,  101,   99,   98,   96,   74,  142,  149,
+      149,  121,   47,  104,  105,   82,   67,  133,   71,   81,
+      134,   54,  122,   22,  146,   66,  108,   70,   24,    4,
+       60,   65,   53,   69,   46,   11,  107,  149,   34,    2,
+        5,   56,  110,   58,   48,   76,   80,   78,   79,   77,
+       75,   50,  135,  106,   49,   55,   21,  132,   43,   57,
+       28,  129,   42,  112,  111,    7,  127,   31,  131,   36,
+       59,  118,  114,  126,   25,   26,  113,  128,   51,  123,
 
-      116,  117,   17,   44,  115,   18,   45,   19
+      117,   41,    6,   27,  109,   35,    8,   16,    9,  116,
+       10,  115,   33,   12,   14,   13,   30,   38,   15,   29,
+      130,  136,  138,  139,   17,   44,  137,   18,   45,   19
     } ;
 
-static yyconst short int yy_accept[568] =
+static yyconst short int yy_accept[602] =
     {   0,
         1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
        17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
@@ -355,61 +357,66 @@
        74,   75,   76,   77,   77,   78,   78,   79,   80,   80,
        81,   81,   81,   81,   81,   81,   81,   81,   81,   82,
        82,   83,   83,   83,   83,   83,   83,   83,   83,   83,
-       83,   83,   83,   83,   83,   83,   83,   83,   83,   83,
-       83,   83,   83,   83,   83,   83,   83,   83,   83,   84,
        84,   84,   84,   84,   84,   84,   84,   84,   84,   84,
+       84,   84,   84,   84,   84,   84,   84,   84,   84,   84,
+       85,   85,   85,   85,   85,   85,   85,   86,   86,   86,
 
-       84,   84,   84,   84,   84,   85,   85,   85,   85,   85,
-       85,   85,   85,   85,   85,   85,   85,   85,   85,   85,
-       85,   86,   87,   89,   90,   91,   92,   92,   93,   94,
-       94,   94,   95,   95,   95,   96,   96,   97,   97,   97,
-       97,   97,   98,   98,   98,   98,   98,   98,   98,   99,
-       99,   99,  100,  100,  100,  100,  100,  100,  100,  100,
-      100,  100,  100,  100,  100,  100,  101,  101,  101,  101,
-      101,  101,  101,  101,  101,  101,  102,  102,  102,  103,
-      103,  103,  104,  105,  105,  105,  105,  105,  105,  105,
-      105,  106,  106,  107,  107,  107,  107,  107,  107,  108,
+       86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
+       86,   86,   86,   86,   86,   87,   87,   87,   87,   87,
+       87,   87,   87,   87,   87,   87,   87,   87,   87,   87,
+       87,   87,   87,   88,   89,   91,   92,   93,   94,   94,
+       95,   96,   96,   96,   97,   97,   97,   98,   98,   99,
+       99,   99,   99,   99,  100,  100,  100,  100,  100,  100,
+      100,  101,  101,  101,  102,  102,  102,  102,  102,  102,
+      102,  102,  102,  102,  102,  102,  102,  102,  102,  102,
+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
+      104,  104,  105,  106,  107,  108,  109,  110,  110,  111,
 
-      108,  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,  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,
+      112,  112,  112,  113,  114,  114,  114,  114,  114,  114,
+      114,  114,  115,  116,  117,  117,  118,  118,  118,  118,
+      119,  120,  120,  120,  121,  121,  121,  121,  121,  121,
+      121,  121,  121,  122,  123,  124,  124,  124,  125,  125,
+      126,  126,  127,  127,  128,  128,  128,  128,  128,  128,
+      128,  128,  128,  128,  129,  129,  129,  130,  131,  131,
+      131,  131,  132,  132,  132,  132,  133,  133,  133,  134,
+      135,  136,  136,  136,  136,  136,  136,  136,  136,  136,
+      136,  136,  136,  136,  136,  136,  136,  137,  138,  138,
+      138,  138,  138,  139,  140,  140,  140,  141,  141,  141,
 
-      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,
+      141,  141,  141,  141,  141,  141,  142,  143,  144,  144,
+      144,  145,  145,  145,  145,  146,  146,  147,  147,  147,
+      147,  147,  147,  147,  148,  148,  148,  148,  148,  149,
+      149,  149,  150,  150,  150,  151,  151,  152,  152,  153,
+      154,  154,  154,  154,  154,  154,  154,  155,  155,  155,
+      156,  156,  157,  157,  157,  158,  159,  160,  160,  160,
+      161,  161,  161,  161,  161,  161,  161,  161,  161,  161,
+      161,  161,  161,  161,  161,  162,  162,  163,  164,  164,
+      164,  164,  164,  164,  164,  164,  164,  164,  164,  165,
+      165,  165,  165,  165,  165,  165,  165,  166,  166,  166,
 
-      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,
+      167,  168,  169,  170,  171,  172,  173,  173,  173,  173,
+      174,  174,  174,  174,  175,  176,  176,  177,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  179,  179,
+      179,  180,  180,  180,  180,  180,  180,  180,  180,  181,
+      182,  183,  183,  183,  184,  185,  186,  186,  186,  187,
+      187,  187,  187,  187,  188,  188,  189,  190,  191,  192,
+      192,  192,  192,  193,  193,  193,  194,  195,  196,  197,
+      198,  198,  198,  199,  200,  201,  201,  201,  201,  201,
+      201,  202,  202,  203,  203,  204,  205,  205,  205,  205,
+      205,  205,  206,  206,  206,  206,  206,  206,  206,  206,
 
-      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,  204,  204,  205,
-      205,  206,  207,  208,  208,  209,  209
+      206,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  208,  208,  208,  208,  208,  209,  209,  209,  209,
+      209,  210,  211,  212,  212,  213,  213,  213,  213,  213,
+      214,  214,  214,  214,  215,  215,  216,  217,  217,  217,
+      217,  217,  217,  217,  217,  217,  217,  217,  217,  217,
+      217,  218,  218,  218,  218,  218,  218,  218,  218,  219,
+      219,  219,  219,  219,  219,  220,  220,  220,  220,  220,
+      221,  221,  221,  222,  222,  222,  222,  222,  222,  222,
+      222,  222,  222,  222,  222,  222,  222,  223,  223,  224,
+      225,  226,  226,  227,  227,  228,  229,  230,  230,  231,
+
+      231
     } ;
 
 static yyconst int yy_ec[256] =
@@ -453,141 +460,149 @@
         3,    3,    3
     } ;
 
-static yyconst short int yy_base[572] =
+static yyconst short int yy_base[606] =
     {   0,
-        0,    0, 1222, 1223, 1223, 1223, 1217, 1206,   36,   40,
+        0,    0, 1290, 1291, 1291, 1291, 1285, 1274,   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, 1215, 1223, 1204, 1223,
-        0,  159,  176,  199,  204,   95,  209,  224,  229,    0,
-      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, 1202,  287,
-      290,  293,  294,  160,  270,  295,  304,  305,  299,  306,
+      108,   91,  105,   96,  119,   68,  144,  128,  111,  170,
+      136,  201,  130,  117,  132,  125, 1283, 1291, 1272, 1291,
+        0,  175,  190,  207,  229,   70,  234,  249,  254,    0,
+      139,  145,  167,   76,  168,  138,  255,   31, 1271,  177,
+       90,  198,   48,  110,  258,  195,  221,  211,  200, 1270,
+      267,  269,  270,  156,  271,  272,  273,  217,  275,  276,
+      219,  279,  288,  280,  300,  287,  268,  298,  296, 1269,
+      307,   73,  309,  310,  312,  308,  315,  314,  316,  320,
 
-      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,
+      324,  325,  162,  326,  328,  336,  342,  330,  349,  337,
+      344,  348,  356,  361, 1268,  364,  331,  365,  367,  370,
+      375,  368,  378,  402,  383,  394,  395,  403,  371,  241,
+      379,  386, 1267,    0,  428,  433, 1266,  447,  464,    0,
+     1265,  397,  404, 1264,  405,  412, 1263,  421, 1262,  441,
+      437,  438,  417, 1261,  373,  449,  459,  465,  439,  451,
+     1260,  467,  469,  472,  473,  474,  455,  478,  479,  481,
+      484,  486,  487,  488,  490,  494,  491,  492,  493,  503,
+      496,  509,  511,  515,  516,  517,  519,  520,  521, 1259,
+      522, 1258, 1257, 1256, 1255, 1254, 1253,  389, 1252, 1251,
 
-      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,
+      527,  523, 1250, 1249,  551,  529,  530,  539,  532,  563,
+      542, 1248, 1247, 1246,  543, 1245,  142,  566,  533, 1244,
+     1243,  419,  567, 1242,  568,  569,  570,  571,  576,  573,
+      577,  579, 1241, 1240, 1239,  583,  587, 1238,  586, 1237,
+      589, 1236,  592, 1235,  599,  594,  595,  596,  531,  602,
+      612,  601,  616, 1234,  613,  618, 1291,  625,  639,  646,
+      650,  655,  639,  619,  640, 1233,  658,  625, 1232, 1231,
+     1230,  659,  660,  661,  662,  663,  665,  664,  669,  667,
+      671,  670,  672,  674,  681,  673, 1229, 1228,  686,  687,
+      692,  688, 1227, 1226,  696,  694, 1225,  695,  697,  698,
 
-     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,
+      702,  701,  706,  705,  707, 1224, 1223, 1222,  708,  713,
+     1221,  700,  717,  725,    0,  727, 1220,  729,  730,  731,
+      732,  735,  738, 1219,  733,  739,  745,  750, 1218,  748,
+      746, 1217,  752,  759, 1216,  762, 1215,  763, 1214, 1213,
+      765,  766,  768,  767,  771,  764, 1212,  770,  773, 1211,
+      779, 1210,  782,  783, 1209,  788, 1208,  788,  789, 1207,
+      790,  798,  795,  799,  803,  801,  807,  809,  810,  811,
+      814,  815,  816,  817, 1206,  818, 1205, 1204,  819,  821,
+      823,  826,  827,  830,  836,  837,  839,  841, 1203,  843,
+      844,  845,  847,  848,  855,  849, 1202,  851,  861, 1201,
 
-      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,
+     1200, 1199, 1198, 1197, 1196, 1195,  863,  865,  866, 1194,
+      867,  868,  871, 1193, 1192,  870, 1191, 1190,  872,  874,
+      882,  873,  876,  886,  883,  877,  892, 1189,  893,  894,
+     1188,  897,  898,  901,  902,  903,  904,  908, 1187, 1186,
+     1185,  915,  907, 1184, 1183, 1182,  916,  912, 1181,  918,
+      924,  931,  921, 1180,  932, 1179, 1178, 1177, 1176,  913,
+      935,  937, 1175,  938,  940, 1174, 1173, 1172, 1171, 1170,
+      942,  941, 1169, 1168, 1167,  943,  945,  948,  946,  949,
+     1166,  951, 1165,  957, 1164, 1163,  960,  961,   46,  962,
+      963, 1162,  964,  968,  965,  969,  970,  978,  971,  976,
 
-      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
+     1161,  979,  983,  989,  990,  988,  986,  996,  998, 1000,
+     1160, 1001, 1005, 1006, 1007, 1159, 1002, 1010, 1008, 1013,
+     1158, 1155, 1146, 1019, 1144, 1014, 1026, 1015, 1012, 1143,
+     1034, 1035, 1024, 1142, 1020, 1141, 1139, 1039, 1036, 1038,
+     1042, 1046, 1048, 1049, 1050, 1051, 1052, 1053, 1054, 1055,
+     1138, 1057, 1059, 1063, 1065, 1070, 1072, 1066, 1137, 1068,
+     1074, 1076, 1078, 1080, 1136, 1085, 1084, 1086, 1087, 1133,
+     1090, 1092, 1132, 1096, 1098, 1100, 1102, 1103, 1109, 1106,
+     1110, 1112, 1114, 1115, 1116, 1117, 1128, 1118,  910,  734,
+      703, 1123,  629, 1125,  627,  597,  534, 1126,  334, 1291,
+
+     1161, 1163,  296, 1167,  253
     } ;
 
-static yyconst short int yy_def[572] =
+static yyconst short int yy_def[606] =
     {   0,
-      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,
+      600,    1,  600,  600,  600,  600,  601,  602,  603,  600,
+      602,  602,  602,  602,  604,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  601,  600,  602,  600,
+      605,  605,  600,  600,  602,  602,  602,  602,  602,  604,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
 
-      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,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  600,  605,  605,  600,  602,  602,  602,   49,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
 
-      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,
+      602,  602,  602,  602,   49,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  600,  600,  600,  600,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
 
-      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,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  205,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  600,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
 
-      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,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
 
-      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
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  602,  602,  602,    0,
+
+      600,  600,  600,  600,  600
     } ;
 
-static yyconst short int yy_nxt[1267] =
+static yyconst short int yy_nxt[1335] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   14,   14,    4,   15,    8,    8,    8,   16,   17,
@@ -595,124 +610,132 @@
        26,   27,   28,    8,   29,   30,   31,   32,   33,   34,
        35,    8,   36,   42,   40,   43,   43,   43,   43,   44,
        44,   44,   44,   45,   45,   45,   45,   40,   46,   40,
-       40,   40,  139,   40,   47,   48,   48,   48,   48,   40,
-       47,   48,   48,   48,   48,   40,   40,   69,  122,   40,
-       88,   40,   89,   87,   51,  118,   40,   70,   56,   40,
-       93,   52,   57,   53,   40,   54,   49,   58,   55,   60,
+       40,   40,  151,   40,   47,   48,   48,   48,   48,   40,
+       47,   48,   48,   48,   48,   40,   40,   69,  137,   40,
+       70,   40,  157,   40,   51,  515,   40,   71,   56,   40,
+       90,   52,   57,   53,   40,   54,   49,   58,   55,   60,
 
-       59,   61,   40,  125,  119,   78,   79,   64,   40,   40,
-       40,   65,   62,   40,   80,   66,   63,   67,   71,   76,
-       68,   72,   81,   40,   40,   77,   41,   82,   73,   84,
-       40,   83,   74,   40,   75,   90,   40,   40,  115,   40,
-       40,   91,   85,   40,  104,  117,   92,   40,   86,   94,
-       40,  116,  120,   40,  151,  129,  133,  105,  132,   95,
-      106,   96,   97,  146,   40,   98,   99,  107,  123,  123,
-      123,  123,   40,   40,  100,  136,  101,  102,   40,  103,
-       94,   40,   40,  137,   40,   43,   43,   43,   43,   40,
-      108,  130,  109,  131,  134,  138,  140,  110,  135,  111,
+       59,   61,   40,   40,   40,   91,  192,   64,  145,   40,
+      154,   65,   62,   78,   83,   66,   63,   67,   40,   79,
+       68,   40,   84,   40,   40,   80,   72,   85,   73,   74,
+       40,   86,   40,  101,   81,   82,   75,   87,   40,  129,
+       76,   40,   77,   40,  130,   40,  158,  132,  127,   40,
+       88,   40,   40,   98,  114,   40,   89,   40,   40,   99,
+      141,  128,  148,  131,  100,  326,   92,  115,   93,   40,
+      116,  142,   94,  143,   95,   40,   96,  117,   97,  102,
+       40,   40,  170,   40,  135,  135,  135,  135,  144,  103,
+       40,  104,  105,  146,  106,  107,  108,  147,  109,   43,
 
-      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,  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,
-      144,  147,   40,  152,  153,   40,   40,  145,  155,  157,
-       40,  159,   40,  148,  161,  156,   40,  158,   40,   40,
-      154,   40,   40,   40,  168,  160,   40,   40,  163,  162,
-       40,  164,  171,  173,  175,   40,  169,  174,  165,  166,
+       43,   43,   43,  206,  110,  152,  111,  112,   40,  113,
+      102,   40,  153,   40,   40,  136,   44,   44,   44,   44,
+      118,  164,  119,  120,   40,  121,  155,  122,  156,  123,
+       40,  124,   40,  161,   40,  125,  126,   47,   45,   45,
+       45,   45,   40,  138,  138,  138,  138,   40,  163,  162,
+      139,  178,  253,  175,   40,  134,  139,   47,   48,   48,
+       48,   48,   40,  140,  140,  140,  140,   40,   40,  140,
+      140,   40,  140,  140,  140,  140,  140,  140,  159,  149,
+       40,   40,   40,   40,   40,   40,   40,  165,   40,   40,
+      160,  150,   40,   40,  172,  174,  188,  167,   41,  169,
 
-       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,  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,  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,
+       40,   40,  171,  166,  168,  177,  176,  182,  173,   40,
+      183,   40,  187,   40,  179,  180,  184,  181,  185,  189,
+       40,   40,   40,   40,  190,   40,  198,   40,   40,   40,
+      186,  193,  195,   40,  197,  191,  199,   40,   40,   40,
+      200,   40,  201,   40,   40,  194,  196,   40,  208,   40,
+       40,  218,  207,  203,  202,   40,  209,   40,  212,  222,
+      204,   40,   40,  230,  210,  205,  219,  224,  211,   40,
+      214,  220,  213,  215,   40,  223,  216,   40,   40,  217,
+       40,   40,  225,   40,   40,  221,   40,  226,   40,  252,
+      228,   40,   40,  232,  272,  227,   40,  234,  236,   40,
 
-      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,
+      238,  229,   40,  233,  237,  247,  231,   40,   40,  239,
+       40,  235,  249,  254,  240,   40,   40,   40,   40,  248,
+      255,  263,  312,  241,  242,   40,  256,  265,  243,  250,
+       40,  251,   40,  244,   40,  264,  245,  135,  135,  135,
+      135,  246,  258,  258,  258,  258,  266,  267,  329,  259,
+       40,   40,   40,  271,   40,  259,  138,  138,  138,  138,
+       40,  268,   40,  139,   40,  269,  270,  276,   40,  139,
+      260,  261,   40,  262,  262,  262,  262,   40,   40,  277,
+       40,  274,   40,  275,  273,   40,   40,   40,  280,  278,
+      285,   40,   40,  279,   40,  282,  283,   40,  281,   40,
 
-      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,
+       40,   40,  289,   40,   40,   40,   40,   40,  284,   40,
+      293,  287,  295,  296,  286,  299,   40,  294,  291,  288,
+      298,  292,   40,  297,   40,  300,  290,  302,   40,   40,
+       40,  303,   40,   40,   40,   40,   40,  306,  304,  301,
+       40,  307,   40,   40,   40,   40,   40,   40,  309,  349,
+      311,  305,   40,  308,  319,   40,   40,  313,  310,  314,
+      315,  315,  315,  315,  328,  316,  315,  315,  317,  315,
+      315,  315,  315,  315,  315,  318,   40,  325,  324,   40,
+       40,   40,   40,   40,   40,  320,   40,  321,  327,   40,
+       40,  322,   40,  323,  333,  337,   40,  332,  335,   40,
 
-      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,
+       40,  330,   40,  334,  331,   40,  336,   40,   40,   40,
+       40,  343,   40,  338,   40,   40,  342,  339,  341,  340,
+      346,  345,  344,  350,  347,   40,   40,  348,  352,   40,
+      351,   40,   40,  353,  258,  258,  258,  258,   40,  358,
+       40,  259,   40,  361,  354,  260,  260,  259,  356,  356,
+      356,  356,   40,   40,  355,  356,  356,  356,  356,  262,
+      262,  262,  262,   40,  262,  262,  262,  262,   40,  357,
+      359,   40,   40,   40,   40,   40,   40,   40,   40,  362,
+       40,  366,   40,   40,   40,   40,   40,   40,  360,  371,
+      365,  367,  374,  376,   40,  370,  363,  364,  369,   40,
 
-      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,  372,  375,  368,   40,  373,   40,   40,   40,
+       40,   40,  383,   40,   40,   40,   40,  384,   40,   40,
+       40,   40,  377,  378,  382,  381,   40,  379,  388,  380,
+       40,  385,  386,  387,  389,  391,  390,  394,   40,  392,
+       40,  393,   40,   40,   40,   40,   40,   40,   40,  397,
+      399,   40,   40,  395,  401,  398,  396,  403,   40,   40,
+      405,   40,  407,   40,  400,   40,  411,  408,  402,  406,
+      410,  404,   40,  409,  412,   40,   40,   40,   40,   40,
+       40,   40,  414,   40,   40,  415,   40,  413,  416,  420,
+      417,  418,   40,  419,  421,   40,   40,  356,  356,  356,
 
-       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,
+      356,   40,   40,   40,  422,  425,  428,  423,   40,  427,
+      429,   40,   40,  432,   40,  424,   40,  426,  431,  433,
+       40,  434,   40,   40,   40,  430,  436,   40,   40,   40,
+       40,   40,   40,  439,   40,  435,   40,  443,  444,   40,
+       40,  437,  438,   40,  440,  445,  442,  446,  448,   40,
+       40,  441,   40,  447,   40,  449,   40,   40,   40,  450,
+       40,   40,   40,  454,   40,  457,  456,  452,   40,  458,
+      459,  453,  451,  455,   40,  461,   40,  460,   40,   40,
+       40,   40,  462,   40,   40,   40,   40,   40,  465,   40,
+       40,  464,  467,  469,  472,   40,   40,  463,  466,   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,
+      475,  477,  470,  473,  468,   40,   40,   40,  471,  474,
+       40,   40,  476,  478,   40,   40,   40,   40,  483,  480,
+       40,   40,  479,   40,  485,   40,   40,  482,   40,   40,
+      481,   40,  489,  490,   40,  487,  492,   40,  486,  488,
+      494,  493,  484,  491,   40,   40,  495,  499,   40,  496,
+       40,   40,  498,   40,   40,   40,   40,  497,   40,   40,
+      502,   40,   40,  503,   40,  500,  505,  501,  504,  508,
+       40,  506,  509,   40,   40,   40,   40,   40,   40,  510,
+      507,   40,   40,   40,   40,  517,  518,  511,  512,   40,
+      516,   40,   40,  520,  513,  514,   40,  521,  519,   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,
+      523,   40,   40,   40,  522,  527,  524,  528,  529,   40,
+      530,   40,  525,   40,   40,   40,  532,  526,   40,   40,
+       40,   40,  531,   40,  534,   40,   40,   40,   40,  538,
+      539,  547,   40,   40,  533,  542,  544,   40,  535,   40,
+      540,  536,  537,  546,  541,  543,  545,   40,   40,   40,
+      550,   40,   40,  549,  548,   40,  551,  552,  553,   40,
+      555,   40,   40,   40,   40,   40,   40,   40,   40,  558,
+       40,  562,   40,  564,  554,  556,   40,  560,   40,   40,
+      561,   40,  563,   40,  565,   40,  559,   40,  566,   40,
+      557,   40,  569,   40,  570,  567,  573,   40,   40,   40,
 
-      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,  568,  571,   40,  574,   40,  575,  577,  576,   40,
+      572,   40,  579,   40,  582,   40,   40,  580,  584,   40,
+      578,  581,   40,   40,  583,   40,  585,   40,   40,   40,
+       40,   40,  586,  591,  592,  593,   40,  587,   40,   40,
+      588,   40,  589,  597,  590,   40,   40,  598,  596,   40,
+       40,   40,   40,  595,   40,   40,   40,   40,  594,   40,
+      599,   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,
@@ -720,157 +743,165 @@
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       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
+      257,   40,   40,   40,   40,   40,  133,   40,   38,  600,
+        3,  600,  600,  600,  600,  600,  600,  600,  600,  600,
+
+      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
+      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
+      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
+      600,  600,  600,  600
     } ;
 
-static yyconst short int yy_chk[1267] =
+static yyconst short int yy_chk[1335] =
     {   0,
         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,    1,    1,    1,
         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,  571,   17,
-       27,   29,   27,   26,   16,   35,   35,   20,   17,   23,
-       29,   16,   17,   16,   18,   16,   13,   17,   16,   18,
+       10,   10,   10,   11,   11,   11,   11,   11,   12,  489,
+       20,   63,   58,   12,   13,   13,   13,   13,   13,   13,
+       14,   14,   14,   14,   14,   14,   16,   20,   46,   17,
+       20,   26,   63,   46,   16,  489,   92,   20,   17,   54,
+       26,   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,  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,
-       31,   30,   30,   64,   56,   30,   30,   31,   42,   42,
-       42,   42,   57,   94,   30,   56,   30,   30,   52,   30,
-       32,   60,   55,   57,   32,   43,   43,   43,   43,   67,
-       32,   52,   32,   52,   55,   57,   60,   32,   55,   32,
+       17,   18,   19,   61,   22,   26,   92,   19,   54,   24,
+       61,   19,   18,   22,   24,   19,   18,   19,   23,   22,
+       19,   21,   24,   64,   29,   23,   21,   24,   21,   21,
+       34,   24,   25,   29,   23,   23,   21,   25,   36,   34,
+       21,   28,   21,   33,   35,   35,   64,   36,   33,   31,
+       25,   56,   51,   28,   31,  217,   25,   27,   52,   28,
+       51,   33,   56,   35,   28,  217,   27,   31,   27,   74,
+       31,   52,   27,   52,   27,  103,   27,   31,   27,   30,
+       53,   55,   74,   30,   42,   42,   42,   42,   53,   30,
+       60,   30,   30,   55,   30,   30,   30,   55,   30,   43,
 
-       94,   32,   66,   60,   67,   32,   32,   44,   44,   44,
-       44,   44,   45,   45,   45,   45,   45,   45,   47,   47,
-       47,   47,   47,   61,   88,   47,  118,   66,  118,   88,
-       61,   47,   48,   48,   48,   48,   48,   48,   49,   49,
-       49,   49,   49,   62,   49,   49,   63,   49,   49,   49,
-       49,   49,   49,   71,   65,   69,   72,   70,   62,   73,
-       62,   65,   74,   69,   70,   75,   76,   63,   71,   72,
-       77,   74,   78,   65,   75,   71,   79,   73,   80,   81,
-       70,   83,   84,   95,   80,   74,   85,   82,   77,   76,
-       86,   78,   82,   83,   85,   87,   81,   84,   79,   79,
+       43,   43,   43,  103,   30,   60,   30,   30,   66,   30,
+       32,   62,   60,   69,   32,   44,   44,   44,   44,   44,
+       32,   69,   32,   32,   68,   32,   62,   32,   62,   32,
+       78,   32,   81,   66,   67,   32,   32,   45,   45,   45,
+       45,   45,   45,   47,   47,   47,   47,   47,   68,   67,
+       47,   81,  130,   78,  130,  605,   47,   48,   48,   48,
+       48,   48,   48,   49,   49,   49,   49,   49,   57,   49,
+       49,   65,   49,   49,   49,   49,   49,   49,   65,   57,
+       71,   87,   72,   73,   75,   76,   77,   71,   79,   80,
+       65,   57,   82,   84,   76,   77,   87,   72,  603,   73,
 
-       90,   79,   81,   91,   82,   86,   92,   93,   96,  102,
-       87,   95,   99,   90,  139,  102,   91,   97,   98,  100,
-       99,   96,  107,   93,   97,  101,  108,   92,  100,  139,
-       93,  111,   97,   98,  103,   99,   98,  104,  106,   98,
-       97,  107,   98,  101,   97,  114,  109,  103,  110,  111,
-      104,  106,  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,
+       86,   83,   75,   71,   72,   80,   79,   83,   76,   89,
+       84,   88,   86,   85,   82,   82,   84,   82,   85,   88,
+       91,   96,   93,   94,   89,   95,   96,   98,   97,   99,
+       85,   93,   94,  100,   95,   91,   97,  101,  102,  104,
+       98,  105,   99,  108,  117,   93,   94,  599,  105,  106,
+      110,  108,  104,  101,  100,  107,  105,  111,  106,  110,
+      101,  112,  109,  117,  105,  102,  108,  112,  105,  113,
+      107,  109,  106,  107,  114,  111,  107,  116,  118,  107,
+      119,  122,  113,  120,  129,  109,  155,  114,  121,  129,
+      116,  123,  131,  119,  155,  114,  125,  121,  122,  132,
 
-      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,
+      123,  116,  198,  120,  122,  125,  118,  126,  127,  123,
+      142,  121,  127,  131,  123,  124,  128,  143,  145,  126,
+      132,  142,  198,  124,  124,  146,  132,  145,  124,  128,
+      153,  128,  222,  124,  148,  143,  124,  135,  135,  135,
+      135,  124,  136,  136,  136,  136,  146,  148,  222,  136,
+      151,  152,  159,  153,  150,  136,  138,  138,  138,  138,
+      138,  150,  156,  138,  160,  151,  152,  159,  167,  138,
+      139,  139,  157,  139,  139,  139,  139,  139,  158,  160,
+      162,  157,  163,  158,  156,  164,  165,  166,  163,  162,
+      167,  168,  169,  162,  170,  165,  166,  171,  164,  172,
 
-      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,
+      173,  174,  171,  175,  177,  178,  179,  176,  166,  181,
+      174,  169,  175,  176,  168,  179,  180,  174,  173,  170,
+      178,  173,  182,  177,  183,  180,  172,  181,  184,  185,
+      186,  182,  187,  188,  189,  191,  202,  185,  183,  180,
+      201,  186,  206,  207,  249,  209,  219,  597,  188,  249,
+      191,  184,  208,  187,  209,  211,  215,  201,  189,  202,
+      205,  205,  205,  205,  219,  206,  205,  205,  207,  205,
+      205,  205,  205,  205,  205,  208,  210,  215,  211,  218,
+      223,  225,  226,  227,  228,  210,  230,  210,  218,  229,
+      231,  210,  232,  210,  227,  230,  236,  226,  229,  239,
 
-      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,
+      237,  223,  241,  228,  225,  243,  229,  246,  247,  248,
+      596,  241,  245,  231,  252,  250,  239,  232,  237,  236,
+      246,  245,  243,  250,  247,  251,  255,  248,  252,  253,
+      251,  256,  264,  253,  258,  258,  258,  258,  268,  264,
+      595,  258,  593,  268,  255,  259,  259,  258,  259,  259,
+      259,  259,  263,  265,  256,  260,  260,  260,  260,  261,
+      261,  261,  261,  261,  262,  262,  262,  262,  262,  263,
+      265,  267,  272,  273,  274,  275,  276,  278,  277,  272,
+      280,  276,  279,  282,  281,  283,  286,  284,  267,  281,
+      275,  277,  284,  286,  285,  280,  273,  274,  279,  289,
 
-      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,
+      290,  292,  282,  285,  278,  291,  283,  296,  298,  295,
+      299,  300,  296,  312,  302,  301,  591,  298,  304,  303,
+      305,  309,  289,  290,  295,  292,  310,  291,  302,  291,
+      313,  299,  300,  301,  303,  305,  304,  312,  314,  309,
+      316,  310,  318,  319,  320,  321,  325,  590,  322,  316,
+      319,  323,  326,  313,  321,  318,  314,  322,  327,  331,
+      323,  330,  326,  328,  320,  333,  331,  327,  321,  325,
+      330,  322,  334,  328,  333,  336,  338,  346,  341,  342,
+      344,  343,  336,  348,  345,  338,  349,  334,  341,  345,
+      342,  343,  351,  344,  346,  353,  354,  356,  356,  356,
 
-      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,
+      356,  358,  359,  361,  348,  353,  358,  349,  363,  354,
+      359,  362,  364,  363,  366,  351,  365,  353,  362,  364,
+      367,  365,  368,  369,  370,  361,  367,  371,  372,  373,
+      374,  376,  379,  370,  380,  366,  381,  374,  376,  382,
+      383,  368,  369,  384,  371,  379,  373,  380,  382,  385,
+      386,  372,  387,  381,  388,  383,  390,  391,  392,  384,
+      393,  394,  396,  388,  398,  392,  391,  386,  395,  393,
+      394,  387,  385,  390,  399,  396,  407,  395,  408,  409,
+      411,  412,  398,  416,  413,  419,  422,  420,  408,  423,
+      426,  407,  411,  413,  420,  421,  425,  399,  409,  424,
 
-      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,
+      423,  425,  416,  421,  412,  427,  429,  430,  419,  422,
+      432,  433,  424,  426,  434,  435,  436,  437,  433,  429,
+      443,  438,  427,  589,  435,  448,  460,  432,  442,  447,
+      430,  450,  442,  442,  453,  437,  447,  451,  436,  438,
+      450,  448,  434,  443,  452,  455,  451,  460,  461,  452,
+      462,  464,  455,  465,  472,  471,  476,  453,  477,  479,
+      464,  478,  480,  465,  482,  461,  472,  462,  471,  478,
+      484,  476,  479,  487,  488,  490,  491,  493,  495,  480,
+      477,  494,  496,  497,  499,  491,  493,  482,  484,  500,
+      490,  498,  502,  495,  487,  488,  503,  496,  494,  507,
 
-      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,
+      498,  506,  504,  505,  497,  503,  499,  504,  505,  508,
+      506,  509,  500,  510,  512,  517,  508,  502,  513,  514,
+      515,  519,  507,  518,  510,  529,  520,  526,  528,  515,
+      517,  529,  524,  535,  509,  520,  526,  533,  512,  527,
+      518,  513,  514,  528,  519,  524,  527,  531,  532,  539,
+      533,  540,  538,  532,  531,  541,  535,  538,  539,  542,
+      541,  543,  544,  545,  546,  547,  548,  549,  550,  544,
+      552,  548,  553,  550,  540,  542,  554,  546,  555,  558,
+      547,  560,  549,  556,  552,  557,  545,  561,  553,  562,
+      543,  563,  556,  564,  557,  554,  561,  567,  566,  568,
 
-      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,
+      569,  555,  558,  571,  562,  572,  563,  566,  564,  574,
+      560,  575,  568,  576,  572,  577,  578,  569,  575,  580,
+      567,  571,  579,  581,  574,  582,  576,  583,  584,  585,
+      586,  588,  577,  582,  583,  584,  592,  578,  594,  598,
+      579,  587,  580,  592,  581,  573,  570,  594,  588,  565,
+      559,  551,  537,  586,  536,  534,  530,  525,  585,  523,
+      598,  601,  601,  601,  601,  602,  602,  604,  522,  604,
+      604,  521,  516,  511,  501,  492,  486,  485,  483,  481,
+      475,  474,  473,  470,  469,  468,  467,  466,  463,  459,
+      458,  457,  456,  454,  449,  446,  445,  444,  441,  440,
 
-      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
+      439,  431,  428,  418,  417,  415,  414,  410,  406,  405,
+      404,  403,  402,  401,  400,  397,  389,  378,  377,  375,
+      360,  357,  355,  352,  350,  347,  340,  339,  337,  335,
+      332,  329,  324,  317,  311,  308,  307,  306,  297,  294,
+      293,  288,  287,  271,  270,  269,  266,  254,  244,  242,
+      240,  238,  235,  234,  233,  224,  221,  220,  216,  214,
+      213,  212,  204,  203,  200,  199,  197,  196,  195,  194,
+      193,  192,  190,  161,  154,  149,  147,  144,  141,  137,
+      133,  115,   90,   70,   59,   39,   37,    8,    7,    3,
+      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
+
+      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
+      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
+      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
+      600,  600,  600,  600
     } ;
 
 static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
@@ -948,7 +979,7 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 952 "UpgradeLexer.cpp"
+#line 983 "UpgradeLexer.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1102,7 +1133,7 @@
 #line 99 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 
 
-#line 1106 "UpgradeLexer.cpp"
+#line 1137 "UpgradeLexer.cpp"
 
 	if ( yy_init )
 		{
@@ -1150,14 +1181,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 >= 567 )
+				if ( yy_current_state >= 601 )
 					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 != 566 );
+		while ( yy_current_state != 600 );
 
 yy_find_action:
 		yy_current_state = *--yy_state_ptr;
@@ -1595,246 +1626,356 @@
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 186 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( PHI_TOK); }
+#line 185 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(ICMP); }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 187 "/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(FCMP); }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 188 "/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(EQ); }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 189 "/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(NE); }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 190 "/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(SLT); }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 191 "/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(SGT); }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 192 "/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(SLE); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 193 "/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(SGE); }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 194 "/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(OEQ); }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 195 "/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(ONE); }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 196 "/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(OLT); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 197 "/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(OGT); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 198 "/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(OLE); }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 199 "/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(OGE); }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 200 "/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(ORD); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 201 "/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(UNO); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 202 "/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(UEQ); }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 203 "/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(UNE); }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 204 "/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(ULT); }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 205 "/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(UGT); }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 206 "/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(ULE); }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 207 "/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(UGE); }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
 #line 208 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( BR); }
+{ RET_TOK( PHI_TOK); }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
 #line 209 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SWITCH); }
+{ RET_TOK( CALL); }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
 #line 210 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( INVOKE); }
+{ RET_TOK( CAST); }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
 #line 211 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UNWIND); }
+{ RET_TOK( TRUNC); }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
 #line 212 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( EXCEPT); } // alias for unwind
+{ RET_TOK( ZEXT); }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
 #line 213 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UNREACHABLE); }
+{ RET_TOK( SEXT); }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 215 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( MALLOC); }
+#line 214 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FPTRUNC); }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 216 "/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( FPEXT); }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 217 "/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( FPTOUI); }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 218 "/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( FPTOSI); }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 219 "/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( UITOFP); }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 220 "/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( SITOFP); }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 222 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( EXTRACTELEMENT); }
+#line 220 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( PTRTOINT); }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 223 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( INSERTELEMENT); }
+#line 221 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( INTTOPTR); }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 224 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SHUFFLEVECTOR); }
+#line 222 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( BITCAST); }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 227 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( VAR_ID); }
+#line 223 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SELECT); }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 228 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LABELSTR); }
+#line 224 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SHL); }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 229 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LABELSTR); }
+#line 225 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SHR); }
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 230 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( STRINGCONSTANT ); }
+#line 226 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ASHR); }
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 231 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( EUINT64VAL ); }
+#line 227 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( LSHR); }
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 232 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ESINT64VAL ); }
+#line 228 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( VAARG); }
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 233 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( yytext[0] == 's' ? ESINT64VAL : EUINT64VAL ); }
+#line 229 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( RET); }
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 234 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UINTVAL); }
+#line 230 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( BR); }
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 235 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SINTVAL); }
+#line 231 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SWITCH); }
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 236 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FPVAL); }
+#line 232 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( INVOKE); }
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
+#line 233 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UNWIND); }
+	YY_BREAK
+case 129:
+YY_RULE_SETUP
+#line 234 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( EXCEPT); } // alias for unwind
+	YY_BREAK
+case 130:
+YY_RULE_SETUP
+#line 235 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UNREACHABLE); }
+	YY_BREAK
+case 131:
+YY_RULE_SETUP
 #line 237 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( MALLOC); }
+	YY_BREAK
+case 132:
+YY_RULE_SETUP
+#line 238 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ALLOCA); }
+	YY_BREAK
+case 133:
+YY_RULE_SETUP
+#line 239 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FREE); }
+	YY_BREAK
+case 134:
+YY_RULE_SETUP
+#line 240 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( LOAD); }
+	YY_BREAK
+case 135:
+YY_RULE_SETUP
+#line 241 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( STORE); }
+	YY_BREAK
+case 136:
+YY_RULE_SETUP
+#line 242 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( GETELEMENTPTR); }
+	YY_BREAK
+case 137:
+YY_RULE_SETUP
+#line 244 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( EXTRACTELEMENT); }
+	YY_BREAK
+case 138:
+YY_RULE_SETUP
+#line 245 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( INSERTELEMENT); }
+	YY_BREAK
+case 139:
+YY_RULE_SETUP
+#line 246 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SHUFFLEVECTOR); }
+	YY_BREAK
+case 140:
+YY_RULE_SETUP
+#line 249 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( VAR_ID); }
+	YY_BREAK
+case 141:
+YY_RULE_SETUP
+#line 250 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( LABELSTR); }
+	YY_BREAK
+case 142:
+YY_RULE_SETUP
+#line 251 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( LABELSTR); }
+	YY_BREAK
+case 143:
+YY_RULE_SETUP
+#line 252 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( STRINGCONSTANT ); }
+	YY_BREAK
+case 144:
+YY_RULE_SETUP
+#line 253 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( EUINT64VAL ); }
+	YY_BREAK
+case 145:
+YY_RULE_SETUP
+#line 254 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ESINT64VAL ); }
+	YY_BREAK
+case 146:
+YY_RULE_SETUP
+#line 255 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( yytext[0] == 's' ? ESINT64VAL : EUINT64VAL ); }
+	YY_BREAK
+case 147:
+YY_RULE_SETUP
+#line 256 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UINTVAL); }
+	YY_BREAK
+case 148:
+YY_RULE_SETUP
+#line 257 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SINTVAL); }
+	YY_BREAK
+case 149:
+YY_RULE_SETUP
+#line 258 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FPVAL); }
+	YY_BREAK
+case 150:
+YY_RULE_SETUP
+#line 259 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( FPVAL); }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 238 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 260 "/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!
@@ -1843,22 +1984,22 @@
                   return EOF;
                 }
 	YY_BREAK
-case 129:
+case 151:
 YY_RULE_SETUP
-#line 246 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 268 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { /* Ignore whitespace */ }
 	YY_BREAK
-case 130:
+case 152:
 YY_RULE_SETUP
-#line 247 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 269 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 { return yytext[0]; }
 	YY_BREAK
-case 131:
+case 153:
 YY_RULE_SETUP
-#line 249 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 271 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 1862 "UpgradeLexer.cpp"
+#line 2003 "UpgradeLexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2145,7 +2286,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 >= 567 )
+			if ( yy_current_state >= 601 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2175,11 +2316,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 >= 567 )
+		if ( yy_current_state >= 601 )
 			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 == 566);
+	yy_is_jam = (yy_current_state == 600);
 	if ( ! yy_is_jam )
 		*yy_state_ptr++ = yy_current_state;
 
@@ -2736,5 +2877,5 @@
 	return 0;
 	}
 #endif
-#line 249 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 271 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"