Regenerate


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@35795 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AsmParser/Lexer.cpp.cvs b/lib/AsmParser/Lexer.cpp.cvs
index 6b536b5..0092f7f 100644
--- a/lib/AsmParser/Lexer.cpp.cvs
+++ b/lib/AsmParser/Lexer.cpp.cvs
@@ -317,37 +317,37 @@
 	*yy_cp = '\0'; \
 	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 136
-#define YY_END_OF_BUFFER 137
-static yyconst short int yy_acclist[217] =
+#define YY_NUM_RULES 135
+#define YY_END_OF_BUFFER 136
+static yyconst short int yy_acclist[216] =
     {   0,
-      137,  135,  136,  134,  135,  136,  134,  136,  135,  136,
-      135,  136,  135,  136,  135,  136,  135,  136,  135,  136,
-      127,  135,  136,  127,  135,  136,    1,  135,  136,  135,
-      136,  135,  136,  135,  136,  135,  136,  135,  136,  135,
-      136,  135,  136,  135,  136,  135,  136,  135,  136,  135,
-      136,  135,  136,  135,  136,  135,  136,  135,  136,  135,
-      136,  135,  136,  135,  136,  135,  136,  135,  136,  135,
-      136,  135,  136,  135,  136,  125,  123,  121,  130,  128,
-      132,  127,    1,  122,  131,  107,   36,   70,   52,   71,
-       66,   24,  125,  121,  132,   21,  132,  133,  126,  122,
+      136,  134,  135,  133,  134,  135,  133,  135,  134,  135,
+      134,  135,  134,  135,  134,  135,  134,  135,  134,  135,
+      126,  134,  135,  126,  134,  135,    1,  134,  135,  134,
+      135,  134,  135,  134,  135,  134,  135,  134,  135,  134,
+      135,  134,  135,  134,  135,  134,  135,  134,  135,  134,
+      135,  134,  135,  134,  135,  134,  135,  134,  135,  134,
+      135,  134,  135,  134,  135,  134,  135,  134,  135,  134,
+      135,  134,  135,  134,  135,  124,  122,  120,  129,  127,
+      131,  126,    1,  121,  130,  106,   35,   69,   51,   70,
+       65,   23,  124,  120,  131,   20,  131,  132,  125,  121,
 
-       53,   65,   34,   37,    3,   55,   80,   85,   83,   84,
-       82,   81,   86,   90,  106,   75,   73,   62,   74,   72,
-       54,   88,   79,   77,   78,   76,   89,   87,   67,  124,
-      132,  132,   64,   91,   69,   58,  114,   61,   68,  115,
-       63,   23,  129,   57,   94,   60,   43,   25,    4,   50,
-       56,   59,   46,   12,   93,  132,   31,    2,    5,   47,
-       96,   42,   49,  116,   92,   22,  113,   39,    7,   48,
-       38,  100,   99,    8,   16,  109,  112,   33,   51,  104,
-       98,  108,   26,   27,   97,  110,  105,  103,    6,   28,
-       95,   32,    9,   18,   10,  101,   11,   45,   44,  102,
+       52,   64,   33,   36,    3,   54,   79,   84,   82,   83,
+       81,   80,   85,   89,  105,   74,   72,   61,   73,   71,
+       53,   87,   78,   76,   77,   75,   88,   86,   66,  123,
+      131,  131,   63,   90,   68,   57,  113,   60,   67,  114,
+       62,   22,  128,   56,   93,   59,   42,   24,    4,   49,
+       55,   58,   45,   12,   92,  131,   30,    2,    5,   46,
+       95,   41,   48,  115,   91,   21,  112,   38,    7,   47,
+       37,   99,   98,    8,   16,  108,  111,   32,   50,  103,
+       97,  107,   25,   26,   96,  109,  104,  102,    6,   27,
+       94,   31,    9,   18,   10,  100,   11,   44,   43,  101,
 
-       30,   13,   15,   14,   29,   35,   17,  111,  117,  119,
-      120,   40,  118,   19,   41,   20
+       29,   13,   15,   14,   28,   34,   17,  110,  116,  118,
+      119,   39,  117,   40,   19
     } ;
 
-static yyconst short int yy_accept[553] =
+static yyconst short int yy_accept[540] =
     {   0,
         1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
        17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
@@ -358,58 +358,56 @@
        86,   86,   87,   87,   88,   88,   88,   88,   88,   88,
        88,   89,   89,   89,   89,   89,   89,   89,   89,   89,
        89,   89,   90,   90,   90,   90,   90,   90,   90,   90,
-       90,   90,   90,   91,   91,   91,   91,   91,   91,   91,
+       90,   90,   91,   91,   91,   91,   91,   91,   91,   91,
 
-       91,   92,   92,   92,   92,   92,   92,   92,   92,   92,
-       92,   92,   92,   92,   92,   92,   92,   93,   93,   93,
+       92,   92,   92,   92,   92,   92,   92,   92,   92,   92,
+       92,   92,   92,   92,   92,   92,   93,   93,   93,   93,
        93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
-       93,   93,   93,   94,   95,   96,   97,   98,   98,   99,
-       99,  100,  101,  102,  102,  102,  103,  103,  103,  104,
-      104,  104,  104,  105,  105,  105,  105,  105,  105,  105,
-      105,  105,  106,  106,  106,  106,  106,  106,  106,  106,
+       93,   93,   94,   95,   96,   97,   98,   98,   99,   99,
+      100,  101,  102,  102,  102,  103,  103,  103,  104,  104,
+      104,  104,  105,  105,  105,  105,  105,  105,  105,  105,
+      105,  106,  106,  106,  106,  106,  106,  106,  106,  106,
       106,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,  106,  106,  106,  106,  106,  107,  107,  107,
-      107,  108,  109,  110,  111,  112,  113,  113,  114,  115,
+      106,  106,  106,  106,  106,  107,  107,  107,  107,  108,
+      109,  110,  111,  112,  113,  113,  114,  115,  115,  116,
 
-      115,  116,  116,  116,  116,  116,  116,  117,  118,  119,
-      119,  119,  119,  120,  121,  121,  121,  122,  122,  122,
-      122,  122,  122,  122,  122,  123,  124,  125,  125,  126,
-      127,  127,  128,  129,  129,  129,  129,  129,  129,  129,
-      129,  129,  130,  130,  130,  131,  132,  132,  132,  132,
-      133,  133,  133,  133,  134,  134,  134,  135,  135,  135,
-      135,  135,  135,  135,  135,  135,  135,  135,  135,  135,
-      135,  136,  137,  137,  137,  137,  137,  138,  139,  139,
-      139,  139,  140,  140,  140,  140,  140,  140,  140,  140,
-      140,  141,  142,  142,  142,  142,  142,  143,  143,  143,
+      116,  116,  116,  116,  116,  117,  118,  119,  119,  119,
+      119,  120,  121,  121,  121,  122,  122,  122,  122,  122,
+      122,  122,  122,  123,  124,  125,  125,  126,  127,  127,
+      128,  129,  129,  129,  129,  129,  129,  129,  129,  129,
+      130,  130,  130,  131,  132,  132,  132,  132,  133,  133,
+      133,  133,  134,  134,  134,  135,  135,  135,  135,  135,
+      135,  135,  135,  135,  135,  135,  135,  135,  135,  136,
+      137,  137,  137,  137,  137,  138,  139,  139,  139,  139,
+      140,  140,  140,  140,  140,  140,  140,  140,  141,  142,
+      142,  142,  142,  142,  143,  143,  143,  144,  145,  145,
 
-      144,  145,  145,  145,  146,  146,  146,  146,  147,  148,
-      148,  148,  149,  149,  149,  150,  150,  151,  152,  152,
-      152,  152,  152,  153,  153,  154,  154,  155,  155,  155,
-      156,  157,  158,  158,  158,  159,  159,  159,  159,  159,
-      159,  159,  159,  159,  159,  159,  159,  159,  160,  160,
-      161,  162,  162,  162,  162,  162,  162,  162,  162,  163,
-      163,  163,  163,  163,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  165,  165,  165,
-      165,  166,  166,  167,  167,  167,  167,  167,  167,  167,
-      167,  168,  168,  168,  169,  169,  169,  169,  170,  170,
+      145,  146,  146,  146,  146,  147,  148,  148,  148,  149,
+      149,  149,  150,  150,  151,  152,  152,  152,  152,  152,
+      153,  153,  154,  154,  155,  155,  155,  156,  157,  158,
+      158,  158,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  160,  160,  161,  162,  162,
+      162,  162,  162,  162,  162,  163,  163,  163,  163,  163,
+      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
+      164,  164,  164,  165,  165,  165,  165,  166,  166,  167,
+      167,  167,  167,  167,  167,  167,  167,  168,  168,  168,
+      169,  169,  169,  169,  170,  170,  170,  170,  171,  171,
 
-      170,  170,  171,  171,  171,  172,  173,  174,  174,  174,
-      175,  176,  176,  176,  176,  176,  177,  177,  178,  179,
-      179,  179,  180,  180,  180,  181,  181,  181,  182,  183,
-      184,  185,  186,  186,  187,  188,  188,  188,  188,  188,
-      188,  189,  189,  189,  190,  191,  191,  191,  191,  191,
-      191,  192,  192,  192,  192,  192,  192,  192,  192,  192,
-      192,  193,  193,  193,  193,  193,  193,  193,  193,  193,
-      194,  194,  194,  194,  194,  195,  195,  195,  195,  195,
-      196,  197,  198,  199,  200,  201,  201,  201,  201,  202,
-      202,  202,  202,  203,  203,  204,  205,  205,  205,  205,
+      171,  172,  173,  174,  174,  174,  175,  176,  176,  176,
+      176,  177,  177,  178,  179,  179,  179,  180,  180,  180,
+      181,  181,  181,  182,  183,  184,  185,  186,  186,  187,
+      188,  188,  188,  188,  188,  188,  189,  189,  189,  190,
+      191,  191,  191,  191,  191,  191,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  194,  194,  194,  194,  194,  195,
+      195,  195,  195,  196,  197,  198,  199,  200,  201,  201,
+      201,  201,  202,  202,  202,  202,  203,  203,  204,  205,
+      205,  205,  205,  205,  205,  205,  205,  205,  205,  205,
 
-      205,  205,  205,  205,  205,  205,  205,  205,  206,  206,
-      206,  206,  206,  206,  206,  207,  207,  207,  207,  207,
-      208,  208,  208,  208,  208,  208,  209,  209,  209,  209,
-      209,  209,  209,  209,  209,  209,  209,  209,  209,  210,
-      210,  211,  212,  212,  213,  213,  214,  215,  216,  216,
-      217,  217
+      206,  206,  206,  206,  206,  206,  207,  207,  207,  207,
+      207,  208,  208,  208,  208,  208,  209,  209,  209,  209,
+      209,  209,  209,  209,  209,  209,  209,  209,  210,  211,
+      212,  212,  213,  213,  214,  215,  215,  216,  216
     } ;
 
 static yyconst int yy_ec[256] =
