Regenerate.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32772 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/llvm-upgrade/UpgradeLexer.cpp b/tools/llvm-upgrade/UpgradeLexer.cpp
index f7cebbe..722ffc6 100644
--- a/tools/llvm-upgrade/UpgradeLexer.cpp
+++ b/tools/llvm-upgrade/UpgradeLexer.cpp
@@ -317,38 +317,39 @@
 	*yy_cp = '\0'; \
 	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 153
-#define YY_END_OF_BUFFER 154
-static yyconst short int yy_acclist[231] =
+#define YY_NUM_RULES 154
+#define YY_END_OF_BUFFER 155
+static yyconst short int yy_acclist[232] =
     {   0,
-      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,
+      155,  153,  154,  152,  153,  154,  152,  154,  153,  154,
+      153,  154,  153,  154,  153,  154,  153,  154,  153,  154,
+      145,  153,  154,  145,  153,  154,    1,  153,  154,  153,
+      154,  153,  154,  153,  154,  153,  154,  153,  154,  153,
+      154,  153,  154,  153,  154,  153,  154,  153,  154,  153,
+      154,  153,  154,  153,  154,  153,  154,  153,  154,  153,
+      154,  153,  154,  153,  154,  153,  154,  153,  154,  153,
+      154,  144,  142,  141,  141,  148,  146,  150,  145,    1,
+      126,   40,   84,   85,   74,   24,  144,  141,  141,  149,
+      150,   21,  150,  151,   62,   73,   38,   33,   41,   65,
 
-        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,
+        3,   53,   64,   90,   95,   93,   94,   92,   91,   96,
+      104,   69,  125,   89,   87,  120,  121,   88,   86,   63,
+       98,  103,  101,  102,  100,   99,   97,   75,  143,  150,
+      150,  122,   48,  105,  106,   83,   68,  134,   72,   82,
+      135,   55,  123,   23,  147,   67,  109,   71,   25,    4,
+       61,   66,   54,   70,   47,   12,  108,  150,   35,    2,
+        5,   57,  111,   59,   49,   77,   81,   79,   80,   78,
+       76,   51,  136,  107,   50,   56,   22,  133,   44,    7,
+       58,   29,  130,   43,  113,  112,    8,  128,   32,  132,
+       37,   60,  119,  115,  127,   26,   27,  114,  129,   52,
 
-      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
+      124,  118,   42,    6,   28,  110,   36,    9,   17,   10,
+      117,   11,  116,   34,   13,   15,   14,   31,   39,   16,
+       30,  131,  137,  139,  140,   18,   45,  138,   19,   46,
+       20
     } ;
 
-static yyconst short int yy_accept[602] =
+static yyconst short int yy_accept[606] =
     {   0,
         1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
        17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
@@ -367,56 +368,56 @@
        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,
+      100,  100,  101,  101,  101,  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,
+      102,  103,  103,  103,  103,  103,  103,  103,  103,  103,
+      103,  104,  104,  105,  106,  107,  108,  109,  110,  110,
 
-      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,
+      111,  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,  136,  137,
+      138,  138,  138,  138,  138,  139,  140,  140,  140,  141,
 
-      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,
+      141,  141,  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,  161,  162,  162,
+      163,  164,  164,  164,  164,  164,  164,  164,  164,  164,
+      164,  164,  165,  165,  165,  165,  165,  165,  165,  165,
 
-      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,
+      166,  166,  166,  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,  181,
+      181,  181,  181,  182,  183,  184,  184,  184,  185,  186,
+      187,  187,  187,  188,  188,  188,  188,  188,  189,  189,
+      190,  191,  192,  193,  193,  193,  193,  194,  194,  194,
+      195,  196,  197,  198,  199,  199,  199,  200,  201,  202,
+      202,  202,  202,  202,  202,  203,  203,  204,  204,  205,
+      206,  206,  206,  206,  206,  206,  207,  207,  207,  207,
 
-      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,
+      207,  207,  207,  207,  207,  208,  208,  208,  208,  208,
+      208,  208,  208,  208,  208,  209,  209,  209,  209,  209,
+      210,  210,  210,  210,  210,  211,  212,  213,  213,  214,
+      214,  214,  214,  214,  215,  215,  215,  215,  216,  216,
+      217,  218,  218,  218,  218,  218,  218,  218,  218,  218,
+      218,  218,  218,  218,  218,  219,  219,  219,  219,  219,
+      219,  219,  219,  220,  220,  220,  220,  220,  220,  221,
+      221,  221,  221,  221,  222,  222,  222,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  224,  224,  225,  226,  227,  227,  228,  228,  229,
 
-      231
+      230,  231,  231,  232,  232
     } ;
 
 static yyconst int yy_ec[256] =
@@ -460,149 +461,149 @@
         3,    3,    3
     } ;
 
