For PR786:
Turn on -Wunused and -Wno-unused-parameter. Clean up most of the resulting
fall out by removing unused variables. Remaining warnings have to do with
unused functions (I didn't want to delete code without review) and unused
variables in generated code. Maintainers should clean up the remaining
issues when they see them. All changes pass DejaGnu tests and Olden.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@31380 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AsmParser/Lexer.cpp.cvs b/lib/AsmParser/Lexer.cpp.cvs
index 5791e2b..d11bfa0 100644
--- a/lib/AsmParser/Lexer.cpp.cvs
+++ b/lib/AsmParser/Lexer.cpp.cvs
@@ -17,7 +17,7 @@
 #define yylineno llvmAsmlineno
 
 #line 20 "Lexer.cpp"
-/* A lexical scanner generated by flex */
+/* A lexical scanner generated by flex*/
 
 /* Scanner skeleton version:
  * $Header$
@@ -28,6 +28,7 @@
 #define YY_FLEX_MINOR_VERSION 5
 
 #include <stdio.h>
+#include <unistd.h>
 
 
 /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
@@ -41,7 +42,6 @@
 #ifdef __cplusplus
 
 #include <stdlib.h>
-#include <unistd.h>
 
 /* Use prototypes in function declarations. */
 #define YY_USE_PROTOS
@@ -153,6 +153,15 @@
 
 #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).
@@ -259,7 +268,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 ));
+static inline void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) YY_MAY_BE_UNUSED;
 static void yy_flex_free YY_PROTO(( void * ));
 
 #define yy_new_buffer yy_create_buffer
@@ -308,35 +317,35 @@
 	*yy_cp = '\0'; \
 	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 114
-#define YY_END_OF_BUFFER 115
-static yyconst short int yy_acclist[192] =
+#define YY_NUM_RULES 120
+#define YY_END_OF_BUFFER 121
+static yyconst short int yy_acclist[198] =
     {   0,
-      115,  113,  114,  112,  113,  114,  112,  114,  113,  114,
-      113,  114,  113,  114,  113,  114,  113,  114,  113,  114,
-      105,  113,  114,  105,  113,  114,    1,  113,  114,  113,
-      114,  113,  114,  113,  114,  113,  114,  113,  114,  113,
-      114,  113,  114,  113,  114,  113,  114,  113,  114,  113,
-      114,  113,  114,  113,  114,  113,  114,  113,  114,  113,
-      114,  113,  114,  113,  114,  113,  114,  113,  114,  113,
-      114,  104,  102,  101,  101,  108,  106,  110,  105,    1,
-       87,   41,   69,   23,  104,  101,  101,  109,  110,   20,
-      110,  111,   63,   68,   39,   34,   42,   66,    3,   54,
+      121,  119,  120,  118,  119,  120,  118,  120,  119,  120,
+      119,  120,  119,  120,  119,  120,  119,  120,  119,  120,
+      111,  119,  120,  111,  119,  120,    1,  119,  120,  119,
+      120,  119,  120,  119,  120,  119,  120,  119,  120,  119,
+      120,  119,  120,  119,  120,  119,  120,  119,  120,  119,
+      120,  119,  120,  119,  120,  119,  120,  119,  120,  119,
+      120,  119,  120,  119,  120,  119,  120,  119,  120,  119,
+      120,  110,  108,  107,  107,  114,  112,  116,  111,    1,
+       93,   41,   75,   23,  110,  107,  107,  115,  116,   20,
+      116,  117,   63,   74,   39,   34,   42,   66,    3,   54,
 
-       65,   25,   77,   67,   86,   81,   82,   64,   70,  103,
-      110,  110,   49,   78,   79,   94,   95,   56,   22,  107,
-       26,    4,   61,   55,   48,   11,  110,   36,    2,    5,
-       58,   60,   50,   72,   76,   74,   75,   73,   71,   52,
-       96,   51,   57,   21,   84,   93,   45,   59,   30,   24,
-       44,    7,   89,   33,   92,   38,   62,   80,   88,   27,
-       28,   90,   53,   85,   83,   43,    6,   29,   37,    8,
-       17,    9,   10,   35,   12,   14,   13,   32,   40,   15,
-       31,   91,   97,   99,  100,   16,   46,   98,   18,   47,
-       19
+       65,   25,   83,   70,   92,   87,   88,   64,   76,  109,
+      116,  116,   49,   84,   85,   69,  100,   73,  101,   56,
+       22,  113,   68,   72,   26,    4,   61,   67,   55,   71,
+       48,   11,  116,   36,    2,    5,   58,   60,   50,   78,
+       82,   80,   81,   79,   77,   52,  102,   51,   57,   21,
+       90,   99,   45,   59,   30,   24,   44,    7,   95,   33,
+       98,   38,   62,   86,   94,   27,   28,   96,   53,   91,
+       89,   43,    6,   29,   37,    8,   17,    9,   10,   35,
+       12,   14,   13,   32,   40,   15,   31,   97,  103,  105,
+      106,   16,   46,  104,   18,   47,   19
 
     } ;
 
-static yyconst short int yy_accept[511] =
+static yyconst short int yy_accept[527] =
     {   0,
         1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
        17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
@@ -346,54 +355,56 @@
        81,   81,   81,   81,   81,   81,   81,   81,   81,   82,
        82,   83,   83,   83,   83,   83,   83,   83,   83,   83,
        83,   83,   83,   83,   83,   83,   83,   83,   83,   83,
-       83,   83,   83,   83,   83,   83,   83,   84,   84,   84,
+       83,   83,   83,   83,   83,   83,   83,   83,   84,   84,
        84,   84,   84,   84,   84,   84,   84,   84,   84,   84,
 
-       85,   85,   85,   85,   85,   85,   85,   85,   85,   85,
-       85,   85,   85,   85,   86,   87,   89,   90,   91,   92,
-       92,   93,   94,   94,   94,   95,   95,   96,   96,   97,
-       97,   97,   97,   98,   98,   98,   98,   98,   98,   98,
-       99,   99,   99,  100,  100,  100,  100,  100,  100,  100,
-      100,  100,  100,  100,  101,  101,  101,  101,  101,  101,
-      101,  101,  101,  102,  103,  103,  103,  104,  104,  105,
-      106,  106,  106,  106,  106,  106,  107,  107,  108,  108,
-      108,  108,  109,  109,  109,  109,  109,  109,  109,  109,
+       84,   84,   84,   85,   85,   85,   85,   85,   85,   85,
+       85,   85,   85,   85,   85,   85,   85,   85,   85,   86,
+       87,   89,   90,   91,   92,   92,   93,   94,   94,   94,
+       95,   95,   96,   96,   97,   97,   97,   97,   98,   98,
+       98,   98,   98,   98,   98,   99,   99,   99,  100,  100,
+      100,  100,  100,  100,  100,  100,  100,  100,  100,  100,
+      101,  101,  101,  101,  101,  101,  101,  101,  101,  102,
+      103,  103,  103,  104,  104,  105,  106,  106,  106,  106,
+      106,  106,  106,  107,  107,  108,  108,  108,  108,  108,
       109,  109,  109,  109,  109,  109,  109,  109,  109,  109,
 
+      109,  109,  109,  109,  109,  109,  109,  109,  109,  109,
       109,  109,  109,  109,  110,  110,  111,  112,  112,  112,
       112,  113,  113,  113,  113,  113,  114,  115,  116,  116,
       116,  116,  116,  116,  116,  116,  116,  116,  116,  116,
-      116,  116,  116,  116,  116,  117,  117,  117,  117,  117,
-      117,  117,  117,  117,  117,  118,  119,  119,  119,  120,
-      120,  120,  121,  121,  121,  121,  121,  121,  121,  121,
-      121,  121,  121,  121,  121,  122,  122,  122,  123,  124,
-      124,  125,  125,  125,  125,  125,  125,  125,  125,  125,
-      125,  126,  126,  127,  127,  127,  128,  129,  129,  129,
-      130,  130,  130,  130,  130,  130,  130,  130,  130,  130,
+      116,  116,  116,  116,  117,  117,  118,  119,  119,  119,
+      119,  119,  119,  119,  119,  119,  119,  120,  121,  121,
+      121,  122,  122,  122,  123,  123,  124,  124,  124,  124,
+      124,  124,  124,  124,  124,  124,  125,  125,  125,  126,
+      126,  126,  127,  128,  128,  129,  130,  130,  130,  130,
+      130,  130,  131,  131,  131,  131,  131,  132,  132,  133,
 
-      130,  130,  130,  130,  131,  131,  132,  132,  132,  132,
-      132,  132,  132,  133,  133,  133,  133,  133,  133,  133,
-      134,  134,  134,  135,  136,  137,  138,  139,  140,  141,
-      141,  141,  142,  142,  142,  142,  143,  144,  145,  145,
-      145,  145,  145,  145,  146,  146,  146,  146,  146,  146,
-      147,  147,  148,  148,  148,  148,  148,  148,  148,  148,
-      149,  150,  151,  151,  151,  152,  152,  153,  153,  153,
-      153,  154,  154,  155,  156,  157,  158,  158,  158,  159,
-      159,  159,  160,  161,  162,  162,  162,  163,  164,  165,
-      166,  166,  166,  166,  166,  166,  166,  167,  167,  168,
+      133,  133,  134,  135,  135,  135,  136,  136,  136,  136,
+      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
+      137,  137,  138,  138,  138,  138,  138,  138,  138,  139,
+      139,  139,  139,  139,  139,  139,  140,  140,  140,  141,
+      142,  143,  144,  145,  146,  147,  147,  147,  148,  148,
+      148,  148,  149,  150,  151,  151,  151,  151,  151,  151,
+      152,  152,  152,  152,  152,  152,  153,  153,  154,  154,
+      154,  154,  154,  154,  154,  154,  155,  156,  157,  157,
+      157,  158,  158,  159,  159,  159,  159,  160,  160,  161,
+      162,  163,  164,  164,  164,  165,  165,  165,  166,  167,
 
-      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
-      169,  169,  170,  170,  170,  170,  170,  170,  170,  170,
-      170,  170,  171,  171,  171,  171,  171,  172,  172,  172,
-      172,  172,  173,  174,  174,  174,  174,  174,  174,  175,
-      175,  175,  175,  176,  176,  177,  178,  178,  178,  178,
-      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
-      179,  179,  179,  179,  179,  179,  179,  179,  180,  180,
-      180,  180,  180,  180,  181,  181,  181,  181,  181,  182,
-      182,  182,  183,  183,  183,  183,  183,  183,  183,  183,
-      183,  183,  183,  183,  183,  183,  184,  184,  185,  186,
+      168,  168,  168,  169,  170,  171,  172,  172,  172,  172,
+      172,  172,  172,  173,  173,  174,  175,  175,  175,  175,
+      175,  175,  175,  175,  175,  175,  175,  175,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  177,  177,
+      177,  177,  177,  178,  178,  178,  178,  178,  179,  180,
+      180,  180,  180,  180,  180,  181,  181,  181,  181,  182,
+      182,  183,  184,  184,  184,  184,  184,  184,  184,  184,
+      184,  184,  184,  184,  184,  184,  185,  185,  185,  185,
+      185,  185,  185,  185,  186,  186,  186,  186,  186,  186,
+      187,  187,  187,  187,  187,  188,  188,  188,  189,  189,
 
-      187,  187,  188,  188,  189,  190,  191,  191,  192,  192
+      189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
+      189,  189,  190,  190,  191,  192,  193,  193,  194,  194,
+      195,  196,  197,  197,  198,  198
     } ;
 
 static yyconst int yy_ec[256] =