@@ -453,137 +451,135 @@
         4,    4,    4,    4
     } ;
 
-static yyconst short int yy_base[560] =
+static yyconst short int yy_base[547] =
     {   0,
-        0,    0, 1199, 1200, 1200, 1200, 1194, 1183,   35,   39,
+        0,    0, 1175, 1176, 1176, 1176, 1170, 1159,   35,   39,
        43,   49,   55,   61,    0,   72,   64,   67,   66,   86,
        76,  106,   91,   65,  133,  121,  117,   99,  152,   95,
-       78,  179,  137,  211,  139,   90,  148,   93, 1192, 1200,
-     1181, 1200,    0,   49,  185,  217,  116,  238,  254,  259,
-        0, 1190,    0,  200,  125,  149,  146,  153,  177,   63,
-      154, 1179,  160,  161,  208,  185,  264,  171,  113,  210,
-     1178,  222,  260,  228,  186,  261,  271,  110,  273,  274,
-      230,  223,  277,  278,  279,  282,  286,  285,  205,  290,
-      287,  292, 1177,  288,  299,  300,  307,  309,  312,  314,
+       78,  179,  137,  211,  139,   90,  148,   93, 1168, 1176,
+     1157, 1176,    0,   49,  185,  217,  116,  238,  254,  259,
+        0, 1166,    0,  200,  125,  149,  146,  153,  177,   63,
+      154, 1155,  160,  161,  208,  185,  264,  171,  113,  210,
+     1154,  222,  260,  228,  186,  261,  271,  110,  273,  274,
+      230,  289,  277,  278,  150,  290,  241,  205,  282,  231,
+      291, 1153,  292,  296,  299,  303,  305,  306,  318,  310,
 
-      316,  318,  323,  311,  324,  326,  328,  327,  330,  329,
-      339,  347,  341,  343,  334,  354, 1176,  358,  342,  359,
-      361,  364,  365,  367,  371,  369,  370,  378,  395,  386,
-      385,  387, 1175,    0,  406, 1174,  421,  439,    0, 1183,
-     1200,    0, 1172,  232,  408, 1171,  396,  400, 1170,  397,
-      426,  412, 1169,  414,  424,  440,  413,  430,  441,  442,
-      443, 1168,  445,  448,  449,  454,  451,  453,  458,  460,
-      466,  462,  461,  469,  464,  465,  470,  475,  487,  488,
-      489,  490,  491,  492,  493,  494, 1167,  496,  495,  501,
-     1166, 1165, 1164, 1163, 1162, 1161,  502, 1160, 1159,  498,
+      309,  311,  321,  322,  325,  326,  328,  330,  332,  337,
+      343,  340,  344,  335,  348, 1152,  357,  358,  360,  363,
+      365,  364,  366,  377,  369,  331,  367,  385,  394,  373,
+      380, 1151,    0,  413, 1150,  428,  446,    0, 1159, 1176,
+        0, 1148,  232,  397, 1147,  393,  398, 1146,  400,  405,
+      406, 1145,  421,  418,  401,  415,  419,  434,  437,  429,
+     1144,  448,  449,  435,  453,  452,  454,  455,  457,  464,
+      456,  461,  462,  465,  467,  480,  482,  469,  484,  486,
+      487,  475,  489,  491, 1143,  493,  495,  498, 1142, 1141,
+     1140, 1139, 1138, 1137,  499, 1136, 1135,  500, 1134,  529,
 
-     1158,  528,  503,  504,  508,  516, 1157, 1156, 1155,  510,
-      520,  533, 1154, 1153,  541,  542, 1152,  543,  544,  545,
-      546,  551,  549,  547, 1151, 1150, 1149,  553, 1148, 1147,
-      568, 1146, 1145,  570,  548,  554,  550,  574,  575,  576,
-      577, 1144,  579,  563, 1200,  596,  611,  615,  619,  624,
-      584,  588,  585, 1143,  625,  626, 1142,  589,  627,  628,
-      629,  630,  631,  633,  636,  634,  637,  640,  639,  647,
-     1141, 1140,  638,  641,  652,  642, 1139, 1138,  654,  657,
-      656, 1137,  658,  660,  664,  669,  671,  586,  673,  674,
-     1136, 1135,  676,  678,  679,  680, 1134,  681,  682,    0,
+      504,  507,  502,  510, 1133, 1132, 1131,  508,  511,  522,
+     1130, 1129,  529,  523, 1128,  518,  543,  544,  547,  548,
+      550,  549, 1127, 1126, 1125,  551, 1124, 1123,  552, 1122,
+     1121,  554,  555,  557,  509,  563,  565,  561,  568, 1120,
+      577,  578, 1176,  583,  592,  601,  607,  612,  583,  584,
+      595, 1119,  614,  615, 1118,  616,  594,  617,  619,  620,
+      622,  623,  626,  628,  627,  629,  630,  631, 1117, 1116,
+      634,  637,  641,  642, 1115, 1114,  646,  647,  645, 1113,
+      648,  650,  652,  654,  656,  659,  657, 1112, 1111,  663,
+      665,  668,  669, 1110,  670,  678,    0, 1109,  677,  679,
 
-     1133,  683,  684, 1132,  685,  688,  699, 1131, 1130,  702,
-      700, 1129,  704,  705, 1128,  709, 1127, 1126,  711,  713,
-      719,  715, 1125,  716, 1124,  718, 1123,  720,  723, 1122,
-      730, 1121,  730,  590, 1120,  732,  739,  734,  735,  744,
-      746,  745,  748,  749,  750,  753,  751, 1119,  754, 1118,
-     1117,  758,  761,  763,  757,  764,  765,  770, 1116,  773,
-      774,  776,  778, 1115,  777,  782,  779,  784,  785,  791,
-      786,  793,  794,  798,  802,  803, 1114,  804,  805,  806,
-     1113,  807, 1112,  811,  815,  808,  821,  822,  810,  825,
-     1111,  826,  830, 1110,  831,  832,  836, 1109,  833,  838,
+     1108,  683,  680,  688, 1107, 1106,  693,  698, 1105,  700,
+      685, 1104,  704, 1103, 1102,  702,  705,  708,  689, 1101,
+      709, 1100,  711, 1099,  715,  718, 1098,  723, 1097,  717,
+      724, 1096,  725,  728,  734,  737,  727,  729,  744,  730,
+      741,  742,  745,  746, 1095,  747, 1094, 1093,  753,  756,
+      757,  758,  760,  759, 1092,  762,  764,  765,  769, 1091,
+      766,  772,  771,  773,  774,  783,  778,  787,  789,  791,
+      790,  794, 1090,  795,  796,  799, 1089,  797, 1088,  802,
+      803,  804,  805,  815,  800,  811, 1087,  818,  822, 1086,
+      823,  825,  826, 1085,  827,  828,  830, 1084,  833,  831,
 
-      839, 1108,  842,  841, 1107, 1106, 1105,  837,  850, 1104,
-     1103,  852,  853,  860,  844, 1102,  851, 1101, 1100,  855,
-      864, 1099,  869,  870, 1098,  871,  872, 1097, 1096, 1095,
-     1094, 1093,  873, 1092, 1091,  874,  875,  876,  878,  879,
-     1090,  880,  884, 1089, 1088,  889,  891,  893,  894,  895,
-     1087,  896,  899,  900,  902,  901,  909,  907,  912,  908,
-     1076,  914,  924,  922,  926,  915,  927,  929,  930, 1066,
-      931,  933,  937,  938, 1065,  943,  944,  941,  945, 1064,
-     1063, 1062, 1059, 1058, 1057,  950,  946,  951, 1056,  963,
-      964,  952, 1054,  949, 1053, 1052,  968,  967,  969,  972,
+     1083, 1082, 1081,  834,  835, 1080, 1079,  843,  845,  837,
+     1078,  840, 1077, 1076,  844,  856, 1075,  857,  858, 1074,
+      859,  860, 1073, 1072, 1071, 1070, 1069,  864, 1068, 1067,
+      862,  863,  870,  867,  865, 1066,  868,  872, 1065, 1064,
+      873,  880,  882,  884,  887, 1063,  888,  885,  889,  890,
+      893,  896,  899,  894, 1062,  904,  906,  907,  910,  911,
+      915,  917,  919, 1061,  921,  924,  925,  922, 1050,  926,
+      927,  928, 1039, 1037, 1036, 1035, 1034, 1033,  929,  936,
+      933, 1032,  943,  947,  950, 1031,  934, 1030, 1029,  954,
+      952,  937,  955,  957,  956,  959,  963,  966,  967, 1024,
 
-      975,  976,  979,  980,  981,  982,  983, 1047,  985,  988,
-      986,  990,  991,  994, 1046,  997,  995,  999, 1004,  947,
-     1002, 1008, 1009, 1010, 1016,  687, 1013, 1017, 1019, 1021,
-     1022, 1024, 1026, 1027, 1030, 1034, 1031, 1036,  555, 1037,
-      515,  512, 1040,  463, 1041,  399,  366,  247, 1045,  243,
-     1200, 1081, 1083,  212, 1088, 1091,  167, 1095,  108
+      968,  970,  971,  974,  976, 1022,  978,  977,  979,  981,
+     1021,  986,  985,  989,  992, 1018,  990,  994,  998,  999,
+     1001, 1003, 1004, 1005, 1008, 1010, 1014,  686,  684,  517,
+     1020,  463, 1015,  372,  368, 1019,  279, 1176, 1055, 1057,
+      253, 1062, 1065,  212, 1069,  108
     } ;
 
