Regenerate for PR645 and PR761


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@33525 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AsmParser/Lexer.cpp.cvs b/lib/AsmParser/Lexer.cpp.cvs
index 51f989e..d102617 100644
--- a/lib/AsmParser/Lexer.cpp.cvs
+++ b/lib/AsmParser/Lexer.cpp.cvs
@@ -17,10 +17,14 @@
 #define yylineno llvmAsmlineno
 
 #line 20 "Lexer.cpp"
-/* A lexical scanner generated by flex*/
+/* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
+<<<<<<< Lexer.cpp.cvs
  * $Header$
+=======
+ * $Header$
+>>>>>>> 1.27
  */
 
 #define FLEX_SCANNER
@@ -28,7 +32,6 @@
 #define YY_FLEX_MINOR_VERSION 5
 
 #include <stdio.h>
-#include <unistd.h>
 
 
 /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
@@ -42,6 +45,7 @@
 #ifdef __cplusplus
 
 #include <stdlib.h>
+#include <unistd.h>
 
 /* Use prototypes in function declarations. */
 #define YY_USE_PROTOS
@@ -153,15 +157,6 @@
 
 #define unput(c) yyunput( c, yytext_ptr )
 
-/* Some routines like yy_flex_realloc() are emitted as static but are
-   not called by all lexers. This generates warnings in some compilers,
-   notably GCC. Arrange to suppress these. */
-#ifdef __GNUC__
-#define YY_MAY_BE_UNUSED __attribute__((unused))
-#else
-#define YY_MAY_BE_UNUSED
-#endif
-
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
@@ -268,7 +263,7 @@
 YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
 
 static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static inline void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) YY_MAY_BE_UNUSED;
+static inline void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
 static void yy_flex_free YY_PROTO(( void * ));
 
 #define yy_new_buffer yy_create_buffer
@@ -317,37 +312,36 @@
 	*yy_cp = '\0'; \
 	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 135
-#define YY_END_OF_BUFFER 136
-static yyconst short int yy_acclist[215] =
+#define YY_NUM_RULES 131
+#define YY_END_OF_BUFFER 132
+static yyconst short int yy_acclist[211] =
     {   0,
-      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,  125,  123,  122,  122,  129,  127,  131,
-      126,    1,  108,   40,   68,   53,   69,   64,   24,  125,
-      122,  122,  130,  131,   21,  131,  132,   54,   63,   38,
+      132,  130,  131,  129,  130,  131,  129,  131,  130,  131,
+      130,  131,  130,  131,  130,  131,  130,  131,  130,  131,
+      122,  130,  131,  122,  130,  131,    1,  130,  131,  130,
+      131,  130,  131,  130,  131,  130,  131,  130,  131,  130,
+      131,  130,  131,  130,  131,  130,  131,  130,  131,  130,
+      131,  130,  131,  130,  131,  130,  131,  130,  131,  130,
+      131,  130,  131,  130,  131,  130,  131,  130,  131,  130,
+      131,  130,  131,  121,  119,  118,  118,  125,  123,  127,
+      122,    1,  104,   36,   64,   49,   65,   60,   24,  121,
+      118,  118,  126,  127,   21,  127,  128,   50,   59,   34,
 
-       33,   41,    3,   56,   78,   83,   81,   82,   80,   79,
-       84,   88,  107,   73,   71,  103,   72,   70,   55,   86,
-       77,   75,   76,   74,   87,   85,   65,  124,  131,  131,
-      105,   89,   67,   59,  115,   62,   66,  116,  104,   23,
-      128,   58,   92,   61,   25,    4,   51,   57,   60,   47,
-       12,   91,  131,   35,    2,    5,   48,   94,   50,  117,
-       90,   22,  114,   44,    7,   49,   29,   43,   98,   97,
-        8,   16,  110,   32,  113,   37,   52,  102,   96,  109,
-       26,   27,   95,  111,  106,  101,   42,    6,   28,   93,
-       36,    9,   18,   10,   99,   11,  100,   34,   13,   15,
+       37,    3,   52,   74,   79,   77,   78,   76,   75,   80,
+       84,  103,   69,   67,   99,   68,   66,   51,   82,   73,
+       71,   72,   70,   83,   81,   61,  120,  127,  127,  101,
+       85,   63,   55,  111,   58,   62,  112,  100,   23,  124,
+       54,   88,   57,   25,    4,   47,   53,   56,   43,   12,
+       87,  127,   31,    2,    5,   44,   90,   46,  113,   86,
+       22,  110,   40,    7,   45,   39,   94,   93,    8,   16,
+      106,  109,   33,   48,   98,   92,  105,   26,   27,   91,
+      107,  102,   97,   38,    6,   28,   89,   32,    9,   18,
+       10,   95,   11,   96,   30,   13,   15,   14,   29,   35,
 
-       14,   31,   39,   17,   30,  112,  118,  120,  121,   45,
-      119,   19,   46,   20
+       17,  108,  114,  116,  117,   41,  115,   19,   42,   20
     } ;
 
-static yyconst short int yy_accept[555] =
+static yyconst short int yy_accept[537] =
     {   0,
         1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
        17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
@@ -361,55 +355,53 @@
        87,   88,   88,   88,   88,   88,   88,   88,   89,   89,
 
        89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   90,   90,   90,   90,   90,
+       89,   89,   89,   89,   90,   90,   90,   90,   90,   90,
        90,   90,   90,   90,   90,   90,   90,   90,   90,   90,
-       90,   91,   92,   94,   95,   96,   97,   97,   98,   99,
-       99,   99,  100,  100,  100,  101,  101,  102,  102,  102,
+       91,   92,   94,   95,   96,   97,   97,   98,   99,   99,
+       99,  100,  100,  100,  101,  101,  101,  101,  102,  102,
+      102,  102,  102,  102,  102,  102,  102,  102,  103,  103,
       103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
-      104,  104,  104,  104,  104,  104,  104,  104,  104,  104,
-      104,  104,  104,  104,  104,  104,  104,  104,  104,  104,
-      104,  104,  104,  104,  104,  105,  105,  106,  107,  108,
-      109,  110,  111,  111,  112,  113,  113,  113,  114,  114,
+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
+      103,  103,  104,  104,  105,  106,  107,  108,  109,  110,
+      110,  111,  112,  112,  113,  113,  113,  113,  113,  113,
 
-      114,  114,  114,  114,  115,  116,  117,  117,  117,  117,
-      118,  119,  119,  119,  120,  120,  120,  120,  120,  120,
-      120,  120,  121,  122,  123,  123,  124,  125,  125,  126,
-      127,  127,  127,  127,  127,  127,  127,  127,  127,  128,
-      128,  128,  129,  130,  130,  130,  130,  131,  131,  131,
-      131,  132,  132,  132,  133,  133,  133,  133,  133,  133,
-      133,  133,  133,  133,  133,  133,  133,  133,  133,  133,
-      134,  135,  135,  135,  135,  135,  136,  137,  137,  137,
-      137,  138,  138,  138,  138,  138,  138,  138,  138,  138,
-      139,  140,  140,  140,  141,  141,  141,  141,  142,  143,
+      114,  115,  116,  116,  116,  116,  117,  118,  118,  118,
+      119,  119,  119,  119,  119,  119,  119,  119,  120,  121,
+      122,  122,  123,  124,  124,  125,  126,  126,  126,  126,
+      126,  126,  126,  126,  126,  127,  127,  127,  128,  129,
+      129,  129,  129,  130,  130,  130,  130,  131,  131,  131,
+      132,  132,  132,  132,  132,  132,  132,  132,  132,  132,
+      132,  132,  132,  132,  132,  133,  134,  134,  134,  134,
+      134,  135,  136,  136,  136,  136,  137,  137,  137,  137,
+      137,  137,  137,  137,  138,  139,  139,  139,  140,  140,
+      140,  141,  142,  142,  142,  143,  143,  143,  143,  144,
 
-      143,  143,  144,  144,  144,  144,  145,  145,  145,  146,
-      146,  146,  147,  147,  148,  149,  149,  149,  149,  149,
-      150,  150,  151,  151,  152,  152,  152,  153,  154,  155,
-      155,  155,  156,  156,  156,  156,  156,  156,  156,  156,
-      156,  156,  156,  156,  156,  156,  156,  157,  157,  158,
-      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
-      159,  159,  160,  160,  160,  160,  160,  160,  160,  160,
-      160,  160,  160,  160,  160,  161,  161,  161,  161,  162,
-      162,  163,  163,  163,  163,  163,  163,  163,  163,  164,
-      164,  164,  165,  165,  165,  165,  165,  166,  166,  166,
+      144,  144,  145,  145,  145,  146,  146,  147,  148,  148,
+      148,  148,  148,  149,  149,  150,  150,  151,  151,  151,
+      152,  153,  154,  154,  154,  155,  155,  155,  155,  155,
+      155,  155,  155,  155,  155,  155,  155,  155,  155,  156,
+      156,  157,  158,  158,  158,  158,  158,  158,  158,  158,
+      158,  158,  158,  158,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  160,  160,  160,  160,  161,
+      161,  162,  162,  162,  162,  162,  162,  162,  162,  163,
+      163,  163,  164,  164,  164,  164,  164,  165,  165,  165,
+      165,  166,  166,  166,  167,  168,  169,  169,  169,  170,
 
-      166,  167,  168,  168,  168,  169,  170,  171,  171,  171,
-      172,  173,  173,  173,  173,  173,  174,  174,  175,  176,
-      177,  178,  178,  178,  178,  179,  179,  179,  180,  181,
-      182,  183,  184,  184,  185,  186,  186,  186,  186,  186,
-      186,  187,  187,  188,  188,  189,  190,  190,  190,  190,
-      190,  190,  191,  191,  191,  191,  191,  191,  191,  191,
-      191,  192,  192,  192,  192,  192,  192,  192,  192,  192,
-      193,  193,  193,  193,  193,  194,  194,  194,  194,  194,
-      195,  196,  197,  197,  198,  198,  198,  198,  199,  199,
-      199,  199,  200,  200,  201,  202,  202,  202,  202,  202,
+      171,  171,  171,  171,  171,  172,  172,  173,  174,  175,
+      175,  175,  176,  176,  176,  177,  178,  179,  180,  181,
+      181,  182,  183,  183,  183,  183,  183,  183,  184,  184,
+      185,  185,  186,  187,  187,  187,  187,  187,  187,  188,
+      188,  188,  188,  188,  188,  188,  188,  189,  189,  189,
+      189,  189,  189,  189,  189,  189,  190,  190,  190,  190,
+      190,  191,  191,  191,  191,  191,  192,  193,  194,  195,
+      195,  195,  195,  196,  196,  196,  196,  197,  197,  198,
+      199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+      199,  199,  200,  200,  200,  200,  200,  200,  200,  201,
 
-      202,  202,  202,  202,  202,  202,  202,  202,  203,  203,
-      203,  203,  203,  203,  203,  203,  204,  204,  204,  204,
-      204,  205,  205,  205,  205,  205,  206,  206,  207,  207,
-      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
-      207,  208,  208,  209,  210,  210,  211,  211,  212,  213,
-      214,  214,  215,  215
+      201,  201,  201,  201,  202,  202,  202,  202,  202,  202,
+      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
+      203,  203,  203,  204,  204,  205,  206,  206,  207,  207,
+      208,  209,  210,  210,  211,  211
     } ;
 
 static yyconst int yy_ec[256] =