@@ -437,260 +448,265 @@
         3,    3,    3
     } ;
 
-static yyconst short int yy_base[515] =
+static yyconst short int yy_base[531] =
     {   0,
-        0,    0, 1108, 1109, 1109, 1109, 1103, 1092,   36,   40,
+        0,    0, 1140, 1141, 1141, 1141, 1135, 1124,   36,   40,
        44,   50,   56,   62,    0,   63,   66,   81,   89,   47,
-       90,   91,   76,   96,  108,   49,   97,  110,   68,  137,
-      120,  168,  112,  115,  135,  127, 1101, 1109, 1090, 1109,
-        0,  158,  173,  180,  196,   70,  201,  216,  221,    0,
-      121,  152,  123,  139,  166,  140,  162,  184, 1089,  222,
-      180,   31,  186,  119,  232,  208,  144,  225,  234,  236,
-      235,  188,  238,  240,  246,  241,  245,  203,  248,  256,
-      254,  258,  262,  252,  272,  274, 1088,  276,  278,  280,
-      255,  253,  283,  284,  285,  286,  288,  297,  300, 1087,
+      100,   97,   76,   96,  111,   49,  113,  110,   68,  140,
+      126,  171,  119,  118,  139,  133, 1133, 1141, 1122, 1141,
+        0,  176,  184,  199,  204,   70,  209,  224,  229,    0,
+      117,  130,  150,   72,  160,  151,  159,  123, 1121,  230,
+      178,   31,   69,  168,  240,   95,  233,  165,  241,  243,
+      242,  156,  244,  246,  187,  251,  253,  254,  211,  258,
+      256,  263,  260,  265,  190,  267,  283, 1120,  271,  274,
+      270,  285,  289,  290,  291,  292,  294,  295,  297,  299,
 
-      301,  292,  295,  307,  309,  318,  316,  315,  322,  312,
-      147,  329,  330, 1086,    0,  344,  349, 1085,  363,  380,
-        0, 1084,  338,  336, 1083,  355, 1082,  356, 1081,  353,
-      367,  334, 1080,  375,  365,  381,  384,  370,  371, 1079,
-      388,  392,  391,  393,  394,  395,  396,  400,  399,  407,
-      406,  409,  411,  413,  410,  414,  418,  421,  425,  426,
-      427,  429, 1078, 1077,  430,  431, 1076,  435, 1075, 1074,
-      458,  436,  439,  434,  469, 1073,  449, 1072,  438,  441,
-      458, 1071,  471,  472,  474,  473,  481,  482,  475,  476,
-      483,  488,  489,  493,  495,  496,  504,  501,  503,  505,
+      296,  308, 1119,  311,  300,  318,  320,  322,  323,  330,
+      325,  328,  327,  337,  342,  216,  336,  345, 1118,    0,
+      362,  366, 1117,  380,  397,    0, 1116,  370,  349, 1115,
+      373, 1114,  355, 1113,  371,  372,  384, 1112,  392,  326,
+      399,  398,  401,  402, 1111,  405,  404,  406,  411,  412,
+      409,  413,  415,  422,  423,  425,  424,  426,  428,  429,
+      435,  442,  374,  443,  444,  445,  446,  447, 1110, 1109,
+      448,  449, 1108,  450, 1107, 1106,  476,  454,  455,  464,
+      459,  488, 1105,  470, 1104,  490,  489,  460,  492, 1103,
+      493,  494,  495,  496,  501,  502,  504,  507,  508,  512,
 
-      510,  507,  516, 1070,  511, 1109,  527,  541,  545,  549,
-      554,  555,  440,  556,  557, 1069, 1068, 1067,  558,  559,
-      560,  517,  528,  518,  561,  189,  562,  563,  566,  569,
-      570,  567,  564,  578, 1066,  579,  581,  580,  584,  587,
-      592,  595,  591,  596, 1065, 1064,  597,  598, 1063,  593,
-      599,    0,  603,  607,  614,  604,  616,  618,  619,  600,
-      626,  629,  631,  630, 1062,  633,  632, 1061, 1060,  634,
-     1059,  635,  644,  645,  648,  649,  650,  651,  652,  655,
-     1058,  656, 1057,  659,  657,  677, 1056,  660,  519, 1055,
-      661,  662,  677,  678,  664,  680,  687,  688,  689,  691,
+      514,  517,  519,  520,  521,  518,  457,  522,  526,  530,
+      539,  540,  541, 1102,  524, 1141,  550,  564,  568,  572,
+      577,  578,  458,  579,  580, 1101, 1100, 1099,  581,  582,
+      583,  584,  550,  585,  525,  586,  589,  551,  590,  587,
+      607,  591,  594, 1098,  592, 1097, 1096,  603,  611,  610,
+      593,  613,  617,  620,  621,  622, 1095, 1094,  623,  625,
+     1093,  624,  626,    0,  627, 1092,  629,  638,  630,  643,
+      644,  646,  628,  647,  654, 1091,  656,  661, 1090,  660,
+      658, 1089, 1088,  662, 1087, 1086,  659,  664,  672,  675,
+      676, 1085,  677,  678,  679,  681, 1084,  682, 1083,  684,
 
-      690,  692,  693, 1054,  694, 1053,  695,  696,  699,  697,
-      702,  703, 1052,  705,  714,  710,  716,  718,  721, 1051,
-      724,  726, 1050, 1049, 1048, 1047, 1046, 1045, 1044,  728,
-      729, 1043,  732,  731,  736, 1042, 1041, 1040,  733,  734,
-      738,  735,  737, 1039,  740,  747,  750,  751,  752, 1038,
-      753, 1037,  759,  757,  761,  762,  765,  767,  768, 1036,
-     1035, 1034,  773,  770, 1033,  772, 1032,  775,  781,  791,
-     1031,  792, 1030, 1029, 1028, 1027,  779,  780, 1026,  794,
-      795, 1025, 1024, 1023,  798,  801, 1022, 1021, 1020, 1019,
-      802,  782,  806,  807,  808,  809, 1018,  810, 1017, 1016,
+      683,  690, 1082,  692,  695, 1081,  700,  704,  710,  711,
+      691,  713,  701,  702,  714,  715,  718,  722,  724, 1080,
+      726, 1079,  725,  727,  728,  729,  730,  736, 1078,  737,
+      740,  743,  746,  748,  751, 1077,  735,  738, 1076, 1075,
+     1074, 1073, 1072, 1071, 1070,  756,  758, 1069,  762,  759,
+      763, 1068, 1067, 1066,  764,  766,  767,  765,  769, 1065,
+      770,  776,  778,  777,  779, 1064,  781, 1063,  784,  785,
+      786,  790,  791,  797,  798, 1062, 1061, 1060,  802,  795,
+     1059,  803, 1058,  808,  811,  804, 1057,  805, 1056, 1055,
+     1054, 1053,  810,  821, 1052,  823,  824, 1051, 1050, 1049,
 
-      812,  815,  816,  819,  818,  821,  822,  823,  826,  831,
-      824, 1015,  829,  835,  843,  845,  847,  837,  851,  849,
-      852, 1014,  853,  855,  857,  859, 1013,  861,  862,  864,
-      865, 1012, 1011,  869,  866,  881,  870,  867, 1010,  883,
-      884,  886, 1007,  871,  998,  997,  891,  892,  893,  895,
-      897,  898,  902,  903,  904,  905,  906,  907,  910,  995,
-      914,  908,  912,  918,  921,  923,  919,  994,  925,  929,
-      933,  934,  935,  992,  936,  937,  939,  940,  990,  943,
-      944,  989,  947,  951,  946,  955,  956,  963,  964,  965,
-      966,  968,  969,  967,  970,  985,  971,  984,  983,  979,
+      822,  825, 1048, 1047, 1046, 1045,  826,  827,  828,  829,
+      830,  833, 1044,  839, 1043, 1042,  840,  843,  844,  845,
+      846,  850,  848,  851,  852,  853,  854, 1041,  858,  863,
+      868,  869,  871,  875,  877,  878,  879, 1040,  881,  885,
+      886,  882, 1037,  887,  889,  888,  894, 1028, 1026,  897,
+      895,  892,  900,  907, 1025,  912,  916,  914, 1024,  917,
+     1023, 1021,  918,  920,  922,  925,  926,  924,  928,  931,
+      933,  932,  934,  936,  938, 1020,  941,  944,  937,  948,
+      949,  950,  952, 1019,  957,  961,  962,  963,  964, 1018,
+      965,  966,  967,  968, 1013,  969,  972, 1010,  973,  976,
 
-      973,  783,  982,  602,  477,  446,  978,  333, 1109, 1013,
-     1015,   83, 1019,   80
+      982,  984,  990,  991,  992,  993,  994,  996,  997,  998,
+      999, 1006, 1000,  896,  893,  633, 1005,  632, 1007,  385,
+      354,  353, 1008,  301, 1141, 1043, 1045,  226, 1049,  166
     } ;
 