-static yyconst short int yy_def[560] =
+static yyconst short int yy_def[547] =
     {   0,
-      551,    1,  551,  551,  551,  551,  552,  553,  554,  551,
-      553,  553,  553,  553,  555,  556,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  552,  551,
-      553,  551,  557,  551,  551,  553,  553,  553,  553,  553,
-      555,  558,  559,  551,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,   25,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      538,    1,  538,  538,  538,  538,  539,  540,  541,  538,
+      540,  540,  540,  540,  542,  543,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  539,  538,
+      540,  538,  544,  538,  538,  540,  540,  540,  540,  540,
+      542,  545,  546,  538,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
 
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  551,  557,  551,  553,  553,  553,   50,  558,
-      551,  559,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  538,  544,  538,  540,  540,  540,   50,  545,  538,
+      546,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,   50,
 
-      553,   50,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  551,  551,  551,  551,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  202,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  538,  538,  538,  538,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  200,  540,  540,  540,
 
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      551,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  538,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
 
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
 
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-        0,  551,  551,  551,  551,  551,  551,  551,  551
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,    0,  538,  538,
+      538,  538,  538,  538,  538,  538
     } ;
 
-static yyconst short int yy_nxt[1245] =
+static yyconst short int yy_nxt[1221] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   14,   14,    4,   15,   16,    8,    8,    8,   17,
@@ -593,118 +589,118 @@
        45,   45,   46,   46,   46,   46,   42,   47,   44,   44,
        44,   44,   42,   48,   49,   49,   49,   49,   42,   48,
        49,   49,   49,   49,   42,   52,   42,   42,   42,   42,
-       42,   54,   54,   54,   54,   63,   55,   64,  150,   42,
+       42,   54,   54,   54,   54,   63,   55,   64,  149,   42,
        60,   42,   81,   56,   61,   57,   50,   58,   65,   42,
 
-       59,  104,   62,   42,   42,   66,   42,   70,   42,   67,
-       71,  142,   42,  129,   79,   68,  132,   72,   69,   42,
-       80,  102,   93,   42,  136,   73,   42,   74,   75,   42,
-       42,   94,  103,  171,   42,   76,   90,   95,   42,   77,
-       86,   78,   82,   82,   82,   82,   42,  143,   87,   91,
-       42,  161,   42,   88,   83,   92,  116,   89,  127,   42,
-      130,   42,   42,   84,   85,   42,   42,   42,  146,  117,
-      134,  128,  118,   42,   42,   96,  144,   97,  145,  119,
-      131,   98,  153,   99,   42,  100,  147,  101,  105,  152,
-       42,  151,   42,  135,   45,   45,   45,   45,   42,   42,
+       59,  103,   62,   42,   42,   66,   42,   70,   42,   67,
+       71,  141,   42,  128,   79,   68,  131,   72,   69,   42,
+       80,  101,   92,   42,  135,   73,   42,   74,   75,   42,
+       42,   93,  102,  170,   42,   76,   89,   94,   42,   77,
+       85,   78,   82,   82,   82,   82,   42,  142,   86,   90,
+       42,  160,   42,   87,   83,   91,  115,   88,  126,   42,
+      129,   42,   42,   42,   84,   42,   42,   42,  145,  116,
+      179,  127,  117,   42,   42,   95,  143,   96,  144,  118,
+      130,   97,  152,   98,   42,   99,  146,  100,  104,  151,
+       42,  150,   42,  134,   45,   45,   45,   45,   42,   42,
 
-      160,  106,  107,  148,  108,  109,  110,  149,  111,   54,
-       54,   54,   54,  167,  112,   43,  113,  114,   42,  115,
-      105,   42,  156,   42,   42,   48,   46,   46,   46,   46,
-       42,  184,  162,  120,  121,   42,  122,  154,  123,  155,
-      124,   42,  125,   42,   41,   42,  126,  137,  137,  137,
-      137,   42,  174,   41,   41,  138,   42,  251,  166,  163,
-       42,  138,   48,   49,   49,   49,   49,   42,  139,  139,
-      139,  139,   42,   42,   42,  139,  139,   42,  139,  139,
-      139,  139,  139,  139,   42,  157,   42,   42,  158,  164,
-       42,   42,   42,  168,  169,   42,  165,  159,   42,   42,
+      159,  105,  106,  147,  107,  108,  109,  148,  110,   54,
+       54,   54,   54,  166,  111,  133,  112,  113,   42,  114,
+      104,   42,  155,   42,   42,   48,   46,   46,   46,   46,
+       42,  182,  161,  119,  120,   42,  121,  153,  122,  154,
+      123,   42,  124,   42,   42,   42,  125,  136,  136,  136,
+      136,   42,  173,  184,   42,  137,   43,  249,  165,  162,
+      181,  137,   48,   49,   49,   49,   49,   42,  138,  138,
+      138,  138,   42,   42,   42,  138,  138,   42,  138,  138,
+      138,  138,  138,  138,   42,  156,   42,   42,  157,  163,
+       42,   42,   42,  167,  168,   42,  164,  158,   82,   82,
 
