For PR950:
This patch removes the SetCC instructions and replaces them with the ICmp
and FCmp instructions. The SetCondInst instruction has been removed and
been replaced with ICmpInst and FCmpInst.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32751 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AsmParser/Lexer.cpp.cvs b/lib/AsmParser/Lexer.cpp.cvs
index a36a753..f480d1c 100644
--- a/lib/AsmParser/Lexer.cpp.cvs
+++ b/lib/AsmParser/Lexer.cpp.cvs
@@ -317,38 +317,37 @@
 	*yy_cp = '\0'; \
 	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 147
-#define YY_END_OF_BUFFER 148
-static yyconst short int yy_acclist[225] =
+#define YY_NUM_RULES 141
+#define YY_END_OF_BUFFER 142
+static yyconst short int yy_acclist[219] =
     {   0,
-      148,  146,  147,  145,  146,  147,  145,  147,  146,  147,
-      146,  147,  146,  147,  146,  147,  146,  147,  146,  147,
-      138,  146,  147,  138,  146,  147,    1,  146,  147,  146,
-      147,  146,  147,  146,  147,  146,  147,  146,  147,  146,
-      147,  146,  147,  146,  147,  146,  147,  146,  147,  146,
-      147,  146,  147,  146,  147,  146,  147,  146,  147,  146,
-      147,  146,  147,  146,  147,  146,  147,  146,  147,  146,
-      147,  137,  135,  134,  134,  141,  139,  143,  138,    1,
-      120,   38,   80,   81,   70,   22,  137,  134,  134,  142,
-      143,   19,  143,  144,   60,   69,   36,   31,   39,    3,
+      142,  140,  141,  139,  140,  141,  139,  141,  140,  141,
+      140,  141,  140,  141,  140,  141,  140,  141,  140,  141,
+      132,  140,  141,  132,  140,  141,    1,  140,  141,  140,
+      141,  140,  141,  140,  141,  140,  141,  140,  141,  140,
+      141,  140,  141,  140,  141,  140,  141,  140,  141,  140,
+      141,  140,  141,  140,  141,  140,  141,  140,  141,  140,
+      141,  140,  141,  140,  141,  140,  141,  140,  141,  140,
+      141,  131,  129,  128,  128,  135,  133,  137,  132,    1,
+      114,   38,   74,   75,   70,   22,  131,  128,  128,  136,
+      137,   19,  137,  138,   60,   69,   36,   31,   39,    3,
 
-       51,   62,   90,   95,   93,   94,   92,   91,   96,  100,
-      119,   85,   83,  115,   84,   82,   61,   98,   89,   87,
-       88,   86,   99,   97,   71,  136,  143,  143,  117,   46,
-      101,   79,   65,  127,   68,   78,  128,   53,  116,   21,
-      140,   64,  104,   67,   23,    4,   58,   63,   52,   66,
-       45,   11,  103,  143,   33,    2,    5,   55,  106,   57,
-       47,   73,   77,   75,   76,   74,   72,   49,  129,  102,
-       48,   54,   20,  126,   42,   56,   27,   41,  110,  109,
-        7,  122,   30,  125,   35,   59,  114,  108,  121,   24,
-       25,  107,  123,   50,  118,  113,   40,    6,   26,  105,
+       51,   62,   84,   89,   87,   88,   86,   85,   90,   94,
+      113,   79,   77,  109,   78,   76,   61,   92,   83,   81,
+       82,   80,   93,   91,   71,  130,  137,  137,  111,   46,
+       95,   73,   65,  121,   68,   72,  122,   53,  110,   21,
+      134,   64,   98,   67,   23,    4,   58,   63,   52,   66,
+       45,   11,   97,  137,   33,    2,    5,   55,  100,   57,
+       47,   49,  123,   96,   48,   54,   20,  120,   42,   56,
+       27,   41,  104,  103,    7,  116,   30,  119,   35,   59,
+      108,  102,  115,   24,   25,  101,  117,   50,  112,  107,
+       40,    6,   26,   99,   34,    8,   16,    9,  105,   10,
 
-       34,    8,   16,    9,  111,   10,  112,   32,   12,   14,
-       13,   29,   37,   15,   28,  124,  130,  132,  133,   43,
-      131,   17,   44,   18
+      106,   32,   12,   14,   13,   29,   37,   15,   28,  118,
+      124,  126,  127,   43,  125,   17,   44,   18
     } ;
 
-static yyconst short int yy_accept[581] =
+static yyconst short int yy_accept[570] =
     {   0,
         1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
        17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
@@ -372,47 +371,46 @@
       102,  102,  102,  102,  102,  102,  103,  103,  104,  105,
       106,  107,  108,  109,  109,  110,  111,  111,  111,  112,
 
-      112,  112,  112,  112,  112,  112,  112,  113,  114,  115,
-      115,  115,  115,  115,  116,  117,  117,  117,  118,  118,
-      118,  118,  118,  118,  118,  118,  118,  119,  120,  121,
-      121,  121,  122,  122,  123,  123,  124,  125,  125,  125,
-      125,  125,  125,  125,  125,  125,  125,  126,  126,  126,
-      127,  128,  128,  128,  128,  129,  129,  129,  129,  130,
-      130,  130,  131,  132,  132,  132,  132,  132,  132,  132,
-      132,  132,  132,  132,  132,  132,  132,  132,  133,  134,
-      134,  134,  134,  134,  135,  136,  136,  136,  137,  137,
-      137,  137,  137,  137,  137,  137,  137,  138,  139,  140,
+      112,  112,  112,  112,  112,  112,  113,  114,  115,  115,
+      115,  115,  115,  116,  117,  117,  117,  118,  118,  118,
+      118,  118,  118,  118,  118,  118,  119,  120,  121,  121,
+      121,  122,  122,  123,  123,  124,  125,  125,  125,  125,
+      125,  125,  125,  125,  125,  125,  126,  126,  126,  127,
+      128,  128,  128,  128,  129,  129,  129,  129,  130,  130,
+      130,  131,  132,  132,  132,  132,  132,  132,  132,  132,
+      132,  132,  132,  132,  132,  132,  132,  133,  134,  134,
+      134,  134,  134,  135,  136,  136,  136,  137,  137,  137,
+      137,  137,  137,  137,  137,  137,  138,  139,  140,  140,
 
-      140,  140,  141,  141,  141,  141,  142,  142,  143,  143,
-      143,  143,  143,  143,  143,  144,  144,  144,  144,  144,
-      145,  145,  145,  146,  146,  146,  147,  147,  148,  148,
-      149,  150,  150,  150,  150,  150,  150,  151,  151,  151,
-      152,  152,  153,  153,  153,  154,  155,  156,  156,  156,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  158,  158,  159,  160,  160,  160,
-      160,  160,  160,  160,  160,  160,  160,  160,  161,  161,
-      161,  161,  161,  161,  161,  161,  162,  162,  162,  163,
-      164,  165,  166,  167,  168,  169,  169,  169,  169,  170,
+      140,  141,  141,  141,  141,  142,  142,  143,  143,  143,
+      144,  144,  144,  144,  144,  145,  145,  145,  146,  146,
+      146,  147,  147,  148,  148,  149,  150,  150,  150,  150,
+      150,  150,  151,  151,  151,  152,  152,  153,  153,  153,
+      154,  155,  156,  156,  156,  157,  157,  157,  157,  157,
+      157,  157,  157,  157,  157,  157,  157,  157,  157,  158,
+      158,  159,  160,  160,  160,  160,  160,  160,  160,  160,
+      160,  160,  160,  161,  161,  161,  161,  161,  161,  161,
+      161,  162,  162,  162,  163,  163,  163,  163,  164,  164,
+      164,  164,  165,  166,  166,  167,  168,  168,  168,  168,
 
-      170,  170,  170,  171,  172,  172,  173,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  175,  175,  175,  176,
-      176,  176,  176,  176,  176,  176,  176,  177,  178,  178,
-      178,  179,  180,  181,  181,  181,  182,  182,  182,  182,
-      182,  183,  183,  184,  185,  186,  187,  187,  187,  187,
-      188,  188,  188,  189,  190,  191,  192,  193,  193,  194,
-      195,  196,  196,  196,  196,  196,  196,  197,  197,  198,
-      198,  199,  200,  200,  200,  200,  200,  200,  201,  201,
-      201,  201,  201,  201,  201,  201,  201,  202,  202,  202,
-      202,  202,  202,  202,  202,  202,  203,  203,  203,  203,
+      168,  168,  168,  168,  168,  169,  169,  169,  170,  170,
+      170,  170,  170,  170,  170,  170,  171,  172,  172,  172,
+      173,  174,  175,  175,  175,  176,  176,  176,  176,  176,
+      177,  177,  178,  179,  180,  181,  181,  181,  181,  182,
+      182,  182,  183,  184,  185,  186,  187,  187,  188,  189,
+      190,  190,  190,  190,  190,  190,  191,  191,  192,  192,
+      193,  194,  194,  194,  194,  194,  194,  195,  195,  195,
+      195,  195,  195,  195,  195,  195,  196,  196,  196,  196,
+      196,  196,  196,  196,  196,  197,  197,  197,  197,  197,
+      198,  198,  198,  198,  198,  199,  200,  201,  201,  202,
 
-      203,  204,  204,  204,  204,  204,  205,  206,  207,  207,
-      208,  208,  208,  208,  209,  209,  209,  209,  210,  210,
-      211,  212,  212,  212,  212,  212,  212,  212,  212,  212,
-      212,  212,  212,  212,  213,  213,  213,  213,  213,  213,
-      213,  213,  214,  214,  214,  214,  214,  215,  215,  215,
-      215,  215,  216,  216,  217,  217,  217,  217,  217,  217,
-      217,  217,  217,  217,  217,  217,  217,  218,  218,  219,
-      220,  220,  221,  221,  222,  223,  224,  224,  225,  225
+      202,  202,  202,  203,  203,  203,  203,  204,  204,  205,
+      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
+      206,  206,  206,  207,  207,  207,  207,  207,  207,  207,
+      207,  208,  208,  208,  208,  208,  209,  209,  209,  209,
+      209,  210,  210,  211,  211,  211,  211,  211,  211,  211,
+      211,  211,  211,  211,  211,  211,  212,  212,  213,  214,
+      214,  215,  215,  216,  217,  218,  218,  219,  219
     } ;
 
 static yyconst int yy_ec[256] =