-static yyconst short int yy_def[515] =
+static yyconst short int yy_def[531] =
     {   0,
-      509,    1,  509,  509,  509,  509,  510,  511,  512,  509,
-      511,  511,  511,  511,  513,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  510,  509,  511,  509,
-      514,  514,  509,  509,  511,  511,  511,  511,  511,  513,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      525,    1,  525,  525,  525,  525,  526,  527,  528,  525,
+      527,  527,  527,  527,  529,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  526,  525,  527,  525,
+      530,  530,  525,  525,  527,  527,  527,  527,  527,  529,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
 
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  509,  514,  514,  509,  511,  511,  511,
-       49,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-       49,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  525,  530,
+      530,  525,  527,  527,  527,   49,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,   49,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
 
-      511,  511,  511,  511,  511,  509,  509,  509,  509,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  171,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  509,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  525,  525,  525,  525,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  177,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
 
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      527,  525,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
 
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
-      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
 
-      511,  511,  511,  511,  511,  511,  511,  511,    0,  509,
-      509,  509,  509,  509
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,    0,  525,  525,  525,  525,  525
     } ;
 
-static yyconst short int yy_nxt[1153] =
+static yyconst short int yy_nxt[1185] =
     {   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,    8,   23,    8,   24,   25,
        26,   27,   28,    8,   29,   30,   31,   32,   33,   34,
        35,    8,   36,   42,   40,   43,   43,   43,   43,   44,
-       44,   44,   44,   45,   45,   45,   45,   40,   46,  134,
-       40,  135,   40,   40,   47,   48,   48,   48,   48,   40,
-       47,   48,   48,   48,   48,   40,   40,   69,  118,   40,
-       84,   40,  115,   40,   51,   41,   85,   70,   56,   40,
-       90,   52,   57,   53,   40,   54,   49,   58,   55,   60,
+       44,   44,   44,   45,   45,   45,   45,   40,   46,  139,
+       40,  140,   40,   40,   47,   48,   48,   48,   48,   40,
+       47,   48,   48,   48,   48,   40,   40,   69,  123,   40,
+       85,   40,   40,   40,   51,   40,   86,   70,   56,   40,
+       91,   52,   57,   53,   40,   54,   49,   58,   55,   60,
 
-       59,   61,   40,   40,   40,   76,   77,   64,   71,   40,
-       40,   65,   62,   74,   78,   66,   63,   67,   72,   75,
-       68,   40,   79,   40,   73,   40,   81,   80,   40,   86,
-      108,   87,   40,   40,   40,   88,   40,  110,   99,   82,
-       40,   89,  122,  109,  125,   83,   91,  111,   40,  113,
-       40,  100,   40,   40,  101,  137,   92,   40,  203,   93,
-       40,  102,   94,   95,  128,   40,  112,  116,  116,  116,
-      116,  126,  141,   96,   97,   40,   98,   91,  123,   40,
-      124,   40,   43,   43,   43,   43,  129,  103,  117,   44,
-       44,   44,   44,   40,  104,  127,  105,   40,  106,   40,
+       59,   61,   40,  141,  131,   77,   78,   64,   40,   40,
+       40,   65,   62,   40,   79,   66,   63,   67,   71,   75,
+       68,   72,   80,   40,   40,   76,   40,   81,   73,   82,
+       40,   40,   40,  145,   74,   89,   40,  113,  127,   40,
+      115,   90,   83,   40,  102,   87,   40,   88,   84,   92,
+      114,  116,   40,   40,  135,  118,  128,  103,  129,   93,
+      104,   94,   95,   40,   40,   96,   97,  105,  120,   40,
+      117,  130,   40,   40,   98,  133,   99,  100,   40,  101,
+       92,   40,  153,  134,   40,  121,  121,  121,  121,  132,
+      106,   40,  107,   43,   43,   43,   43,  108,  138,  109,
 
-      133,   40,   40,  107,   47,   45,   45,   45,   45,   40,
-      119,  119,  119,  119,   40,  130,   40,  120,  298,  148,
-      136,   40,  156,  120,   47,   48,   48,   48,   48,   40,
-      121,  121,  121,  121,   40,   40,  121,  121,   40,  121,
-      121,  121,  121,  121,  121,   40,  140,   40,   40,   40,
-      131,   40,  138,   40,   40,  143,  144,  132,   40,   40,
-      149,   40,  142,  146,  139,   40,   40,   40,   40,   40,
-      147,   40,  145,  152,  159,   40,  150,  151,  157,  162,
-      153,  154,  161,  155,  158,   40,  160,   40,  164,   40,
-      163,   40,  166,   40,  172,  171,   40,   40,   40,   40,
+       40,  110,  147,   40,  142,  111,  112,  122,   44,   44,
+       44,   44,   47,   45,   45,   45,   45,   40,  124,  124,
+      124,  124,   40,  156,   40,  125,  170,  213,   41,   40,
+      162,  125,   47,   48,   48,   48,   48,   40,  126,  126,
+      126,  126,   40,   40,  126,  126,   40,  126,  126,  126,
+      126,  126,  126,   40,   40,   40,   40,   40,  136,   40,
+      143,  146,  148,  149,   40,  137,   40,   40,  155,   40,
+      151,   40,  144,   40,  165,  154,   40,  152,   40,  150,
+       40,  168,  157,   40,   40,  158,  166,   40,  163,  159,
+      160,  167,  161,  169,  164,  171,   40,  173,   40,  175,
 
-      165,   40,  167,  173,  168,   40,  180,  182,   40,  169,
-       40,  174,  176,   40,   40,  177,  170,  181,  178,  175,
-       40,  179,   40,  183,  188,   40,  184,  186,   40,   40,
-      202,   40,  197,  198,  185,   40,  189,  190,  187,  192,
-      191,  196,   40,   40,  193,  199,   40,   40,  200,   40,
-      201,   40,  194,  116,  116,  116,  116,  195,  207,  207,
-      207,  207,  212,  204,  205,  208,   40,  213,   40,   40,
-      218,  208,  119,  119,  119,  119,   40,  214,   40,  120,
-       40,  216,  215,   40,   40,  120,  209,  210,   40,  211,
-      211,  211,  211,   40,   40,  217,  219,   40,  223,  224,
+      174,  172,   40,   40,   40,   40,  176,   40,   40,   40,
+       40,  180,   40,   40,   40,  187,  179,  188,  190,  181,
+      183,   40,  191,  184,   40,  177,  185,  182,  189,  186,
+      178,   40,  196,   40,  192,   40,   40,  194,   40,   40,
+       40,   40,  193,   40,  207,  208,  198,  205,  195,   40,
+       40,  201,  199,  206,  200,   40,  202,  209,   40,  197,
+      212,  230,   40,  210,  203,  211,   40,   40,   40,  204,
+      214,  121,  121,  121,  121,  217,  217,  217,  217,  215,
+      223,  225,  218,   40,   40,   40,   40,   40,  218,  124,
+      124,  124,  124,   40,  222,  224,  125,   40,   40,  226,
 
-      220,   40,  222,  221,   40,   40,   40,   40,   40,   40,
-      225,  227,   40,   40,  226,  229,  230,  228,  234,   40,
-       40,  235,   40,   40,   40,  237,   40,   40,  231,  236,
-      232,   40,  233,  239,   40,  240,  242,  238,   40,   40,
-       40,  241,   40,   40,   40,  243,  245,   40,   40,   40,
-      246,   40,   40,   40,   40,  247,  255,  244,  249,   40,
-      288,  261,   40,  262,  250,  251,  248,  252,  252,  252,
-      252,   40,  253,  252,  252,  254,  252,  252,  252,  252,
-      252,  252,   40,  260,   40,   40,   40,   40,   40,   40,
-       40,  256,  263,  257,   40,   40,   40,  258,  266,  259,
+      227,  255,  125,  219,  220,   40,  221,  221,  221,  221,
+       40,   40,   40,  229,   40,   40,  232,   40,   40,   40,
+      228,  231,   40,  237,   40,   40,   40,  235,   40,  233,
+      234,  236,  238,  239,  240,   40,   40,   40,   40,   40,
+      245,   40,   40,  249,  242,  246,  241,  248,   40,  243,
+      251,  252,  247,  244,  250,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,  254,  257,  253,   40,   40,  258,
+       40,   40,   40,   40,  259,  294,  261,   40,  304,  256,
+      263,  268,  262,   40,  260,  264,  264,  264,  264,  276,
+      265,  264,  264,  266,  264,  264,  264,  264,  264,  264,
 
-      265,   40,   40,  268,  269,  267,   40,  264,   40,   40,
-      273,  270,  271,  272,   40,  275,   40,   40,   40,  274,
-       40,  276,  278,   40,   40,  280,  281,  277,  282,   40,
-       40,   40,   40,  284,  283,  279,  207,  207,  207,  207,
-      351,   40,  285,  208,  296,  294,  295,  209,  209,  208,
-      286,  286,  286,  286,  286,  286,  286,  286,  211,  211,
-      211,  211,   40,  211,  211,  211,  211,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,  291,   40,
-       40,  300,   40,   40,  305,  287,  289,  290,  303,  304,
-      299,   40,   40,   40,   40,  292,  293,   40,  301,  308,
-
-       40,  297,  309,  302,   40,   40,   40,  307,   40,   40,
-       40,   40,   40,   40,  306,   40,   40,   40,  310,  312,
-       40,  311,  314,  313,  315,  320,  317,   40,  316,   40,
-      318,   40,   40,  321,  322,  319,  329,  323,  324,   40,
-      326,  328,   40,   40,   40,   40,   40,   40,   40,  330,
-      333,  331,  325,  332,  327,  334,  336,   40,   40,  337,
-      335,   40,   40,   40,   40,   40,  340,  338,   40,   40,
-       40,  339,   40,   40,   40,   40,  344,   40,  350,  341,
-      353,  352,  347,  349,  342,  343,  286,  286,  286,  286,
-       40,   40,  346,   40,  348,  345,  355,  354,  356,  357,
-
+      267,   40,   40,   40,  273,   40,   40,   40,   40,   40,
+      269,  275,  270,  274,   40,   40,  271,   40,  272,  280,
+       40,   40,  279,  282,  283,   40,  277,   40,  281,  278,
+       40,   40,   40,   40,   40,   40,  288,   40,   40,   40,
+      284,  290,  287,   40,  286,  285,  291,  289,  296,  293,
+      292,  297,   40,   40,   40,  301,  295,  298,  300,  217,
+      217,  217,  217,   40,   40,  313,  218,  299,  311,  316,
+      219,  219,  218,  302,  302,  302,  302,  302,  302,  302,
+      302,  221,  221,  221,  221,   40,  221,  221,  221,  221,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       40,  360,   40,  364,  365,   40,   40,  366,   40,  358,
-      359,  361,  363,   40,  367,  371,  362,   40,  368,   40,
-      374,   40,  370,  369,   40,  372,  373,   40,  375,   40,
-      376,   40,   40,  377,   40,   40,   40,   40,   40,   40,
-       40,   40,  381,   40,  386,  378,  380,  382,  384,  387,
-       40,  389,  379,   40,   40,   40,   40,  383,  392,  385,
-       40,  388,   40,  391,   40,   40,  390,  397,   40,  395,
-       40,   40,  394,   40,  399,   40,   40,  393,   40,  396,
-      403,  404,   40,   40,   40,   40,   40,  407,  401,  402,
 
-      400,  406,  398,  408,   40,   40,  405,   40,   40,  409,
-      412,   40,  410,  411,   40,   40,  413,  418,  414,   40,
-       40,   40,   40,   40,  415,   40,  416,  419,   40,   40,
-      417,   40,   40,  420,   40,   40,   40,   40,  421,   40,
-      428,  423,   40,  429,   40,  422,  424,  427,   40,  425,
-       40,  431,  430,  433,  432,  426,   40,  436,   40,  434,
-       40,  437,   40,  438,   40,   40,   40,  435,   40,  439,
-       40,  441,   40,  440,   40,   40,  443,   40,   40,   40,
-       40,  447,   40,   40,   40,  442,  456,  451,  453,  448,
-      444,  445,  449,  446,   40,  452,   40,   40,  455,   40,
+       40,  307,   40,   40,   40,   40,   40,   40,  303,  305,
+      306,  312,  310,  320,  321,  314,   40,  315,  308,  309,
+       40,  318,  317,   40,   40,  319,   40,  326,  322,  324,
+       40,  323,  325,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,  328,   40,   40,  327,  329,  336,
+      331,   40,  330,  333,  332,  337,   40,   40,  338,   40,
+       40,  334,  335,  339,  345,  340,  342,   40,  344,   40,
+      346,   40,   40,   40,   40,   40,  347,   40,  348,  341,
+      343,  349,  350,  353,  352,   40,  351,  354,   40,   40,
+       40,   40,   40,  356,   40,   40,   40,   40,  355,  302,
 
-      450,  454,  458,  457,   40,   40,   40,  460,   40,  461,
-       40,   40,  459,  464,  462,   40,   40,   40,   40,   40,
-       40,   40,  467,   40,  471,   40,  465,   40,  473,  463,
-      469,   40,   40,  470,   40,  472,   40,  475,   40,  468,
-      466,  474,   40,  478,  476,  479,   40,   40,   40,   40,
-       40,  482,   40,   40,  477,  480,   40,   40,  486,   40,
-       40,  483,  484,  485,   40,  488,  491,  481,   40,   40,
-      489,  493,  494,  487,  490,  492,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,  495,   40,  500,  501,  502,
-      496,   40,   40,  506,  497,   40,   40,   40,   40,  499,
+      302,  302,  302,  360,   40,   40,  357,  363,   40,  365,
+      366,  358,  359,   40,   40,   40,  367,   40,  362,  364,
+      368,  361,  369,   40,   40,  372,   40,   40,   40,  371,
+      370,   40,  373,  374,  375,   40,  376,   40,   40,   40,
+       40,   40,   40,   40,  380,  377,  381,  382,   40,   40,
+       40,   40,  379,   40,  378,  383,   40,  384,  387,   40,
+      386,   40,  389,  390,   40,  385,  394,  388,  391,   40,
+      392,   40,   40,  393,  395,   40,   40,   40,   40,   40,
+       40,  397,   40,   40,  396,  400,  402,  398,  403,   40,
+       40,   40,   40,  405,   40,  399,  408,   40,   40,   40,
 
-      498,  505,   40,   40,  507,   40,  504,   40,   40,  503,
-       40,   40,  508,   37,   37,   37,   37,   39,   39,   50,
+      401,  404,  407,   40,   40,  413,  406,  411,   40,  410,
+       40,   40,  415,  409,  412,   40,   40,   40,   40,  419,
+      420,   40,  425,   40,   40,  426,  416,  414,  417,  418,
+      423,  421,  422,  424,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,  427,  429,   40,  430,  431,  435,
+      432,  428,   40,   40,  433,  436,   40,   40,   40,   40,
+      437,   40,  434,   40,   40,   40,   40,   40,  444,  438,
+      439,   40,  445,  443,  440,  449,   40,  441,  446,  447,
+      448,   40,   40,  442,   40,  452,  453,  454,   40,  450,
+       40,   40,   40,  455,   40,   40,  451,  457,   40,   40,
+
+       40,   40,   40,  459,  463,   40,   40,   40,   40,   40,
+       40,  456,  470,   40,  458,  464,  467,  469,  460,  465,
+       40,  461,  462,  468,  466,   40,  472,   40,  471,   40,
+       40,   40,  473,   40,  474,   40,  477,   40,   40,   40,
+      475,   40,  478,  480,   40,   40,   40,   40,  483,   40,
+       40,   40,  487,  476,   40,  481,  489,   40,  479,  485,
+      486,   40,   40,   40,  488,   40,  482,  484,  490,  492,
+       40,  494,  495,  491,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,  498,  493,   40,   40,  502,  496,   40,
+      499,  500,  501,  504,  507,   40,  509,   40,  505,  497,
+
+      506,  508,  503,   40,   40,   40,   40,   40,  510,   40,
+       40,   40,   40,   40,  511,  516,  517,  518,   40,   40,
+       40,   40,  513,   40,  512,  522,   40,  515,  514,  523,
+      521,   40,   40,   40,   40,  520,   40,   40,   40,   40,
+      519,   40,  524,   37,   37,   37,   37,   39,   39,   50,
        40,   50,   50,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,   40,  206,
 
-       40,   40,   40,   40,  114,   40,   38,  509,    3,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,  216,   40,   40,   40,   40,  119,   40,   38,  525,
+        3,  525,  525,  525,  525,  525,  525,  525,  525,  525,
+      525,  525,  525,  525,  525,  525,  525,  525,  525,  525,
+      525,  525,  525,  525,  525,  525,  525,  525,  525,  525,
+      525,  525,  525,  525,  525,  525,  525,  525,  525,  525,
+      525,  525,  525,  525
     } ;
 
