diff --git a/lib/AsmParser/Lexer.cpp.cvs b/lib/AsmParser/Lexer.cpp.cvs
index dae64fa..752ba01 100644
--- a/lib/AsmParser/Lexer.cpp.cvs
+++ b/lib/AsmParser/Lexer.cpp.cvs
@@ -349,7 +349,7 @@
 
 /* Begin user sect3 */
 
-#define llvmAsmwrap() 1
+#define llvmAsmwrap(n) 1
 #define YY_SKIP_YYWRAP
 
 typedef unsigned char YY_CHAR;
@@ -380,8 +380,8 @@
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 136
-#define YY_END_OF_BUFFER 137
+#define YY_NUM_RULES 137
+#define YY_END_OF_BUFFER 138
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -389,68 +389,69 @@
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[550] =
+static yyconst flex_int16_t yy_accept[552] =
     {   0,
-        0,    0,  137,  135,  134,  134,  135,  135,  135,  135,
-      135,  135,  127,  127,    1,  135,  135,  135,  135,  135,
-      135,  135,  135,  135,  135,  135,  135,  135,  135,  135,
-      135,  135,  135,  135,  135,  135,  135,  135,    0,  125,
-        0,  123,  121,  130,    0,  128,    0,  132,  127,    0,
-        1,    0,  122,  131,    0,    0,    0,    0,    0,    0,
-        0,  107,    0,   36,    0,    0,    0,    0,    0,    0,
-       70,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   52,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   71,    0,    0,    0,    0,    0,    0,    0,   66,
+        0,    0,  138,  136,  135,  135,  136,  136,  136,  136,
+      136,  136,  128,  128,    1,  136,  136,  136,  136,  136,
+      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
+      136,  136,  136,  136,  136,  136,  136,  136,    0,  126,
+        0,  124,  122,  131,    0,  129,    0,  133,  128,    0,
+        1,    0,  123,  132,    0,    0,    0,    0,    0,    0,
+        0,  108,    0,   37,    0,    0,    0,    0,    0,    0,
+       71,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   53,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   72,    0,    0,    0,    0,    0,    0,    0,   67,
 
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,   24,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  125,  121,  132,   21,  132,    0,  133,    0,
-      126,  122,   53,    0,    0,   65,    0,    0,   34,    0,
-        0,    0,   37,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,  126,  122,  133,   21,  133,    0,  134,    0,
+      127,  123,   54,    0,    0,   66,    0,    0,   35,    0,
+        0,    0,   38,    0,    0,    0,    0,    0,    0,    0,
         0,    3,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,   55,    0,    0,    0,   80,
-       85,   83,   84,   82,   81,    0,   86,   90,    0,  106,
+        0,    0,    0,    0,    0,   56,    0,    0,    0,   81,
+       86,   84,   85,   83,   82,    0,   87,   91,    0,  107,
 
-        0,    0,    0,    0,    0,   75,   73,   62,    0,    0,
-        0,   74,   72,    0,    0,   54,    0,    0,    0,    0,
-        0,    0,    0,    0,   88,   79,   77,    0,   78,   76,
-        0,   89,   87,    0,    0,    0,    0,    0,    0,    0,
-        0,   67,    0,    0,  124,  132,    0,    0,    0,  132,
-        0,    0,    0,   64,    0,    0,   91,    0,    0,    0,
+        0,    0,    0,    0,    0,   76,   74,   63,    0,    0,
+        0,   75,   73,    0,    0,   55,    0,    0,    0,    0,
+        0,    0,    0,    0,   89,   80,   78,    0,   79,   77,
+        0,   90,   88,    0,    0,    0,    0,    0,    0,    0,
+        0,   68,    0,    0,  125,  133,    0,    0,    0,  133,
+        0,    0,    0,    0,   65,    0,    0,   92,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       69,   58,    0,    0,    0,    0,  114,   61,    0,    0,
-        0,   68,    0,    0,    0,    0,    0,    0,    0,  115,
-       63,    0,    0,    0,    0,   23,    0,    0,  129,   57,
+        0,   70,   59,    0,    0,    0,    0,  115,   62,    0,
+        0,    0,   69,    0,    0,    0,    0,    0,    0,    0,
+      116,   64,    0,    0,    0,    0,   23,    0,    0,  130,
 
-        0,    0,   94,    0,    0,    0,   60,   43,    0,    0,
-       25,    0,    0,    0,    4,    0,   50,   56,    0,    0,
-        0,    0,   59,    0,   46,    0,   12,    0,    0,   93,
-      132,   31,    0,    0,    2,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    5,    0,   47,
-       96,    0,    0,    0,    0,    0,    0,   42,    0,    0,
-        0,    0,   49,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  116,    0,    0,    0,    0,
-       92,    0,   22,    0,    0,    0,    0,    0,    0,    0,
-      113,    0,    0,   39,    0,    0,    0,    7,    0,    0,
+       58,    0,    0,   95,    0,    0,    0,   61,   44,    0,
+        0,   25,    0,    0,    0,    4,    0,   51,   57,    0,
+        0,    0,    0,   60,    0,   47,    0,   12,    0,    0,
+       94,  133,   33,   31,    0,    0,    2,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    5,
+        0,   48,   97,    0,    0,    0,    0,    0,    0,   43,
+        0,    0,    0,    0,   50,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  117,    0,    0,
+        0,    0,   93,    0,   22,    0,    0,    0,    0,    0,
+        0,    0,  114,    0,    0,   40,    0,    0,    0,    7,
 
-        0,   48,    0,    0,   38,  100,   99,    0,    0,    8,
-       16,    0,    0,    0,  109,    0,  112,   33,    0,    0,
-       51,    0,    0,  104,    0,    0,   98,  108,   26,    0,
-       27,   97,    0,  110,  105,    0,    0,    0,    0,    0,
-      103,    0,    0,    6,   28,    0,    0,    0,    0,    0,
-       95,    0,    0,    0,    0,    0,    0,    0,    0,   32,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    9,
-        0,    0,    0,    0,   18,    0,    0,    0,   10,  101,
-       11,   45,   44,  102,    0,    0,    0,    0,   30,    0,
-        0,    0,   13,    0,   15,   14,    0,    0,    0,    0,
+        0,    0,    0,   49,    0,    0,   39,  101,  100,    0,
+        0,    8,   16,    0,    0,    0,  110,    0,  113,   34,
+        0,    0,   52,    0,    0,  105,    0,    0,   99,  109,
+       26,    0,   27,   98,    0,  111,  106,    0,    0,    0,
+        0,    0,  104,    0,    0,    6,   28,    0,    0,    0,
+        0,    0,   96,    0,    0,    0,    0,    0,    0,    0,
+        0,   32,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    9,    0,    0,    0,    0,   18,    0,    0,    0,
+       10,  102,   11,   46,   45,  103,    0,    0,    0,    0,
+       30,    0,    0,    0,   13,    0,   15,   14,    0,    0,
 
-        0,    0,    0,    0,    0,    0,    0,   29,    0,    0,
-        0,    0,    0,   35,    0,    0,    0,    0,    0,   17,
-        0,    0,    0,    0,    0,  111,    0,    0,    0,    0,
-        0,    0,    0,   19,    0,    0,    0,    0,  117,  119,
-      120,    0,   40,    0,  118,   41,    0,   20,    0
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   29,
+        0,    0,    0,    0,    0,   36,    0,    0,    0,    0,
+        0,   17,    0,    0,    0,    0,    0,  112,    0,    0,
+        0,    0,    0,    0,    0,   19,    0,    0,    0,    0,
+      118,  120,  121,    0,   41,    0,  119,   42,    0,   20,
+        0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -494,137 +495,137 @@
         4,    4,    4,    4
     } ;
 