-       42,   42,  181,   42,  183,   42,  173,  175,  170,  186,
-      172,  176,   42,   42,  177,  178,  179,  182,  180,  185,
-       42,  187,   42,  188,   42,   42,  189,   42,  190,   42,
-      192,   42,  194,  197,  191,  196,   42,   42,  198,   42,
-       42,   42,   42,   42,  193,  199,  195,   42,  201,  204,
-      207,  211,   42,  203,   42,   42,   42,  205,  200,  209,
-       42,  218,  213,  217,  208,  202,  212,   42,  210,  206,
-      215,   42,   42,  216,   42,  223,  214,   42,   42,   42,
-       42,  219,   42,   42,   42,  221,  224,  226,  237,  220,
-      229,   42,  236,  231,  232,  225,  222,  241,   42,   42,
+       82,   82,   42,   42,   42,   42,  172,  174,  169,   42,
+      171,  183,   42,  175,  176,  177,   42,  178,   42,   42,
+      185,  180,   42,   42,   42,  188,  190,  186,  192,  194,
+      187,   42,  196,  189,   42,   42,  197,  195,   42,   42,
+      191,   42,  193,   42,   42,   42,  198,  202,   42,  235,
+       42,  205,  201,   42,  209,  203,   42,   42,  199,  207,
+      211,   42,  216,  200,  215,  206,  213,  204,  208,  210,
+       42,   42,  214,   42,  212,  217,   42,   42,   42,   42,
+       42,   42,   42,  218,  219,   42,   42,  222,  224,  227,
+       42,  221,  234,   42,  236,  220,  237,  223,   42,  229,
 
-       42,  227,  228,  233,  230,  238,  234,  239,   42,   42,
-       42,  235,   42,   42,  240,  246,  246,  246,  246,  253,
-      242,   42,  243,  247,  255,   42,   42,   42,  244,  247,
-      137,  137,  137,  137,   42,  254,  258,   42,  138,   42,
-      252,  257,  261,   42,  138,  248,  249,  256,  250,  250,
-      250,  250,   42,   42,   42,   42,   42,  262,   42,  260,
-      259,   42,   42,  266,   42,  264,   42,   42,  267,  265,
-      263,   42,  273,   42,   42,   42,   42,   42,   42,   42,
-      268,  280,   42,   42,  269,  279,  270,  271,   42,  277,
-      272,  281,  275,  284,  283,  276,  278,  282,  285,  274,
+      230,  226,  225,  228,  238,  239,   42,   42,  240,  231,
+       42,   42,  232,   42,   42,  241,  251,  233,   42,   42,
+      258,  242,  244,  244,  244,  244,  254,  253,   42,  250,
+      245,   42,   42,  252,   42,  255,  245,  136,  136,  136,
+      136,   42,   42,  256,  259,  137,  260,   42,   42,  264,
+       42,  137,  246,  247,  257,  248,  248,  248,  248,   42,
+      262,   42,   42,  261,  263,   42,   42,   42,   42,   42,
+       42,  265,  268,  271,   42,   42,   42,   42,   42,  277,
+       42,  278,   42,  266,  279,  267,  269,  275,   42,  273,
+      281,  270,  274,   42,  276,   42,  272,   42,  280,   42,
 
+       42,  285,   42,  282,   42,  283,   42,  286,   42,  288,
+      289,   42,   42,   42,  287,   42,  292,   42,  290,  284,
+       42,   42,   42,   42,   42,  300,  293,  294,  321,  291,
+       42,   42,  302,  295,  303,   42,   42,  296,  297,  297,
+      297,  297,   42,  298,  299,  297,  297,  301,  297,  297,
+      297,  297,  297,  297,  304,  308,   42,   42,  307,  305,
+       42,   42,   42,   42,   42,   42,  306,   42,   42,  310,
+       42,  312,  309,  314,   42,  317,   42,  318,   42,  313,
+      311,   42,  319,  316,  323,  322,  325,  320,  315,  324,
+       42,   42,  244,  244,  244,  244,   42,   42,  246,  246,
+
+      245,  328,  328,  328,  328,  330,  245,   42,   42,  326,
+      328,  328,  328,  328,  329,  327,  248,  248,  248,  248,
+       42,  248,  248,  248,  248,   42,  331,   42,   42,   42,
+       42,  335,   42,   42,  333,   42,   42,  334,  337,   42,
+       42,   42,   42,   42,   42,  332,  336,   42,  344,  339,
+       42,  338,  346,  345,   42,   42,  341,  342,   42,   42,
+       42,   42,  343,   42,  340,   42,  353,   42,  354,   42,
+       42,  347,   42,  355,  348,  352,   42,  349,   42,  350,
+      351,   42,   42,   42,  359,  356,  358,  357,  360,  361,
+       42,   42,   42,   42,  363,  362,   42,   42,   42,   42,
+
+      369,   42,   42,  371,  368,  364,   42,  370,  366,  365,
+      367,   42,  372,   42,  376,   42,  373,   42,   42,  374,
+      381,   42,   42,  375,   42,  377,  378,  380,   42,  379,
+       42,   42,  328,  328,  328,  328,  387,   42,   42,  384,
+       42,   42,   42,   42,  382,  386,  388,   42,  383,  390,
+       42,  385,  394,  391,   42,   42,  392,   42,   42,   42,
+       42,  389,  393,  396,  395,  398,   42,  400,  401,   42,
+       42,   42,   42,   42,  397,   42,  399,   42,   42,   42,
+      402,  405,   42,  403,   42,   42,   42,   42,  404,  406,
+      407,   42,  411,  413,  414,  409,   42,  412,  410,  408,
+
+       42,  416,   42,   42,   42,  418,  417,   42,   42,   42,
+       42,  415,   42,   42,  422,   42,   42,   42,   42,  419,
+      421,  424,  426,  428,   42,  429,  420,  423,   42,  430,
+      427,   42,  431,  425,  432,   42,   42,  433,   42,   42,
+       42,   42,  434,   42,   42,  435,   42,   42,   42,  439,
+       42,  443,  444,   42,  437,  446,   42,   42,   42,  436,
+      441,  451,  442,  440,  449,  447,  448,  438,  445,   42,
+       42,   42,   42,   42,  450,   42,   42,   42,   42,  452,
+       42,   42,  456,   42,  457,   42,   42,  453,  454,  455,
+      458,  459,  461,   42,  462,   42,  463,   42,   42,  460,
+
+       42,   42,   42,   42,  465,  464,   42,   42,  466,   42,
+      470,  471,   42,  469,  472,  467,  475,   42,  473,   42,
+       42,  477,  468,   42,   42,  474,  481,  476,   42,  480,
+       42,  478,   42,  482,   42,   42,  484,   42,   42,   42,
+       42,   42,   42,  479,  486,  490,   42,   42,  483,   42,
+       42,  493,  494,  496,  485,  491,   42,  495,  492,  487,
+       42,  488,  489,   42,  497,   42,  498,   42,   42,   42,
+       42,  500,   42,  501,  503,  502,   42,  499,  505,   42,
+       42,   42,  508,   42,   42,  504,  510,   42,  507,   42,
+       42,   42,   42,  506,   42,  509,  511,  514,   42,   42,
+
+      512,  516,   42,   42,  513,   42,  517,   42,  518,  520,
+      519,   42,   42,  515,   42,  525,   42,   42,   42,  524,
+      522,   42,  521,   42,  523,  526,  531,   42,   42,  532,
+      527,   42,   42,   42,   42,   42,  528,   42,  536,  530,
+      529,  535,   42,   42,   42,   42,   42,   42,   42,   42,
+       42,  534,   42,  533,  537,   39,   39,   39,   39,   39,
+       41,   41,   51,   42,   51,   51,   51,   53,   53,  139,
+      139,  139,  139,  139,   42,   42,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
-      286,   42,  289,  291,   42,   42,   42,   42,  290,  295,
-      288,   42,  293,   42,  287,   42,  296,  292,   42,   42,
-      297,  303,  294,   42,  305,  299,  298,  300,  300,  300,
-      300,  302,  301,  306,  300,  300,   42,  300,  300,  300,
-      300,  300,  300,  304,   42,   42,   42,   42,   42,   42,
-       42,   42,   42,   42,   42,  307,   42,   42,   42,  324,
-      313,  308,  317,  312,  315,  322,   42,  310,  309,  314,
-      311,   42,  316,   42,  323,  319,  318,   42,   42,   42,
-       42,  320,   42,  321,  326,  328,  325,   42,   42,   42,
-
-      330,   42,   42,   42,  327,  246,  246,  246,  246,  333,
-      337,  329,  392,  247,  363,  332,  334,  248,  248,  247,
-      331,  331,  331,  331,  331,  331,  331,  331,  250,  250,
-      250,  250,   42,  250,  250,  250,  250,   42,   42,   42,
-       42,   42,   42,   42,   42,  336,   42,   42,  340,   42,
-       42,   42,   42,   42,   42,   42,  335,  339,  342,  347,
-       42,  341,  348,  345,  338,   42,  344,   42,  349,   42,
-       42,   42,  346,   42,  343,  350,  356,   42,  351,  357,
-      354,  358,   42,  355,   42,  359,   42,   42,  352,   42,
-      353,   42,   42,   42,   42,   42,   42,   42,   42,  360,
-
-       42,   42,  364,  362,  361,  373,  365,  367,  366,  374,
-      372,  375,   42,   42,  371,   42,  368,   42,   42,  370,
-      369,  378,   42,  376,   42,  377,   42,  379,   42,   42,
-      381,   42,   42,   42,  380,  382,   42,  383,  384,  331,
-      331,  331,  331,   42,  388,   42,  385,   42,   42,  391,
-      390,  386,   42,  395,  396,  387,  389,   42,   42,   42,
-      394,   42,   42,   42,   42,  399,   42,   42,  393,  398,
-       42,   42,  404,  402,   42,  405,   42,   42,   42,  397,
-      409,  400,  401,   42,  403,  406,   42,   42,  407,   42,
-       42,   42,   42,  410,  408,   42,  411,   42,   42,   42,
-
-      412,  416,  419,  418,   42,  414,   42,   42,  417,  415,
-      413,   42,  421,  423,  422,   42,   42,   42,   42,   42,
-       42,   42,  420,   42,   42,  424,  427,  426,   42,  431,
-      429,  425,  433,  435,   42,   42,  428,  434,   42,   42,
-      432,  437,  430,   42,   42,   42,   42,  438,  436,   42,
-       42,   42,   42,  440,   42,   42,  439,   42,  451,  444,
-      448,  449,  442,   42,   42,   42,   42,  441,   42,  445,
-      446,  447,  457,   42,  443,  453,  454,   42,  450,  455,
-      452,  456,   42,   42,   42,   42,   42,   42,   42,   42,
-      458,   42,   42,   42,  462,  459,  463,   42,  467,  464,
-
-      460,  461,   42,  465,   42,  468,   42,   42,   42,   42,
-      469,  466,   42,   42,   42,   42,  471,  470,  476,  477,
-       42,   42,   42,  475,  472,   42,  473,   42,   42,  479,
-      478,  480,  482,  474,  484,   42,  481,   42,  483,   42,
-       42,  488,   42,   42,   42,  485,   42,  487,  491,  489,
-       42,   42,  490,  486,   42,  493,   42,   42,   42,   42,
-       42,  497,   42,   42,   42,   42,  492,  503,  501,  494,
-      495,  504,  498,  502,  496,  499,   42,   42,  500,  507,
-       42,   42,   42,  506,  505,   42,  508,  509,   42,   42,
-      510,  512,   42,   42,   42,   42,   42,  514,   42,   42,
-
-      517,   42,  519,   42,   42,  513,  511,   42,   42,  516,
-       42,  518,   42,  520,  524,   42,  515,   42,  521,  522,
-      526,   42,   42,   42,  527,  530,   42,  523,  528,   42,
-       42,  525,   42,  529,   42,   42,  532,   42,  536,   42,
-       42,  533,  535,   42,   42,  531,  537,   42,  534,   42,
-       42,  543,  538,   42,   42,  544,  540,  539,   42,   42,
-       42,  548,  542,  541,  549,   42,   42,   42,  547,   42,
-       42,   42,   42,  546,  545,   42,   42,   42,   42,   42,
-      550,   39,   39,   39,   39,   39,   41,   41,   51,   42,
-       51,   51,   51,   53,   53,  140,  140,  140,  140,  140,
+       42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
 
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
@@ -712,19 +708,16 @@
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
-       42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
-       42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
-       42,   42,   42,   42,   42,   42,  141,   42,  245,   42,
-       42,   42,   42,  141,   42,  133,   42,   40,  551,    3,
+       42,   42,  140,   42,  243,   42,   42,   42,   42,  140,
+       42,  132,   42,   40,  538,    3,  538,  538,  538,  538,
+      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
+      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
 
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551
+      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
+      538,  538,  538,  538,  538,  538,  538,  538,  538,  538
     } ;
 