@@ -453,416 +445,404 @@
         3,    3,    3
     } ;
 
-static yyconst short int yy_base[559] =
+static yyconst short int yy_base[541] =
     {   0,
-        0,    0, 1200, 1201, 1201, 1201, 1195, 1184,   36,   40,
+        0,    0, 1164, 1165, 1165, 1165, 1159, 1148,   36,   40,
        44,   50,   56,   62,    0,   63,   66,   81,   89,   47,
-      108,   91,   77,  134,   92,  119,   93,  152,  126,  109,
-      178,  154,  209,  135,  111,  146,  112, 1193, 1201, 1182,
-     1201,    0,  159,  198,  215,  236,   70,  241,  256,  261,
-        0,   68,  147,  128,  165,  176,   73,  262, 1181,   31,
-      170,  166,   48,   49,  265,  185,  101,  198, 1180,  180,
-      227,  207,  208,  225,  274,  139,  276,  228,  278,  272,
-      229,  277,  280,  281,  290,  293,  282,  291,  292,  295,
-     1179,  301,  122,  308,  309,  311,  314,  304,  315,  321,
+      108,   91,   77,  134,   92,  119,   93,  152,   72,  109,
+      178,  121,  209,  120,  135,  146,  147, 1157, 1165, 1146,
+     1165,    0,  161,  183,  199,  215,   70,  235,  250,  255,
+        0,   68,  140,  128,  165,  154,  101,   46, 1145,   96,
+      168,  206,  162,  177,  259,  188,   49,  208, 1144,  219,
+      267,  176,  172,  207,  268,  227,  256,  270,  229,  264,
+      274,  273,  272,  287,   31,  296,  228,  283,  276,  285,
+     1143,  299,  286,  302,  303,  304,  305,  307,  308,  309,
 
-      322,  323,  324,  325,  326,  327,  330,  329,  335,  339,
-      342,  349,  356,  357, 1178,  359,  347,  361,  362,  364,
-      340,  367,  371,  368,  215,  381,  386,  395,  384,  385,
-     1177,    0,  402,  411, 1176,  425,  442,    0, 1175,  168,
-      411, 1174,  404,  416, 1173,  375, 1172,  419,  402, 1171,
-      443,  427,  444,  445,  403,  433,  415,  447,  448,  452,
-      455,  457,  458,  459,  461,  462,  463,  466,  473,  468,
-      469,  472,  474,  470,  483,  488,  491,  494,  496,  495,
-      498,  499,  500,  501, 1170,  502, 1169, 1168, 1167, 1166,
-     1165, 1164,  504, 1163, 1162,  505,  507, 1161,  535,  514,
+      316,  317,  318,  320,  319,  322,  332,  329,  324,  323,
+      343,  345,  348, 1142,  350,  334,  351,  336,  357,  354,
+      359,  367,  362,  239,  379,  360,  372,  378,  381, 1141,
+        0,  399,  407, 1140,  421,  438,    0, 1139,  373,  383,
+     1138,  391,  386, 1137,  409,  426,  412, 1136,  415,  389,
+      439,  440,  413,  429,  441,  444,  443, 1135,  446,  425,
+      450,  451,  452,  454,  387,  458,  462,  460,  466,  474,
+      461,  468,  475,  481,  485,  486,  487,  488,  489,  491,
+      492, 1134,  493, 1133, 1132, 1131, 1130, 1129, 1128,  494,
+     1127, 1126,  497, 1125,  525,  500,  513,  498,  515, 1124,
 
-      512,  519,  513, 1160, 1159, 1158,  516,  546,  529, 1157,
-     1156,  548,  549, 1155,  527,  508,  551,  552,  556,  554,
-      553, 1154, 1153, 1152,  557, 1151, 1150,  558, 1149, 1148,
-      559,  561,  560,  572,  579,  580,  569,  582, 1147,  566,
-      581, 1201,  592,  600,  609,  613,  618,  602,  620,  621,
-     1146,  622,  623, 1145,  624,  603,  625,  629,  630,  632,
-      633,  634,  636,  640,  637,  641,  645,  647,  651, 1144,
-     1143,  643,  653,  657,  654, 1142, 1141,  659,  660,  663,
-     1140,  664,  667,  668,  669,  670,  671,  675,  677, 1139,
-     1138,  680,  682, 1137,  683,  685,  691,    0, 1136,  690,
+     1123, 1122,  499,  502,  519, 1121, 1120,  526,  518, 1119,
+      517,  529,  541,  543,  546,  545,  547, 1118, 1117, 1116,
+      548, 1115, 1114,  549, 1113, 1112,  550,  551,  553,  556,
+      557,  568,  560,  567, 1111,  570,  575, 1165,  580,  588,
+      594,  603,  608,  580,  505,  594, 1110,  595,  609, 1109,
+      610,  596,  613,  615,  616,  618,  620,  622,  623,  625,
+      624,  626,  628,  627, 1108, 1107,  629,  632,  638,  641,
+     1106, 1105,  642,  643,  644, 1104,  647,  646,  650,  651,
+      654,  658,  659, 1103, 1102,  661,  663, 1101,  664,  666,
+        0, 1100,  670,  674, 1099,  672,  676,  680, 1098,  686,
 
-      694, 1135,  695,  702,  696, 1134,  704,  710, 1133,  712,
-      699, 1132,  715, 1131, 1130,  716,  718,  719,  720, 1129,
-      723, 1128,  725, 1127,  729,  727, 1126,  734, 1125,  736,
-      592, 1124,  734,  735,  738,  745,  749,  746,  750,  747,
-      755,  757,  760,  758,  761,  763, 1123,  764, 1122, 1121,
-      766,  768,  765,  777,  772,  773,  780,  762,  783,  784,
-      788, 1120,  789,  792,  791,  793,  795,  799,  794,  805,
-      809,  810,  811,  812, 1119,  814,  813,  815, 1118,  816,
-     1117,  820,  822,  817,  829,  833,  818,  834, 1116,  837,
-      839, 1115,  840,  845,  819,  844, 1114,  843,  846,  848,
+      687, 1097,  689,  691, 1096,  692, 1095, 1094,  693,  697,
+      696,  700, 1093,  702, 1092,  704, 1091,  708,  709, 1090,
+      714, 1089,  714,  716, 1088,  715,  721,  720,  726,  729,
+      731,  732,  736,  735,  738,  739,  743,  740, 1087,  744,
+     1086, 1085,  745,  746,  749,  753,  750,  755,  761,  756,
+      763,  764,  767, 1084,  768,  771,  773,  775,  774,  770,
+      769,  781,  789,  786, 1083,  790,  791,  794, 1082,  793,
+     1081,  797,  798,  800,  795,  810,  801,  809, 1080,  807,
+      813, 1079,  816,  818,  817,  819, 1078,  821,  822,  823,
+     1077,  827,  829, 1076, 1075, 1074,  830,  834, 1073, 1072,
 
-     1113, 1112,  854,  849, 1111, 1110, 1109,  856,  855, 1108,
-     1107,  860,  861,  868,  867, 1106,  874, 1105, 1104, 1103,
-     1102,  875,  876,  877, 1101,  878,  879, 1100, 1099, 1098,
-     1097, 1096,  880, 1095, 1094,  882,  883,  891,  885,  884,
-     1093,  886, 1092,  888, 1091, 1090,  895,  900,  902,  903,
-      904, 1089,  908,  907,  910,  911,  912,  914,  915,  919,
-     1086,  920,  922,  927,  929,  930,  934,  935,  936, 1077,
-      939,  943,  944,  940, 1076,  946,  948,  950,  951, 1075,
-     1073, 1071,  955, 1070,  962,  952,  964, 1069,  969,  972,
-      974, 1068,  956, 1067, 1064,  975,  981,  978,  983,  982,
+      835,  838,  846,  839, 1071,  842, 1070, 1069, 1068,  848,
+      853, 1067,  854,  856, 1066, 1065, 1064, 1063, 1062,  855,
+     1061, 1060,  857,  858,  860,  861,  859, 1059,  864, 1058,
+      871, 1057, 1056,  869,  873,  122,  877,  875, 1055,  879,
+      878,  881,  882,  883,  891,  885, 1054,  886,  893,  898,
+      901,  899,  905,  906,  907, 1051,  909,  913,  914,  915,
+     1042,  916,  917,  919,  921, 1041, 1040, 1039, 1038,  923,
+      920,  935, 1036,  938,  939,  940, 1035,  925, 1033, 1032,
+      946,  943,  926,  950,  947,  954,  956,  957,  959,  958,
+      960, 1031,  962,  966,  967,  968,  969,  970, 1027,  971,
 
-      957,  984,  985,  989,  992,  994,  995, 1063,  993,  996,
-      999, 1002, 1005, 1006, 1003, 1062, 1010, 1013, 1016, 1017,
-     1058, 1011, 1021, 1022, 1023,  954, 1024,  700, 1030, 1027,
-     1033, 1036, 1029, 1037, 1038, 1039, 1041, 1047, 1043, 1051,
-      521, 1049,  471,  432, 1052,  431, 1056,  365,  248,  247,
-     1057,  216, 1201, 1092, 1094,  107, 1098,  106
+      974,  975,  977, 1025,  985,  981,  983,  984,  987, 1024,
+      988,  995,  997,  998,  999, 1000, 1006, 1007, 1009, 1012,
+     1008, 1011, 1023, 1013,  928,  705, 1014,  675, 1017,  465,
+      464,  463, 1022,  390, 1165, 1057, 1059,  286, 1063,  252
     } ;
 