-static yyconst short int yy_base[606] =
+static yyconst short int yy_base[610] =
     {   0,
-        0,    0, 1290, 1291, 1291, 1291, 1285, 1274,   36,   40,
+        0,    0, 1298, 1299, 1299, 1299, 1293, 1282,   36,   40,
        44,   50,   56,   62,    0,   63,   66,   81,   89,   47,
       108,   91,  105,   96,  119,   68,  144,  128,  111,  170,
-      136,  201,  130,  117,  132,  125, 1283, 1291, 1272, 1291,
+      136,  201,  130,  117,  132,  125, 1291, 1299, 1280, 1299,
         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,
+      139,  145,  167,   76,  168,  138,  255,   31, 1279,  177,
+       90,  198,   48,  110,  258,  195,  221,  211,  200, 1278,
       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,
+      219,  279,  288,  280,  300,  287,  283,  306,  296, 1277,
+      307,   73,  309,  310,  312,  308,  315,  316,  324,  320,
 
-      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,
+      326,  325,  162,  327,  328,  330,  344,  338,  347,  336,
+      348,  354,  350,  358, 1276,  364,  357,  367,  369,  372,
+      374,  373,  375,  399,  378,  389,  381,  391,  400,  241,
+      394,  402, 1275,    0,  434,  438, 1274,  452,  469,    0,
+     1273,  403,  409, 1272,  410,  418, 1271,  411, 1270,  421,
+      438,  442,  422, 1269,  446,  456,  464,  470,  443,  413,
+      444, 1268,  471,  380,  472,  474,  477,  460,  476,  481,
+      479,  487,  488,  489,  493,  494,  490,  495,  491,  508,
+      511,  501,  512,  513,  505,  516,  518,  522,  523,  416,
+     1267,  525, 1266, 1265, 1264, 1263, 1262, 1261,  526, 1260,
 
-      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,
+     1259,  530,  531, 1258, 1257,  559,  536,  535,  548,  532,
+      563,  550, 1256, 1255, 1254,  549, 1253,  142,  533,  575,
+     1252, 1251,  537,  576, 1250,  577,  579,  581,  582,  586,
+      587,  583,  584, 1249, 1248, 1247,  585,  589, 1246,  588,
+     1245,  590, 1244,  598, 1243,  602,  539,  604,  610,  612,
+      613,  614,  616,  618, 1242,  623,  624, 1299,  635,  652,
+      656,  660,  665,  625,  544,  626, 1241,  666,  635, 1240,
+     1239, 1238,  629,  667,  668,  669,  670,  671,  672,  673,
+      676,  674,  677,  678,  680,  681,  687,  695, 1237, 1236,
+      693,  694,  698,  679, 1235, 1234,  699,  704, 1233,  706,
 
-      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,
+      705,  707,  711,  710,  708,  712,  718, 1232, 1231, 1230,
+      713,  719, 1229,  721,  725,  732,    0,  727, 1228,  738,
+      735,  737,  740,  743,  744, 1227,  739,  627,  746,  754,
+     1226,  747,  758, 1225,  759,  760, 1224,  767, 1223,  761,
+     1222, 1221,  769,  771,  773,  772,  776,  777, 1220,  778,
+      780, 1219,  784, 1218,  786,  787, 1217,  792, 1216,  792,
+      795, 1215,  793,  798,  804,  806,  811,  802,  810,  812,
+      814,  817,  820,  821,  822,  824,  825, 1214,  827, 1213,
+     1212,  826,  830,  831,  828,  835,  840,  842,  844,  847,
+      846, 1211,  851,  849,  852,  853,  854,  860,  857, 1210,
 
-     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,
+      864,  867, 1209, 1208, 1207, 1206, 1205, 1204, 1203,  871,
+      873,  872, 1202,  875,  874,  876, 1201, 1200,  877, 1199,
+     1198,  878,  881,  884,  879,  889,  880,  894,  895,  898,
+     1197,  903,  904, 1196,  905,  906,  907,  908, 1195,  909,
+      910,  911, 1194, 1193, 1192,  919,  914, 1191, 1190, 1189,
+      925,  920, 1188,  912,  930,  933,  926, 1187,  934, 1186,
+     1185, 1184, 1183,  940,  942,  943, 1182,  944,  945, 1181,
+     1180, 1179, 1178, 1177,  950,  946, 1176, 1175, 1174,  947,
+      948,  956,  952,  951, 1173,  954, 1172,  957, 1171, 1170,
+      966,  967,   46,  969,  971, 1169,  972,  973,  974,  976,
 
-     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,
+      978,  983,  979,  982, 1168,  985,  986,  993,  997,  994,
+      996, 1000, 1004, 1006, 1167, 1008, 1011, 1012, 1009, 1166,
+     1013, 1014, 1015, 1016, 1165, 1164, 1161, 1020, 1152, 1021,
+     1022, 1024, 1036, 1150, 1037, 1040, 1041, 1149, 1023, 1148,
+     1147, 1043, 1047, 1026, 1050, 1051, 1052, 1053, 1057, 1058,
+     1059, 1061, 1062, 1063, 1145, 1064, 1069, 1065, 1070, 1073,
+     1079, 1072, 1144, 1075, 1083, 1076, 1086, 1087, 1143, 1089,
+     1090, 1094, 1097, 1140, 1099, 1096, 1139, 1100, 1103, 1106,
+     1108, 1109, 1111, 1112, 1116, 1118, 1120, 1121, 1122, 1123,
+     1136, 1124, 1134,  741,  639, 1131,  591, 1133,  545,  497,
 
-     1161, 1163,  296, 1167,  253
+      334, 1132,  331, 1299, 1167, 1169,  296, 1173,  253
     } ;
 