-static yyconst short int yy_chk[1245] =
+static yyconst short int yy_chk[1221] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -738,131 +731,128 @@
        18,   31,   24,   17,   18,   17,   13,   17,   19,   20,
 
        17,   31,   18,   36,   23,   20,   38,   21,   30,   20,
-       21,  559,   28,   36,   23,   20,   38,   21,   20,   22,
+       21,  546,   28,   36,   23,   20,   38,   21,   20,   22,
        23,   30,   28,   78,   47,   22,   69,   22,   22,   47,
        27,   28,   30,   78,   26,   22,   27,   28,   55,   22,
        26,   22,   25,   25,   25,   25,   25,   55,   26,   27,
        33,   69,   35,   26,   25,   27,   33,   26,   35,   57,
-       37,   37,   56,   25,   25,   29,   58,   61,   57,   33,
-      557,   35,   33,   63,   64,   29,   56,   29,   56,   33,
+       37,   37,   56,   85,   25,   29,   58,   61,   57,   33,
+       85,   35,   33,   63,   64,   29,   56,   29,   56,   33,
        37,   29,   64,   29,   68,   29,   58,   29,   32,   63,
        59,   61,   32,   45,   45,   45,   45,   45,   66,   75,
 
        68,   32,   32,   59,   32,   32,   32,   59,   32,   54,
-       54,   54,   54,   75,   32,  554,   32,   32,   89,   32,
+       54,   54,   54,   75,   32,  544,   32,   32,   88,   32,
        34,   65,   66,   70,   34,   46,   46,   46,   46,   46,
-       46,   89,   70,   34,   34,   72,   34,   65,   34,   65,
-       34,   74,   34,   81,   82,  144,   34,   48,   48,   48,
-       48,   48,   81,   82,   82,   48,  550,  144,   74,   72,
-      548,   48,   49,   49,   49,   49,   49,   49,   50,   50,
+       46,   88,   70,   34,   34,   72,   34,   65,   34,   65,
+       34,   74,   34,   81,   90,  143,   34,   48,   48,   48,
+       48,   48,   81,   90,   87,   48,  541,  143,   74,   72,
+       87,   48,   49,   49,   49,   49,   49,   49,   50,   50,
        50,   50,   50,   73,   76,   50,   50,   67,   50,   50,
        50,   50,   50,   50,   77,   67,   79,   80,   67,   73,
-       83,   84,   85,   76,   77,   86,   73,   67,   88,   87,
+       83,   84,  537,   76,   77,   89,   73,   67,   82,   82,
 
-       91,   94,   86,   90,   88,   92,   80,   83,   77,   91,
-       79,   84,   95,   96,   85,   85,   85,   87,   85,   90,
-       97,   92,   98,   94,  104,   99,   94,  100,   95,  101,
-       97,  102,   98,  100,   96,   99,  103,  105,  101,  106,
-      108,  107,  110,  109,   97,  102,   98,  115,  104,  107,
-      108,  110,  111,  106,  113,  119,  114,  107,  103,  109,
-      112,  115,  111,  114,  108,  105,  110,  116,  109,  107,
-      112,  118,  120,  113,  121,  119,  111,  122,  123,  547,
-      124,  116,  126,  127,  125,  118,  120,  122,  127,  116,
-      124,  128,  126,  125,  125,  121,  118,  130,  131,  130,
+       82,   82,   82,   86,   91,   93,   80,   83,   77,   94,
+       79,   89,   95,   84,   84,   84,   96,   84,   97,   98,
+       91,   86,  101,  100,  102,   94,   96,   93,   97,   98,
+       93,   99,  100,   95,  103,  104,  101,   99,  105,  106,
+       96,  107,   97,  108,  126,  109,  102,  106,  114,  126,
+      110,  107,  105,  112,  109,  106,  111,  113,  103,  108,
+      110,  115,  114,  104,  113,  107,  111,  106,  108,  109,
+      117,  118,  112,  119,  110,  115,  120,  122,  121,  123,
+      127,  535,  125,  115,  117,  534,  130,  119,  121,  123,
+      124,  118,  125,  131,  127,  117,  127,  120,  128,  124,
 
-      132,  122,  123,  125,  124,  128,  125,  128,  129,  147,
-      150,  125,  546,  148,  129,  135,  135,  135,  135,  147,
-      131,  145,  132,  135,  150,  152,  157,  154,  132,  135,
-      137,  137,  137,  137,  137,  148,  154,  155,  137,  151,
-      145,  152,  157,  158,  137,  138,  138,  151,  138,  138,
-      138,  138,  138,  156,  159,  160,  161,  158,  163,  156,
-      155,  164,  165,  161,  167,  160,  168,  166,  163,  160,
-      159,  169,  168,  170,  173,  172,  544,  175,  176,  171,
-      163,  173,  174,  177,  164,  172,  165,  166,  178,  171,
-      167,  174,  170,  177,  176,  170,  171,  175,  178,  169,
+      124,  122,  121,  123,  128,  129,  146,  129,  130,  124,
+      144,  147,  124,  149,  155,  131,  146,  124,  150,  151,
+      155,  131,  134,  134,  134,  134,  150,  149,  156,  144,
+      134,  154,  157,  147,  153,  151,  134,  136,  136,  136,
+      136,  136,  160,  153,  156,  136,  157,  158,  164,  160,
+      159,  136,  137,  137,  154,  137,  137,  137,  137,  137,
+      159,  162,  163,  158,  159,  166,  165,  167,  168,  171,
+      169,  162,  164,  167,  172,  173,  532,  170,  174,  171,
+      175,  172,  178,  162,  173,  163,  165,  170,  182,  169,
+      175,  166,  169,  176,  170,  177,  168,  179,  174,  180,
 