@@ -456,143 +454,141 @@
         3,    3,    3
     } ;
 
-static yyconst short int yy_base[585] =
+static yyconst short int yy_base[574] =
     {   0,
-        0,    0, 1248, 1249, 1249, 1249, 1243, 1232,   36,   40,
+        0,    0, 1226, 1227, 1227, 1227, 1221, 1210,   36,   40,
        44,   50,   56,   62,    0,   63,   66,   81,   89,   47,
       108,   91,   95,   92,   72,  109,  134,  119,  117,  160,
-      120,  191,  139,  121,  136,  150, 1241, 1249, 1230, 1249,
+      120,  191,  139,  121,  136,  150, 1219, 1227, 1208, 1227,
         0,  165,  180,  197,  219,   70,  224,  239,  244,    0,
-       68,  152,   93,  128,  158,  190,  245,   31, 1229,  188,
-      182,  211,   48,  207,  248,  210,  122,  124, 1228,  209,
+       68,  152,   93,  128,  158,  190,  245,   31, 1207,  188,
+      182,  211,   48,  207,  248,  210,  122,  124, 1206,  209,
       257,  258,  185,  259,  260,  261,  262,  263,  264,  265,
-      266,  276,  273,  287,  286,  278,  294,  295, 1227,  297,
+      266,  276,  273,  287,  286,  278,  294,  295, 1205,  297,
       299,  300,  305,  306,  303,  313,  307,  311,  301,  316,
 
-       46,  317,  318,  325,  326,  329,  333,  327,  334,  337,
-      351,  346,  354, 1226,  358,  342,  338,  360,  363,  365,
-      362,  368,  372,  369,  364,  271,  384,  387,  231,  389,
-      394, 1225,    0,  404,  408, 1224,  426,  443,    0, 1223,
-      408,  395, 1222,  409,  412, 1221,  414, 1220,  431,  430,
-      432, 1219,  420,  434,  444,  446,  448,  449,  452,  454,
-      455,  450,  457,  458,  466,  180,  462,  469,  470,  473,
-      474,  472,  475,  477,  484,  486,  480,  490,  487,  497,
-      500,  502,  503,  504,  505, 1218,  506, 1217, 1216, 1215,
-     1214, 1213, 1212,  396, 1211, 1210,  510,  507, 1209,  535,
+       46,  317,  318,  325,  326,  329,  333,  327,  334,  330,
+      351,  342,  346, 1204,  358,  354,  337,  361,  360,  363,
+      362,  366,  369,  383,  364,  271,  381,  388,  231,  370,
+      397, 1203,    0,  402,  406, 1202,  429,  446,    0, 1201,
+      406,  412, 1200,  407,  410, 1199,  408, 1198,  413,  419,
+      422, 1197,  433,  414,  447,  448,  435,  449,  452,  451,
+      454,  459,  455,  458,  460,  180,  466,  462,  469,  475,
+      463,  470,  473,  478,  474,  485,  482,  486,  488,  496,
+      497,  498,  499,  501,  503, 1196,  506, 1195, 1194, 1193,
+     1192, 1191, 1190,  504, 1189, 1188,  511,  507, 1187,  535,
 
-      512,  511,  516,  514,  546,  525, 1208, 1207, 1206,  526,
-      518,  549,  550, 1205, 1204,  551,  552, 1203,  553,  554,
-      559,  556,  562,  565,  560,  564, 1202, 1201, 1200,  572,
-      566, 1199,  577, 1198,  578, 1197, 1196,  581,  580,  582,
-      585,  517,  588,  586,  592,  597, 1195,  599,  600, 1249,
-      611,  628,  632,  636,  641,  602,  604,  642, 1194,  643,
-      613, 1193, 1192,  605,  644,  645,  646,  647,  649,  648,
-      650,  654,  651,  653,  658,  655,  665, 1191, 1190,  657,
-      670,  673,  676, 1189, 1188,  671,  677, 1187,  678,  681,
-      683,  685,  684,  679,  688,  690, 1186, 1185, 1184,  689,
+      512,  514,  513,  517,  523, 1186, 1185, 1184,  529,  515,
+      547,  548, 1183, 1182,  549,  551, 1181,  552,  553,  558,
+      554,  561,  555,  557,  559, 1180, 1179, 1178,  560,  563,
+     1177,  562, 1176,  567, 1175, 1174,  577,  574,  582,  571,
+      585,  510,  588,  591,  592, 1173,  594,  595, 1227,  604,
+      623,  612,  627,  632,  597,  599,  633, 1172,  634,  635,
+     1171, 1170,  636,  615,  637,  639,  641,  642,  644,  645,
+      647,  648,  649,  652,  656,  659, 1169, 1168,  658,  663,
+      667,  664, 1167, 1166,  668,  669, 1165,  673,  672,  675,
+      676,  678,  680,  679,  684, 1164, 1163, 1162,  685,  687,
 
-      696, 1183,  691,  699,  692,    0,  708, 1182,  701,  709,
-      712,  718,  719,  720, 1181,  713,  721,  724,  725, 1180,
-      730,  737, 1179,  734,  723, 1178,  740, 1177,  745, 1176,
-     1175,  746,  748,  750,  752,  749, 1174,  751,  753, 1173,
-      755, 1172,  758,  762, 1171,  785, 1170,  764,  763, 1169,
-      765,  770,  785,  779,  788,  773,  761,  776,  789,  791,
-      792,  796,  797, 1168,  798, 1167, 1166,  799,  801,  802,
-      806,  803,  807,  810,  811,  816,  817, 1165,  820,  821,
-      822,  825,  827,  831,  832, 1164,  824,  838, 1163, 1162,
-     1161, 1160, 1159, 1158, 1157,  839,  841,  843, 1156,  844,
+     1161,  677,  690,  698,    0,  700, 1160,  704,  705, 1159,
+      706,  708,  710,  711, 1158,  714,  715, 1157,  724,  720,
+     1156,  725, 1155,  727, 1154, 1153,  728,  726,  730,  734,
+      731, 1152,  741,  742, 1151,  743, 1150,  745,  744, 1149,
+      753, 1148,  753,  746, 1147,  747,  761,  759,  765,  770,
+      756,  773,  771,  774,  776,  778,  780,  781, 1146,  782,
+     1145, 1144,  783,  786,  784,  791,  787,  792,  794,  798,
+      803,  804, 1143,  806,  805,  809,  810,  811,  812,  818,
+     1142,  807,  824, 1141,  826,  827,  829, 1140,  411,  828,
+      830, 1139, 1138,  833, 1137, 1136,  835,  832,  834,  838,
 
-      846,  848, 1155, 1154,  847, 1153, 1152,  852,  850,  849,
-      853,  855,  860,  863,  867, 1151,  870,  871, 1150,  873,
-      874,  875,  876,  877,  878,  879, 1149, 1148,  887,  882,
-     1147, 1146, 1145,  888,  893, 1144,  880,  898,  901,  900,
-     1143,  904, 1142, 1141, 1140, 1139,  908,  902,  910, 1138,
-      912,  914, 1137, 1136, 1135, 1134, 1133,  913, 1132, 1131,
-     1130,  915,  916,  918,  920,  917, 1129,  922, 1128,  928,
-     1127, 1126,  931,  932,  935,  936,  939, 1125,  940,  937,
-      941,  942,  943,  950,  944,  947, 1124,  955,  958,  960,
-      962,  963,  968,  969,  972, 1123,  973,  976,  977,  978,
+      843,  845,  836,  844, 1135,  853,  846, 1134,  854,  855,
+      858,  863,  860,  865,  867, 1133, 1132,  870,  864, 1131,
+     1130, 1129,  873,  868, 1128,  879,  881,  889,  876, 1127,
+      891, 1126, 1125, 1124, 1123,  892,  878,  893, 1122,  896,
+      897, 1121, 1120, 1119, 1118, 1117,  900, 1116, 1115, 1114,
+      901,  902,  903,  904,  906, 1113,  908, 1112,  909, 1111,
+     1110,  914,  915,  918,  919,  920, 1109,  921,  922,  925,
+      926,  928,  933,  932,  937, 1108,  938,  943,  945,  946,
+      947,  951,  948,  953, 1107,  956,  959,  961,  957, 1106,
+      962,  968,  965,  967, 1105, 1104, 1103,  973, 1102,  969,
 
-     1122,  974,  979,  981,  982, 1121, 1118, 1108,  985, 1107,
-      984,  988, 1001, 1106, 1002, 1003, 1005, 1105,  990, 1103,
-     1102, 1006, 1010,  994, 1015, 1012, 1014, 1016, 1021, 1022,
-     1024, 1025, 1026, 1101, 1027, 1030, 1032, 1033, 1036, 1038,
-     1034, 1100, 1039, 1035, 1049, 1052, 1098, 1053, 1042, 1055,
-     1054, 1097, 1058, 1093, 1059, 1063, 1060, 1061, 1066, 1072,
-     1069, 1075, 1077, 1079, 1080, 1081, 1091, 1082, 1083,  726,
-     1088,  616, 1085,  615,  515,  476, 1089,  370, 1249, 1124,
-     1126,  341, 1130,  151
+      972,  975, 1101,  983,  987,  989, 1098,  974, 1088, 1086,
+      991,  994,  993,  995,  998,  999, 1001, 1004, 1005, 1006,
+     1007, 1010, 1085, 1009, 1013, 1012, 1017, 1021, 1024, 1018,
+     1084, 1025, 1032, 1035, 1036, 1083, 1037, 1019, 1026, 1038,
+     1082, 1043, 1077, 1044, 1045, 1049, 1048, 1053, 1054, 1056,
+     1057, 1060, 1063, 1058, 1066, 1076, 1064, 1073,  877, 1068,
+      760, 1071,  707,  604,  522, 1069,  368, 1227, 1104, 1106,
+      349, 1110,  151
     } ;
 