-static yyconst short int yy_def[559] =
+static yyconst short int yy_def[541] =
     {   0,
-      553,    1,  553,  553,  553,  553,  554,  555,  556,  553,
-      555,  555,  555,  555,  557,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  554,  553,  555,
-      553,  558,  558,  553,  553,  555,  555,  555,  555,  555,
-      557,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,   24,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      535,    1,  535,  535,  535,  535,  536,  537,  538,  535,
+      537,  537,  537,  537,  539,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  536,  535,  537,
+      535,  540,  540,  535,  535,  537,  537,  537,  537,  537,
+      539,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,   24,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
 
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      553,  558,  558,  553,  555,  555,  555,   50,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,   50,  555,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  535,
+      540,  540,  535,  537,  537,  537,   50,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,   50,  537,  537,  537,  537,  537,
 
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  553,  553,  553,  553,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  199,  555,  555,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  535,  535,  535,
+      535,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      195,  537,  537,  537,  537,  537,  537,  537,  537,  537,
 
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  553,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      535,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
 
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
 
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
-      555,  555,    0,  553,  553,  553,  553,  553
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      537,  537,  537,  537,    0,  535,  535,  535,  535,  535
     } ;
 
-static yyconst short int yy_nxt[1245] =
+static yyconst short int yy_nxt[1209] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   14,   14,    4,   15,    8,    8,    8,   16,   17,
        18,   19,   20,   21,   22,   23,   24,    8,   25,   26,
        27,   28,   29,    8,   30,   31,   32,   33,   34,   35,
        36,    8,   37,   43,   41,   44,   44,   44,   44,   45,
-       45,   45,   45,   46,   46,   46,   46,   41,   47,  149,
-       41,   41,   41,   41,   48,   49,   49,   49,   49,   41,
-       48,   49,   49,   49,   49,   41,   41,   68,  135,   41,
-       69,   41,  153,   41,   52,  154,   41,   70,   57,  139,
-       41,   53,   58,   54,   41,   55,   50,  146,   56,   60,
+       45,   45,   45,   46,   46,   46,   46,   41,   47,   41,
+       41,  177,   41,   41,   48,   49,   49,   49,   49,   41,
+       48,   49,   49,   49,   49,   41,   41,   68,  134,   41,
+       69,   41,  146,   41,   52,   41,  157,   70,   57,  138,
+       41,   53,   58,   54,   41,   55,   50,   99,   56,   60,
 
-       59,   61,   41,   79,   41,   41,   41,   64,  132,   42,
+       59,   61,   41,   79,   41,   41,   41,   64,  100,   41,
        84,   65,   62,   77,   41,   91,   63,   66,   85,   78,
-       67,   41,   41,   86,   41,   41,   71,   87,   72,   73,
-       92,  102,   41,  127,  130,   41,   74,   88,  159,   41,
-       75,   41,   76,   80,   80,   80,   80,   41,   41,  142,
-       89,   99,   41,  125,   81,  187,   90,  100,  128,   41,
-       41,  169,  101,   82,   83,   41,  126,   41,  133,  133,
-      133,  133,  114,  140,   93,  141,   94,  129,   41,   41,
-       95,   41,   96,   41,   97,  115,   98,  103,  116,   41,
-      150,   41,  248,   41,  151,  117,  152,  143,   41,  104,
+       67,   41,   41,   86,  147,  145,   71,   87,   72,   73,
+       92,  101,   41,   41,   41,   41,   74,   88,  124,  113,
+       75,   41,   76,   80,   80,   80,   80,   41,   41,  141,
+       89,  125,  114,   41,   81,  115,   90,  126,  127,   41,
+       41,  460,  116,   82,   83,   41,  139,   41,  140,  129,
+      132,  132,  132,  132,   93,   41,   94,  128,   41,  143,
+       95,   41,   96,  144,   97,   41,   98,  102,  148,   41,
+       41,   41,   44,   44,   44,   44,  151,  142,  163,  103,
 
-      105,  144,  106,  107,  108,  145,  109,   44,   44,   44,
-       44,   41,  110,  158,  111,  112,  161,  113,  103,  160,
-       41,   41,   41,  134,   45,   45,   45,   45,   41,   41,
-      118,  119,  234,  120,  165,  121,  164,  122,   41,  123,
-       41,   41,   41,  124,   48,   46,   46,   46,   46,   41,
-      136,  136,  136,  136,   41,  162,  166,  137,  173,  171,
-       41,   41,  163,  137,   48,   49,   49,   49,   49,   41,
-      138,  138,  138,  138,   41,   41,  138,  138,   41,  138,
-      138,  138,  138,  138,  138,  155,  147,   41,  156,   41,
-       41,   41,   40,   41,   41,   41,  167,  157,  148,  172,
+      104,   41,  105,  106,  107,  162,  108,  133,   45,   45,
+       45,   45,  109,  152,  110,  111,  156,  112,  102,   41,
+       41,   41,   41,   48,   46,   46,   46,   46,   41,  158,
+      117,  118,   41,  119,  149,  120,  150,  121,  164,  122,
+       41,   41,   41,  123,  135,  135,  135,  135,   41,  167,
+      170,  136,   41,  179,  131,  159,  230,  136,   48,   49,
+       49,   49,   49,   41,  137,  137,  137,  137,   41,   41,
+      137,  137,   41,  137,  137,  137,  137,  137,  137,  153,
+       41,   41,  154,   41,   40,   41,   41,   41,   42,   41,
+      165,  155,  168,   40,   40,  160,   41,  181,   41,   41,
 
-      178,   40,   40,   41,   41,   41,   41,  182,   41,  174,
-      168,  181,  170,  184,   41,  175,  176,   41,  177,  183,
-      179,   41,   41,  185,   41,  194,  180,   41,   41,  186,
-      188,  190,  193,  192,   41,   41,   41,   41,   41,   41,
-       41,  195,   41,   41,  189,  191,  201,  196,   41,  204,
-      208,  200,   41,   41,  202,   41,  197,  210,  206,  198,
-       41,  212,   41,  205,  199,  209,  203,  207,  214,   41,
-       41,  211,   41,  213,   41,   41,  225,   41,   41,  220,
-       41,   41,  215,  216,   41,  218,  223,  221,   41,  226,
-      233,  217,  228,  229,   41,  222,  219,   41,   41,   41,
+       41,  169,  161,  171,  166,  172,  176,  173,  174,   41,
+      175,  180,   41,  182,  178,   41,   41,   41,   41,  184,
+       41,   41,   41,  190,  185,  187,  189,  183,  191,   41,
+       41,   41,   41,   41,  192,   41,   41,   41,  186,  188,
+      197,  200,   41,  193,  196,   41,  208,   41,  198,   41,
+      202,  206,  194,  204,  209,  201,   41,  195,   41,  203,
+      199,   41,  210,   41,   41,  207,  216,   41,  205,  218,
+       41,  211,   41,   41,  212,   41,  214,  217,  233,  219,
+       41,  222,  213,  234,  229,   41,   41,  215,  224,  225,
+      221,   41,   41,  220,   41,  223,   41,  244,  226,   41,
 