-static yyconst flex_int16_t yy_base[558] =
+static yyconst flex_int16_t yy_base[560] =
     {   0,
-        0,    0, 1197, 1198, 1198, 1198, 1192, 1181,   35,   39,
+        0,    0, 1201, 1202, 1202, 1202, 1196, 1185,   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, 1190, 1198,
-     1179, 1198,    0,   49,  185,  217,  116,  238,  254,  259,
-        0, 1188,    0,  200,  125,  149,  146,  153,  177,   63,
-      154, 1177,  160,  161,  208,  185,  264,  171,  113,  210,
-     1176,  222,  260,  228,  186,  261,  271,  110,  273,  274,
+       78,  179,  137,  211,  139,   90,  148,   93, 1194, 1202,
+     1183, 1202,    0,   49,  185,  217,  116,  238,  254,  259,
+        0, 1192,    0,  200,  125,  149,  146,  153,  177,   63,
+      154, 1181,  160,  161,  208,  185,  264,  171,  113,  210,
+     1180,  222,  260,  228,  186,  261,  271,  110,  273,  274,
       230,  289,  277,  278,  240,  290,  292,  205,  291,  232,
-      296, 1175,  299,  303,  305,  306,  310,  313,  309,  318,
+      296, 1179,  299,  303,  305,  306,  310,  313,  309,  318,
 
       311,  314,  317,  322,  328,  329,  338,  331,  335,  339,
-      333,  332,  346,  340,  352,  355, 1174,  358,  360,  361,
+      333,  332,  346,  340,  352,  355, 1178,  358,  360,  361,
       364,  368,  365,  369,  381,  376,  382,  388,  367,  396,
-      384,  395, 1173,    0,  414, 1172,  429,  447,    0, 1181,
-     1198,    0, 1170,  231,  397, 1169,  399,  398, 1168,  401,
-      414,  405, 1167,  442,  407,  431,  419,  434,  436,  449,
-      450, 1166,  454,  432,  438,  453,  456,  460,  458,  461,
-      467,  465,  471,  470,  468,  481,  485,  487,  474,  489,
-      490,  492,  472,  496,  498, 1165,  500,  502,  503, 1164,
-     1163, 1162, 1161, 1160, 1159,  504, 1158, 1157,  506, 1156,
+      384,  395, 1177,    0,  414, 1176,  429,  447,    0, 1185,
+     1202,    0, 1174,  409,  397, 1173,  420,  414, 1172,  405,
+      399,  422, 1171,  442,  431,  449,  432,  450,  437,  452,
+      456, 1170,  457,  435,  459,  460,  461,  465,  370,  469,
+      468,  472,  470,  475,  473,  476,  489,  490,  492,  494,
+      481,  497,  495,  502,  498, 1169,  503,  501,  505, 1168,
+     1167, 1166, 1165, 1164, 1163,  507, 1162, 1161,  508, 1160,
 
-      535,  509,  513,  507,  516, 1155, 1154, 1153,  515,  508,
-      528, 1152, 1151,  536,  527, 1150,  524,  550,  551,  552,
-      554,  555,  557,  556, 1149, 1148, 1147,  558, 1146, 1145,
-      559, 1144, 1143,  561,  564,  568,  570,  572,  580,  514,
-      579, 1142,  575,  583, 1198,  591,  606,  612,  616,  621,
-      606,  622,  623, 1141,  625,  591, 1140,  626,  627,  628,
-      592,  629,  631,  632,  633,  636,  635,  640,  638,  653,
-     1139, 1138,  639,  642,  649,  637, 1137, 1136,  654,  658,
-      655, 1135,  656,  659,  667,  669,  671,  675,  673, 1134,
-     1133,  676,  677,  678,  679, 1132,  680,  682,    0, 1131,
+      537,  512,  515,  510,  525, 1159, 1158, 1157,  516,  542,
+      531, 1156, 1155,  537,  529, 1154,  553,  555,  231,  556,
+      558,  557,  559,  560, 1153, 1152, 1151,  562, 1150, 1149,
+      563, 1148, 1147,  564,  565,  509,  524,  576,  582,  568,
+      584, 1146,  572,  570, 1202,  599,  608,  614,  618,  623,
+      608,  624,  592,  625, 1145,  626,  587, 1144,  627,  628,
+      629,  630,  632,  633,  634,  637,  639,  638,  640,  580,
+      641, 1143, 1142,  648,  651,  653,  656, 1141, 1140,  657,
+      658,  659, 1139,  665,  661,  663,  667,  674,  666,  668,
+     1138, 1137,  671,  679,  670,  680, 1136,  684,  691,    0,
 
-      683,  690, 1130,  685,  684,  699, 1129, 1128,  703,  700,
-     1127,  704,  709,  707, 1126,  711, 1125, 1124,  716,  717,
-      712,  720, 1123,  721, 1122,  722, 1121,  724,  725, 1120,
-      733, 1119,  734,  733, 1118,  726,  736,  745,  748,  737,
-      750,  755,  741,  752,  753,  756,  757, 1117,  758, 1116,
-     1115,  764,  767,  768,  769,  771,  770, 1114,  773,  775,
-      776,  780, 1113,  777,  783,  782,  784,  785,  794,  789,
-      798,  800,  802,  801,  805, 1112,  806,  807,  811,  813,
-     1111,  808, 1110,  814,  821,  815,  826,  810,  829,  832,
-     1109,  833,  834, 1108,  836,  835,  838, 1107,  837,  842,
+     1135,  688,  692, 1134,  693,  696,  697, 1133, 1132,  701,
+      705, 1131,  712,  714,  699, 1130,  716, 1129, 1128,  717,
+      718,  719,  703, 1127,  723, 1126,  726, 1125,  730,  732,
+     1124,  737, 1123, 1122,  731,  738, 1121,  739,  740,  743,
+      751,  742,  744,  752,  755,  756,  758,  760,  761, 1120,
+      763, 1119, 1118,  765,  766,  767,  772,  770,  773, 1117,
+      774,  777,  781,  783, 1116,  784,  788,  787,  789,  790,
+      799,  792,  794,  800,  803,  805,  807, 1115,  808,  810,
+      811,  812, 1114,  815, 1113,  817,  823,  818,  826,  831,
+      828,  829, 1112,  836,  833, 1111,  838,  698,  839, 1110,
 
-      843, 1106,  839,  841, 1105, 1104, 1103,  849,  846, 1102,
-     1101,  856,  867,  851, 1100,  868, 1099, 1098,  852,  859,
-     1097,  869,  870, 1096,  871,  872, 1095, 1094, 1093,  879,
-     1092, 1091,  878, 1090, 1089,  880,  882,  885,  886,  889,
-     1088,  890,  892, 1087, 1076,  893,  895,  897,  902,  898,
-     1066,  899,  903,  904,  901,  906,  910,  912,  913, 1065,
-      922,  925,  926,  927,  929,  930,  932,  931,  934, 1064,
-      936,  938,  941,  943, 1061,  944,  945,  947, 1060, 1059,
-     1058, 1057, 1056, 1055,  949,  950,  951,  964, 1054,  966,
-      967,  968, 1048,  952, 1047, 1046,  969,  977,  956,  972,
+      841,  842,  843, 1109,  848,  844, 1108, 1107, 1106,  851,
+      846, 1105, 1104,  845,  860,  858, 1103,  865, 1102, 1101,
+      867,  869, 1100,  870,  872, 1099,  871,  874, 1098, 1097,
+     1096,  875, 1095, 1094,  878, 1093, 1092,  876,  877,  884,
+      883,  886, 1091,  879,  894, 1090, 1089,  895,  896,  898,
+      899,  901, 1088,  902,  905,  906,  907,  909,  908,  914,
+      910, 1087,  916,  920,  924,  927,  928,  931,  935,  932,
+      936, 1086,  937,  939,  941,  944, 1085,  945,  946,  947,
+     1074, 1064, 1063, 1062, 1061, 1060,  949,  950,  951,  953,
+     1059,  966,  967,  968, 1058,  952, 1057, 1056,  969,  971,
 
-      978,  979,  983,  981,  984,  985,  988,  855,  992,  993,
-      995,  996,  998,  687,  999, 1002, 1000, 1004, 1008,  596,
-     1009, 1011, 1013, 1014, 1018,  593, 1021, 1017, 1026, 1023,
-     1027, 1028, 1029,  522, 1030, 1036, 1032, 1039,  521,  469,
-      371, 1042,  370, 1043,  282,  279, 1045,  244, 1198, 1081,
-     1083,  212, 1088, 1091,  167, 1095,  108
+      972,  977,  978,  979,  980,  983,  984,  985,  987, 1055,
+      989,  991,  992,  995,  997, 1053, 1000, 1007,  998, 1002,
+     1009, 1049, 1010, 1011, 1013, 1015, 1016, 1046, 1022, 1019,
+     1023, 1024, 1026, 1028, 1029, 1045, 1033, 1036,  371, 1030,
+      599,  522,  474, 1039,  434, 1040,  282,  279, 1043,  244,
+     1202, 1079, 1081,  212, 1086, 1089,  167, 1093,  108
     } ;
 