-static yyconst short int yy_def[606] =
+static yyconst short int yy_def[610] =
     {   0,
-      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,
+      604,    1,  604,  604,  604,  604,  605,  606,  607,  604,
+      606,  606,  606,  606,  608,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  605,  604,  606,  604,
+      609,  609,  604,  604,  606,  606,  606,  606,  606,  608,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
 
-      602,  602,  602,  602,  602,  602,  602,  602,  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,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  604,  609,  609,  604,  606,  606,  606,   49,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
 
-      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,
+      606,  606,  606,  606,  606,   49,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  604,  604,  604,
+      604,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
 
-      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,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  206,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  604,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
 
-      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
-      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
-      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
-      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
-      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
-      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
-      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
-      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
-      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
-      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
 
-      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
-      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
-      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
-      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
-      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
-      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
-      602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
-      602,  602,  602,  602,  602,  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,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
+      606,  606,  606,  606,  606,  606,  606,  606,  606,  606,
 
-      600,  600,  600,  600,  600
+      606,  606,  606,    0,  604,  604,  604,  604,  604
     } ;
 
-static yyconst short int yy_nxt[1335] =
+static yyconst short int yy_nxt[1343] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   14,   14,    4,   15,    8,    8,    8,   16,   17,
@@ -612,127 +613,127 @@
        44,   44,   44,   45,   45,   45,   45,   40,   46,   40,
        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,
+       70,   40,  157,   40,   51,  519,   40,   71,   56,   40,
        90,   52,   57,   53,   40,   54,   49,   58,   55,   60,
 
-       59,   61,   40,   40,   40,   91,  192,   64,  145,   40,
+       59,   61,   40,   40,   40,   91,  193,   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,
+      141,  128,  148,  131,  100,  328,   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,   40,  171,   40,  135,  135,  135,  135,  144,  103,
        40,  104,  105,  146,  106,  107,  108,  147,  109,   43,
 
-       43,   43,   43,  206,  110,  152,  111,  112,   40,  113,
+       43,   43,   43,  207,  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,
+      118,  165,  119,  120,   40,  121,  155,  122,  156,  123,
+       40,  124,   40,  162,   40,  125,  126,   47,   45,   45,
+       45,   45,   40,  138,  138,  138,  138,   40,  164,  163,
+      139,  179,  254,  176,   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,  160,   40,   40,   40,   40,   40,  166,   40,   40,
+      161,  150,   40,   40,  173,  175,   40,  168,   41,  170,
 
-       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,
+       40,   40,  172,  167,  169,  178,  177,  183,  174,   40,
+      184,  189,  188,   40,  180,  181,  185,  182,  186,   40,
+       40,   40,   40,   40,  191,   40,  199,  190,   40,   40,
+      187,  194,  196,   40,  198,  192,  200,   40,   40,   40,
+       40,   40,  201,   40,   40,  195,  197,   40,  209,   40,
+      202,   40,  213,  208,  203,  204,  210,   40,  223,  219,
+       40,   40,  205,   40,  211,  206,  214,   40,  212,  221,
+       40,   40,  215,  225,  220,  216,  226,   40,  217,  224,
+       40,  218,   40,  222,  227,   40,   40,   40,   40,  231,
+      229,   40,  228,   40,   40,  233,  235,  239,  250,  282,
 
-      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,
+      248,  230,   40,  237,   40,  234,  240,   40,  232,  238,
+      236,  241,   40,   40,  249,   40,   40,  251,  253,  252,
+      242,  243,   40,   40,   40,  244,   40,  264,  255,   40,
+      245,   40,  266,  246,   40,   40,  256,  268,  247,  278,
+      265,  269,  257,  135,  135,  135,  135,  259,  259,  259,
+      259,   40,  267,  312,  260,   40,   40,   40,  272,   40,
+      260,  138,  138,  138,  138,   40,  270,  273,  139,   40,
+      271,  277,  279,   40,  139,  261,  262,   40,  263,  263,
+      263,  263,   40,   40,   40,   40,  275,   40,  276,   40,
+       40,  274,   40,  280,   40,  287,  284,  281,  283,  285,
 
-       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,
+       40,   40,   40,   40,   40,  291,   40,   40,   40,  298,
+       40,  286,  288,  289,   40,  295,  297,  290,   40,  300,
+      293,   40,  296,  294,   40,   40,   40,  299,  292,   40,
+      301,   40,  304,  302,  305,   40,   40,  308,   40,   40,
+      306,  307,  309,   40,   40,   40,   40,  303,   40,   40,
+       40,  311,   40,  313,  321,  329,  310,   40,   40,  314,
+      315,   40,   40,   40,  360,  348,  331,  316,  317,  317,
+      317,  317,  318,  319,  317,  317,   40,  317,  317,  317,
+      317,  317,  317,  327,  320,  322,  326,  323,   40,   40,
+       40,  324,   40,  325,   40,   40,   40,   40,   40,   40,
 
-       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,
+       40,   40,   40,   40,   40,  335,  330,  334,  337,  339,
+      332,   40,  345,  333,  336,   40,  338,   40,  344,  340,
+      343,  342,  341,   40,  347,   40,   40,   40,  346,   40,
+      351,   40,  353,  349,  352,  355,   40,   40,   40,   40,
+       40,  350,   40,  354,  259,  259,  259,  259,   40,  364,
+      410,  260,   40,  363,  356,  359,  361,  260,  261,  261,
+      357,  358,  358,  358,  358,  358,  358,  358,  358,  263,
+      263,  263,  263,   40,  263,  263,  263,  263,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,  368,   40,
+       40,   40,   40,   40,   40,  374,  362,  367,  370,  377,
 