-      224,  252,  230,  227,  237,  231,  238,  235,   41,  236,
-      232,  133,  133,  133,  133,   41,   41,   41,  239,  240,
-      243,  243,  243,  243,   41,  241,  250,  244,   41,   41,
-      254,  259,   41,  244,  136,  136,  136,  136,   41,  253,
-       41,  137,  249,  261,   41,   41,   41,  137,  245,  246,
-      251,  247,  247,  247,  247,   41,   41,   41,   41,  260,
-       41,   41,  256,  258,  255,   41,  257,  264,   41,  262,
-       41,   41,   41,  263,   41,   41,   41,  266,  265,   41,
-      272,   41,   41,   41,   41,   41,   41,   41,  279,  267,
-      278,  270,  268,  280,  269,  276,   41,  274,  282,  271,
+       41,  227,   41,   41,   41,  231,  228,  232,  132,  132,
+      132,  132,  235,  246,  245,  236,  239,  239,  239,  239,
+      247,  237,   41,  240,  252,   41,   41,  268,   41,  240,
+      135,  135,  135,  135,   41,  248,  251,  136,   41,   41,
+      250,  255,   41,  136,  241,  242,  249,  243,  243,  243,
+      243,   41,   41,   41,   41,  256,   41,   41,  254,   41,
+      263,  253,  260,   41,   41,   41,  258,   41,  261,  257,
+      259,   41,  267,   41,   41,   41,   41,   41,   41,   41,
+      262,   41,  273,  265,  271,  274,  264,   41,   41,  269,
+      266,  272,  270,  276,   41,  275,  277,  278,   41,   41,
 
-      275,   41,  277,  273,   41,  283,  281,   41,   41,   41,
-      284,   41,   41,   41,   41,   41,  287,   41,   41,  290,
-       41,   41,  286,  288,  285,   41,   41,   41,  292,   41,
-      294,  289,   41,  291,   41,  296,  309,  295,  293,  303,
-       41,  301,   41,  297,  298,  298,  298,  298,  300,  302,
-      298,  298,  299,  298,  298,  298,  298,  298,  298,   41,
-      305,   41,   41,  308,   41,   41,   41,   41,  304,   41,
-       41,   41,   41,   41,   41,  310,  314,  306,  312,   41,
-      317,  318,   41,  307,  311,   41,  313,  319,  316,  320,
-      321,  315,   41,   41,   41,   41,  324,  326,  323,  325,
+       41,   41,   41,  279,   41,   41,   41,   41,  282,  284,
+       41,   41,   41,   41,  283,   41,  281,  280,   41,  286,
+      294,  288,  296,  285,  297,  323,   41,  289,   41,  287,
+       41,   41,   41,  290,  291,  291,  291,  291,  292,   41,
+      291,  291,   41,  291,  291,  291,  291,  291,  291,  293,
+      298,  295,  300,  301,   41,  299,   41,  302,   41,   41,
+       41,   41,   41,   41,   41,  303,   41,  307,  305,   41,
+       41,  310,  311,   41,  314,  304,  306,  312,  315,  309,
+       41,   41,  313,   41,  318,  308,  316,  317,   41,  239,
+      239,  239,  239,   41,  241,  241,  240,  321,  321,  321,
 
-      322,  243,  243,  243,  243,   41,  245,  245,  244,  328,
-      328,  328,  328,  390,  244,   41,   41,  327,  328,  328,
-      328,  328,  247,  247,  247,  247,   41,  247,  247,  247,
-      247,   41,  329,   41,   41,   41,   41,   41,   41,  335,
-      330,  333,   41,   41,  334,   41,   41,   41,  338,   41,
-       41,  331,  332,   41,   41,  344,   41,  337,   41,  340,
-       41,  336,  339,  346,   41,  342,   41,   41,  343,  347,
-       41,  348,   41,   41,  341,  345,   41,   41,  355,  349,
-       41,   41,   41,   41,   41,  356,  357,  354,   41,  350,
-       41,  353,  351,   41,  352,   41,   41,  361,   41,  362,
+      321,  319,  240,  321,  321,  321,  321,   41,   41,   41,
+      322,  320,  243,  243,  243,  243,   41,  243,  243,  243,
+      243,   41,   41,   41,  324,  325,   41,  326,   41,   41,
+      327,   41,  328,   41,  331,   41,   41,   41,   41,   41,
+       41,   41,   41,  330,  338,   41,  333,  340,  332,  329,
+      339,   41,  335,  336,   41,   41,   41,   41,  337,   41,
+       41,  347,  334,   41,   41,  341,  348,   41,  342,  349,
+      346,   41,   41,  343,   41,  344,   41,   41,  345,   41,
+      350,  353,  352,   41,  351,   41,  354,   41,   41,   41,
+      355,  357,  356,   41,  361,  362,  360,  359,  363,   41,
 
-      360,  358,  359,   41,   41,  364,  363,   41,   41,   41,
-      366,  365,   41,   41,  371,   41,  370,   41,  372,  374,
-      367,  368,  369,   41,  373,   41,  375,  378,   41,   41,
-      376,   41,   41,   41,  377,  379,   41,  382,   41,  380,
-       41,  381,   41,  328,  328,  328,  328,   41,   41,   41,
-      383,   41,  386,  388,  389,  392,  393,  384,   41,   41,
-       41,  385,   41,   41,  387,  394,  398,  395,   41,  391,
-       41,   41,  397,   41,   41,   41,   41,   41,   41,   41,
-      396,   41,  401,  404,  405,   41,   41,  399,  402,  400,
-       41,  403,  406,   41,  407,  408,   41,   41,  413,  409,
+       41,  358,   41,  364,   41,   41,   41,  366,  365,   41,
+       41,  367,  369,   41,  372,   41,  370,   41,   41,  368,
+      371,   41,   41,  321,  321,  321,  321,   41,   41,   41,
+      373,  376,  379,   41,   41,  378,  374,  380,  383,   41,
+      375,  382,   41,  377,   41,   41,  384,  385,   41,   41,
+      381,   41,   41,   41,  387,  388,   41,   41,   41,   41,
+      393,  391,   41,   41,  394,  386,   41,  389,   41,   41,
+      390,  395,  396,  392,   41,  398,   41,   41,  399,  397,
+       41,   41,   41,   41,   41,  400,   41,   41,   41,  405,
+      401,  407,  402,  403,   41,  408,  404,  409,  406,   41,
 
-      410,   41,   41,  411,   41,   41,   41,   41,   41,  412,
-      416,  419,   41,  414,  418,  420,  415,  421,   41,  417,
-      423,  422,   41,   41,   41,   41,   41,   41,   41,   41,
-       41,   41,   41,   41,  427,   41,  424,  431,  426,  429,
-      433,  435,   41,  434,  428,  425,   41,   41,  432,  430,
-       41,  437,   41,   41,  438,  436,   41,   41,   41,   41,
-      444,   41,   41,  440,  439,  443,  445,   41,   41,   41,
-      442,  449,  450,   41,   41,  441,  452,  447,  446,  448,
-       41,   41,  454,  455,  453,  451,  456,   41,   41,   41,
-       41,   41,   41,   41,  458,   41,   41,   41,   41,   41,
+      410,  411,   41,   41,   41,  412,   41,   41,   41,  413,
+       41,   41,  414,   41,   41,  416,  418,  420,  415,  421,
+       41,  423,   41,   41,  422,  419,   41,  417,  424,   41,
+       41,   41,   41,  427,   41,   41,   41,  425,  430,  426,
+       41,  432,   41,   41,  436,  437,  429,   41,   41,  428,
+      439,   41,   41,  434,  435,   41,  433,  441,  431,   41,
+      442,   41,  445,  440,  443,  438,   41,   41,   41,   41,
+       41,   41,   41,   41,   41,  444,  448,   41,  446,  449,
+      450,  453,   41,  447,   41,  451,   41,  454,   41,  455,
+       41,   41,   41,  452,   41,   41,   41,  462,   41,   41,
 