-static yyconst short int yy_def[585] =
+static yyconst short int yy_def[574] =
     {   0,
-      579,    1,  579,  579,  579,  579,  580,  581,  582,  579,
-      581,  581,  581,  581,  583,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  580,  579,  581,  579,
-      584,  584,  579,  579,  581,  581,  581,  581,  581,  583,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
+      568,    1,  568,  568,  568,  568,  569,  570,  571,  568,
+      570,  570,  570,  570,  572,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  569,  568,  570,  568,
+      573,  573,  568,  568,  570,  570,  570,  570,  570,  572,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
 
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  579,  584,  584,  579,  581,  581,  581,   49,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,   49,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  568,  573,  573,  568,  570,  570,  570,   49,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,   49,
 
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  579,
-      579,  579,  579,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  568,  568,
+      568,  568,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
 
-      581,  581,  581,  581,  581,  200,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  579,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
+      570,  570,  570,  570,  200,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      568,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
 
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
 
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  581,    0,  579,
-      579,  579,  579,  579
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+      570,  570,  570,  570,  570,  570,  570,    0,  568,  568,
+      568,  568,  568
     } ;
 
-static yyconst short int yy_nxt[1293] =
+static yyconst short int yy_nxt[1271] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   14,   14,    4,   15,    8,    8,    8,   16,   17,
@@ -617,107 +613,105 @@
        43,   43,   43,   40,  109,   40,  110,  111,   40,  112,
 
       101,   40,  152,   40,   40,  135,   44,   44,   44,   44,
-      117,  166,  118,  119,  147,  120,  151,  121,  279,  122,
+      117,  166,  118,  119,  147,  120,  151,  121,  278,  122,
        40,  123,   40,   40,   40,  124,  125,   47,   45,   45,
        45,   45,   40,  137,  137,  137,  137,   40,  159,  153,
-      138,  154,  246,  156,   40,  162,  138,   47,   48,   48,
+      138,  154,  245,  156,   40,  162,  138,   47,   48,   48,
        48,   48,   40,  139,  139,  139,  139,   40,   40,  139,
       139,   40,  139,  139,  139,  139,  139,  139,  157,  148,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-      158,  149,  168,  170,   40,  163,   40,  165,  242,   40,
+      158,  149,  168,  170,   40,  163,   40,  165,  241,   40,
       167,   40,  164,  173,  172,  178,  169,  174,  171,   40,
 
        40,  175,  176,  179,  177,  181,  184,   40,   40,  180,
        40,  183,   40,   40,   40,  185,   40,  182,   40,   40,
        40,  194,  189,  186,   40,  187,   40,  191,  193,   40,
        40,   40,  188,  196,  195,  198,  190,  197,   40,   40,
-       40,  192,   40,   41,  202,  203,   40,   40,  207,  214,
-       40,   40,  199,  204,  212,   40,  216,  209,  201,   40,
-      210,  205,  208,  215,   40,  206,  211,   40,  217,  213,
-      218,   40,  219,   40,  224,   40,   40,   40,   40,  225,
-      220,   40,   40,   40,  222,   40,  226,  228,  221,  241,
-      232,  240,  230,  235,  236,  223,  227,   40,  231,  233,
+       40,  192,   40,   40,  202,  203,   40,   40,  206,  213,
+       40,   41,  199,  204,  211,   40,  215,  208,  201,   40,
+      209,  216,  207,  214,   40,  205,  210,   40,  218,  212,
+      217,   40,  219,   40,   40,   40,   40,   40,  224,   40,
+      220,   40,   40,   40,  221,  227,  223,  225,  231,  240,
+      234,  235,  229,  226,   40,  222,   40,  232,  230,  228,
 