-static yyconst short int yy_chk[1153] =
+static yyconst short int yy_chk[1185] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -700,125 +716,128 @@
        10,   10,   10,   11,   11,   11,   11,   11,   12,   62,
        20,   62,   26,   12,   13,   13,   13,   13,   13,   13,
        14,   14,   14,   14,   14,   14,   16,   20,   46,   17,
-       26,   29,  514,   46,   16,  512,   26,   20,   17,   23,
+       26,   29,   63,   46,   16,   54,   26,   20,   17,   23,
        29,   16,   17,   16,   18,   16,   13,   17,   16,   18,
 
-       17,   18,   19,   21,   22,   23,   23,   19,   21,   24,
-       27,   19,   18,   22,   24,   19,   18,   19,   21,   22,
-       19,   25,   24,   28,   21,   33,   25,   24,   34,   27,
-       33,   27,   64,   31,   51,   28,   53,   34,   31,   25,
-       36,   28,   51,   33,   53,   25,   30,   35,   35,   36,
-       30,   31,   54,   56,   31,   64,   30,   67,  111,   30,
-      111,   31,   30,   30,   56,   52,   35,   42,   42,   42,
-       42,   54,   67,   30,   30,   57,   30,   32,   52,   55,
-       52,   32,   43,   43,   43,   43,   57,   32,   44,   44,
-       44,   44,   44,   61,   32,   55,   32,   58,   32,   63,
+       17,   18,   19,   63,   54,   23,   23,   19,   66,   24,
+       22,   19,   18,   21,   24,   19,   18,   19,   21,   22,
+       19,   21,   24,   28,   25,   22,   27,   24,   21,   25,
+       51,   34,   33,   66,   21,   28,   58,   33,   51,   31,
+       34,   28,   25,   52,   31,   27,   36,   27,   25,   30,
+       33,   35,   35,   30,   58,   36,   52,   31,   52,   30,
+       31,   30,   30,   53,   56,   30,   30,   31,  530,   72,
+       35,   53,   57,   55,   30,   56,   30,   30,   68,   30,
+       32,   64,   72,   57,   32,   42,   42,   42,   42,   55,
+       32,   61,   32,   43,   43,   43,   43,   32,   61,   32,
 