-      462,   41,  463,  457,   41,  464,  460,  461,   41,  459,
-      465,  468,  467,   41,  469,   41,   41,   41,  466,  471,
-       41,   41,  470,   41,   41,   41,  476,   41,   41,  472,
-      477,  475,   41,   41,  473,   41,  482,  478,  479,  480,
-       41,  474,   41,   41,  486,  487,  481,   41,   41,   41,
-      483,  488,   41,   41,  490,  484,   41,   41,  485,   41,
-      492,   41,  496,   41,   41,   41,  489,   41,   41,   41,
-       41,  491,  503,  500,  497,   41,  493,   41,  498,  494,
-      495,  501,   41,  504,  502,   41,  499,   41,   41,  505,
-      506,   41,  508,  509,   41,   41,   41,   41,   41,  514,
+      456,  463,  457,  458,   41,  461,   41,  459,  464,  465,
+      466,   41,   41,  468,   41,  471,  472,  467,   41,   41,
+       41,  469,   41,  473,  470,  475,   41,   41,   41,   41,
+       41,  477,   41,   41,   41,  474,   41,  481,   41,   41,
+      487,   41,  476,  485,  482,  486,  478,  483,   41,  479,
+      480,   41,   41,   41,  488,  484,   41,  490,  489,   41,
+       41,  492,  495,   41,  493,  494,  491,   41,  496,   41,
+       41,   41,   41,   41,  498,   41,  497,  501,  503,   41,
+       41,   41,   41,   41,   41,  500,  502,   41,   41,  504,
+       41,  508,  499,  510,   41,  505,   41,   41,   41,  506,
 
-      507,  512,   41,  510,  515,   41,   41,   41,   41,   41,
-      518,  513,   41,  520,  511,   41,   41,  517,   41,   41,
-      521,  516,  519,   41,   41,  522,   41,  525,  526,   41,
-       41,  523,  528,  532,   41,   41,   41,   41,  524,  527,
-       41,  529,   41,   41,  530,  531,   41,  538,  534,   41,
-       41,   41,   41,  535,   41,  536,   41,  533,  537,  539,
-       41,  545,   41,  541,   41,   41,  540,  546,  542,   41,
-       41,   41,  550,  544,  543,   41,   41,   41,  551,  549,
-       41,   41,   41,   41,   41,  547,   41,  548,   41,   41,
-       41,  552,   38,   38,   38,   38,   40,   40,   51,   41,
+       41,   41,  511,  512,  507,  513,  509,  514,   41,  516,
+       41,   41,   41,   41,  517,  520,  519,  515,  518,   41,
+       41,   41,   41,  521,   41,   41,   41,   41,  522,  527,
+       41,  524,  528,  523,  532,   41,   41,   41,   41,  533,
+       41,  526,  525,  531,   41,   41,   41,  530,   41,   41,
+      529,   41,   41,   41,   41,   41,  534,   38,   38,   38,
+       38,   40,   40,   51,   41,   51,   51,   41,   41,   41,
+       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
+       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
+       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
 
-       51,   51,   41,   41,   41,   41,   41,   41,   41,   41,
        41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
        41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
        41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
        41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
        41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
-       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
-       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
-       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
-      242,   41,   41,   41,   41,   41,  131,   41,   39,  553,
+       41,   41,   41,   41,  238,   41,   41,   41,   41,   41,
+      130,   41,   39,  535,    3,  535,  535,  535,  535,  535,
+      535,  535,  535,  535,  535,  535,  535,  535,  535,  535,
+      535,  535,  535,  535,  535,  535,  535,  535,  535,  535,
+      535,  535,  535,  535,  535,  535,  535,  535,  535,  535,
 
-        3,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553
+      535,  535,  535,  535,  535,  535,  535,  535
     } ;
 
-static yyconst short int yy_chk[1245] =
+static yyconst short int yy_chk[1209] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    9,   60,    9,    9,    9,    9,   10,
-       10,   10,   10,   11,   11,   11,   11,   11,   12,   60,
-       20,   63,   64,   12,   13,   13,   13,   13,   13,   13,
+        1,    1,    1,    9,   85,    9,    9,    9,    9,   10,
+       10,   10,   10,   11,   11,   11,   11,   11,   12,   58,
+       20,   85,   67,   12,   13,   13,   13,   13,   13,   13,
        14,   14,   14,   14,   14,   14,   16,   20,   47,   17,
-       20,   52,   63,   47,   16,   64,   57,   20,   17,   52,
-       23,   16,   17,   16,   18,   16,   13,   57,   16,   18,
+       20,   52,   58,   47,   16,   29,   67,   20,   17,   52,
+       23,   16,   17,   16,   18,   16,   13,   29,   16,   18,
 
-       17,   18,   19,   23,   22,   25,   27,   19,  558,  556,
-       25,   19,   18,   22,   67,   27,   18,   19,   25,   22,
-       19,   21,   30,   25,   35,   37,   21,   25,   21,   21,
-       27,   30,   26,   35,   37,   93,   21,   26,   67,   29,
-       21,   54,   21,   24,   24,   24,   24,   24,   34,   54,
-       26,   29,   76,   34,   24,   93,   26,   29,   36,   36,
-       53,   76,   29,   24,   24,   28,   34,   32,   43,   43,
-       43,   43,   32,   53,   28,   53,   28,   36,   55,   62,
-       28,  140,   28,   61,   28,   32,   28,   31,   32,   56,
-       61,   31,  140,   70,   62,   32,   62,   55,   66,   31,
+       17,   18,   19,   23,   22,   25,   27,   19,   29,   60,
+       25,   19,   18,   22,   57,   27,   18,   19,   25,   22,
+       19,   21,   30,   25,   60,   57,   21,   25,   21,   21,
+       27,   30,   26,   34,   32,  436,   21,   26,   34,   32,
+       21,   54,   21,   24,   24,   24,   24,   24,   35,   54,
+       26,   34,   32,   53,   24,   32,   26,   35,   36,   36,
+       37,  436,   32,   24,   24,   28,   53,   56,   53,   37,
+       43,   43,   43,   43,   28,   63,   28,   36,   55,   56,
+       28,   61,   28,   56,   28,   73,   28,   31,   61,   72,
+       64,   31,   44,   44,   44,   44,   63,   55,   73,   31,
 
-       31,   56,   31,   31,   31,   56,   31,   44,   44,   44,
-       44,   68,   31,   66,   31,   31,   70,   31,   33,   68,
-       72,   73,   33,   45,   45,   45,   45,   45,  125,  552,
-       33,   33,  125,   33,   73,   33,   72,   33,   74,   33,
-       71,   78,   81,   33,   46,   46,   46,   46,   46,   46,
-       48,   48,   48,   48,   48,   71,   74,   48,   81,   78,
-      550,  549,   71,   48,   49,   49,   49,   49,   49,   49,
-       50,   50,   50,   50,   50,   58,   50,   50,   65,   50,
-       50,   50,   50,   50,   50,   65,   58,   75,   65,   77,
-       82,   79,   80,   83,   84,   87,   75,   65,   58,   79,
+       31,   66,   31,   31,   31,   72,   31,   45,   45,   45,
+       45,   45,   31,   64,   31,   31,   66,   31,   33,   62,
+       74,   68,   33,   46,   46,   46,   46,   46,   46,   68,
+       33,   33,   70,   33,   62,   33,   62,   33,   74,   33,
+       76,   87,   79,   33,   48,   48,   48,   48,   48,   76,
+       79,   48,  124,   87,  540,   70,  124,   48,   49,   49,
+       49,   49,   49,   49,   50,   50,   50,   50,   50,   77,
+       50,   50,   65,   50,   50,   50,   50,   50,   50,   65,
+       71,   75,   65,   78,   80,   83,   82,   81,  538,   89,
+       75,   65,   77,   80,   80,   71,   88,   89,   90,   93,
 
-       84,   80,   80,   85,   88,   89,   86,   87,   90,   82,
-       75,   86,   77,   89,   92,   83,   83,   98,   83,   88,
-       85,   94,   95,   90,   96,   98,   85,   97,   99,   92,
-       94,   95,   97,   96,  100,  101,  102,  103,  104,  105,
-      106,   99,  108,  107,   94,   95,  105,  100,  109,  106,
-      108,  104,  110,  121,  105,  111,  101,  109,  107,  102,
-      117,  110,  112,  106,  103,  108,  105,  107,  112,  113,
-      114,  109,  116,  111,  118,  119,  121,  120,  548,  117,
-      122,  124,  113,  114,  123,  116,  120,  118,  146,  122,
-      124,  114,  123,  123,  126,  119,  116,  129,  130,  127,
+       84,   78,   71,   81,   75,   82,   84,   83,   83,   86,
+       83,   88,   92,   90,   86,   94,   95,   96,   97,   93,
+       98,   99,  100,   97,   94,   95,   96,   92,   98,  101,
+      102,  103,  105,  104,   99,  106,  110,  109,   94,   95,
+      104,  105,  108,  100,  103,  107,  109,  116,  104,  118,
+      106,  108,  101,  107,  110,  105,  111,  102,  112,  106,
+      104,  113,  111,  115,  117,  108,  116,  120,  107,  118,
+      119,  112,  121,  126,  113,  123,  115,  117,  126,  119,
+      122,  121,  113,  127,  123,  127,  139,  115,  122,  122,
+      120,  128,  125,  119,  129,  121,  140,  139,  122,  143,
 