-       40,  229,   40,  237,  234,  245,  238,   40,   40,   40,
-      243,  239,  244,  134,  134,  134,  134,  251,  251,  251,
-      251,   40,   40,  247,  252,   40,  257,   40,  248,  303,
-      252,  258,  256,   40,  249,  137,  137,  137,  137,   40,
-      260,  264,  138,   40,   40,   40,  259,   40,  138,  253,
-      254,  261,  255,  255,  255,  255,   40,   40,  262,   40,
-      263,   40,   40,   40,  267,   40,  266,   40,   40,  265,
-       40,   40,  274,  272,  270,   40,  268,  269,  271,   40,
-      280,  273,   40,   40,  275,   40,   40,   40,   40,   40,
-       40,  287,  276,   40,  277,  284,  286,   40,  278,   40,
+      236,   40,  233,  237,  246,  239,  244,  242,  238,  243,
+       40,  134,  134,  134,  134,  250,  250,  250,  250,   40,
+       40,   40,  251,   40,   40,   40,   40,   40,  251,  257,
+      255,  247,   40,  260,  259,   40,  443,  248,  137,  137,
+      137,  137,   40,  256,  258,  138,   40,  261,   40,  264,
+      262,  138,  252,  253,  263,  254,  254,  254,  254,   40,
+       40,   40,   40,  267,   40,   40,  266,   40,   40,  265,
+      271,   40,   40,   40,  269,   40,   40,  268,  270,   40,
+      272,  273,   40,   40,  279,  285,   40,   40,   40,  286,
+      275,   40,  277,  274,  276,   40,  289,  283,   40,   40,
 
-       40,  282,  285,   40,  283,  289,  290,  288,  291,  281,
-       40,  293,  294,   40,  295,   40,   40,   40,   40,   40,
-       40,  297,  292,   40,   40,   40,  298,   40,   40,   40,
-       40,   40,  300,  296,  302,  339,  310,  299,   40,   40,
-      304,  317,  301,  305,  306,  306,  306,  306,  307,  308,
-      306,  306,  309,  306,  306,  306,  306,  306,  306,   40,
-      316,  315,   40,   40,   40,   40,   40,   40,  311,   40,
-      312,  318,   40,   40,  313,   40,  314,   40,   40,   40,
-      320,  319,  323,  324,  326,   40,  321,  328,  325,  322,
-       40,   40,  327,   40,   40,   40,  329,  332,   40,   40,
+      281,   40,  280,  282,  284,  287,  288,  290,  293,   40,
+       40,   40,   40,  292,   40,  294,   40,   40,  296,   40,
+       40,  291,  297,   40,   40,   40,   40,   40,   40,  299,
+       40,  335,  295,  298,  301,   40,   40,  302,  312,  309,
+      300,  303,   40,  304,  305,  305,  305,  305,  306,  308,
+      305,  305,  307,  305,  305,  305,  305,  305,  305,  310,
+       40,   40,   40,  311,   40,   40,   40,   40,   40,  313,
+       40,   40,   40,   40,   40,   40,   40,  323,  315,  314,
+       40,  318,  319,  321,   40,  316,  320,   40,  317,  329,
+       40,  322,  328,  324,  327,   40,  326,  325,   40,  330,
 
-      334,   40,  330,  335,  341,   40,  336,  333,  331,  340,
-       40,  337,   40,   40,  343,   40,  338,   40,   40,  342,
-      251,  251,  251,  251,  348,  352,   40,  252,   40,   40,
-      344,  351,  347,  252,  253,  253,  345,  346,  346,  346,
-      346,  346,  346,  346,  346,  255,  255,  255,  255,   40,
-      255,  255,  255,  255,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,  356,   40,   40,   40,  361,
-       40,   40,  349,  350,  355,  357,  363,  364,   40,  359,
-      353,  354,  360,   40,   40,  365,   40,  362,  358,   40,
-       40,   40,   40,  366,   40,  372,   40,   40,   40,  371,
+      331,   40,  333,  334,   40,   40,  336,   40,   40,  338,
+       40,  332,   40,  250,  250,  250,  250,   40,  337,  343,
+      251,  341,  341,  341,  341,  339,  251,  342,   40,  252,
+      252,  340,  341,  341,  341,  341,  254,  254,  254,  254,
+       40,  254,  254,  254,  254,   40,   40,   40,   40,   40,
+       40,  348,   40,  346,   40,   40,  347,   40,   40,  351,
+       40,   40,   40,  344,  345,   40,  356,  350,  352,   40,
+      358,   40,   40,  349,  354,  355,   40,   40,  359,  360,
+       40,   40,   40,  357,  353,   40,   40,  367,   40,   40,
+       40,   40,   40,   40,  361,  368,  366,   40,   40,  362,
 
-      373,   40,   40,   40,   40,   40,  367,  378,  368,   40,
-      369,  377,   40,  370,   40,  374,  376,  375,  380,  379,
-      381,   40,   40,  385,  382,   40,   40,  387,  383,  388,
-      386,   40,   40,   40,   40,  384,   40,   40,   40,   40,
-      390,  392,  394,   40,  396,  389,  397,   40,  398,  395,
-       40,  402,  399,   40,  391,  393,  401,  400,   40,   40,
-      403,   40,   40,   40,   40,   40,   40,  404,   40,  405,
-      408,   40,  406,  407,   40,   40,   40,   40,   40,  409,
-      424,  413,  416,   40,  417,  410,   40,  411,  415,   40,
-      419,  412,   40,  414,  346,  346,  346,  346,   40,  421,
+       40,  365,  363,   40,  364,  372,  369,  371,  373,  370,
+      374,   40,  375,   40,  378,  377,  376,   40,   40,   40,
+       40,   40,  381,   40,   40,  383,  379,   40,   40,  380,
+      382,  385,  386,   40,  387,  389,  388,   40,   40,   40,
+       40,   40,  384,   40,   40,  392,  390,   40,  391,  393,
+      395,  394,  397,  396,   40,   40,   40,   40,   40,   40,
+       40,  398,  341,  341,  341,  341,   40,  406,  402,   40,
+      404,  405,   40,   40,   40,  399,  400,  409,   40,  401,
+      403,  408,  407,   40,   40,  410,   40,   40,  411,   40,
+      412,   40,  413,   40,   40,   40,   40,   40,  416,   40,
 
-      418,   40,   40,  420,   40,   40,  422,  423,  425,   40,
-       40,   40,   40,  427,   40,   40,   40,  430,  431,   40,
-       40,  426,  428,   40,   40,  432,  429,  433,  435,   40,
-       40,  436,  434,   40,   40,   40,  437,   40,   40,  441,
-       40,  439,  444,  443,   40,   40,  438,  445,  440,  446,
-      442,   40,   40,  447,   40,  449,   40,   40,  448,   40,
-       40,   40,   40,   40,  452,   40,   40,  451,   40,  454,
-      456,  459,  458,   40,  450,  453,   40,  461,  463,  457,
-       40,  462,  455,   40,   40,  460,   40,   40,   40,   40,
-       40,   40,   40,   40,  469,   40,  466,  465,  471,  464,
+       40,  419,  420,  414,   40,   40,  415,   40,  417,  421,
+      418,   40,  422,  424,  423,  425,   40,   40,   40,   40,
+       40,  426,   40,   40,   40,   40,  430,  432,  428,  433,
+      427,   40,  434,  435,  436,  429,  431,   40,  438,   40,
+       40,   40,   40,   40,  437,   40,   40,   40,   40,   40,
+      441,   40,  445,  448,  440,  447,   40,   40,   40,   40,
+      439,  442,  450,  452,  444,  446,   40,   40,   40,  451,
+      449,   40,  453,   40,  454,  458,   40,   40,   40,  455,
+       40,   40,  456,   40,  457,  460,   40,  464,  465,   40,
+       40,   40,   40,  467,   40,  461,  462,  468,  463,  459,
 