-       61,   72,  226,   32,   45,   45,   45,   45,   45,   45,
-       47,   47,   47,   47,   47,   58,   78,   47,  226,   72,
-       63,   66,   78,   47,   48,   48,   48,   48,   48,   48,
-       49,   49,   49,   49,   49,   60,   49,   49,   68,   49,
-       49,   49,   49,   49,   49,   65,   66,   69,   71,   70,
-       60,   73,   65,   74,   76,   69,   70,   60,   77,   75,
-       73,   79,   68,   71,   65,   84,   92,   81,   91,   80,
-       71,   82,   70,   76,   80,   83,   74,   75,   79,   82,
-       77,   77,   81,   77,   79,   85,   80,   86,   84,   88,
-       83,   89,   86,   90,   92,   91,   93,   94,   95,   96,
+       75,   32,   68,   85,   64,   32,   32,   44,   44,   44,
+       44,   44,   45,   45,   45,   45,   45,   45,   47,   47,
+       47,   47,   47,   75,   79,   47,   85,  116,  528,  116,
+       79,   47,   48,   48,   48,   48,   48,   48,   49,   49,
+       49,   49,   49,   60,   49,   49,   67,   49,   49,   49,
+       49,   49,   49,   65,   69,   71,   70,   73,   60,   74,
+       65,   67,   69,   70,   76,   60,   77,   78,   74,   81,
+       71,   80,   65,   83,   81,   73,   82,   71,   84,   70,
+       86,   83,   76,   91,   89,   77,   81,   90,   80,   78,
+       78,   82,   78,   84,   80,   86,   87,   89,   92,   91,
 
-       85,   97,   88,   93,   89,  102,   95,   97,  103,   90,
-       98,   93,   94,   99,  101,   94,   90,   96,   94,   93,
-      104,   94,  105,   98,  102,  110,   99,  101,  108,  107,
-      110,  106,  108,  108,   99,  109,  103,  104,  101,  106,
-      105,  107,  112,  113,  106,  108,  508,  132,  109,  124,
-      109,  123,  106,  116,  116,  116,  116,  106,  117,  117,
-      117,  117,  123,  112,  113,  117,  130,  124,  126,  128,
-      132,  117,  119,  119,  119,  119,  119,  126,  135,  119,
-      131,  130,  128,  138,  139,  119,  120,  120,  134,  120,
-      120,  120,  120,  120,  136,  131,  134,  137,  138,  139,
+       90,   87,   93,   94,   95,   96,   91,   97,   98,  101,
+       99,   95,  100,  105,  524,   97,   94,   98,  100,   95,
+       96,  102,  101,   96,  104,   92,   96,   95,   99,   96,
+       93,  106,  105,  107,  102,  108,  109,  104,  111,  140,
+      113,  112,  102,  110,  113,  113,  107,  111,  104,  117,
+      114,  110,  108,  112,  109,  115,  110,  113,  118,  106,
+      115,  140,  129,  114,  110,  114,  522,  521,  133,  110,
+      117,  121,  121,  121,  121,  122,  122,  122,  122,  118,
+      129,  133,  122,  128,  135,  136,  131,  163,  122,  124,
+      124,  124,  124,  124,  128,  131,  124,  137,  520,  135,
 