-      120,  146,  123,  122,  127,  123,  128,  126,  128,  126,
-      123,  133,  133,  133,  133,  149,  155,  143,  129,  130,
-      134,  134,  134,  134,  141,  130,  143,  134,  157,  144,
-      149,  155,  148,  134,  136,  136,  136,  136,  136,  148,
-      152,  136,  141,  157,  546,  544,  156,  136,  137,  137,
-      144,  137,  137,  137,  137,  137,  151,  153,  154,  156,
-      158,  159,  152,  154,  151,  160,  153,  159,  161,  158,
-      162,  163,  164,  158,  165,  166,  167,  161,  160,  168,
-      166,  170,  171,  174,  543,  172,  169,  173,  171,  161,
-      170,  164,  162,  172,  163,  169,  175,  168,  174,  165,
+      165,  122,  150,  534,  142,  125,  122,  125,  132,  132,
+      132,  132,  128,  142,  140,  129,  133,  133,  133,  133,
+      143,  129,  145,  133,  150,  147,  153,  165,  149,  133,
+      135,  135,  135,  135,  135,  145,  149,  135,  160,  146,
+      147,  153,  154,  135,  136,  136,  146,  136,  136,  136,
+      136,  136,  151,  152,  155,  154,  157,  156,  152,  159,
+      160,  151,  157,  161,  162,  163,  156,  164,  159,  155,
+      156,  166,  164,  168,  171,  167,  532,  531,  530,  169,
+      159,  172,  168,  162,  167,  169,  161,  170,  173,  166,
+      163,  167,  166,  171,  174,  170,  172,  173,  175,  176,
 
-      168,  176,  169,  167,  177,  175,  173,  178,  180,  179,
-      176,  181,  182,  183,  184,  186,  178,  193,  196,  181,
-      197,  216,  177,  179,  176,  201,  203,  200,  183,  207,
-      186,  180,  202,  182,  541,  196,  216,  193,  184,  207,
-      215,  202,  209,  197,  199,  199,  199,  199,  201,  203,
-      199,  199,  200,  199,  199,  199,  199,  199,  199,  208,
-      209,  212,  213,  215,  217,  218,  221,  220,  208,  219,
-      225,  228,  231,  233,  232,  217,  220,  212,  219,  240,
-      228,  231,  237,  213,  218,  234,  219,  232,  225,  233,
-      234,  221,  235,  236,  241,  238,  237,  240,  236,  238,
+      177,  178,  179,  174,  180,  181,  183,  190,  176,  178,
+      193,  198,  203,  196,  177,  204,  175,  174,  245,  180,
+      198,  183,  203,  179,  204,  245,  197,  190,  199,  181,
+      211,  209,  205,  193,  195,  195,  195,  195,  196,  208,
+      195,  195,  212,  195,  195,  195,  195,  195,  195,  197,
+      205,  199,  209,  211,  213,  208,  214,  212,  216,  215,
+      217,  221,  224,  227,  228,  213,  229,  216,  215,  230,
+      231,  224,  227,  233,  230,  214,  215,  228,  231,  221,
+      234,  232,  229,  236,  234,  217,  232,  233,  237,  239,
+      239,  239,  239,  244,  240,  240,  239,  240,  240,  240,
 
-      235,  243,  243,  243,  243,  331,  244,  244,  243,  244,
-      244,  244,  244,  331,  243,  248,  256,  241,  245,  245,
-      245,  245,  246,  246,  246,  246,  246,  247,  247,  247,
-      247,  247,  248,  249,  250,  252,  253,  255,  257,  256,
-      249,  253,  258,  259,  255,  260,  261,  262,  259,  263,
-      265,  250,  252,  264,  266,  265,  272,  258,  267,  261,
-      268,  257,  260,  267,  269,  263,  273,  275,  264,  268,
-      274,  269,  278,  279,  262,  266,  280,  282,  279,  272,
-      283,  284,  285,  286,  287,  280,  282,  278,  288,  273,
-      289,  275,  274,  292,  274,  293,  295,  286,  296,  287,
+      240,  236,  239,  241,  241,  241,  241,  246,  248,  252,
+      244,  237,  242,  242,  242,  242,  242,  243,  243,  243,
+      243,  243,  249,  251,  246,  248,  253,  249,  254,  255,
+      251,  256,  252,  257,  255,  258,  259,  261,  260,  262,
+      264,  263,  267,  254,  262,  268,  257,  264,  256,  253,
+      263,  269,  259,  260,  270,  273,  274,  275,  261,  278,
+      277,  274,  258,  279,  280,  267,  275,  281,  268,  277,
+      273,  282,  283,  269,  286,  269,  287,  289,  270,  290,
+      278,  281,  280,  293,  279,  296,  282,  294,  528,  297,
+      283,  287,  286,  298,  294,  296,  293,  290,  297,  300,
 
-      285,  283,  284,  300,  297,  289,  288,  301,  303,  305,
-      293,  292,  311,  528,  301,  304,  300,  307,  303,  305,
-      295,  296,  297,  308,  304,  310,  307,  311,  313,  316,
-      308,  317,  318,  319,  310,  313,  321,  318,  323,  316,
-      326,  317,  325,  328,  328,  328,  328,  333,  334,  330,
-      319,  335,  325,  326,  330,  334,  335,  321,  336,  338,
-      340,  323,  337,  339,  325,  336,  340,  337,  341,  333,
-      342,  344,  339,  343,  345,  358,  346,  348,  353,  351,
-      338,  352,  343,  346,  348,  355,  356,  341,  344,  342,
-      354,  345,  351,  357,  352,  353,  359,  360,  358,  354,
+      301,  289,  303,  298,  304,  306,  309,  301,  300,  311,
+      310,  303,  306,  312,  311,  314,  309,  316,  526,  304,
+      310,  318,  319,  321,  321,  321,  321,  323,  326,  324,
+      312,  318,  323,  328,  327,  319,  314,  324,  328,  329,
+      316,  327,  330,  318,  331,  332,  329,  330,  334,  333,
+      326,  335,  336,  338,  332,  333,  337,  340,  343,  344,
+      338,  336,  345,  347,  340,  331,  346,  334,  348,  350,
+      335,  343,  344,  337,  349,  346,  351,  352,  347,  345,
+      353,  355,  361,  360,  356,  348,  357,  359,  358,  353,
+      349,  356,  350,  351,  362,  357,  352,  358,  355,  364,
 
-      355,  361,  363,  356,  365,  364,  366,  369,  367,  357,
-      361,  365,  368,  359,  364,  366,  360,  367,  370,  363,
-      369,  368,  371,  372,  373,  374,  377,  376,  378,  380,
-      384,  387,  395,  382,  373,  383,  370,  378,  372,  376,
-      382,  384,  385,  383,  374,  371,  386,  388,  380,  377,
-      390,  386,  391,  393,  387,  385,  398,  396,  394,  399,
-      395,  400,  404,  390,  388,  394,  396,  403,  409,  408,
-      393,  403,  403,  412,  413,  391,  408,  399,  398,  400,
-      415,  414,  412,  413,  409,  404,  414,  417,  422,  423,
-      424,  426,  427,  433,  417,  436,  437,  440,  439,  442,
+      359,  360,  363,  366,  367,  361,  370,  368,  375,  362,
+      372,  373,  363,  374,  377,  366,  368,  372,  364,  373,
+      380,  375,  378,  376,  374,  370,  381,  367,  376,  383,
+      385,  384,  386,  380,  388,  389,  390,  377,  384,  378,
+      392,  386,  393,  397,  392,  392,  383,  398,  401,  381,
+      397,  402,  404,  389,  390,  406,  388,  401,  385,  403,
+      402,  410,  406,  398,  403,  393,  411,  413,  420,  414,
+      423,  424,  427,  425,  426,  404,  413,  429,  410,  414,
+      420,  425,  434,  411,  431,  423,  435,  426,  438,  427,
+      437,  441,  440,  424,  442,  443,  444,  438,  446,  448,
 
-      426,  444,  427,  415,  438,  433,  423,  424,  447,  422,
-      436,  439,  438,  448,  440,  449,  450,  451,  437,  444,
-      454,  453,  442,  455,  456,  457,  451,  458,  459,  447,
-      453,  450,  460,  462,  448,  463,  458,  454,  455,  456,
-      464,  449,  465,  466,  463,  464,  457,  467,  468,  469,
-      459,  465,  471,  474,  467,  460,  472,  473,  462,  476,
-      469,  477,  474,  478,  479,  486,  466,  526,  483,  493,
-      501,  468,  486,  479,  476,  485,  471,  487,  477,  472,
-      473,  483,  489,  487,  485,  490,  478,  491,  496,  489,
-      490,  498,  493,  496,  497,  500,  499,  502,  503,  501,
+      429,  440,  431,  434,  445,  437,  449,  435,  441,  442,
+      443,  450,  452,  445,  451,  449,  450,  444,  453,  454,
+      455,  446,  457,  451,  448,  453,  458,  459,  460,  462,
+      463,  455,  464,  471,  465,  452,  470,  460,  478,  483,
+      471,  525,  454,  465,  462,  470,  457,  463,  472,  458,
+      459,  474,  475,  476,  472,  464,  482,  475,  474,  481,
+      485,  478,  483,  484,  481,  482,  476,  486,  484,  487,
+      488,  490,  489,  491,  486,  493,  485,  489,  491,  494,
+      495,  496,  497,  498,  500,  488,  490,  501,  502,  493,
+      503,  497,  487,  500,  506,  494,  507,  508,  505,  495,
 