-static yyconst flex_int16_t yy_def[558] =
+static yyconst flex_int16_t yy_def[560] =
     {   0,
-      549,    1,  549,  549,  549,  549,  550,  551,  552,  549,
-      551,  551,  551,  551,  553,  554,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  550,  549,
-      551,  549,  555,  549,  549,  551,  551,  551,  551,  551,
-      553,  556,  557,  549,  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,  551,  551,
+      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,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
 
-      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,  549,  555,  549,  551,  551,  551,   50,  556,
-      549,  557,  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,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  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,  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,
 
-       50,  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,  549,  549,  549,  549,  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,  551,  551,  551,  551,  551,  551,  201,  551,
+       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,  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,  201,
 
-      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,
-      549,  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,  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,
+      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,  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,
 
-      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,  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,  551,  551,
-      551,  551,  551,  551,  551,  551,  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,  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,
 
-      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,  551,  551,  551,  551,    0,  549,
-      549,  549,  549,  549,  549,  549,  549
+      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
     } ;
 
-static yyconst flex_int16_t yy_nxt[1243] =
+static yyconst flex_int16_t yy_nxt[1247] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   14,   14,    4,   15,   16,    8,    8,    8,   17,
@@ -653,7 +654,7 @@
       104,   42,  156,   42,   42,   48,   46,   46,   46,   46,
        42,  183,  162,  120,  121,   42,  122,  154,  123,  155,
       124,   42,  125,   42,   42,   42,  126,  137,  137,  137,
-      137,   42,  174,   42,  185,  138,  251,   42,  166,  163,
+      137,   42,  174,   42,  185,  138,  313,   42,  166,  163,
       180,  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,
@@ -671,81 +672,81 @@
       220,  226,  229,  223,   42,   42,  222,   42,  225,  236,
 
       237,   42,  228,  231,  232,  227,  230,  241,   42,   42,
-       42,   42,   42,  233,   42,  238,  234,  239,   42,  242,
-       42,  235,  253,  246,  246,  246,  246,   42,  255,  252,
-      243,  247,   42,  254,  257,  256,  244,  247,  137,  137,
-      137,  137,   42,  259,   42,   42,  138,   42,  261,   42,
-      260,   42,  138,  248,  249,   42,  250,  250,  250,  250,
-       42,  262,   42,   42,  258,  263,   42,   42,  269,   42,
-      266,   42,  264,   42,   42,  270,  265,  267,   42,  273,
-       42,   42,   42,   42,   42,   42,  271,   42,  279,  268,
-      277,  280,  281,  275,   42,  272,  276,  278,   42,  274,
+       42,  275,   42,  233,  546,  238,  234,  239,   42,  242,
+      257,  235,   42,  246,  246,  246,  246,   42,  251,  253,
+      243,  247,  256,   42,  252,   42,  244,  247,  137,  137,
+      137,  137,   42,  254,   42,   42,  138,   42,   42,  255,
+       42,  258,  138,  248,  249,   42,  250,  250,  250,  250,
+       42,  262,   42,   42,  259,   42,  264,  260,  261,   42,
+       42,  270,   42,   42,   42,  265,  267,  263,   42,  266,
+      268,   42,   42,   42,  274,   42,   42,   42,   42,   42,
+      281,  278,  269,  272,   42,  280,  271,  282,  279,  284,
 
-       42,  282,   42,   42,  283,   42,  287,  291,  284,   42,
-      285,   42,  288,   42,  290,   42,   42,   42,  289,   42,
-       42,   42,   42,  294,  286,  292,   42,   42,   42,   42,
-      302,  305,  296,  295,   42,   42,  293,   42,  297,  304,
-       42,   42,  327,  298,  299,  299,  299,  299,  300,   42,
-      301,  299,  299,  303,  299,  299,  299,  299,  299,  299,
-      306,  310,  309,   42,   42,   42,  307,   42,   42,   42,
-       42,   42,   42,  308,   42,  313,  312,   42,  315,  311,
-      317,   42,  320,   42,  321,   42,  316,  314,   42,  324,
-      319,  322,   42,   42,  325,  318,   42,  328,  323,  326,
+      273,  276,   42,   42,  277,   42,  283,   42,   42,  290,
+       42,   42,  285,  286,   42,   42,   42,  289,   42,  291,
+       42,   42,   42,   42,  288,   42,  295,  287,   42,   42,
+      292,  293,  296,  303,  297,   42,  294,   42,   42,  324,
+      305,  298,   42,  325,   42,  299,  300,  300,  300,  300,
+       42,  301,  302,  300,  300,   42,  300,  300,  300,  300,
+      300,  300,  304,  307,  310,  306,   42,  308,   42,   42,
+       42,   42,   42,   42,  309,   42,   42,   42,   42,  314,
+      316,   42,  318,   42,  312,   42,  321,  322,  317,   42,
+      311,  315,  323,   42,  320,   42,  328,   42,  326,  319,
 
-      246,  246,  246,  246,   42,   42,   42,  329,  247,   42,
-      336,  340,  248,  248,  247,  331,  331,  331,  331,   42,
-      330,  331,  331,  331,  331,  250,  250,  250,  250,   42,
-      250,  250,  250,  250,   42,   42,   42,  332,   42,   42,
-       42,   42,   42,  333,   42,   42,   42,  337,   42,   42,
-       42,   42,   42,   42,  334,   42,  335,  339,  342,  347,
-      341,  348,   42,  344,  338,  345,   42,   42,   42,   42,
-      346,   42,   42,  343,  349,  354,  350,  356,  357,  351,
-       42,  358,   42,  355,   42,  352,   42,  353,   42,   42,
-       42,   42,   42,   42,  359,   42,   42,   42,   42,  362,
+       42,  327,  329,  350,  330,   42,  338,  331,  246,  246,
+      246,  246,   42,  335,  248,  248,  247,  332,  332,  332,
+      332,   42,  247,  332,  332,  332,  332,  250,  250,  250,
+      250,   42,  250,  250,  250,  250,   42,   42,   42,   42,
+       42,   42,   42,   42,  333,   42,   42,   42,  339,  342,
+       42,   42,   42,   42,   42,  334,  336,  337,  341,  349,
+      344,   42,  351,  343,   42,  340,   42,  346,  347,   42,
+       42,   42,   42,  348,   42,  345,   42,  358,   42,   42,
+       42,   42,  359,   42,   42,  352,  357,   42,  353,  354,
+      360,  355,   42,   42,  356,  365,  361,   42,  362,  363,
 