-      135,  141,  137,  136,  143,  142,  144,  145,  146,  147,
-      141,  142,  149,  148,  141,  144,  145,  143,  148,  151,
-      150,  149,  152,  155,  153,  151,  154,  156,  145,  150,
-      146,  157,  147,  153,  158,  154,  156,  152,  159,  160,
-      161,  155,  162,  165,  166,  157,  159,  174,  168,  172,
-      160,  179,  173,  213,  180,  161,  174,  158,  165,  506,
-      213,  179,  177,  180,  166,  168,  162,  171,  171,  171,
-      171,  181,  172,  171,  171,  173,  171,  171,  171,  171,
-      171,  171,  175,  177,  183,  184,  186,  185,  189,  190,
-      505,  175,  181,  175,  187,  188,  191,  175,  185,  175,
+      136,  163,  124,  125,  125,  139,  125,  125,  125,  125,
+      125,  142,  141,  139,  143,  144,  142,  147,  146,  148,
+      137,  141,  151,  147,  149,  150,  152,  146,  153,  143,
+      144,  146,  148,  149,  150,  154,  155,  157,  156,  158,
+      154,  159,  160,  157,  151,  155,  150,  156,  161,  152,
+      159,  160,  155,  153,  158,  162,  164,  165,  166,  167,
+      168,  171,  172,  174,  162,  165,  161,  178,  179,  166,
+      207,  223,  181,  188,  167,  207,  171,  180,  223,  164,
+      174,  181,  172,  184,  168,  177,  177,  177,  177,  188,
+      178,  177,  177,  179,  177,  177,  177,  177,  177,  177,
 
-      184,  192,  193,  187,  188,  186,  194,  183,  195,  196,
-      192,  189,  190,  191,  198,  194,  199,  197,  200,  193,
-      202,  195,  197,  201,  205,  199,  200,  196,  201,  203,
-      222,  224,  289,  203,  202,  198,  207,  207,  207,  207,
-      289,  223,  205,  207,  224,  222,  223,  208,  208,  207,
-      208,  208,  208,  208,  209,  209,  209,  209,  210,  210,
-      210,  210,  210,  211,  211,  211,  211,  211,  212,  214,
-      215,  219,  220,  221,  225,  227,  228,  233,  219,  229,
-      232,  228,  230,  231,  233,  212,  214,  215,  231,  232,
-      227,  234,  236,  238,  237,  220,  221,  239,  229,  237,
+      180,  182,  187,  186,  184,  189,  191,  192,  193,  194,
+      182,  187,  182,  186,  195,  196,  182,  197,  182,  193,
+      198,  199,  192,  195,  196,  200,  189,  201,  194,  191,
+      202,  206,  203,  204,  205,  208,  201,  215,  235,  209,
+      197,  203,  200,  210,  199,  198,  204,  202,  209,  206,
+      205,  210,  211,  212,  213,  215,  208,  211,  213,  217,
+      217,  217,  217,  233,  238,  235,  217,  212,  233,  238,
+      218,  218,  217,  218,  218,  218,  218,  219,  219,  219,
+      219,  220,  220,  220,  220,  220,  221,  221,  221,  221,
+      221,  222,  224,  225,  229,  230,  231,  232,  234,  236,
 
-      240,  225,  238,  230,  243,  241,  250,  236,  242,  244,
-      247,  248,  251,  260,  234,  504,  253,  256,  239,  241,
-      254,  240,  243,  242,  244,  253,  248,  255,  247,  257,
-      250,  258,  259,  254,  255,  251,  260,  256,  257,  261,
-      258,  259,  262,  264,  263,  267,  266,  270,  272,  261,
-      264,  262,  257,  263,  258,  266,  270,  273,  274,  272,
-      267,  275,  276,  277,  278,  279,  275,  273,  280,  282,
-      285,  274,  284,  288,  291,  292,  279,  295,  288,  276,
-      292,  291,  284,  285,  277,  278,  286,  286,  286,  286,
-      293,  294,  282,  296,  284,  280,  294,  293,  295,  296,
+      240,  229,  237,  239,  242,  245,  251,  243,  222,  224,
+      225,  234,  232,  242,  243,  236,  248,  237,  230,  231,
+      241,  240,  239,  250,  249,  241,  252,  251,  245,  249,
+      253,  248,  250,  254,  255,  256,  259,  262,  260,  263,
+      265,  273,  267,  269,  253,  518,  516,  252,  254,  265,
+      256,  268,  255,  260,  259,  267,  270,  271,  268,  272,
+      274,  262,  263,  269,  273,  270,  271,  275,  272,  277,
+      274,  281,  287,  280,  278,  284,  275,  288,  277,  270,
+      271,  278,  280,  287,  284,  289,  281,  288,  290,  291,
+      293,  294,  295,  290,  296,  298,  301,  300,  289,  302,
 
-      297,  298,  299,  301,  300,  302,  303,  305,  307,  308,
-      310,  299,  309,  303,  305,  311,  312,  307,  314,  297,
-      298,  300,  302,  316,  308,  312,  301,  315,  309,  317,
-      316,  318,  311,  310,  319,  314,  315,  321,  317,  322,
-      318,  330,  331,  319,  334,  333,  339,  340,  342,  335,
-      343,  341,  331,  345,  340,  321,  330,  333,  335,  341,
-      346,  343,  322,  347,  348,  349,  351,  334,  347,  339,
-      354,  342,  353,  346,  355,  356,  345,  354,  357,  351,
-      358,  359,  349,  364,  356,  366,  363,  348,  368,  353,
-      363,  363,  377,  378,  369,  392,  502,  368,  358,  359,
+      302,  302,  302,  295,  311,  304,  291,  300,  305,  301,
+      304,  293,  294,  307,  313,  314,  305,  308,  298,  300,
+      307,  296,  308,  309,  310,  311,  312,  315,  316,  310,
+      309,  317,  312,  313,  314,  318,  315,  319,  323,  321,
+      324,  325,  326,  327,  319,  316,  321,  323,  337,  328,
+      330,  338,  318,  331,  317,  324,  332,  325,  328,  333,
+      327,  334,  331,  332,  335,  326,  337,  330,  333,  346,
+      334,  347,  350,  335,  338,  349,  351,  355,  358,  356,
+      357,  347,  359,  361,  346,  351,  356,  349,  357,  362,
+      364,  363,  365,  359,  367,  350,  363,  369,  370,  371,
 
-      357,  366,  355,  369,  370,  372,  364,  380,  381,  370,
-      378,  385,  372,  377,  386,  391,  380,  392,  381,  393,
-      394,  395,  396,  398,  385,  401,  386,  393,  402,  403,
-      391,  405,  404,  394,  406,  407,  408,  411,  395,  409,
-      405,  398,  413,  406,  410,  396,  401,  404,  414,  402,
-      418,  408,  407,  410,  409,  403,  415,  414,  416,  411,
-      417,  415,  420,  416,  419,  421,  423,  413,  424,  417,
-      425,  419,  426,  418,  428,  429,  421,  430,  431,  435,
-      438,  426,  434,  437,  444,  420,  438,  431,  435,  428,
-      423,  424,  429,  425,  436,  434,  440,  441,  437,  442,
+      355,  358,  362,  372,  373,  370,  361,  367,  380,  365,
+      374,  375,  372,  364,  369,  379,  382,  386,  388,  379,
+      379,  384,  386,  393,  385,  388,  373,  371,  374,  375,
+      384,  380,  382,  385,  394,  401,  396,  397,  402,  407,
+      408,  409,  410,  411,  393,  396,  412,  397,  401,  409,
+      402,  394,  414,  417,  407,  410,  418,  419,  420,  421,
+      411,  423,  408,  422,  424,  425,  426,  427,  421,  412,
+      414,  429,  422,  420,  417,  426,  430,  418,  423,  424,
+      425,  431,  432,  419,  433,  430,  431,  432,  434,  427,
+      435,  436,  437,  433,  439,  442,  429,  435,  440,  441,
 