-       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,  369,  373,  365,  366,  372,   40,   40,   40,  378,
+      375,   40,   40,  371,  376,  379,  384,   40,   40,   40,
+       40,   40,  386,   40,   40,   40,   40,  385,  387,  380,
+      381,   40,   40,  382,   40,  383,  392,  391,   40,  388,
+       40,  389,  390,  393,  395,   40,  394,  396,   40,  400,
+       40,   40,   40,   40,   40,  402,   40,   40,  397,   40,
+       40,  398,  404,  399,  401,  406,  408,   40,  411,  413,
+      403,   40,   40,   40,   40,  409,  405,  412,  414,  407,
+       40,  415,   40,  418,   40,   40,   40,  417,  416,   40,
+       40,   40,  419,   40,  423,  420,  421,   40,  422,   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,
+       40,  358,  358,  358,  358,   40,   40,  424,   40,  428,
+      431,   40,  425,  430,  426,   40,  432,   40,  434,   40,
+      427,  429,  435,   40,   40,   40,  436,   40,  433,  437,
+       40,  440,  439,   40,   40,   40,  438,   40,   40,   40,
+       40,   40,  443,   40,   40,  447,  441,  448,   40,  442,
+      452,  444,  449,   40,  446,   40,  450,   40,  445,   40,
+       40,  451,   40,  453,   40,   40,   40,   40,  458,  454,
+       40,  460,  461,   40,  456,  462,  463,   40,  455,  457,
+       40,  459,  464,  465,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,  466,  469,   40,  473,  468,
 
-      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,
+      471,  476,   40,  467,  470,  477,  480,   40,   40,  474,
+      472,   40,  481,  479,  475,  478,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,  487,   40,  483,  484,
+      489,  482,   40,   40,  498,  486,  493,  494,   40,   40,
+      485,  491,  492,   40,  490,  496,   40,   40,  488,  497,
+      495,  500,  499,   40,  502,   40,   40,   40,   40,   40,
+       40,   40,  501,   40,   40,   40,  506,   40,  507,   40,
+       40,  509,  504,  505,  503,  510,  508,  512,  513,   40,
+       40,  514,   40,  511,   40,   40,   40,   40,  516,   40,
+      515,   40,   40,  521,  522,   40,   40,  520,   40,   40,
 
-      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,
+      517,  518,  524,  523,  525,  527,   40,   40,  531,   40,
+       40,  532,  526,   40,  528,  533,  534,   40,  529,   40,
+      536,   40,   40,  530,   40,   40,   40,   40,   40,   40,
+      538,  542,  535,   40,   40,   40,   40,   40,  546,   40,
+      537,  543,  549,  548,  544,  539,  547,  540,  541,   40,
+       40,  545,  550,   40,   40,  551,   40,  552,  553,  555,
+       40,  556,  558,   40,   40,   40,   40,  554,  559,  557,
+       40,   40,   40,  562,   40,   40,   40,   40,   40,  566,
+      560,  568,   40,   40,  564,   40,   40,  565,   40,   40,
+      567,  569,   40,  563,  561,  573,   40,  571,  570,   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,  574,   40,   40,  578,  577,  572,   40,  575,   40,
+       40,  581,   40,   40,  579,  580,   40,  576,  586,   40,
+      583,   40,   40,  588,   40,   40,  582,  584,  587,   40,
+      585,   40,  589,   40,   40,   40,   40,   40,  590,  595,
+      596,  597,  592,  591,   40,   40,   40,   40,  593,   40,
+      594,  601,   40,   40,  600,  602,   40,   40,   40,  599,
+       40,   40,   40,   40,  598,   40,  603,   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,
 
@@ -744,26 +745,27 @@
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-      257,   40,   40,   40,   40,   40,  133,   40,   38,  600,
-        3,  600,  600,  600,  600,  600,  600,  600,  600,  600,
+       40,   40,   40,   40,   40,   40,   40,   40,  258,   40,
+       40,   40,   40,   40,  133,   40,   38,  604,    3,  604,
 
-      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
+      604,  604,  604,  604,  604,  604,  604,  604,  604,  604,
+      604,  604,  604,  604,  604,  604,  604,  604,  604,  604,
+      604,  604,  604,  604,  604,  604,  604,  604,  604,  604,
+      604,  604,  604,  604,  604,  604,  604,  604,  604,  604,
+      604,  604
     } ;
 