-      179,  180,  181,  182,  183,  184,  185,  186,  189,  188,
-      179,  200,  181,  183,  190,  197,  203,  204,  182,  188,
-      180,  205,  185,  210,  179,  542,  189,  184,  541,  206,
-      190,  205,  186,  211,  210,  200,  197,  202,  202,  202,
-      202,  204,  203,  211,  202,  202,  212,  202,  202,  202,
-      202,  202,  202,  206,  215,  216,  218,  219,  220,  221,
-      224,  235,  223,  237,  222,  212,  228,  236,  539,  237,
-      220,  215,  223,  219,  222,  235,  244,  216,  215,  221,
-      218,  231,  222,  234,  236,  228,  224,  238,  239,  240,
-      241,  231,  243,  234,  239,  241,  238,  251,  253,  288,
+      181,  178,  183,  176,  184,  177,  186,  179,  187,  181,
+      182,  188,  195,  198,  180,  203,  186,  201,  183,  177,
+      202,  208,  235,  204,  209,  203,  187,  188,  235,  184,
+      530,  216,  208,  195,  209,  210,  214,  198,  200,  200,
+      200,  200,  213,  201,  202,  200,  200,  204,  200,  200,
+      200,  200,  200,  200,  210,  216,  217,  218,  214,  213,
+      219,  220,  222,  221,  226,  229,  213,  232,  233,  218,
+      234,  220,  217,  221,  238,  229,  236,  232,  237,  220,
+      219,  239,  233,  226,  237,  236,  239,  234,  222,  238,
+      241,  242,  244,  244,  244,  244,  249,  250,  245,  245,
 
-      244,  252,  258,  334,  240,  246,  246,  246,  246,  252,
-      258,  243,  334,  246,  288,  251,  253,  247,  247,  246,
-      247,  247,  247,  247,  248,  248,  248,  248,  249,  249,
-      249,  249,  249,  250,  250,  250,  250,  250,  255,  256,
-      259,  260,  261,  262,  263,  256,  264,  266,  261,  265,
-      267,  273,  269,  268,  274,  276,  255,  260,  263,  268,
-      270,  262,  269,  266,  259,  275,  265,  279,  270,  281,
-      280,  283,  267,  284,  264,  273,  280,  285,  274,  281,
-      276,  283,  286,  279,  287,  284,  289,  290,  275,  293,
-      275,  294,  295,  296,  298,  299,  302,  303,  305,  285,
+      244,  245,  245,  245,  245,  250,  244,  257,  251,  241,
+      246,  246,  246,  246,  249,  242,  247,  247,  247,  247,
+      247,  248,  248,  248,  248,  248,  251,  253,  254,  256,
+      258,  257,  259,  260,  254,  261,  262,  256,  259,  263,
+      265,  264,  266,  267,  268,  253,  258,  271,  266,  261,
+      272,  260,  268,  267,  273,  274,  263,  264,  279,  277,
+      278,  281,  265,  282,  262,  283,  278,  284,  279,  285,
+      287,  271,  286,  281,  272,  277,  290,  273,  291,  273,
+      274,  292,  293,  295,  285,  282,  284,  283,  286,  287,
+      299,  296,  300,  303,  291,  290,  302,  529,  311,  528,
 
-      526,  306,  289,  287,  286,  303,  290,  294,  293,  305,
-      302,  306,  307,  311,  299,  310,  295,  313,  314,  298,
-      296,  311,  316,  307,  319,  310,  320,  313,  322,  324,
-      316,  326,  321,  328,  314,  319,  329,  320,  321,  331,
-      331,  331,  331,  333,  328,  336,  322,  338,  339,  333,
-      329,  324,  337,  338,  339,  326,  328,  340,  342,  341,
-      337,  343,  344,  345,  347,  342,  346,  349,  336,  341,
-      355,  352,  347,  345,  353,  349,  354,  356,  357,  340,
-      355,  343,  344,  358,  346,  352,  360,  361,  353,  362,
-      365,  363,  367,  356,  354,  366,  357,  368,  369,  371,
+      300,  304,  319,  303,  299,  292,  307,  302,  295,  293,
+      296,  308,  304,  310,  311,  316,  307,  313,  317,  308,
+      319,  318,  321,  310,  323,  313,  316,  318,  325,  317,
+      330,  326,  328,  328,  328,  328,  330,  331,  333,  325,
+      337,  334,  338,  340,  321,  326,  331,  335,  323,  334,
+      336,  325,  338,  335,  341,  342,  336,  339,  343,  344,
+      346,  333,  337,  340,  339,  342,  349,  344,  346,  350,
+      351,  352,  354,  353,  341,  356,  343,  357,  358,  361,
+      349,  352,  359,  350,  363,  362,  364,  365,  351,  353,
+      354,  367,  359,  362,  363,  357,  366,  361,  358,  356,
 
-      358,  363,  367,  366,  370,  361,  372,  373,  365,  362,
-      360,  374,  369,  371,  370,  375,  376,  378,  379,  380,
-      382,  386,  368,  389,  384,  372,  375,  374,  385,  380,
-      378,  373,  384,  386,  387,  388,  376,  385,  390,  392,
-      382,  388,  379,  393,  395,  396,  399,  389,  387,  397,
-      408,  400,  401,  392,  404,  403,  390,  415,  408,  397,
-      403,  403,  395,  409,  417,  412,  413,  393,  420,  399,
-      400,  401,  417,  414,  396,  412,  413,  421,  404,  414,
-      409,  415,  423,  424,  426,  427,  433,  436,  437,  438,
-      420,  439,  440,  442,  426,  421,  427,  443,  438,  433,
+      368,  365,  369,  371,  370,  367,  366,  372,  374,  375,
+      378,  364,  376,  385,  371,  380,  381,  382,  383,  368,
+      370,  374,  376,  380,  386,  381,  369,  372,  384,  382,
+      378,  388,  383,  375,  384,  389,  391,  385,  392,  393,
+      395,  396,  386,  397,  400,  388,  399,  404,  405,  393,
+      410,  399,  399,  412,  391,  404,  408,  415,  409,  389,
+      396,  412,  397,  395,  409,  405,  408,  392,  400,  416,
+      418,  419,  421,  422,  410,  431,  432,  428,  435,  415,
+      434,  437,  421,  433,  422,  438,  441,  416,  418,  419,
+      428,  431,  433,  442,  434,  443,  435,  444,  448,  432,
 
-      423,  424,  446,  436,  447,  439,  448,  449,  450,  452,
-      440,  437,  453,  454,  456,  455,  443,  442,  450,  452,
-      458,  460,  457,  449,  446,  459,  447,  462,  466,  454,
-      453,  455,  457,  448,  459,  464,  456,  463,  458,  465,
-      467,  464,  468,  469,  471,  460,  472,  463,  467,  465,
-      473,  474,  466,  462,  478,  469,  476,  477,  479,  487,
-      520,  474,  494,  486,  488,  492,  468,  487,  479,  471,
-      472,  488,  476,  486,  473,  477,  490,  491,  478,  492,
-      498,  497,  499,  491,  490,  500,  494,  497,  501,  502,
-      498,  500,  503,  504,  505,  506,  507,  502,  509,  511,
+      445,  447,  449,  450,  438,  437,  451,  454,  441,  452,
+      445,  447,  453,  444,  448,  442,  451,  456,  449,  457,
+      458,  453,  443,  459,  460,  450,  458,  452,  461,  457,
+      462,  454,  463,  459,  465,  468,  461,  466,  467,  470,
+      471,  472,  479,  456,  463,  468,  481,  487,  460,  480,
+      492,  472,  479,  481,  462,  470,  483,  480,  471,  465,
+      484,  466,  467,  485,  483,  491,  484,  490,  493,  495,
+      494,  487,  496,  490,  492,  491,  497,  485,  494,  498,
+      499,  501,  497,  502,  503,  493,  499,  504,  496,  505,
+      508,  507,  509,  495,  510,  498,  501,  504,  513,  512,
 