-       40,   40,  480,  468,  475,  476,   40,  467,  478,  473,
-      474,   40,  472,   40,   40,   40,  470,   40,  477,  482,
-      481,   40,  479,   40,  484,   40,   40,   40,   40,   40,
-       40,   40,  486,   40,  488,   40,  483,  489,  490,  493,
-      487,   40,  485,  491,   40,   40,  494,  495,   40,   40,
-       40,  492,   40,   40,   40,   40,   40,   40,  496,  497,
-       40,  502,  503,   40,  501,  498,  499,  504,   40,  505,
-      506,   40,  508,   40,  500,   40,   40,  507,  513,  509,
-      512,   40,   40,  510,  514,   40,   40,   40,  516,   40,
-       40,   40,   40,  511,   40,   40,  518,   40,   40,  515,
+      466,  469,   40,  470,   40,   40,   40,  471,  475,   40,
+       40,  473,  472,   40,   40,   40,   40,   40,  477,   40,
+      478,   40,   40,  476,  482,  479,  474,   40,   40,  480,
+      483,   40,   40,   40,   40,   40,  484,  481,   40,   40,
+      486,   40,  491,  492,  485,   40,   40,  490,  487,  488,
+       40,   40,  493,  494,  495,  497,   40,  489,   40,   40,
+       40,   40,  496,  502,   40,  501,   40,  498,  503,   40,
+       40,  505,   40,  499,   40,   40,  500,  507,   40,  511,
+       40,   40,   40,  504,  506,   40,   40,   40,   40,  515,
+      512,  517,  518,  508,  519,  509,   40,  510,  513,  516,
 
-      522,   40,  523,   40,  526,  517,  528,   40,  529,  524,
-      519,  527,  520,  521,   40,   40,   40,  525,   40,   40,
-      530,  532,  531,   40,  535,   40,  534,   40,   40,   40,
-      537,  533,  536,  538,   40,   40,  541,   40,   40,   40,
-       40,  539,  544,   40,  546,   40,   40,   40,   40,   40,
-      543,   40,   40,  545,  547,   40,  540,  542,  551,  548,
-      552,  554,   40,  555,  549,   40,   40,   40,   40,  550,
-      553,   40,   40,   40,   40,  558,   40,  556,  559,   40,
-      557,  560,   40,  564,  561,   40,  565,  563,   40,  562,
-       40,  566,   40,   40,   40,   40,   40,  571,   40,  572,
+       40,  514,   40,  520,   40,  521,   40,   40,   40,  524,
+      523,   40,   40,  527,   40,  522,  525,   40,   40,   40,
+       40,  530,   40,   40,  533,   40,   40,  528,  535,  526,
+       40,   40,   40,  532,   40,  534,  536,   40,   40,   40,
+      531,  529,  537,  540,  538,   40,  541,  543,   40,   40,
+       40,   40,  549,  539,  542,  548,   40,   40,   40,  547,
+      544,   40,   40,  545,  546,  553,   40,   40,  550,   40,
+       40,   40,  552,   40,  551,  554,   40,   40,  555,   40,
+      560,   40,   40,  561,   40,  557,   40,  556,  565,   40,
+       40,  559,  558,  566,  564,   40,   40,   40,   40,   40,
 
-      567,   40,   40,  568,   40,  569,   40,  577,  576,  570,
-       40,   40,  575,   40,   40,   40,   40,  574,   40,   40,
-       40,   40,  573,  578,   37,   37,   37,   37,   39,   39,
+      562,   40,  563,  567,   37,   37,   37,   37,   39,   39,
        50,   40,   50,   50,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
@@ -725,21 +719,19 @@
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
 
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,  250,   40,
-       40,   40,   40,   40,  132,   40,   38,  579,    3,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579
-
+       40,   40,   40,   40,   40,   40,  249,   40,   40,   40,
+       40,   40,  132,   40,   38,  568,    3,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568
     } ;
 
-static yyconst short int yy_chk[1293] =
+static yyconst short int yy_chk[1271] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -757,7 +749,7 @@
        19,   21,   26,   24,   23,   23,   21,   24,   21,   21,
        29,   26,   28,   31,   34,   67,   21,   68,   31,   29,
        21,   54,   21,   34,   28,   68,   26,   27,   35,   35,
-       28,   31,   33,  584,   31,   28,   27,   33,   27,   67,
+       28,   31,   33,  573,   31,   28,   27,   33,   27,   67,
        54,   31,   27,   36,   27,   52,   27,   35,   27,   30,
        33,   55,   36,   30,   42,   42,   42,   42,   52,   30,
        52,   30,   30,   55,   30,   30,   30,   55,   30,   43,
@@ -778,112 +770,108 @@
        90,   85,   91,   92,   99,   87,   95,   84,   93,   94,
        97,   95,   92,   88,   98,   90,   96,   93,   94,  100,
       102,  103,   91,   97,   96,   99,   92,   98,  104,  105,
-      108,   93,  106,  582,  103,  104,  107,  109,  105,  108,
-      110,  117,  100,  104,  107,  116,  109,  106,  102,  112,
-      106,  104,  105,  108,  111,  104,  106,  113,  110,  107,
-      111,  115,  112,  118,  116,  121,  119,  125,  120,  117,
-      113,  122,  124,  578,  115,  123,  118,  120,  113,  125,
-      122,  124,  121,  123,  123,  115,  119,  127,  121,  122,
+      108,   93,  106,  110,  103,  104,  107,  109,  105,  108,
+      117,  571,  100,  104,  107,  112,  109,  106,  102,  113,
+      106,  110,  105,  108,  111,  104,  106,  116,  112,  107,
+      111,  115,  113,  119,  118,  121,  120,  125,  117,  122,
+      113,  567,  123,  130,  115,  120,  116,  118,  122,  125,
+      123,  123,  121,  119,  127,  115,  124,  122,  121,  120,
 
-      128,  120,  130,  123,  122,  128,  123,  131,  142,  194,
-      127,  123,  127,  134,  134,  134,  134,  135,  135,  135,
-      135,  141,  144,  130,  135,  145,  142,  147,  131,  194,
-      135,  144,  141,  153,  131,  137,  137,  137,  137,  137,
-      147,  153,  137,  150,  149,  151,  145,  154,  137,  138,
-      138,  149,  138,  138,  138,  138,  138,  155,  150,  156,
-      151,  157,  158,  162,  156,  159,  155,  160,  161,  154,
-      163,  164,  162,  160,  159,  167,  157,  158,  159,  165,
-      167,  161,  168,  169,  162,  172,  170,  171,  173,  576,
-      174,  172,  163,  177,  164,  170,  171,  175,  165,  176,
+      123,  128,  122,  123,  130,  124,  128,  127,  123,  127,
+      131,  134,  134,  134,  134,  135,  135,  135,  135,  141,
+      144,  147,  135,  145,  389,  142,  149,  154,  135,  144,
+      141,  131,  150,  149,  147,  151,  389,  131,  137,  137,
+      137,  137,  137,  142,  145,  137,  153,  150,  157,  154,
+      151,  137,  138,  138,  153,  138,  138,  138,  138,  138,
+      155,  156,  158,  157,  160,  159,  156,  161,  163,  155,
+      160,  164,  162,  165,  159,  168,  171,  158,  159,  167,
+      161,  162,  169,  172,  167,  171,  173,  175,  170,  172,
+      163,  174,  165,  162,  164,  177,  175,  170,  176,  178,
 
-      179,  169,  170,  178,  169,  174,  175,  173,  176,  168,
-      180,  177,  178,  181,  179,  182,  183,  184,  185,  187,
-      198,  181,  176,  197,  202,  201,  182,  204,  575,  203,
-      242,  211,  184,  180,  187,  242,  204,  183,  206,  210,
-      197,  211,  185,  198,  200,  200,  200,  200,  201,  202,
-      200,  200,  203,  200,  200,  200,  200,  200,  200,  205,
-      210,  206,  212,  213,  216,  217,  219,  220,  205,  222,
-      205,  212,  221,  225,  205,  223,  205,  226,  224,  231,
-      216,  213,  220,  221,  223,  230,  217,  224,  222,  219,
-      233,  235,  223,  239,  238,  240,  225,  231,  241,  244,
+      169,  179,  168,  169,  170,  173,  174,  176,  178,  180,
+      181,  182,  183,  177,  184,  179,  185,  194,  181,  187,
+      198,  176,  182,  242,  197,  201,  203,  202,  210,  184,
+      204,  242,  180,  183,  187,  565,  205,  194,  210,  204,
+      185,  197,  209,  198,  200,  200,  200,  200,  201,  203,
+      200,  200,  202,  200,  200,  200,  200,  200,  200,  205,
+      211,  212,  215,  209,  216,  218,  219,  221,  223,  211,
+      224,  220,  225,  229,  222,  232,  230,  223,  215,  212,
+      234,  219,  220,  222,  240,  216,  221,  238,  218,  234,
+      237,  222,  232,  224,  230,  239,  229,  225,  241,  237,
 