-       42,  361,  360,   42,  363,  364,  366,  374,  365,  373,
-      371,  372,   42,   42,  370,  367,   42,   42,  369,  368,
-       42,  377,   42,  375,   42,   42,  376,  378,  379,   42,
-       42,  384,  381,   42,   42,   42,  380,   42,   42,   42,
-      382,  383,  331,  331,  331,  331,   42,   42,  388,   42,
-       42,  385,  390,  391,   42,  392,  386,  394,   42,  387,
-      389,   42,  393,   42,  395,   42,   42,  396,   42,   42,
-       42,   42,  397,  398,  400,  399,  402,   42,  404,  405,
-       42,   42,   42,   42,   42,  401,   42,  403,   42,   42,
-       42,  406,  409,   42,  407,   42,   42,   42,   42,  408,
+      366,   42,  364,  367,   42,   42,   42,  369,  368,   42,
+       42,   42,   42,  374,   42,  373,   42,  375,   42,  376,
+      370,  377,  371,  372,  378,   42,  379,   42,  382,   42,
+       42,   42,   42,  381,  387,  380,   42,  383,  386,   42,
+      445,  384,  385,   42,   42,   42,  332,  332,  332,  332,
+      393,   42,   42,   42,  390,   42,   42,   42,  388,  392,
+      394,  396,  397,  389,   42,   42,  391,  400,   42,   42,
+      398,   42,  401,   42,   42,  395,   42,  399,   42,   42,
+       42,  404,  406,   42,  407,   42,   42,   42,  402,  403,
+       42,  405,  408,  409,   42,  411,   42,   42,  410,  412,
 
-      410,  411,   42,  415,  417,  418,  413,   42,  416,  414,
-      412,   42,  420,   42,   42,   42,  422,  421,   42,   42,
-       42,   42,  419,   42,   42,  426,   42,   42,   42,  437,
-      423,  425,  428,  430,   42,  433,  431,  424,  427,   42,
-      435,  432,   42,  434,  429,   42,   42,   42,   42,   42,
-       42,   42,   42,  436,   42,   42,   42,  448,  449,   42,
-      440,  444,   42,  439,   42,   42,  438,  442,   42,   42,
-      451,  441,   42,  445,  446,  447,  452,  443,  450,  453,
-       42,   42,   42,   42,   42,   42,  454,  457,  455,  456,
-      458,   42,   42,   42,  461,   42,  462,  463,   42,   42,
+       42,   42,   42,   42,  413,   42,  417,   42,  415,  419,
+      420,  414,   42,   42,  416,  418,   42,  422,   42,  424,
+       42,   42,  423,   42,   42,   42,  425,  421,   42,  428,
+       42,   42,  427,  432,  430,  433,   42,  426,  435,   42,
+      429,   42,   42,  437,   42,  436,   42,  431,  434,   42,
+      439,   42,   42,  438,   42,   42,   42,   42,   42,   42,
+      441,   42,  446,  442,   42,  440,  450,  451,  455,  444,
+      443,   42,  453,   42,  448,  449,  454,  447,   42,  456,
+       42,  452,   42,   42,   42,   42,  458,   42,   42,   42,
+       42,   42,   42,  465,  463,  457,   42,   42,  464,   42,
 
-      459,  460,   42,   42,  464,   42,   42,  467,   42,  465,
-       42,   42,   42,  468,   42,   42,   42,   42,  466,   42,
-      469,  476,  477,   42,  471,   42,   42,  470,  472,  481,
-      473,  475,  478,  479,  483,   42,  480,  474,   42,   42,
-       42,  482,   42,   42,   42,   42,  488,   42,  486,   42,
-      484,   42,  489,  491,   42,  487,   42,   42,   42,  493,
-       42,  485,   42,   42,   42,   42,  497,  490,  492,   42,
-      500,  502,  501,  498,  494,  495,  499,   42,  496,   42,
-       42,   42,   42,  503,  504,   42,  506,  505,  509,  508,
-       42,   42,   42,  511,   42,  507,   42,   42,   42,  513,
+      460,  461,  459,  462,  466,  467,  469,   42,   42,   42,
+      470,   42,   42,  468,   42,   42,  472,  471,   42,   42,
+       42,   42,   42,   42,  478,  479,  473,   42,  477,   42,
+      474,  475,  483,   42,  480,  481,  485,   42,  476,  484,
+       42,   42,  482,  488,   42,   42,  490,  486,   42,   42,
+       42,  491,   42,  489,   42,  487,  493,   42,   42,   42,
+       42,  495,   42,   42,   42,   42,   42,  499,  492,  494,
+      502,  504,  503,  506,  500,  496,  497,  501,  498,   42,
+       42,   42,   42,  505,   42,   42,  508,  507,  511,  510,
+       42,   42,   42,   42,  512,  509,   42,   42,   42,  515,
 
-      510,   42,  512,  517,  515,   42,   42,  519,   42,   42,
-      516,   42,   42,   42,  518,   42,  514,   42,  525,  523,
-      520,   42,   42,  521,   42,  526,   42,   42,  522,  527,
-       42,   42,  530,  528,   42,  524,   42,  529,  536,   42,
-       42,   42,   42,   42,  532,   42,  533,  534,  531,   42,
-      535,  542,   42,  537,  538,   42,   42,  543,   42,   42,
-       42,   42,  539,  546,  541,  540,  547,   42,   42,   42,
-       42,   42,   42,   42,   42,  544,  545,   42,   42,   42,
-      548,   39,   39,   39,   39,   39,   41,   41,   51,   42,
-       51,   51,   51,   53,   53,  140,  140,  140,  140,  140,
+       42,  517,   42,  519,   42,   42,  521,  514,   42,  513,
+       42,   42,  518,   42,  520,   42,  516,  522,  525,  527,
+       42,  523,   42,   42,   42,  524,   42,  529,   42,   42,
+      528,  530,   42,  532,  526,   42,   42,   42,  531,   42,
+      538,   42,   42,   42,  534,  536,   42,  535,  533,   42,
+      539,  537,   42,   42,  544,  540,   42,  545,   42,   42,
+      548,  541,   42,  549,  543,  542,   42,  547,   42,   42,
+       42,   42,   42,   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,
@@ -755,17 +756,17 @@
        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,  549,    3,  549,  549,
+       42,   42,   42,   42,   42,   42,   42,   42,  141,   42,
+      245,   42,   42,   42,   42,  141,   42,  133,   42,   40,
 
-      549,  549,  549,  549,  549,  549,  549,  549,  549,  549,
-      549,  549,  549,  549,  549,  549,  549,  549,  549,  549,
-      549,  549,  549,  549,  549,  549,  549,  549,  549,  549,
-      549,  549,  549,  549,  549,  549,  549,  549,  549,  549,
-      549,  549
+      551,    3,  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
     } ;
 
-static yyconst flex_int16_t yy_chk[1243] =
+static yyconst flex_int16_t yy_chk[1247] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -779,26 +780,26 @@
        18,   31,   24,   17,   18,   17,   13,   17,   19,   20,
 
        17,   31,   18,   36,   23,   20,   38,   21,   30,   20,