-      430,  436,  441,  440,  447,  448,  449,  444,  450,  447,
-      451,  452,  442,  450,  448,  453,  454,  455,  456,  457,
-      458,  462,  453,  459,  457,  463,  451,  461,  459,  449,
-      455,  464,  467,  456,  465,  458,  466,  462,  469,  454,
-      452,  461,  470,  465,  463,  466,  471,  472,  473,  475,
-      476,  470,  477,  478,  464,  467,  480,  481,  475,  485,
-      483,  471,  472,  473,  484,  477,  481,  469,  486,  487,
-      478,  484,  485,  476,  480,  483,  488,  489,  490,  491,
-      494,  492,  493,  495,  497,  486,  501,  491,  492,  493,
-      487,  507,  500,  501,  488,  503,  499,  498,  496,  490,
+      444,  446,  445,  437,  442,  452,  515,  447,  451,  514,
+      450,  434,  452,  453,  436,  444,  447,  451,  439,  445,
+      454,  440,  441,  450,  446,  456,  454,  458,  453,  457,
+      460,  463,  456,  464,  457,  465,  463,  468,  466,  467,
+      458,  469,  464,  466,  470,  472,  471,  473,  469,  474,
+      479,  475,  473,  460,  477,  467,  475,  478,  465,  471,
+      472,  480,  481,  482,  474,  483,  468,  470,  477,  479,
+      485,  481,  482,  478,  486,  487,  488,  489,  491,  492,
+      493,  494,  496,  486,  480,  497,  499,  491,  483,  500,
+      487,  488,  489,  493,  497,  501,  500,  502,  494,  485,
 
-      489,  497,  482,  479,  503,  474,  495,  468,  460,  494,
-      446,  445,  507,  510,  510,  510,  510,  511,  511,  513,
-      443,  513,  513,  439,  433,  432,  427,  422,  412,  400,
-      399,  397,  390,  389,  388,  387,  384,  383,  382,  379,
-      376,  375,  374,  373,  371,  367,  365,  362,  361,  360,
-      352,  350,  344,  338,  337,  336,  332,  329,  328,  327,
-      326,  325,  324,  323,  320,  313,  306,  304,  290,  287,
-      283,  281,  271,  269,  268,  265,  249,  246,  245,  235,
-      218,  217,  216,  204,  182,  178,  176,  170,  169,  167,
-      164,  163,  140,  133,  129,  127,  125,  122,  118,  114,
+      496,  499,  492,  503,  504,  505,  506,  507,  501,  508,
+      509,  510,  511,  513,  502,  507,  508,  509,  517,  512,
+      519,  523,  504,  498,  503,  517,  495,  506,  505,  519,
+      513,  490,  484,  476,  462,  511,  461,  459,  455,  449,
+      510,  448,  523,  526,  526,  526,  526,  527,  527,  529,
+      443,  529,  529,  438,  428,  416,  415,  413,  406,  405,
+      404,  403,  400,  399,  398,  395,  392,  391,  390,  389,
+      387,  383,  381,  378,  377,  376,  368,  366,  360,  354,
+      353,  352,  348,  345,  344,  343,  342,  341,  340,  339,
+      336,  329,  322,  320,  306,  303,  299,  297,  292,  286,
 
-      100,   87,   59,   39,   37,    8,    7,    3,  509,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
-      509,  509
+      285,  283,  282,  279,  276,  266,  261,  258,  257,  247,
+      246,  244,  228,  227,  226,  214,  190,  185,  183,  176,
+      175,  173,  170,  169,  145,  138,  134,  132,  130,  127,
+      123,  119,  103,   88,   59,   39,   37,    8,    7,    3,
+      525,  525,  525,  525,  525,  525,  525,  525,  525,  525,
+      525,  525,  525,  525,  525,  525,  525,  525,  525,  525,
+      525,  525,  525,  525,  525,  525,  525,  525,  525,  525,
+      525,  525,  525,  525,  525,  525,  525,  525,  525,  525,
+      525,  525,  525,  525
     } ;
 
 static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
@@ -835,7 +854,7 @@
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 1 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 #define INITIAL 0
 /*===-- Lexer.l - Scanner for llvm assembly files --------------*- C++ -*--===//
 //
@@ -850,7 +869,7 @@
 //
 //===----------------------------------------------------------------------===*/
 #define YY_NEVER_INTERACTIVE 1
-#line 28 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 28 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 #include "ParserInternals.h"
 #include "llvm/Module.h"
 #include <list>
@@ -865,8 +884,18 @@
   yy_scan_string (str);
 }
 
+// Construct a token value for a non-obsolete token
 #define RET_TOK(type, Enum, sym) \