-static yyconst short int yy_chk[1335] =
+static yyconst short int yy_chk[1343] =
     {   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,  489,
+       10,   10,   10,   11,   11,   11,   11,   11,   12,  493,
        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,
+       20,   26,   63,   46,   16,  493,   92,   20,   17,   54,
        26,   16,   17,   16,   18,   16,   13,   17,   16,   18,
 
        17,   18,   19,   61,   22,   26,   92,   19,   54,   24,
@@ -771,8 +773,8 @@
        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,
+       25,   56,   51,   28,   31,  218,   25,   27,   52,   28,
+       51,   33,   56,   35,   28,  218,   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,
@@ -782,126 +784,127 @@
        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,
+       47,   81,  130,   78,  130,  609,   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,
+       71,   65,   72,   73,   75,   76,   77,   71,   79,   80,
+       65,   57,   82,   84,   76,   77,   87,   72,  607,   73,
 
        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,
+       84,   87,   86,   85,   82,   82,   84,   82,   85,   88,
+       91,   96,   93,   94,   89,   95,   96,   88,   97,   98,
+       85,   93,   94,  100,   95,   91,   97,   99,  102,  101,
+      104,  105,   98,  106,  603,   93,   94,  601,  105,  110,
+       99,  108,  106,  104,  100,  101,  105,  107,  110,  108,
+      109,  111,  101,  113,  105,  102,  106,  112,  105,  109,
+      117,  114,  107,  112,  108,  107,  113,  116,  107,  111,
+      118,  107,  119,  109,  114,  120,  122,  121,  123,  117,
+      116,  125,  114,  164,  127,  119,  121,  123,  127,  164,
 
-      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,
+      125,  116,  126,  122,  128,  120,  123,  131,  118,  122,
+      121,  123,  124,  129,  126,  132,  142,  128,  129,  128,
+      124,  124,  143,  145,  148,  124,  160,  142,  131,  190,
+      124,  146,  145,  124,  150,  153,  132,  148,  124,  160,
+      143,  150,  132,  135,  135,  135,  135,  136,  136,  136,
+      136,  151,  146,  190,  136,  152,  159,  161,  153,  155,
+      136,  138,  138,  138,  138,  138,  151,  155,  138,  156,
+      152,  159,  161,  168,  138,  139,  139,  157,  139,  139,
+      139,  139,  139,  158,  163,  165,  157,  166,  158,  169,
+      167,  156,  171,  163,  170,  168,  166,  163,  165,  167,
 
-      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,
+      172,  173,  174,  177,  179,  172,  175,  176,  178,  177,
+      600,  167,  169,  170,  182,  175,  176,  171,  185,  179,
+      174,  180,  175,  174,  181,  183,  184,  178,  173,  186,
+      180,  187,  182,  181,  183,  188,  189,  186,  192,  199,
+      184,  185,  187,  202,  203,  210,  219,  181,  208,  207,
+      223,  189,  247,  192,  210,  219,  188,  265,  599,  199,
+      202,  209,  216,  212,  265,  247,  223,  203,  206,  206,
+      206,  206,  207,  208,  206,  206,  211,  206,  206,  206,
+      206,  206,  206,  216,  209,  211,  212,  211,  220,  224,
+      226,  211,  227,  211,  228,  229,  232,  233,  237,  230,
 
-      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,
+      231,  240,  238,  242,  597,  228,  220,  227,  230,  231,
+      224,  244,  242,  226,  229,  246,  230,  248,  240,  232,
+      238,  237,  233,  249,  246,  250,  251,  252,  244,  253,
+      250,  254,  252,  248,  251,  254,  256,  257,  264,  266,
+      328,  249,  273,  253,  259,  259,  259,  259,  269,  273,
+      328,  259,  595,  269,  256,  264,  266,  259,  260,  260,
+      257,  260,  260,  260,  260,  261,  261,  261,  261,  262,
+      262,  262,  262,  262,  263,  263,  263,  263,  263,  268,
+      274,  275,  276,  277,  278,  279,  280,  282,  277,  281,
+      283,  284,  294,  285,  286,  283,  268,  276,  279,  286,
 
-      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,
+      287,  278,  282,  274,  275,  281,  291,  292,  288,  287,
+      284,  293,  297,  280,  285,  288,  294,  298,  301,  300,
+      302,  305,  298,  304,  303,  306,  311,  297,  300,  291,
+      292,  307,  312,  293,  314,  293,  305,  304,  315,  301,
+      318,  302,  303,  306,  311,  316,  307,  312,  321,  318,
+      322,  320,  327,  323,  594,  321,  324,  325,  314,  329,
+      332,  315,  323,  316,  320,  324,  325,  330,  329,  332,
+      322,  333,  335,  336,  340,  327,  323,  330,  333,  324,
+      338,  335,  343,  340,  344,  346,  345,  338,  336,  347,
+      348,  350,  343,  351,  347,  344,  345,  353,  346,  355,
 
-      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,
+      356,  358,  358,  358,  358,  360,  363,  348,  361,  355,
+      360,  364,  350,  356,  351,  368,  361,  365,  364,  366,
+      353,  355,  365,  369,  367,  370,  366,  371,  363,  367,
+      372,  370,  369,  373,  374,  375,  368,  376,  377,  382,
+      379,  385,  373,  383,  384,  377,  371,  379,  386,  372,
+      385,  374,  382,  387,  376,  388,  383,  389,  375,  391,
+      390,  384,  394,  386,  393,  395,  396,  397,  391,  387,
+      399,  394,  395,  398,  389,  396,  397,  401,  388,  390,
+      402,  393,  398,  399,  410,  412,  411,  415,  414,  416,
+      419,  422,  425,  427,  423,  401,  411,  424,  416,  410,
 
-      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,
+      414,  423,  426,  402,  412,  424,  427,  428,  429,  419,
+      415,  430,  428,  426,  422,  425,  432,  433,  435,  436,
+      437,  438,  440,  441,  442,  454,  436,  447,  430,  432,
+      438,  429,  446,  452,  454,  435,  446,  446,  451,  457,
+      433,  441,  442,  455,  440,  451,  456,  459,  437,  452,
+      447,  456,  455,  464,  459,  465,  466,  468,  469,  476,
+      480,  481,  457,  475,  484,  483,  468,  486,  469,  482,
+      488,  476,  465,  466,  464,  480,  475,  482,  483,  491,
+      492,  484,  494,  481,  495,  497,  498,  499,  488,  500,
+      486,  501,  503,  495,  497,  504,  502,  494,  506,  507,
 
-      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,
+      491,  492,  499,  498,  500,  502,  508,  510,  507,  511,
+      509,  508,  501,  512,  503,  509,  510,  513,  504,  514,
+      512,  516,  519,  506,  517,  518,  521,  522,  523,  524,
+      514,  519,  511,  528,  530,  531,  539,  532,  524,  544,
+      513,  521,  531,  530,  522,  516,  528,  517,  518,  533,
+      535,  523,  532,  536,  537,  533,  542,  535,  536,  539,
+      543,  542,  544,  545,  546,  547,  548,  537,  545,  543,
+      549,  550,  551,  548,  552,  553,  554,  556,  558,  552,
+      546,  554,  557,  559,  550,  562,  560,  551,  564,  566,
+      553,  556,  561,  549,  547,  560,  565,  558,  557,  567,
 
-      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,
+      568,  561,  570,  571,  566,  565,  559,  572,  562,  576,
+      573,  570,  575,  578,  567,  568,  579,  564,  576,  580,
+      572,  581,  582,  579,  583,  584,  571,  573,  578,  585,
+      575,  586,  580,  587,  588,  589,  590,  592,  581,  586,
+      587,  588,  583,  582,  596,  602,  598,  593,  584,  591,
+      585,  596,  577,  574,  592,  598,  569,  563,  555,  590,
+      541,  540,  538,  534,  589,  529,  602,  605,  605,  605,
+      605,  606,  606,  608,  527,  608,  608,  526,  525,  520,
+      515,  505,  496,  490,  489,  487,  485,  479,  478,  477,
+      474,  473,  472,  471,  470,  467,  463,  462,  461,  460,
 
-      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,
+      458,  453,  450,  449,  448,  445,  444,  443,  439,  434,
+      431,  421,  420,  418,  417,  413,  409,  408,  407,  406,
+      405,  404,  403,  400,  392,  381,  380,  378,  362,  359,
+      357,  354,  352,  349,  342,  341,  339,  337,  334,  331,
+      326,  319,  313,  310,  309,  308,  299,  296,  295,  290,
+      289,  272,  271,  270,  267,  255,  245,  243,  241,  239,
+      236,  235,  234,  225,  222,  221,  217,  215,  214,  213,
+      205,  204,  201,  200,  198,  197,  196,  195,  194,  193,
+      191,  162,  154,  149,  147,  144,  141,  137,  133,  115,
+       90,   70,   59,   39,   37,    8,    7,    3,  604,  604,
 
-      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
+      604,  604,  604,  604,  604,  604,  604,  604,  604,  604,
+      604,  604,  604,  604,  604,  604,  604,  604,  604,  604,
+      604,  604,  604,  604,  604,  604,  604,  604,  604,  604,
+      604,  604,  604,  604,  604,  604,  604,  604,  604,  604,
+      604,  604
     } ;
 
 static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