-      491,  499,  504,  497,  502,  505,  509,  506,  507,  510,
-      505,  500,  511,  507,  498,  512,  515,  504,  513,  514,
-      509,  503,  506,  517,  522,  510,  518,  513,  514,  519,
-      520,  511,  517,  522,  523,  524,  525,  527,  512,  515,
-      530,  518,  533,  529,  519,  520,  531,  530,  524,  532,
-      534,  535,  536,  525,  537,  527,  539,  523,  529,  531,
-      538,  537,  542,  533,  540,  545,  532,  538,  534,  547,
-      551,  521,  545,  536,  535,  516,  508,  495,  547,  542,
-      494,  492,  488,  484,  482,  539,  481,  540,  480,  475,
-      470,  551,  554,  554,  554,  554,  555,  555,  557,  461,
+      509,  511,  501,  502,  496,  503,  498,  505,  512,  507,
+      513,  514,  515,  516,  508,  512,  511,  506,  509,  517,
+      518,  521,  519,  513,  522,  520,  524,  527,  514,  519,
+      529,  516,  520,  515,  527,  533,  523,  510,  504,  529,
+      499,  518,  517,  524,  492,  480,  479,  522,  477,  473,
+      521,  469,  468,  467,  466,  461,  533,  536,  536,  536,
+      536,  537,  537,  539,  456,  539,  539,  447,  439,  433,
+      432,  430,  428,  422,  421,  419,  418,  417,  416,  415,
+      412,  409,  408,  407,  405,  400,  399,  396,  395,  394,
+      391,  387,  382,  379,  371,  369,  365,  354,  342,  341,
 
-      557,  557,  452,  446,  445,  443,  441,  435,  434,  432,
-      431,  430,  429,  428,  425,  421,  420,  419,  418,  416,
-      411,  410,  407,  406,  405,  402,  401,  397,  392,  389,
-      381,  379,  375,  362,  350,  349,  347,  332,  329,  327,
-      324,  322,  320,  315,  314,  312,  309,  306,  302,  299,
-      294,  291,  290,  281,  277,  276,  271,  270,  254,  251,
-      239,  230,  229,  227,  226,  224,  223,  222,  214,  211,
-      210,  206,  205,  204,  198,  195,  194,  192,  191,  190,
-      189,  188,  187,  185,  150,  147,  145,  142,  139,  135,
-      131,  115,   91,   69,   59,   40,   38,    8,    7,    3,
+      339,  325,  322,  320,  317,  315,  313,  308,  307,  305,
+      302,  299,  295,  292,  288,  285,  284,  276,  272,  271,
+      266,  265,  250,  247,  235,  226,  225,  223,  222,  220,
+      219,  218,  210,  207,  206,  202,  201,  200,  194,  192,
+      191,  189,  188,  187,  186,  185,  184,  182,  158,  148,
+      144,  141,  138,  134,  130,  114,   91,   69,   59,   40,
+       38,    8,    7,    3,  535,  535,  535,  535,  535,  535,
+      535,  535,  535,  535,  535,  535,  535,  535,  535,  535,
+      535,  535,  535,  535,  535,  535,  535,  535,  535,  535,
+      535,  535,  535,  535,  535,  535,  535,  535,  535,  535,
 
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553
+      535,  535,  535,  535,  535,  535,  535,  535
     } ;
 
 static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
@@ -879,7 +859,7 @@
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 1 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 #define INITIAL 0
 /*===-- Lexer.l - Scanner for llvm assembly files --------------*- C++ -*--===//
 //
@@ -894,7 +874,7 @@
 //
 //===----------------------------------------------------------------------===*/
 #define YY_NEVER_INTERACTIVE 1
-#line 28 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 28 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 #include "ParserInternals.h"
 #include "llvm/Module.h"
 #include <list>
@@ -1027,7 +1007,7 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 1031 "Lexer.cpp"
+#line 1007 "Lexer.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1175,13 +1155,13 @@
 YY_DECL
 	{
 	register yy_state_type yy_current_state;
-	register char *yy_cp = NULL, *yy_bp = NULL;
+	register char *yy_cp, *yy_bp;
 	register int yy_act;
 
-#line 188 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 188 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 
 
-#line 1185 "Lexer.cpp"
+#line 1161 "Lexer.cpp"
 
 	if ( yy_init )
 		{
@@ -1229,14 +1209,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 >= 554 )
+				if ( yy_current_state >= 536 )
 					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 != 553 );
+		while ( yy_current_state != 535 );
 
 yy_find_action:
 		yy_current_state = *--yy_state_ptr;
@@ -1274,267 +1254,247 @@
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 190 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 190 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { /* Ignore comments for now */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 192 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 192 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return BEGINTOK; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 193 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 193 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return ENDTOK; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 194 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 194 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return TRUETOK;  }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 195 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 195 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return FALSETOK; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 196 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 196 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return DECLARE; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 197 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 197 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return DEFINE; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 198 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 198 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return GLOBAL; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 199 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 199 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return CONSTANT; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 200 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 200 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return INTERNAL; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 201 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 201 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return LINKONCE; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 202 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 202 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return WEAK; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 203 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 203 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return APPENDING; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 204 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 204 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return DLLIMPORT; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 205 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 205 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return DLLEXPORT; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 206 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 206 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return HIDDEN; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 207 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 207 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return EXTERN_WEAK; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 208 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 208 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return EXTERNAL; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 209 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 209 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return IMPLEMENTATION; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 210 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 210 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return ZEROINITIALIZER; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 211 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 211 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return DOTDOTDOT; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 212 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 212 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return UNDEF; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 213 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 213 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return NULL_TOK; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 214 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 214 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return TO; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 215 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 215 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return TAIL; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 216 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 216 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return TARGET; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 217 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 217 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return TRIPLE; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 218 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 218 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return DEPLIBS; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 219 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return ENDIAN; }
+#line 219 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return DATALAYOUT; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 220 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return POINTERSIZE; }
+#line 220 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return VOLATILE; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 221 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return DATALAYOUT; }
+#line 221 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return ALIGN;  }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 222 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return LITTLE; }
+#line 222 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return SECTION; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 223 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return BIG; }
+#line 223 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return MODULE; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 224 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return VOLATILE; }
+#line 224 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return ASM_TOK; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 225 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return ALIGN;  }
+#line 225 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return SIDEEFFECT; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 226 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return SECTION; }
+#line 227 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return CC_TOK; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 227 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return MODULE; }
+#line 228 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return CCC_TOK; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 228 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return ASM_TOK; }
+#line 229 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return CSRETCC_TOK; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 229 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return SIDEEFFECT; }
+#line 230 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return FASTCC_TOK; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 231 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return CC_TOK; }
+#line 231 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return COLDCC_TOK; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 232 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return CCC_TOK; }
+#line 232 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return X86_STDCALLCC_TOK; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 233 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return CSRETCC_TOK; }
+#line 233 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return X86_FASTCALLCC_TOK; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 234 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return FASTCC_TOK; }
+#line 235 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::VoidTy,  VOID);  }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 235 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return COLDCC_TOK; }
+#line 236 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::FloatTy, FLOAT); }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 236 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return X86_STDCALLCC_TOK; }
+#line 237 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::DoubleTy,DOUBLE);}
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 237 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return X86_FASTCALLCC_TOK; }
+#line 238 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::LabelTy, LABEL); }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 239 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::VoidTy,  VOID);  }
+#line 239 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return TYPE;   }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 240 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::FloatTy, FLOAT); }
+#line 240 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return OPAQUE; }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 241 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::DoubleTy,DOUBLE);}
-	YY_BREAK
-case 50:
-YY_RULE_SETUP
-#line 242 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::LabelTy, LABEL); }
-	YY_BREAK
-case 51:
-YY_RULE_SETUP
-#line 243 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return TYPE;   }
-	YY_BREAK
-case 52:
-YY_RULE_SETUP
-#line 244 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return OPAQUE; }
-	YY_BREAK
-case 53:
-YY_RULE_SETUP
-#line 245 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 241 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { uint64_t NumBits = atoull(yytext+1);
                   if (NumBits < IntegerType::MIN_INT_BITS || 
                       NumBits > IntegerType::MAX_INT_BITS)
@@ -1543,358 +1503,358 @@
                   RET_TY(Ty, INTTYPE);
                 }
 	YY_BREAK