-      505,  510,  507,  512,  513,  501,  499,  514,  517,  504,
-      516,  506,  518,  509,  513,  521,  503,  519,  510,  511,
-      516,  522,  523,  524,  517,  521,  527,  512,  518,  525,
-      528,  514,  529,  519,  530,  531,  523,  532,  528,  533,
-      534,  524,  527,  535,  537,  522,  529,  536,  525,  538,
-      540,  535,  530,  543,  545,  536,  532,  531,  549,  515,
-      508,  543,  534,  533,  545,  496,  495,  493,  540,  489,
-      485,  484,  483,  538,  537,  482,  481,  480,  475,  470,
-      549,  552,  552,  552,  552,  552,  553,  553,  555,  461,
-      555,  555,  555,  556,  556,  558,  558,  558,  558,  558,
+      502,  507,  514,  517,  503,  515,  508,  518,  509,  512,
+      510,  519,  520,  505,  521,  518,  522,  523,  524,  517,
+      514,  525,  513,  526,  515,  519,  524,  527,  533,  525,
+      520,  516,  536,  531,  511,  506,  521,  500,  533,  523,
+      522,  531,  489,  488,  486,  482,  478,  477,  476,  475,
+      474,  527,  473,  526,  536,  539,  539,  539,  539,  539,
+      540,  540,  542,  469,  542,  542,  542,  543,  543,  545,
+      545,  545,  545,  545,  464,  455,  446,  440,  439,  436,
+      430,  429,  427,  426,  425,  424,  423,  420,  417,  414,
+      413,  411,  407,  406,  403,  402,  401,  398,  394,  390,
 
-      451,  445,  444,  441,  435,  434,  432,  431,  430,  429,
-      428,  425,  422,  419,  418,  416,  411,  410,  407,  406,
-      405,  402,  398,  394,  391,  383,  381,  377,  364,  359,
-      351,  350,  348,  335,  332,  330,  327,  325,  323,  318,
-      317,  315,  312,  309,  308,  304,  301,  297,  292,  291,
-      282,  278,  277,  272,  271,  257,  254,  242,  233,  232,
-      230,  229,  227,  226,  225,  217,  214,  213,  209,  208,
-      207,  201,  199,  198,  196,  195,  194,  193,  192,  191,
-      187,  162,  153,  149,  146,  143,  140,  136,  133,  117,
-       93,   71,   62,   52,   41,   39,    8,    7,    3,  551,
+      387,  379,  377,  373,  360,  355,  348,  347,  345,  332,
+      329,  327,  324,  322,  320,  315,  314,  312,  309,  306,
+      305,  301,  298,  294,  289,  288,  280,  276,  275,  270,
+      269,  255,  252,  240,  231,  230,  228,  227,  225,  224,
+      223,  215,  212,  211,  207,  206,  205,  199,  197,  196,
+      194,  193,  192,  191,  190,  189,  185,  161,  152,  148,
+      145,  142,  139,  135,  132,  116,   92,   71,   62,   52,
+       41,   39,    8,    7,    3,  538,  538,  538,  538,  538,
+      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
+      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
 
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551
+      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
+      538,  538,  538,  538,  538,  538,  538,  538,  538,  538
     } ;
 
 static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
@@ -879,7 +869,7 @@
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 1 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 #define INITIAL 0
 /*===-- Lexer.l - Scanner for llvm assembly files --------------*- C++ -*--===//
 //
@@ -894,7 +884,7 @@
 //
 //===----------------------------------------------------------------------===*/
 #define YY_NEVER_INTERACTIVE 1
-#line 28 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 28 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 #include "ParserInternals.h"
 #include "llvm/Module.h"
 #include <list>
@@ -1027,7 +1017,7 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 1031 "Lexer.cpp"
+#line 1021 "Lexer.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1178,10 +1168,10 @@
 	register char *yy_cp = NULL, *yy_bp = NULL;
 	register int yy_act;
 
-#line 190 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 190 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 
 
-#line 1185 "Lexer.cpp"
+#line 1175 "Lexer.cpp"
 
 	if ( yy_init )
 		{
@@ -1229,14 +1219,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 >= 552 )
+				if ( yy_current_state >= 539 )
 					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 != 551 );
+		while ( yy_current_state != 538 );
 
 yy_find_action:
 		yy_current_state = *--yy_state_ptr;
@@ -1274,262 +1264,257 @@
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 192 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 192 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { /* Ignore comments for now */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 194 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 194 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return BEGINTOK; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 195 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 195 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return ENDTOK; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 196 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 196 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return TRUETOK;  }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 197 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 197 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return FALSETOK; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 198 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 198 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return DECLARE; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 199 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 199 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return DEFINE; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 200 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 200 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return GLOBAL; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 201 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 201 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return CONSTANT; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 202 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 202 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return INTERNAL; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 203 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 203 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return LINKONCE; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 204 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 204 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return WEAK; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 205 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 205 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return APPENDING; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 206 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 206 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return DLLIMPORT; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 207 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 207 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return DLLEXPORT; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 208 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 208 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return HIDDEN; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 209 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 209 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return EXTERN_WEAK; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 210 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 210 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return EXTERNAL; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 211 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return IMPLEMENTATION; }
+#line 211 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return ZEROINITIALIZER; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 212 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return ZEROINITIALIZER; }
+#line 212 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return DOTDOTDOT; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 213 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return DOTDOTDOT; }
+#line 213 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return UNDEF; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 214 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return UNDEF; }
+#line 214 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return NULL_TOK; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 215 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return NULL_TOK; }
+#line 215 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return TO; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 216 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return TO; }
+#line 216 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return TAIL; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 217 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return TAIL; }
+#line 217 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return TARGET; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 218 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return TARGET; }
+#line 218 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return TRIPLE; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 219 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return TRIPLE; }
+#line 219 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return DEPLIBS; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 220 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return DEPLIBS; }
+#line 220 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return DATALAYOUT; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 221 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return DATALAYOUT; }
+#line 221 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return VOLATILE; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 222 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return VOLATILE; }
+#line 222 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return ALIGN;  }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 223 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return ALIGN;  }
+#line 223 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return SECTION; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 224 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return SECTION; }
+#line 224 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return MODULE; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 225 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return MODULE; }
+#line 225 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return ASM_TOK; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 226 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return ASM_TOK; }
+#line 226 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return SIDEEFFECT; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 227 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return SIDEEFFECT; }
+#line 228 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return CC_TOK; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 229 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return CC_TOK; }
+#line 229 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return CCC_TOK; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 230 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return CCC_TOK; }
+#line 230 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return FASTCC_TOK; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 231 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return FASTCC_TOK; }
+#line 231 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return COLDCC_TOK; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 232 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return COLDCC_TOK; }
+#line 232 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return X86_STDCALLCC_TOK; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 233 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return X86_STDCALLCC_TOK; }
+#line 233 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return X86_FASTCALLCC_TOK; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 234 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return X86_FASTCALLCC_TOK; }
+#line 235 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return INREG; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 236 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return INREG; }
+#line 236 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return SRET;  }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 237 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return SRET;  }
+#line 237 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return NOUNWIND; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 238 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return NOUNWIND; }
+#line 238 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return NORETURN; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 239 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return NORETURN; }
+#line 240 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::VoidTy,  VOID);  }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 241 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::VoidTy,  VOID);  }
+#line 241 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::FloatTy, FLOAT); }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 242 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::FloatTy, FLOAT); }
+#line 242 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::DoubleTy,DOUBLE);}
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 243 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::DoubleTy,DOUBLE);}
+#line 243 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::LabelTy, LABEL); }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 244 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::LabelTy, LABEL); }
+#line 244 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return TYPE;   }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 245 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return TYPE;   }
+#line 245 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return OPAQUE; }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 246 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return OPAQUE; }
-	YY_BREAK
-case 52:
-YY_RULE_SETUP
-#line 247 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 246 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { uint64_t NumBits = atoull(yytext+1);
                   if (NumBits < IntegerType::MIN_INT_BITS || 
                       NumBits > IntegerType::MAX_INT_BITS)
@@ -1538,367 +1523,367 @@
                   RET_TY(Ty, INTTYPE);
                 }
 	YY_BREAK