-       21,  557,   28,   36,   23,   20,   38,   21,   20,   22,
+       21,  559,   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,   33,   25,   29,   58,   61,   57,   33,
-      555,   35,   33,   63,   64,   29,   56,   29,   56,   33,
+      557,   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,  552,   32,   32,   88,   32,
+       54,   54,   54,   75,   32,  554,   32,   32,   88,   32,
        34,   65,   66,   70,   34,   46,   46,   46,   46,   46,
        46,   88,   70,   34,   34,   72,   34,   65,   34,   65,
-       34,   74,   34,   81,  144,   90,   34,   48,   48,   48,
-       48,   48,   81,   85,   90,   48,  144,  548,   74,   72,
+       34,   74,   34,   81,  219,   90,   34,   48,   48,   48,
+       48,   48,   81,   85,   90,   48,  219,  550,   74,   72,
        85,   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,  546,   76,   77,  545,   73,   67,   82,   82,
+       83,   84,  548,   76,   77,  547,   73,   67,   82,   82,
 
        82,   82,   82,   86,   89,   87,   80,   83,   77,   91,
        79,   87,   93,   84,   84,   84,   94,   84,   95,   96,
@@ -808,106 +809,106 @@
       106,  107,  110,  114,  103,  105,  111,  109,  106,  113,
       108,  107,  110,  104,  112,  115,  113,  114,  116,  108,
       106,  118,  109,  119,  120,  107,  110,  121,  123,  115,
-      129,  122,  124,  543,  541,  118,  129,  115,  120,  126,
+      129,  122,  124,  169,  539,  118,  129,  115,  120,  126,
       116,  122,  124,  119,  125,  127,  118,  131,  121,  126,
 
       127,  128,  123,  125,  125,  122,  124,  130,  132,  130,
-      145,  148,  147,  125,  150,  128,  125,  128,  152,  131,
-      155,  125,  147,  135,  135,  135,  135,  151,  150,  145,
-      132,  135,  157,  148,  152,  151,  132,  135,  137,  137,
-      137,  137,  137,  155,  156,  164,  137,  158,  157,  159,
-      156,  165,  137,  138,  138,  154,  138,  138,  138,  138,
-      138,  158,  160,  161,  154,  159,  166,  163,  164,  167,
-      161,  169,  160,  168,  170,  165,  160,  163,  172,  168,
-      171,  175,  540,  174,  173,  183,  166,  179,  172,  163,
-      171,  173,  174,  170,  176,  167,  170,  171,  177,  169,
+      145,  169,  151,  125,  539,  128,  125,  128,  150,  131,
+      151,  125,  144,  135,  135,  135,  135,  148,  144,  145,
+      132,  135,  150,  147,  144,  152,  132,  135,  137,  137,
+      137,  137,  137,  147,  155,  157,  137,  545,  164,  148,
+      159,  152,  137,  138,  138,  154,  138,  138,  138,  138,
+      138,  157,  156,  158,  154,  160,  159,  155,  156,  161,
+      163,  164,  165,  166,  167,  160,  161,  158,  168,  160,
+      163,  171,  170,  173,  168,  172,  175,  543,  174,  176,
+      173,  171,  163,  166,  181,  172,  165,  174,  171,  176,
 
-      178,  175,  180,  181,  176,  182,  179,  183,  177,  184,
-      178,  185,  180,  187,  182,  188,  189,  196,  181,  199,
-      204,  210,  202,  187,  178,  184,  203,  240,  209,  205,
-      204,  210,  189,  188,  539,  534,  185,  217,  196,  209,
-      215,  211,  240,  199,  201,  201,  201,  201,  202,  214,
-      203,  201,  201,  205,  201,  201,  201,  201,  201,  201,
-      211,  217,  215,  218,  219,  220,  214,  221,  222,  224,
-      223,  228,  231,  214,  234,  220,  219,  235,  222,  218,
-      223,  236,  231,  237,  234,  238,  222,  221,  243,  237,
-      228,  235,  241,  239,  238,  224,  244,  241,  236,  239,
+      167,  170,  177,  178,  170,  179,  175,  180,  183,  181,
+      182,  185,  177,  178,  188,  184,  187,  180,  189,  182,
+      196,  199,  236,  204,  179,  202,  187,  178,  203,  209,
+      183,  184,  188,  204,  189,  542,  185,  237,  205,  236,
+      209,  196,  215,  237,  211,  199,  201,  201,  201,  201,
+      214,  202,  203,  201,  201,  210,  201,  201,  201,  201,
+      201,  201,  205,  211,  215,  210,  217,  214,  218,  220,
+      222,  221,  223,  224,  214,  228,  231,  234,  235,  220,
+      222,  240,  223,  244,  218,  243,  231,  234,  222,  238,
+      217,  221,  235,  270,  228,  239,  240,  241,  238,  224,
 
-      246,  246,  246,  246,  256,  261,  526,  243,  246,  520,
-      256,  261,  247,  247,  246,  247,  247,  247,  247,  251,
-      244,  248,  248,  248,  248,  249,  249,  249,  249,  249,
-      250,  250,  250,  250,  250,  252,  253,  251,  255,  258,
-      259,  260,  262,  252,  263,  264,  265,  258,  267,  266,
-      276,  269,  273,  268,  253,  274,  255,  260,  263,  268,
-      262,  269,  275,  265,  259,  266,  270,  279,  281,  283,
-      267,  280,  284,  264,  270,  276,  273,  280,  281,  274,
-      285,  283,  286,  279,  287,  275,  289,  275,  288,  292,
-      293,  294,  295,  297,  284,  298,  301,  305,  304,  287,
+      257,  239,  241,  270,  243,  253,  257,  244,  246,  246,
+      246,  246,  541,  253,  247,  247,  246,  247,  247,  247,
+      247,  251,  246,  248,  248,  248,  248,  249,  249,  249,
+      249,  249,  250,  250,  250,  250,  250,  252,  254,  256,
+      259,  260,  261,  262,  251,  263,  264,  265,  259,  262,
+      266,  268,  267,  269,  271,  252,  254,  256,  261,  269,
+      264,  274,  271,  263,  275,  260,  276,  266,  267,  277,
+      280,  281,  282,  268,  285,  265,  286,  281,  284,  289,
+      287,  290,  282,  295,  293,  274,  280,  288,  275,  276,
+      284,  276,  294,  296,  277,  289,  285,  298,  286,  287,
 
-      514,  286,  285,  302,  288,  289,  293,  305,  292,  304,
-      301,  302,  306,  310,  298,  294,  309,  312,  297,  295,
-      314,  310,  313,  306,  316,  321,  309,  312,  313,  319,
-      320,  321,  316,  322,  324,  326,  314,  328,  329,  336,
-      319,  320,  331,  331,  331,  331,  334,  333,  328,  337,
-      340,  322,  329,  333,  343,  334,  324,  337,  338,  326,
-      328,  339,  336,  341,  338,  344,  345,  339,  342,  346,
-      347,  349,  340,  341,  343,  342,  345,  352,  347,  349,
-      353,  354,  355,  357,  356,  344,  359,  346,  360,  361,
-      364,  352,  355,  362,  353,  366,  365,  367,  368,  354,
+      290,  302,  288,  293,  299,  303,  305,  295,  294,  306,
+      307,  398,  315,  303,  310,  302,  323,  305,  311,  306,
+      296,  307,  298,  299,  310,  313,  311,  314,  315,  317,
+      320,  321,  322,  314,  323,  313,  325,  317,  322,  327,
+      398,  320,  321,  329,  335,  330,  332,  332,  332,  332,
+      335,  336,  338,  339,  329,  342,  340,  343,  325,  330,
+      336,  339,  340,  327,  341,  344,  329,  343,  345,  346,
+      341,  347,  344,  348,  349,  338,  351,  342,  354,  355,
+      356,  347,  349,  358,  351,  357,  359,  361,  345,  346,
+      362,  348,  354,  355,  363,  357,  364,  366,  356,  358,
 