@@ -918,7 +921,7 @@
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 1 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 #define INITIAL 0
 /*===-- UpgradeLexer.l - Scanner for 1.9 assembly files --------*- C++ -*--===//
 //
@@ -933,7 +936,7 @@
 //
 //===----------------------------------------------------------------------===*/
 #define YY_NEVER_INTERACTIVE 1
-#line 28 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 28 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 
 #include "ParserInternals.h"
 #include "UpgradeParser.h"
@@ -979,7 +982,7 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 983 "UpgradeLexer.cpp"
+#line 986 "UpgradeLexer.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1130,10 +1133,10 @@
 	register char *yy_cp = NULL, *yy_bp = NULL;
 	register int yy_act;
 
-#line 99 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 99 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 
 
-#line 1137 "UpgradeLexer.cpp"
+#line 1140 "UpgradeLexer.cpp"
 
 	if ( yy_init )
 		{
@@ -1181,14 +1184,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 >= 601 )
+				if ( yy_current_state >= 605 )
 					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 != 600 );
+		while ( yy_current_state != 604 );
 
 yy_find_action:
 		yy_current_state = *--yy_state_ptr;
@@ -1226,756 +1229,761 @@
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 101 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 101 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { /* Ignore comments for now */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 103 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 103 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( BEGINTOK); }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 104 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 104 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( ENDTOK); }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 105 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 105 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( TRUETOK);  }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 106 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 106 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( FALSETOK); }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 107 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 107 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( DECLARE); }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 108 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( GLOBAL); }
+#line 108 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( DEFINE); }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 109 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( CONSTANT); }
+#line 109 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( GLOBAL); }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 110 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( INTERNAL); }
+#line 110 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( CONSTANT); }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 111 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LINKONCE); }
+#line 111 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( INTERNAL); }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 112 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( WEAK); }
+#line 112 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( LINKONCE); }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 113 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( APPENDING); }
+#line 113 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( WEAK); }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 114 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( DLLIMPORT); }
+#line 114 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( APPENDING); }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 115 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( DLLEXPORT); }
+#line 115 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( DLLIMPORT); }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 116 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( EXTERN_WEAK); }
+#line 116 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( DLLEXPORT); }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 117 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( EXTERNAL); }
+#line 117 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( EXTERN_WEAK); }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 118 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UNINITIALIZED); }  // alias for external
+#line 118 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( EXTERNAL); }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 119 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( IMPLEMENTATION); }
+#line 119 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UNINITIALIZED); }  // alias for external
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 120 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ZEROINITIALIZER); }
+#line 120 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( IMPLEMENTATION); }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 121 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( DOTDOTDOT); }
+#line 121 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ZEROINITIALIZER); }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 122 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UNDEF); }
+#line 122 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( DOTDOTDOT); }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 123 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( NULL_TOK); }
+#line 123 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UNDEF); }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 124 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( TO); }
+#line 124 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( NULL_TOK); }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 125 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( TAIL); }
+#line 125 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( TO); }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 126 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( TARGET); }
+#line 126 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( TAIL); }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 127 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( TRIPLE); }
+#line 127 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( TARGET); }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 128 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( DEPLIBS); }
+#line 128 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( TRIPLE); }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 129 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ENDIAN); }
+#line 129 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( DEPLIBS); }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 130 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( POINTERSIZE); }
+#line 130 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ENDIAN); }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 131 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( DATALAYOUT); }
+#line 131 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( POINTERSIZE); }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 132 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LITTLE); }
+#line 132 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( DATALAYOUT); }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 133 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( BIG); }
+#line 133 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( LITTLE); }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 134 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( VOLATILE); }
+#line 134 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( BIG); }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 135 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ALIGN);  }
+#line 135 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( VOLATILE); }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 136 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SECTION); }
+#line 136 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ALIGN);  }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 137 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( MODULE); }
+#line 137 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SECTION); }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 138 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ASM_TOK); }
+#line 138 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( MODULE); }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 139 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SIDEEFFECT); }
+#line 139 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ASM_TOK); }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 141 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( CC_TOK); }
+#line 140 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SIDEEFFECT); }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 142 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( CCC_TOK); }
+#line 142 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( CC_TOK); }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 143 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( CSRETCC_TOK); }
+#line 143 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( CCC_TOK); }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 144 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FASTCC_TOK); }
+#line 144 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( CSRETCC_TOK); }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 145 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( COLDCC_TOK); }
+#line 145 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FASTCC_TOK); }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 146 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( X86_STDCALLCC_TOK); }
+#line 146 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( COLDCC_TOK); }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 147 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( X86_FASTCALLCC_TOK); }
+#line 147 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( X86_STDCALLCC_TOK); }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 149 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(VOID,VoidTy,"void",false); }
+#line 148 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( X86_FASTCALLCC_TOK); }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 150 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(BOOL,BoolTy,"bool",false); }
+#line 150 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(VOID,VoidTy,"void",false); }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 151 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(SBYTE,SByteTy,"sbyte",true); }
+#line 151 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(BOOL,BoolTy,"bool",false); }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 152 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(UBYTE,UByteTy,"ubyte",false); }
+#line 152 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(SBYTE,SByteTy,"sbyte",true); }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 153 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(SHORT,ShortTy,"short",true); }
+#line 153 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(UBYTE,UByteTy,"ubyte",false); }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 154 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(USHORT,UShortTy,"ushort",false); }
+#line 154 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(SHORT,ShortTy,"short",true); }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 155 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(INT,IntTy,"int",true);   }
+#line 155 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(USHORT,UShortTy,"ushort",false); }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 156 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(UINT,UIntTy,"uint",false);  }
+#line 156 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(INT,IntTy,"int",true);   }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 157 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(LONG,LongTy,"long",true);  }
+#line 157 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(UINT,UIntTy,"uint",false);  }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 158 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(ULONG,ULongTy,"ulong",false); }
+#line 158 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(LONG,LongTy,"long",true);  }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 159 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(FLOAT,FloatTy,"float",false); }
+#line 159 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(ULONG,ULongTy,"ulong",false); }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 160 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(DOUBLE,DoubleTy,"double",false); }
+#line 160 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(FLOAT,FloatTy,"float",false); }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 161 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(LABEL,LabelTy,"label",false); }
+#line 161 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(DOUBLE,DoubleTy,"double",false); }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 162 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(OPAQUE); }
+#line 162 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(LABEL,LabelTy,"label",false); }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 163 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(TYPE);   }
+#line 163 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(OPAQUE); }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 165 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ADD); }
+#line 164 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(TYPE);   }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 166 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SUB); }
+#line 166 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ADD); }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 167 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( MUL); }
+#line 167 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SUB); }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 168 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( DIV); }
+#line 168 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( MUL); }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 169 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UDIV); }
+#line 169 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( DIV); }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 170 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SDIV); }
+#line 170 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UDIV); }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 171 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FDIV); }
+#line 171 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SDIV); }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 172 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( REM);  }
+#line 172 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FDIV); }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 173 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UREM); }
+#line 173 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( REM);  }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 174 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SREM); }
+#line 174 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UREM); }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 175 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FREM); }
+#line 175 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SREM); }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 176 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( AND); }
+#line 176 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FREM); }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 177 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( OR); }
+#line 177 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( AND); }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 178 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( XOR); }
+#line 178 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( OR); }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 179 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SETNE); }
+#line 179 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( XOR); }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 180 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SETEQ); }
+#line 180 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SETNE); }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 181 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SETLT); }
+#line 181 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SETEQ); }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 182 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SETGT); }
+#line 182 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SETLT); }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 183 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SETLE); }
+#line 183 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SETGT); }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 184 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SETGE); }
+#line 184 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SETLE); }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 185 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(ICMP); }
+#line 185 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SETGE); }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 186 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(FCMP); }
+#line 186 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(ICMP); }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 187 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(EQ); }
+#line 187 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(FCMP); }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 188 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(NE); }
+#line 188 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(EQ); }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 189 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(SLT); }
+#line 189 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(NE); }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 190 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(SGT); }
+#line 190 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(SLT); }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 191 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(SLE); }
+#line 191 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(SGT); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 192 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(SGE); }
+#line 192 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(SLE); }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 193 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(OEQ); }
+#line 193 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(SGE); }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 194 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(ONE); }
+#line 194 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(OEQ); }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 195 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(OLT); }
+#line 195 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(ONE); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 196 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(OGT); }
+#line 196 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(OLT); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 197 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(OLE); }
+#line 197 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(OGT); }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 198 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(OGE); }
+#line 198 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(OLE); }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 199 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(ORD); }
+#line 199 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(OGE); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 200 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(UNO); }
+#line 200 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(ORD); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 201 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(UEQ); }
+#line 201 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(UNO); }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 202 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(UNE); }
+#line 202 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(UEQ); }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 203 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(ULT); }
+#line 203 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(UNE); }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 204 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(UGT); }
+#line 204 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(ULT); }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 205 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(ULE); }
+#line 205 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(UGT); }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 206 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK(UGE); }
+#line 206 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(ULE); }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 208 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( PHI_TOK); }
+#line 207 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK(UGE); }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 209 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( CALL); }
+#line 209 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( PHI_TOK); }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 210 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( CAST); }
+#line 210 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( CALL); }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 211 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( TRUNC); }
+#line 211 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( CAST); }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 212 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ZEXT); }
+#line 212 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( TRUNC); }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 213 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SEXT); }
+#line 213 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ZEXT); }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 214 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FPTRUNC); }
+#line 214 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SEXT); }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 215 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FPEXT); }
+#line 215 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FPTRUNC); }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 216 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FPTOUI); }
+#line 216 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FPEXT); }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 217 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FPTOSI); }
+#line 217 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FPTOUI); }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 218 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UITOFP); }
+#line 218 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FPTOSI); }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 219 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SITOFP); }
+#line 219 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UITOFP); }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 220 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( PTRTOINT); }
+#line 220 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SITOFP); }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 221 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( INTTOPTR); }
+#line 221 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( PTRTOINT); }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 222 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( BITCAST); }
+#line 222 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( INTTOPTR); }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 223 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SELECT); }
+#line 223 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( BITCAST); }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 224 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SHL); }
+#line 224 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SELECT); }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 225 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SHR); }
+#line 225 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SHL); }
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 226 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ASHR); }
+#line 226 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SHR); }
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 227 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LSHR); }
+#line 227 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ASHR); }
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 228 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( VAARG); }
+#line 228 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( LSHR); }
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 229 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( RET); }
+#line 229 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( VAARG); }
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 230 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( BR); }
+#line 230 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( RET); }
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 231 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SWITCH); }
+#line 231 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( BR); }
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 232 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( INVOKE); }
+#line 232 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SWITCH); }
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 233 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UNWIND); }
+#line 233 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( INVOKE); }
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 234 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( EXCEPT); } // alias for unwind
+#line 234 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UNWIND); }
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 235 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UNREACHABLE); }
+#line 235 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( EXCEPT); } // alias for unwind
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 237 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( MALLOC); }
+#line 236 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UNREACHABLE); }
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 238 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ALLOCA); }
+#line 238 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( MALLOC); }
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
-#line 239 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FREE); }
+#line 239 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ALLOCA); }
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 240 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LOAD); }
+#line 240 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FREE); }
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 241 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( STORE); }
+#line 241 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( LOAD); }
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 242 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( GETELEMENTPTR); }
+#line 242 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( STORE); }
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 244 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( EXTRACTELEMENT); }
+#line 243 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( GETELEMENTPTR); }
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 245 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( INSERTELEMENT); }
+#line 245 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( EXTRACTELEMENT); }
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 246 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SHUFFLEVECTOR); }
+#line 246 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( INSERTELEMENT); }
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 249 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( VAR_ID); }
+#line 247 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SHUFFLEVECTOR); }
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
-#line 250 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( LABELSTR); }
+#line 250 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( VAR_ID); }
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
-#line 251 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 251 "/proj/llvm/llvm-1/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 ); }
+#line 252 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( LABELSTR); }
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 253 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( EUINT64VAL ); }
+#line 253 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( STRINGCONSTANT ); }
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
-#line 254 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( ESINT64VAL ); }
+#line 254 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( EUINT64VAL ); }
 	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 ); }