+case 52:
+YY_RULE_SETUP
+#line 254 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Add, ADD); }
+	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 255 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Add, ADD); }
+#line 255 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Sub, SUB); }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 256 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Sub, SUB); }
+#line 256 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Mul, MUL); }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 257 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Mul, MUL); }
+#line 257 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, UDiv, UDIV); }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 258 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, UDiv, UDIV); }
+#line 258 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SDiv, SDIV); }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 259 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SDiv, SDIV); }
+#line 259 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, FDiv, FDIV); }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 260 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, FDiv, FDIV); }
+#line 260 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, URem, UREM); }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 261 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, URem, UREM); }
+#line 261 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SRem, SREM); }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 262 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SRem, SREM); }
+#line 262 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, FRem, FREM); }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 263 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, FRem, FREM); }
+#line 263 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Shl, SHL); }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 264 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Shl, SHL); }
+#line 264 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, LShr, LSHR); }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 265 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, LShr, LSHR); }
+#line 265 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, AShr, ASHR); }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 266 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, AShr, ASHR); }
+#line 266 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, And, AND); }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 267 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, And, AND); }
+#line 267 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Or , OR ); }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 268 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Or , OR ); }
+#line 268 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Xor, XOR); }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 269 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Xor, XOR); }
+#line 269 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal,  ICmp,  ICMP); }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 270 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal,  ICmp,  ICMP); }
+#line 270 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal,  FCmp,  FCMP); }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 271 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal,  FCmp,  FCMP); }
+#line 272 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return EQ;  }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 273 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return EQ;  }
+#line 273 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return NE;  }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 274 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return NE;  }
+#line 274 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return SLT; }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 275 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return SLT; }
+#line 275 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return SGT; }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 276 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return SGT; }
+#line 276 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return SLE; }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 277 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return SLE; }
+#line 277 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return SGE; }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 278 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return SGE; }
+#line 278 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return ULT; }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 279 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return ULT; }
+#line 279 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return UGT; }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 280 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return UGT; }
+#line 280 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return ULE; }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 281 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return ULE; }
+#line 281 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return UGE; }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 282 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return UGE; }
+#line 282 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return OEQ; }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 283 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return OEQ; }
+#line 283 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return ONE; }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 284 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return ONE; }
+#line 284 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return OLT; }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 285 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return OLT; }
+#line 285 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return OGT; }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 286 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return OGT; }
+#line 286 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return OLE; }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 287 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return OLE; }
+#line 287 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return OGE; }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 288 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return OGE; }
+#line 288 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return ORD; }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 289 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return ORD; }
+#line 289 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return UNO; }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 290 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return UNO; }
+#line 290 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return UEQ; }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 291 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return UEQ; }
+#line 291 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return UNE; }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 292 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return UNE; }
+#line 293 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, PHI, PHI_TOK); }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 294 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, PHI, PHI_TOK); }
+#line 294 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Call, CALL); }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 295 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Call, CALL); }
+#line 295 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, Trunc, TRUNC); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 296 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, Trunc, TRUNC); }
+#line 296 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, ZExt, ZEXT); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 297 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, ZExt, ZEXT); }
+#line 297 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, SExt, SEXT); }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 298 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, SExt, SEXT); }
+#line 298 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPTrunc, FPTRUNC); }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 299 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPTrunc, FPTRUNC); }
+#line 299 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPExt, FPEXT); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 300 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPExt, FPEXT); }
+#line 300 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, UIToFP, UITOFP); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 301 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, UIToFP, UITOFP); }
+#line 301 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, SIToFP, SITOFP); }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 302 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, SIToFP, SITOFP); }
+#line 302 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPToUI, FPTOUI); }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 303 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPToUI, FPTOUI); }
+#line 303 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPToSI, FPTOSI); }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 304 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPToSI, FPTOSI); }
+#line 304 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, IntToPtr, INTTOPTR); }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 305 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, IntToPtr, INTTOPTR); }
+#line 305 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, PtrToInt, PTRTOINT); }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 306 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, PtrToInt, PTRTOINT); }
+#line 306 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, BitCast, BITCAST); }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 307 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, BitCast, BITCAST); }
+#line 307 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Select, SELECT); }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 308 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Select, SELECT); }
+#line 308 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, VAArg , VAARG); }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 309 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, VAArg , VAARG); }
+#line 309 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Ret, RET); }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 310 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Ret, RET); }
+#line 310 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Br, BR); }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 311 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Br, BR); }
+#line 311 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Switch, SWITCH); }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 312 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Switch, SWITCH); }
+#line 312 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Invoke, INVOKE); }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 313 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Invoke, INVOKE); }
+#line 313 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 314 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unwind, UNWIND); }
+#line 314 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 315 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
+#line 316 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Malloc, MALLOC); }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 317 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Malloc, MALLOC); }
+#line 317 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 318 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
+#line 318 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Free, FREE); }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 319 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Free, FREE); }
+#line 319 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Load, LOAD); }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 320 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Load, LOAD); }
+#line 320 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Store, STORE); }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 321 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Store, STORE); }
+#line 321 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 322 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
+#line 323 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 324 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
+#line 324 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 325 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
+#line 325 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 326 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
-	YY_BREAK
-case 121:
-YY_RULE_SETUP
-#line 329 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 328 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 {
                   UnEscapeLexed(yytext+1);
                   llvmAsmlval.StrVal = strdup(yytext+1);             // Skip %
                   return LOCALVAR;
                 }
 	YY_BREAK
-case 122:
+case 121:
 YY_RULE_SETUP
-#line 334 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 333 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 {
                   UnEscapeLexed(yytext+1);
                   llvmAsmlval.StrVal = strdup(yytext+1);             // Skip @
                   return GLOBALVAR;
                 }
 	YY_BREAK
-case 123:
+case 122:
 YY_RULE_SETUP
-#line 339 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 338 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 {
                   yytext[strlen(yytext)-1] = 0;  // nuke colon
                   UnEscapeLexed(yytext);
@@ -1906,9 +1891,9 @@
                   return LABELSTR;
                 }
 	YY_BREAK
-case 124:
+case 123:
 YY_RULE_SETUP
-#line 345 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 344 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 {
                   yytext[strlen(yytext)-2] = 0;  // nuke colon, end quote
                   UnEscapeLexed(yytext+1);
@@ -1916,9 +1901,9 @@
                   return LABELSTR;
                 }
 	YY_BREAK
-case 125:
+case 124:
 YY_RULE_SETUP
-#line 352 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 351 "/proj/llvm/llvm-4/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
@@ -1929,18 +1914,18 @@
                    return STRINGCONSTANT;
                  }
 	YY_BREAK
-case 126:
+case 125:
 YY_RULE_SETUP
-#line 361 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 360 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 {
                      yytext[strlen(yytext)-1] = 0;           // nuke end quote
                      llvmAsmlval.StrVal = strdup(yytext+2);  // Nuke @, quote
                      return ATSTRINGCONSTANT;
                    }
 	YY_BREAK
-case 127:
+case 126:
 YY_RULE_SETUP
-#line 367 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 366 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { int len = strlen(yytext); 
                   uint32_t numBits = ((len * 64) / 19) + 1;
                   APInt Tmp(numBits, yytext, len, 10);
@@ -1956,9 +1941,9 @@
                   }
                 }
 	YY_BREAK
-case 128:
+case 127:
 YY_RULE_SETUP
-#line 381 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 380 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { int len = strlen(yytext); 
                   uint32_t numBits = (((len-1) * 64) / 19) + 2;
                   APInt Tmp(numBits, yytext, len, 10);
@@ -1974,9 +1959,9 @@
                   }
                 }
 	YY_BREAK
-case 129:
+case 128:
 YY_RULE_SETUP
-#line 396 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 395 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { int len = strlen(yytext+3) - 3;
                    uint32_t bits = len * 4;
                    APInt Tmp(bits, yytext+3, len, 16);
@@ -1995,9 +1980,9 @@
                    }
                  }
 	YY_BREAK
-case 130:
+case 129:
 YY_RULE_SETUP
-#line 414 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 413 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   if ((unsigned)Val != Val)
@@ -2006,9 +1991,9 @@
                   return LOCALVAL_ID;
                 }
 	YY_BREAK
-case 131:
+case 130:
 YY_RULE_SETUP
-#line 421 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 420 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   if ((unsigned)Val != Val)
@@ -2017,18 +2002,18 @@
                   return GLOBALVAL_ID;
                 }
 	YY_BREAK
-case 132:
+case 131:
 YY_RULE_SETUP
-#line 429 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 428 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = atof(yytext); return FPVAL; }
 	YY_BREAK
-case 133:
+case 132:
 YY_RULE_SETUP
-#line 430 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 429 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = HexToFP(yytext); return FPVAL; }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 432 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 431 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
@@ -2037,22 +2022,22 @@
                   return EOF;
                 }
 	YY_BREAK
+case 133:
+YY_RULE_SETUP
+#line 439 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ /* Ignore whitespace */ }
+	YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 440 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ /* Ignore whitespace */ }
+#line 440 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return yytext[0]; }
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 441 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return yytext[0]; }
-	YY_BREAK
-case 136:
-YY_RULE_SETUP
-#line 443 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 442 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2056 "Lexer.cpp"
+#line 2041 "Lexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2339,7 +2324,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 >= 552 )
+			if ( yy_current_state >= 539 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2369,11 +2354,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 >= 552 )
+		if ( yy_current_state >= 539 )
 			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 == 551);
+	yy_is_jam = (yy_current_state == 538);
 	if ( ! yy_is_jam )
 		*yy_state_ptr++ = yy_current_state;
 
@@ -2930,5 +2915,5 @@
 	return 0;
 	}
 #endif
-#line 443 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 442 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"