-      356,  357,  370,  362,  365,  366,  360,  369,  364,  361,
-      359,  371,  368,  372,  374,  373,  370,  369,  375,  377,
-      378,  382,  367,  388,  379,  374,  380,  384,  386,  388,
-      371,  373,  377,  379,  385,  384,  380,  372,  375,  387,
-      386,  382,  389,  385,  378,  390,  392,  393,  396,  395,
-      399,  397,  403,  387,  404,  400,  401,  403,  403,  409,
-      392,  397,  408,  390,  414,  419,  389,  395,  508,  412,
-      408,  393,  420,  399,  400,  401,  409,  396,  404,  412,
-      413,  416,  422,  423,  425,  426,  413,  419,  414,  416,
-      420,  433,  430,  436,  425,  437,  426,  430,  438,  439,
+      368,  367,  369,  370,  359,  372,  364,  373,  362,  367,
+      368,  361,  371,  374,  363,  366,  375,  370,  376,  372,
+      377,  379,  371,  380,  381,  382,  373,  369,  384,  376,
+      386,  388,  375,  381,  379,  382,  387,  374,  386,  389,
+      377,  391,  392,  388,  390,  387,  395,  380,  384,  394,
+      390,  397,  399,  389,  401,  402,  403,  406,  414,  411,
+      392,  405,  399,  394,  410,  391,  405,  405,  414,  397,
+      395,  416,  410,  415,  402,  403,  411,  401,  418,  415,
+      421,  406,  422,  424,  427,  425,  418,  428,  432,  438,
+      439,  435,  444,  432,  427,  416,  441,  440,  428,  442,
 
-      422,  423,  440,  442,  433,  443,  446,  438,  447,  436,
-      448,  450,  452,  439,  455,  449,  453,  454,  437,  456,
-      440,  450,  452,  457,  443,  458,  459,  442,  446,  456,
-      447,  449,  453,  454,  458,  461,  455,  448,  462,  463,
-      464,  457,  465,  466,  468,  467,  464,  469,  462,  471,
-      459,  472,  465,  467,  473,  463,  474,  476,  477,  469,
-      478,  461,  485,  486,  487,  494,  474,  466,  468,  499,
-      478,  486,  485,  476,  471,  472,  477,  488,  473,  490,
-      491,  492,  497,  487,  488,  500,  491,  490,  497,  494,
-      498,  501,  502,  499,  504,  492,  503,  505,  506,  501,
+      422,  424,  421,  425,  435,  438,  440,  445,  448,  449,
+      441,  450,  451,  439,  452,  454,  444,  442,  455,  456,
+      457,  459,  458,  461,  452,  454,  445,  460,  451,  463,
+      448,  449,  458,  464,  455,  456,  460,  465,  450,  459,
+      466,  467,  457,  464,  468,  470,  466,  461,  469,  471,
+      473,  467,  474,  465,  475,  463,  469,  476,  478,  479,
+      480,  471,  487,  488,  489,  496,  490,  476,  468,  470,
+      480,  488,  487,  490,  478,  473,  474,  479,  475,  492,
+      493,  494,  499,  489,  500,  501,  493,  492,  499,  496,
+      502,  503,  504,  505,  500,  494,  506,  507,  508,  503,
 
-      498,  507,  500,  505,  503,  509,  510,  507,  511,  512,
-      504,  513,  515,  517,  506,  516,  502,  518,  515,  512,
-      509,  519,  521,  510,  522,  516,  523,  524,  511,  517,
-      528,  525,  521,  518,  527,  513,  530,  519,  528,  529,
-      531,  532,  533,  535,  523,  537,  524,  525,  522,  536,
-      527,  535,  538,  529,  530,  542,  544,  536,  547,  496,
-      495,  493,  531,  542,  533,  532,  544,  489,  484,  483,
-      482,  481,  480,  479,  475,  537,  538,  470,  460,  451,
-      547,  550,  550,  550,  550,  550,  551,  551,  553,  445,
-      553,  553,  553,  554,  554,  556,  556,  556,  556,  556,
+      509,  505,  511,  507,  512,  513,  509,  502,  514,  501,
+      515,  519,  506,  517,  508,  520,  504,  511,  514,  517,
+      518,  512,  521,  523,  524,  513,  525,  519,  526,  527,
+      518,  520,  530,  523,  515,  529,  531,  532,  521,  533,
+      530,  534,  535,  540,  525,  527,  537,  526,  524,  538,
+      531,  529,  544,  546,  537,  532,  549,  538,  536,  528,
+      544,  533,  522,  546,  535,  534,  516,  540,  510,  498,
+      497,  495,  491,  486,  485,  484,  483,  482,  549,  552,
+      552,  552,  552,  552,  553,  553,  555,  481,  555,  555,
+      555,  556,  556,  558,  558,  558,  558,  558,  477,  472,
 
-      444,  441,  435,  434,  432,  431,  429,  428,  427,  424,
-      421,  418,  417,  415,  411,  410,  407,  406,  405,  402,
-      398,  394,  391,  383,  381,  376,  363,  358,  351,  350,
-      348,  335,  332,  330,  327,  325,  323,  318,  317,  315,
-      311,  308,  307,  303,  300,  296,  291,  290,  282,  278,
-      277,  272,  271,  257,  254,  242,  233,  232,  230,  229,
-      227,  226,  225,  216,  213,  212,  208,  207,  206,  200,
-      198,  197,  195,  194,  193,  192,  191,  190,  186,  162,
-      153,  149,  146,  143,  140,  136,  133,  117,   92,   71,
-       62,   52,   41,   39,    8,    7,    3,  549,  549,  549,
+      462,  453,  447,  446,  443,  437,  436,  434,  433,  431,
+      430,  429,  426,  423,  420,  419,  417,  413,  412,  409,
+      408,  407,  404,  400,  396,  393,  385,  383,  378,  365,
+      360,  353,  352,  350,  337,  334,  333,  331,  328,  326,
+      324,  319,  318,  316,  312,  309,  308,  304,  301,  297,
+      292,  291,  283,  279,  278,  273,  272,  258,  255,  242,
+      233,  232,  230,  229,  227,  226,  225,  216,  213,  212,
+      208,  207,  206,  200,  198,  197,  195,  194,  193,  192,
+      191,  190,  186,  162,  153,  149,  146,  143,  140,  136,
+      133,  117,   92,   71,   62,   52,   41,   39,    8,    7,
 
-      549,  549,  549,  549,  549,  549,  549,  549,  549,  549,
-      549,  549,  549,  549,  549,  549,  549,  549,  549,  549,
-      549,  549,  549,  549,  549,  549,  549,  549,  549,  549,
-      549,  549,  549,  549,  549,  549,  549,  549,  549,  549,
-      549,  549
+        3,  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,  551
     } ;
 
 /* Table of booleans, true if rule could match eol. */
-static yyconst flex_int32_t yy_rule_can_match_eol[137] =
+static yyconst flex_int32_t yy_rule_can_match_eol[138] =
     {   0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -915,7 +916,7 @@
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,     };
+    0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,     };
 
 static yy_state_type yy_last_accepting_state;
 static char *yy_last_accepting_cpos;
@@ -931,7 +932,7 @@
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *llvmAsmtext;
-#line 1 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 1 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 /*===-- Lexer.l - Scanner for llvm assembly files --------------*- C++ -*--===//
 //
 //                     The LLVM Compiler Infrastructure
@@ -944,7 +945,7 @@
 //  This file implements the flex scanner for LLVM assembly languages files.
 //
 //===----------------------------------------------------------------------===*/