-      235,  243,  226,  238,  244,  245,  239,  233,  230,  243,
-      246,  240,  248,  249,  246,  256,  241,  257,  264,  245,
-      251,  251,  251,  251,  257,  264,  261,  251,  574,  572,
-      248,  261,  256,  251,  252,  252,  249,  252,  252,  252,
-      252,  253,  253,  253,  253,  254,  254,  254,  254,  254,
-      255,  255,  255,  255,  255,  258,  260,  265,  266,  267,
-      268,  270,  269,  271,  273,  268,  274,  272,  276,  273,
-      280,  275,  258,  260,  267,  269,  275,  276,  277,  271,
-      265,  266,  272,  281,  286,  277,  282,  274,  270,  283,
-      287,  289,  294,  280,  290,  287,  291,  293,  292,  286,
+      238,  243,  240,  241,  244,  245,  243,  247,  248,  245,
+      255,  239,  256,  250,  250,  250,  250,  564,  244,  256,
+      250,  252,  252,  252,  252,  247,  250,  255,  264,  251,
+      251,  248,  251,  251,  251,  251,  253,  253,  253,  253,
+      253,  254,  254,  254,  254,  254,  257,  259,  260,  263,
+      265,  264,  266,  260,  267,  268,  263,  269,  270,  267,
+      271,  272,  273,  257,  259,  274,  272,  266,  268,  275,
+      274,  279,  276,  265,  270,  271,  280,  282,  275,  276,
+      281,  285,  286,  273,  269,  289,  288,  286,  290,  291,
+      302,  292,  294,  293,  279,  288,  285,  295,  299,  280,
 
-      289,  295,  300,  296,  303,  305,  281,  294,  282,  301,
-      282,  293,  304,  283,  309,  290,  292,  291,  296,  295,
-      300,  307,  310,  305,  301,  311,  316,  309,  303,  310,
-      307,  312,  313,  314,  317,  304,  325,  318,  319,  570,
-      312,  313,  314,  321,  317,  311,  318,  324,  319,  316,
-      322,  325,  321,  327,  312,  313,  324,  322,  329,  332,
-      327,  333,  336,  334,  338,  335,  339,  329,  341,  332,
-      335,  343,  333,  334,  357,  344,  349,  348,  351,  336,
-      357,  343,  348,  352,  349,  338,  356,  339,  344,  358,
-      352,  341,  354,  343,  346,  346,  346,  346,  353,  354,
+      300,  282,  281,  303,  281,  292,  289,  291,  293,  290,
+      294,  304,  295,  306,  302,  300,  299,  308,  309,  311,
+      563,  312,  306,  313,  314,  309,  303,  316,  317,  304,
+      308,  312,  313,  320,  314,  317,  316,  319,  322,  328,
+      324,  327,  311,  329,  331,  322,  319,  330,  320,  324,
+      328,  327,  330,  329,  333,  334,  336,  339,  338,  344,
+      346,  331,  341,  341,  341,  341,  343,  344,  338,  351,
+      339,  343,  348,  561,  347,  333,  334,  348,  349,  336,
+      338,  347,  346,  350,  353,  349,  352,  354,  350,  355,
+      351,  356,  352,  357,  358,  360,  363,  365,  355,  364,
 
-      351,  355,  359,  353,  360,  361,  355,  356,  358,  362,
-      363,  365,  368,  360,  369,  370,  372,  363,  365,  371,
-      373,  359,  361,  374,  375,  368,  362,  369,  371,  376,
-      377,  372,  370,  379,  380,  381,  373,  387,  382,  377,
-      383,  375,  381,  380,  384,  385,  374,  382,  376,  383,
-      379,  388,  396,  384,  397,  387,  398,  400,  385,  401,
-      405,  402,  410,  409,  397,  408,  411,  396,  412,  400,
-      402,  409,  408,  413,  388,  398,  414,  411,  413,  405,
-      415,  412,  401,  417,  418,  410,  420,  421,  422,  423,
-      424,  425,  426,  437,  421,  430,  417,  415,  423,  414,
+      367,  358,  360,  353,  366,  368,  354,  369,  356,  363,
+      357,  370,  364,  366,  365,  367,  371,  372,  375,  374,
+      382,  368,  376,  377,  378,  379,  372,  375,  370,  376,
+      369,  380,  377,  378,  379,  371,  374,  383,  382,  385,
+      386,  390,  387,  391,  380,  398,  394,  399,  397,  403,
+      386,  400,  391,  398,  385,  397,  401,  404,  402,  407,
+      383,  387,  400,  402,  390,  394,  406,  409,  410,  401,
+      399,  411,  403,  413,  404,  410,  412,  419,  414,  406,
+      415,  424,  407,  418,  409,  412,  423,  418,  418,  429,
+      559,  437,  426,  423,  427,  413,  414,  424,  415,  411,
 
-      429,  434,  437,  420,  429,  429,  435,  418,  434,  425,
-      426,  438,  424,  440,  439,  448,  422,  442,  430,  439,
-      438,  447,  435,  449,  442,  451,  458,  452,  462,  463,
-      466,  464,  448,  465,  451,  468,  440,  452,  458,  464,
-      449,  470,  447,  462,  473,  474,  465,  466,  475,  476,
-      480,  463,  477,  479,  481,  482,  483,  485,  468,  470,
-      486,  477,  479,  484,  476,  473,  474,  480,  488,  481,
-      482,  489,  484,  490,  475,  491,  492,  483,  490,  485,
-      489,  493,  494,  486,  491,  495,  497,  502,  493,  498,
-      499,  500,  503,  488,  504,  505,  495,  511,  509,  492,
+      419,  426,  428,  427,  431,  436,  438,  428,  437,  440,
+      441,  431,  429,  447,  451,  452,  453,  454,  440,  455,
+      441,  457,  459,  438,  453,  447,  436,  462,  463,  451,
+      454,  464,  465,  466,  468,  469,  455,  452,  470,  471,
+      459,  472,  466,  468,  457,  474,  473,  465,  462,  463,
+      475,  477,  469,  470,  471,  473,  478,  464,  479,  480,
+      481,  483,  472,  479,  482,  478,  484,  474,  480,  486,
+      489,  482,  487,  475,  488,  491,  477,  484,  493,  489,
+      494,  492,  500,  481,  483,  501,  498,  508,  502,  494,
+      491,  500,  501,  486,  502,  487,  504,  488,  492,  498,
 
-      500,  512,  502,  519,  505,  494,  511,  524,  512,  503,
-      497,  509,  498,  499,  513,  515,  516,  504,  517,  522,
-      513,  516,  515,  523,  522,  526,  519,  527,  525,  528,
-      524,  517,  523,  525,  529,  530,  528,  531,  532,  533,
-      535,  526,  531,  536,  533,  537,  538,  541,  544,  539,
-      530,  540,  543,  532,  535,  549,  527,  529,  539,  536,
-      540,  543,  545,  544,  537,  546,  548,  551,  550,  538,
-      541,  553,  555,  557,  558,  548,  556,  545,  549,  559,
-      546,  550,  561,  556,  551,  560,  557,  555,  562,  553,
-      563,  558,  564,  565,  566,  568,  569,  563,  573,  564,
+      505,  493,  506,  504,  511,  505,  513,  512,  514,  511,
+      508,  515,  516,  514,  517,  506,  512,  518,  519,  520,
+      521,  517,  524,  522,  520,  526,  525,  515,  522,  513,
+      527,  530,  538,  519,  528,  521,  524,  529,  532,  539,
+      518,  516,  525,  528,  526,  533,  529,  532,  534,  535,
+      537,  540,  539,  527,  530,  538,  542,  544,  545,  537,
+      533,  547,  546,  534,  535,  545,  548,  549,  540,  550,
+      551,  554,  544,  552,  542,  546,  553,  557,  547,  555,
+      552,  560,  566,  553,  562,  549,  558,  548,  560,  556,
+      543,  551,  550,  562,  557,  541,  536,  531,  523,  510,
 