-  llvmAsmlval.type = Instruction::Enum; return sym
+  llvmAsmlval.type.opcode = Instruction::Enum; \
+  llvmAsmlval.type.obsolete = false; \
+  return sym
+
+// Construct a token value for an obsolete token
+#define RET_TOK_OBSOLETE(type, Enum, sym) \
+  llvmAsmlval.type.opcode = Instruction::Enum; \
+  llvmAsmlval.type.obsolete = true; \
+  return sym
+
 
 namespace llvm {
 
@@ -976,7 +1005,7 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 980 "Lexer.cpp"
+#line 1009 "Lexer.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1124,13 +1153,13 @@
 YY_DECL
 	{
 	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
+	register char *yy_cp = NULL, *yy_bp = NULL;
 	register int yy_act;
 
-#line 179 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 189 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 
 
-#line 1134 "Lexer.cpp"
+#line 1163 "Lexer.cpp"
 
 	if ( yy_init )
 		{
@@ -1178,14 +1207,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 >= 510 )
+				if ( yy_current_state >= 526 )
 					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 != 509 );
+		while ( yy_current_state != 525 );
 
 yy_find_action:
 		yy_current_state = *--yy_state_ptr;
@@ -1223,516 +1252,546 @@
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 181 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 191 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { /* Ignore comments for now */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 183 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 193 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return BEGINTOK; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 184 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 194 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return ENDTOK; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 185 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 195 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return TRUETOK;  }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 186 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 196 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return FALSETOK; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 187 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 197 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return DECLARE; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 188 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 198 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return GLOBAL; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 189 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 199 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return CONSTANT; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 190 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 200 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return INTERNAL; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 191 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 201 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return LINKONCE; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 192 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 202 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return WEAK; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 193 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 203 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return APPENDING; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 194 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 204 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return DLLIMPORT; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 195 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 205 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return DLLEXPORT; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 196 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 206 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return EXTERN_WEAK; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 197 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 207 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return EXTERNAL; }    /* Deprecated, turn into external */
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 198 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 208 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return EXTERNAL; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 199 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 209 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return IMPLEMENTATION; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 200 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 210 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return ZEROINITIALIZER; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 201 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 211 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return DOTDOTDOT; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 202 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 212 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return UNDEF; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 203 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 213 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return NULL_TOK; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 204 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 214 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return TO; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 205 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 215 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 206 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 216 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return NOT; }  /* Deprecated, turned into XOR */
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 207 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 217 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return TAIL; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 208 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 218 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return TARGET; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 209 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 219 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return TRIPLE; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 210 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 220 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return DEPLIBS; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 211 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 221 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return ENDIAN; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 212 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 222 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return POINTERSIZE; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 213 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 223 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return DATALAYOUT; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 214 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 224 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return LITTLE; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 215 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 225 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return BIG; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 216 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 226 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return VOLATILE; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 217 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 227 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return ALIGN;  }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 218 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 228 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return SECTION; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 219 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 229 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return MODULE; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 220 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 230 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return ASM_TOK; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 221 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 231 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return SIDEEFFECT; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 223 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 233 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return CC_TOK; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 224 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 234 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return CCC_TOK; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 225 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 235 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return CSRETCC_TOK; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 226 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 236 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return FASTCC_TOK; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 227 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 237 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return COLDCC_TOK; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 228 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 238 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return X86_STDCALLCC_TOK; }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 229 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 239 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return X86_FASTCALLCC_TOK; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 231 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 241 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::VoidTy  ; return VOID;   }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 232 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 242 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::BoolTy  ; return BOOL;   }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 233 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 243 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::SByteTy ; return SBYTE;  }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 234 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 244 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::UByteTy ; return UBYTE;  }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 235 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 245 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::ShortTy ; return SHORT;  }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 236 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 246 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::UShortTy; return USHORT; }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 237 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 247 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::IntTy   ; return INT;    }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 238 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 248 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::UIntTy  ; return UINT;   }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 239 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 249 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::LongTy  ; return LONG;   }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 240 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 250 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::ULongTy ; return ULONG;  }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 241 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 251 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::FloatTy ; return FLOAT;  }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 242 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 252 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::DoubleTy; return DOUBLE; }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 243 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 253 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::LabelTy ; return LABEL;  }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 244 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 254 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return TYPE;   }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 245 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 255 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return OPAQUE; }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 247 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 257 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Add, ADD); }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 248 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 258 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Sub, SUB); }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 249 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 259 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Mul, MUL); }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 250 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Div, DIV); }
+#line 260 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK_OBSOLETE(BinaryOpVal, UDiv, UDIV); }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 251 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Rem, REM); }
+#line 261 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, UDiv, UDIV); }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 252 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, And, AND); }
+#line 262 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SDiv, SDIV); }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 253 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Or , OR ); }
+#line 263 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, FDiv, FDIV); }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 254 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Xor, XOR); }
+#line 264 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK_OBSOLETE(BinaryOpVal, URem, UREM); }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 255 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetNE, SETNE); }
+#line 265 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, URem, UREM); }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 256 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetEQ, SETEQ); }
+#line 266 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SRem, SREM); }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 257 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetLT, SETLT); }
+#line 267 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, FRem, FREM); }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 258 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetGT, SETGT); }
+#line 268 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, And, AND); }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 259 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetLE, SETLE); }
+#line 269 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Or , OR ); }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 260 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetGE, SETGE); }
+#line 270 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Xor, XOR); }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 262 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, PHI, PHI_TOK); }
+#line 271 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SetNE, SETNE); }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 263 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Call, CALL); }
+#line 272 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SetEQ, SETEQ); }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 264 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Cast, CAST); }
+#line 273 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SetLT, SETLT); }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 265 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Select, SELECT); }
+#line 274 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SetGT, SETGT); }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 266 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Shl, SHL); }
+#line 275 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SetLE, SETLE); }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 267 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Shr, SHR); }
+#line 276 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SetGE, SETGE); }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 268 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ return VANEXT_old; }
+#line 278 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, PHI, PHI_TOK); }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 269 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ return VAARG_old; }
+#line 279 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Call, CALL); }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 270 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, VAArg , VAARG); }
+#line 280 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Cast, CAST); }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 271 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Ret, RET); }
+#line 281 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Select, SELECT); }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 272 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Br, BR); }
+#line 282 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Shl, SHL); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 273 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Switch, SWITCH); }
+#line 283 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Shr, SHR); }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 274 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Invoke, INVOKE); }
+#line 284 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return VANEXT_old; }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 275 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unwind, UNWIND); }
+#line 285 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ return VAARG_old; }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 276 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
+#line 286 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, VAArg , VAARG); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 278 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Malloc, MALLOC); }
+#line 287 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Ret, RET); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 279 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
+#line 288 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Br, BR); }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 280 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Free, FREE); }
+#line 289 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Switch, SWITCH); }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 281 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Load, LOAD); }
+#line 290 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Invoke, INVOKE); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 282 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Store, STORE); }
+#line 291 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 283 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
+#line 292 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 285 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
+#line 294 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Malloc, MALLOC); }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 286 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
+#line 295 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 287 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
+#line 296 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Free, FREE); }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 290 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 297 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Load, LOAD); }
+	YY_BREAK
+case 102:
+YY_RULE_SETUP
+#line 298 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Store, STORE); }
+	YY_BREAK
+case 103:
+YY_RULE_SETUP
+#line 299 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
+	YY_BREAK
+case 104:
+YY_RULE_SETUP
+#line 301 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
+	YY_BREAK
+case 105:
+YY_RULE_SETUP
+#line 302 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
+	YY_BREAK
+case 106:
+YY_RULE_SETUP
+#line 303 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
+	YY_BREAK
+case 107:
+YY_RULE_SETUP
+#line 306 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 {
                   UnEscapeLexed(yytext+1);
                   llvmAsmlval.StrVal = strdup(yytext+1);             // Skip %
                   return VAR_ID;
                 }
 	YY_BREAK
-case 102:
+case 108:
 YY_RULE_SETUP
-#line 295 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 311 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 {
                   yytext[strlen(yytext)-1] = 0;  // nuke colon
                   UnEscapeLexed(yytext);
@@ -1740,9 +1799,9 @@
                   return LABELSTR;
                 }
 	YY_BREAK
-case 103:
+case 109:
 YY_RULE_SETUP
-#line 301 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 317 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 {
                   yytext[strlen(yytext)-2] = 0;  // nuke colon, end quote
                   UnEscapeLexed(yytext+1);
@@ -1750,9 +1809,9 @@
                   return LABELSTR;
                 }
 	YY_BREAK
-case 104:
+case 110:
 YY_RULE_SETUP
-#line 308 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 324 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { // Note that we cannot unescape a string constant here!  The
                    // string constant might contain a \00 which would not be
                    // understood by the string stuff.  It is valid to make a
@@ -1763,14 +1822,14 @@
                    return STRINGCONSTANT;
                  }
 	YY_BREAK
-case 105:
+case 111:
 YY_RULE_SETUP
-#line 319 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 335 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { llvmAsmlval.UInt64Val = atoull(yytext); return EUINT64VAL; }
 	YY_BREAK
-case 106:
+case 112:
 YY_RULE_SETUP
-#line 320 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 336 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   // +1:  we have bigger negative range
@@ -1780,17 +1839,17 @@
                   return ESINT64VAL;
                 }
 	YY_BREAK
-case 107:
+case 113:
 YY_RULE_SETUP
-#line 328 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 344 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 {
                    llvmAsmlval.UInt64Val = HexIntToVal(yytext+3);
                    return yytext[0] == 's' ? ESINT64VAL : EUINT64VAL;
                  }
 	YY_BREAK
-case 108:
+case 114:
 YY_RULE_SETUP
-#line 333 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 349 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   if ((unsigned)Val != Val)
@@ -1799,9 +1858,9 @@
                   return UINTVAL;
                 }
 	YY_BREAK
-case 109:
+case 115:
 YY_RULE_SETUP
-#line 340 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 356 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+2);
                   // +1:  we have bigger negative range
@@ -1811,18 +1870,18 @@
                   return SINTVAL;
                 }
 	YY_BREAK
-case 110:
+case 116:
 YY_RULE_SETUP
-#line 349 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 365 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = atof(yytext); return FPVAL; }
 	YY_BREAK
-case 111:
+case 117:
 YY_RULE_SETUP
-#line 350 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 366 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = HexToFP(yytext); return FPVAL; }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 352 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 368 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
@@ -1831,22 +1890,22 @@
                   return EOF;
                 }
 	YY_BREAK
-case 112:
+case 118:
 YY_RULE_SETUP
-#line 360 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 376 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { /* Ignore whitespace */ }
 	YY_BREAK
-case 113:
+case 119:
 YY_RULE_SETUP
-#line 361 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 377 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 { return yytext[0]; }
 	YY_BREAK
-case 114:
+case 120:
 YY_RULE_SETUP
-#line 363 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 379 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 1850 "Lexer.cpp"
+#line 1909 "Lexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2133,7 +2192,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 >= 510 )
+			if ( yy_current_state >= 526 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2163,11 +2222,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 >= 510 )
+		if ( yy_current_state >= 526 )
 			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 == 509);
+	yy_is_jam = (yy_current_state == 525);
 	if ( ! yy_is_jam )
 		*yy_state_ptr++ = yy_current_state;
 
@@ -2222,6 +2281,7 @@
 #endif	/* ifndef YY_NO_UNPUT */
 
 
+#ifndef YY_NO_INPUT
 #ifdef __cplusplus
 static int yyinput()
 #else
@@ -2295,7 +2355,7 @@
 
 	return c;
 	}
-
+#endif /* YY_NO_INPUT */
 
 #ifdef YY_USE_PROTOS
 void yyrestart( FILE *input_file )
@@ -2406,11 +2466,6 @@
 	}
 
 
-#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 )
@@ -2728,5 +2783,5 @@
 	return 0;
 	}
 #endif
-#line 363 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 379 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"