+case 50:
+YY_RULE_SETUP
+#line 249 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Add, ADD); }
+	YY_BREAK
+case 51:
+YY_RULE_SETUP
+#line 250 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Sub, SUB); }
+	YY_BREAK
+case 52:
+YY_RULE_SETUP
+#line 251 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Mul, MUL); }
+	YY_BREAK
+case 53:
+YY_RULE_SETUP
+#line 252 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, UDiv, UDIV); }
+	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 253 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Add, ADD); }
+#line 253 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SDiv, SDIV); }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 254 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Sub, SUB); }
+#line 254 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, FDiv, FDIV); }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 255 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Mul, MUL); }
+#line 255 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, URem, UREM); }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 256 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, UDiv, UDIV); }
+#line 256 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SRem, SREM); }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 257 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SDiv, SDIV); }
+#line 257 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, FRem, FREM); }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 258 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, FDiv, FDIV); }
+#line 258 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, And, AND); }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 259 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, URem, UREM); }
+#line 259 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Or , OR ); }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 260 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SRem, SREM); }
+#line 260 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Xor, XOR); }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 261 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, FRem, FREM); }
+#line 261 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal,  ICmp,  ICMP); }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 262 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, And, AND); }
+#line 262 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal,  FCmp,  FCMP); }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 263 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Or , OR ); }
+#line 263 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return EQ;  }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 264 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Xor, XOR); }
+#line 264 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return NE;  }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 265 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal,  ICmp,  ICMP); }
+#line 265 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return SLT; }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 266 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal,  FCmp,  FCMP); }
+#line 266 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return SGT; }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 267 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return EQ;  }
+#line 267 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return SLE; }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 268 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return NE;  }
+#line 268 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return SGE; }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 269 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return SLT; }
+#line 269 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return ULT; }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 270 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return SGT; }
+#line 270 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return UGT; }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 271 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return SLE; }
+#line 271 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return ULE; }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 272 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return SGE; }
+#line 272 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return UGE; }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 273 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return ULT; }
+#line 273 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return OEQ; }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 274 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return UGT; }
+#line 274 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return ONE; }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 275 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return ULE; }
+#line 275 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return OLT; }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 276 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return UGE; }
+#line 276 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return OGT; }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 277 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return OEQ; }
+#line 277 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return OLE; }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 278 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return ONE; }
+#line 278 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return OGE; }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 279 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return OLT; }
+#line 279 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return ORD; }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 280 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return OGT; }
+#line 280 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return UNO; }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 281 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return OLE; }
+#line 281 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return UEQ; }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 282 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return OGE; }
+#line 282 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return UNE; }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 283 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return ORD; }
+#line 284 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, PHI, PHI_TOK); }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 284 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return UNO; }
+#line 285 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Call, CALL); }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 285 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return UEQ; }
+#line 286 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, Trunc, TRUNC); }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 286 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return UNE; }
+#line 287 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, ZExt, ZEXT); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 288 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, PHI, PHI_TOK); }
+#line 288 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, SExt, SEXT); }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 289 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Call, CALL); }
+#line 289 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPTrunc, FPTRUNC); }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 290 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, Trunc, TRUNC); }
+#line 290 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPExt, FPEXT); }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 291 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, ZExt, ZEXT); }
+#line 291 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, UIToFP, UITOFP); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 292 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, SExt, SEXT); }
+#line 292 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, SIToFP, SITOFP); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 293 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPTrunc, FPTRUNC); }
+#line 293 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPToUI, FPTOUI); }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 294 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPExt, FPEXT); }
+#line 294 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPToSI, FPTOSI); }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 295 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, UIToFP, UITOFP); }
+#line 295 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, IntToPtr, INTTOPTR); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 296 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, SIToFP, SITOFP); }
+#line 296 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, PtrToInt, PTRTOINT); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 297 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPToUI, FPTOUI); }
+#line 297 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, BitCast, BITCAST); }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 298 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPToSI, FPTOSI); }
+#line 298 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Select, SELECT); }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 299 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, IntToPtr, INTTOPTR); }
+#line 299 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Shl, SHL); }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 300 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, PtrToInt, PTRTOINT); }
+#line 300 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, LShr, LSHR); }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 301 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, BitCast, BITCAST); }
+#line 301 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, AShr, ASHR); }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 302 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Select, SELECT); }
+#line 302 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, VAArg , VAARG); }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 303 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Shl, SHL); }
+#line 303 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Ret, RET); }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 304 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, LShr, LSHR); }
+#line 304 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Br, BR); }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 305 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, AShr, ASHR); }
+#line 305 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Switch, SWITCH); }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 306 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, VAArg , VAARG); }
+#line 306 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Invoke, INVOKE); }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 307 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Ret, RET); }
+#line 307 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 308 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Br, BR); }
+#line 308 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 309 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Switch, SWITCH); }
+#line 310 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Malloc, MALLOC); }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 310 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Invoke, INVOKE); }
+#line 311 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 311 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unwind, UNWIND); }
+#line 312 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Free, FREE); }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 312 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
+#line 313 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Load, LOAD); }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 314 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Malloc, MALLOC); }
+#line 314 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Store, STORE); }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 315 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
+#line 315 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 316 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Free, FREE); }
+#line 317 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 317 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Load, LOAD); }
+#line 318 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 318 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Store, STORE); }
+#line 319 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 319 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
-	YY_BREAK
-case 119:
-YY_RULE_SETUP
-#line 321 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
-	YY_BREAK
-case 120:
-YY_RULE_SETUP
-#line 322 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
-	YY_BREAK
-case 121:
-YY_RULE_SETUP
-#line 323 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
-	YY_BREAK
-case 122:
-YY_RULE_SETUP
-#line 326 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 322 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 {
                   UnEscapeLexed(yytext+1);
                   llvmAsmlval.StrVal = strdup(yytext+1);             // Skip %
                   return VAR_ID;
                 }
 	YY_BREAK
-case 123:
+case 119:
 YY_RULE_SETUP
-#line 331 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 327 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 {
                   yytext[strlen(yytext)-1] = 0;  // nuke colon
                   UnEscapeLexed(yytext);
@@ -1902,9 +1862,9 @@
                   return LABELSTR;
                 }
 	YY_BREAK
-case 124:
+case 120:
 YY_RULE_SETUP
-#line 337 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 333 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 {
                   yytext[strlen(yytext)-2] = 0;  // nuke colon, end quote
                   UnEscapeLexed(yytext+1);
@@ -1912,9 +1872,9 @@
                   return LABELSTR;
                 }
 	YY_BREAK
-case 125:
+case 121:
 YY_RULE_SETUP
-#line 344 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 340 "/Users/resistor/llvm/src/llvm/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
@@ -1925,14 +1885,14 @@
                    return STRINGCONSTANT;
                  }
 	YY_BREAK
-case 126:
+case 122:
 YY_RULE_SETUP
-#line 355 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 351 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.UInt64Val = atoull(yytext); return EUINT64VAL; }
 	YY_BREAK
-case 127:
+case 123:
 YY_RULE_SETUP
-#line 356 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 352 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   // +1:  we have bigger negative range
@@ -1942,17 +1902,17 @@
                   return ESINT64VAL;
                 }
 	YY_BREAK
-case 128:
+case 124:
 YY_RULE_SETUP
-#line 364 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 360 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 {
                    llvmAsmlval.UInt64Val = HexIntToVal(yytext+3);
                    return yytext[0] == 's' ? ESINT64VAL : EUINT64VAL;
                  }
 	YY_BREAK
-case 129:
+case 125:
 YY_RULE_SETUP
-#line 369 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 365 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   if ((unsigned)Val != Val)
@@ -1961,9 +1921,9 @@
                   return UINTVAL;
                 }
 	YY_BREAK
-case 130:
+case 126:
 YY_RULE_SETUP
-#line 376 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 372 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+2);
                   // +1:  we have bigger negative range
@@ -1973,18 +1933,18 @@
                   return SINTVAL;
                 }
 	YY_BREAK
-case 131:
+case 127:
 YY_RULE_SETUP
-#line 385 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 381 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = atof(yytext); return FPVAL; }
 	YY_BREAK
-case 132:
+case 128:
 YY_RULE_SETUP
-#line 386 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 382 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = HexToFP(yytext); return FPVAL; }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 388 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 384 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
@@ -1993,22 +1953,22 @@
                   return EOF;
                 }
 	YY_BREAK
-case 133:
+case 129:
 YY_RULE_SETUP
-#line 396 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 392 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { /* Ignore whitespace */ }
 	YY_BREAK
-case 134:
+case 130:
 YY_RULE_SETUP
-#line 397 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 393 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return yytext[0]; }
 	YY_BREAK
-case 135:
+case 131:
 YY_RULE_SETUP
-#line 399 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 395 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2012 "Lexer.cpp"
+#line 1968 "Lexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2295,7 +2255,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 >= 554 )
+			if ( yy_current_state >= 536 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2325,11 +2285,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 >= 554 )
+		if ( yy_current_state >= 536 )
 			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 == 553);
+	yy_is_jam = (yy_current_state == 535);
 	if ( ! yy_is_jam )
 		*yy_state_ptr++ = yy_current_state;
 
@@ -2384,7 +2344,6 @@
 #endif	/* ifndef YY_NO_UNPUT */
 
 
-#ifndef YY_NO_INPUT
 #ifdef __cplusplus
 static int yyinput()
 #else
@@ -2458,7 +2417,7 @@
 
 	return c;
 	}
-#endif /* YY_NO_INPUT */
+
 
 #ifdef YY_USE_PROTOS
 void yyrestart( FILE *input_file )
@@ -2569,6 +2528,11 @@
 	}
 
 
+#ifndef YY_ALWAYS_INTERACTIVE
+#ifndef YY_NEVER_INTERACTIVE
+extern int isatty YY_PROTO(( int ));
+#endif
+#endif
 
 #ifdef YY_USE_PROTOS
 void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
@@ -2886,5 +2850,5 @@
 	return 0;
 	}
 #endif
-#line 399 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 395 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"