-      559,  571,  577,  560,  567,  561,  554,  573,  571,  562,
-      552,  547,  568,  542,  534,  521,  520,  566,  518,  514,
-      510,  508,  565,  577,  580,  580,  580,  580,  581,  581,
-      583,  507,  583,  583,  506,  501,  496,  487,  478,  472,
-      471,  469,  467,  461,  460,  459,  457,  456,  455,  454,
-      453,  450,  446,  445,  444,  443,  441,  436,  433,  432,
-      431,  428,  427,  419,  416,  407,  406,  404,  403,  399,
-      395,  394,  393,  392,  391,  390,  389,  386,  378,  367,
-      366,  364,  350,  347,  345,  342,  340,  337,  331,  330,
-      328,  326,  323,  320,  315,  308,  302,  299,  298,  297,
+      554,  509,  555,  566,  569,  569,  569,  569,  570,  570,
+      572,  507,  572,  572,  503,  499,  497,  496,  495,  490,
+      485,  476,  467,  461,  460,  458,  456,  450,  449,  448,
+      446,  445,  444,  443,  442,  439,  435,  434,  433,  432,
+      430,  425,  422,  421,  420,  417,  416,  408,  405,  396,
+      395,  393,  392,  388,  384,  381,  373,  362,  361,  359,
+      345,  342,  340,  337,  335,  332,  326,  325,  323,  321,
+      318,  315,  310,  307,  301,  298,  297,  296,  287,  284,
+      283,  278,  277,  262,  261,  258,  246,  236,  235,  233,
+      231,  228,  227,  226,  217,  214,  213,  208,  207,  206,
 
-      288,  285,  284,  279,  278,  263,  262,  259,  247,  237,
-      236,  234,  232,  229,  228,  227,  218,  215,  214,  209,
-      208,  207,  199,  196,  195,  193,  192,  191,  190,  189,
-      188,  186,  152,  148,  146,  143,  140,  136,  132,  114,
-       89,   69,   59,   39,   37,    8,    7,    3,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579,  579,  579,  579,  579,  579,  579,  579,  579,
-      579,  579
-
+      199,  196,  195,  193,  192,  191,  190,  189,  188,  186,
+      152,  148,  146,  143,  140,  136,  132,  114,   89,   69,
+       59,   39,   37,    8,    7,    3,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568
     } ;
 
 static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
@@ -900,7 +888,7 @@
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 1 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 #define INITIAL 0
 /*===-- Lexer.l - Scanner for llvm assembly files --------------*- C++ -*--===//
 //
@@ -915,7 +903,7 @@
 //
 //===----------------------------------------------------------------------===*/
 #define YY_NEVER_INTERACTIVE 1
-#line 28 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 28 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 #include "ParserInternals.h"
 #include "llvm/Module.h"
 #include <list>
@@ -1048,7 +1036,7 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 1052 "Lexer.cpp"
+#line 1040 "Lexer.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1199,10 +1187,10 @@
 	register char *yy_cp = NULL, *yy_bp = NULL;
 	register int yy_act;
 
-#line 186 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 186 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 
 
-#line 1206 "Lexer.cpp"
+#line 1194 "Lexer.cpp"
 
 	if ( yy_init )
 		{
@@ -1250,14 +1238,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 >= 580 )
+				if ( yy_current_state >= 569 )
 					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 != 579 );
+		while ( yy_current_state != 568 );
 
 yy_find_action:
 		yy_current_state = *--yy_state_ptr;