-#line 28 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 28 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 #include "ParserInternals.h"
 #include "llvm/Module.h"
 #include <list>
@@ -1077,7 +1078,7 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 1081 "Lexer.cpp"
+#line 1082 "Lexer.cpp"
 
 #define INITIAL 0
 
@@ -1230,10 +1231,10 @@
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 190 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 190 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 
 
-#line 1237 "Lexer.cpp"
+#line 1238 "Lexer.cpp"
 
 	if ( !(yy_init) )
 		{
@@ -1286,13 +1287,13 @@
 			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 >= 550 )
+				if ( yy_current_state >= 552 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_current_state != 549 );
+		while ( yy_current_state != 551 );
 		yy_cp = (yy_last_accepting_cpos);
 		yy_current_state = (yy_last_accepting_state);
 
@@ -1324,262 +1325,267 @@
 
 case 1:
 YY_RULE_SETUP
-#line 192 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 192 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { /* Ignore comments for now */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 194 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 194 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return BEGINTOK; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 195 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 195 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return ENDTOK; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 196 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 196 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return TRUETOK;  }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 197 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 197 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return FALSETOK; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 198 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 198 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DECLARE; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 199 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 199 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DEFINE; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 200 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 200 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return GLOBAL; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 201 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 201 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return CONSTANT; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 202 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 202 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return INTERNAL; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 203 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 203 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return LINKONCE; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 204 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 204 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return WEAK; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 205 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 205 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return APPENDING; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 206 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 206 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DLLIMPORT; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 207 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 207 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DLLEXPORT; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 208 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 208 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return HIDDEN; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 209 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 209 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return EXTERN_WEAK; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 210 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 210 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return EXTERNAL; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 211 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 211 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return THREAD_LOCAL; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 212 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 212 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return ZEROINITIALIZER; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 213 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 213 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DOTDOTDOT; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 214 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 214 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return UNDEF; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 215 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 215 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return NULL_TOK; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 216 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 216 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return TO; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 217 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 217 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return TAIL; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 218 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 218 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return TARGET; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 219 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 219 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return TRIPLE; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 220 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 220 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DEPLIBS; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 221 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 221 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DATALAYOUT; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 222 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 222 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return VOLATILE; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 223 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 223 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return ALIGN;  }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 224 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 224 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return SECTION; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 225 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return MODULE; }
+#line 225 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return ALIAS; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 226 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return ASM_TOK; }
+#line 226 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return MODULE; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 227 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return SIDEEFFECT; }
+#line 227 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return ASM_TOK; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 229 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return CC_TOK; }
+#line 228 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return SIDEEFFECT; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 230 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return CCC_TOK; }
+#line 230 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return CC_TOK; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 231 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return FASTCC_TOK; }
+#line 231 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return CCC_TOK; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 232 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return COLDCC_TOK; }
+#line 232 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return FASTCC_TOK; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 233 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return X86_STDCALLCC_TOK; }
+#line 233 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return COLDCC_TOK; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 234 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return X86_FASTCALLCC_TOK; }
+#line 234 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return X86_STDCALLCC_TOK; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 236 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return INREG; }
+#line 235 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return X86_FASTCALLCC_TOK; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 237 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return SRET;  }
+#line 237 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return INREG; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 238 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return NOUNWIND; }
+#line 238 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return SRET;  }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 239 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return NORETURN; }
+#line 239 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return NOUNWIND; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 241 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::VoidTy,  VOID);  }
+#line 240 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return NORETURN; }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 242 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::FloatTy, FLOAT); }
+#line 242 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::VoidTy,  VOID);  }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 243 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::DoubleTy,DOUBLE);}
+#line 243 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::FloatTy, FLOAT); }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 244 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::LabelTy, LABEL); }
+#line 244 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::DoubleTy,DOUBLE);}
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 245 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return TYPE;   }
+#line 245 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::LabelTy, LABEL); }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 246 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return OPAQUE; }
+#line 246 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return TYPE;   }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 247 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 247 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return OPAQUE; }
+	YY_BREAK
+case 53:
+YY_RULE_SETUP
+#line 248 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { uint64_t NumBits = atoull(llvmAsmtext+1);
                   if (NumBits < IntegerType::MIN_INT_BITS || 
                       NumBits > IntegerType::MAX_INT_BITS)
@@ -1588,367 +1594,367 @@
                   RET_TY(Ty, INTTYPE);
                 }
 	YY_BREAK
-case 53:
-YY_RULE_SETUP
-#line 255 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Add, ADD); }
-	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 256 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Sub, SUB); }
+#line 256 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Add, ADD); }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 257 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Mul, MUL); }
+#line 257 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Sub, SUB); }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 258 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, UDiv, UDIV); }
+#line 258 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Mul, MUL); }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 259 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SDiv, SDIV); }
+#line 259 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, UDiv, UDIV); }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 260 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, FDiv, FDIV); }
+#line 260 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SDiv, SDIV); }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 261 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, URem, UREM); }
+#line 261 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, FDiv, FDIV); }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 262 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SRem, SREM); }
+#line 262 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, URem, UREM); }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 263 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, FRem, FREM); }
+#line 263 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SRem, SREM); }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 264 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Shl, SHL); }
+#line 264 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, FRem, FREM); }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 265 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, LShr, LSHR); }
+#line 265 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Shl, SHL); }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 266 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, AShr, ASHR); }
+#line 266 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, LShr, LSHR); }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 267 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, And, AND); }
+#line 267 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, AShr, ASHR); }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 268 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Or , OR ); }
+#line 268 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, And, AND); }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 269 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Xor, XOR); }
+#line 269 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Or , OR ); }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 270 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal,  ICmp,  ICMP); }
+#line 270 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Xor, XOR); }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 271 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal,  FCmp,  FCMP); }
+#line 271 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal,  ICmp,  ICMP); }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 273 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return EQ;  }
+#line 272 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal,  FCmp,  FCMP); }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 274 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return NE;  }
+#line 274 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return EQ;  }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 275 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return SLT; }
+#line 275 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return NE;  }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 276 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return SGT; }
+#line 276 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return SLT; }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 277 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return SLE; }
+#line 277 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return SGT; }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 278 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return SGE; }
+#line 278 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return SLE; }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 279 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return ULT; }
+#line 279 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return SGE; }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 280 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return UGT; }
+#line 280 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return ULT; }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 281 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return ULE; }
+#line 281 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return UGT; }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 282 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return UGE; }
+#line 282 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return ULE; }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 283 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return OEQ; }
+#line 283 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return UGE; }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 284 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return ONE; }
+#line 284 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return OEQ; }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 285 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return OLT; }
+#line 285 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return ONE; }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 286 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return OGT; }
+#line 286 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return OLT; }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 287 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return OLE; }
+#line 287 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return OGT; }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 288 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return OGE; }
+#line 288 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return OLE; }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 289 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return ORD; }
+#line 289 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return OGE; }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 290 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return UNO; }
+#line 290 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return ORD; }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 291 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return UEQ; }
+#line 291 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return UNO; }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 292 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return UNE; }
+#line 292 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return UEQ; }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 294 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, PHI, PHI_TOK); }
+#line 293 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return UNE; }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 295 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Call, CALL); }
+#line 295 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, PHI, PHI_TOK); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 296 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, Trunc, TRUNC); }
+#line 296 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Call, CALL); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 297 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, ZExt, ZEXT); }
+#line 297 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, Trunc, TRUNC); }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 298 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, SExt, SEXT); }
+#line 298 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, ZExt, ZEXT); }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 299 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPTrunc, FPTRUNC); }
+#line 299 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, SExt, SEXT); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 300 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPExt, FPEXT); }
+#line 300 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPTrunc, FPTRUNC); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 301 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, UIToFP, UITOFP); }
+#line 301 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPExt, FPEXT); }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 302 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, SIToFP, SITOFP); }
+#line 302 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, UIToFP, UITOFP); }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 303 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPToUI, FPTOUI); }
+#line 303 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, SIToFP, SITOFP); }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 304 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPToSI, FPTOSI); }
+#line 304 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPToUI, FPTOUI); }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 305 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, IntToPtr, INTTOPTR); }
+#line 305 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPToSI, FPTOSI); }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 306 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, PtrToInt, PTRTOINT); }
+#line 306 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, IntToPtr, INTTOPTR); }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 307 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, BitCast, BITCAST); }
+#line 307 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, PtrToInt, PTRTOINT); }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 308 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Select, SELECT); }
+#line 308 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, BitCast, BITCAST); }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 309 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, VAArg , VAARG); }
+#line 309 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Select, SELECT); }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 310 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Ret, RET); }
+#line 310 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, VAArg , VAARG); }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 311 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Br, BR); }
+#line 311 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Ret, RET); }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 312 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Switch, SWITCH); }
+#line 312 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Br, BR); }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 313 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Invoke, INVOKE); }
+#line 313 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Switch, SWITCH); }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 314 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unwind, UNWIND); }
+#line 314 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Invoke, INVOKE); }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 315 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
+#line 315 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 317 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Malloc, MALLOC); }
+#line 316 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 318 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
+#line 318 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Malloc, MALLOC); }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 319 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Free, FREE); }
+#line 319 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 320 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Load, LOAD); }
+#line 320 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Free, FREE); }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 321 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Store, STORE); }
+#line 321 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Load, LOAD); }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 322 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
+#line 322 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Store, STORE); }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 324 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
+#line 323 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 325 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
+#line 325 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 326 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
+#line 326 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 329 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 327 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
+	YY_BREAK
+case 122:
+YY_RULE_SETUP
+#line 330 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
                   UnEscapeLexed(llvmAsmtext+1);
                   llvmAsmlval.StrVal = strdup(llvmAsmtext+1);             // Skip %
                   return LOCALVAR;
                 }
 	YY_BREAK