+#line 255 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( ESINT64VAL ); }
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 256 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( UINTVAL); }
+#line 256 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( yytext[0] == 's' ? ESINT64VAL : EUINT64VAL ); }
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
-#line 257 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( SINTVAL); }
+#line 257 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( UINTVAL); }
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 258 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TOK( FPVAL); }
+#line 258 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( SINTVAL); }
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
-#line 259 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 259 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TOK( FPVAL); }
+	YY_BREAK
+case 151:
+YY_RULE_SETUP
+#line 260 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK( FPVAL); }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 260 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 261 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
@@ -1984,22 +1992,22 @@
                   return EOF;
                 }
 	YY_BREAK
-case 151:
-YY_RULE_SETUP
-#line 268 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ /* Ignore whitespace */ }
-	YY_BREAK
 case 152:
 YY_RULE_SETUP
-#line 269 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ return yytext[0]; }
+#line 269 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ /* Ignore whitespace */ }
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
-#line 271 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 270 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ return yytext[0]; }
+	YY_BREAK
+case 154:
+YY_RULE_SETUP
+#line 272 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2003 "UpgradeLexer.cpp"
+#line 2011 "UpgradeLexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2286,7 +2294,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 >= 601 )
+			if ( yy_current_state >= 605 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2316,11 +2324,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 >= 601 )
+		if ( yy_current_state >= 605 )
 			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 == 600);
+	yy_is_jam = (yy_current_state == 604);
 	if ( ! yy_is_jam )
 		*yy_state_ptr++ = yy_current_state;
 
@@ -2877,5 +2885,5 @@
 	return 0;
 	}
 #endif
-#line 271 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
+#line 272 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"