@@ -1295,681 +1283,651 @@
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 188 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 188 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { /* Ignore comments for now */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 190 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 190 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return BEGINTOK; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 191 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 191 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return ENDTOK; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 192 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 192 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return TRUETOK;  }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 193 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 193 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return FALSETOK; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 194 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 194 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return DECLARE; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 195 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 195 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return GLOBAL; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 196 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 196 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return CONSTANT; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 197 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 197 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return INTERNAL; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 198 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 198 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return LINKONCE; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 199 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 199 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return WEAK; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 200 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 200 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return APPENDING; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 201 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 201 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return DLLIMPORT; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 202 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 202 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return DLLEXPORT; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 203 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 203 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return EXTERN_WEAK; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 204 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 204 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return EXTERNAL; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 205 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 205 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return IMPLEMENTATION; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 206 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 206 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return ZEROINITIALIZER; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 207 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 207 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return DOTDOTDOT; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 208 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 208 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return UNDEF; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 209 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 209 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return NULL_TOK; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 210 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 210 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return TO; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 211 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 211 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return TAIL; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 212 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 212 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return TARGET; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 213 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 213 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return TRIPLE; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 214 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 214 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return DEPLIBS; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 215 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 215 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return ENDIAN; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 216 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 216 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return POINTERSIZE; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 217 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 217 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return DATALAYOUT; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 218 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 218 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return LITTLE; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 219 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 219 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return BIG; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 220 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 220 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return VOLATILE; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 221 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 221 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return ALIGN;  }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 222 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 222 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return SECTION; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 223 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 223 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return MODULE; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 224 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 224 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return ASM_TOK; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 225 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 225 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return SIDEEFFECT; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 227 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 227 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return CC_TOK; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 228 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 228 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return CCC_TOK; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 229 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 229 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return CSRETCC_TOK; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 230 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 230 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return FASTCC_TOK; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 231 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 231 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return COLDCC_TOK; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 232 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 232 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return X86_STDCALLCC_TOK; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 233 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 233 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return X86_FASTCALLCC_TOK; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 235 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 235 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TY(Type::VoidTy,  VOID);  }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 236 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 236 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TY(Type::BoolTy,  BOOL);  }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 237 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 237 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TY(Type::SByteTy, SBYTE); }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 238 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 238 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TY(Type::UByteTy, UBYTE); }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 239 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 239 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TY(Type::ShortTy, SHORT); }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 240 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 240 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TY(Type::UShortTy,USHORT);}
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 241 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 241 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TY(Type::IntTy,   INT);   }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 242 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 242 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TY(Type::UIntTy,  UINT);  }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 243 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 243 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TY(Type::LongTy,  LONG);  }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 244 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 244 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TY(Type::ULongTy, ULONG); }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 245 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 245 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TY(Type::FloatTy, FLOAT); }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 246 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 246 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TY(Type::DoubleTy,DOUBLE);}
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 247 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 247 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TY(Type::LabelTy, LABEL); }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 248 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 248 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return TYPE;   }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 249 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 249 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return OPAQUE; }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 251 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 251 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Add, ADD); }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 252 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 252 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Sub, SUB); }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 253 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 253 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Mul, MUL); }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 254 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 254 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, UDiv, UDIV); }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 255 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 255 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SDiv, SDIV); }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 256 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 256 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, FDiv, FDIV); }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 257 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 257 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, URem, UREM); }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 258 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 258 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SRem, SREM); }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 259 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 259 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, FRem, FREM); }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 260 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 260 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, And, AND); }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 261 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 261 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Or , OR ); }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 262 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 262 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Xor, XOR); }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 263 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetNE, SETNE); }
+#line 263 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal,  ICmp,  ICMP); }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 264 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetEQ, SETEQ); }
+#line 264 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal,  FCmp,  FCMP); }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 265 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetLT, SETLT); }
+#line 265 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ return EQ;  }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 266 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetGT, SETGT); }
+#line 266 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ return NE;  }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 267 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetLE, SETLE); }
+#line 267 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ return SLT; }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 268 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetGE, SETGE); }
+#line 268 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ return SGT; }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 269 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal,  ICmp,  ICMP); }
+#line 269 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ return SLE; }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 270 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal,  FCmp,  FCMP); }
+#line 270 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ return SGE; }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 271 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return EQ;  }
+#line 271 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ return ULT; }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 272 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return NE;  }
+#line 272 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ return UGT; }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 273 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return SLT; }
+#line 273 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ return ULE; }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 274 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return SGT; }
+#line 274 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ return UGE; }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 275 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return SLE; }
+#line 275 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ return OEQ; }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 276 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return SGE; }
+#line 276 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ return ONE; }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 277 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return ULT; }
+#line 277 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ return OLT; }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 278 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return UGT; }
+#line 278 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ return OGT; }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 279 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return ULE; }
+#line 279 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ return OLE; }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 280 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return UGE; }
+#line 280 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ return OGE; }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 281 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return OEQ; }
+#line 281 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ return ORD; }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 282 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return ONE; }
+#line 282 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ return UNO; }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 283 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return OLT; }
+#line 283 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ return UEQ; }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 284 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return OGT; }
+#line 284 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ return UNE; }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 285 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return OLE; }
+#line 286 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, PHI, PHI_TOK); }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 286 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return OGE; }
+#line 287 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Call, CALL); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 287 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return ORD; }
+#line 288 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, Trunc, TRUNC); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 288 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return UNO; }
+#line 289 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, ZExt, ZEXT); }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 289 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return UEQ; }
+#line 290 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, SExt, SEXT); }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 290 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return UNE; }
+#line 291 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPTrunc, FPTRUNC); }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 292 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, PHI, PHI_TOK); }
+#line 292 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPExt, FPEXT); }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 293 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Call, CALL); }
+#line 293 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, UIToFP, UITOFP); }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 294 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, Trunc, TRUNC); }
+#line 294 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, SIToFP, SITOFP); }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 295 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, ZExt, ZEXT); }
+#line 295 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPToUI, FPTOUI); }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 296 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, SExt, SEXT); }
+#line 296 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPToSI, FPTOSI); }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 297 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPTrunc, FPTRUNC); }
+#line 297 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, IntToPtr, INTTOPTR); }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 298 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPExt, FPEXT); }
+#line 298 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, PtrToInt, PTRTOINT); }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 299 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, UIToFP, UITOFP); }
+#line 299 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, BitCast, BITCAST); }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 300 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, SIToFP, SITOFP); }
+#line 300 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Select, SELECT); }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 301 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPToUI, FPTOUI); }
+#line 301 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Shl, SHL); }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 302 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPToSI, FPTOSI); }
+#line 302 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, LShr, LSHR); }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 303 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, IntToPtr, INTTOPTR); }
+#line 303 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, AShr, ASHR); }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 304 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, PtrToInt, PTRTOINT); }
+#line 304 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, VAArg , VAARG); }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 305 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, BitCast, BITCAST); }
+#line 305 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Ret, RET); }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 306 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Select, SELECT); }
+#line 306 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Br, BR); }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 307 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Shl, SHL); }
+#line 307 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Switch, SWITCH); }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 308 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, LShr, LSHR); }
+#line 308 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Invoke, INVOKE); }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 309 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, AShr, ASHR); }
+#line 309 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 310 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, VAArg , VAARG); }
+#line 310 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 311 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Ret, RET); }
+#line 312 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Malloc, MALLOC); }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 312 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Br, BR); }
+#line 313 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 313 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Switch, SWITCH); }
+#line 314 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Free, FREE); }
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 314 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Invoke, INVOKE); }
+#line 315 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Load, LOAD); }
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 315 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unwind, UNWIND); }
+#line 316 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Store, STORE); }
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 316 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
+#line 317 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 318 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Malloc, MALLOC); }
+#line 319 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 319 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
+#line 320 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 320 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Free, FREE); }
+#line 321 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 321 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Load, LOAD); }
-	YY_BREAK
-case 129:
-YY_RULE_SETUP
-#line 322 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Store, STORE); }
-	YY_BREAK
-case 130:
-YY_RULE_SETUP
-#line 323 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
-	YY_BREAK
-case 131:
-YY_RULE_SETUP
-#line 325 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
-	YY_BREAK
-case 132:
-YY_RULE_SETUP
-#line 326 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
-	YY_BREAK
-case 133:
-YY_RULE_SETUP
-#line 327 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
-	YY_BREAK
-case 134:
-YY_RULE_SETUP
-#line 330 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 324 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 {
                   UnEscapeLexed(yytext+1);
                   llvmAsmlval.StrVal = strdup(yytext+1);             // Skip %
                   return VAR_ID;
                 }
 	YY_BREAK
-case 135:
+case 129:
 YY_RULE_SETUP
-#line 335 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 329 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 {
                   yytext[strlen(yytext)-1] = 0;  // nuke colon
                   UnEscapeLexed(yytext);
@@ -1977,9 +1935,9 @@
                   return LABELSTR;
                 }
 	YY_BREAK
-case 136:
+case 130:
 YY_RULE_SETUP
-#line 341 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 335 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 {
                   yytext[strlen(yytext)-2] = 0;  // nuke colon, end quote
                   UnEscapeLexed(yytext+1);
@@ -1987,9 +1945,9 @@
                   return LABELSTR;
                 }
 	YY_BREAK
-case 137:
+case 131:
 YY_RULE_SETUP
-#line 348 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 342 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { // Note that we cannot unescape a string constant here!  The
                    // string constant might contain a \00 which would not be
                    // understood by the string stuff.  It is valid to make a
@@ -2000,14 +1958,14 @@
                    return STRINGCONSTANT;
                  }
 	YY_BREAK
-case 138:
+case 132:
 YY_RULE_SETUP
-#line 359 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 353 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { llvmAsmlval.UInt64Val = atoull(yytext); return EUINT64VAL; }
 	YY_BREAK
-case 139:
+case 133:
 YY_RULE_SETUP
-#line 360 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 354 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   // +1:  we have bigger negative range
@@ -2017,17 +1975,17 @@
                   return ESINT64VAL;
                 }
 	YY_BREAK
-case 140:
+case 134:
 YY_RULE_SETUP
-#line 368 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 362 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 {
                    llvmAsmlval.UInt64Val = HexIntToVal(yytext+3);
                    return yytext[0] == 's' ? ESINT64VAL : EUINT64VAL;
                  }
 	YY_BREAK
-case 141:
+case 135:
 YY_RULE_SETUP
-#line 373 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 367 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   if ((unsigned)Val != Val)
@@ -2036,9 +1994,9 @@
                   return UINTVAL;
                 }
 	YY_BREAK
-case 142:
+case 136:
 YY_RULE_SETUP
-#line 380 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 374 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+2);
                   // +1:  we have bigger negative range
@@ -2048,18 +2006,18 @@
                   return SINTVAL;
                 }
 	YY_BREAK
-case 143:
+case 137:
 YY_RULE_SETUP
-#line 389 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 383 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = atof(yytext); return FPVAL; }
 	YY_BREAK
-case 144:
+case 138:
 YY_RULE_SETUP
-#line 390 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 384 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = HexToFP(yytext); return FPVAL; }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 392 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 386 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
@@ -2068,22 +2026,22 @@
                   return EOF;
                 }
 	YY_BREAK
-case 145:
+case 139:
 YY_RULE_SETUP
-#line 400 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 394 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { /* Ignore whitespace */ }
 	YY_BREAK
-case 146:
+case 140:
 YY_RULE_SETUP
-#line 401 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 395 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 { return yytext[0]; }
 	YY_BREAK
-case 147:
+case 141:
 YY_RULE_SETUP
-#line 403 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 397 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2087 "Lexer.cpp"
+#line 2045 "Lexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2370,7 +2328,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 >= 580 )
+			if ( yy_current_state >= 569 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2400,11 +2358,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 >= 580 )
+		if ( yy_current_state >= 569 )
 			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 == 579);
+	yy_is_jam = (yy_current_state == 568);
 	if ( ! yy_is_jam )
 		*yy_state_ptr++ = yy_current_state;
 
@@ -2961,5 +2919,5 @@
 	return 0;
 	}
 #endif
-#line 403 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 397 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"