-case 122:
+case 123:
 YY_RULE_SETUP
-#line 334 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 335 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
                   UnEscapeLexed(llvmAsmtext+1);
                   llvmAsmlval.StrVal = strdup(llvmAsmtext+1);             // Skip @
                   return GLOBALVAR;
                 }
 	YY_BREAK
-case 123:
+case 124:
 YY_RULE_SETUP
-#line 339 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 340 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
                   llvmAsmtext[strlen(llvmAsmtext)-1] = 0;  // nuke colon
                   UnEscapeLexed(llvmAsmtext);
@@ -1956,10 +1962,10 @@
                   return LABELSTR;
                 }
 	YY_BREAK
-case 124:
-/* rule 124 can match eol */
+case 125:
+/* rule 125 can match eol */
 YY_RULE_SETUP
-#line 345 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 346 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
                   llvmAsmtext[strlen(llvmAsmtext)-2] = 0;  // nuke colon, end quote
                   UnEscapeLexed(llvmAsmtext+1);
@@ -1967,10 +1973,10 @@
                   return LABELSTR;
                 }
 	YY_BREAK
-case 125:
-/* rule 125 can match eol */
+case 126:
+/* rule 126 can match eol */
 YY_RULE_SETUP
-#line 352 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 353 "/home/asl/proj/llvm/src/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
@@ -1981,19 +1987,19 @@
                    return STRINGCONSTANT;
                  }
 	YY_BREAK
-case 126:
-/* rule 126 can match eol */
+case 127:
+/* rule 127 can match eol */
 YY_RULE_SETUP
-#line 361 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 362 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
                      llvmAsmtext[strlen(llvmAsmtext)-1] = 0;           // nuke end quote
                      llvmAsmlval.StrVal = strdup(llvmAsmtext+2);  // Nuke @, quote
                      return ATSTRINGCONSTANT;
                    }
 	YY_BREAK
-case 127:
+case 128:
 YY_RULE_SETUP
-#line 367 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 368 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { int len = strlen(llvmAsmtext); 
                   uint32_t numBits = ((len * 64) / 19) + 1;
                   APInt Tmp(numBits, llvmAsmtext, len, 10);
@@ -2009,9 +2015,9 @@
                   }
                 }
 	YY_BREAK
-case 128:
+case 129:
 YY_RULE_SETUP
-#line 381 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 382 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { int len = strlen(llvmAsmtext); 
                   uint32_t numBits = (((len-1) * 64) / 19) + 2;
                   APInt Tmp(numBits, llvmAsmtext, len, 10);
@@ -2027,9 +2033,9 @@
                   }
                 }
 	YY_BREAK
-case 129:
+case 130:
 YY_RULE_SETUP
-#line 396 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 397 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { int len = strlen(llvmAsmtext+3) - 3;
                    uint32_t bits = len * 4;
                    APInt Tmp(bits, llvmAsmtext+3, len, 16);
@@ -2048,9 +2054,9 @@
                    }
                  }
 	YY_BREAK
-case 130:
+case 131:
 YY_RULE_SETUP
-#line 414 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 415 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(llvmAsmtext+1);
                   if ((unsigned)Val != Val)
@@ -2059,9 +2065,9 @@
                   return LOCALVAL_ID;
                 }
 	YY_BREAK
-case 131:
+case 132:
 YY_RULE_SETUP
-#line 421 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 422 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(llvmAsmtext+1);
                   if ((unsigned)Val != Val)
@@ -2070,18 +2076,18 @@
                   return GLOBALVAL_ID;
                 }
 	YY_BREAK
-case 132:
-YY_RULE_SETUP
-#line 429 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.FPVal = atof(llvmAsmtext); return FPVAL; }
-	YY_BREAK
 case 133:
 YY_RULE_SETUP
-#line 430 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 430 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.FPVal = atof(llvmAsmtext); return FPVAL; }
+	YY_BREAK
+case 134:
+YY_RULE_SETUP
+#line 431 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = HexToFP(llvmAsmtext); return FPVAL; }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 432 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 433 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
@@ -2090,23 +2096,23 @@
                   return EOF;
                 }
 	YY_BREAK
-case 134:
-/* rule 134 can match eol */
-YY_RULE_SETUP
-#line 440 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ /* Ignore whitespace */ }
-	YY_BREAK
 case 135:
+/* rule 135 can match eol */
 YY_RULE_SETUP
-#line 441 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return llvmAsmtext[0]; }
+#line 441 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ /* Ignore whitespace */ }
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 443 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 442 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return llvmAsmtext[0]; }
+	YY_BREAK
+case 137:
+YY_RULE_SETUP
+#line 444 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2110 "Lexer.cpp"
+#line 2116 "Lexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2389,7 +2395,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 >= 550 )
+			if ( yy_current_state >= 552 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2417,11 +2423,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 >= 550 )
+		if ( yy_current_state >= 552 )
 			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 == 549);
+	yy_is_jam = (yy_current_state == 551);
 
 	return yy_is_jam ? 0 : yy_current_state;
 }
@@ -2842,7 +2848,7 @@
 
 /** Setup the input buffer state to scan a string. The next call to llvmAsmlex() will
  * scan from a @e copy of @a str.
- * @param yystr a NUL-terminated string to scan
+ * @param str a NUL-terminated string to scan
  * 
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
@@ -3099,7 +3105,7 @@
 
 #define YYTABLES_NAME "yytables"
 
-#line 443 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 444 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"