[llvm-commits] [llvm] r37918 - in /llvm/trunk/lib/AsmParser: Lexer.cpp.cvs Lexer.l.cvs llvmAsmParser.cpp.cvs llvmAsmParser.h.cvs llvmAsmParser.y.cvs

Chris Lattner sabre at nondot.org
Thu Jul 5 10:26:49 PDT 2007


Author: lattner
Date: Thu Jul  5 12:26:49 2007
New Revision: 37918

URL: http://llvm.org/viewvc/llvm-project?rev=37918&view=rev
Log:
update the .cvs files

Modified:
    llvm/trunk/lib/AsmParser/Lexer.cpp.cvs
    llvm/trunk/lib/AsmParser/Lexer.l.cvs
    llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs
    llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs
    llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs

Modified: llvm/trunk/lib/AsmParser/Lexer.cpp.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/Lexer.cpp.cvs?rev=37918&r1=37917&r2=37918&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/Lexer.cpp.cvs (original)
+++ llvm/trunk/lib/AsmParser/Lexer.cpp.cvs Thu Jul  5 12:26:49 2007
@@ -17,10 +17,10 @@
 #define yylineno llvmAsmlineno
 
 #line 20 "Lexer.cpp"
-/* A lexical scanner generated by flex*/
+/* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header$
+ * $Header: /cvs/root/flex/flex/skel.c,v 1.2 2004/05/07 00:28:17 jkh Exp $
  */
 
 #define FLEX_SCANNER
@@ -28,7 +28,6 @@
 #define YY_FLEX_MINOR_VERSION 5
 
 #include <stdio.h>
-#include <unistd.h>
 
 
 /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
@@ -42,6 +41,7 @@
 #ifdef __cplusplus
 
 #include <stdlib.h>
+#include <unistd.h>
 
 /* Use prototypes in function declarations. */
 #define YY_USE_PROTOS
@@ -153,15 +153,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 +259,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 +308,37 @@
 	*yy_cp = '\0'; \
 	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 139
-#define YY_END_OF_BUFFER 140
-static yyconst short int yy_acclist[220] =
+#define YY_NUM_RULES 140
+#define YY_END_OF_BUFFER 141
+static yyconst short int yy_acclist[221] =
     {   0,
-      140,  138,  139,  137,  138,  139,  137,  139,  138,  139,
-      138,  139,  138,  139,  138,  139,  138,  139,  138,  139,
-      130,  138,  139,  130,  138,  139,    1,  138,  139,  138,
-      139,  138,  139,  138,  139,  138,  139,  138,  139,  138,
-      139,  138,  139,  138,  139,  138,  139,  138,  139,  138,
-      139,  138,  139,  138,  139,  138,  139,  138,  139,  138,
-      139,  138,  139,  138,  139,  138,  139,  138,  139,  138,
-      139,  138,  139,  138,  139,  127,  125,  123,  133,  131,
-      135,  130,    1,  124,  134,  109,   38,   72,   54,   73,
-       68,   25,  127,  129,  123,  135,   22,  135,  136,  128,
-
-      124,   55,   67,   36,   39,    3,   57,   82,   87,   85,
-       86,   84,   83,   88,   92,  108,   77,   75,   64,   76,
-       74,   56,   90,   81,   79,   80,   78,   91,   89,   69,
-      126,  135,  135,   66,   93,   71,   60,  116,   63,   70,
-      117,   65,   24,  132,   59,   96,   62,   45,   26,    4,
-       52,   58,   61,   48,   12,   95,  135,   34,   32,    2,
-        5,   49,   98,   44,   51,  118,   94,   23,  115,   41,
-        7,   50,   40,  102,  101,    8,   16,  111,  114,   35,
-       53,  106,  100,  110,   27,   28,   99,  112,  107,  105,
-        6,   29,   97,   33,    9,   19,   10,  103,   11,   47,
+      141,  139,  140,  138,  139,  140,  138,  140,  139,  140,
+      139,  140,  139,  140,  139,  140,  139,  140,  139,  140,
+      131,  139,  140,  131,  139,  140,    1,  139,  140,  139,
+      140,  139,  140,  139,  140,  139,  140,  139,  140,  139,
+      140,  139,  140,  139,  140,  139,  140,  139,  140,  139,
+      140,  139,  140,  139,  140,  139,  140,  139,  140,  139,
+      140,  139,  140,  139,  140,  139,  140,  139,  140,  139,
+      140,  139,  140,  139,  140,  128,  126,  124,  134,  132,
+      136,  131,    1,  125,  135,  110,   38,   73,   55,   74,
+       69,   25,  128,  130,  124,  136,   22,  136,  137,  129,
+
+      125,   56,   68,   36,   39,    3,   58,   83,   88,   86,
+       87,   85,   84,   89,   93,  109,   78,   76,   65,   77,
+       75,   57,   91,   82,   80,   81,   79,   92,   90,   70,
+      127,  136,  136,   67,   94,   72,   61,  117,   64,   71,
+      118,   66,   24,  133,   60,   97,   63,   45,   26,    4,
+       53,   59,   62,   49,   12,   96,  136,   34,   32,    2,
+        5,   50,   99,   44,   52,  119,   95,   23,  116,   41,
+        7,   51,   40,  103,  102,    8,   16,  112,  115,   35,
+       54,  107,  101,  111,   27,   28,  100,  113,  108,  106,
+        6,   29,   98,   48,   33,    9,   19,   10,  104,   11,
 
-       46,  104,   31,   13,   15,   14,   17,   30,   37,   18,
-      113,   20,  119,  121,  122,   42,  120,   43,   21
+       47,   46,  105,   31,   13,   15,   14,   17,   30,   37,
+       18,  114,   20,  120,  122,  123,   42,  121,   43,   21
     } ;
 
-static yyconst short int yy_accept[564] =
+static yyconst short int yy_accept[569] =
     {   0,
         1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
        17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
@@ -369,48 +360,48 @@
       106,  106,  106,  106,  106,  106,  107,  107,  107,  107,
       107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
       107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
-      108,  108,  108,  108,  109,  110,  111,  112,  113,  114,
+      108,  108,  108,  108,  108,  109,  110,  111,  112,  113,
 
-      114,  115,  116,  116,  116,  117,  117,  117,  117,  117,
-      117,  118,  119,  120,  120,  120,  120,  121,  122,  122,
-      122,  123,  123,  123,  123,  123,  123,  123,  123,  123,
-      124,  125,  126,  126,  127,  128,  128,  129,  130,  130,
-      130,  130,  130,  130,  130,  130,  130,  131,  131,  131,
-      132,  133,  133,  133,  133,  134,  134,  134,  134,  134,
-      135,  135,  135,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  137,  138,  138,
-      138,  138,  138,  139,  140,  140,  140,  140,  141,  141,
-      141,  141,  141,  141,  141,  141,  142,  143,  143,  143,
-
-      143,  143,  144,  144,  144,  144,  145,  146,  146,  146,
-      147,  147,  147,  147,  148,  149,  149,  149,  150,  150,
-      150,  150,  151,  151,  152,  153,  153,  153,  153,  153,
-      154,  154,  155,  155,  156,  156,  156,  157,  158,  159,
-      160,  160,  160,  161,  161,  161,  161,  161,  161,  161,
-      161,  161,  161,  161,  161,  161,  162,  162,  163,  164,
-      164,  164,  164,  164,  164,  164,  165,  165,  165,  165,
-      165,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  167,  167,  167,  167,  167,
-      168,  168,  169,  169,  169,  169,  169,  169,  169,  169,
-
-      170,  170,  170,  171,  171,  171,  171,  172,  172,  172,
-      172,  173,  173,  173,  174,  175,  176,  176,  176,  177,
-      178,  178,  178,  178,  179,  179,  180,  181,  181,  181,
-      182,  182,  182,  182,  183,  183,  183,  184,  185,  186,
-      186,  187,  188,  188,  189,  190,  190,  190,  190,  190,
-      190,  191,  191,  191,  192,  193,  193,  193,  193,  193,
-      193,  194,  194,  194,  194,  194,  194,  194,  194,  194,
-      194,  195,  195,  195,  195,  195,  195,  195,  195,  195,
-      195,  196,  196,  196,  196,  196,  197,  197,  197,  197,
-      198,  199,  200,  201,  202,  202,  203,  203,  203,  203,
-
-      203,  204,  204,  204,  204,  205,  205,  206,  207,  207,
-      207,  207,  207,  208,  208,  208,  208,  208,  208,  208,
-      208,  209,  209,  209,  209,  209,  209,  210,  210,  210,
-      210,  210,  210,  211,  211,  211,  211,  211,  211,  212,
-      212,  212,  212,  212,  212,  212,  212,  213,  213,  213,
-      213,  213,  214,  215,  216,  216,  217,  217,  218,  219,
-      219,  220,  220
+      114,  114,  115,  116,  116,  116,  117,  117,  117,  117,
+      117,  117,  118,  119,  120,  120,  120,  120,  121,  122,
+      122,  122,  123,  123,  123,  123,  123,  123,  123,  123,
+      123,  124,  125,  126,  126,  127,  128,  128,  129,  130,
+      130,  130,  130,  130,  130,  130,  130,  130,  131,  131,
+      131,  132,  133,  133,  133,  133,  134,  134,  134,  134,
+      134,  135,  135,  135,  136,  136,  136,  136,  136,  136,
+      136,  136,  136,  136,  136,  136,  136,  136,  137,  138,
+      138,  138,  138,  138,  139,  140,  140,  140,  140,  141,
+      141,  141,  141,  141,  141,  141,  141,  142,  143,  143,
+
+      143,  143,  143,  143,  144,  144,  144,  144,  145,  146,
+      146,  146,  147,  147,  147,  147,  148,  149,  149,  149,
+      150,  150,  150,  150,  151,  151,  152,  153,  153,  153,
+      153,  153,  154,  154,  155,  155,  156,  156,  156,  157,
+      158,  159,  160,  160,  160,  161,  161,  161,  161,  161,
+      161,  161,  161,  161,  161,  161,  161,  161,  162,  162,
+      163,  164,  164,  164,  164,  164,  164,  164,  165,  165,
+      165,  165,  165,  166,  166,  166,  166,  166,  166,  166,
+      166,  166,  166,  166,  166,  166,  166,  166,  167,  167,
+      167,  167,  167,  168,  168,  169,  169,  169,  169,  169,
+
+      169,  169,  169,  170,  170,  170,  171,  171,  171,  171,
+      172,  172,  172,  172,  173,  173,  173,  174,  175,  176,
+      176,  176,  177,  178,  178,  178,  178,  179,  179,  180,
+      181,  181,  181,  181,  182,  182,  182,  182,  183,  183,
+      183,  184,  185,  186,  186,  187,  188,  188,  189,  190,
+      190,  190,  190,  190,  190,  191,  191,  191,  192,  193,
+      193,  193,  193,  193,  193,  194,  194,  194,  194,  194,
+      194,  195,  195,  195,  195,  195,  196,  196,  196,  196,
+      196,  196,  196,  196,  196,  196,  197,  197,  197,  197,
+      197,  198,  198,  198,  198,  199,  200,  201,  202,  203,
+
+      203,  204,  204,  204,  204,  204,  205,  205,  205,  205,
+      206,  206,  207,  208,  208,  208,  208,  208,  209,  209,
+      209,  209,  209,  209,  209,  209,  210,  210,  210,  210,
+      210,  210,  211,  211,  211,  211,  211,  211,  212,  212,
+      212,  212,  212,  212,  213,  213,  213,  213,  213,  213,
+      213,  213,  214,  214,  214,  214,  214,  215,  216,  217,
+      217,  218,  218,  219,  220,  220,  221,  221
     } ;
 
 static yyconst int yy_ec[256] =
@@ -454,141 +445,141 @@
         4,    4,    4,    4
     } ;
 
-static yyconst short int yy_base[572] =
+static yyconst short int yy_base[577] =
     {   0,
-        0,    0, 1226, 1227, 1227, 1227, 1221, 1210,   41,   36,
+        0,    0, 1236, 1237, 1237, 1237, 1231, 1220,   41,   36,
        45,   51,   57,   63,    0,   74,   66,   69,   68,   88,
        78,  108,   93,   36,  135,  123,  119,  101,  154,  127,
-       67,  181,  139,  213,  141,   80,  156,   92, 1219, 1227,
-     1208, 1227, 1217,    0,  186,  203,  219,  100,  240,  256,
-      261,    0, 1216,    0,  190,  112,  157,  113,  159,  150,
-      136,   81, 1205,   49,  110,  162,  196,  266,  210,  207,
-      212, 1204,  204,  262,  224,  233,  192,  263,  279,  275,
+       67,  181,  139,  213,  141,   80,  156,   92, 1229, 1237,
+     1218, 1237, 1227,    0,  186,  203,  219,  100,  240,  256,
+      261,    0, 1226,    0,  190,  112,  157,  113,  159,  150,
+      136,   81, 1215,   49,  110,  162,  196,  266,  210,  207,
+      212, 1214,  204,  262,  224,  233,  192,  263,  279,  275,
       230,  234,  284,  276,  288,  290,   97,  242,  291,  292,
-      294,  300, 1203,  295,  302,  298,  305,  313,  296,  301,
+      294,  300, 1213,  295,  302,  298,  305,  313,  296,  321,
 
-      321,  322,  309,  324,  325,  326,  327,  331,  332,  335,
-      334,  338,  340,  333,  357,  353,  355,  344, 1202,  361,
-      345,  368,  363,  370,  371,  373,  379,  381,  385,  393,
-      372,  376,  392,  396, 1201, 1210, 1227,    0,  406, 1199,
-      429,  447,    0, 1208, 1227,    0, 1197,  411,  400, 1196,
-      412,  399, 1195,  420,  430,  415, 1194,  442,  413,  448,
-      437,  435,  450,  455,  452, 1193,  457,  458,  408,  456,
-      460,  462,  461,  463,  470,  464,  471,  475,  472,  473,
-      488,  490,  477,  491,  493,  494,  495,  497,  499, 1192,
-      502,  504,  505, 1191, 1190, 1189, 1188, 1187, 1186,  506,
-
-     1185, 1184,  507,  509, 1183,  538,  525,  515,  510,  516,
-     1182, 1181, 1180,  518,  528,  511, 1179, 1178,  526,  532,
-     1177,  552,  553,  555,  556,  557,  560,  558,  559, 1176,
-     1175, 1174,  561, 1173, 1172,  562, 1171, 1170,  563,  565,
-      564,  582,  574,  584,  571,  587, 1169,  575,  589, 1227,
-      599,  608,  618,  622,  627,  608,  593,  591,  610, 1168,
-      612,  629, 1167,  632,  633,  634,  636,  637,  638,  639,
-      641,  643,  644,  645,  646,  653, 1166, 1165,  647,  648,
-      654,  649, 1164, 1163,  660,  662,  663, 1162,  669,  664,
-      665,  670,  675,  678,  680, 1161, 1160,  682,  684,  683,
-
-      685, 1159,  688,  692,  691,    0, 1158,  695,  696, 1157,
-      697,  693,  705, 1156, 1155,  711,  698, 1154,  714,  717,
-      715, 1153,  718, 1152, 1151,  719,  722,  728,  720, 1150,
-      725, 1149,  727, 1148,  729,  732, 1147,  745, 1146, 1145,
-      739,  748, 1144,  735,  753,  749,  750,  737,  754,  760,
-      762,  763,  765,  766,  768, 1143,  769, 1142, 1141,  771,
-      772,  770,  779,  774,  773, 1140,  778,  780,  781,  787,
-     1139,  792,  795,  794,  793,  799,  796,  800,  805,  807,
-      809,  811,  812,  814, 1138,  815,  816,  820,  821, 1137,
-      817, 1136,  822,  832,  824,  825,  838,  835,  842, 1135,
-
-      843,  845, 1134,  846,  847,  848, 1133,  849,  851,  852,
-     1132,  850,  853, 1131, 1130, 1129,  854,  861, 1128, 1127,
-      863,  868,  865, 1126,  867, 1125, 1124,  866,  879, 1123,
-      880,  881,  882, 1122,  883,  884, 1121, 1120, 1119,  885,
-     1118, 1117,  892, 1116, 1115,  886,  887,  894,  898,  891,
-     1114,  896,  906, 1113, 1112,  901,  907,  908,  911,  914,
-     1111,  916,  915,  917,  918,  922,  919,  921,  928,  934,
-     1110,  913,  936,  941,  942,  943,  944,  947,  945,  949,
-     1094,  950,  952,  954,  956, 1082,  951,  959,  960, 1081,
-     1079, 1078, 1077, 1075,  962, 1074,  963,  964,  965,  974,
-
-     1073,  979,  980,  982, 1072,  983, 1071, 1070,  985,  988,
-      989,  992, 1069,  993,  990,  994,  995,  997,  999, 1000,
-     1068, 1004, 1005, 1008, 1010, 1012, 1064, 1017, 1016, 1018,
-     1021, 1024, 1063, 1025, 1027, 1029, 1030, 1032,  736, 1038,
-     1031, 1041, 1042, 1043, 1033, 1044,  600, 1045, 1050, 1046,
-     1056,  523,  519,  387, 1059,  246, 1052,  245,  169, 1061,
-      165, 1227, 1097, 1099, 1102, 1106, 1109, 1113,   58, 1118,
-       57
+      322,  324,  307,  325,  309,  328,  330,  332,  335,  336,
+      334,  339,  341,  346,  350,  353,  354,  342, 1212,  355,
+      362,  370,  366,  371,  372,  373,  379,  375,  386,  378,
+      393,  402,  390,  403, 1211, 1220, 1237,    0,  411, 1209,
+      436,  454,    0, 1218, 1237,    0, 1207,  405,  404, 1206,
+      414,  416, 1205,  413,  418,  428, 1204,  420,  419,  437,
+      439,  445,  441,  456,  458, 1203,  461,  449,  460,  462,
+      463,  467,  464,  468,  469,  475,  474,  488,  476,  491,
+      493,  494,  480,  495,  498,  500,  502,  506,  507, 1202,
+      510,  511,  512,  515, 1201, 1200, 1199, 1198, 1197, 1196,
+
+      508, 1195, 1194,  514,  516, 1193,  545,  519,  523,  517,
+      533, 1192, 1191, 1190,  525,  550,  520, 1189, 1188,  546,
+      537, 1187,  534,  561,  562,  565,  564,  568,  566,  567,
+     1186, 1185, 1184,  569, 1183, 1182,  571, 1181, 1180,  572,
+      573,  579,  583,  585,  591,  580,  598, 1179,  590,  592,
+     1237,  603,  621,  625,  629,  634,  612,  636,  422,  637,
+     1178,  638,  604, 1177,  639,  640,  641,  605,  642,  644,
+      643,  645,  649,  646,  653,  651,  666, 1176, 1175,  648,
+      652,  650,  663, 1174, 1173,  667,  678,  669, 1172,  670,
+      677,  680,  681,  686,  687,  685, 1171, 1170,  689,  690,
+
+      691,  692,  693, 1169,  694,  697,  695,    0, 1168,  696,
+      709, 1167,  711,  713,  715, 1166, 1165,  718,  721, 1164,
+      724,  725,  727, 1163,  730, 1162, 1161,  733,  735,  736,
+      732, 1160,  737, 1159,  739, 1158,  741,  698, 1157,  757,
+     1156, 1155,  745,  740, 1154,  747,  757,  760,  761,  758,
+      762,  528,  748,  769,  771,  773,  774, 1153,  775, 1152,
+     1151,  776,  778,  777,  784,  785,  779, 1150,  786,  787,
+      788,  793, 1149,  796,  798,  799,  807,  800,  802,  811,
+      804,  815,  817,  818,  819,  820,  823, 1148,  824,  822,
+      830,  828, 1147,  827, 1146,  826,  832,  833,  840,  844,
+
+      848,  849, 1145,  851,  852, 1144,  853,  855,  856, 1143,
+      857,  858,  859, 1142,  863,  861, 1141, 1140, 1139,  862,
+      864, 1138, 1137,  873,  882,  874, 1136,  879, 1135, 1134,
+      886,  875,  889, 1133,  890,  892,  893, 1132,  891,  894,
+     1131, 1130, 1129,  895, 1128, 1127,  899, 1126, 1125,  902,
+      896,  904,  903,  906, 1124,  908,  915, 1123, 1122,  916,
+      920,  921,  923,  925, 1106,  926,  927,  928,  929,  930,
+     1094,  931,  937,  945,  933, 1093,  941,  950,  947,  952,
+      954,  953,  961,  956,  959, 1092,  962,  965,  966,  968,
+     1089,  970,  973,  972, 1088, 1087, 1086, 1085, 1084,  974,
+
+     1083,  975,  976,  979,  981, 1082,  992,  993,  994, 1081,
+      995, 1075, 1074,  996,  997, 1001, 1003, 1073, 1004, 1005,
+     1006, 1010, 1009, 1011, 1016,  922, 1013, 1017, 1018, 1021,
+     1023,  860, 1024, 1032, 1033, 1035, 1036,  608, 1040, 1037,
+     1039, 1041, 1043,  606, 1046, 1045, 1044, 1048, 1054, 1055,
+     1056,  478, 1063, 1064, 1065, 1067,  477,  377,  374, 1069,
+      246, 1070,  245,  169, 1068,  165, 1237, 1109, 1111, 1114,
+     1118, 1121, 1125,   58, 1130,   57
     } ;
 
-static yyconst short int yy_def[572] =
+static yyconst short int yy_def[577] =
     {   0,
-      562,    1,  562,  562,  562,  562,  563,  564,  565,  562,
-      564,  564,  564,  564,  566,  567,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  563,  562,
-      564,  562,  568,  569,  562,  562,  564,  564,  564,  564,
-      564,  566,  570,  571,  562,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  562,  568,  562,  569,  562,  564,
-      564,  564,   51,  570,  562,  571,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-
-      564,  564,  564,  564,  564,   51,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  562,
-      562,  562,  562,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-
-      564,  564,  564,  564,  564,  206,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  562,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,  564,  564,  564,  564,  564,  564,  564,  564,  564,
-      564,    0,  562,  562,  562,  562,  562,  562,  562,  562,
-      562
+      567,    1,  567,  567,  567,  567,  568,  569,  570,  567,
+      569,  569,  569,  569,  571,  572,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  568,  567,
+      569,  567,  573,  574,  567,  567,  569,  569,  569,  569,
+      569,  571,  575,  576,  567,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  567,  573,  567,  574,  567,  569,
+      569,  569,   51,  575,  567,  576,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+
+      569,  569,  569,  569,  569,  569,   51,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      567,  567,  567,  567,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+
+      569,  569,  569,  569,  569,  569,  569,  207,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  567,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
+      569,  569,  569,  569,  569,  569,    0,  567,  567,  567,
+      567,  567,  567,  567,  567,  567
     } ;
 
-static yyconst short int yy_nxt[1272] =
+static yyconst short int yy_nxt[1282] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   14,   14,    4,   15,   16,    8,    8,    8,   17,
@@ -624,97 +615,97 @@
       162,  168,   42,   83,   83,   83,   83,   42,  169,  163,
 
       174,   42,  175,   42,   42,   42,  179,   42,   42,   42,
-      184,   42,  176,   42,   42,   42,  189,  187,   42,  199,
-      200,  188,   42,  180,  181,  182,   42,  183,  195,  190,
-      191,  193,  194,  192,   42,   42,  197,   42,   42,   42,
-       42,  203,  196,  201,   42,   42,   42,   42,   42,  202,
-      198,   42,  208,   42,  207,  211,  215,   42,   42,  204,
-      209,  217,  205,  219,  213,  220,   42,  206,   42,  212,
-       42,  216,  210,  214,   42,  218,   42,  221,  228,  225,
-      222,   42,  223,   42,   42,   42,   42,  246,  226,   42,
-      224,  245,   42,  231,   42,  229,  234,  230,   42,  227,
-
-       42,  236,  237,  242,  241,   42,   42,  232,  233,   42,
-      235,  238,   42,   42,  239,  251,  251,  251,  251,  240,
-      243,   42,  244,  252,   42,   42,   42,  247,   42,  252,
-      256,  248,  258,   42,  260,  259,  257,  249,  141,  141,
-      141,  141,   42,   42,  263,  276,  142,  261,   42,  265,
-       42,  262,  142,  253,  254,   42,  255,  255,  255,  255,
-       42,   42,  268,   42,  264,   42,  267,  266,   42,   42,
-       42,   42,  272,   42,   42,   42,   42,   42,  270,  269,
-      273,  279,  271,   42,   42,   42,   42,  285,   42,  277,
-       42,  286,  274,  283,  275,  281,  289,  287,  282,  278,
-
-      284,   42,  280,   42,   42,  288,   42,   42,   42,  293,
-       42,  290,   42,  291,  294,   42,  296,   42,   42,   42,
-       42,  295,   42,   42,   42,  300,  298,  292,   42,   42,
-      297,   42,   42,  309,  302,  301,   42,  299,   42,   42,
-      303,   42,  311,  313,  304,   42,  305,  306,  306,  306,
-      306,  312,  308,  310,  306,  306,  314,  306,  306,  306,
-      306,  306,  306,  315,  307,   42,   42,  316,   42,   42,
-       42,   42,   42,   42,   42,   42,   42,   42,   42,  320,
-      319,  324,  318,  322,   42,  327,  328,   42,   42,  317,
-      321,  323,  329,  326,  330,   42,  332,   42,  325,  334,
-
-       42,  331,   42,  333,   42,  335,   42,  336,  251,  251,
-      251,  251,  341,   42,  253,  253,  252,  338,  338,  338,
-      338,   42,  252,   42,  340,   42,  337,  338,  338,  338,
-      338,  255,  255,  255,  255,   42,  255,  255,  255,  255,
-       42,  342,   42,  343,  339,   42,   42,   42,  344,   42,
-       42,   42,   42,  345,   42,  348,   42,   42,   42,   42,
-       42,   42,   42,  347,  355,  350,   42,   42,  349,  356,
-      346,  352,  353,   42,  357,   42,   42,   42,   42,  354,
-      351,  364,   42,   42,  358,  359,  365,  362,   42,  363,
-      360,   42,  361,   42,  366,   42,   42,   42,   42,  367,
-
-      368,   42,  369,  370,   42,   42,   42,  371,   42,   42,
-       42,   42,  372,  374,  373,  378,  383,  381,   42,  386,
-      375,  382,  380,  379,   42,  376,  377,   42,   42,  384,
-       42,   42,   42,   42,  385,   42,  388,  387,   42,  390,
-       42,   42,   42,  391,  389,   42,  392,  393,   42,   42,
-       42,  394,   42,  397,  338,  338,  338,  338,  400,  399,
-      395,   42,   42,   42,  396,  398,   42,   42,  404,  405,
-      401,  402,  406,   42,  403,   42,   42,  407,   42,   42,
-      408,   42,   42,   42,   42,   42,   42,   42,  411,  413,
-      414,   42,   42,   42,   42,  409,  410,  412,  415,  416,
-
-       42,  417,  418,  419,  420,   42,   42,   42,   42,   42,
-      424,  422,   42,   42,  423,  421,  426,  427,   42,  430,
-       42,  431,   42,  425,   42,   42,  429,   42,   42,   42,
-       42,  428,  432,   42,   42,   42,  436,   42,   42,  433,
-      435,  438,  440,  443,  441,   42,  434,  437,   42,  445,
-      442,   42,  446,  439,  444,   42,   42,  447,   42,   42,
-       42,   42,   42,   42,   42,   42,   42,   42,  458,  459,
-      450,  454,  448,  449,   42,  461,   42,  452,   42,   42,
-       42,   42,  451,  456,  457,  455,  463,  464,  466,  453,
-      460,  462,   42,   42,   42,   42,   42,   42,   42,   42,
-
-       42,  467,  465,  474,   42,   42,  472,   42,  473,   42,
-      468,   42,  470,  471,   42,  476,  478,  469,  475,   42,
-       42,   42,  480,  477,   42,  479,   42,   42,   42,   42,
-       42,   42,   42,  481,   42,   42,  483,  487,  482,  488,
-      486,   42,  484,  494,  489,  492,  490,   42,  485,   42,
-      493,  495,  497,  491,   42,   42,   42,   42,   42,  498,
-       42,  500,   42,   42,   42,   42,  501,   42,  503,   42,
-      499,  496,   42,   42,  505,   42,   42,   42,   42,  509,
-      510,  502,  504,  512,  513,  515,  514,   42,  506,  507,
-      511,  508,   42,   42,  517,   42,   42,  516,   42,  519,
-
-      518,   42,   42,   42,  522,   42,   42,   42,   42,  520,
-       42,  523,   42,   42,  526,  528,  530,   42,   42,  532,
-      521,   42,  525,   42,  529,   42,  524,  527,  531,   42,
-       42,   42,  533,  536,   42,  534,  538,   42,   42,  539,
-       42,  535,   42,   42,   42,   42,   42,  540,  543,  537,
-      541,   42,  549,  542,   42,   42,   42,   42,   42,   42,
-      545,  547,  546,   42,  544,   42,  555,  548,  550,   42,
-      553,  556,   42,  551,   42,  560,   42,   42,  552,  554,
-      559,   42,   42,   42,   42,   42,   42,   42,   42,  557,
-       42,   42,   42,  558,   42,   42,  561,   39,   39,   39,
-
-       39,   39,   41,   41,   44,   44,   52,   42,   52,   52,
-       52,   54,   54,  136,  136,  136,  136,  136,  144,  144,
-      144,  144,  144,   42,   42,   42,   42,   42,   42,   42,
+      184,   42,  176,   42,  191,   42,  189,  187,   42,  200,
+       42,  188,   42,  180,  181,  182,   42,  183,  196,  190,
+      192,  194,  195,  193,   42,   42,  198,   42,   42,  204,
+      201,   42,  197,   42,  202,   42,  206,   42,   42,   42,
+      199,  203,   42,  209,   42,   42,  216,  208,  212,   42,
+      205,  210,  218,   42,  220,  214,   42,   42,   42,  207,
+      222,  217,  213,  211,  215,   42,  219,  226,  221,   42,
+      223,  224,  227,   42,   42,   42,   42,   42,   42,  225,
+       42,   42,   42,  228,  232,  229,  235,  230,  242,   42,
+
+      231,  237,  238,   42,  243,  244,   42,  245,  233,  234,
+      236,  239,  246,  247,  240,   42,   42,   42,   42,  241,
+      252,  252,  252,  252,  257,  248,   42,   42,  253,   42,
+      258,   42,   42,   42,  253,   42,  259,  260,  249,  263,
+      262,   42,  265,  343,  250,  141,  141,  141,  141,   42,
+       42,  261,   42,  142,   42,  266,  267,  264,   42,  142,
+      254,  255,   42,  256,  256,  256,  256,   42,  268,   42,
+      270,   42,  269,   42,   42,   42,   42,   42,  273,  271,
+       42,   42,   42,  272,  274,  276,  280,   42,   42,   42,
+       42,   42,  284,   42,  287,  278,  275,  277,  286,  285,
+
+      282,   42,  279,  283,   42,  281,   42,   42,   42,  289,
+      288,   42,  294,   42,  290,   42,  291,  292,  295,   42,
+       42,   42,  297,   42,   42,   42,  296,   42,   42,   42,
+       42,  293,   42,   42,  302,  299,   42,  298,   42,  301,
+      311,   42,  305,  303,  304,  300,   42,   42,  411,  313,
+       42,  306,  315,  307,  308,  308,  308,  308,  309,   42,
+      310,  308,  308,   42,  308,  308,  308,  308,  308,  308,
+      312,  319,  318,  314,   42,   42,  316,   42,   42,   42,
+       42,   42,   42,  317,   42,   42,   42,  321,  322,  326,
+      320,  324,   42,   42,  329,  330,   42,  323,   42,  325,
+
+      331,  328,  333,   42,   42,   42,  327,  334,  336,  332,
+      335,   42,  252,  252,  252,  252,  337,   42,   42,   42,
+      253,   42,  338,  346,  350,   42,  253,  254,  254,  339,
+      340,  340,  340,  340,  340,  340,  340,  340,  256,  256,
+      256,  256,   42,  256,  256,  256,  256,   42,  341,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+      347,   42,   42,   42,   42,   42,   42,  342,  344,  345,
+      349,  352,  357,  351,  358,  354,   42,  348,  355,   42,
+       42,  356,   42,   42,  353,  360,  362,  359,  363,  361,
+       42,   42,  367,   42,   42,  368,  365,  366,   42,   42,
+
+       42,  364,   42,   42,   42,   42,   42,   42,   42,   42,
+       42,   42,  369,  371,  372,  370,  373,  374,  377,  376,
+      381,  375,   42,  383,   42,  402,   42,  382,   42,  378,
+      384,   42,  380,  379,   42,  385,  386,   42,   42,  387,
+       42,  388,  389,   42,  391,   42,   42,  390,   42,   42,
+       42,  393,   42,   42,   42,  396,  392,  394,   42,  395,
+       42,   42,  404,  397,  403,  400,  340,  340,  340,  340,
+       42,   42,  398,   42,   42,   42,  399,  401,  406,  407,
+      408,  412,   42,  405,   42,  410,   42,   42,   42,   42,
+       42,   42,   42,  409,  414,  416,  417,   42,   42,   42,
+
+       42,   42,  413,  418,  415,  419,   42,  421,  420,   42,
+      423,   42,   42,   42,  422,   42,  427,   42,  425,  429,
+       42,  426,  430,  424,   42,  435,  431,  428,   42,  433,
+       42,   42,   42,   42,  434,   42,   42,   42,  432,   42,
+       42,   42,  436,   42,  440,   42,   42,  447,  439,  437,
+      442,  445,  444,   42,  448,  438,  441,   42,  449,  443,
+      446,   42,   42,  451,   42,   42,   42,  450,   42,   42,
+       42,   42,   42,   42,   42,   42,   42,   42,  454,  458,
+      453,  462,  463,  465,  456,  452,   42,   42,   42,  455,
+      460,  461,   42,  459,  466,   42,  467,  457,  464,   42,
+
+      470,  468,   42,   42,   42,   42,   42,   42,   42,   42,
+      472,  469,   42,  479,  477,   42,   42,   42,  478,   42,
+      473,   42,  471,  475,  476,  480,  483,  474,   42,   42,
+      484,  481,  482,   42,   42,   42,   42,  485,   42,   42,
+       42,   42,   42,   42,   42,  486,   42,  487,  492,  493,
+       42,  488,  491,  497,   42,  489,  494,  495,   42,  499,
+       42,  490,  498,   42,  496,   42,   42,   42,  500,   42,
+      501,  505,   42,  503,   42,   42,  504,  506,   42,   42,
+      502,   42,  508,   42,  510,   42,   42,   42,   42,   42,
+      507,  514,   42,  509,   42,  517,  518,  520,  519,  515,
+
+      511,  522,  512,  513,  516,   42,   42,   42,   42,   42,
+       42,  521,  524,  523,   42,  527,   42,   42,   42,   42,
+      528,  525,   42,   42,   42,  531,   42,  533,  535,   42,
+       42,   42,  526,  530,   42,  537,   42,   42,  529,  534,
+      536,  538,  532,  543,  541,   42,   42,  539,   42,   42,
+       42,  540,   42,   42,   42,  544,   42,   42,   42,   42,
+      542,   42,  545,  548,  546,  547,  554,   42,   42,   42,
+      550,  555,  552,  551,  549,  553,   42,   42,   42,  556,
+       42,   42,   42,   42,  560,  561,   42,   42,   42,  557,
+      564,  559,  558,  565,   42,   42,   42,   42,   42,   42,
+
+       42,   42,   42,  566,  563,   42,   42,   42,  562,   39,
+       39,   39,   39,   39,   41,   41,   44,   44,   52,   42,
+       52,   52,   52,   54,   54,  136,  136,  136,  136,  136,
+      144,  144,  144,  144,  144,   42,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
@@ -723,16 +714,17 @@
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
 
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
-       42,  145,   42,  137,  250,   42,   42,   42,   42,  145,
-      137,   42,  135,   42,   40,  562,    3,  562,  562,  562,
-      562,  562,  562,  562,  562,  562,  562,  562,  562,  562,
-      562,  562,  562,  562,  562,  562,  562,  562,  562,  562,
-      562,  562,  562,  562,  562,  562,  562,  562,  562,  562,
-      562,  562,  562,  562,  562,  562,  562,  562,  562,  562,
-      562
+       42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+       42,  145,   42,  137,  251,   42,   42,   42,   42,  145,
+      137,   42,  135,   42,   40,  567,    3,  567,  567,  567,
+      567,  567,  567,  567,  567,  567,  567,  567,  567,  567,
+      567,  567,  567,  567,  567,  567,  567,  567,  567,  567,
+      567,  567,  567,  567,  567,  567,  567,  567,  567,  567,
+      567,  567,  567,  567,  567,  567,  567,  567,  567,  567,
+      567
     } ;
 
-static yyconst short int yy_chk[1272] =
+static yyconst short int yy_chk[1282] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -740,7 +732,7 @@
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    9,   10,   10,   10,   10,   24,
         9,    9,    9,    9,   11,   11,   11,   11,   11,   12,
-      571,  569,   64,   24,   12,   13,   13,   13,   13,   13,
+      576,  574,   64,   24,   12,   13,   13,   13,   13,   13,
        13,   14,   14,   14,   14,   14,   14,   16,   64,   17,
        31,   19,   18,   16,   16,   16,   16,   19,   17,   19,
        31,   21,   18,   36,   62,   17,   18,   17,   13,   17,
@@ -752,8 +744,8 @@
        30,   22,   26,   22,   25,   25,   25,   25,   25,   61,
        26,   27,   33,   30,   35,   26,   25,   27,   33,   26,
        35,   61,   30,   60,   30,   33,   25,   29,   37,   37,
-       57,   33,   59,   35,   33,   66,   60,   29,  561,   29,
-       60,   33,  559,   29,   57,   29,   57,   29,   37,   29,
+       57,   33,   59,   35,   33,   66,   60,   29,  566,   29,
+       60,   33,  564,   29,   57,   29,   57,   29,   37,   29,
        32,   66,   59,   66,   32,   45,   45,   45,   45,   55,
 
        55,   55,   55,   32,   32,   77,   32,   32,   32,   67,
@@ -761,119 +753,120 @@
        70,   32,   34,   69,   77,   71,   34,   47,   47,   47,
        47,   47,   47,   67,   71,   34,   34,   75,   34,   69,
        34,   73,   34,   81,   34,   70,   76,   82,   34,   49,
-       49,   49,   49,   49,   75,   88,   82,   49,  558,  556,
+       49,   49,   49,   49,   75,   88,   82,   49,  563,  561,
        76,   88,   81,   49,   50,   50,   50,   50,   50,   50,
        51,   51,   51,   51,   51,   74,   78,   51,   51,   68,
        51,   51,   51,   51,   51,   51,   78,   68,   80,   84,
        68,   74,   79,   83,   83,   83,   83,   83,   74,   68,
 
        78,   85,   79,   86,   89,   90,   84,   91,   94,   99,
-       86,   96,   80,   92,  100,   95,   91,   89,   97,   99,
-      100,   90,  103,   85,   85,   85,   98,   85,   97,   92,
-       94,   95,   96,   94,  101,  102,   98,  104,  105,  106,
-      107,  103,   97,  101,  108,  109,  114,  111,  110,  102,
-       98,  112,  108,  113,  107,  109,  111,  118,  121,  104,
-      108,  112,  105,  113,  110,  114,  116,  106,  117,  109,
-      115,  111,  108,  110,  120,  112,  123,  115,  121,  118,
-      116,  122,  117,  124,  125,  131,  126,  132,  120,  132,
-      117,  131,  127,  124,  128,  122,  126,  123,  129,  120,
-
-      554,  127,  127,  129,  128,  133,  130,  124,  125,  134,
-      126,  127,  152,  149,  127,  139,  139,  139,  139,  127,
-      130,  169,  130,  139,  148,  151,  159,  133,  156,  139,
-      148,  134,  149,  154,  152,  151,  148,  134,  141,  141,
-      141,  141,  141,  155,  156,  169,  141,  154,  162,  159,
-      161,  155,  141,  142,  142,  158,  142,  142,  142,  142,
-      142,  160,  162,  163,  158,  165,  161,  160,  164,  170,
-      167,  168,  165,  171,  173,  172,  174,  176,  164,  163,
-      167,  172,  164,  175,  177,  179,  180,  176,  178,  170,
-      183,  177,  167,  175,  168,  174,  180,  178,  174,  171,
-
-      175,  181,  173,  182,  184,  179,  185,  186,  187,  183,
-      188,  181,  189,  182,  184,  191,  186,  192,  193,  200,
-      203,  185,  204,  209,  216,  191,  188,  182,  208,  210,
-      187,  214,  553,  209,  193,  192,  552,  189,  207,  219,
-      200,  215,  214,  216,  203,  220,  204,  206,  206,  206,
-      206,  215,  208,  210,  206,  206,  219,  206,  206,  206,
-      206,  206,  206,  219,  207,  222,  223,  220,  224,  225,
-      226,  228,  229,  227,  233,  236,  239,  241,  240,  225,
-      224,  228,  223,  227,  245,  236,  239,  243,  248,  222,
-      226,  227,  240,  233,  241,  242,  243,  244,  229,  245,
-
-      246,  242,  249,  244,  258,  246,  257,  248,  251,  251,
-      251,  251,  258,  547,  252,  252,  251,  252,  252,  252,
-      252,  256,  251,  259,  257,  261,  249,  253,  253,  253,
-      253,  254,  254,  254,  254,  254,  255,  255,  255,  255,
-      255,  259,  262,  261,  256,  264,  265,  266,  262,  267,
-      268,  269,  270,  264,  271,  267,  272,  273,  274,  275,
-      279,  280,  282,  266,  274,  269,  276,  281,  268,  275,
-      265,  271,  272,  285,  276,  286,  287,  290,  291,  273,
-      270,  286,  289,  292,  279,  280,  287,  282,  293,  285,
-      281,  294,  281,  295,  289,  298,  300,  299,  301,  290,
-
-      291,  303,  292,  293,  305,  304,  312,  294,  308,  309,
-      311,  317,  295,  299,  298,  304,  312,  309,  313,  317,
-      300,  311,  308,  305,  316,  301,  303,  319,  321,  313,
-      320,  323,  326,  329,  316,  327,  320,  319,  331,  323,
-      333,  328,  335,  326,  321,  336,  327,  328,  344,  539,
-      348,  329,  341,  335,  338,  338,  338,  338,  341,  336,
-      331,  342,  346,  347,  333,  335,  345,  349,  346,  347,
-      342,  344,  348,  350,  345,  351,  352,  349,  353,  354,
-      350,  355,  357,  362,  360,  361,  365,  364,  353,  355,
-      357,  367,  363,  368,  369,  351,  352,  354,  360,  361,
-
-      370,  362,  363,  364,  365,  372,  375,  374,  373,  377,
-      370,  368,  376,  378,  369,  367,  373,  374,  379,  377,
-      380,  378,  381,  372,  382,  383,  376,  384,  386,  387,
-      391,  375,  379,  388,  389,  393,  383,  395,  396,  380,
-      382,  386,  388,  393,  389,  394,  381,  384,  398,  395,
-      391,  397,  396,  387,  394,  399,  401,  397,  402,  404,
-      405,  406,  408,  412,  409,  410,  413,  417,  412,  412,
-      401,  406,  398,  399,  418,  417,  421,  404,  423,  428,
-      425,  422,  402,  409,  410,  408,  421,  422,  425,  405,
-      413,  418,  429,  431,  432,  433,  435,  436,  440,  446,
-
-      447,  428,  423,  440,  450,  443,  435,  448,  436,  452,
-      429,  449,  432,  433,  456,  446,  448,  431,  443,  453,
-      457,  458,  450,  447,  459,  449,  472,  460,  463,  462,
-      464,  465,  467,  452,  468,  466,  456,  460,  453,  462,
-      459,  469,  457,  468,  463,  466,  464,  470,  458,  473,
-      467,  469,  472,  465,  474,  475,  476,  477,  479,  473,
-      478,  475,  480,  482,  487,  483,  476,  484,  478,  485,
-      474,  470,  488,  489,  480,  495,  497,  498,  499,  485,
-      487,  477,  479,  489,  495,  498,  497,  500,  482,  483,
-      488,  484,  502,  503,  500,  504,  506,  499,  509,  503,
-
-      502,  510,  511,  515,  509,  512,  514,  516,  517,  504,
-      518,  510,  519,  520,  514,  516,  518,  522,  523,  520,
-      506,  524,  512,  525,  517,  526,  511,  515,  519,  529,
-      528,  530,  522,  525,  531,  523,  528,  532,  534,  529,
-      535,  524,  536,  537,  541,  538,  545,  530,  534,  526,
-      531,  540,  541,  532,  542,  543,  544,  546,  548,  550,
-      536,  538,  537,  549,  535,  557,  548,  540,  542,  551,
-      545,  549,  555,  543,  560,  557,  533,  527,  544,  546,
-      555,  521,  513,  508,  507,  505,  501,  496,  494,  550,
-      493,  492,  491,  551,  490,  486,  560,  563,  563,  563,
-
-      563,  563,  564,  564,  565,  565,  566,  481,  566,  566,
-      566,  567,  567,  568,  568,  568,  568,  568,  570,  570,
-      570,  570,  570,  471,  461,  455,  454,  451,  445,  444,
-      442,  441,  439,  438,  437,  434,  430,  427,  426,  424,
-      420,  419,  416,  415,  414,  411,  407,  403,  400,  392,
-      390,  385,  371,  366,  359,  358,  356,  343,  340,  339,
-      337,  334,  332,  330,  325,  324,  322,  318,  315,  314,
-      310,  307,  302,  297,  296,  288,  284,  283,  278,  277,
-      263,  260,  247,  238,  237,  235,  234,  232,  231,  230,
-      221,  218,  217,  213,  212,  211,  205,  202,  201,  199,
+       86,   96,   80,   92,   94,   95,   91,   89,   97,   99,
+      103,   90,  105,   85,   85,   85,   98,   85,   97,   92,
+       94,   95,   96,   94,  100,  101,   98,  102,  104,  103,
+      100,  106,   97,  107,  101,  108,  105,  111,  109,  110,
+       98,  102,  112,  108,  113,  118,  111,  107,  109,  114,
+      104,  108,  112,  115,  113,  110,  116,  117,  120,  106,
+      115,  111,  109,  108,  110,  121,  112,  118,  114,  123,
+      116,  117,  120,  122,  124,  125,  126,  559,  128,  117,
+      558,  130,  127,  120,  124,  121,  126,  122,  128,  129,
+
+      123,  127,  127,  133,  129,  130,  131,  130,  124,  125,
+      126,  127,  131,  132,  127,  132,  134,  149,  148,  127,
+      139,  139,  139,  139,  148,  133,  154,  151,  139,  152,
+      148,  155,  159,  158,  139,  259,  149,  151,  134,  155,
+      154,  156,  158,  259,  134,  141,  141,  141,  141,  141,
+      160,  152,  161,  141,  163,  159,  160,  156,  162,  141,
+      142,  142,  168,  142,  142,  142,  142,  142,  161,  164,
+      163,  165,  162,  169,  167,  170,  171,  173,  165,  164,
+      172,  174,  175,  164,  167,  168,  172,  177,  176,  179,
+      557,  552,  175,  183,  177,  170,  167,  169,  176,  175,
+
+      174,  178,  171,  174,  180,  173,  181,  182,  184,  179,
+      178,  185,  183,  186,  180,  187,  181,  182,  184,  188,
+      189,  201,  186,  191,  192,  193,  185,  204,  194,  205,
+      210,  182,  208,  217,  192,  188,  209,  187,  215,  191,
+      210,  352,  201,  193,  194,  189,  211,  223,  352,  215,
+      221,  204,  217,  205,  207,  207,  207,  207,  208,  220,
+      209,  207,  207,  216,  207,  207,  207,  207,  207,  207,
+      211,  223,  221,  216,  224,  225,  220,  227,  226,  229,
+      230,  228,  234,  220,  237,  240,  241,  225,  226,  229,
+      224,  228,  242,  246,  237,  240,  243,  227,  244,  228,
+
+      241,  234,  243,  249,  245,  250,  230,  244,  246,  242,
+      245,  247,  252,  252,  252,  252,  247,  263,  268,  544,
+      252,  538,  249,  263,  268,  257,  252,  253,  253,  250,
+      253,  253,  253,  253,  254,  254,  254,  254,  255,  255,
+      255,  255,  255,  256,  256,  256,  256,  256,  257,  258,
+      260,  262,  265,  266,  267,  269,  271,  270,  272,  274,
+      265,  280,  273,  282,  276,  281,  275,  258,  260,  262,
+      267,  270,  275,  269,  276,  272,  283,  266,  273,  277,
+      286,  274,  288,  290,  271,  280,  282,  277,  282,  281,
+      291,  287,  288,  292,  293,  290,  286,  287,  296,  294,
+
+      295,  283,  299,  300,  301,  302,  303,  305,  307,  310,
+      306,  338,  291,  293,  294,  292,  295,  296,  301,  300,
+      306,  299,  311,  310,  313,  338,  314,  307,  315,  302,
+      311,  318,  305,  303,  319,  313,  314,  321,  322,  315,
+      323,  318,  319,  325,  322,  331,  328,  321,  329,  330,
+      333,  325,  335,  344,  337,  330,  323,  328,  343,  329,
+      346,  353,  344,  331,  343,  337,  340,  340,  340,  340,
+      347,  350,  333,  348,  349,  351,  335,  337,  347,  348,
+      349,  353,  354,  346,  355,  351,  356,  357,  359,  362,
+      364,  363,  367,  350,  355,  357,  359,  365,  366,  369,
+
+      370,  371,  354,  362,  356,  363,  372,  365,  364,  374,
+      367,  375,  376,  378,  366,  379,  372,  381,  370,  375,
+      377,  371,  376,  369,  380,  381,  377,  374,  382,  379,
+      383,  384,  385,  386,  380,  390,  387,  389,  378,  396,
+      394,  392,  382,  391,  386,  397,  398,  396,  385,  383,
+      389,  392,  391,  399,  397,  384,  387,  400,  398,  390,
+      394,  401,  402,  400,  404,  405,  407,  399,  408,  409,
+      411,  412,  413,  532,  416,  420,  415,  421,  404,  409,
+      402,  415,  415,  420,  407,  401,  424,  426,  432,  405,
+      412,  413,  428,  411,  421,  425,  424,  408,  416,  431,
+
+      428,  425,  433,  435,  439,  436,  437,  440,  444,  451,
+      432,  426,  447,  444,  439,  450,  453,  452,  440,  454,
+      433,  456,  431,  436,  437,  447,  452,  435,  457,  460,
+      453,  450,  451,  461,  462,  526,  463,  454,  464,  466,
+      467,  468,  469,  470,  472,  456,  475,  457,  464,  466,
+      473,  460,  463,  470,  477,  461,  467,  468,  474,  473,
+      479,  462,  472,  478,  469,  480,  482,  481,  474,  484,
+      475,  480,  485,  478,  483,  487,  479,  481,  488,  489,
+      477,  490,  483,  492,  485,  494,  493,  500,  502,  503,
+      482,  490,  504,  484,  505,  494,  500,  503,  502,  492,
+
+      487,  505,  488,  489,  493,  507,  508,  509,  511,  514,
+      515,  504,  508,  507,  516,  514,  517,  519,  520,  521,
+      515,  509,  523,  522,  524,  519,  527,  521,  523,  525,
+      528,  529,  511,  517,  530,  525,  531,  533,  516,  522,
+      524,  527,  520,  533,  530,  534,  535,  528,  536,  537,
+      540,  529,  541,  539,  542,  534,  543,  547,  546,  545,
+      531,  548,  535,  539,  536,  537,  546,  549,  550,  551,
+      541,  547,  543,  542,  540,  545,  553,  554,  555,  548,
+      556,  565,  560,  562,  553,  554,  518,  513,  512,  549,
+      560,  551,  550,  562,  510,  506,  501,  499,  498,  497,
+
+      496,  495,  491,  565,  556,  486,  476,  471,  555,  568,
+      568,  568,  568,  568,  569,  569,  570,  570,  571,  465,
+      571,  571,  571,  572,  572,  573,  573,  573,  573,  573,
+      575,  575,  575,  575,  575,  459,  458,  455,  449,  448,
+      446,  445,  443,  442,  441,  438,  434,  430,  429,  427,
+      423,  422,  419,  418,  417,  414,  410,  406,  403,  395,
+      393,  388,  373,  368,  361,  360,  358,  345,  342,  341,
+      339,  336,  334,  332,  327,  326,  324,  320,  317,  316,
+      312,  309,  304,  298,  297,  289,  285,  284,  279,  278,
+      264,  261,  248,  239,  238,  236,  235,  233,  232,  231,
 
-      198,  197,  196,  195,  194,  190,  166,  157,  153,  150,
+      222,  219,  218,  214,  213,  212,  206,  203,  202,  200,
+      199,  198,  197,  196,  195,  190,  166,  157,  153,  150,
       147,  144,  140,  136,  135,  119,   93,   72,   63,   53,
-       43,   41,   39,    8,    7,    3,  562,  562,  562,  562,
-      562,  562,  562,  562,  562,  562,  562,  562,  562,  562,
-      562,  562,  562,  562,  562,  562,  562,  562,  562,  562,
-      562,  562,  562,  562,  562,  562,  562,  562,  562,  562,
-      562,  562,  562,  562,  562,  562,  562,  562,  562,  562,
-      562
+       43,   41,   39,    8,    7,    3,  567,  567,  567,  567,
+      567,  567,  567,  567,  567,  567,  567,  567,  567,  567,
+      567,  567,  567,  567,  567,  567,  567,  567,  567,  567,
+      567,  567,  567,  567,  567,  567,  567,  567,  567,  567,
+      567,  567,  567,  567,  567,  567,  567,  567,  567,  567,
+      567
     } ;
 
 static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
@@ -890,7 +883,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 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 #define INITIAL 0
 /*===-- Lexer.l - Scanner for llvm assembly files --------------*- C++ -*--===//
 //
@@ -905,7 +898,7 @@
 //
 //===----------------------------------------------------------------------===*/
 #define YY_NEVER_INTERACTIVE 1
-#line 28 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 28 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 #include "ParserInternals.h"
 #include "llvm/Module.h"
 #include "llvm/Support/MathExtras.h"
@@ -1027,7 +1020,7 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 1031 "Lexer.cpp"
+#line 1024 "Lexer.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1175,13 +1168,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 180 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 180 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 
 
-#line 1185 "Lexer.cpp"
+#line 1178 "Lexer.cpp"
 
 	if ( yy_init )
 		{
@@ -1229,14 +1222,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 >= 563 )
+				if ( yy_current_state >= 568 )
 					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 != 562 );
+		while ( yy_current_state != 567 );
 
 yy_find_action:
 		yy_current_state = *--yy_state_ptr;
@@ -1274,272 +1267,277 @@
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 182 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 182 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { /* Ignore comments for now */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 184 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 184 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return BEGINTOK; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 185 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 185 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return ENDTOK; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 186 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 186 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return TRUETOK;  }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 187 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 187 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return FALSETOK; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 188 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 188 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return DECLARE; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 189 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 189 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return DEFINE; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 190 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 190 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return GLOBAL; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 191 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 191 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return CONSTANT; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 192 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 192 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return INTERNAL; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 193 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 193 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return LINKONCE; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 194 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 194 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return WEAK; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 195 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 195 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return APPENDING; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 196 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 196 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return DLLIMPORT; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 197 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 197 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return DLLEXPORT; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 198 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 198 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return HIDDEN; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 199 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 199 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return PROTECTED; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 200 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 200 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return EXTERN_WEAK; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 201 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 201 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return EXTERNAL; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 202 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 202 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return THREAD_LOCAL; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 203 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 203 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return ZEROINITIALIZER; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 204 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 204 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return DOTDOTDOT; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 205 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 205 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return UNDEF; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 206 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 206 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return NULL_TOK; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 207 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 207 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return TO; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 208 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 208 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return TAIL; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 209 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 209 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return TARGET; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 210 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 210 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return TRIPLE; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 211 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 211 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return DEPLIBS; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 212 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 212 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return DATALAYOUT; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 213 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 213 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return VOLATILE; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 214 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 214 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return ALIGN;  }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 215 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 215 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return SECTION; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 216 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 216 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return ALIAS; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 217 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 217 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return MODULE; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 218 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 218 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return ASM_TOK; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 219 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 219 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return SIDEEFFECT; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 221 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 221 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return CC_TOK; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 222 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 222 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return CCC_TOK; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 223 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 223 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return FASTCC_TOK; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 224 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 224 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return COLDCC_TOK; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 225 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 225 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return X86_STDCALLCC_TOK; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 226 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 226 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return X86_FASTCALLCC_TOK; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 228 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 228 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return INREG; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 229 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 229 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return SRET;  }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 230 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 230 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return NOUNWIND; }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 231 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 231 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return NORETURN; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 233 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::VoidTy,  VOID);  }
+#line 232 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+{ return NOALIAS; }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 234 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::FloatTy, FLOAT); }
+#line 234 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::VoidTy,  VOID);  }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 235 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::DoubleTy,DOUBLE);}
+#line 235 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::FloatTy, FLOAT); }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 236 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::LabelTy, LABEL); }
+#line 236 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::DoubleTy,DOUBLE);}
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 237 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return TYPE;   }
+#line 237 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::LabelTy, LABEL); }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 238 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
-{ return OPAQUE; }
+#line 238 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+{ return TYPE;   }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 239 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 239 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+{ return OPAQUE; }
+	YY_BREAK
+case 55:
+YY_RULE_SETUP
+#line 240 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { uint64_t NumBits = atoull(yytext+1);
                   if (NumBits < IntegerType::MIN_INT_BITS || 
                       NumBits > IntegerType::MAX_INT_BITS)
@@ -1548,374 +1546,374 @@
                   RET_TY(Ty, INTTYPE);
                 }
 	YY_BREAK
-case 55:
+case 56:
 YY_RULE_SETUP
-#line 247 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 248 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Add, ADD); }
 	YY_BREAK
-case 56:
+case 57:
 YY_RULE_SETUP
-#line 248 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 249 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Sub, SUB); }
 	YY_BREAK
-case 57:
+case 58:
 YY_RULE_SETUP
-#line 249 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 250 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Mul, MUL); }
 	YY_BREAK
-case 58:
+case 59:
 YY_RULE_SETUP
-#line 250 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 251 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, UDiv, UDIV); }
 	YY_BREAK
-case 59:
+case 60:
 YY_RULE_SETUP
-#line 251 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 252 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SDiv, SDIV); }
 	YY_BREAK
-case 60:
+case 61:
 YY_RULE_SETUP
-#line 252 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 253 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, FDiv, FDIV); }
 	YY_BREAK
-case 61:
+case 62:
 YY_RULE_SETUP
-#line 253 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 254 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, URem, UREM); }
 	YY_BREAK
-case 62:
+case 63:
 YY_RULE_SETUP
-#line 254 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 255 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SRem, SREM); }
 	YY_BREAK
-case 63:
+case 64:
 YY_RULE_SETUP
-#line 255 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 256 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, FRem, FREM); }
 	YY_BREAK
-case 64:
+case 65:
 YY_RULE_SETUP
-#line 256 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 257 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Shl, SHL); }
 	YY_BREAK
-case 65:
+case 66:
 YY_RULE_SETUP
-#line 257 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 258 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, LShr, LSHR); }
 	YY_BREAK
-case 66:
+case 67:
 YY_RULE_SETUP
-#line 258 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 259 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, AShr, ASHR); }
 	YY_BREAK
-case 67:
+case 68:
 YY_RULE_SETUP
-#line 259 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 260 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, And, AND); }
 	YY_BREAK
-case 68:
+case 69:
 YY_RULE_SETUP
-#line 260 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 261 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Or , OR ); }
 	YY_BREAK
-case 69:
+case 70:
 YY_RULE_SETUP
-#line 261 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 262 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Xor, XOR); }
 	YY_BREAK
-case 70:
+case 71:
 YY_RULE_SETUP
-#line 262 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 263 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal,  ICmp,  ICMP); }
 	YY_BREAK
-case 71:
+case 72:
 YY_RULE_SETUP
-#line 263 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 264 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal,  FCmp,  FCMP); }
 	YY_BREAK
-case 72:
+case 73:
 YY_RULE_SETUP
-#line 265 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 266 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return EQ;  }
 	YY_BREAK
-case 73:
+case 74:
 YY_RULE_SETUP
-#line 266 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 267 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return NE;  }
 	YY_BREAK
-case 74:
+case 75:
 YY_RULE_SETUP
-#line 267 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 268 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return SLT; }
 	YY_BREAK
-case 75:
+case 76:
 YY_RULE_SETUP
-#line 268 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 269 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return SGT; }
 	YY_BREAK
-case 76:
+case 77:
 YY_RULE_SETUP
-#line 269 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 270 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return SLE; }
 	YY_BREAK
-case 77:
+case 78:
 YY_RULE_SETUP
-#line 270 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 271 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return SGE; }
 	YY_BREAK
-case 78:
+case 79:
 YY_RULE_SETUP
-#line 271 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 272 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return ULT; }
 	YY_BREAK
-case 79:
+case 80:
 YY_RULE_SETUP
-#line 272 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 273 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return UGT; }
 	YY_BREAK
-case 80:
+case 81:
 YY_RULE_SETUP
-#line 273 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 274 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return ULE; }
 	YY_BREAK
-case 81:
+case 82:
 YY_RULE_SETUP
-#line 274 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 275 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return UGE; }
 	YY_BREAK
-case 82:
+case 83:
 YY_RULE_SETUP
-#line 275 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 276 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return OEQ; }
 	YY_BREAK
-case 83:
+case 84:
 YY_RULE_SETUP
-#line 276 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 277 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return ONE; }
 	YY_BREAK
-case 84:
+case 85:
 YY_RULE_SETUP
-#line 277 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 278 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return OLT; }
 	YY_BREAK
-case 85:
+case 86:
 YY_RULE_SETUP
-#line 278 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 279 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return OGT; }
 	YY_BREAK
-case 86:
+case 87:
 YY_RULE_SETUP
-#line 279 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 280 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return OLE; }
 	YY_BREAK
-case 87:
+case 88:
 YY_RULE_SETUP
-#line 280 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 281 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return OGE; }
 	YY_BREAK
-case 88:
+case 89:
 YY_RULE_SETUP
-#line 281 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 282 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return ORD; }
 	YY_BREAK
-case 89:
+case 90:
 YY_RULE_SETUP
-#line 282 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 283 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return UNO; }
 	YY_BREAK
-case 90:
+case 91:
 YY_RULE_SETUP
-#line 283 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 284 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return UEQ; }
 	YY_BREAK
-case 91:
+case 92:
 YY_RULE_SETUP
-#line 284 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 285 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return UNE; }
 	YY_BREAK
-case 92:
+case 93:
 YY_RULE_SETUP
-#line 286 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 287 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, PHI, PHI_TOK); }
 	YY_BREAK
-case 93:
+case 94:
 YY_RULE_SETUP
-#line 287 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 288 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Call, CALL); }
 	YY_BREAK
-case 94:
+case 95:
 YY_RULE_SETUP
-#line 288 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 289 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, Trunc, TRUNC); }
 	YY_BREAK
-case 95:
+case 96:
 YY_RULE_SETUP
-#line 289 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 290 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, ZExt, ZEXT); }
 	YY_BREAK
-case 96:
+case 97:
 YY_RULE_SETUP
-#line 290 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 291 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, SExt, SEXT); }
 	YY_BREAK
-case 97:
+case 98:
 YY_RULE_SETUP
-#line 291 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 292 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, FPTrunc, FPTRUNC); }
 	YY_BREAK
-case 98:
+case 99:
 YY_RULE_SETUP
-#line 292 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 293 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, FPExt, FPEXT); }
 	YY_BREAK
-case 99:
+case 100:
 YY_RULE_SETUP
-#line 293 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 294 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, UIToFP, UITOFP); }
 	YY_BREAK
-case 100:
+case 101:
 YY_RULE_SETUP
-#line 294 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 295 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, SIToFP, SITOFP); }
 	YY_BREAK
-case 101:
+case 102:
 YY_RULE_SETUP
-#line 295 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 296 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, FPToUI, FPTOUI); }
 	YY_BREAK
-case 102:
+case 103:
 YY_RULE_SETUP
-#line 296 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 297 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, FPToSI, FPTOSI); }
 	YY_BREAK
-case 103:
+case 104:
 YY_RULE_SETUP
-#line 297 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 298 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, IntToPtr, INTTOPTR); }
 	YY_BREAK
-case 104:
+case 105:
 YY_RULE_SETUP
-#line 298 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 299 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, PtrToInt, PTRTOINT); }
 	YY_BREAK
-case 105:
+case 106:
 YY_RULE_SETUP
-#line 299 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 300 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, BitCast, BITCAST); }
 	YY_BREAK
-case 106:
+case 107:
 YY_RULE_SETUP
-#line 300 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 301 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Select, SELECT); }
 	YY_BREAK
-case 107:
+case 108:
 YY_RULE_SETUP
-#line 301 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 302 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, VAArg , VAARG); }
 	YY_BREAK
-case 108:
+case 109:
 YY_RULE_SETUP
-#line 302 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 303 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Ret, RET); }
 	YY_BREAK
-case 109:
+case 110:
 YY_RULE_SETUP
-#line 303 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 304 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Br, BR); }
 	YY_BREAK
-case 110:
+case 111:
 YY_RULE_SETUP
-#line 304 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 305 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Switch, SWITCH); }
 	YY_BREAK
-case 111:
+case 112:
 YY_RULE_SETUP
-#line 305 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 306 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Invoke, INVOKE); }
 	YY_BREAK
-case 112:
+case 113:
 YY_RULE_SETUP
-#line 306 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 307 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
-case 113:
+case 114:
 YY_RULE_SETUP
-#line 307 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 308 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
 	YY_BREAK
-case 114:
+case 115:
 YY_RULE_SETUP
-#line 309 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 310 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Malloc, MALLOC); }
 	YY_BREAK
-case 115:
+case 116:
 YY_RULE_SETUP
-#line 310 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 311 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Alloca, ALLOCA); }
 	YY_BREAK
-case 116:
+case 117:
 YY_RULE_SETUP
-#line 311 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 312 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Free, FREE); }
 	YY_BREAK
-case 117:
+case 118:
 YY_RULE_SETUP
-#line 312 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 313 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Load, LOAD); }
 	YY_BREAK
-case 118:
+case 119:
 YY_RULE_SETUP
-#line 313 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 314 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Store, STORE); }
 	YY_BREAK
-case 119:
+case 120:
 YY_RULE_SETUP
-#line 314 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 315 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
 	YY_BREAK
-case 120:
+case 121:
 YY_RULE_SETUP
-#line 316 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 317 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
 	YY_BREAK
-case 121:
+case 122:
 YY_RULE_SETUP
-#line 317 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 318 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
 	YY_BREAK
-case 122:
+case 123:
 YY_RULE_SETUP
-#line 318 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 319 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
 	YY_BREAK
-case 123:
+case 124:
 YY_RULE_SETUP
-#line 321 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 322 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   llvmAsmlval.StrVal = new std::string(yytext+1);   // Skip %
                   return LOCALVAR;
                 }
 	YY_BREAK
-case 124:
+case 125:
 YY_RULE_SETUP
-#line 325 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 326 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   llvmAsmlval.StrVal = new std::string(yytext+1);   // Skip @
                   return GLOBALVAR;
                 }
 	YY_BREAK
-case 125:
+case 126:
 YY_RULE_SETUP
-#line 329 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 330 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   yytext[yyleng-1] = 0;            // nuke colon
                   llvmAsmlval.StrVal = new std::string(yytext);
                   return LABELSTR;
                 }
 	YY_BREAK
-case 126:
+case 127:
 YY_RULE_SETUP
-#line 334 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 335 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   yytext[yyleng-2] = 0;  // nuke colon, end quote
                   const char* EndChar = UnEscapeLexed(yytext+1, yytext+yyleng);
@@ -1924,9 +1922,9 @@
                   return LABELSTR;
                 }
 	YY_BREAK
-case 127:
+case 128:
 YY_RULE_SETUP
-#line 342 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 343 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { yytext[yyleng-1] = 0;           // nuke end quote
                    const char* EndChar = UnEscapeLexed(yytext+1, yytext+yyleng);
                    llvmAsmlval.StrVal = 
@@ -1934,9 +1932,9 @@
                    return STRINGCONSTANT;
                  }
 	YY_BREAK
-case 128:
+case 129:
 YY_RULE_SETUP
-#line 348 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 349 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                      yytext[yyleng-1] = 0;         // nuke end quote
                      const char* EndChar = 
@@ -1946,9 +1944,9 @@
                      return ATSTRINGCONSTANT;
                    }
 	YY_BREAK
-case 129:
+case 130:
 YY_RULE_SETUP
-#line 356 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 357 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                      yytext[yyleng-1] = 0;           // nuke end quote
                      const char* EndChar = 
@@ -1958,9 +1956,9 @@
                      return PCTSTRINGCONSTANT;
                    }
 	YY_BREAK
-case 130:
+case 131:
 YY_RULE_SETUP
-#line 364 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 365 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { 
                   uint32_t numBits = ((yyleng * 64) / 19) + 1;
                   APInt Tmp(numBits, yytext, yyleng, 10);
@@ -1976,9 +1974,9 @@
                   }
                 }
 	YY_BREAK
-case 131:
+case 132:
 YY_RULE_SETUP
-#line 378 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 379 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   uint32_t numBits = (((yyleng-1) * 64) / 19) + 2;
                   APInt Tmp(numBits, yytext, yyleng, 10);
@@ -1994,9 +1992,9 @@
                   }
                 }
 	YY_BREAK
-case 132:
+case 133:
 YY_RULE_SETUP
-#line 393 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 394 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { int len = yyleng - 3;
                    uint32_t bits = len * 4;
                    APInt Tmp(bits, yytext+3, len, 16);
@@ -2015,9 +2013,9 @@
                    }
                  }
 	YY_BREAK
-case 133:
+case 134:
 YY_RULE_SETUP
-#line 411 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 412 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   if ((unsigned)Val != Val)
@@ -2026,9 +2024,9 @@
                   return LOCALVAL_ID;
                 }
 	YY_BREAK
-case 134:
+case 135:
 YY_RULE_SETUP
-#line 418 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 419 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   if ((unsigned)Val != Val)
@@ -2037,18 +2035,18 @@
                   return GLOBALVAL_ID;
                 }
 	YY_BREAK
-case 135:
+case 136:
 YY_RULE_SETUP
-#line 426 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 427 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = atof(yytext); return FPVAL; }
 	YY_BREAK
-case 136:
+case 137:
 YY_RULE_SETUP
-#line 427 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 428 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = HexToFP(yytext); return FPVAL; }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 429 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 430 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
@@ -2057,22 +2055,22 @@
                   return EOF;
                 }
 	YY_BREAK
-case 137:
+case 138:
 YY_RULE_SETUP
-#line 437 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 438 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { /* Ignore whitespace */ }
 	YY_BREAK
-case 138:
+case 139:
 YY_RULE_SETUP
-#line 438 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 439 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 { return yytext[0]; }
 	YY_BREAK
-case 139:
+case 140:
 YY_RULE_SETUP
-#line 440 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 441 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2076 "Lexer.cpp"
+#line 2074 "Lexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2359,7 +2357,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 >= 563 )
+			if ( yy_current_state >= 568 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2389,11 +2387,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 >= 563 )
+		if ( yy_current_state >= 568 )
 			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 == 562);
+	yy_is_jam = (yy_current_state == 567);
 	if ( ! yy_is_jam )
 		*yy_state_ptr++ = yy_current_state;
 
@@ -2448,7 +2446,6 @@
 #endif	/* ifndef YY_NO_UNPUT */
 
 
-#ifndef YY_NO_INPUT
 #ifdef __cplusplus
 static int yyinput()
 #else
@@ -2522,7 +2519,7 @@
 
 	return c;
 	}
-#endif /* YY_NO_INPUT */
+
 
 #ifdef YY_USE_PROTOS
 void yyrestart( FILE *input_file )
@@ -2633,6 +2630,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 )
@@ -2950,5 +2952,5 @@
 	return 0;
 	}
 #endif
-#line 440 "/proj/llvm/llvm-4/lib/AsmParser/Lexer.l"
+#line 441 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
 

Modified: llvm/trunk/lib/AsmParser/Lexer.l.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/Lexer.l.cvs?rev=37918&r1=37917&r2=37918&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/Lexer.l.cvs (original)
+++ llvm/trunk/lib/AsmParser/Lexer.l.cvs Thu Jul  5 12:26:49 2007
@@ -229,6 +229,7 @@
 sret            { return SRET;  }
 nounwind        { return NOUNWIND; }
 noreturn        { return NORETURN; }
+noalias         { return NOALIAS; }
 
 void            { RET_TY(Type::VoidTy,  VOID);  }
 float           { RET_TY(Type::FloatTy, FLOAT); }

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs?rev=37918&r1=37917&r2=37918&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs Thu Jul  5 12:26:49 2007
@@ -1,348 +1,154 @@
-/* A Bison parser, made by GNU Bison 2.1.  */
 
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/*  A Bison parser, made from /Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y
+    by GNU Bison version 1.28  */
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* Written by Richard Stallman by simplifying the original so called
-   ``semantic'' parser.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
-
-/* Identify Bison output.  */
-#define YYBISON 1
-
-/* Bison version.  */
-#define YYBISON_VERSION "2.1"
-
-/* Skeleton name.  */
-#define YYSKELETON_NAME "yacc.c"
-
-/* Pure parsers.  */
-#define YYPURE 0
-
-/* Using locations.  */
-#define YYLSP_NEEDED 0
+#define YYBISON 1  /* Identify Bison output.  */
 
-/* Substitute the variable and function names.  */
 #define yyparse llvmAsmparse
-#define yylex   llvmAsmlex
+#define yylex llvmAsmlex
 #define yyerror llvmAsmerror
-#define yylval  llvmAsmlval
-#define yychar  llvmAsmchar
+#define yylval llvmAsmlval
+#define yychar llvmAsmchar
 #define yydebug llvmAsmdebug
 #define yynerrs llvmAsmnerrs
+#define	ESINT64VAL	257
+#define	EUINT64VAL	258
+#define	ESAPINTVAL	259
+#define	EUAPINTVAL	260
+#define	LOCALVAL_ID	261
+#define	GLOBALVAL_ID	262
+#define	FPVAL	263
+#define	VOID	264
+#define	INTTYPE	265
+#define	FLOAT	266
+#define	DOUBLE	267
+#define	LABEL	268
+#define	TYPE	269
+#define	LOCALVAR	270
+#define	GLOBALVAR	271
+#define	LABELSTR	272
+#define	STRINGCONSTANT	273
+#define	ATSTRINGCONSTANT	274
+#define	PCTSTRINGCONSTANT	275
+#define	ZEROINITIALIZER	276
+#define	TRUETOK	277
+#define	FALSETOK	278
+#define	BEGINTOK	279
+#define	ENDTOK	280
+#define	DECLARE	281
+#define	DEFINE	282
+#define	GLOBAL	283
+#define	CONSTANT	284
+#define	SECTION	285
+#define	ALIAS	286
+#define	VOLATILE	287
+#define	THREAD_LOCAL	288
+#define	TO	289
+#define	DOTDOTDOT	290
+#define	NULL_TOK	291
+#define	UNDEF	292
+#define	INTERNAL	293
+#define	LINKONCE	294
+#define	WEAK	295
+#define	APPENDING	296
+#define	DLLIMPORT	297
+#define	DLLEXPORT	298
+#define	EXTERN_WEAK	299
+#define	OPAQUE	300
+#define	EXTERNAL	301
+#define	TARGET	302
+#define	TRIPLE	303
+#define	ALIGN	304
+#define	DEPLIBS	305
+#define	CALL	306
+#define	TAIL	307
+#define	ASM_TOK	308
+#define	MODULE	309
+#define	SIDEEFFECT	310
+#define	CC_TOK	311
+#define	CCC_TOK	312
+#define	FASTCC_TOK	313
+#define	COLDCC_TOK	314
+#define	X86_STDCALLCC_TOK	315
+#define	X86_FASTCALLCC_TOK	316
+#define	DATALAYOUT	317
+#define	RET	318
+#define	BR	319
+#define	SWITCH	320
+#define	INVOKE	321
+#define	UNWIND	322
+#define	UNREACHABLE	323
+#define	ADD	324
+#define	SUB	325
+#define	MUL	326
+#define	UDIV	327
+#define	SDIV	328
+#define	FDIV	329
+#define	UREM	330
+#define	SREM	331
+#define	FREM	332
+#define	AND	333
+#define	OR	334
+#define	XOR	335
+#define	SHL	336
+#define	LSHR	337
+#define	ASHR	338
+#define	ICMP	339
+#define	FCMP	340
+#define	EQ	341
+#define	NE	342
+#define	SLT	343
+#define	SGT	344
+#define	SLE	345
+#define	SGE	346
+#define	ULT	347
+#define	UGT	348
+#define	ULE	349
+#define	UGE	350
+#define	OEQ	351
+#define	ONE	352
+#define	OLT	353
+#define	OGT	354
+#define	OLE	355
+#define	OGE	356
+#define	ORD	357
+#define	UNO	358
+#define	UEQ	359
+#define	UNE	360
+#define	MALLOC	361
+#define	ALLOCA	362
+#define	FREE	363
+#define	LOAD	364
+#define	STORE	365
+#define	GETELEMENTPTR	366
+#define	TRUNC	367
+#define	ZEXT	368
+#define	SEXT	369
+#define	FPTRUNC	370
+#define	FPEXT	371
+#define	BITCAST	372
+#define	UITOFP	373
+#define	SITOFP	374
+#define	FPTOUI	375
+#define	FPTOSI	376
+#define	INTTOPTR	377
+#define	PTRTOINT	378
+#define	PHI_TOK	379
+#define	SELECT	380
+#define	VAARG	381
+#define	EXTRACTELEMENT	382
+#define	INSERTELEMENT	383
+#define	SHUFFLEVECTOR	384
+#define	NORETURN	385
+#define	INREG	386
+#define	SRET	387
+#define	NOUNWIND	388
+#define	NOALIAS	389
+#define	DEFAULT	390
+#define	HIDDEN	391
+#define	PROTECTED	392
 
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     ESINT64VAL = 258,
-     EUINT64VAL = 259,
-     ESAPINTVAL = 260,
-     EUAPINTVAL = 261,
-     LOCALVAL_ID = 262,
-     GLOBALVAL_ID = 263,
-     FPVAL = 264,
-     VOID = 265,
-     INTTYPE = 266,
-     FLOAT = 267,
-     DOUBLE = 268,
-     LABEL = 269,
-     TYPE = 270,
-     LOCALVAR = 271,
-     GLOBALVAR = 272,
-     LABELSTR = 273,
-     STRINGCONSTANT = 274,
-     ATSTRINGCONSTANT = 275,
-     PCTSTRINGCONSTANT = 276,
-     ZEROINITIALIZER = 277,
-     TRUETOK = 278,
-     FALSETOK = 279,
-     BEGINTOK = 280,
-     ENDTOK = 281,
-     DECLARE = 282,
-     DEFINE = 283,
-     GLOBAL = 284,
-     CONSTANT = 285,
-     SECTION = 286,
-     ALIAS = 287,
-     VOLATILE = 288,
-     THREAD_LOCAL = 289,
-     TO = 290,
-     DOTDOTDOT = 291,
-     NULL_TOK = 292,
-     UNDEF = 293,
-     INTERNAL = 294,
-     LINKONCE = 295,
-     WEAK = 296,
-     APPENDING = 297,
-     DLLIMPORT = 298,
-     DLLEXPORT = 299,
-     EXTERN_WEAK = 300,
-     OPAQUE = 301,
-     EXTERNAL = 302,
-     TARGET = 303,
-     TRIPLE = 304,
-     ALIGN = 305,
-     DEPLIBS = 306,
-     CALL = 307,
-     TAIL = 308,
-     ASM_TOK = 309,
-     MODULE = 310,
-     SIDEEFFECT = 311,
-     CC_TOK = 312,
-     CCC_TOK = 313,
-     FASTCC_TOK = 314,
-     COLDCC_TOK = 315,
-     X86_STDCALLCC_TOK = 316,
-     X86_FASTCALLCC_TOK = 317,
-     DATALAYOUT = 318,
-     RET = 319,
-     BR = 320,
-     SWITCH = 321,
-     INVOKE = 322,
-     UNWIND = 323,
-     UNREACHABLE = 324,
-     ADD = 325,
-     SUB = 326,
-     MUL = 327,
-     UDIV = 328,
-     SDIV = 329,
-     FDIV = 330,
-     UREM = 331,
-     SREM = 332,
-     FREM = 333,
-     AND = 334,
-     OR = 335,
-     XOR = 336,
-     SHL = 337,
-     LSHR = 338,
-     ASHR = 339,
-     ICMP = 340,
-     FCMP = 341,
-     EQ = 342,
-     NE = 343,
-     SLT = 344,
-     SGT = 345,
-     SLE = 346,
-     SGE = 347,
-     ULT = 348,
-     UGT = 349,
-     ULE = 350,
-     UGE = 351,
-     OEQ = 352,
-     ONE = 353,
-     OLT = 354,
-     OGT = 355,
-     OLE = 356,
-     OGE = 357,
-     ORD = 358,
-     UNO = 359,
-     UEQ = 360,
-     UNE = 361,
-     MALLOC = 362,
-     ALLOCA = 363,
-     FREE = 364,
-     LOAD = 365,
-     STORE = 366,
-     GETELEMENTPTR = 367,
-     TRUNC = 368,
-     ZEXT = 369,
-     SEXT = 370,
-     FPTRUNC = 371,
-     FPEXT = 372,
-     BITCAST = 373,
-     UITOFP = 374,
-     SITOFP = 375,
-     FPTOUI = 376,
-     FPTOSI = 377,
-     INTTOPTR = 378,
-     PTRTOINT = 379,
-     PHI_TOK = 380,
-     SELECT = 381,
-     VAARG = 382,
-     EXTRACTELEMENT = 383,
-     INSERTELEMENT = 384,
-     SHUFFLEVECTOR = 385,
-     NORETURN = 386,
-     INREG = 387,
-     SRET = 388,
-     NOUNWIND = 389,
-     DEFAULT = 390,
-     HIDDEN = 391,
-     PROTECTED = 392
-   };
-#endif
-/* Tokens.  */
-#define ESINT64VAL 258
-#define EUINT64VAL 259
-#define ESAPINTVAL 260
-#define EUAPINTVAL 261
-#define LOCALVAL_ID 262
-#define GLOBALVAL_ID 263
-#define FPVAL 264
-#define VOID 265
-#define INTTYPE 266
-#define FLOAT 267
-#define DOUBLE 268
-#define LABEL 269
-#define TYPE 270
-#define LOCALVAR 271
-#define GLOBALVAR 272
-#define LABELSTR 273
-#define STRINGCONSTANT 274
-#define ATSTRINGCONSTANT 275
-#define PCTSTRINGCONSTANT 276
-#define ZEROINITIALIZER 277
-#define TRUETOK 278
-#define FALSETOK 279
-#define BEGINTOK 280
-#define ENDTOK 281
-#define DECLARE 282
-#define DEFINE 283
-#define GLOBAL 284
-#define CONSTANT 285
-#define SECTION 286
-#define ALIAS 287
-#define VOLATILE 288
-#define THREAD_LOCAL 289
-#define TO 290
-#define DOTDOTDOT 291
-#define NULL_TOK 292
-#define UNDEF 293
-#define INTERNAL 294
-#define LINKONCE 295
-#define WEAK 296
-#define APPENDING 297
-#define DLLIMPORT 298
-#define DLLEXPORT 299
-#define EXTERN_WEAK 300
-#define OPAQUE 301
-#define EXTERNAL 302
-#define TARGET 303
-#define TRIPLE 304
-#define ALIGN 305
-#define DEPLIBS 306
-#define CALL 307
-#define TAIL 308
-#define ASM_TOK 309
-#define MODULE 310
-#define SIDEEFFECT 311
-#define CC_TOK 312
-#define CCC_TOK 313
-#define FASTCC_TOK 314
-#define COLDCC_TOK 315
-#define X86_STDCALLCC_TOK 316
-#define X86_FASTCALLCC_TOK 317
-#define DATALAYOUT 318
-#define RET 319
-#define BR 320
-#define SWITCH 321
-#define INVOKE 322
-#define UNWIND 323
-#define UNREACHABLE 324
-#define ADD 325
-#define SUB 326
-#define MUL 327
-#define UDIV 328
-#define SDIV 329
-#define FDIV 330
-#define UREM 331
-#define SREM 332
-#define FREM 333
-#define AND 334
-#define OR 335
-#define XOR 336
-#define SHL 337
-#define LSHR 338
-#define ASHR 339
-#define ICMP 340
-#define FCMP 341
-#define EQ 342
-#define NE 343
-#define SLT 344
-#define SGT 345
-#define SLE 346
-#define SGE 347
-#define ULT 348
-#define UGT 349
-#define ULE 350
-#define UGE 351
-#define OEQ 352
-#define ONE 353
-#define OLT 354
-#define OGT 355
-#define OLE 356
-#define OGE 357
-#define ORD 358
-#define UNO 359
-#define UEQ 360
-#define UNE 361
-#define MALLOC 362
-#define ALLOCA 363
-#define FREE 364
-#define LOAD 365
-#define STORE 366
-#define GETELEMENTPTR 367
-#define TRUNC 368
-#define ZEXT 369
-#define SEXT 370
-#define FPTRUNC 371
-#define FPEXT 372
-#define BITCAST 373
-#define UITOFP 374
-#define SITOFP 375
-#define FPTOUI 376
-#define FPTOSI 377
-#define INTTOPTR 378
-#define PTRTOINT 379
-#define PHI_TOK 380
-#define SELECT 381
-#define VAARG 382
-#define EXTRACTELEMENT 383
-#define INSERTELEMENT 384
-#define SHUFFLEVECTOR 385
-#define NORETURN 386
-#define INREG 387
-#define SRET 388
-#define NOUNWIND 389
-#define DEFAULT 390
-#define HIDDEN 391
-#define PROTECTED 392
-
-
-
-
-/* Copy the first part of user declarations.  */
-#line 14 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 14 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -1285,28 +1091,8 @@
 }
 
 
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
-
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 957 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-typedef union YYSTYPE {
+#line 957 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+typedef union {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   llvm::BasicBlock                       *BasicBlockVal;
@@ -1352,1578 +1138,1097 @@
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
 } YYSTYPE;
-/* Line 196 of yacc.c.  */
-#line 1357 "llvmAsmParser.tab.c"
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
-#endif
-
-
-
-/* Copy the second part of user declarations.  */
-
-
-/* Line 219 of yacc.c.  */
-#line 1369 "llvmAsmParser.tab.c"
-
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus))
-# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
-#ifndef YY_
-# if YYENABLE_NLS
-#  if ENABLE_NLS
-#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
-#  endif
-# endif
-# ifndef YY_
-#  define YY_(msgid) msgid
-# endif
-#endif
-
-#if ! defined (yyoverflow) || YYERROR_VERBOSE
-
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-
-# ifdef YYSTACK_USE_ALLOCA
-#  if YYSTACK_USE_ALLOCA
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
-#   else
-#    define YYSTACK_ALLOC alloca
-#    if defined (__STDC__) || defined (__cplusplus)
-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     define YYINCLUDED_STDLIB_H
-#    endif
-#   endif
-#  endif
-# endif
-
-# ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning. */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-    /* The OS might guarantee only one guard page at the bottom of the stack,
-       and a page size can be as small as 4096 bytes.  So we cannot safely
-       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
-       to allow for a few compiler-allocated temporary stack slots.  */
-#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */
-#  endif
-# else
-#  define YYSTACK_ALLOC YYMALLOC
-#  define YYSTACK_FREE YYFREE
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-#   define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1)
-#  endif
-#  ifdef __cplusplus
-extern "C" {
-#  endif
-#  ifndef YYMALLOC
-#   define YYMALLOC malloc
-#   if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \
-	&& (defined (__STDC__) || defined (__cplusplus)))
-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-#  ifndef YYFREE
-#   define YYFREE free
-#   if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \
-	&& (defined (__STDC__) || defined (__cplusplus)))
-void free (void *); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-#  ifdef __cplusplus
-}
-#  endif
-# endif
-#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
+#include <stdio.h>
 
+#ifndef __cplusplus
+#ifndef __STDC__
+#define const
+#endif
+#endif
 
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
 
-/* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  short int yyss;
-  YYSTYPE yyvs;
-  };
 
-/* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+#define	YYFINAL		583
+#define	YYFLAG		-32768
+#define	YYNTBASE	153
+
+#define YYTRANSLATE(x) ((unsigned)(x) <= 392 ? yytranslate[x] : 234)
+
+static const short yytranslate[] = {     0,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,   143,
+   144,   141,     2,   140,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,   148,
+   139,   149,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+   145,   142,   147,     2,     2,     2,     2,     2,   152,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,   146,
+     2,     2,   150,     2,   151,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     1,     3,     4,     5,     6,
+     7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+    17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+    27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
+    37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+    47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+    57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
+    67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+    77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+    87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+    97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
+   107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
+   117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+   127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+   137,   138
+};
 
-/* The size of an array large to enough to hold all stacks, each with
-   N elements.  */
-# define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short int) + sizeof (YYSTYPE))			\
-      + YYSTACK_GAP_MAXIMUM)
-
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined (__GNUC__) && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  YYSIZE_T yyi;				\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (0)
-#  endif
-# endif
-
-/* Relocate STACK from its old location to the new one.  The
-   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-   elements in the stack, and YYPTR gives the new location of the
-   stack.  Advance YYPTR to a properly aligned location for the next
-   stack.  */
-# define YYSTACK_RELOCATE(Stack)					\
-    do									\
-      {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack, Stack, yysize);				\
-	Stack = &yyptr->Stack;						\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-	yyptr += yynewbytes / sizeof (*yyptr);				\
-      }									\
-    while (0)
+#if YYDEBUG != 0
+static const short yyprhs[] = {     0,
+     0,     2,     4,     6,     8,    10,    12,    14,    16,    18,
+    20,    22,    24,    26,    28,    30,    32,    34,    36,    38,
+    40,    42,    44,    46,    48,    50,    52,    54,    56,    58,
+    60,    62,    64,    66,    68,    70,    72,    74,    76,    78,
+    80,    82,    84,    86,    88,    90,    92,    94,    96,    98,
+   100,   102,   104,   106,   108,   110,   112,   114,   116,   118,
+   120,   121,   124,   125,   127,   129,   131,   132,   135,   137,
+   139,   141,   143,   145,   147,   149,   151,   152,   154,   156,
+   158,   159,   161,   163,   164,   166,   168,   170,   172,   173,
+   175,   177,   178,   180,   182,   184,   186,   188,   191,   193,
+   195,   197,   199,   201,   202,   205,   207,   209,   211,   212,
+   215,   216,   219,   220,   224,   227,   228,   230,   231,   235,
+   237,   240,   242,   244,   246,   248,   250,   252,   255,   257,
+   260,   266,   272,   278,   284,   288,   291,   297,   302,   305,
+   307,   309,   311,   315,   317,   321,   323,   324,   326,   330,
+   335,   339,   343,   348,   353,   357,   364,   370,   373,   376,
+   379,   382,   385,   388,   391,   394,   397,   400,   403,   406,
+   413,   419,   428,   435,   442,   450,   458,   465,   474,   483,
+   487,   489,   491,   493,   495,   496,   499,   506,   508,   509,
+   511,   514,   515,   519,   520,   524,   528,   532,   536,   537,
+   545,   546,   555,   556,   565,   571,   574,   578,   580,   584,
+   588,   592,   596,   598,   599,   605,   609,   611,   615,   617,
+   618,   628,   630,   632,   637,   639,   641,   644,   648,   649,
+   651,   653,   655,   657,   659,   661,   663,   665,   667,   671,
+   673,   679,   681,   683,   685,   687,   689,   691,   694,   697,
+   700,   704,   707,   708,   710,   713,   716,   720,   730,   740,
+   749,   764,   766,   768,   775,   781,   784,   791,   799,   803,
+   809,   810,   811,   815,   818,   820,   826,   832,   839,   846,
+   851,   858,   863,   868,   875,   882,   885,   894,   896,   898,
+   899,   903,   910,   914,   921,   924,   930,   938
+};
 
-#endif
+static const short yyrhs[] = {    70,
+     0,    71,     0,    72,     0,    73,     0,    74,     0,    75,
+     0,    76,     0,    77,     0,    78,     0,    82,     0,    83,
+     0,    84,     0,    79,     0,    80,     0,    81,     0,   113,
+     0,   114,     0,   115,     0,   116,     0,   117,     0,   118,
+     0,   119,     0,   120,     0,   121,     0,   122,     0,   123,
+     0,   124,     0,    87,     0,    88,     0,    89,     0,    90,
+     0,    91,     0,    92,     0,    93,     0,    94,     0,    95,
+     0,    96,     0,    97,     0,    98,     0,    99,     0,   100,
+     0,   101,     0,   102,     0,   103,     0,   104,     0,   105,
+     0,   106,     0,    93,     0,    94,     0,    95,     0,    96,
+     0,    23,     0,    24,     0,    11,     0,    12,     0,    13,
+     0,    16,     0,    19,     0,    21,     0,   160,     0,     0,
+   160,   139,     0,     0,    17,     0,    20,     0,   165,     0,
+     0,   163,   139,     0,    39,     0,    41,     0,    40,     0,
+    42,     0,    44,     0,    43,     0,    45,     0,    47,     0,
+     0,   136,     0,   137,     0,   138,     0,     0,    43,     0,
+    45,     0,     0,    39,     0,    40,     0,    41,     0,    44,
+     0,     0,    41,     0,    39,     0,     0,    58,     0,    59,
+     0,    60,     0,    61,     0,    62,     0,    57,     4,     0,
+   114,     0,   115,     0,   132,     0,   133,     0,   135,     0,
+     0,   174,   173,     0,   131,     0,   134,     0,   173,     0,
+     0,   176,   175,     0,     0,    50,     4,     0,     0,   140,
+    50,     4,     0,    31,    19,     0,     0,   179,     0,     0,
+   140,   182,   181,     0,   179,     0,    50,     4,     0,    11,
+     0,    12,     0,    13,     0,    14,     0,    46,     0,   183,
+     0,   184,   141,     0,   218,     0,   142,     4,     0,   184,
+   143,   188,   144,   176,     0,    10,   143,   188,   144,   176,
+     0,   145,     4,   146,   184,   147,     0,   148,     4,   146,
+   184,   149,     0,   150,   189,   151,     0,   150,   151,     0,
+   148,   150,   189,   151,   149,     0,   148,   150,   151,   149,
+     0,   184,   174,     0,   184,     0,    10,     0,   185,     0,
+   187,   140,   185,     0,   187,     0,   187,   140,    36,     0,
+    36,     0,     0,   184,     0,   189,   140,   184,     0,   184,
+   145,   192,   147,     0,   184,   145,   147,     0,   184,   152,
+    19,     0,   184,   148,   192,   149,     0,   184,   150,   192,
+   151,     0,   184,   150,   151,     0,   184,   148,   150,   192,
+   151,   149,     0,   184,   148,   150,   151,   149,     0,   184,
+    37,     0,   184,    38,     0,   184,   218,     0,   184,   191,
+     0,   184,    22,     0,   158,     3,     0,   158,     5,     0,
+   158,     4,     0,   158,     6,     0,    11,    23,     0,    11,
+    24,     0,   159,     9,     0,   155,   143,   190,    35,   184,
+   144,     0,   112,   143,   190,   229,   144,     0,   126,   143,
+   190,   140,   190,   140,   190,   144,     0,   153,   143,   190,
+   140,   190,   144,     0,   154,   143,   190,   140,   190,   144,
+     0,    85,   156,   143,   190,   140,   190,   144,     0,    86,
+   157,   143,   190,   140,   190,   144,     0,   128,   143,   190,
+   140,   190,   144,     0,   129,   143,   190,   140,   190,   140,
+   190,   144,     0,   130,   143,   190,   140,   190,   140,   190,
+   144,     0,   192,   140,   190,     0,   190,     0,    29,     0,
+    30,     0,    34,     0,     0,   186,   218,     0,   118,   143,
+   195,    35,   184,   144,     0,   197,     0,     0,   198,     0,
+   197,   198,     0,     0,    28,   199,   214,     0,     0,    27,
+   200,   215,     0,    55,    54,   204,     0,   162,    15,   184,
+     0,   162,    15,    10,     0,     0,   164,   168,   194,   193,
+   190,   201,   181,     0,     0,   164,   166,   168,   194,   193,
+   190,   202,   181,     0,     0,   164,   167,   168,   194,   193,
+   184,   203,   181,     0,   164,   168,    32,   171,   195,     0,
+    48,   205,     0,    51,   139,   206,     0,    19,     0,    49,
+   139,    19,     0,    63,   139,    19,     0,   145,   207,   147,
+     0,   207,   140,    19,     0,    19,     0,     0,   208,   140,
+   184,   174,   161,     0,   184,   174,   161,     0,   208,     0,
+   208,   140,    36,     0,    36,     0,     0,   172,   186,   163,
+   143,   209,   144,   176,   180,   177,     0,    25,     0,   150,
+     0,   170,   168,   210,   211,     0,    26,     0,   151,     0,
+   221,   213,     0,   169,   168,   210,     0,     0,    56,     0,
+     3,     0,     4,     0,     9,     0,    23,     0,    24,     0,
+    37,     0,    38,     0,    22,     0,   148,   192,   149,     0,
+   191,     0,    54,   216,    19,   140,    19,     0,     7,     0,
+     8,     0,   160,     0,   163,     0,   218,     0,   217,     0,
+   184,   219,     0,   221,   222,     0,   212,   222,     0,   223,
+   162,   224,     0,   223,   226,     0,     0,    18,     0,    64,
+   220,     0,    64,    10,     0,    65,    14,   219,     0,    65,
+    11,   219,   140,    14,   219,   140,    14,   219,     0,    66,
+   158,   219,   140,    14,   219,   145,   225,   147,     0,    66,
+   158,   219,   140,    14,   219,   145,   147,     0,    67,   172,
+   186,   219,   143,   228,   144,   176,    35,    14,   219,    68,
+    14,   219,     0,    68,     0,    69,     0,   225,   158,   217,
+   140,    14,   219,     0,   158,   217,   140,    14,   219,     0,
+   162,   231,     0,   184,   145,   219,   140,   219,   147,     0,
+   227,   140,   145,   219,   140,   219,   147,     0,   184,   219,
+   174,     0,   228,   140,   184,   219,   174,     0,     0,     0,
+   229,   140,   220,     0,    53,    52,     0,    52,     0,   153,
+   184,   219,   140,   219,     0,   154,   184,   219,   140,   219,
+     0,    85,   156,   184,   219,   140,   219,     0,    86,   157,
+   184,   219,   140,   219,     0,   155,   220,    35,   184,     0,
+   126,   220,   140,   220,   140,   220,     0,   127,   220,   140,
+   184,     0,   128,   220,   140,   220,     0,   129,   220,   140,
+   220,   140,   220,     0,   130,   220,   140,   220,   140,   220,
+     0,   125,   227,     0,   230,   172,   186,   219,   143,   228,
+   144,   176,     0,   233,     0,    33,     0,     0,   107,   184,
+   178,     0,   107,   184,   140,    11,   219,   178,     0,   108,
+   184,   178,     0,   108,   184,   140,    11,   219,   178,     0,
+   109,   220,     0,   232,   110,   184,   219,   178,     0,   232,
+   111,   220,   140,   184,   219,   178,     0,   112,   184,   219,
+   229,     0
+};
 
-#if defined (__STDC__) || defined (__cplusplus)
-   typedef signed char yysigned_char;
-#else
-   typedef short int yysigned_char;
 #endif
 
-/* YYFINAL -- State number of the termination state. */
-#define YYFINAL  43
-/* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1610
-
-/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS  152
-/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS  82
-/* YYNRULES -- Number of rules. */
-#define YYNRULES  298
-/* YYNRULES -- Number of states. */
-#define YYNSTATES  582
-
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
-#define YYUNDEFTOK  2
-#define YYMAXUTOK   392
-
-#define YYTRANSLATE(YYX)						\
-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const unsigned char yytranslate[] =
-{
-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     142,   143,   140,     2,   139,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     147,   138,   148,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   144,   141,   146,     2,     2,     2,     2,     2,   151,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     145,     2,     2,   149,     2,   150,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137
+#if YYDEBUG != 0
+static const short yyrline[] = { 0,
+  1116,  1116,  1116,  1116,  1116,  1116,  1116,  1116,  1116,  1117,
+  1117,  1117,  1117,  1117,  1117,  1118,  1118,  1118,  1118,  1118,
+  1118,  1118,  1119,  1119,  1119,  1119,  1119,  1122,  1122,  1123,
+  1123,  1124,  1124,  1125,  1125,  1126,  1126,  1130,  1130,  1131,
+  1131,  1132,  1132,  1133,  1133,  1134,  1134,  1135,  1135,  1136,
+  1136,  1137,  1138,  1143,  1144,  1144,  1146,  1146,  1146,  1147,
+  1147,  1151,  1155,  1160,  1160,  1162,  1163,  1168,  1174,  1175,
+  1176,  1177,  1178,  1182,  1183,  1184,  1188,  1189,  1190,  1191,
+  1195,  1196,  1197,  1201,  1202,  1203,  1204,  1205,  1209,  1210,
+  1211,  1214,  1214,  1215,  1216,  1217,  1218,  1219,  1227,  1228,
+  1229,  1230,  1231,  1234,  1235,  1240,  1241,  1242,  1245,  1246,
+  1253,  1253,  1260,  1260,  1269,  1277,  1277,  1283,  1283,  1285,
+  1290,  1303,  1303,  1303,  1303,  1306,  1310,  1314,  1321,  1326,
+  1334,  1364,  1395,  1400,  1412,  1422,  1426,  1436,  1443,  1450,
+  1457,  1462,  1467,  1474,  1475,  1482,  1489,  1497,  1503,  1515,
+  1543,  1559,  1586,  1614,  1640,  1660,  1686,  1706,  1718,  1725,
+  1791,  1801,  1811,  1817,  1827,  1833,  1843,  1848,  1853,  1861,
+  1873,  1895,  1903,  1909,  1920,  1925,  1930,  1936,  1942,  1951,
+  1955,  1963,  1963,  1966,  1966,  1969,  1980,  2001,  2006,  2014,
+  2015,  2019,  2019,  2023,  2023,  2026,  2029,  2053,  2064,  2071,
+  2074,  2080,  2083,  2090,  2094,  2113,  2116,  2122,  2132,  2136,
+  2141,  2143,  2148,  2153,  2162,  2172,  2183,  2187,  2196,  2205,
+  2210,  2331,  2331,  2333,  2342,  2342,  2344,  2349,  2361,  2365,
+  2370,  2374,  2378,  2382,  2386,  2390,  2394,  2398,  2402,  2427,
+  2431,  2441,  2445,  2449,  2454,  2461,  2461,  2467,  2476,  2480,
+  2489,  2498,  2507,  2511,  2518,  2522,  2526,  2531,  2541,  2560,
+  2569,  2649,  2653,  2660,  2671,  2684,  2694,  2705,  2715,  2724,
+  2733,  2736,  2737,  2744,  2748,  2753,  2774,  2791,  2805,  2819,
+  2831,  2839,  2846,  2852,  2858,  2864,  2879,  2964,  2969,  2973,
+  2980,  2987,  2995,  3002,  3010,  3018,  3032,  3049
 };
+#endif
 
-#if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const unsigned short int yyprhs[] =
-{
-       0,     0,     3,     5,     7,     9,    11,    13,    15,    17,
-      19,    21,    23,    25,    27,    29,    31,    33,    35,    37,
-      39,    41,    43,    45,    47,    49,    51,    53,    55,    57,
-      59,    61,    63,    65,    67,    69,    71,    73,    75,    77,
-      79,    81,    83,    85,    87,    89,    91,    93,    95,    97,
-      99,   101,   103,   105,   107,   109,   111,   113,   115,   117,
-     119,   121,   123,   124,   127,   128,   130,   132,   134,   135,
-     138,   140,   142,   144,   146,   148,   150,   152,   154,   155,
-     157,   159,   161,   162,   164,   166,   167,   169,   171,   173,
-     175,   176,   178,   180,   181,   183,   185,   187,   189,   191,
-     194,   196,   198,   200,   202,   203,   206,   208,   210,   212,
-     213,   216,   217,   220,   221,   225,   228,   229,   231,   232,
-     236,   238,   241,   243,   245,   247,   249,   251,   253,   256,
-     258,   261,   267,   273,   279,   285,   289,   292,   298,   303,
-     306,   308,   310,   312,   316,   318,   322,   324,   325,   327,
-     331,   336,   340,   344,   349,   354,   358,   365,   371,   374,
-     377,   380,   383,   386,   389,   392,   395,   398,   401,   404,
-     407,   414,   420,   429,   436,   443,   451,   459,   466,   475,
-     484,   488,   490,   492,   494,   496,   497,   500,   507,   509,
-     510,   512,   515,   516,   520,   521,   525,   529,   533,   537,
-     538,   546,   547,   556,   557,   566,   572,   575,   579,   581,
-     585,   589,   593,   597,   599,   600,   606,   610,   612,   616,
-     618,   619,   629,   631,   633,   638,   640,   642,   645,   649,
-     650,   652,   654,   656,   658,   660,   662,   664,   666,   668,
-     672,   674,   680,   682,   684,   686,   688,   690,   692,   695,
-     698,   701,   705,   708,   709,   711,   714,   717,   721,   731,
-     741,   750,   765,   767,   769,   776,   782,   785,   792,   800,
-     804,   810,   811,   812,   816,   819,   821,   827,   833,   840,
-     847,   852,   859,   864,   869,   876,   883,   886,   895,   897,
-     899,   900,   904,   911,   915,   922,   925,   931,   939
-};
 
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const short int yyrhs[] =
-{
-     196,     0,    -1,    70,    -1,    71,    -1,    72,    -1,    73,
-      -1,    74,    -1,    75,    -1,    76,    -1,    77,    -1,    78,
-      -1,    82,    -1,    83,    -1,    84,    -1,    79,    -1,    80,
-      -1,    81,    -1,   113,    -1,   114,    -1,   115,    -1,   116,
-      -1,   117,    -1,   118,    -1,   119,    -1,   120,    -1,   121,
-      -1,   122,    -1,   123,    -1,   124,    -1,    87,    -1,    88,
-      -1,    89,    -1,    90,    -1,    91,    -1,    92,    -1,    93,
-      -1,    94,    -1,    95,    -1,    96,    -1,    97,    -1,    98,
-      -1,    99,    -1,   100,    -1,   101,    -1,   102,    -1,   103,
-      -1,   104,    -1,   105,    -1,   106,    -1,    93,    -1,    94,
-      -1,    95,    -1,    96,    -1,    23,    -1,    24,    -1,    11,
-      -1,    12,    -1,    13,    -1,    16,    -1,    19,    -1,    21,
-      -1,   160,    -1,    -1,   160,   138,    -1,    -1,    17,    -1,
-      20,    -1,   165,    -1,    -1,   163,   138,    -1,    39,    -1,
-      41,    -1,    40,    -1,    42,    -1,    44,    -1,    43,    -1,
-      45,    -1,    47,    -1,    -1,   135,    -1,   136,    -1,   137,
-      -1,    -1,    43,    -1,    45,    -1,    -1,    39,    -1,    40,
-      -1,    41,    -1,    44,    -1,    -1,    41,    -1,    39,    -1,
-      -1,    58,    -1,    59,    -1,    60,    -1,    61,    -1,    62,
-      -1,    57,     4,    -1,   114,    -1,   115,    -1,   132,    -1,
-     133,    -1,    -1,   174,   173,    -1,   131,    -1,   134,    -1,
-     173,    -1,    -1,   176,   175,    -1,    -1,    50,     4,    -1,
-      -1,   139,    50,     4,    -1,    31,    19,    -1,    -1,   179,
-      -1,    -1,   139,   182,   181,    -1,   179,    -1,    50,     4,
-      -1,    11,    -1,    12,    -1,    13,    -1,    14,    -1,    46,
-      -1,   183,    -1,   184,   140,    -1,   218,    -1,   141,     4,
-      -1,   184,   142,   188,   143,   176,    -1,    10,   142,   188,
-     143,   176,    -1,   144,     4,   145,   184,   146,    -1,   147,
-       4,   145,   184,   148,    -1,   149,   189,   150,    -1,   149,
-     150,    -1,   147,   149,   189,   150,   148,    -1,   147,   149,
-     150,   148,    -1,   184,   174,    -1,   184,    -1,    10,    -1,
-     185,    -1,   187,   139,   185,    -1,   187,    -1,   187,   139,
-      36,    -1,    36,    -1,    -1,   184,    -1,   189,   139,   184,
-      -1,   184,   144,   192,   146,    -1,   184,   144,   146,    -1,
-     184,   151,    19,    -1,   184,   147,   192,   148,    -1,   184,
-     149,   192,   150,    -1,   184,   149,   150,    -1,   184,   147,
-     149,   192,   150,   148,    -1,   184,   147,   149,   150,   148,
-      -1,   184,    37,    -1,   184,    38,    -1,   184,   218,    -1,
-     184,   191,    -1,   184,    22,    -1,   158,     3,    -1,   158,
-       5,    -1,   158,     4,    -1,   158,     6,    -1,    11,    23,
-      -1,    11,    24,    -1,   159,     9,    -1,   155,   142,   190,
-      35,   184,   143,    -1,   112,   142,   190,   229,   143,    -1,
-     126,   142,   190,   139,   190,   139,   190,   143,    -1,   153,
-     142,   190,   139,   190,   143,    -1,   154,   142,   190,   139,
-     190,   143,    -1,    85,   156,   142,   190,   139,   190,   143,
-      -1,    86,   157,   142,   190,   139,   190,   143,    -1,   128,
-     142,   190,   139,   190,   143,    -1,   129,   142,   190,   139,
-     190,   139,   190,   143,    -1,   130,   142,   190,   139,   190,
-     139,   190,   143,    -1,   192,   139,   190,    -1,   190,    -1,
-      29,    -1,    30,    -1,    34,    -1,    -1,   186,   218,    -1,
-     118,   142,   195,    35,   184,   143,    -1,   197,    -1,    -1,
-     198,    -1,   197,   198,    -1,    -1,    28,   199,   214,    -1,
-      -1,    27,   200,   215,    -1,    55,    54,   204,    -1,   162,
-      15,   184,    -1,   162,    15,    10,    -1,    -1,   164,   168,
-     194,   193,   190,   201,   181,    -1,    -1,   164,   166,   168,
-     194,   193,   190,   202,   181,    -1,    -1,   164,   167,   168,
-     194,   193,   184,   203,   181,    -1,   164,   168,    32,   171,
-     195,    -1,    48,   205,    -1,    51,   138,   206,    -1,    19,
-      -1,    49,   138,    19,    -1,    63,   138,    19,    -1,   144,
-     207,   146,    -1,   207,   139,    19,    -1,    19,    -1,    -1,
-     208,   139,   184,   174,   161,    -1,   184,   174,   161,    -1,
-     208,    -1,   208,   139,    36,    -1,    36,    -1,    -1,   172,
-     186,   163,   142,   209,   143,   176,   180,   177,    -1,    25,
-      -1,   149,    -1,   170,   168,   210,   211,    -1,    26,    -1,
-     150,    -1,   221,   213,    -1,   169,   168,   210,    -1,    -1,
-      56,    -1,     3,    -1,     4,    -1,     9,    -1,    23,    -1,
-      24,    -1,    37,    -1,    38,    -1,    22,    -1,   147,   192,
-     148,    -1,   191,    -1,    54,   216,    19,   139,    19,    -1,
-       7,    -1,     8,    -1,   160,    -1,   163,    -1,   218,    -1,
-     217,    -1,   184,   219,    -1,   221,   222,    -1,   212,   222,
-      -1,   223,   162,   224,    -1,   223,   226,    -1,    -1,    18,
-      -1,    64,   220,    -1,    64,    10,    -1,    65,    14,   219,
-      -1,    65,    11,   219,   139,    14,   219,   139,    14,   219,
-      -1,    66,   158,   219,   139,    14,   219,   144,   225,   146,
-      -1,    66,   158,   219,   139,    14,   219,   144,   146,    -1,
-      67,   172,   186,   219,   142,   228,   143,   176,    35,    14,
-     219,    68,    14,   219,    -1,    68,    -1,    69,    -1,   225,
-     158,   217,   139,    14,   219,    -1,   158,   217,   139,    14,
-     219,    -1,   162,   231,    -1,   184,   144,   219,   139,   219,
-     146,    -1,   227,   139,   144,   219,   139,   219,   146,    -1,
-     184,   219,   174,    -1,   228,   139,   184,   219,   174,    -1,
-      -1,    -1,   229,   139,   220,    -1,    53,    52,    -1,    52,
-      -1,   153,   184,   219,   139,   219,    -1,   154,   184,   219,
-     139,   219,    -1,    85,   156,   184,   219,   139,   219,    -1,
-      86,   157,   184,   219,   139,   219,    -1,   155,   220,    35,
-     184,    -1,   126,   220,   139,   220,   139,   220,    -1,   127,
-     220,   139,   184,    -1,   128,   220,   139,   220,    -1,   129,
-     220,   139,   220,   139,   220,    -1,   130,   220,   139,   220,
-     139,   220,    -1,   125,   227,    -1,   230,   172,   186,   219,
-     142,   228,   143,   176,    -1,   233,    -1,    33,    -1,    -1,
-     107,   184,   178,    -1,   107,   184,   139,    11,   219,   178,
-      -1,   108,   184,   178,    -1,   108,   184,   139,    11,   219,
-     178,    -1,   109,   220,    -1,   232,   110,   184,   219,   178,
-      -1,   232,   111,   220,   139,   184,   219,   178,    -1,   112,
-     184,   219,   229,    -1
-};
+#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
 
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short int yyrline[] =
-{
-       0,  1116,  1116,  1116,  1116,  1116,  1116,  1116,  1116,  1116,
-    1116,  1117,  1117,  1117,  1117,  1117,  1117,  1118,  1118,  1118,
-    1118,  1118,  1118,  1119,  1119,  1119,  1119,  1119,  1119,  1122,
-    1122,  1123,  1123,  1124,  1124,  1125,  1125,  1126,  1126,  1130,
-    1130,  1131,  1131,  1132,  1132,  1133,  1133,  1134,  1134,  1135,
-    1135,  1136,  1136,  1137,  1138,  1143,  1144,  1144,  1146,  1146,
-    1146,  1147,  1147,  1151,  1155,  1160,  1160,  1162,  1163,  1168,
-    1174,  1175,  1176,  1177,  1178,  1182,  1183,  1184,  1188,  1189,
-    1190,  1191,  1195,  1196,  1197,  1201,  1202,  1203,  1204,  1205,
-    1209,  1210,  1211,  1214,  1215,  1216,  1217,  1218,  1219,  1220,
-    1227,  1228,  1229,  1230,  1233,  1234,  1239,  1240,  1241,  1244,
-    1245,  1252,  1253,  1259,  1260,  1268,  1276,  1277,  1282,  1283,
-    1284,  1289,  1302,  1302,  1302,  1302,  1305,  1309,  1313,  1320,
-    1325,  1333,  1363,  1394,  1399,  1411,  1421,  1425,  1435,  1442,
-    1449,  1456,  1461,  1466,  1473,  1474,  1481,  1488,  1496,  1502,
-    1514,  1542,  1558,  1585,  1613,  1639,  1659,  1685,  1705,  1717,
-    1724,  1790,  1800,  1810,  1816,  1826,  1832,  1842,  1847,  1852,
-    1860,  1872,  1894,  1902,  1908,  1919,  1924,  1929,  1935,  1941,
-    1950,  1954,  1962,  1962,  1965,  1965,  1968,  1979,  2000,  2005,
-    2013,  2014,  2018,  2018,  2022,  2022,  2025,  2028,  2052,  2063,
-    2063,  2074,  2073,  2083,  2082,  2093,  2112,  2115,  2121,  2131,
-    2135,  2140,  2142,  2147,  2152,  2161,  2171,  2182,  2186,  2195,
-    2204,  2209,  2330,  2330,  2332,  2341,  2341,  2343,  2348,  2360,
-    2364,  2369,  2373,  2377,  2381,  2385,  2389,  2393,  2397,  2401,
-    2426,  2430,  2440,  2444,  2448,  2453,  2460,  2460,  2466,  2475,
-    2479,  2488,  2497,  2506,  2510,  2517,  2521,  2525,  2530,  2540,
-    2559,  2568,  2648,  2652,  2659,  2670,  2683,  2693,  2704,  2714,
-    2723,  2732,  2735,  2736,  2743,  2747,  2752,  2773,  2790,  2804,
-    2818,  2830,  2838,  2845,  2851,  2857,  2863,  2878,  2963,  2968,
-    2972,  2979,  2986,  2994,  3001,  3009,  3017,  3031,  3048
+static const char * const yytname[] = {   "$","error","$undefined.","ESINT64VAL",
+"EUINT64VAL","ESAPINTVAL","EUAPINTVAL","LOCALVAL_ID","GLOBALVAL_ID","FPVAL",
+"VOID","INTTYPE","FLOAT","DOUBLE","LABEL","TYPE","LOCALVAR","GLOBALVAR","LABELSTR",
+"STRINGCONSTANT","ATSTRINGCONSTANT","PCTSTRINGCONSTANT","ZEROINITIALIZER","TRUETOK",
+"FALSETOK","BEGINTOK","ENDTOK","DECLARE","DEFINE","GLOBAL","CONSTANT","SECTION",
+"ALIAS","VOLATILE","THREAD_LOCAL","TO","DOTDOTDOT","NULL_TOK","UNDEF","INTERNAL",
+"LINKONCE","WEAK","APPENDING","DLLIMPORT","DLLEXPORT","EXTERN_WEAK","OPAQUE",
+"EXTERNAL","TARGET","TRIPLE","ALIGN","DEPLIBS","CALL","TAIL","ASM_TOK","MODULE",
+"SIDEEFFECT","CC_TOK","CCC_TOK","FASTCC_TOK","COLDCC_TOK","X86_STDCALLCC_TOK",
+"X86_FASTCALLCC_TOK","DATALAYOUT","RET","BR","SWITCH","INVOKE","UNWIND","UNREACHABLE",
+"ADD","SUB","MUL","UDIV","SDIV","FDIV","UREM","SREM","FREM","AND","OR","XOR",
+"SHL","LSHR","ASHR","ICMP","FCMP","EQ","NE","SLT","SGT","SLE","SGE","ULT","UGT",
+"ULE","UGE","OEQ","ONE","OLT","OGT","OLE","OGE","ORD","UNO","UEQ","UNE","MALLOC",
+"ALLOCA","FREE","LOAD","STORE","GETELEMENTPTR","TRUNC","ZEXT","SEXT","FPTRUNC",
+"FPEXT","BITCAST","UITOFP","SITOFP","FPTOUI","FPTOSI","INTTOPTR","PTRTOINT",
+"PHI_TOK","SELECT","VAARG","EXTRACTELEMENT","INSERTELEMENT","SHUFFLEVECTOR",
+"NORETURN","INREG","SRET","NOUNWIND","NOALIAS","DEFAULT","HIDDEN","PROTECTED",
+"'='","','","'*'","'\\\\'","'('","')'","'['","'x'","']'","'<'","'>'","'{'","'}'",
+"'c'","ArithmeticOps","LogicalOps","CastOps","IPredicates","FPredicates","IntType",
+"FPType","LocalName","OptLocalName","OptLocalAssign","GlobalName","OptGlobalAssign",
+"GlobalAssign","GVInternalLinkage","GVExternalLinkage","GVVisibilityStyle","FunctionDeclareLinkage",
+"FunctionDefineLinkage","AliasLinkage","OptCallingConv","ParamAttr","OptParamAttrs",
+"FuncAttr","OptFuncAttrs","OptAlign","OptCAlign","SectionString","OptSection",
+"GlobalVarAttributes","GlobalVarAttribute","PrimType","Types","ArgType","ResultTypes",
+"ArgTypeList","ArgTypeListI","TypeListI","ConstVal","ConstExpr","ConstVector",
+"GlobalType","ThreadLocal","AliaseeRef","Module","DefinitionList","Definition",
+"@1","@2","@3","@4","@5","AsmBlock","TargetDefinition","LibrariesDefinition",
+"LibList","ArgListH","ArgList","FunctionHeaderH","BEGIN","FunctionHeader","END",
+"Function","FunctionProto","OptSideEffect","ConstValueRef","SymbolicValueRef",
+"ValueRef","ResolvedVal","BasicBlockList","BasicBlock","InstructionList","BBTerminatorInst",
+"JumpTable","Inst","PHIList","ValueRefList","IndexList","OptTailCall","InstVal",
+"OptVolatile","MemoryInst", NULL
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
-static const char *const yytname[] =
-{
-  "$end", "error", "$undefined", "ESINT64VAL", "EUINT64VAL", "ESAPINTVAL",
-  "EUAPINTVAL", "LOCALVAL_ID", "GLOBALVAL_ID", "FPVAL", "VOID", "INTTYPE",
-  "FLOAT", "DOUBLE", "LABEL", "TYPE", "LOCALVAR", "GLOBALVAR", "LABELSTR",
-  "STRINGCONSTANT", "ATSTRINGCONSTANT", "PCTSTRINGCONSTANT",
-  "ZEROINITIALIZER", "TRUETOK", "FALSETOK", "BEGINTOK", "ENDTOK",
-  "DECLARE", "DEFINE", "GLOBAL", "CONSTANT", "SECTION", "ALIAS",
-  "VOLATILE", "THREAD_LOCAL", "TO", "DOTDOTDOT", "NULL_TOK", "UNDEF",
-  "INTERNAL", "LINKONCE", "WEAK", "APPENDING", "DLLIMPORT", "DLLEXPORT",
-  "EXTERN_WEAK", "OPAQUE", "EXTERNAL", "TARGET", "TRIPLE", "ALIGN",
-  "DEPLIBS", "CALL", "TAIL", "ASM_TOK", "MODULE", "SIDEEFFECT", "CC_TOK",
-  "CCC_TOK", "FASTCC_TOK", "COLDCC_TOK", "X86_STDCALLCC_TOK",
-  "X86_FASTCALLCC_TOK", "DATALAYOUT", "RET", "BR", "SWITCH", "INVOKE",
-  "UNWIND", "UNREACHABLE", "ADD", "SUB", "MUL", "UDIV", "SDIV", "FDIV",
-  "UREM", "SREM", "FREM", "AND", "OR", "XOR", "SHL", "LSHR", "ASHR",
-  "ICMP", "FCMP", "EQ", "NE", "SLT", "SGT", "SLE", "SGE", "ULT", "UGT",
-  "ULE", "UGE", "OEQ", "ONE", "OLT", "OGT", "OLE", "OGE", "ORD", "UNO",
-  "UEQ", "UNE", "MALLOC", "ALLOCA", "FREE", "LOAD", "STORE",
-  "GETELEMENTPTR", "TRUNC", "ZEXT", "SEXT", "FPTRUNC", "FPEXT", "BITCAST",
-  "UITOFP", "SITOFP", "FPTOUI", "FPTOSI", "INTTOPTR", "PTRTOINT",
-  "PHI_TOK", "SELECT", "VAARG", "EXTRACTELEMENT", "INSERTELEMENT",
-  "SHUFFLEVECTOR", "NORETURN", "INREG", "SRET", "NOUNWIND", "DEFAULT",
-  "HIDDEN", "PROTECTED", "'='", "','", "'*'", "'\\\\'", "'('", "')'",
-  "'['", "'x'", "']'", "'<'", "'>'", "'{'", "'}'", "'c'", "$accept",
-  "ArithmeticOps", "LogicalOps", "CastOps", "IPredicates", "FPredicates",
-  "IntType", "FPType", "LocalName", "OptLocalName", "OptLocalAssign",
-  "GlobalName", "OptGlobalAssign", "GlobalAssign", "GVInternalLinkage",
-  "GVExternalLinkage", "GVVisibilityStyle", "FunctionDeclareLinkage",
-  "FunctionDefineLinkage", "AliasLinkage", "OptCallingConv", "ParamAttr",
-  "OptParamAttrs", "FuncAttr", "OptFuncAttrs", "OptAlign", "OptCAlign",
-  "SectionString", "OptSection", "GlobalVarAttributes",
-  "GlobalVarAttribute", "PrimType", "Types", "ArgType", "ResultTypes",
-  "ArgTypeList", "ArgTypeListI", "TypeListI", "ConstVal", "ConstExpr",
-  "ConstVector", "GlobalType", "ThreadLocal", "AliaseeRef", "Module",
-  "DefinitionList", "Definition", "@1", "@2", "@3", "@4", "@5", "AsmBlock",
-  "TargetDefinition", "LibrariesDefinition", "LibList", "ArgListH",
-  "ArgList", "FunctionHeaderH", "BEGIN", "FunctionHeader", "END",
-  "Function", "FunctionProto", "OptSideEffect", "ConstValueRef",
-  "SymbolicValueRef", "ValueRef", "ResolvedVal", "BasicBlockList",
-  "BasicBlock", "InstructionList", "BBTerminatorInst", "JumpTable", "Inst",
-  "PHIList", "ValueRefList", "IndexList", "OptTailCall", "InstVal",
-  "OptVolatile", "MemoryInst", 0
+static const short yyr1[] = {     0,
+   153,   153,   153,   153,   153,   153,   153,   153,   153,   154,
+   154,   154,   154,   154,   154,   155,   155,   155,   155,   155,
+   155,   155,   155,   155,   155,   155,   155,   156,   156,   156,
+   156,   156,   156,   156,   156,   156,   156,   157,   157,   157,
+   157,   157,   157,   157,   157,   157,   157,   157,   157,   157,
+   157,   157,   157,   158,   159,   159,   160,   160,   160,   161,
+   161,   162,   162,   163,   163,   164,   164,   165,   166,   166,
+   166,   166,   166,   167,   167,   167,   168,   168,   168,   168,
+   169,   169,   169,   170,   170,   170,   170,   170,   171,   171,
+   171,   172,   172,   172,   172,   172,   172,   172,   173,   173,
+   173,   173,   173,   174,   174,   175,   175,   175,   176,   176,
+   177,   177,   178,   178,   179,   180,   180,   181,   181,   182,
+   182,   183,   183,   183,   183,   184,   184,   184,   184,   184,
+   184,   184,   184,   184,   184,   184,   184,   184,   185,   186,
+   186,   187,   187,   188,   188,   188,   188,   189,   189,   190,
+   190,   190,   190,   190,   190,   190,   190,   190,   190,   190,
+   190,   190,   190,   190,   190,   190,   190,   190,   190,   191,
+   191,   191,   191,   191,   191,   191,   191,   191,   191,   192,
+   192,   193,   193,   194,   194,   195,   195,   196,   196,   197,
+   197,   199,   198,   200,   198,   198,   198,   198,   201,   198,
+   202,   198,   203,   198,   198,   198,   198,   204,   205,   205,
+   206,   207,   207,   207,   208,   208,   209,   209,   209,   209,
+   210,   211,   211,   212,   213,   213,   214,   215,   216,   216,
+   217,   217,   217,   217,   217,   217,   217,   217,   217,   217,
+   217,   218,   218,   218,   218,   219,   219,   220,   221,   221,
+   222,   223,   223,   223,   224,   224,   224,   224,   224,   224,
+   224,   224,   224,   225,   225,   226,   227,   227,   228,   228,
+   228,   229,   229,   230,   230,   231,   231,   231,   231,   231,
+   231,   231,   231,   231,   231,   231,   231,   231,   232,   232,
+   233,   233,   233,   233,   233,   233,   233,   233
 };
-#endif
 
-# ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
-static const unsigned short int yytoknum[] =
-{
-       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
-     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
-     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
-     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,   389,   390,   391,   392,    61,    44,
-      42,    92,    40,    41,    91,   120,    93,    60,    62,   123,
-     125,    99
+static const short yyr2[] = {     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,     1,     1,     1,     1,     1,     1,     1,
+     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+     0,     2,     0,     1,     1,     1,     0,     2,     1,     1,
+     1,     1,     1,     1,     1,     1,     0,     1,     1,     1,
+     0,     1,     1,     0,     1,     1,     1,     1,     0,     1,
+     1,     0,     1,     1,     1,     1,     1,     2,     1,     1,
+     1,     1,     1,     0,     2,     1,     1,     1,     0,     2,
+     0,     2,     0,     3,     2,     0,     1,     0,     3,     1,
+     2,     1,     1,     1,     1,     1,     1,     2,     1,     2,
+     5,     5,     5,     5,     3,     2,     5,     4,     2,     1,
+     1,     1,     3,     1,     3,     1,     0,     1,     3,     4,
+     3,     3,     4,     4,     3,     6,     5,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     6,
+     5,     8,     6,     6,     7,     7,     6,     8,     8,     3,
+     1,     1,     1,     1,     0,     2,     6,     1,     0,     1,
+     2,     0,     3,     0,     3,     3,     3,     3,     0,     7,
+     0,     8,     0,     8,     5,     2,     3,     1,     3,     3,
+     3,     3,     1,     0,     5,     3,     1,     3,     1,     0,
+     9,     1,     1,     4,     1,     1,     2,     3,     0,     1,
+     1,     1,     1,     1,     1,     1,     1,     1,     3,     1,
+     5,     1,     1,     1,     1,     1,     1,     2,     2,     2,
+     3,     2,     0,     1,     2,     2,     3,     9,     9,     8,
+    14,     1,     1,     6,     5,     2,     6,     7,     3,     5,
+     0,     0,     3,     2,     1,     5,     5,     6,     6,     4,
+     6,     4,     4,     6,     6,     2,     8,     1,     1,     0,
+     3,     6,     3,     6,     2,     5,     7,     4
 };
-# endif
 
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const unsigned char yyr1[] =
-{
-       0,   152,   153,   153,   153,   153,   153,   153,   153,   153,
-     153,   154,   154,   154,   154,   154,   154,   155,   155,   155,
-     155,   155,   155,   155,   155,   155,   155,   155,   155,   156,
-     156,   156,   156,   156,   156,   156,   156,   156,   156,   157,
-     157,   157,   157,   157,   157,   157,   157,   157,   157,   157,
-     157,   157,   157,   157,   157,   158,   159,   159,   160,   160,
-     160,   161,   161,   162,   162,   163,   163,   164,   164,   165,
-     166,   166,   166,   166,   166,   167,   167,   167,   168,   168,
-     168,   168,   169,   169,   169,   170,   170,   170,   170,   170,
-     171,   171,   171,   172,   172,   172,   172,   172,   172,   172,
-     173,   173,   173,   173,   174,   174,   175,   175,   175,   176,
-     176,   177,   177,   178,   178,   179,   180,   180,   181,   181,
-     182,   182,   183,   183,   183,   183,   184,   184,   184,   184,
-     184,   184,   184,   184,   184,   184,   184,   184,   184,   185,
-     186,   186,   187,   187,   188,   188,   188,   188,   189,   189,
-     190,   190,   190,   190,   190,   190,   190,   190,   190,   190,
-     190,   190,   190,   190,   190,   190,   190,   190,   190,   190,
-     191,   191,   191,   191,   191,   191,   191,   191,   191,   191,
-     192,   192,   193,   193,   194,   194,   195,   195,   196,   196,
-     197,   197,   199,   198,   200,   198,   198,   198,   198,   201,
-     198,   202,   198,   203,   198,   198,   198,   198,   204,   205,
-     205,   206,   207,   207,   207,   208,   208,   209,   209,   209,
-     209,   210,   211,   211,   212,   213,   213,   214,   215,   216,
-     216,   217,   217,   217,   217,   217,   217,   217,   217,   217,
-     217,   217,   218,   218,   218,   218,   219,   219,   220,   221,
-     221,   222,   223,   223,   223,   224,   224,   224,   224,   224,
-     224,   224,   224,   224,   225,   225,   226,   227,   227,   228,
-     228,   228,   229,   229,   230,   230,   231,   231,   231,   231,
-     231,   231,   231,   231,   231,   231,   231,   231,   231,   232,
-     232,   233,   233,   233,   233,   233,   233,   233,   233
+static const short yydefact[] = {    67,
+    57,    64,    58,    65,    59,   194,   192,     0,     0,     0,
+     0,     0,     0,    77,    66,    67,   190,    81,    84,     0,
+     0,   206,     0,     0,    62,     0,    68,    69,    71,    70,
+    72,    74,    73,    75,    76,    78,    79,    80,    77,    77,
+   185,   191,    82,    83,    77,   195,    85,    86,    87,    88,
+    77,   253,   193,   253,     0,     0,   214,   207,   208,   196,
+   242,   243,   198,   122,   123,   124,   125,   126,     0,     0,
+     0,     0,   244,   245,   127,   197,   129,   185,   185,    89,
+   184,     0,    92,    92,   254,   250,    63,   225,   226,   227,
+   249,   209,   210,   213,     0,   147,   130,     0,     0,     0,
+     0,   136,   148,     0,   128,   147,     0,     0,    91,    90,
+     0,   182,   183,     0,     0,    93,    94,    95,    96,    97,
+     0,   228,     0,   290,   252,     0,   211,   146,   104,   142,
+   144,     0,     0,     0,     0,     0,     0,   135,     0,     0,
+     0,   141,     0,   140,     0,   205,   122,   123,   124,     0,
+     0,     0,   199,    98,     0,   222,   223,   224,   289,   275,
+     0,     0,     0,     0,    92,   262,   263,     1,     2,     3,
+     4,     5,     6,     7,     8,     9,    13,    14,    15,    10,
+    11,    12,     0,     0,     0,     0,     0,     0,    16,    17,
+    18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,   251,
+    92,   266,     0,   288,   212,   139,     0,   109,     0,     0,
+   138,     0,   149,   109,   201,   203,     0,   186,   167,   168,
+   163,   165,   164,   166,   169,   162,   158,   159,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,   161,   160,   118,     0,   274,   256,     0,   255,
+     0,     0,    54,     0,     0,    28,    29,    30,    31,    32,
+    33,    34,    35,    36,    37,     0,    52,    53,    48,    49,
+    50,    51,    38,    39,    40,    41,    42,    43,    44,    45,
+    46,    47,     0,   113,   113,   295,     0,     0,   286,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    99,   100,   101,   102,   103,   105,   145,   143,   132,   133,
+   134,   137,   131,   118,   118,     0,     0,     0,     0,     0,
+     0,     0,     0,   151,   181,     0,     0,     0,   155,     0,
+   152,     0,     0,     0,     0,   200,   220,   231,   232,   233,
+   238,   234,   235,   236,   237,   229,     0,   240,   247,   246,
+   248,     0,   257,     0,     0,     0,     0,     0,   291,     0,
+   293,   272,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,   106,   107,   108,   110,   202,
+   204,     0,     0,     0,   272,     0,     0,     0,     0,     0,
+   150,   136,   148,     0,   153,   154,     0,     0,     0,     0,
+     0,   120,   118,   219,   104,   217,     0,   230,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,   298,     0,
+     0,     0,   282,   283,     0,     0,     0,     0,   280,     0,
+   113,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+   180,   157,     0,     0,     0,     0,   115,   121,   119,    61,
+     0,   109,     0,   239,     0,     0,   271,     0,     0,   113,
+   114,   113,     0,     0,     0,     0,     0,     0,   276,   277,
+   271,     0,   296,     0,   187,     0,     0,   171,     0,     0,
+     0,     0,   156,     0,     0,     0,    60,   216,   218,   104,
+   116,     0,     0,     0,     0,     0,   278,   279,   292,   294,
+   273,     0,     0,   281,   284,   285,     0,   113,     0,     0,
+     0,   177,     0,     0,   173,   174,   170,    61,   117,   111,
+   241,     0,     0,   104,     0,   109,   267,     0,   109,   297,
+   175,   176,     0,     0,     0,   215,     0,   221,     0,   260,
+     0,     0,   269,     0,     0,   268,   287,   172,   178,   179,
+   112,   258,     0,   259,     0,   104,     0,     0,     0,   270,
+     0,     0,     0,     0,   265,     0,     0,   264,     0,   261,
+     0,     0,     0
 };
 
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const unsigned char yyr2[] =
-{
-       0,     2,     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,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     0,     2,     0,     1,     1,     1,     0,     2,
-       1,     1,     1,     1,     1,     1,     1,     1,     0,     1,
-       1,     1,     0,     1,     1,     0,     1,     1,     1,     1,
-       0,     1,     1,     0,     1,     1,     1,     1,     1,     2,
-       1,     1,     1,     1,     0,     2,     1,     1,     1,     0,
-       2,     0,     2,     0,     3,     2,     0,     1,     0,     3,
-       1,     2,     1,     1,     1,     1,     1,     1,     2,     1,
-       2,     5,     5,     5,     5,     3,     2,     5,     4,     2,
-       1,     1,     1,     3,     1,     3,     1,     0,     1,     3,
-       4,     3,     3,     4,     4,     3,     6,     5,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       6,     5,     8,     6,     6,     7,     7,     6,     8,     8,
-       3,     1,     1,     1,     1,     0,     2,     6,     1,     0,
-       1,     2,     0,     3,     0,     3,     3,     3,     3,     0,
-       7,     0,     8,     0,     8,     5,     2,     3,     1,     3,
-       3,     3,     3,     1,     0,     5,     3,     1,     3,     1,
-       0,     9,     1,     1,     4,     1,     1,     2,     3,     0,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     3,
-       1,     5,     1,     1,     1,     1,     1,     1,     2,     2,
-       2,     3,     2,     0,     1,     2,     2,     3,     9,     9,
-       8,    14,     1,     1,     6,     5,     2,     6,     7,     3,
-       5,     0,     0,     3,     2,     1,     5,     5,     6,     6,
-       4,     6,     4,     4,     6,     6,     2,     8,     1,     1,
-       0,     3,     6,     3,     6,     2,     5,     7,     4
+static const short yydefgoto[] = {   250,
+   251,   252,   276,   293,   150,   151,    73,   498,    12,    74,
+    14,    15,    39,    40,    41,    45,    51,   111,   121,   316,
+   216,   389,   319,   548,   369,   412,   530,   346,   413,    75,
+   152,   130,   145,   131,   132,   104,   335,   358,   336,   114,
+    82,   146,   581,    16,    17,    19,    18,   255,   324,   325,
+    60,    22,    58,    95,   416,   417,   122,   158,    52,    90,
+    53,    46,   419,   359,    77,   361,   260,    54,    86,    87,
+   210,   552,   125,   299,   506,   429,   211,   212,   213,   214
 };
 
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
-static const unsigned short int yydefact[] =
-{
-      68,    58,    65,    59,    66,    60,   194,   192,     0,     0,
-       0,     0,     0,     0,    78,    67,     0,    68,   190,    82,
-      85,     0,     0,   206,     0,     0,    63,     0,    69,    70,
-      72,    71,    73,    75,    74,    76,    77,    79,    80,    81,
-      78,    78,   185,     1,   191,    83,    84,    78,   195,    86,
-      87,    88,    89,    78,   253,   193,   253,     0,     0,   214,
-     207,   208,   196,   242,   243,   198,   122,   123,   124,   125,
-     126,     0,     0,     0,     0,   244,   245,   127,   197,   129,
-     185,   185,    90,   184,     0,    93,    93,   254,   250,    64,
-     225,   226,   227,   249,   209,   210,   213,     0,   147,   130,
-       0,     0,     0,     0,   136,   148,     0,   128,   147,     0,
-       0,    92,    91,     0,   182,   183,     0,     0,    94,    95,
-      96,    97,    98,     0,   228,     0,   290,   252,     0,   211,
-     146,   104,   142,   144,     0,     0,     0,     0,     0,     0,
-     135,     0,     0,     0,   141,     0,   140,     0,   205,   122,
-     123,   124,     0,     0,     0,   199,    99,     0,   222,   223,
-     224,   289,   275,     0,     0,     0,     0,    93,   262,   263,
-       2,     3,     4,     5,     6,     7,     8,     9,    10,    14,
-      15,    16,    11,    12,    13,     0,     0,     0,     0,     0,
-       0,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   251,    93,   266,     0,   288,   212,   139,     0,
-     109,     0,     0,   138,     0,   149,   109,   201,   203,     0,
-     186,   167,   168,   163,   165,   164,   166,   169,   162,   158,
-     159,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   161,   160,   118,     0,   274,
-     256,     0,   255,     0,     0,    55,     0,     0,    29,    30,
-      31,    32,    33,    34,    35,    36,    37,    38,     0,    53,
-      54,    49,    50,    51,    52,    39,    40,    41,    42,    43,
-      44,    45,    46,    47,    48,     0,   113,   113,   295,     0,
-       0,   286,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   100,   101,   102,   103,   105,   145,   143,
-     132,   133,   134,   137,   131,   118,   118,     0,     0,     0,
-       0,     0,     0,     0,     0,   151,   181,     0,     0,     0,
-     155,     0,   152,     0,     0,     0,     0,   200,   220,   231,
-     232,   233,   238,   234,   235,   236,   237,   229,     0,   240,
-     247,   246,   248,     0,   257,     0,     0,     0,     0,     0,
-     291,     0,   293,   272,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   106,   107,   108,
-     110,   202,   204,     0,     0,     0,   272,     0,     0,     0,
-       0,     0,   150,   136,   148,     0,   153,   154,     0,     0,
-       0,     0,     0,   120,   118,   219,   104,   217,     0,   230,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     298,     0,     0,     0,   282,   283,     0,     0,     0,     0,
-     280,     0,   113,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   180,   157,     0,     0,     0,     0,   115,   121,
-     119,    62,     0,   109,     0,   239,     0,     0,   271,     0,
-       0,   113,   114,   113,     0,     0,     0,     0,     0,     0,
-     276,   277,   271,     0,   296,     0,   187,     0,     0,   171,
-       0,     0,     0,     0,   156,     0,     0,     0,    61,   216,
-     218,   104,   116,     0,     0,     0,     0,     0,   278,   279,
-     292,   294,   273,     0,     0,   281,   284,   285,     0,   113,
-       0,     0,     0,   177,     0,     0,   173,   174,   170,    62,
-     117,   111,   241,     0,     0,   104,     0,   109,   267,     0,
-     109,   297,   175,   176,     0,     0,     0,   215,     0,   221,
-       0,   260,     0,     0,   269,     0,     0,   268,   287,   172,
-     178,   179,   112,   258,     0,   259,     0,   104,     0,     0,
-       0,   270,     0,     0,     0,     0,   265,     0,     0,   264,
-       0,   261
+static const short yypact[] = {  1026,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,    -3,   -63,    44,
+   -10,   142,    62,   336,-32768,  1490,-32768,   107,   131,    74,
+   127,-32768,   -27,   149,-32768,  1195,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,    93,    93,
+   214,-32768,-32768,-32768,    93,-32768,-32768,-32768,-32768,-32768,
+    93,   155,-32768,    13,   239,   253,   258,-32768,-32768,-32768,
+-32768,-32768,   139,-32768,-32768,-32768,-32768,-32768,   282,   284,
+     5,   128,-32768,-32768,-32768,   124,-32768,   256,   256,   230,
+-32768,    34,   163,   163,-32768,-32768,   184,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,   -30,   956,-32768,   147,   151,   910,
+   139,-32768,   124,   -74,-32768,   956,    34,    34,-32768,-32768,
+   987,-32768,-32768,  1210,   302,-32768,-32768,-32768,-32768,-32768,
+  1247,-32768,    15,  1353,-32768,   290,-32768,-32768,   124,-32768,
+   170,   173,  1262,  1262,   162,   -68,  1262,-32768,   174,  1210,
+  1262,   139,   177,   124,    83,-32768,    38,   312,   314,   251,
+   315,   764,-32768,-32768,   126,-32768,-32768,-32768,-32768,-32768,
+   273,  1308,   227,   317,   163,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,   566,   613,  1262,  1262,  1262,  1262,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+  1262,  1262,  1262,  1262,  1262,  1262,  1262,  1262,  1262,-32768,
+   163,-32768,    -4,-32768,-32768,   -77,  1002,-32768,   -59,    63,
+-32768,   182,   124,-32768,-32768,   124,   987,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   566,   613,
+   189,   190,   191,   193,   194,  1100,  1354,   925,   319,   196,
+   197,   198,-32768,-32768,   203,   199,-32768,   139,   611,-32768,
+   741,   741,-32768,   741,  1247,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,  1262,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,  1262,   109,   119,-32768,   611,    94,   204,   206,
+   207,   208,   209,   215,   611,   611,   321,  1247,  1262,  1262,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   -82,-32768,
+-32768,-32768,   -82,   203,   203,   323,   218,   220,  1210,  1210,
+  1210,  1210,  1210,-32768,-32768,   -21,   941,   -92,-32768,   -62,
+-32768,  1210,  1210,  1210,    -5,-32768,  1146,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,   313,  1210,-32768,-32768,-32768,
+-32768,   228,-32768,   233,   741,   611,   611,     4,-32768,    17,
+-32768,-32768,   741,   225,  1262,  1262,  1262,  1262,  1262,   242,
+   244,  1262,   741,   611,   245,-32768,-32768,-32768,-32768,-32768,
+-32768,  1262,  1210,  1210,-32768,   246,   247,   248,   249,  1210,
+-32768,   241,   764,   -46,-32768,-32768,   252,   254,   358,   377,
+   393,-32768,   203,-32768,   124,   259,   257,-32768,   379,   -70,
+   386,   388,   262,   266,   267,   741,   404,   741,   269,   271,
+   741,   272,   124,-32768,   274,   276,   741,   741,   124,   270,
+   283,  1262,    45,   287,   288,    70,  1210,  1210,  1210,  1210,
+-32768,-32768,   275,  1210,  1210,  1262,-32768,-32768,-32768,    76,
+  1164,-32768,   289,-32768,   741,   741,  1262,   741,   741,   283,
+-32768,   283,  1262,   741,   294,  1262,  1262,  1262,-32768,-32768,
+  1262,   372,-32768,   611,-32768,  1210,  1210,-32768,   295,   286,
+   298,   299,-32768,   297,   300,   164,-32768,-32768,-32768,   124,
+    84,   424,   305,   301,   611,    92,-32768,-32768,-32768,-32768,
+-32768,   303,   741,-32768,-32768,-32768,   103,   283,   310,   311,
+  1210,-32768,  1210,  1210,-32768,-32768,-32768,    76,-32768,   397,
+-32768,   435,     6,-32768,  1262,-32768,-32768,   320,-32768,-32768,
+-32768,-32768,   318,   322,   324,-32768,   455,-32768,   741,-32768,
+   476,     7,   -77,   611,    -1,-32768,   -82,-32768,-32768,-32768,
+-32768,-32768,   329,-32768,   476,-32768,   447,   456,   335,   -77,
+   741,   741,   462,   409,-32768,   741,   464,-32768,   741,-32768,
+   483,   484,-32768
 };
 
-/* YYDEFGOTO[NTERM-NUM]. */
-static const short int yydefgoto[] =
-{
-      -1,   252,   253,   254,   278,   295,   152,   153,    75,   499,
-      12,    76,    14,    15,    40,    41,    42,    47,    53,   113,
-     123,   317,   218,   390,   320,   549,   370,   413,   531,   347,
-     414,    77,   154,   132,   147,   133,   134,   106,   336,   359,
-     337,   116,    84,   148,    16,    17,    18,    20,    19,   257,
-     325,   326,    62,    23,    60,    97,   417,   418,   124,   160,
-      54,    92,    55,    48,   420,   360,    79,   362,   262,    56,
-      88,    89,   212,   553,   127,   301,   507,   430,   213,   214,
-     215,   216
+static const short yypgoto[] = {   362,
+   363,   364,   250,   261,  -161,-32768,     0,   -38,   406,    14,
+-32768,-32768,-32768,-32768,    29,-32768,-32768,-32768,  -146,  -294,
+  -407,-32768,  -220,-32768,  -285,     1,-32768,  -289,-32768,-32768,
+   -25,   279,  -114,-32768,   385,   403,   -29,  -150,  -236,   167,
+   202,   277,-32768,-32768,   481,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,   421,-32768,-32768,-32768,
+-32768,-32768,-32768,  -492,  -139,    98,  -182,-32768,   452,-32768,
+-32768,-32768,-32768,-32768,    26,   113,-32768,-32768,-32768,-32768
 };
 
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -509
-static const short int yypact[] =
-{
-      47,  -509,  -509,  -509,  -509,  -509,  -509,  -509,    -8,  -120,
-     -11,  -110,    58,   -77,   432,  -509,    79,   240,  -509,   204,
-      64,   -50,   -32,  -509,   -17,   114,  -509,  1280,  -509,  -509,
-    -509,  -509,  -509,  -509,  -509,  -509,  -509,  -509,  -509,  -509,
-     102,   102,   286,  -509,  -509,  -509,  -509,   102,  -509,  -509,
-    -509,  -509,  -509,   102,   122,  -509,     1,   130,   141,   157,
-    -509,  -509,  -509,  -509,  -509,    62,  -509,  -509,  -509,  -509,
-    -509,   191,   239,     5,   365,  -509,  -509,  -509,   181,  -509,
-     196,   196,   292,  -509,   170,   220,   220,  -509,  -509,   118,
-    -509,  -509,  -509,  -509,  -509,  -509,  -509,   -93,  1082,  -509,
-     101,   106,   566,    62,  -509,   181,   -94,  -509,  1082,   170,
-     170,  -509,  -509,  1122,  -509,  -509,  1327,   250,  -509,  -509,
-    -509,  -509,  -509,  1342,  -509,   -14,  1480,  -509,   251,  -509,
-    -509,   181,  -509,   119,   140,  1379,  1379,   125,   -58,  1379,
-    -509,   147,  1327,  1379,    62,   151,   181,   255,  -509,    28,
-     302,   308,   219,   315,   863,  -509,  -509,   149,  -509,  -509,
-    -509,  -509,  -509,   273,  1394,   222,   317,   220,  -509,  -509,
-    -509,  -509,  -509,  -509,  -509,  -509,  -509,  -509,  -509,  -509,
-    -509,  -509,  -509,  -509,  -509,   395,   443,  1379,  1379,  1379,
-    1379,  -509,  -509,  -509,  -509,  -509,  -509,  -509,  -509,  -509,
-    -509,  -509,  -509,  1379,  1379,  1379,  1379,  1379,  1379,  1379,
-    1379,  1379,  -509,   220,  -509,   155,  -509,  -509,    14,  1137,
-    -509,   -10,   -41,  -509,   184,   181,  -509,  -509,   181,  1122,
-    -509,  -509,  -509,  -509,  -509,  -509,  -509,  -509,  -509,  -509,
-    -509,   395,   443,   192,   194,   195,   197,   198,  1168,  1431,
-     820,   319,   199,   200,   201,  -509,  -509,   205,   206,  -509,
-      62,   610,  -509,   739,   739,  -509,   739,  1342,  -509,  -509,
-    -509,  -509,  -509,  -509,  -509,  -509,  -509,  -509,  1379,  -509,
-    -509,  -509,  -509,  -509,  -509,  -509,  -509,  -509,  -509,  -509,
-    -509,  -509,  -509,  -509,  -509,  1379,     2,    66,  -509,   610,
-      46,   207,   208,   210,   216,   217,   224,   610,   610,   323,
-    1342,  1379,  1379,  -509,  -509,  -509,  -509,  -509,  -509,  -509,
-      41,  -509,  -509,  -509,    41,   205,   205,   326,   227,   238,
-    1327,  1327,  1327,  1327,  1327,  -509,  -509,   -46,   904,   -99,
-    -509,   -56,  -509,  1327,  1327,  1327,    19,  -509,  1184,  -509,
-    -509,  -509,  -509,  -509,  -509,  -509,  -509,   312,  1327,  -509,
-    -509,  -509,  -509,   244,  -509,   248,   739,   610,   610,    10,
-    -509,    15,  -509,  -509,   739,   246,  1379,  1379,  1379,  1379,
-    1379,   249,   252,  1379,   739,   610,   253,  -509,  -509,  -509,
-    -509,  -509,  -509,  1379,  1327,  1327,  -509,   254,   257,   258,
-     259,  1327,  -509,   260,   863,   -54,  -509,  -509,   261,   262,
-     359,   380,   398,  -509,   205,  -509,   181,   266,   263,  -509,
-     388,   -68,   399,   400,   267,   277,   283,   739,   408,   739,
-     284,   285,   739,   288,   181,  -509,   289,   290,   739,   739,
-     181,   293,   291,  1379,    89,   295,   299,   -24,  1327,  1327,
-    1327,  1327,  -509,  -509,   296,  1327,  1327,  1379,  -509,  -509,
-    -509,    38,  1231,  -509,   300,  -509,   739,   739,  1379,   739,
-     739,   291,  -509,   291,  1379,   739,   304,  1379,  1379,  1379,
-    -509,  -509,  1379,   391,  -509,   610,  -509,  1327,  1327,  -509,
-     306,   303,   310,   311,  -509,   316,   322,   154,  -509,  -509,
-    -509,   181,    83,   428,   321,   324,   610,   -23,  -509,  -509,
-    -509,  -509,  -509,   309,   739,  -509,  -509,  -509,    53,   291,
-     335,   350,  1327,  -509,  1327,  1327,  -509,  -509,  -509,    38,
-    -509,   404,  -509,   455,    -1,  -509,  1379,  -509,  -509,   351,
-    -509,  -509,  -509,  -509,   353,   355,   356,  -509,   496,  -509,
-     739,  -509,   993,     4,    14,   610,    87,  -509,    41,  -509,
-    -509,  -509,  -509,  -509,   362,  -509,   993,  -509,   488,   489,
-     366,    14,   739,   739,   490,   439,  -509,   739,   494,  -509,
-     739,  -509
-};
 
-/* YYPGOTO[NTERM-NUM].  */
-static const short int yypgoto[] =
-{
-    -509,   385,   387,   390,   276,   278,  -164,  -509,     0,    -7,
-     429,     8,  -509,  -509,  -509,  -509,    37,  -509,  -509,  -509,
-    -143,  -308,  -410,  -509,  -221,  -509,  -284,    17,  -509,  -296,
-    -509,  -509,   -26,   305,  -119,  -509,   413,   424,   -30,  -151,
-    -227,   103,   226,   298,  -509,  -509,   513,  -509,  -509,  -509,
-    -509,  -509,  -509,  -509,  -509,  -509,  -509,  -509,   445,  -509,
-    -509,  -509,  -509,  -509,  -509,  -508,  -140,    96,  -169,  -509,
-     476,  -509,  -509,  -509,  -509,  -509,    51,   156,  -509,  -509,
-    -509,  -509
-};
+#define	YYLAST		1545
 
-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -190
-static const short int yytable[] =
-{
-      11,    78,   266,   255,   157,   324,   461,   230,    13,   101,
-     265,   158,   389,   372,   256,   265,   389,    11,    24,    87,
-     298,   427,   339,   341,   267,    13,   429,    90,    26,   391,
-     392,   -55,   -55,   -55,   -55,   302,   303,   304,   305,   306,
-     401,    21,   309,    25,   564,   139,   128,  -189,   105,   406,
-     411,   231,   232,   129,     1,    22,   140,     3,   570,     5,
-     428,    28,   -64,     1,     2,   428,     3,     4,     5,   412,
-     310,   401,   131,    27,     6,     7,   105,    80,    81,    43,
-     465,   139,   131,   401,    85,   401,   155,   146,    57,    11,
-      86,   529,   224,   401,   407,     8,   454,   146,     9,   107,
-     402,   108,    10,    49,    50,    51,    58,   322,    52,   221,
-     222,   405,   227,   225,   411,   474,   536,   228,   460,   489,
-     537,   361,   568,   361,   361,   554,   361,    59,   313,   314,
-     107,   421,   108,    61,     1,   159,   321,     3,   261,     5,
-      87,   369,   107,   386,   108,   551,   315,   316,   366,    94,
-     565,    91,   313,   314,   102,   313,   314,   571,   484,   361,
-      95,   296,   297,   261,   299,   258,     2,   361,   361,     4,
-     315,   316,   387,   315,   316,   388,    96,   300,   261,   261,
-     261,   261,   261,   307,   308,   261,   107,   510,   108,   511,
-     374,   384,   536,   131,   389,    99,   540,   313,   314,   114,
-     115,   313,   314,   146,    98,   371,   107,   433,   108,   435,
-     436,   437,   142,   143,   387,   315,   316,   388,   387,   315,
-     316,   388,   233,   234,   235,   236,   361,   361,   361,   107,
-      83,   108,   486,   263,   361,   541,   264,    37,    38,    39,
-    -188,   146,   502,   100,   361,   361,   135,    45,   389,    46,
-     389,   136,   367,   255,   156,   -64,     1,     2,   219,     3,
-       4,     5,    63,    64,   256,   311,   312,     6,     7,   368,
-     217,     1,     2,   223,     3,     4,     5,   117,   118,   119,
-     120,   121,   122,   220,   146,   385,   261,   361,     8,   361,
-     226,     9,   361,   229,   107,    10,   108,   528,   361,   361,
-     396,   397,   398,   399,   400,   512,   109,   110,   515,   516,
-     517,   -56,   404,   408,   409,   410,   556,   -57,    82,   558,
-      83,   107,   416,   108,   237,   259,   361,   361,   265,   361,
-     361,   111,   323,   112,   330,   361,   331,   332,   342,   333,
-     334,   343,   344,   345,   346,   361,   375,   376,   348,   377,
-     261,   434,   261,   261,   261,   378,   379,   440,   383,   363,
-     364,   393,   365,   380,   445,   446,   361,   444,   419,   394,
-     552,   452,    63,    64,   361,   103,    66,    67,    68,    69,
-     395,     1,     2,   422,     3,     4,     5,   423,   438,   566,
-     432,   439,   443,   448,   457,   373,   449,   450,   451,   458,
-     455,   456,   459,   381,   382,   462,   463,   464,   453,   468,
-     361,    70,   472,   466,   467,   361,   469,   485,   490,   491,
-     492,   493,   470,   474,   475,   495,   496,   477,   478,   479,
-     483,   497,   361,   361,   487,   482,   501,   361,   488,   503,
-     361,   428,   506,   514,   494,   522,   523,   532,   261,   524,
-     525,   261,   261,   261,   548,   538,   506,   520,   521,   526,
-     533,   498,   424,   425,   426,   527,   279,   280,   534,   550,
-     431,    29,    30,    31,    32,    33,    34,    35,   542,    36,
-     441,   442,   268,   269,   270,   271,   272,   273,   274,   275,
-     276,   277,   544,   543,   545,   546,   559,   557,   560,   561,
-     562,   569,   572,   573,   577,   574,    71,   578,   580,    72,
-     555,   209,    73,   210,    74,   104,   211,   328,   126,   530,
-     329,   141,   547,   471,   319,   473,   138,   327,   476,   498,
-      44,   125,    93,   518,   480,   481,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-       0,     0,   447,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   504,   505,     0,   508,   509,    37,    38,    39,
-       0,   513,     0,    63,    64,     0,   103,    66,    67,    68,
-      69,   519,     1,     2,     0,     3,     4,     5,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   535,     0,     0,     0,     0,     0,     0,     0,
-     539,     0,    70,   349,   350,     0,     0,    63,    64,   351,
-       0,     0,     0,     0,     0,     0,     1,     2,     0,     3,
-       4,     5,   352,   353,   354,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   563,   355,   356,     0,
-       0,   567,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   357,     0,     0,     0,   575,   576,
-       0,     0,     0,   579,     0,     0,   581,     0,     0,     0,
-     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
-     180,   181,   182,   183,   184,   241,   242,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    71,     0,     0,
-      72,     0,     0,    73,     0,    74,   137,     0,     0,     0,
-       0,     0,   243,   191,   192,   193,   194,   195,   196,   197,
-     198,   199,   200,   201,   202,     0,   244,     0,   245,   246,
-     247,     0,   349,   350,     0,     0,    63,    64,   351,     0,
-     107,     0,   108,     0,     0,     1,     2,   358,     3,     4,
-       5,   352,   353,   354,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   355,   356,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   357,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   170,
-     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,   241,   242,     0,    63,    64,     0,
-     103,   149,   150,   151,    69,     0,     1,     2,     0,     3,
-       4,     5,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   243,   191,   192,   193,   194,   195,   196,   197,   198,
-     199,   200,   201,   202,     0,   244,    70,   245,   246,   247,
-      63,    64,     0,     0,     0,     0,     0,     0,     0,     1,
-       2,     0,     3,     4,     5,   238,   358,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     239,   240,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    63,    64,     0,   103,   149,   150,   151,    69,     0,
-       1,     2,     0,     3,     4,     5,     0,     0,     0,     0,
-       0,     0,     0,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,   241,   242,
-      70,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    71,     0,     0,    72,     0,     0,    73,     0,    74,
-     340,     0,     0,     0,     0,   243,   191,   192,   193,   194,
-     195,   196,   197,   198,   199,   200,   201,   202,     0,   244,
-       0,   245,   246,   247,     0,     0,   349,   350,     0,     0,
-       0,     0,   351,   107,     0,   108,     0,   248,     0,     0,
-     249,     0,   250,     0,   251,   352,   353,   354,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     355,   356,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    71,     0,   357,    72,     0,
-       0,    73,     0,    74,   403,     0,     0,     0,     0,     0,
-       0,     0,     0,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,   241,   242,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    63,
-      64,     0,   103,    66,    67,    68,    69,     0,     1,     2,
-       0,     3,     4,     5,     0,   243,   191,   192,   193,   194,
-     195,   196,   197,   198,   199,   200,   201,   202,   130,   244,
-       0,   245,   246,   247,     0,     0,     0,     0,    70,    63,
-      64,     0,   144,    66,    67,    68,    69,     0,     1,     2,
-     358,     3,     4,     5,    63,    64,     0,   103,    66,    67,
-      68,    69,     0,     1,     2,     0,     3,     4,     5,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    70,     0,
-       0,     0,     0,   318,     0,    63,    64,     0,   103,   149,
-     150,   151,    69,    70,     1,     2,     0,     3,     4,     5,
-       0,    63,    64,     0,   103,    66,    67,    68,    69,     0,
-       1,     2,     0,     3,     4,     5,     0,     0,     0,     0,
-       0,     0,     0,     0,    70,     0,     0,     0,     0,     0,
-     415,     0,     0,    71,     0,     0,    72,     0,     0,    73,
-      70,    74,     0,     0,     0,     0,     0,     0,    63,    64,
-     145,   103,    66,    67,    68,    69,     0,     1,     2,     0,
-       3,     4,     5,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    71,     0,     0,    72,   500,     0,    73,
-       0,    74,     0,     0,     0,     0,     0,    70,    71,     0,
-       0,    72,     0,     0,    73,     0,    74,    63,    64,     0,
-      65,    66,    67,    68,    69,     0,     1,     2,     0,     3,
-       4,     5,     0,     0,     0,     0,     0,     0,     0,    71,
-       0,     0,    72,     0,   335,    73,     0,    74,     0,     0,
-       0,     0,     0,     0,     0,    71,    70,     0,    72,     0,
-       0,    73,     0,    74,    63,    64,     0,   103,   149,   150,
-     151,    69,     0,     1,     2,     0,     3,     4,     5,    63,
-      64,     0,   144,    66,    67,    68,    69,     0,     1,     2,
-       0,     3,     4,     5,     0,     0,     0,     0,     0,     0,
-       0,     0,    71,    70,     0,    72,     0,     0,    73,     0,
-      74,     0,     0,     0,     0,     0,    63,    64,    70,   103,
-      66,    67,    68,    69,     0,     1,     2,     0,     3,     4,
-       5,    63,    64,     0,   260,    66,    67,    68,    69,     0,
-       1,     2,     0,     3,     4,     5,     0,     0,     0,     0,
-       0,    71,     0,     0,    72,    70,     0,    73,     0,    74,
-       0,     0,     0,     0,     0,     0,     0,     0,    63,    64,
-      70,   103,   149,   150,   151,    69,     0,     1,     2,     0,
-       3,     4,     5,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    71,     0,
-       0,    72,     0,     0,    73,     0,    74,    70,     0,     0,
-       0,     0,     0,    71,     0,     0,    72,     0,     0,    73,
-       0,    74,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   161,     0,     0,     0,     0,     0,     0,
-      71,     0,     0,    72,     0,     0,    73,     0,    74,     0,
-       0,     0,   162,   163,     0,    71,     0,     0,    72,     0,
-       0,    73,     0,    74,   164,   165,   166,   167,   168,   169,
-     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
-     180,   181,   182,   183,   184,   185,   186,     0,     0,     0,
-       0,     0,    71,     0,     0,    72,     0,     0,    73,     0,
-     338,     0,     0,     0,     0,     0,     0,   187,   188,   189,
-       0,     0,   190,   191,   192,   193,   194,   195,   196,   197,
-     198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
-     208
-};
 
-static const short int yycheck[] =
-{
-       0,    27,   166,   154,   123,   226,   416,   147,     0,     4,
-      11,    25,   320,   297,   154,    11,   324,    17,   138,    18,
-     189,    11,   249,   250,   167,    17,    11,    26,   138,   325,
-     326,     3,     4,     5,     6,   204,   205,   206,   207,   208,
-     139,    49,   211,    54,   552,   139,   139,     0,    74,   148,
-      31,    23,    24,   146,    16,    63,   150,    19,   566,    21,
-      50,   138,    15,    16,    17,    50,    19,    20,    21,    50,
-     213,   139,    98,    15,    27,    28,   102,    40,    41,     0,
-     148,   139,   108,   139,    47,   139,   116,   113,   138,    89,
-      53,   501,   150,   139,   150,    48,   150,   123,    51,   140,
-     146,   142,    55,    39,    40,    41,   138,   148,    44,   135,
-     136,   338,   142,   139,    31,   139,   139,   143,   414,   143,
-     143,   261,    35,   263,   264,   535,   266,   144,   114,   115,
-     140,   358,   142,    19,    16,   149,   146,    19,   164,    21,
-      18,   139,   140,   312,   142,   146,   132,   133,   267,    19,
-     146,   150,   114,   115,   149,   114,   115,   567,   442,   299,
-      19,   187,   188,   189,   190,   157,    17,   307,   308,    20,
-     132,   133,   131,   132,   133,   134,    19,   203,   204,   205,
-     206,   207,   208,   209,   210,   211,   140,   471,   142,   473,
-     144,   310,   139,   219,   502,     4,   143,   114,   115,    29,
-      30,   114,   115,   229,   142,   139,   140,   376,   142,   378,
-     379,   380,   109,   110,   131,   132,   133,   134,   131,   132,
-     133,   134,     3,     4,     5,     6,   366,   367,   368,   140,
-      34,   142,   143,    11,   374,   519,    14,   135,   136,   137,
-       0,   267,   463,     4,   384,   385,   145,    43,   556,    45,
-     558,   145,   278,   404,     4,    15,    16,    17,   139,    19,
-      20,    21,     7,     8,   404,   110,   111,    27,    28,   295,
-      19,    16,    17,   148,    19,    20,    21,    57,    58,    59,
-      60,    61,    62,   143,   310,   311,   312,   427,    48,   429,
-     143,    51,   432,   142,   140,    55,   142,   143,   438,   439,
-     330,   331,   332,   333,   334,   474,    80,    81,   477,   478,
-     479,     9,   338,   343,   344,   345,   537,     9,    32,   540,
-      34,   140,   348,   142,     9,    52,   466,   467,    11,   469,
-     470,    39,   148,    41,   142,   475,   142,   142,    19,   142,
-     142,   142,   142,   142,   139,   485,   139,   139,   142,   139,
-     376,   377,   378,   379,   380,   139,   139,   383,    35,   263,
-     264,    35,   266,   139,   394,   395,   506,   393,    56,   142,
-     534,   401,     7,     8,   514,    10,    11,    12,    13,    14,
-     142,    16,    17,   139,    19,    20,    21,   139,   139,   553,
-     144,   139,   139,   139,    35,   299,   139,   139,   139,    19,
-     139,   139,     4,   307,   308,   139,   143,    19,   148,   142,
-     550,    46,     4,    14,    14,   555,   139,   443,   448,   449,
-     450,   451,   139,   139,   139,   455,   456,   139,   139,   139,
-     139,   457,   572,   573,   139,   142,   462,   577,   139,   139,
-     580,    50,   468,   139,   148,   139,   143,    19,   474,   139,
-     139,   477,   478,   479,    50,   146,   482,   487,   488,   143,
-     139,   461,   366,   367,   368,   143,    23,    24,   144,    14,
-     374,    39,    40,    41,    42,    43,    44,    45,   143,    47,
-     384,   385,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,   522,   143,   524,   525,   143,   146,   143,   143,
-       4,   139,    14,    14,    14,   139,   141,    68,    14,   144,
-     536,   126,   147,   126,   149,   150,   126,   241,    89,   502,
-     242,   108,   529,   427,   219,   429,   102,   229,   432,   529,
-      17,    86,    56,   482,   438,   439,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-      -1,    -1,   396,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   466,   467,    -1,   469,   470,   135,   136,   137,
-      -1,   475,    -1,     7,     8,    -1,    10,    11,    12,    13,
-      14,   485,    16,    17,    -1,    19,    20,    21,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   506,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     514,    -1,    46,     3,     4,    -1,    -1,     7,     8,     9,
-      -1,    -1,    -1,    -1,    -1,    -1,    16,    17,    -1,    19,
-      20,    21,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   550,    37,    38,    -1,
-      -1,   555,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    54,    -1,    -1,    -1,   572,   573,
-      -1,    -1,    -1,   577,    -1,    -1,   580,    -1,    -1,    -1,
-      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
-      80,    81,    82,    83,    84,    85,    86,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   141,    -1,    -1,
-     144,    -1,    -1,   147,    -1,   149,   150,    -1,    -1,    -1,
-      -1,    -1,   112,   113,   114,   115,   116,   117,   118,   119,
-     120,   121,   122,   123,   124,    -1,   126,    -1,   128,   129,
-     130,    -1,     3,     4,    -1,    -1,     7,     8,     9,    -1,
-     140,    -1,   142,    -1,    -1,    16,    17,   147,    19,    20,
-      21,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    37,    38,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    54,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    70,
-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    -1,     7,     8,    -1,
-      10,    11,    12,    13,    14,    -1,    16,    17,    -1,    19,
-      20,    21,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,    -1,   126,    46,   128,   129,   130,
-       7,     8,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    16,
-      17,    -1,    19,    20,    21,    22,   147,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      37,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,     7,     8,    -1,    10,    11,    12,    13,    14,    -1,
-      16,    17,    -1,    19,    20,    21,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      46,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   141,    -1,    -1,   144,    -1,    -1,   147,    -1,   149,
-     150,    -1,    -1,    -1,    -1,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,   124,    -1,   126,
-      -1,   128,   129,   130,    -1,    -1,     3,     4,    -1,    -1,
-      -1,    -1,     9,   140,    -1,   142,    -1,   144,    -1,    -1,
-     147,    -1,   149,    -1,   151,    22,    23,    24,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      37,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   141,    -1,    54,   144,    -1,
-      -1,   147,    -1,   149,   150,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     7,
-       8,    -1,    10,    11,    12,    13,    14,    -1,    16,    17,
-      -1,    19,    20,    21,    -1,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,   124,    36,   126,
-      -1,   128,   129,   130,    -1,    -1,    -1,    -1,    46,     7,
-       8,    -1,    10,    11,    12,    13,    14,    -1,    16,    17,
-     147,    19,    20,    21,     7,     8,    -1,    10,    11,    12,
-      13,    14,    -1,    16,    17,    -1,    19,    20,    21,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    46,    -1,
-      -1,    -1,    -1,    36,    -1,     7,     8,    -1,    10,    11,
-      12,    13,    14,    46,    16,    17,    -1,    19,    20,    21,
-      -1,     7,     8,    -1,    10,    11,    12,    13,    14,    -1,
-      16,    17,    -1,    19,    20,    21,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    46,    -1,    -1,    -1,    -1,    -1,
-      36,    -1,    -1,   141,    -1,    -1,   144,    -1,    -1,   147,
-      46,   149,    -1,    -1,    -1,    -1,    -1,    -1,     7,     8,
-     118,    10,    11,    12,    13,    14,    -1,    16,    17,    -1,
-      19,    20,    21,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   141,    -1,    -1,   144,    36,    -1,   147,
-      -1,   149,    -1,    -1,    -1,    -1,    -1,    46,   141,    -1,
-      -1,   144,    -1,    -1,   147,    -1,   149,     7,     8,    -1,
-      10,    11,    12,    13,    14,    -1,    16,    17,    -1,    19,
-      20,    21,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   141,
-      -1,    -1,   144,    -1,   146,   147,    -1,   149,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   141,    46,    -1,   144,    -1,
-      -1,   147,    -1,   149,     7,     8,    -1,    10,    11,    12,
-      13,    14,    -1,    16,    17,    -1,    19,    20,    21,     7,
-       8,    -1,    10,    11,    12,    13,    14,    -1,    16,    17,
-      -1,    19,    20,    21,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   141,    46,    -1,   144,    -1,    -1,   147,    -1,
-     149,    -1,    -1,    -1,    -1,    -1,     7,     8,    46,    10,
-      11,    12,    13,    14,    -1,    16,    17,    -1,    19,    20,
-      21,     7,     8,    -1,    10,    11,    12,    13,    14,    -1,
-      16,    17,    -1,    19,    20,    21,    -1,    -1,    -1,    -1,
-      -1,   141,    -1,    -1,   144,    46,    -1,   147,    -1,   149,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     7,     8,
-      46,    10,    11,    12,    13,    14,    -1,    16,    17,    -1,
-      19,    20,    21,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   141,    -1,
-      -1,   144,    -1,    -1,   147,    -1,   149,    46,    -1,    -1,
-      -1,    -1,    -1,   141,    -1,    -1,   144,    -1,    -1,   147,
-      -1,   149,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    33,    -1,    -1,    -1,    -1,    -1,    -1,
-     141,    -1,    -1,   144,    -1,    -1,   147,    -1,   149,    -1,
-      -1,    -1,    52,    53,    -1,   141,    -1,    -1,   144,    -1,
-      -1,   147,    -1,   149,    64,    65,    66,    67,    68,    69,
-      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
-      80,    81,    82,    83,    84,    85,    86,    -1,    -1,    -1,
-      -1,    -1,   141,    -1,    -1,   144,    -1,    -1,   147,    -1,
-     149,    -1,    -1,    -1,    -1,    -1,    -1,   107,   108,   109,
-      -1,    -1,   112,   113,   114,   115,   116,   117,   118,   119,
-     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
-     130
+static const short yytable[] = {    11,
+    76,   253,   264,   323,   296,   228,   155,   460,    99,   371,
+   338,   340,   254,    13,   426,    11,   263,   263,   265,   300,
+   301,   302,   303,   304,   388,   410,   307,   428,   388,    13,
+    85,   311,   312,   567,   390,   391,   311,   312,    88,   156,
+   -54,   -54,   -54,   -54,   411,    20,   103,   400,   386,   313,
+   314,   387,   315,   427,   313,   314,   405,   315,   563,    21,
+   229,   230,   112,   113,   308,   137,   427,    78,    79,   400,
+   129,   137,   569,    83,   103,    23,   138,   400,   464,    84,
+   129,   105,   222,   106,   153,   144,    11,   320,   406,    61,
+    62,     1,   528,   400,     3,   144,     5,    24,     1,     2,
+   404,     3,     4,     5,   453,   309,   310,   219,   220,   126,
+   225,   223,   311,   312,   410,   226,   127,    57,   400,   360,
+   420,   360,   360,   459,   360,   401,   553,   385,    25,   386,
+   313,   314,   387,   315,    61,    62,   259,   101,    64,    65,
+    66,    67,     2,     1,     2,     4,     3,     4,     5,    43,
+   365,    44,   550,   564,   100,   483,    26,   360,   570,   294,
+   295,   259,   297,    89,   157,   360,   360,    59,   256,    47,
+    48,    49,    85,    68,    50,   298,   259,   259,   259,   259,
+   259,   305,   306,   259,   509,   105,   510,   106,   485,   311,
+   312,   129,   432,   383,   434,   435,   436,   311,   312,     1,
+    27,   144,     3,   105,     5,   106,   388,   313,   314,   473,
+   315,   321,    55,   488,   386,   313,   314,   387,   315,   115,
+   116,   117,   118,   119,   120,   360,   360,   360,    36,    37,
+    38,   535,   540,   360,   105,   536,   106,   261,   373,   144,
+   262,   501,   535,   360,   360,    80,   539,    81,   368,   105,
+   366,   106,   253,   231,   232,   233,   234,    92,   370,   105,
+   388,   106,   388,   254,   105,    56,   106,   367,   109,    69,
+   110,    93,    70,   140,   141,    71,    94,    72,   102,   107,
+   108,    96,   144,   384,   259,    97,   360,    98,   360,    81,
+   511,   360,   133,   514,   515,   516,   134,   360,   360,   395,
+   396,   397,   398,   399,   105,   154,   106,   527,   215,   217,
+   221,   403,   407,   408,   409,   555,   218,   224,   557,   227,
+   -55,   415,   -56,   235,   257,   360,   360,   263,   360,   360,
+   322,   329,   330,   331,   360,   332,   333,   341,   342,   343,
+   344,   347,   345,   374,   360,   375,   376,   377,   378,   259,
+   433,   259,   259,   259,   379,   382,   439,   392,   362,   363,
+   393,   364,   394,   444,   445,   360,   443,   421,   418,   431,
+   451,   551,   422,   360,    28,    29,    30,    31,    32,    33,
+    34,   437,    35,   438,   442,   447,   448,   449,   450,   452,
+   565,   454,   456,   455,   372,   457,   458,   463,   461,   465,
+   462,   466,   380,   381,   467,   468,   469,   471,   473,   360,
+   474,   476,   481,   477,   360,   478,   484,   489,   490,   491,
+   492,   427,   482,   493,   494,   495,   486,   487,   502,   522,
+   496,   360,   360,   513,   521,   500,   360,   523,   524,   360,
+   525,   505,   531,   526,   532,   533,   547,   259,   549,   537,
+   259,   259,   259,   541,   542,   505,   519,   520,   561,   497,
+   571,   558,   423,   424,   425,   559,   556,   560,   568,   572,
+   430,    36,    37,    38,   573,   576,   577,   579,   348,   349,
+   440,   441,   582,   583,   350,   207,   208,   209,   327,   546,
+   139,   543,   124,   544,   545,   318,    42,   351,   352,   353,
+   328,   529,   136,   326,   123,    91,   517,   446,     0,   554,
+     0,     0,   354,   355,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,   470,     0,   472,     0,   497,   475,   356,
+     0,     0,     0,     0,   479,   480,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,   168,   169,   170,   171,   172,
+   173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+   239,   240,   503,   504,     0,   507,   508,     0,     0,     0,
+     0,   512,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,   518,     0,     0,     0,     0,     0,   241,   189,   190,
+   191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
+     0,   242,   534,   243,   244,   245,     0,     0,     0,     0,
+   538,     0,     0,   348,   349,     0,     0,    61,    62,   350,
+     0,     0,     0,   357,     0,     0,     1,     2,     0,     3,
+     4,     5,   351,   352,   353,   277,   278,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,   562,   354,   355,     0,
+     0,   566,   266,   267,   268,   269,   270,   271,   272,   273,
+   274,   275,     0,     0,   356,     0,     0,     0,   574,   575,
+     0,     0,     0,   578,     0,     0,   580,     0,     0,     0,
+   168,   169,   170,   171,   172,   173,   174,   175,   176,   177,
+   178,   179,   180,   181,   182,   239,   240,     0,     0,     0,
+     0,     0,     0,     0,     0,   279,   280,   281,   282,   283,
+   284,   285,   286,   287,   288,   289,   290,   291,   292,     0,
+     0,     0,   241,   189,   190,   191,   192,   193,   194,   195,
+   196,   197,   198,   199,   200,     0,   242,     0,   243,   244,
+   245,     0,     0,   348,   349,     0,     0,    61,    62,   350,
+     0,   105,     0,   106,     0,     0,     1,     2,   357,     3,
+     4,     5,   351,   352,   353,     0,     0,     0,     0,     0,
+    61,    62,     0,     0,     0,     0,     0,   354,   355,     1,
+     2,     0,     3,     4,     5,   236,     0,     0,     0,     0,
+     0,     0,     0,     0,   356,     0,     0,     0,     0,     0,
+   237,   238,     0,     0,     0,     0,     0,     0,     0,     0,
+   168,   169,   170,   171,   172,   173,   174,   175,   176,   177,
+   178,   179,   180,   181,   182,   239,   240,     0,     0,     0,
+     0,     0,     0,   168,   169,   170,   171,   172,   173,   174,
+   175,   176,   177,   178,   179,   180,   181,   182,   239,   240,
+     0,     0,   241,   189,   190,   191,   192,   193,   194,   195,
+   196,   197,   198,   199,   200,     0,   242,     0,   243,   244,
+   245,     0,     0,     0,     0,   241,   189,   190,   191,   192,
+   193,   194,   195,   196,   197,   198,   199,   200,   357,   242,
+     0,   243,   244,   245,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,   105,     0,   106,     0,   246,     0,
+     0,   247,     0,   248,     0,   249,    61,    62,     0,   101,
+    64,    65,    66,    67,     0,     1,     2,     0,     3,     4,
+     5,    61,    62,     0,   101,   147,   148,   149,    67,     0,
+     1,     2,     0,     3,     4,     5,     0,    61,    62,     0,
+   101,   147,   148,   149,    67,    68,     1,     2,     0,     3,
+     4,     5,    61,    62,     0,   101,    64,    65,    66,    67,
+    68,     1,     2,     0,     3,     4,     5,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,    68,     0,     0,     0,
+     0,   128,     0,    61,    62,     0,   142,    64,    65,    66,
+    67,    68,     1,     2,     0,     3,     4,     5,    61,    62,
+     0,   101,    64,    65,    66,    67,     0,     1,     2,     0,
+     3,     4,     5,     0,     0,  -189,     0,     0,     0,     0,
+     0,     0,    68,     0,     0,     0,     0,   317,     0,     0,
+   -63,     1,     2,     0,     3,     4,     5,    68,     0,     0,
+     0,    69,     6,     7,    70,     0,     0,    71,     0,    72,
+   135,     0,     0,     0,     0,     0,    69,     0,     0,    70,
+     0,     0,    71,     8,    72,   339,     9,     0,     0,     0,
+    10,     0,    69,     0,     0,    70,     0,     0,    71,     0,
+    72,   402,     0,     0,     0,     0,     0,    69,     0,     0,
+    70,     0,     0,    71,   143,    72,    61,    62,     0,   101,
+   147,   148,   149,    67,     0,     1,     2,     0,     3,     4,
+     5,     0,     0,     0,     0,     0,     0,     0,    69,     0,
+     0,    70,     0,     0,    71,     0,    72,     0,     0,     0,
+     0,     0,     0,    69,     0,    68,    70,     0,     0,    71,
+     0,    72,    61,    62,     0,   101,    64,    65,    66,    67,
+     0,     1,     2,     0,     3,     4,     5,     0,     0,     0,
+    61,    62,     0,   101,    64,    65,    66,    67,     0,     1,
+     2,   414,     3,     4,     5,     0,     0,     0,     0,     0,
+     0,    68,     0,     0,     0,     0,     0,     0,     0,   499,
+     0,    61,    62,     0,    63,    64,    65,    66,    67,    68,
+     1,     2,     0,     3,     4,     5,    61,    62,     0,   101,
+   147,   148,   149,    67,     0,     1,     2,     0,     3,     4,
+     5,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    68,    69,     0,     0,    70,     0,   334,    71,     0,    72,
+     0,     0,     0,    61,    62,    68,   142,    64,    65,    66,
+    67,     0,     1,     2,     0,     3,     4,     5,    61,    62,
+     0,   101,    64,    65,    66,    67,     0,     1,     2,     0,
+     3,     4,     5,     0,     0,     0,     0,    69,     0,     0,
+    70,     0,    68,    71,     0,    72,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,    69,     0,    68,    70,     0,
+     0,    71,     0,    72,    61,    62,     0,   258,    64,    65,
+    66,    67,     0,     1,     2,     0,     3,     4,     5,     0,
+     0,     0,     0,     0,     0,     0,    69,     0,     0,    70,
+     0,     0,    71,     0,    72,     0,     0,     0,     0,     0,
+     0,    69,     0,    68,    70,     0,     0,    71,     0,    72,
+    61,    62,     0,   101,   147,   148,   149,    67,     0,     1,
+     2,     0,     3,     4,     5,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,   159,     0,     0,    69,     0,
+     0,    70,     0,     0,    71,     0,    72,     0,     0,    68,
+     0,     0,     0,    69,   160,   161,    70,     0,     0,    71,
+     0,    72,     0,     0,     0,     0,   162,   163,   164,   165,
+   166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
+   176,   177,   178,   179,   180,   181,   182,   183,   184,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,    69,
+     0,     0,    70,     0,     0,    71,     0,    72,     0,   185,
+   186,   187,     0,     0,   188,   189,   190,   191,   192,   193,
+   194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
+   204,   205,   206,     0,     0,     0,     0,     0,     0,  -188,
+     0,     0,     0,     0,     0,    69,     0,     0,    70,     0,
+     0,    71,     0,   337,   -63,     1,     2,     0,     3,     4,
+     5,     0,     0,     0,     0,     0,     6,     7,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     8,     0,     0,
+     9,     0,     0,     0,    10
 };
 
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
-static const unsigned char yystos[] =
-{
-       0,    16,    17,    19,    20,    21,    27,    28,    48,    51,
-      55,   160,   162,   163,   164,   165,   196,   197,   198,   200,
-     199,    49,    63,   205,   138,    54,   138,    15,   138,    39,
-      40,    41,    42,    43,    44,    45,    47,   135,   136,   137,
-     166,   167,   168,     0,   198,    43,    45,   169,   215,    39,
-      40,    41,    44,   170,   212,   214,   221,   138,   138,   144,
-     206,    19,   204,     7,     8,    10,    11,    12,    13,    14,
-      46,   141,   144,   147,   149,   160,   163,   183,   184,   218,
-     168,   168,    32,    34,   194,   168,   168,    18,   222,   223,
-      26,   150,   213,   222,    19,    19,    19,   207,   142,     4,
-       4,     4,   149,    10,   150,   184,   189,   140,   142,   194,
-     194,    39,    41,   171,    29,    30,   193,    57,    58,    59,
-      60,    61,    62,   172,   210,   210,   162,   226,   139,   146,
-      36,   184,   185,   187,   188,   145,   145,   150,   189,   139,
-     150,   188,   193,   193,    10,   118,   184,   186,   195,    11,
-      12,    13,   158,   159,   184,   190,     4,   186,    25,   149,
-     211,    33,    52,    53,    64,    65,    66,    67,    68,    69,
-      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
-      80,    81,    82,    83,    84,    85,    86,   107,   108,   109,
-     112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
-     122,   123,   124,   125,   126,   127,   128,   129,   130,   153,
-     154,   155,   224,   230,   231,   232,   233,    19,   174,   139,
-     143,   184,   184,   148,   150,   184,   143,   190,   184,   142,
-     218,    23,    24,     3,     4,     5,     6,     9,    22,    37,
-      38,    85,    86,   112,   126,   128,   129,   130,   144,   147,
-     149,   151,   153,   154,   155,   191,   218,   201,   163,    52,
-      10,   184,   220,    11,    14,    11,   158,   172,    87,    88,
-      89,    90,    91,    92,    93,    94,    95,    96,   156,    23,
-      24,    93,    94,    95,    96,    97,    98,    99,   100,   101,
-     102,   103,   104,   105,   106,   157,   184,   184,   220,   184,
-     184,   227,   220,   220,   220,   220,   220,   184,   184,   220,
-     172,   110,   111,   114,   115,   132,   133,   173,    36,   185,
-     176,   146,   148,   148,   176,   202,   203,   195,   156,   157,
-     142,   142,   142,   142,   142,   146,   190,   192,   149,   192,
-     150,   192,    19,   142,   142,   142,   139,   181,   142,     3,
-       4,     9,    22,    23,    24,    37,    38,    54,   147,   191,
-     217,   218,   219,   219,   219,   219,   186,   184,   184,   139,
-     178,   139,   178,   219,   144,   139,   139,   139,   139,   139,
-     139,   219,   219,    35,   186,   184,   220,   131,   134,   173,
-     175,   181,   181,    35,   142,   142,   190,   190,   190,   190,
-     190,   139,   146,   150,   184,   192,   148,   150,   190,   190,
-     190,    31,    50,   179,   182,    36,   184,   208,   209,    56,
-     216,   192,   139,   139,   219,   219,   219,    11,    50,    11,
-     229,   219,   144,   220,   184,   220,   220,   220,   139,   139,
-     184,   219,   219,   139,   184,   190,   190,   229,   139,   139,
-     139,   139,   190,   148,   150,   139,   139,    35,    19,     4,
-     181,   174,   139,   143,    19,   148,    14,    14,   142,   139,
-     139,   219,     4,   219,   139,   139,   219,   139,   139,   139,
-     219,   219,   142,   139,   178,   184,   143,   139,   139,   143,
-     190,   190,   190,   190,   148,   190,   190,   184,   160,   161,
-      36,   184,   176,   139,   219,   219,   184,   228,   219,   219,
-     178,   178,   220,   219,   139,   220,   220,   220,   228,   219,
-     190,   190,   139,   143,   139,   139,   143,   143,   143,   174,
-     179,   180,    19,   139,   144,   219,   139,   143,   146,   219,
-     143,   178,   143,   143,   190,   190,   190,   161,    50,   177,
-      14,   146,   158,   225,   174,   184,   176,   146,   176,   143,
-     143,   143,     4,   219,   217,   146,   158,   219,    35,   139,
-     217,   174,    14,    14,   139,   219,   219,    14,    68,   219,
-      14,   219
+static const short yycheck[] = {     0,
+    26,   152,   164,   224,   187,   145,   121,   415,     4,   295,
+   247,   248,   152,     0,    11,    16,    11,    11,   165,   202,
+   203,   204,   205,   206,   319,    31,   209,    11,   323,    16,
+    18,   114,   115,    35,   324,   325,   114,   115,    26,    25,
+     3,     4,     5,     6,    50,    49,    72,   140,   131,   132,
+   133,   134,   135,    50,   132,   133,   149,   135,   551,    63,
+    23,    24,    29,    30,   211,   140,    50,    39,    40,   140,
+    96,   140,   565,    45,   100,   139,   151,   140,   149,    51,
+   106,   141,   151,   143,   114,   111,    87,   147,   151,     7,
+     8,    16,   500,   140,    19,   121,    21,    54,    16,    17,
+   337,    19,    20,    21,   151,   110,   111,   133,   134,   140,
+   140,   137,   114,   115,    31,   141,   147,   145,   140,   259,
+   357,   261,   262,   413,   264,   147,   534,   310,   139,   131,
+   132,   133,   134,   135,     7,     8,   162,    10,    11,    12,
+    13,    14,    17,    16,    17,    20,    19,    20,    21,    43,
+   265,    45,   147,   147,   150,   441,    15,   297,   566,   185,
+   186,   187,   188,   151,   150,   305,   306,    19,   155,    39,
+    40,    41,    18,    46,    44,   201,   202,   203,   204,   205,
+   206,   207,   208,   209,   470,   141,   472,   143,   144,   114,
+   115,   217,   375,   308,   377,   378,   379,   114,   115,    16,
+   139,   227,    19,   141,    21,   143,   501,   132,   133,   140,
+   135,   149,   139,   144,   131,   132,   133,   134,   135,    57,
+    58,    59,    60,    61,    62,   365,   366,   367,   136,   137,
+   138,   140,   518,   373,   141,   144,   143,    11,   145,   265,
+    14,   462,   140,   383,   384,    32,   144,    34,   140,   141,
+   276,   143,   403,     3,     4,     5,     6,    19,   140,   141,
+   555,   143,   557,   403,   141,   139,   143,   293,    39,   142,
+    41,    19,   145,   107,   108,   148,    19,   150,   151,    78,
+    79,   143,   308,   309,   310,     4,   426,     4,   428,    34,
+   473,   431,   146,   476,   477,   478,   146,   437,   438,   329,
+   330,   331,   332,   333,   141,     4,   143,   144,    19,   140,
+   149,   337,   342,   343,   344,   536,   144,   144,   539,   143,
+     9,   347,     9,     9,    52,   465,   466,    11,   468,   469,
+   149,   143,   143,   143,   474,   143,   143,    19,   143,   143,
+   143,   143,   140,   140,   484,   140,   140,   140,   140,   375,
+   376,   377,   378,   379,   140,    35,   382,    35,   261,   262,
+   143,   264,   143,   393,   394,   505,   392,   140,    56,   145,
+   400,   533,   140,   513,    39,    40,    41,    42,    43,    44,
+    45,   140,    47,   140,   140,   140,   140,   140,   140,   149,
+   552,   140,    35,   140,   297,    19,     4,    19,   140,    14,
+   144,    14,   305,   306,   143,   140,   140,     4,   140,   549,
+   140,   140,   143,   140,   554,   140,   442,   447,   448,   449,
+   450,    50,   140,   149,   454,   455,   140,   140,   140,   144,
+   456,   571,   572,   140,   140,   461,   576,   140,   140,   579,
+   144,   467,    19,   144,   140,   145,    50,   473,    14,   147,
+   476,   477,   478,   144,   144,   481,   486,   487,     4,   460,
+    14,   144,   365,   366,   367,   144,   147,   144,   140,    14,
+   373,   136,   137,   138,   140,    14,    68,    14,     3,     4,
+   383,   384,     0,     0,     9,   124,   124,   124,   239,   528,
+   106,   521,    87,   523,   524,   217,    16,    22,    23,    24,
+   240,   501,   100,   227,    84,    54,   481,   395,    -1,   535,
+    -1,    -1,    37,    38,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,   426,    -1,   428,    -1,   528,   431,    54,
+    -1,    -1,    -1,    -1,   437,   438,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    70,    71,    72,    73,    74,
+    75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+    85,    86,   465,   466,    -1,   468,   469,    -1,    -1,    -1,
+    -1,   474,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,   484,    -1,    -1,    -1,    -1,    -1,   112,   113,   114,
+   115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+    -1,   126,   505,   128,   129,   130,    -1,    -1,    -1,    -1,
+   513,    -1,    -1,     3,     4,    -1,    -1,     7,     8,     9,
+    -1,    -1,    -1,   148,    -1,    -1,    16,    17,    -1,    19,
+    20,    21,    22,    23,    24,    23,    24,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,   549,    37,    38,    -1,
+    -1,   554,    87,    88,    89,    90,    91,    92,    93,    94,
+    95,    96,    -1,    -1,    54,    -1,    -1,    -1,   571,   572,
+    -1,    -1,    -1,   576,    -1,    -1,   579,    -1,    -1,    -1,
+    70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+    80,    81,    82,    83,    84,    85,    86,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    93,    94,    95,    96,    97,
+    98,    99,   100,   101,   102,   103,   104,   105,   106,    -1,
+    -1,    -1,   112,   113,   114,   115,   116,   117,   118,   119,
+   120,   121,   122,   123,   124,    -1,   126,    -1,   128,   129,
+   130,    -1,    -1,     3,     4,    -1,    -1,     7,     8,     9,
+    -1,   141,    -1,   143,    -1,    -1,    16,    17,   148,    19,
+    20,    21,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,
+     7,     8,    -1,    -1,    -1,    -1,    -1,    37,    38,    16,
+    17,    -1,    19,    20,    21,    22,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    54,    -1,    -1,    -1,    -1,    -1,
+    37,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+    80,    81,    82,    83,    84,    85,    86,    -1,    -1,    -1,
+    -1,    -1,    -1,    70,    71,    72,    73,    74,    75,    76,
+    77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+    -1,    -1,   112,   113,   114,   115,   116,   117,   118,   119,
+   120,   121,   122,   123,   124,    -1,   126,    -1,   128,   129,
+   130,    -1,    -1,    -1,    -1,   112,   113,   114,   115,   116,
+   117,   118,   119,   120,   121,   122,   123,   124,   148,   126,
+    -1,   128,   129,   130,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,   141,    -1,   143,    -1,   145,    -1,
+    -1,   148,    -1,   150,    -1,   152,     7,     8,    -1,    10,
+    11,    12,    13,    14,    -1,    16,    17,    -1,    19,    20,
+    21,     7,     8,    -1,    10,    11,    12,    13,    14,    -1,
+    16,    17,    -1,    19,    20,    21,    -1,     7,     8,    -1,
+    10,    11,    12,    13,    14,    46,    16,    17,    -1,    19,
+    20,    21,     7,     8,    -1,    10,    11,    12,    13,    14,
+    46,    16,    17,    -1,    19,    20,    21,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    46,    -1,    -1,    -1,
+    -1,    36,    -1,     7,     8,    -1,    10,    11,    12,    13,
+    14,    46,    16,    17,    -1,    19,    20,    21,     7,     8,
+    -1,    10,    11,    12,    13,    14,    -1,    16,    17,    -1,
+    19,    20,    21,    -1,    -1,     0,    -1,    -1,    -1,    -1,
+    -1,    -1,    46,    -1,    -1,    -1,    -1,    36,    -1,    -1,
+    15,    16,    17,    -1,    19,    20,    21,    46,    -1,    -1,
+    -1,   142,    27,    28,   145,    -1,    -1,   148,    -1,   150,
+   151,    -1,    -1,    -1,    -1,    -1,   142,    -1,    -1,   145,
+    -1,    -1,   148,    48,   150,   151,    51,    -1,    -1,    -1,
+    55,    -1,   142,    -1,    -1,   145,    -1,    -1,   148,    -1,
+   150,   151,    -1,    -1,    -1,    -1,    -1,   142,    -1,    -1,
+   145,    -1,    -1,   148,   118,   150,     7,     8,    -1,    10,
+    11,    12,    13,    14,    -1,    16,    17,    -1,    19,    20,
+    21,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   142,    -1,
+    -1,   145,    -1,    -1,   148,    -1,   150,    -1,    -1,    -1,
+    -1,    -1,    -1,   142,    -1,    46,   145,    -1,    -1,   148,
+    -1,   150,     7,     8,    -1,    10,    11,    12,    13,    14,
+    -1,    16,    17,    -1,    19,    20,    21,    -1,    -1,    -1,
+     7,     8,    -1,    10,    11,    12,    13,    14,    -1,    16,
+    17,    36,    19,    20,    21,    -1,    -1,    -1,    -1,    -1,
+    -1,    46,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    36,
+    -1,     7,     8,    -1,    10,    11,    12,    13,    14,    46,
+    16,    17,    -1,    19,    20,    21,     7,     8,    -1,    10,
+    11,    12,    13,    14,    -1,    16,    17,    -1,    19,    20,
+    21,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    46,   142,    -1,    -1,   145,    -1,   147,   148,    -1,   150,
+    -1,    -1,    -1,     7,     8,    46,    10,    11,    12,    13,
+    14,    -1,    16,    17,    -1,    19,    20,    21,     7,     8,
+    -1,    10,    11,    12,    13,    14,    -1,    16,    17,    -1,
+    19,    20,    21,    -1,    -1,    -1,    -1,   142,    -1,    -1,
+   145,    -1,    46,   148,    -1,   150,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,   142,    -1,    46,   145,    -1,
+    -1,   148,    -1,   150,     7,     8,    -1,    10,    11,    12,
+    13,    14,    -1,    16,    17,    -1,    19,    20,    21,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,   142,    -1,    -1,   145,
+    -1,    -1,   148,    -1,   150,    -1,    -1,    -1,    -1,    -1,
+    -1,   142,    -1,    46,   145,    -1,    -1,   148,    -1,   150,
+     7,     8,    -1,    10,    11,    12,    13,    14,    -1,    16,
+    17,    -1,    19,    20,    21,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    33,    -1,    -1,   142,    -1,
+    -1,   145,    -1,    -1,   148,    -1,   150,    -1,    -1,    46,
+    -1,    -1,    -1,   142,    52,    53,   145,    -1,    -1,   148,
+    -1,   150,    -1,    -1,    -1,    -1,    64,    65,    66,    67,
+    68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
+    78,    79,    80,    81,    82,    83,    84,    85,    86,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   142,
+    -1,    -1,   145,    -1,    -1,   148,    -1,   150,    -1,   107,
+   108,   109,    -1,    -1,   112,   113,   114,   115,   116,   117,
+   118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
+   128,   129,   130,    -1,    -1,    -1,    -1,    -1,    -1,     0,
+    -1,    -1,    -1,    -1,    -1,   142,    -1,    -1,   145,    -1,
+    -1,   148,    -1,   150,    15,    16,    17,    -1,    19,    20,
+    21,    -1,    -1,    -1,    -1,    -1,    27,    28,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    48,    -1,    -1,
+    51,    -1,    -1,    -1,    55
 };
+/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
+#line 3 "/usr/share/bison.simple"
+/* This file comes from bison-1.28.  */
+
+/* Skeleton output parser for bison,
+   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
+
+/* This is the parser code that is written into each bison parser
+  when the %semantic_parser declaration is not specified in the grammar.
+  It was written by Richard Stallman by simplifying the hairy parser
+  used when %semantic_parser is specified.  */
+
+#ifndef YYSTACK_USE_ALLOCA
+#ifdef alloca
+#define YYSTACK_USE_ALLOCA
+#else /* alloca not defined */
+#ifdef __GNUC__
+#define YYSTACK_USE_ALLOCA
+#define alloca __builtin_alloca
+#else /* not GNU C.  */
+#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
+#define YYSTACK_USE_ALLOCA
+#include <alloca.h>
+#else /* not sparc */
+/* We think this test detects Watcom and Microsoft C.  */
+/* This used to test MSDOS, but that is a bad idea
+   since that symbol is in the user namespace.  */
+#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
+#if 0 /* No need for malloc.h, which pollutes the namespace;
+	 instead, just don't use alloca.  */
+#include <malloc.h>
+#endif
+#else /* not MSDOS, or __TURBOC__ */
+#if defined(_AIX)
+/* I don't know what this was needed for, but it pollutes the namespace.
+   So I turned it off.   rms, 2 May 1997.  */
+/* #include <malloc.h>  */
+ #pragma alloca
+#define YYSTACK_USE_ALLOCA
+#else /* not MSDOS, or __TURBOC__, or _AIX */
+#if 0
+#ifdef __hpux /* haible at ilog.fr says this works for HPUX 9.05 and up,
+		 and on HPUX 10.  Eventually we can turn this on.  */
+#define YYSTACK_USE_ALLOCA
+#define alloca __builtin_alloca
+#endif /* __hpux */
+#endif
+#endif /* not _AIX */
+#endif /* not MSDOS, or __TURBOC__ */
+#endif /* not sparc */
+#endif /* not GNU C */
+#endif /* alloca not defined */
+#endif /* YYSTACK_USE_ALLOCA not defined */
+
+#ifdef YYSTACK_USE_ALLOCA
+#define YYSTACK_ALLOC alloca
+#else
+#define YYSTACK_ALLOC malloc
+#endif
+
+/* Note: there must be only one dollar sign in this file.
+   It is replaced by the list of actions, each action
+   as one case of the switch.  */
 
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		(-2)
+#define YYEMPTY		-2
 #define YYEOF		0
-
 #define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
-
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
+#define YYABORT 	goto yyabortlab
+#define YYERROR		goto yyerrlab1
+/* Like YYERROR except do call yyerror.
+   This remains here temporarily to ease the
+   transition to the new meaning of YYERROR, for GCC.
    Once GCC version 2 has supplanted version 1, this can go.  */
-
 #define YYFAIL		goto yyerrlab
-
 #define YYRECOVERING()  (!!yyerrstatus)
-
-#define YYBACKUP(Token, Value)					\
+#define YYBACKUP(token, value) \
 do								\
   if (yychar == YYEMPTY && yylen == 1)				\
-    {								\
-      yychar = (Token);						\
-      yylval = (Value);						\
-      yytoken = YYTRANSLATE (yychar);				\
+    { yychar = (token), yylval = (value);			\
+      yychar1 = YYTRANSLATE (yychar);				\
       YYPOPSTACK;						\
       goto yybackup;						\
     }								\
   else								\
-    {								\
-      yyerror (YY_("syntax error: cannot back up")); \
-      YYERROR;							\
-    }								\
+    { yyerror ("syntax error: cannot back up"); YYERROR; }	\
 while (0)
 
-
 #define YYTERROR	1
 #define YYERRCODE	256
 
-
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
-   If N is 0, then set CURRENT to the empty location which ends
-   the previous symbol: RHS[0] (always defined).  */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)				\
-    do									\
-      if (N)								\
-	{								\
-	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
-	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
-	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
-	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
-	}								\
-      else								\
-	{								\
-	  (Current).first_line   = (Current).last_line   =		\
-	    YYRHSLOC (Rhs, 0).last_line;				\
-	  (Current).first_column = (Current).last_column =		\
-	    YYRHSLOC (Rhs, 0).last_column;				\
-	}								\
-    while (0)
+#ifndef YYPURE
+#define YYLEX		yylex()
 #endif
 
-
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
-
-#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)			\
-     fprintf (File, "%d.%d-%d.%d",			\
-              (Loc).first_line, (Loc).first_column,	\
-              (Loc).last_line,  (Loc).last_column)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
+#ifdef YYPURE
+#ifdef YYLSP_NEEDED
+#ifdef YYLEX_PARAM
+#define YYLEX		yylex(&yylval, &yylloc, YYLEX_PARAM)
+#else
+#define YYLEX		yylex(&yylval, &yylloc)
 #endif
-
-
-/* YYLEX -- calling `yylex' with the right arguments.  */
-
+#else /* not YYLSP_NEEDED */
 #ifdef YYLEX_PARAM
-# define YYLEX yylex (YYLEX_PARAM)
+#define YYLEX		yylex(&yylval, YYLEX_PARAM)
 #else
-# define YYLEX yylex ()
+#define YYLEX		yylex(&yylval)
+#endif
+#endif /* not YYLSP_NEEDED */
 #endif
 
-/* Enable debugging if requested.  */
-#if YYDEBUG
+/* If nonreentrant, generate the variables here */
 
-# ifndef YYFPRINTF
-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYFPRINTF fprintf
-# endif
-
-# define YYDPRINTF(Args)			\
-do {						\
-  if (yydebug)					\
-    YYFPRINTF Args;				\
-} while (0)
-
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)		\
-do {								\
-  if (yydebug)							\
-    {								\
-      YYFPRINTF (stderr, "%s ", Title);				\
-      yysymprint (stderr,					\
-                  Type, Value);	\
-      YYFPRINTF (stderr, "\n");					\
-    }								\
-} while (0)
+#ifndef YYPURE
 
-/*------------------------------------------------------------------.
-| yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included).                                                   |
-`------------------------------------------------------------------*/
+int	yychar;			/*  the lookahead symbol		*/
+YYSTYPE	yylval;			/*  the semantic value of the		*/
+				/*  lookahead symbol			*/
 
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yy_stack_print (short int *bottom, short int *top)
-#else
-static void
-yy_stack_print (bottom, top)
-    short int *bottom;
-    short int *top;
+#ifdef YYLSP_NEEDED
+YYLTYPE yylloc;			/*  location data for the lookahead	*/
+				/*  symbol				*/
 #endif
-{
-  YYFPRINTF (stderr, "Stack now");
-  for (/* Nothing. */; bottom <= top; ++bottom)
-    YYFPRINTF (stderr, " %d", *bottom);
-  YYFPRINTF (stderr, "\n");
-}
-
-# define YY_STACK_PRINT(Bottom, Top)				\
-do {								\
-  if (yydebug)							\
-    yy_stack_print ((Bottom), (Top));				\
-} while (0)
 
+int yynerrs;			/*  number of parse errors so far       */
+#endif  /* not YYPURE */
 
-/*------------------------------------------------.
-| Report that the YYRULE is going to be reduced.  |
-`------------------------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yy_reduce_print (int yyrule)
-#else
-static void
-yy_reduce_print (yyrule)
-    int yyrule;
+#if YYDEBUG != 0
+int yydebug;			/*  nonzero means print parse trace	*/
+/* Since this is uninitialized, it does not stop multiple parsers
+   from coexisting.  */
 #endif
-{
-  int yyi;
-  unsigned long int yylno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ",
-             yyrule - 1, yylno);
-  /* Print the symbols being reduced, and their result.  */
-  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
-    YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
-  YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyrule]]);
-}
 
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
-  if (yydebug)				\
-    yy_reduce_print (Rule);		\
-} while (0)
-
-/* Nonzero means print parse trace.  It is left uninitialized so that
-   multiple parsers can coexist.  */
-int yydebug;
-#else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-# define YY_STACK_PRINT(Bottom, Top)
-# define YY_REDUCE_PRINT(Rule)
-#endif /* !YYDEBUG */
+/*  YYINITDEPTH indicates the initial size of the parser's stacks	*/
 
-
-/* YYINITDEPTH -- initial size of the parser's stacks.  */
 #ifndef	YYINITDEPTH
-# define YYINITDEPTH 200
+#define YYINITDEPTH 200
 #endif
 
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
-   if the built-in stack extension method is used).
+/*  YYMAXDEPTH is the maximum size the stacks can grow to
+    (effective only if the built-in stack extension method is used).  */
 
-   Do not make this value too large; the results are undefined if
-   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
-   evaluated with infinite-precision integer arithmetic.  */
+#if YYMAXDEPTH == 0
+#undef YYMAXDEPTH
+#endif
 
 #ifndef YYMAXDEPTH
-# define YYMAXDEPTH 10000
+#define YYMAXDEPTH 10000
 #endif
-
 
+/* Define __yy_memcpy.  Note that the size argument
+   should be passed with type unsigned int, because that is what the non-GCC
+   definitions require.  With GCC, __builtin_memcpy takes an arg
+   of type size_t, but it can handle unsigned int.  */
+
+#if __GNUC__ > 1		/* GNU C and GNU C++ define this.  */
+#define __yy_memcpy(TO,FROM,COUNT)	__builtin_memcpy(TO,FROM,COUNT)
+#else				/* not GNU C or C++ */
+#ifndef __cplusplus
 
-#if YYERROR_VERBOSE
-
-# ifndef yystrlen
-#  if defined (__GLIBC__) && defined (_STRING_H)
-#   define yystrlen strlen
-#  else
-/* Return the length of YYSTR.  */
-static YYSIZE_T
-#   if defined (__STDC__) || defined (__cplusplus)
-yystrlen (const char *yystr)
-#   else
-yystrlen (yystr)
-     const char *yystr;
-#   endif
-{
-  const char *yys = yystr;
-
-  while (*yys++ != '\0')
-    continue;
-
-  return yys - yystr - 1;
-}
-#  endif
-# endif
-
-# ifndef yystpcpy
-#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
-#   define yystpcpy stpcpy
-#  else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-static char *
-#   if defined (__STDC__) || defined (__cplusplus)
-yystpcpy (char *yydest, const char *yysrc)
-#   else
-yystpcpy (yydest, yysrc)
-     char *yydest;
-     const char *yysrc;
-#   endif
-{
-  char *yyd = yydest;
-  const char *yys = yysrc;
-
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
-
-  return yyd - 1;
-}
-#  endif
-# endif
-
-# ifndef yytnamerr
-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
-   quotes and backslashes, so that it's suitable for yyerror.  The
-   heuristic is that double-quoting is unnecessary unless the string
-   contains an apostrophe, a comma, or backslash (other than
-   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
-   null, do not copy; instead, return the length of what the result
-   would have been.  */
-static YYSIZE_T
-yytnamerr (char *yyres, const char *yystr)
+/* This is the most reliable way to avoid incompatibilities
+   in available built-in functions on various systems.  */
+static void
+__yy_memcpy (to, from, count)
+     char *to;
+     char *from;
+     unsigned int count;
 {
-  if (*yystr == '"')
-    {
-      size_t yyn = 0;
-      char const *yyp = yystr;
+  register char *f = from;
+  register char *t = to;
+  register int i = count;
 
-      for (;;)
-	switch (*++yyp)
-	  {
-	  case '\'':
-	  case ',':
-	    goto do_not_strip_quotes;
-
-	  case '\\':
-	    if (*++yyp != '\\')
-	      goto do_not_strip_quotes;
-	    /* Fall through.  */
-	  default:
-	    if (yyres)
-	      yyres[yyn] = *yyp;
-	    yyn++;
-	    break;
-
-	  case '"':
-	    if (yyres)
-	      yyres[yyn] = '\0';
-	    return yyn;
-	  }
-    do_not_strip_quotes: ;
-    }
-
-  if (! yyres)
-    return yystrlen (yystr);
-
-  return yystpcpy (yyres, yystr) - yyres;
+  while (i-- > 0)
+    *t++ = *f++;
 }
-# endif
-
-#endif /* YYERROR_VERBOSE */
-
-
 
-#if YYDEBUG
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+#else /* __cplusplus */
 
-#if defined (__STDC__) || defined (__cplusplus)
+/* This is the most reliable way to avoid incompatibilities
+   in available built-in functions on various systems.  */
 static void
-yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yysymprint (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
+__yy_memcpy (char *to, char *from, unsigned int count)
 {
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
-
-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
-
+  register char *t = to;
+  register char *f = from;
+  register int i = count;
 
-# ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
-  switch (yytype)
-    {
-      default:
-        break;
-    }
-  YYFPRINTF (yyoutput, ")");
+  while (i-- > 0)
+    *t++ = *f++;
 }
 
-#endif /* ! YYDEBUG */
-/*-----------------------------------------------.
-| Release the memory associated to this symbol.  |
-`-----------------------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
-    const char *yymsg;
-    int yytype;
-    YYSTYPE *yyvaluep;
 #endif
-{
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
-
-  if (!yymsg)
-    yymsg = "Deleting";
-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
-  switch (yytype)
-    {
-
-      default:
-        break;
-    }
-}
+#endif
 
+#line 217 "/usr/share/bison.simple"
 
-/* Prevent warnings from -Wmissing-prototypes.  */
+/* The user can define YYPARSE_PARAM as the name of an argument to be passed
+   into yyparse.  The argument should have type void *.
+   It should actually point to an object.
+   Grammar actions can access the variable by casting it
+   to the proper pointer type.  */
 
 #ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM);
-# else
-int yyparse ();
-# endif
-#else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
-
-
-/* The look-ahead symbol.  */
-int yychar;
-
-/* The semantic value of the look-ahead symbol.  */
-YYSTYPE yylval;
-
-/* Number of syntax errors so far.  */
-int yynerrs;
-
-
-
-/*----------.
-| yyparse.  |
-`----------*/
+#ifdef __cplusplus
+#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
+#define YYPARSE_PARAM_DECL
+#else /* not __cplusplus */
+#define YYPARSE_PARAM_ARG YYPARSE_PARAM
+#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
+#endif /* not __cplusplus */
+#else /* not YYPARSE_PARAM */
+#define YYPARSE_PARAM_ARG
+#define YYPARSE_PARAM_DECL
+#endif /* not YYPARSE_PARAM */
 
+/* Prevent warning if -Wstrict-prototypes.  */
+#ifdef __GNUC__
 #ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM)
-# else
-int yyparse (YYPARSE_PARAM)
-  void *YYPARSE_PARAM;
-# endif
-#else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
-int
-yyparse (void)
+int yyparse (void *);
 #else
-int
-yyparse ()
-
+int yyparse (void);
 #endif
 #endif
-{
-  
-  int yystate;
-  int yyn;
-  int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Look-ahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-
-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
-
-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
-
-  /* The state stack.  */
-  short int yyssa[YYINITDEPTH];
-  short int *yyss = yyssa;
-  short int *yyssp;
-
-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  YYSTYPE *yyvsp;
-
 
+int
+yyparse(YYPARSE_PARAM_ARG)
+     YYPARSE_PARAM_DECL
+{
+  register int yystate;
+  register int yyn;
+  register short *yyssp;
+  register YYSTYPE *yyvsp;
+  int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
+  int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
+
+  short	yyssa[YYINITDEPTH];	/*  the state stack			*/
+  YYSTYPE yyvsa[YYINITDEPTH];	/*  the semantic value stack		*/
+
+  short *yyss = yyssa;		/*  refer to the stacks thru separate pointers */
+  YYSTYPE *yyvs = yyvsa;	/*  to allow yyoverflow to reallocate them elsewhere */
+
+#ifdef YYLSP_NEEDED
+  YYLTYPE yylsa[YYINITDEPTH];	/*  the location stack			*/
+  YYLTYPE *yyls = yylsa;
+  YYLTYPE *yylsp;
 
+#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
+#else
 #define YYPOPSTACK   (yyvsp--, yyssp--)
+#endif
 
-  YYSIZE_T yystacksize = YYINITDEPTH;
+  int yystacksize = YYINITDEPTH;
+  int yyfree_stacks = 0;
 
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
+#ifdef YYPURE
+  int yychar;
+  YYSTYPE yylval;
+  int yynerrs;
+#ifdef YYLSP_NEEDED
+  YYLTYPE yylloc;
+#endif
+#endif
 
+  YYSTYPE yyval;		/*  the variable used to return		*/
+				/*  semantic values from the action	*/
+				/*  routines				*/
 
-  /* When reducing, the number of symbols on the RHS of the reduced
-     rule.  */
   int yylen;
 
-  YYDPRINTF ((stderr, "Starting parse\n"));
+#if YYDEBUG != 0
+  if (yydebug)
+    fprintf(stderr, "Starting parse\n");
+#endif
 
   yystate = 0;
   yyerrstatus = 0;
@@ -2935,709 +2240,676 @@
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
 
-  yyssp = yyss;
+  yyssp = yyss - 1;
   yyvsp = yyvs;
+#ifdef YYLSP_NEEDED
+  yylsp = yyls;
+#endif
 
-  goto yysetstate;
-
-/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
-`------------------------------------------------------------*/
- yynewstate:
-  /* In all cases, when you get here, the value and location stacks
-     have just been pushed. so pushing a state here evens the stacks.
-     */
-  yyssp++;
-
- yysetstate:
-  *yyssp = yystate;
+/* Push a new state, which is found in  yystate  .  */
+/* In all cases, when you get here, the value and location stacks
+   have just been pushed. so pushing a state here evens the stacks.  */
+yynewstate:
+
+  *++yyssp = yystate;
+
+  if (yyssp >= yyss + yystacksize - 1)
+    {
+      /* Give user a chance to reallocate the stack */
+      /* Use copies of these so that the &'s don't force the real ones into memory. */
+      YYSTYPE *yyvs1 = yyvs;
+      short *yyss1 = yyss;
+#ifdef YYLSP_NEEDED
+      YYLTYPE *yyls1 = yyls;
+#endif
 
-  if (yyss + yystacksize - 1 <= yyssp)
-    {
       /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
+      int size = yyssp - yyss + 1;
 
 #ifdef yyoverflow
-      {
-	/* Give user a chance to reallocate the stack. Use copies of
-	   these so that the &'s don't force the real ones into
-	   memory.  */
-	YYSTYPE *yyvs1 = yyvs;
-	short int *yyss1 = yyss;
-
-
-	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  This used to be a
-	   conditional around just the two extra args, but that might
-	   be undefined if yyoverflow is a macro.  */
-	yyoverflow (YY_("memory exhausted"),
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-
-		    &yystacksize);
+      /* Each stack pointer address is followed by the size of
+	 the data in use in that stack, in bytes.  */
+#ifdef YYLSP_NEEDED
+      /* This used to be a conditional around just the two extra args,
+	 but that might be undefined if yyoverflow is a macro.  */
+      yyoverflow("parser stack overflow",
+		 &yyss1, size * sizeof (*yyssp),
+		 &yyvs1, size * sizeof (*yyvsp),
+		 &yyls1, size * sizeof (*yylsp),
+		 &yystacksize);
+#else
+      yyoverflow("parser stack overflow",
+		 &yyss1, size * sizeof (*yyssp),
+		 &yyvs1, size * sizeof (*yyvsp),
+		 &yystacksize);
+#endif
 
-	yyss = yyss1;
-	yyvs = yyvs1;
-      }
+      yyss = yyss1; yyvs = yyvs1;
+#ifdef YYLSP_NEEDED
+      yyls = yyls1;
+#endif
 #else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
-      goto yyexhaustedlab;
-# else
       /* Extend the stack our own way.  */
-      if (YYMAXDEPTH <= yystacksize)
-	goto yyexhaustedlab;
+      if (yystacksize >= YYMAXDEPTH)
+	{
+	  yyerror("parser stack overflow");
+	  if (yyfree_stacks)
+	    {
+	      free (yyss);
+	      free (yyvs);
+#ifdef YYLSP_NEEDED
+	      free (yyls);
+#endif
+	    }
+	  return 2;
+	}
       yystacksize *= 2;
-      if (YYMAXDEPTH < yystacksize)
+      if (yystacksize > YYMAXDEPTH)
 	yystacksize = YYMAXDEPTH;
-
-      {
-	short int *yyss1 = yyss;
-	union yyalloc *yyptr =
-	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-	if (! yyptr)
-	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss);
-	YYSTACK_RELOCATE (yyvs);
-
-#  undef YYSTACK_RELOCATE
-	if (yyss1 != yyssa)
-	  YYSTACK_FREE (yyss1);
-      }
-# endif
+#ifndef YYSTACK_USE_ALLOCA
+      yyfree_stacks = 1;
+#endif
+      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
+      __yy_memcpy ((char *)yyss, (char *)yyss1,
+		   size * (unsigned int) sizeof (*yyssp));
+      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
+      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
+		   size * (unsigned int) sizeof (*yyvsp));
+#ifdef YYLSP_NEEDED
+      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
+      __yy_memcpy ((char *)yyls, (char *)yyls1,
+		   size * (unsigned int) sizeof (*yylsp));
+#endif
 #endif /* no yyoverflow */
 
-      yyssp = yyss + yysize - 1;
-      yyvsp = yyvs + yysize - 1;
-
+      yyssp = yyss + size - 1;
+      yyvsp = yyvs + size - 1;
+#ifdef YYLSP_NEEDED
+      yylsp = yyls + size - 1;
+#endif
 
-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-		  (unsigned long int) yystacksize));
+#if YYDEBUG != 0
+      if (yydebug)
+	fprintf(stderr, "Stack size increased to %d\n", yystacksize);
+#endif
 
-      if (yyss + yystacksize - 1 <= yyssp)
+      if (yyssp >= yyss + yystacksize - 1)
 	YYABORT;
     }
 
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+#if YYDEBUG != 0
+  if (yydebug)
+    fprintf(stderr, "Entering state %d\n", yystate);
+#endif
 
   goto yybackup;
-
-/*-----------.
-| yybackup.  |
-`-----------*/
-yybackup:
+ yybackup:
 
 /* Do appropriate processing given the current state.  */
-/* Read a look-ahead token if we need one and don't already have one.  */
+/* Read a lookahead token if we need one and don't already have one.  */
 /* yyresume: */
 
-  /* First try to decide what to do without reference to look-ahead token.  */
+  /* First try to decide what to do without reference to lookahead token.  */
 
   yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
+  if (yyn == YYFLAG)
     goto yydefault;
 
-  /* Not known => get a look-ahead token if don't already have one.  */
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* yychar is either YYEMPTY or YYEOF
+     or a valid token in external form.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
-      YYDPRINTF ((stderr, "Reading a token: "));
+#if YYDEBUG != 0
+      if (yydebug)
+	fprintf(stderr, "Reading a token: ");
+#endif
       yychar = YYLEX;
     }
 
-  if (yychar <= YYEOF)
+  /* Convert token to internal form (in yychar1) for indexing tables with */
+
+  if (yychar <= 0)		/* This means end of input. */
     {
-      yychar = yytoken = YYEOF;
-      YYDPRINTF ((stderr, "Now at end of input.\n"));
+      yychar1 = 0;
+      yychar = YYEOF;		/* Don't call YYLEX any more */
+
+#if YYDEBUG != 0
+      if (yydebug)
+	fprintf(stderr, "Now at end of input.\n");
+#endif
     }
   else
     {
-      yytoken = YYTRANSLATE (yychar);
-      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+      yychar1 = YYTRANSLATE(yychar);
+
+#if YYDEBUG != 0
+      if (yydebug)
+	{
+	  fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
+	  /* Give the individual parser a way to print the precise meaning
+	     of a token, for further debugging info.  */
+#ifdef YYPRINT
+	  YYPRINT (stderr, yychar, yylval);
+#endif
+	  fprintf (stderr, ")\n");
+	}
+#endif
     }
 
-  /* If the proper action on seeing token YYTOKEN is to reduce or to
-     detect an error, take that action.  */
-  yyn += yytoken;
-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+  yyn += yychar1;
+  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
     goto yydefault;
+
   yyn = yytable[yyn];
-  if (yyn <= 0)
+
+  /* yyn is what to do for this token type in this state.
+     Negative => reduce, -yyn is rule number.
+     Positive => shift, yyn is new state.
+       New state is final state => don't bother to shift,
+       just return success.
+     0, or most negative number => error.  */
+
+  if (yyn < 0)
     {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
+      if (yyn == YYFLAG)
 	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
+  else if (yyn == 0)
+    goto yyerrlab;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  /* Shift the look-ahead token.  */
-  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+  /* Shift the lookahead token.  */
+
+#if YYDEBUG != 0
+  if (yydebug)
+    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
+#endif
 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
     yychar = YYEMPTY;
 
   *++yyvsp = yylval;
+#ifdef YYLSP_NEEDED
+  *++yylsp = yylloc;
+#endif
 
-
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
+  /* count tokens shifted since error; after three, turn off error status.  */
+  if (yyerrstatus) yyerrstatus--;
 
   yystate = yyn;
   goto yynewstate;
 
-
-/*-----------------------------------------------------------.
-| yydefault -- do the default action for the current state.  |
-`-----------------------------------------------------------*/
+/* Do the default action for the current state.  */
 yydefault:
+
   yyn = yydefact[yystate];
   if (yyn == 0)
     goto yyerrlab;
-  goto yyreduce;
-
 
-/*-----------------------------.
-| yyreduce -- Do a reduction.  |
-`-----------------------------*/
+/* Do a reduction.  yyn is the number of a rule to reduce with.  */
 yyreduce:
-  /* yyn is the number of a rule to reduce with.  */
   yylen = yyr2[yyn];
+  if (yylen > 0)
+    yyval = yyvsp[1-yylen]; /* implement default value of the action */
 
-  /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
-
-     Otherwise, the following line sets YYVAL to garbage.
-     This behavior is undocumented and Bison
-     users should not rely upon it.  Assigning to YYVAL
-     unconditionally makes the parser a bit smaller, and it avoids a
-     GCC warning that YYVAL may be used uninitialized.  */
-  yyval = yyvsp[1-yylen];
-
-
-  YY_REDUCE_PRINT (yyn);
-  switch (yyn)
+#if YYDEBUG != 0
+  if (yydebug)
     {
-        case 29:
-#line 1122 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.IPredicate) = ICmpInst::ICMP_EQ; ;}
-    break;
-
-  case 30:
-#line 1122 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.IPredicate) = ICmpInst::ICMP_NE; ;}
-    break;
+      int i;
 
-  case 31:
-#line 1123 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.IPredicate) = ICmpInst::ICMP_SLT; ;}
-    break;
-
-  case 32:
-#line 1123 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.IPredicate) = ICmpInst::ICMP_SGT; ;}
-    break;
-
-  case 33:
-#line 1124 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.IPredicate) = ICmpInst::ICMP_SLE; ;}
-    break;
-
-  case 34:
-#line 1124 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.IPredicate) = ICmpInst::ICMP_SGE; ;}
-    break;
-
-  case 35:
-#line 1125 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.IPredicate) = ICmpInst::ICMP_ULT; ;}
-    break;
-
-  case 36:
-#line 1125 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.IPredicate) = ICmpInst::ICMP_UGT; ;}
-    break;
+      fprintf (stderr, "Reducing via rule %d (line %d), ",
+	       yyn, yyrline[yyn]);
 
-  case 37:
-#line 1126 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.IPredicate) = ICmpInst::ICMP_ULE; ;}
-    break;
+      /* Print the symbols being reduced, and their result.  */
+      for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
+	fprintf (stderr, "%s ", yytname[yyrhs[i]]);
+      fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
+    }
+#endif
 
-  case 38:
-#line 1126 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.IPredicate) = ICmpInst::ICMP_UGE; ;}
-    break;
 
-  case 39:
-#line 1130 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.FPredicate) = FCmpInst::FCMP_OEQ; ;}
-    break;
+  switch (yyn) {
 
-  case 40:
-#line 1130 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.FPredicate) = FCmpInst::FCMP_ONE; ;}
-    break;
-
-  case 41:
-#line 1131 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.FPredicate) = FCmpInst::FCMP_OLT; ;}
-    break;
-
-  case 42:
-#line 1131 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.FPredicate) = FCmpInst::FCMP_OGT; ;}
-    break;
-
-  case 43:
-#line 1132 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.FPredicate) = FCmpInst::FCMP_OLE; ;}
-    break;
-
-  case 44:
-#line 1132 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.FPredicate) = FCmpInst::FCMP_OGE; ;}
-    break;
-
-  case 45:
-#line 1133 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.FPredicate) = FCmpInst::FCMP_ORD; ;}
-    break;
-
-  case 46:
-#line 1133 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.FPredicate) = FCmpInst::FCMP_UNO; ;}
-    break;
-
-  case 47:
-#line 1134 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.FPredicate) = FCmpInst::FCMP_UEQ; ;}
-    break;
-
-  case 48:
-#line 1134 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.FPredicate) = FCmpInst::FCMP_UNE; ;}
-    break;
-
-  case 49:
-#line 1135 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.FPredicate) = FCmpInst::FCMP_ULT; ;}
-    break;
-
-  case 50:
-#line 1135 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.FPredicate) = FCmpInst::FCMP_UGT; ;}
-    break;
-
-  case 51:
-#line 1136 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.FPredicate) = FCmpInst::FCMP_ULE; ;}
-    break;
-
-  case 52:
-#line 1136 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.FPredicate) = FCmpInst::FCMP_UGE; ;}
-    break;
-
-  case 53:
-#line 1137 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.FPredicate) = FCmpInst::FCMP_TRUE; ;}
-    break;
-
-  case 54:
-#line 1138 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.FPredicate) = FCmpInst::FCMP_FALSE; ;}
-    break;
-
-  case 62:
-#line 1147 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.StrVal) = 0; ;}
-    break;
-
-  case 63:
-#line 1151 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.StrVal) = (yyvsp[-1].StrVal);
+case 28:
+#line 1122 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.IPredicate = ICmpInst::ICMP_EQ; ;
+    break;}
+case 29:
+#line 1122 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.IPredicate = ICmpInst::ICMP_NE; ;
+    break;}
+case 30:
+#line 1123 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.IPredicate = ICmpInst::ICMP_SLT; ;
+    break;}
+case 31:
+#line 1123 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.IPredicate = ICmpInst::ICMP_SGT; ;
+    break;}
+case 32:
+#line 1124 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.IPredicate = ICmpInst::ICMP_SLE; ;
+    break;}
+case 33:
+#line 1124 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.IPredicate = ICmpInst::ICMP_SGE; ;
+    break;}
+case 34:
+#line 1125 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.IPredicate = ICmpInst::ICMP_ULT; ;
+    break;}
+case 35:
+#line 1125 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.IPredicate = ICmpInst::ICMP_UGT; ;
+    break;}
+case 36:
+#line 1126 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.IPredicate = ICmpInst::ICMP_ULE; ;
+    break;}
+case 37:
+#line 1126 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.IPredicate = ICmpInst::ICMP_UGE; ;
+    break;}
+case 38:
+#line 1130 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.FPredicate = FCmpInst::FCMP_OEQ; ;
+    break;}
+case 39:
+#line 1130 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.FPredicate = FCmpInst::FCMP_ONE; ;
+    break;}
+case 40:
+#line 1131 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.FPredicate = FCmpInst::FCMP_OLT; ;
+    break;}
+case 41:
+#line 1131 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.FPredicate = FCmpInst::FCMP_OGT; ;
+    break;}
+case 42:
+#line 1132 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.FPredicate = FCmpInst::FCMP_OLE; ;
+    break;}
+case 43:
+#line 1132 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.FPredicate = FCmpInst::FCMP_OGE; ;
+    break;}
+case 44:
+#line 1133 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.FPredicate = FCmpInst::FCMP_ORD; ;
+    break;}
+case 45:
+#line 1133 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.FPredicate = FCmpInst::FCMP_UNO; ;
+    break;}
+case 46:
+#line 1134 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.FPredicate = FCmpInst::FCMP_UEQ; ;
+    break;}
+case 47:
+#line 1134 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.FPredicate = FCmpInst::FCMP_UNE; ;
+    break;}
+case 48:
+#line 1135 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.FPredicate = FCmpInst::FCMP_ULT; ;
+    break;}
+case 49:
+#line 1135 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.FPredicate = FCmpInst::FCMP_UGT; ;
+    break;}
+case 50:
+#line 1136 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.FPredicate = FCmpInst::FCMP_ULE; ;
+    break;}
+case 51:
+#line 1136 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.FPredicate = FCmpInst::FCMP_UGE; ;
+    break;}
+case 52:
+#line 1137 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.FPredicate = FCmpInst::FCMP_TRUE; ;
+    break;}
+case 53:
+#line 1138 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.FPredicate = FCmpInst::FCMP_FALSE; ;
+    break;}
+case 61:
+#line 1147 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.StrVal = 0; ;
+    break;}
+case 62:
+#line 1151 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.StrVal = yyvsp[-1].StrVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 64:
-#line 1155 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.StrVal) = 0;
+  ;
+    break;}
+case 63:
+#line 1155 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.StrVal = 0;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 68:
-#line 1163 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.StrVal) = 0;
+  ;
+    break;}
+case 67:
+#line 1163 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.StrVal = 0;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 69:
-#line 1168 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.StrVal) = (yyvsp[-1].StrVal);
+  ;
+    break;}
+case 68:
+#line 1168 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.StrVal = yyvsp[-1].StrVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 70:
-#line 1174 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
-    break;
-
-  case 71:
-#line 1175 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
-    break;
-
-  case 72:
-#line 1176 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
-    break;
-
-  case 73:
-#line 1177 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
-    break;
-
-  case 74:
-#line 1178 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
-    break;
-
-  case 75:
-#line 1182 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
-    break;
-
-  case 76:
-#line 1183 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
-    break;
-
-  case 77:
-#line 1184 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
-    break;
-
-  case 78:
-#line 1188 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Visibility) = GlobalValue::DefaultVisibility;   ;}
-    break;
-
-  case 79:
-#line 1189 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Visibility) = GlobalValue::DefaultVisibility;   ;}
-    break;
-
-  case 80:
-#line 1190 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Visibility) = GlobalValue::HiddenVisibility;    ;}
-    break;
-
-  case 81:
-#line 1191 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Visibility) = GlobalValue::ProtectedVisibility; ;}
-    break;
-
-  case 82:
-#line 1195 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
-    break;
-
-  case 83:
-#line 1196 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
-    break;
-
-  case 84:
-#line 1197 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
-    break;
-
-  case 85:
-#line 1201 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
-    break;
-
-  case 86:
-#line 1202 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
-    break;
-
-  case 87:
-#line 1203 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
-    break;
-
-  case 88:
-#line 1204 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
-    break;
-
-  case 89:
-#line 1205 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
-    break;
-
-  case 90:
-#line 1209 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
-    break;
-
-  case 91:
-#line 1210 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
-    break;
-
-  case 92:
-#line 1211 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
-    break;
-
-  case 93:
-#line 1214 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = CallingConv::C; ;}
-    break;
-
-  case 94:
-#line 1215 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = CallingConv::C; ;}
-    break;
-
-  case 95:
-#line 1216 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = CallingConv::Fast; ;}
-    break;
-
-  case 96:
-#line 1217 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = CallingConv::Cold; ;}
-    break;
-
-  case 97:
-#line 1218 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = CallingConv::X86_StdCall; ;}
-    break;
-
-  case 98:
-#line 1219 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = CallingConv::X86_FastCall; ;}
-    break;
-
-  case 99:
-#line 1220 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-                   if ((unsigned)(yyvsp[0].UInt64Val) != (yyvsp[0].UInt64Val))
+  ;
+    break;}
+case 69:
+#line 1174 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::InternalLinkage; ;
+    break;}
+case 70:
+#line 1175 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::WeakLinkage; ;
+    break;}
+case 71:
+#line 1176 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::LinkOnceLinkage; ;
+    break;}
+case 72:
+#line 1177 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::AppendingLinkage; ;
+    break;}
+case 73:
+#line 1178 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::DLLExportLinkage; ;
+    break;}
+case 74:
+#line 1182 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::DLLImportLinkage; ;
+    break;}
+case 75:
+#line 1183 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::ExternalWeakLinkage; ;
+    break;}
+case 76:
+#line 1184 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::ExternalLinkage; ;
+    break;}
+case 77:
+#line 1188 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Visibility = GlobalValue::DefaultVisibility;   ;
+    break;}
+case 78:
+#line 1189 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Visibility = GlobalValue::DefaultVisibility;   ;
+    break;}
+case 79:
+#line 1190 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Visibility = GlobalValue::HiddenVisibility;    ;
+    break;}
+case 80:
+#line 1191 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Visibility = GlobalValue::ProtectedVisibility; ;
+    break;}
+case 81:
+#line 1195 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::ExternalLinkage; ;
+    break;}
+case 82:
+#line 1196 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::DLLImportLinkage; ;
+    break;}
+case 83:
+#line 1197 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::ExternalWeakLinkage; ;
+    break;}
+case 84:
+#line 1201 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::ExternalLinkage; ;
+    break;}
+case 85:
+#line 1202 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::InternalLinkage; ;
+    break;}
+case 86:
+#line 1203 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::LinkOnceLinkage; ;
+    break;}
+case 87:
+#line 1204 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::WeakLinkage; ;
+    break;}
+case 88:
+#line 1205 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::DLLExportLinkage; ;
+    break;}
+case 89:
+#line 1209 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::ExternalLinkage; ;
+    break;}
+case 90:
+#line 1210 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::WeakLinkage; ;
+    break;}
+case 91:
+#line 1211 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::InternalLinkage; ;
+    break;}
+case 92:
+#line 1214 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.UIntVal = CallingConv::C; ;
+    break;}
+case 93:
+#line 1215 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.UIntVal = CallingConv::C; ;
+    break;}
+case 94:
+#line 1216 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.UIntVal = CallingConv::Fast; ;
+    break;}
+case 95:
+#line 1217 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.UIntVal = CallingConv::Cold; ;
+    break;}
+case 96:
+#line 1218 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.UIntVal = CallingConv::X86_StdCall; ;
+    break;}
+case 97:
+#line 1219 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.UIntVal = CallingConv::X86_FastCall; ;
+    break;}
+case 98:
+#line 1220 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+                   if ((unsigned)yyvsp[0].UInt64Val != yyvsp[0].UInt64Val)
                      GEN_ERROR("Calling conv too large");
-                   (yyval.UIntVal) = (yyvsp[0].UInt64Val);
+                   yyval.UIntVal = yyvsp[0].UInt64Val;
                   CHECK_FOR_ERROR
-                 ;}
-    break;
-
-  case 100:
-#line 1227 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::ZExt;      ;}
-    break;
-
-  case 101:
-#line 1228 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::SExt;      ;}
-    break;
-
-  case 102:
-#line 1229 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::InReg;     ;}
-    break;
-
-  case 103:
-#line 1230 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::StructRet; ;}
-    break;
-
-  case 104:
-#line 1233 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::None; ;}
-    break;
-
-  case 105:
-#line 1234 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-                (yyval.ParamAttrs) = (yyvsp[-1].ParamAttrs) | (yyvsp[0].ParamAttrs);
-              ;}
-    break;
-
-  case 106:
-#line 1239 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::NoReturn; ;}
-    break;
-
-  case 107:
-#line 1240 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::NoUnwind; ;}
-    break;
-
-  case 109:
-#line 1244 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = ParamAttr::None; ;}
-    break;
-
-  case 110:
-#line 1245 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-                (yyval.ParamAttrs) = (yyvsp[-1].ParamAttrs) | (yyvsp[0].ParamAttrs);
-              ;}
-    break;
-
-  case 111:
-#line 1252 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = 0; ;}
-    break;
-
-  case 112:
-#line 1253 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-  (yyval.UIntVal) = (yyvsp[0].UInt64Val);
-  if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
+                 ;
+    break;}
+case 99:
+#line 1227 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.ParamAttrs = ParamAttr::ZExt;      ;
+    break;}
+case 100:
+#line 1228 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.ParamAttrs = ParamAttr::SExt;      ;
+    break;}
+case 101:
+#line 1229 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.ParamAttrs = ParamAttr::InReg;     ;
+    break;}
+case 102:
+#line 1230 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.ParamAttrs = ParamAttr::StructRet; ;
+    break;}
+case 103:
+#line 1231 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.ParamAttrs = ParamAttr::NoAlias;   ;
+    break;}
+case 104:
+#line 1234 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.ParamAttrs = ParamAttr::None; ;
+    break;}
+case 105:
+#line 1235 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+                yyval.ParamAttrs = yyvsp[-1].ParamAttrs | yyvsp[0].ParamAttrs;
+              ;
+    break;}
+case 106:
+#line 1240 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.ParamAttrs = ParamAttr::NoReturn; ;
+    break;}
+case 107:
+#line 1241 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.ParamAttrs = ParamAttr::NoUnwind; ;
+    break;}
+case 109:
+#line 1245 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.ParamAttrs = ParamAttr::None; ;
+    break;}
+case 110:
+#line 1246 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+                yyval.ParamAttrs = yyvsp[-1].ParamAttrs | yyvsp[0].ParamAttrs;
+              ;
+    break;}
+case 111:
+#line 1253 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.UIntVal = 0; ;
+    break;}
+case 112:
+#line 1254 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+  yyval.UIntVal = yyvsp[0].UInt64Val;
+  if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal))
     GEN_ERROR("Alignment must be a power of two");
   CHECK_FOR_ERROR
-;}
-    break;
-
-  case 113:
-#line 1259 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = 0; ;}
-    break;
-
-  case 114:
-#line 1260 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-  (yyval.UIntVal) = (yyvsp[0].UInt64Val);
-  if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
+;
+    break;}
+case 113:
+#line 1260 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.UIntVal = 0; ;
+    break;}
+case 114:
+#line 1261 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+  yyval.UIntVal = yyvsp[0].UInt64Val;
+  if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal))
     GEN_ERROR("Alignment must be a power of two");
   CHECK_FOR_ERROR
-;}
-    break;
-
-  case 115:
-#line 1268 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-  for (unsigned i = 0, e = (yyvsp[0].StrVal)->length(); i != e; ++i)
-    if ((*(yyvsp[0].StrVal))[i] == '"' || (*(yyvsp[0].StrVal))[i] == '\\')
+;
+    break;}
+case 115:
+#line 1269 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+  for (unsigned i = 0, e = yyvsp[0].StrVal->length(); i != e; ++i)
+    if ((*yyvsp[0].StrVal)[i] == '"' || (*yyvsp[0].StrVal)[i] == '\\')
       GEN_ERROR("Invalid character in section name");
-  (yyval.StrVal) = (yyvsp[0].StrVal);
+  yyval.StrVal = yyvsp[0].StrVal;
   CHECK_FOR_ERROR
-;}
-    break;
-
-  case 116:
-#line 1276 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.StrVal) = 0; ;}
-    break;
-
-  case 117:
-#line 1277 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.StrVal) = (yyvsp[0].StrVal); ;}
-    break;
-
-  case 118:
-#line 1282 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {;}
-    break;
-
-  case 119:
-#line 1283 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {;}
-    break;
-
-  case 120:
-#line 1284 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    CurGV->setSection(*(yyvsp[0].StrVal));
-    delete (yyvsp[0].StrVal);
+;
+    break;}
+case 116:
+#line 1277 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.StrVal = 0; ;
+    break;}
+case 117:
+#line 1278 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.StrVal = yyvsp[0].StrVal; ;
+    break;}
+case 118:
+#line 1283 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{;
+    break;}
+case 119:
+#line 1284 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{;
+    break;}
+case 120:
+#line 1285 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    CurGV->setSection(*yyvsp[0].StrVal);
+    delete yyvsp[0].StrVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 121:
-#line 1289 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    if ((yyvsp[0].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[0].UInt64Val)))
+  ;
+    break;}
+case 121:
+#line 1290 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (yyvsp[0].UInt64Val != 0 && !isPowerOf2_32(yyvsp[0].UInt64Val))
       GEN_ERROR("Alignment must be a power of two");
-    CurGV->setAlignment((yyvsp[0].UInt64Val));
+    CurGV->setAlignment(yyvsp[0].UInt64Val);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 126:
-#line 1305 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
+  ;
+    break;}
+case 126:
+#line 1306 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.TypeVal = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 127:
-#line 1309 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType));
+  ;
+    break;}
+case 127:
+#line 1310 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.TypeVal = new PATypeHolder(yyvsp[0].PrimType);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 128:
-#line 1313 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {                             // Pointer type?
-    if (*(yyvsp[-1].TypeVal) == Type::LabelTy)
+  ;
+    break;}
+case 128:
+#line 1314 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                             // Pointer type?
+    if (*yyvsp[-1].TypeVal == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
-    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(PointerType::get(*(yyvsp[-1].TypeVal))));
-    delete (yyvsp[-1].TypeVal);
+    yyval.TypeVal = new PATypeHolder(HandleUpRefs(PointerType::get(*yyvsp[-1].TypeVal)));
+    delete yyvsp[-1].TypeVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 129:
-#line 1320 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {            // Named types are also simple types...
-    const Type* tmp = getTypeVal((yyvsp[0].ValIDVal));
-    CHECK_FOR_ERROR
-    (yyval.TypeVal) = new PATypeHolder(tmp);
-  ;}
-    break;
-
-  case 130:
-#line 1325 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {                   // Type UpReference
-    if ((yyvsp[0].UInt64Val) > (uint64_t)~0U) GEN_ERROR("Value out of range");
+  ;
+    break;}
+case 129:
+#line 1321 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{            // Named types are also simple types...
+    const Type* tmp = getTypeVal(yyvsp[0].ValIDVal);
+    CHECK_FOR_ERROR
+    yyval.TypeVal = new PATypeHolder(tmp);
+  ;
+    break;}
+case 130:
+#line 1326 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                   // Type UpReference
+    if (yyvsp[0].UInt64Val > (uint64_t)~0U) GEN_ERROR("Value out of range");
     OpaqueType *OT = OpaqueType::get();        // Use temporary placeholder
-    UpRefs.push_back(UpRefRecord((unsigned)(yyvsp[0].UInt64Val), OT));  // Add to vector...
-    (yyval.TypeVal) = new PATypeHolder(OT);
+    UpRefs.push_back(UpRefRecord((unsigned)yyvsp[0].UInt64Val, OT));  // Add to vector...
+    yyval.TypeVal = new PATypeHolder(OT);
     UR_OUT("New Upreference!\n");
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 131:
-#line 1333 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 131:
+#line 1334 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     std::vector<const Type*> Params;
     ParamAttrsVector Attrs;
-    if ((yyvsp[0].ParamAttrs) != ParamAttr::None) {
-      ParamAttrsWithIndex X; X.index = 0; X.attrs = (yyvsp[0].ParamAttrs);
+    if (yyvsp[0].ParamAttrs != ParamAttr::None) {
+      ParamAttrsWithIndex X; X.index = 0; X.attrs = yyvsp[0].ParamAttrs;
       Attrs.push_back(X);
     }
     unsigned index = 1;
-    TypeWithAttrsList::iterator I = (yyvsp[-2].TypeWithAttrsList)->begin(), E = (yyvsp[-2].TypeWithAttrsList)->end();
+    TypeWithAttrsList::iterator I = yyvsp[-2].TypeWithAttrsList->begin(), E = yyvsp[-2].TypeWithAttrsList->end();
     for (; I != E; ++I, ++index) {
       const Type *Ty = I->Ty->get();
       Params.push_back(Ty);
@@ -3653,24 +2925,23 @@
     ParamAttrsList *ActualAttrs = 0;
     if (!Attrs.empty())
       ActualAttrs = ParamAttrsList::get(Attrs);
-    FunctionType *FT = FunctionType::get(*(yyvsp[-4].TypeVal), Params, isVarArg, ActualAttrs);
-    delete (yyvsp[-2].TypeWithAttrsList);   // Delete the argument list
-    delete (yyvsp[-4].TypeVal);   // Delete the return type handle
-    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(FT)); 
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 132:
-#line 1363 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+    FunctionType *FT = FunctionType::get(*yyvsp[-4].TypeVal, Params, isVarArg, ActualAttrs);
+    delete yyvsp[-2].TypeWithAttrsList;   // Delete the argument list
+    delete yyvsp[-4].TypeVal;   // Delete the return type handle
+    yyval.TypeVal = new PATypeHolder(HandleUpRefs(FT)); 
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 132:
+#line 1364 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     std::vector<const Type*> Params;
     ParamAttrsVector Attrs;
-    if ((yyvsp[0].ParamAttrs) != ParamAttr::None) {
-      ParamAttrsWithIndex X; X.index = 0; X.attrs = (yyvsp[0].ParamAttrs);
+    if (yyvsp[0].ParamAttrs != ParamAttr::None) {
+      ParamAttrsWithIndex X; X.index = 0; X.attrs = yyvsp[0].ParamAttrs;
       Attrs.push_back(X);
     }
-    TypeWithAttrsList::iterator I = (yyvsp[-2].TypeWithAttrsList)->begin(), E = (yyvsp[-2].TypeWithAttrsList)->end();
+    TypeWithAttrsList::iterator I = yyvsp[-2].TypeWithAttrsList->begin(), E = yyvsp[-2].TypeWithAttrsList->end();
     unsigned index = 1;
     for ( ; I != E; ++I, ++index) {
       const Type* Ty = I->Ty->get();
@@ -3688,303 +2959,282 @@
     if (!Attrs.empty())
       ActualAttrs = ParamAttrsList::get(Attrs);
 
-    FunctionType *FT = FunctionType::get((yyvsp[-4].PrimType), Params, isVarArg, ActualAttrs);
-    delete (yyvsp[-2].TypeWithAttrsList);      // Delete the argument list
-    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(FT)); 
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 133:
-#line 1394 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {          // Sized array type?
-    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[-1].TypeVal), (unsigned)(yyvsp[-3].UInt64Val))));
-    delete (yyvsp[-1].TypeVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 134:
-#line 1399 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {          // Vector type?
-     const llvm::Type* ElemTy = (yyvsp[-1].TypeVal)->get();
-     if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val))
+    FunctionType *FT = FunctionType::get(yyvsp[-4].PrimType, Params, isVarArg, ActualAttrs);
+    delete yyvsp[-2].TypeWithAttrsList;      // Delete the argument list
+    yyval.TypeVal = new PATypeHolder(HandleUpRefs(FT)); 
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 133:
+#line 1395 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{          // Sized array type?
+    yyval.TypeVal = new PATypeHolder(HandleUpRefs(ArrayType::get(*yyvsp[-1].TypeVal, (unsigned)yyvsp[-3].UInt64Val)));
+    delete yyvsp[-1].TypeVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 134:
+#line 1400 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{          // Vector type?
+     const llvm::Type* ElemTy = yyvsp[-1].TypeVal->get();
+     if ((unsigned)yyvsp[-3].UInt64Val != yyvsp[-3].UInt64Val)
         GEN_ERROR("Unsigned result not equal to signed result");
      if (!ElemTy->isFloatingPoint() && !ElemTy->isInteger())
         GEN_ERROR("Element type of a VectorType must be primitive");
-     if (!isPowerOf2_32((yyvsp[-3].UInt64Val)))
+     if (!isPowerOf2_32(yyvsp[-3].UInt64Val))
        GEN_ERROR("Vector length should be a power of 2");
-     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(VectorType::get(*(yyvsp[-1].TypeVal), (unsigned)(yyvsp[-3].UInt64Val))));
-     delete (yyvsp[-1].TypeVal);
+     yyval.TypeVal = new PATypeHolder(HandleUpRefs(VectorType::get(*yyvsp[-1].TypeVal, (unsigned)yyvsp[-3].UInt64Val)));
+     delete yyvsp[-1].TypeVal;
      CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 135:
-#line 1411 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {                        // Structure type?
+  ;
+    break;}
+case 135:
+#line 1412 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                        // Structure type?
     std::vector<const Type*> Elements;
-    for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-1].TypeList)->begin(),
-           E = (yyvsp[-1].TypeList)->end(); I != E; ++I)
+    for (std::list<llvm::PATypeHolder>::iterator I = yyvsp[-1].TypeList->begin(),
+           E = yyvsp[-1].TypeList->end(); I != E; ++I)
       Elements.push_back(*I);
 
-    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(StructType::get(Elements)));
-    delete (yyvsp[-1].TypeList);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 136:
-#line 1421 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {                                  // Empty structure type?
-    (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
+    yyval.TypeVal = new PATypeHolder(HandleUpRefs(StructType::get(Elements)));
+    delete yyvsp[-1].TypeList;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 137:
-#line 1425 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 136:
+#line 1422 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                                  // Empty structure type?
+    yyval.TypeVal = new PATypeHolder(StructType::get(std::vector<const Type*>()));
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 137:
+#line 1426 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     std::vector<const Type*> Elements;
-    for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-2].TypeList)->begin(),
-           E = (yyvsp[-2].TypeList)->end(); I != E; ++I)
+    for (std::list<llvm::PATypeHolder>::iterator I = yyvsp[-2].TypeList->begin(),
+           E = yyvsp[-2].TypeList->end(); I != E; ++I)
       Elements.push_back(*I);
 
-    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true)));
-    delete (yyvsp[-2].TypeList);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 138:
-#line 1435 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {                         // Empty structure type?
-    (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
+    yyval.TypeVal = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true)));
+    delete yyvsp[-2].TypeList;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 139:
-#line 1442 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { 
-    (yyval.TypeWithAttrs).Ty = (yyvsp[-1].TypeVal); 
-    (yyval.TypeWithAttrs).Attrs = (yyvsp[0].ParamAttrs); 
-  ;}
-    break;
-
-  case 140:
-#line 1449 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 138:
+#line 1436 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                         // Empty structure type?
+    yyval.TypeVal = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 139:
+#line 1443 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ 
+    yyval.TypeWithAttrs.Ty = yyvsp[-1].TypeVal; 
+    yyval.TypeWithAttrs.Attrs = yyvsp[0].ParamAttrs; 
+  ;
+    break;}
+case 140:
+#line 1450 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
-    if (!(*(yyvsp[0].TypeVal))->isFirstClassType())
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
+    if (!(*yyvsp[0].TypeVal)->isFirstClassType())
       GEN_ERROR("LLVM functions cannot return aggregate types");
-    (yyval.TypeVal) = (yyvsp[0].TypeVal);
-  ;}
-    break;
-
-  case 141:
-#line 1456 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.TypeVal) = new PATypeHolder(Type::VoidTy);
-  ;}
-    break;
-
-  case 142:
-#line 1461 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
-    (yyval.TypeWithAttrsList)->push_back((yyvsp[0].TypeWithAttrs));
+    yyval.TypeVal = yyvsp[0].TypeVal;
+  ;
+    break;}
+case 141:
+#line 1457 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.TypeVal = new PATypeHolder(Type::VoidTy);
+  ;
+    break;}
+case 142:
+#line 1462 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.TypeWithAttrsList = new TypeWithAttrsList();
+    yyval.TypeWithAttrsList->push_back(yyvsp[0].TypeWithAttrs);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 143:
-#line 1466 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    ((yyval.TypeWithAttrsList)=(yyvsp[-2].TypeWithAttrsList))->push_back((yyvsp[0].TypeWithAttrs));
+  ;
+    break;}
+case 143:
+#line 1467 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    (yyval.TypeWithAttrsList=yyvsp[-2].TypeWithAttrsList)->push_back(yyvsp[0].TypeWithAttrs);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 145:
-#line 1474 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.TypeWithAttrsList)=(yyvsp[-2].TypeWithAttrsList);
+  ;
+    break;}
+case 145:
+#line 1475 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.TypeWithAttrsList=yyvsp[-2].TypeWithAttrsList;
     TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
     TWA.Ty = new PATypeHolder(Type::VoidTy);
-    (yyval.TypeWithAttrsList)->push_back(TWA);
+    yyval.TypeWithAttrsList->push_back(TWA);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 146:
-#line 1481 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.TypeWithAttrsList) = new TypeWithAttrsList;
+  ;
+    break;}
+case 146:
+#line 1482 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.TypeWithAttrsList = new TypeWithAttrsList;
     TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
     TWA.Ty = new PATypeHolder(Type::VoidTy);
-    (yyval.TypeWithAttrsList)->push_back(TWA);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 147:
-#line 1488 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
+    yyval.TypeWithAttrsList->push_back(TWA);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 148:
-#line 1496 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.TypeList) = new std::list<PATypeHolder>();
-    (yyval.TypeList)->push_back(*(yyvsp[0].TypeVal)); 
-    delete (yyvsp[0].TypeVal);
+  ;
+    break;}
+case 147:
+#line 1489 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.TypeWithAttrsList = new TypeWithAttrsList();
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 149:
-#line 1502 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(*(yyvsp[0].TypeVal)); 
-    delete (yyvsp[0].TypeVal);
+  ;
+    break;}
+case 148:
+#line 1497 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.TypeList = new std::list<PATypeHolder>();
+    yyval.TypeList->push_back(*yyvsp[0].TypeVal); 
+    delete yyvsp[0].TypeVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 149:
+#line 1503 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    (yyval.TypeList=yyvsp[-2].TypeList)->push_back(*yyvsp[0].TypeVal); 
+    delete yyvsp[0].TypeVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 150:
-#line 1514 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { // Nonempty unsized arr
+  ;
+    break;}
+case 150:
+#line 1515 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ // Nonempty unsized arr
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
-    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-3].TypeVal)->get());
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
+    const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-3].TypeVal->get());
     if (ATy == 0)
       GEN_ERROR("Cannot make array constant with type: '" + 
-                     (*(yyvsp[-3].TypeVal))->getDescription() + "'");
+                     (*yyvsp[-3].TypeVal)->getDescription() + "'");
     const Type *ETy = ATy->getElementType();
     int NumElements = ATy->getNumElements();
 
     // Verify that we have the correct size...
-    if (NumElements != -1 && NumElements != (int)(yyvsp[-1].ConstVector)->size())
+    if (NumElements != -1 && NumElements != (int)yyvsp[-1].ConstVector->size())
       GEN_ERROR("Type mismatch: constant sized array initialized with " +
-                     utostr((yyvsp[-1].ConstVector)->size()) +  " arguments, but has size of " + 
+                     utostr(yyvsp[-1].ConstVector->size()) +  " arguments, but has size of " + 
                      itostr(NumElements) + "");
 
     // Verify all elements are correct type!
-    for (unsigned i = 0; i < (yyvsp[-1].ConstVector)->size(); i++) {
-      if (ETy != (*(yyvsp[-1].ConstVector))[i]->getType())
+    for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) {
+      if (ETy != (*yyvsp[-1].ConstVector)[i]->getType())
         GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
                        ETy->getDescription() +"' as required!\nIt is of type '"+
-                       (*(yyvsp[-1].ConstVector))[i]->getType()->getDescription() + "'.");
+                       (*yyvsp[-1].ConstVector)[i]->getType()->getDescription() + "'.");
     }
 
-    (yyval.ConstVal) = ConstantArray::get(ATy, *(yyvsp[-1].ConstVector));
-    delete (yyvsp[-3].TypeVal); delete (yyvsp[-1].ConstVector);
+    yyval.ConstVal = ConstantArray::get(ATy, *yyvsp[-1].ConstVector);
+    delete yyvsp[-3].TypeVal; delete yyvsp[-1].ConstVector;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 151:
-#line 1542 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 151:
+#line 1543 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
-    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal)->get());
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
+    const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-2].TypeVal->get());
     if (ATy == 0)
       GEN_ERROR("Cannot make array constant with type: '" + 
-                     (*(yyvsp[-2].TypeVal))->getDescription() + "'");
+                     (*yyvsp[-2].TypeVal)->getDescription() + "'");
 
     int NumElements = ATy->getNumElements();
     if (NumElements != -1 && NumElements != 0) 
       GEN_ERROR("Type mismatch: constant sized array initialized with 0"
                      " arguments, but has size of " + itostr(NumElements) +"");
-    (yyval.ConstVal) = ConstantArray::get(ATy, std::vector<Constant*>());
-    delete (yyvsp[-2].TypeVal);
+    yyval.ConstVal = ConstantArray::get(ATy, std::vector<Constant*>());
+    delete yyvsp[-2].TypeVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 152:
-#line 1558 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 152:
+#line 1559 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
-    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal)->get());
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
+    const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-2].TypeVal->get());
     if (ATy == 0)
       GEN_ERROR("Cannot make array constant with type: '" + 
-                     (*(yyvsp[-2].TypeVal))->getDescription() + "'");
+                     (*yyvsp[-2].TypeVal)->getDescription() + "'");
 
     int NumElements = ATy->getNumElements();
     const Type *ETy = ATy->getElementType();
-    if (NumElements != -1 && NumElements != int((yyvsp[0].StrVal)->length()))
+    if (NumElements != -1 && NumElements != int(yyvsp[0].StrVal->length()))
       GEN_ERROR("Can't build string constant of size " + 
-                     itostr((int)((yyvsp[0].StrVal)->length())) +
+                     itostr((int)(yyvsp[0].StrVal->length())) +
                      " when array has size " + itostr(NumElements) + "");
     std::vector<Constant*> Vals;
     if (ETy == Type::Int8Ty) {
-      for (unsigned i = 0; i < (yyvsp[0].StrVal)->length(); ++i)
-        Vals.push_back(ConstantInt::get(ETy, (*(yyvsp[0].StrVal))[i]));
+      for (unsigned i = 0; i < yyvsp[0].StrVal->length(); ++i)
+        Vals.push_back(ConstantInt::get(ETy, (*yyvsp[0].StrVal)[i]));
     } else {
-      delete (yyvsp[0].StrVal);
+      delete yyvsp[0].StrVal;
       GEN_ERROR("Cannot build string arrays of non byte sized elements");
     }
-    delete (yyvsp[0].StrVal);
-    (yyval.ConstVal) = ConstantArray::get(ATy, Vals);
-    delete (yyvsp[-2].TypeVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 153:
-#line 1585 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { // Nonempty unsized arr
+    delete yyvsp[0].StrVal;
+    yyval.ConstVal = ConstantArray::get(ATy, Vals);
+    delete yyvsp[-2].TypeVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 153:
+#line 1586 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ // Nonempty unsized arr
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
-    const VectorType *PTy = dyn_cast<VectorType>((yyvsp[-3].TypeVal)->get());
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
+    const VectorType *PTy = dyn_cast<VectorType>(yyvsp[-3].TypeVal->get());
     if (PTy == 0)
       GEN_ERROR("Cannot make packed constant with type: '" + 
-                     (*(yyvsp[-3].TypeVal))->getDescription() + "'");
+                     (*yyvsp[-3].TypeVal)->getDescription() + "'");
     const Type *ETy = PTy->getElementType();
     int NumElements = PTy->getNumElements();
 
     // Verify that we have the correct size...
-    if (NumElements != -1 && NumElements != (int)(yyvsp[-1].ConstVector)->size())
+    if (NumElements != -1 && NumElements != (int)yyvsp[-1].ConstVector->size())
       GEN_ERROR("Type mismatch: constant sized packed initialized with " +
-                     utostr((yyvsp[-1].ConstVector)->size()) +  " arguments, but has size of " + 
+                     utostr(yyvsp[-1].ConstVector->size()) +  " arguments, but has size of " + 
                      itostr(NumElements) + "");
 
     // Verify all elements are correct type!
-    for (unsigned i = 0; i < (yyvsp[-1].ConstVector)->size(); i++) {
-      if (ETy != (*(yyvsp[-1].ConstVector))[i]->getType())
+    for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) {
+      if (ETy != (*yyvsp[-1].ConstVector)[i]->getType())
         GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
            ETy->getDescription() +"' as required!\nIt is of type '"+
-           (*(yyvsp[-1].ConstVector))[i]->getType()->getDescription() + "'.");
+           (*yyvsp[-1].ConstVector)[i]->getType()->getDescription() + "'.");
     }
 
-    (yyval.ConstVal) = ConstantVector::get(PTy, *(yyvsp[-1].ConstVector));
-    delete (yyvsp[-3].TypeVal); delete (yyvsp[-1].ConstVector);
+    yyval.ConstVal = ConstantVector::get(PTy, *yyvsp[-1].ConstVector);
+    delete yyvsp[-3].TypeVal; delete yyvsp[-1].ConstVector;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 154:
-#line 1613 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    const StructType *STy = dyn_cast<StructType>((yyvsp[-3].TypeVal)->get());
+  ;
+    break;}
+case 154:
+#line 1614 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    const StructType *STy = dyn_cast<StructType>(yyvsp[-3].TypeVal->get());
     if (STy == 0)
       GEN_ERROR("Cannot make struct constant with type: '" + 
-                     (*(yyvsp[-3].TypeVal))->getDescription() + "'");
+                     (*yyvsp[-3].TypeVal)->getDescription() + "'");
 
-    if ((yyvsp[-1].ConstVector)->size() != STy->getNumContainedTypes())
+    if (yyvsp[-1].ConstVector->size() != STy->getNumContainedTypes())
       GEN_ERROR("Illegal number of initializers for structure type");
 
     // Check to ensure that constants are compatible with the type initializer!
-    for (unsigned i = 0, e = (yyvsp[-1].ConstVector)->size(); i != e; ++i)
-      if ((*(yyvsp[-1].ConstVector))[i]->getType() != STy->getElementType(i))
+    for (unsigned i = 0, e = yyvsp[-1].ConstVector->size(); i != e; ++i)
+      if ((*yyvsp[-1].ConstVector)[i]->getType() != STy->getElementType(i))
         GEN_ERROR("Expected type '" +
                        STy->getElementType(i)->getDescription() +
                        "' for element #" + utostr(i) +
@@ -3995,21 +3245,20 @@
       GEN_ERROR("Unpacked Initializer to vector type '" +
                 STy->getDescription() + "'");
 
-    (yyval.ConstVal) = ConstantStruct::get(STy, *(yyvsp[-1].ConstVector));
-    delete (yyvsp[-3].TypeVal); delete (yyvsp[-1].ConstVector);
+    yyval.ConstVal = ConstantStruct::get(STy, *yyvsp[-1].ConstVector);
+    delete yyvsp[-3].TypeVal; delete yyvsp[-1].ConstVector;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 155:
-#line 1639 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 155:
+#line 1640 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
-    const StructType *STy = dyn_cast<StructType>((yyvsp[-2].TypeVal)->get());
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
+    const StructType *STy = dyn_cast<StructType>(yyvsp[-2].TypeVal->get());
     if (STy == 0)
       GEN_ERROR("Cannot make struct constant with type: '" + 
-                     (*(yyvsp[-2].TypeVal))->getDescription() + "'");
+                     (*yyvsp[-2].TypeVal)->getDescription() + "'");
 
     if (STy->getNumContainedTypes() != 0)
       GEN_ERROR("Illegal number of initializers for structure type");
@@ -4019,26 +3268,25 @@
       GEN_ERROR("Unpacked Initializer to vector type '" +
                 STy->getDescription() + "'");
 
-    (yyval.ConstVal) = ConstantStruct::get(STy, std::vector<Constant*>());
-    delete (yyvsp[-2].TypeVal);
+    yyval.ConstVal = ConstantStruct::get(STy, std::vector<Constant*>());
+    delete yyvsp[-2].TypeVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 156:
-#line 1659 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    const StructType *STy = dyn_cast<StructType>((yyvsp[-5].TypeVal)->get());
+  ;
+    break;}
+case 156:
+#line 1660 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    const StructType *STy = dyn_cast<StructType>(yyvsp[-5].TypeVal->get());
     if (STy == 0)
       GEN_ERROR("Cannot make struct constant with type: '" + 
-                     (*(yyvsp[-5].TypeVal))->getDescription() + "'");
+                     (*yyvsp[-5].TypeVal)->getDescription() + "'");
 
-    if ((yyvsp[-2].ConstVector)->size() != STy->getNumContainedTypes())
+    if (yyvsp[-2].ConstVector->size() != STy->getNumContainedTypes())
       GEN_ERROR("Illegal number of initializers for structure type");
 
     // Check to ensure that constants are compatible with the type initializer!
-    for (unsigned i = 0, e = (yyvsp[-2].ConstVector)->size(); i != e; ++i)
-      if ((*(yyvsp[-2].ConstVector))[i]->getType() != STy->getElementType(i))
+    for (unsigned i = 0, e = yyvsp[-2].ConstVector->size(); i != e; ++i)
+      if ((*yyvsp[-2].ConstVector)[i]->getType() != STy->getElementType(i))
         GEN_ERROR("Expected type '" +
                        STy->getElementType(i)->getDescription() +
                        "' for element #" + utostr(i) +
@@ -4049,21 +3297,20 @@
       GEN_ERROR("Vector initializer to non-vector type '" + 
                 STy->getDescription() + "'");
 
-    (yyval.ConstVal) = ConstantStruct::get(STy, *(yyvsp[-2].ConstVector));
-    delete (yyvsp[-5].TypeVal); delete (yyvsp[-2].ConstVector);
+    yyval.ConstVal = ConstantStruct::get(STy, *yyvsp[-2].ConstVector);
+    delete yyvsp[-5].TypeVal; delete yyvsp[-2].ConstVector;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 157:
-#line 1685 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 157:
+#line 1686 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
-    const StructType *STy = dyn_cast<StructType>((yyvsp[-4].TypeVal)->get());
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-4].TypeVal)->getDescription());
+    const StructType *STy = dyn_cast<StructType>(yyvsp[-4].TypeVal->get());
     if (STy == 0)
       GEN_ERROR("Cannot make struct constant with type: '" + 
-                     (*(yyvsp[-4].TypeVal))->getDescription() + "'");
+                     (*yyvsp[-4].TypeVal)->getDescription() + "'");
 
     if (STy->getNumContainedTypes() != 0)
       GEN_ERROR("Illegal number of initializers for structure type");
@@ -4073,45 +3320,42 @@
       GEN_ERROR("Vector initializer to non-vector type '" + 
                 STy->getDescription() + "'");
 
-    (yyval.ConstVal) = ConstantStruct::get(STy, std::vector<Constant*>());
-    delete (yyvsp[-4].TypeVal);
+    yyval.ConstVal = ConstantStruct::get(STy, std::vector<Constant*>());
+    delete yyvsp[-4].TypeVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 158:
-#line 1705 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 158:
+#line 1706 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
-    const PointerType *PTy = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
+    const PointerType *PTy = dyn_cast<PointerType>(yyvsp[-1].TypeVal->get());
     if (PTy == 0)
       GEN_ERROR("Cannot make null pointer constant with type: '" + 
-                     (*(yyvsp[-1].TypeVal))->getDescription() + "'");
+                     (*yyvsp[-1].TypeVal)->getDescription() + "'");
 
-    (yyval.ConstVal) = ConstantPointerNull::get(PTy);
-    delete (yyvsp[-1].TypeVal);
+    yyval.ConstVal = ConstantPointerNull::get(PTy);
+    delete yyvsp[-1].TypeVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 159:
-#line 1717 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 159:
+#line 1718 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
-    (yyval.ConstVal) = UndefValue::get((yyvsp[-1].TypeVal)->get());
-    delete (yyvsp[-1].TypeVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 160:
-#line 1724 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
+    yyval.ConstVal = UndefValue::get(yyvsp[-1].TypeVal->get());
+    delete yyvsp[-1].TypeVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 160:
+#line 1725 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
-    const PointerType *Ty = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
+    const PointerType *Ty = dyn_cast<PointerType>(yyvsp[-1].TypeVal->get());
     if (Ty == 0)
       GEN_ERROR("Global const reference must be a pointer type");
 
@@ -4125,7 +3369,7 @@
     Function *SavedCurFn = CurFun.CurrentFunction;
     CurFun.CurrentFunction = 0;
 
-    Value *V = getExistingVal(Ty, (yyvsp[0].ValIDVal));
+    Value *V = getExistingVal(Ty, yyvsp[0].ValIDVal);
     CHECK_FOR_ERROR
 
     CurFun.CurrentFunction = SavedCurFn;
@@ -4140,16 +3384,16 @@
 
       // First check to see if the forward references value is already created!
       PerModuleInfo::GlobalRefsType::iterator I =
-        CurModule.GlobalRefs.find(std::make_pair(PT, (yyvsp[0].ValIDVal)));
+        CurModule.GlobalRefs.find(std::make_pair(PT, yyvsp[0].ValIDVal));
     
       if (I != CurModule.GlobalRefs.end()) {
         V = I->second;             // Placeholder already exists, use it...
-        (yyvsp[0].ValIDVal).destroy();
+        yyvsp[0].ValIDVal.destroy();
       } else {
         std::string Name;
-        if ((yyvsp[0].ValIDVal).Type == ValID::GlobalName)
-          Name = (yyvsp[0].ValIDVal).getName();
-        else if ((yyvsp[0].ValIDVal).Type != ValID::GlobalID)
+        if (yyvsp[0].ValIDVal.Type == ValID::GlobalName)
+          Name = yyvsp[0].ValIDVal.getName();
+        else if (yyvsp[0].ValIDVal.Type != ValID::GlobalID)
           GEN_ERROR("Invalid reference to global");
 
         // Create the forward referenced global.
@@ -4165,371 +3409,336 @@
         }
 
         // Keep track of the fact that we have a forward ref to recycle it
-        CurModule.GlobalRefs.insert(std::make_pair(std::make_pair(PT, (yyvsp[0].ValIDVal)), GV));
+        CurModule.GlobalRefs.insert(std::make_pair(std::make_pair(PT, yyvsp[0].ValIDVal), GV));
         V = GV;
       }
     }
 
-    (yyval.ConstVal) = cast<GlobalValue>(V);
-    delete (yyvsp[-1].TypeVal);            // Free the type handle
+    yyval.ConstVal = cast<GlobalValue>(V);
+    delete yyvsp[-1].TypeVal;            // Free the type handle
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 161:
-#line 1790 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 161:
+#line 1791 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
-    if ((yyvsp[-1].TypeVal)->get() != (yyvsp[0].ConstVal)->getType())
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
+    if (yyvsp[-1].TypeVal->get() != yyvsp[0].ConstVal->getType())
       GEN_ERROR("Mismatched types for constant expression: " + 
-        (*(yyvsp[-1].TypeVal))->getDescription() + " and " + (yyvsp[0].ConstVal)->getType()->getDescription());
-    (yyval.ConstVal) = (yyvsp[0].ConstVal);
-    delete (yyvsp[-1].TypeVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 162:
-#line 1800 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+        (*yyvsp[-1].TypeVal)->getDescription() + " and " + yyvsp[0].ConstVal->getType()->getDescription());
+    yyval.ConstVal = yyvsp[0].ConstVal;
+    delete yyvsp[-1].TypeVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 162:
+#line 1801 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
-    const Type *Ty = (yyvsp[-1].TypeVal)->get();
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
+    const Type *Ty = yyvsp[-1].TypeVal->get();
     if (isa<FunctionType>(Ty) || Ty == Type::LabelTy || isa<OpaqueType>(Ty))
       GEN_ERROR("Cannot create a null initialized value of this type");
-    (yyval.ConstVal) = Constant::getNullValue(Ty);
-    delete (yyvsp[-1].TypeVal);
+    yyval.ConstVal = Constant::getNullValue(Ty);
+    delete yyvsp[-1].TypeVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 163:
-#line 1810 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {      // integral constants
-    if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].SInt64Val)))
+  ;
+    break;}
+case 163:
+#line 1811 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{      // integral constants
+    if (!ConstantInt::isValueValidForType(yyvsp[-1].PrimType, yyvsp[0].SInt64Val))
       GEN_ERROR("Constant value doesn't fit in type");
-    (yyval.ConstVal) = ConstantInt::get((yyvsp[-1].PrimType), (yyvsp[0].SInt64Val), true);
+    yyval.ConstVal = ConstantInt::get(yyvsp[-1].PrimType, yyvsp[0].SInt64Val, true);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 164:
-#line 1816 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {      // arbitrary precision integer constants
-    uint32_t BitWidth = cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth();
-    if ((yyvsp[0].APIntVal)->getBitWidth() > BitWidth) {
+  ;
+    break;}
+case 164:
+#line 1817 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{      // arbitrary precision integer constants
+    uint32_t BitWidth = cast<IntegerType>(yyvsp[-1].PrimType)->getBitWidth();
+    if (yyvsp[0].APIntVal->getBitWidth() > BitWidth) {
       GEN_ERROR("Constant value does not fit in type");
     }
-    (yyvsp[0].APIntVal)->sextOrTrunc(BitWidth);
-    (yyval.ConstVal) = ConstantInt::get(*(yyvsp[0].APIntVal));
-    delete (yyvsp[0].APIntVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 165:
-#line 1826 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {      // integral constants
-    if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].UInt64Val)))
+    yyvsp[0].APIntVal->sextOrTrunc(BitWidth);
+    yyval.ConstVal = ConstantInt::get(*yyvsp[0].APIntVal);
+    delete yyvsp[0].APIntVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 165:
+#line 1827 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{      // integral constants
+    if (!ConstantInt::isValueValidForType(yyvsp[-1].PrimType, yyvsp[0].UInt64Val))
       GEN_ERROR("Constant value doesn't fit in type");
-    (yyval.ConstVal) = ConstantInt::get((yyvsp[-1].PrimType), (yyvsp[0].UInt64Val), false);
+    yyval.ConstVal = ConstantInt::get(yyvsp[-1].PrimType, yyvsp[0].UInt64Val, false);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 166:
-#line 1832 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {      // arbitrary precision integer constants
-    uint32_t BitWidth = cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth();
-    if ((yyvsp[0].APIntVal)->getBitWidth() > BitWidth) {
+  ;
+    break;}
+case 166:
+#line 1833 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{      // arbitrary precision integer constants
+    uint32_t BitWidth = cast<IntegerType>(yyvsp[-1].PrimType)->getBitWidth();
+    if (yyvsp[0].APIntVal->getBitWidth() > BitWidth) {
       GEN_ERROR("Constant value does not fit in type");
     } 
-    (yyvsp[0].APIntVal)->zextOrTrunc(BitWidth);
-    (yyval.ConstVal) = ConstantInt::get(*(yyvsp[0].APIntVal));
-    delete (yyvsp[0].APIntVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 167:
-#line 1842 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {                      // Boolean constants
-    assert(cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth() == 1 && "Not Bool?");
-    (yyval.ConstVal) = ConstantInt::getTrue();
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 168:
-#line 1847 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {                     // Boolean constants
-    assert(cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth() == 1 && "Not Bool?");
-    (yyval.ConstVal) = ConstantInt::getFalse();
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 169:
-#line 1852 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {                   // Float & Double constants
-    if (!ConstantFP::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].FPVal)))
+    yyvsp[0].APIntVal->zextOrTrunc(BitWidth);
+    yyval.ConstVal = ConstantInt::get(*yyvsp[0].APIntVal);
+    delete yyvsp[0].APIntVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 167:
+#line 1843 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                      // Boolean constants
+    assert(cast<IntegerType>(yyvsp[-1].PrimType)->getBitWidth() == 1 && "Not Bool?");
+    yyval.ConstVal = ConstantInt::getTrue();
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 168:
+#line 1848 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                     // Boolean constants
+    assert(cast<IntegerType>(yyvsp[-1].PrimType)->getBitWidth() == 1 && "Not Bool?");
+    yyval.ConstVal = ConstantInt::getFalse();
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 169:
+#line 1853 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                   // Float & Double constants
+    if (!ConstantFP::isValueValidForType(yyvsp[-1].PrimType, yyvsp[0].FPVal))
       GEN_ERROR("Floating point constant invalid for type");
-    (yyval.ConstVal) = ConstantFP::get((yyvsp[-1].PrimType), (yyvsp[0].FPVal));
+    yyval.ConstVal = ConstantFP::get(yyvsp[-1].PrimType, yyvsp[0].FPVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 170:
-#line 1860 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 170:
+#line 1861 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
-    Constant *Val = (yyvsp[-3].ConstVal);
-    const Type *DestTy = (yyvsp[-1].TypeVal)->get();
-    if (!CastInst::castIsValid((yyvsp[-5].CastOpVal), (yyvsp[-3].ConstVal), DestTy))
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
+    Constant *Val = yyvsp[-3].ConstVal;
+    const Type *DestTy = yyvsp[-1].TypeVal->get();
+    if (!CastInst::castIsValid(yyvsp[-5].CastOpVal, yyvsp[-3].ConstVal, DestTy))
       GEN_ERROR("invalid cast opcode for cast from '" +
                 Val->getType()->getDescription() + "' to '" +
                 DestTy->getDescription() + "'"); 
-    (yyval.ConstVal) = ConstantExpr::getCast((yyvsp[-5].CastOpVal), (yyvsp[-3].ConstVal), DestTy);
-    delete (yyvsp[-1].TypeVal);
-  ;}
-    break;
-
-  case 171:
-#line 1872 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (!isa<PointerType>((yyvsp[-2].ConstVal)->getType()))
+    yyval.ConstVal = ConstantExpr::getCast(yyvsp[-5].CastOpVal, yyvsp[-3].ConstVal, DestTy);
+    delete yyvsp[-1].TypeVal;
+  ;
+    break;}
+case 171:
+#line 1873 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!isa<PointerType>(yyvsp[-2].ConstVal->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand");
 
     const Type *IdxTy =
-      GetElementPtrInst::getIndexedType((yyvsp[-2].ConstVal)->getType(), &(*(yyvsp[-1].ValueList))[0], (yyvsp[-1].ValueList)->size(),
+      GetElementPtrInst::getIndexedType(yyvsp[-2].ConstVal->getType(), &(*yyvsp[-1].ValueList)[0], yyvsp[-1].ValueList->size(),
                                         true);
     if (!IdxTy)
       GEN_ERROR("Index list invalid for constant getelementptr");
 
     SmallVector<Constant*, 8> IdxVec;
-    for (unsigned i = 0, e = (yyvsp[-1].ValueList)->size(); i != e; ++i)
-      if (Constant *C = dyn_cast<Constant>((*(yyvsp[-1].ValueList))[i]))
+    for (unsigned i = 0, e = yyvsp[-1].ValueList->size(); i != e; ++i)
+      if (Constant *C = dyn_cast<Constant>((*yyvsp[-1].ValueList)[i]))
         IdxVec.push_back(C);
       else
         GEN_ERROR("Indices to constant getelementptr must be constants");
 
-    delete (yyvsp[-1].ValueList);
+    delete yyvsp[-1].ValueList;
 
-    (yyval.ConstVal) = ConstantExpr::getGetElementPtr((yyvsp[-2].ConstVal), &IdxVec[0], IdxVec.size());
+    yyval.ConstVal = ConstantExpr::getGetElementPtr(yyvsp[-2].ConstVal, &IdxVec[0], IdxVec.size());
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 172:
-#line 1894 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    if ((yyvsp[-5].ConstVal)->getType() != Type::Int1Ty)
+  ;
+    break;}
+case 172:
+#line 1895 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (yyvsp[-5].ConstVal->getType() != Type::Int1Ty)
       GEN_ERROR("Select condition must be of boolean type");
-    if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
+    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
       GEN_ERROR("Select operand types must match");
-    (yyval.ConstVal) = ConstantExpr::getSelect((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+    yyval.ConstVal = ConstantExpr::getSelect(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 173:
-#line 1902 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
+  ;
+    break;}
+case 173:
+#line 1903 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
       GEN_ERROR("Binary operator types must match");
     CHECK_FOR_ERROR;
-    (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].BinaryOpVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
-  ;}
-    break;
-
-  case 174:
-#line 1908 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
+    yyval.ConstVal = ConstantExpr::get(yyvsp[-5].BinaryOpVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
+  ;
+    break;}
+case 174:
+#line 1909 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
       GEN_ERROR("Logical operator types must match");
-    if (!(yyvsp[-3].ConstVal)->getType()->isInteger()) {
-      if (Instruction::isShift((yyvsp[-5].BinaryOpVal)) || !isa<VectorType>((yyvsp[-3].ConstVal)->getType()) || 
-          !cast<VectorType>((yyvsp[-3].ConstVal)->getType())->getElementType()->isInteger())
+    if (!yyvsp[-3].ConstVal->getType()->isInteger()) {
+      if (Instruction::isShift(yyvsp[-5].BinaryOpVal) || !isa<VectorType>(yyvsp[-3].ConstVal->getType()) || 
+          !cast<VectorType>(yyvsp[-3].ConstVal->getType())->getElementType()->isInteger())
         GEN_ERROR("Logical operator requires integral operands");
     }
-    (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].BinaryOpVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+    yyval.ConstVal = ConstantExpr::get(yyvsp[-5].BinaryOpVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 175:
-#line 1919 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
+  ;
+    break;}
+case 175:
+#line 1920 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
       GEN_ERROR("icmp operand types must match");
-    (yyval.ConstVal) = ConstantExpr::getICmp((yyvsp[-5].IPredicate), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
-  ;}
-    break;
-
-  case 176:
-#line 1924 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
+    yyval.ConstVal = ConstantExpr::getICmp(yyvsp[-5].IPredicate, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
+  ;
+    break;}
+case 176:
+#line 1925 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
       GEN_ERROR("fcmp operand types must match");
-    (yyval.ConstVal) = ConstantExpr::getFCmp((yyvsp[-5].FPredicate), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
-  ;}
-    break;
-
-  case 177:
-#line 1929 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (!ExtractElementInst::isValidOperands((yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
+    yyval.ConstVal = ConstantExpr::getFCmp(yyvsp[-5].FPredicate, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
+  ;
+    break;}
+case 177:
+#line 1930 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!ExtractElementInst::isValidOperands(yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
       GEN_ERROR("Invalid extractelement operands");
-    (yyval.ConstVal) = ConstantExpr::getExtractElement((yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+    yyval.ConstVal = ConstantExpr::getExtractElement(yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 178:
-#line 1935 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (!InsertElementInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
+  ;
+    break;}
+case 178:
+#line 1936 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!InsertElementInst::isValidOperands(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
       GEN_ERROR("Invalid insertelement operands");
-    (yyval.ConstVal) = ConstantExpr::getInsertElement((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+    yyval.ConstVal = ConstantExpr::getInsertElement(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 179:
-#line 1941 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (!ShuffleVectorInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
+  ;
+    break;}
+case 179:
+#line 1942 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!ShuffleVectorInst::isValidOperands(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
       GEN_ERROR("Invalid shufflevector operands");
-    (yyval.ConstVal) = ConstantExpr::getShuffleVector((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+    yyval.ConstVal = ConstantExpr::getShuffleVector(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 180:
-#line 1950 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    ((yyval.ConstVector) = (yyvsp[-2].ConstVector))->push_back((yyvsp[0].ConstVal));
+  ;
+    break;}
+case 180:
+#line 1951 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    (yyval.ConstVector = yyvsp[-2].ConstVector)->push_back(yyvsp[0].ConstVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 181:
-#line 1954 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ConstVector) = new std::vector<Constant*>();
-    (yyval.ConstVector)->push_back((yyvsp[0].ConstVal));
+  ;
+    break;}
+case 181:
+#line 1955 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ConstVector = new std::vector<Constant*>();
+    yyval.ConstVector->push_back(yyvsp[0].ConstVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 182:
-#line 1962 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.BoolVal) = false; ;}
-    break;
-
-  case 183:
-#line 1962 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.BoolVal) = true; ;}
-    break;
-
-  case 184:
-#line 1965 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.BoolVal) = true; ;}
-    break;
-
-  case 185:
-#line 1965 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.BoolVal) = false; ;}
-    break;
-
-  case 186:
-#line 1968 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    const Type* VTy = (yyvsp[-1].TypeVal)->get();
-    Value *V = getVal(VTy, (yyvsp[0].ValIDVal));
+  ;
+    break;}
+case 182:
+#line 1963 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.BoolVal = false; ;
+    break;}
+case 183:
+#line 1963 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.BoolVal = true; ;
+    break;}
+case 184:
+#line 1966 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.BoolVal = true; ;
+    break;}
+case 185:
+#line 1966 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.BoolVal = false; ;
+    break;}
+case 186:
+#line 1969 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    const Type* VTy = yyvsp[-1].TypeVal->get();
+    Value *V = getVal(VTy, yyvsp[0].ValIDVal);
     GlobalValue* Aliasee = dyn_cast<GlobalValue>(V);
     if (!Aliasee)
       GEN_ERROR("Aliases can be created only to global values");
 
-    (yyval.ConstVal) = Aliasee;
+    yyval.ConstVal = Aliasee;
     CHECK_FOR_ERROR
-    delete (yyvsp[-1].TypeVal);
-   ;}
-    break;
-
-  case 187:
-#line 1979 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    Constant *Val = (yyvsp[-3].ConstVal);
-    const Type *DestTy = (yyvsp[-1].TypeVal)->get();
-    if (!CastInst::castIsValid((yyvsp[-5].CastOpVal), (yyvsp[-3].ConstVal), DestTy))
+    delete yyvsp[-1].TypeVal;
+   ;
+    break;}
+case 187:
+#line 1980 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    Constant *Val = yyvsp[-3].ConstVal;
+    const Type *DestTy = yyvsp[-1].TypeVal->get();
+    if (!CastInst::castIsValid(yyvsp[-5].CastOpVal, yyvsp[-3].ConstVal, DestTy))
       GEN_ERROR("invalid cast opcode for cast from '" +
                 Val->getType()->getDescription() + "' to '" +
                 DestTy->getDescription() + "'");
     
-    (yyval.ConstVal) = ConstantExpr::getCast((yyvsp[-5].CastOpVal), (yyvsp[-3].ConstVal), DestTy);
+    yyval.ConstVal = ConstantExpr::getCast(yyvsp[-5].CastOpVal, yyvsp[-3].ConstVal, DestTy);
     CHECK_FOR_ERROR
-    delete (yyvsp[-1].TypeVal);
-   ;}
-    break;
-
-  case 188:
-#line 2000 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
+    delete yyvsp[-1].TypeVal;
+   ;
+    break;}
+case 188:
+#line 2001 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ModuleVal = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
     CHECK_FOR_ERROR;
-  ;}
-    break;
-
-  case 189:
-#line 2005 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
+  ;
+    break;}
+case 189:
+#line 2006 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ModuleVal = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
     CHECK_FOR_ERROR;
-  ;}
-    break;
-
-  case 192:
-#line 2018 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { CurFun.isDeclare = false; ;}
-    break;
-
-  case 193:
-#line 2018 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 192:
+#line 2019 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ CurFun.isDeclare = false; ;
+    break;}
+case 193:
+#line 2019 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 194:
-#line 2022 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { CurFun.isDeclare = true; ;}
-    break;
-
-  case 195:
-#line 2022 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 194:
+#line 2023 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ CurFun.isDeclare = true; ;
+    break;}
+case 195:
+#line 2023 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 196:
-#line 2025 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 196:
+#line 2026 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 197:
-#line 2028 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 197:
+#line 2029 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
     // Eagerly resolve types.  This is not an optimization, this is a
     // requirement that is due to the fact that we could have this:
     //
@@ -4539,271 +3748,248 @@
     // If types are not resolved eagerly, then the two types will not be
     // determined to be the same type!
     //
-    ResolveTypeTo((yyvsp[-2].StrVal), *(yyvsp[0].TypeVal));
+    ResolveTypeTo(yyvsp[-2].StrVal, *yyvsp[0].TypeVal);
 
-    if (!setTypeName(*(yyvsp[0].TypeVal), (yyvsp[-2].StrVal)) && !(yyvsp[-2].StrVal)) {
+    if (!setTypeName(*yyvsp[0].TypeVal, yyvsp[-2].StrVal) && !yyvsp[-2].StrVal) {
       CHECK_FOR_ERROR
       // If this is a named type that is not a redefinition, add it to the slot
       // table.
-      CurModule.Types.push_back(*(yyvsp[0].TypeVal));
+      CurModule.Types.push_back(*yyvsp[0].TypeVal);
     }
 
-    delete (yyvsp[0].TypeVal);
+    delete yyvsp[0].TypeVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 198:
-#line 2052 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    ResolveTypeTo((yyvsp[-2].StrVal), (yyvsp[0].PrimType));
+  ;
+    break;}
+case 198:
+#line 2053 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    ResolveTypeTo(yyvsp[-2].StrVal, yyvsp[0].PrimType);
 
-    if (!setTypeName((yyvsp[0].PrimType), (yyvsp[-2].StrVal)) && !(yyvsp[-2].StrVal)) {
+    if (!setTypeName(yyvsp[0].PrimType, yyvsp[-2].StrVal) && !yyvsp[-2].StrVal) {
       CHECK_FOR_ERROR
       // If this is a named type that is not a redefinition, add it to the slot
       // table.
-      CurModule.Types.push_back((yyvsp[0].PrimType));
+      CurModule.Types.push_back(yyvsp[0].PrimType);
     }
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 199:
-#line 2063 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { 
+  ;
+    break;}
+case 199:
+#line 2064 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ 
     /* "Externally Visible" Linkage */
-    if ((yyvsp[0].ConstVal) == 0) 
+    if (yyvsp[0].ConstVal == 0) 
       GEN_ERROR("Global value initializer is not a constant");
-    CurGV = ParseGlobalVariable((yyvsp[-4].StrVal), GlobalValue::ExternalLinkage,
-                                (yyvsp[-3].Visibility), (yyvsp[-1].BoolVal), (yyvsp[0].ConstVal)->getType(), (yyvsp[0].ConstVal), (yyvsp[-2].BoolVal));
+    CurGV = ParseGlobalVariable(yyvsp[-4].StrVal, GlobalValue::ExternalLinkage,
+                                yyvsp[-3].Visibility, yyvsp[-1].BoolVal, yyvsp[0].ConstVal->getType(), yyvsp[0].ConstVal, yyvsp[-2].BoolVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 200:
-#line 2070 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 200:
+#line 2071 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     CurGV = 0;
-  ;}
-    break;
-
-  case 201:
-#line 2074 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    if ((yyvsp[0].ConstVal) == 0) 
+  ;
+    break;}
+case 201:
+#line 2075 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (yyvsp[0].ConstVal == 0) 
       GEN_ERROR("Global value initializer is not a constant");
-    CurGV = ParseGlobalVariable((yyvsp[-5].StrVal), (yyvsp[-4].Linkage), (yyvsp[-3].Visibility), (yyvsp[-1].BoolVal), (yyvsp[0].ConstVal)->getType(), (yyvsp[0].ConstVal), (yyvsp[-2].BoolVal));
+    CurGV = ParseGlobalVariable(yyvsp[-5].StrVal, yyvsp[-4].Linkage, yyvsp[-3].Visibility, yyvsp[-1].BoolVal, yyvsp[0].ConstVal->getType(), yyvsp[0].ConstVal, yyvsp[-2].BoolVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 202:
-#line 2079 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 202:
+#line 2080 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     CurGV = 0;
-  ;}
-    break;
-
-  case 203:
-#line 2083 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 203:
+#line 2084 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
-    CurGV = ParseGlobalVariable((yyvsp[-5].StrVal), (yyvsp[-4].Linkage), (yyvsp[-3].Visibility), (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0, (yyvsp[-2].BoolVal));
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
+    CurGV = ParseGlobalVariable(yyvsp[-5].StrVal, yyvsp[-4].Linkage, yyvsp[-3].Visibility, yyvsp[-1].BoolVal, *yyvsp[0].TypeVal, 0, yyvsp[-2].BoolVal);
     CHECK_FOR_ERROR
-    delete (yyvsp[0].TypeVal);
-  ;}
-    break;
-
-  case 204:
-#line 2089 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+    delete yyvsp[0].TypeVal;
+  ;
+    break;}
+case 204:
+#line 2090 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     CurGV = 0;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 205:
-#line 2093 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 205:
+#line 2094 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     std::string Name;
-    if ((yyvsp[-4].StrVal)) {
-      Name = *(yyvsp[-4].StrVal);
-      delete (yyvsp[-4].StrVal);
+    if (yyvsp[-4].StrVal) {
+      Name = *yyvsp[-4].StrVal;
+      delete yyvsp[-4].StrVal;
     }
     if (Name.empty())
       GEN_ERROR("Alias name cannot be empty");
     
-    Constant* Aliasee = (yyvsp[0].ConstVal);
+    Constant* Aliasee = yyvsp[0].ConstVal;
     if (Aliasee == 0)
       GEN_ERROR(std::string("Invalid aliasee for alias: ") + Name);
 
-    GlobalAlias* GA = new GlobalAlias(Aliasee->getType(), (yyvsp[-1].Linkage), Name, Aliasee,
+    GlobalAlias* GA = new GlobalAlias(Aliasee->getType(), yyvsp[-1].Linkage, Name, Aliasee,
                                       CurModule.CurrentModule);
-    GA->setVisibility((yyvsp[-3].Visibility));
+    GA->setVisibility(yyvsp[-3].Visibility);
     InsertValue(GA, CurModule.Values);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 206:
-#line 2112 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { 
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 207:
-#line 2115 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 206:
+#line 2113 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ 
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 207:
+#line 2116 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 208:
-#line 2121 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 208:
+#line 2122 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   if (AsmSoFar.empty())
-    CurModule.CurrentModule->setModuleInlineAsm(*(yyvsp[0].StrVal));
+    CurModule.CurrentModule->setModuleInlineAsm(*yyvsp[0].StrVal);
   else
-    CurModule.CurrentModule->setModuleInlineAsm(AsmSoFar+"\n"+*(yyvsp[0].StrVal));
-  delete (yyvsp[0].StrVal);
+    CurModule.CurrentModule->setModuleInlineAsm(AsmSoFar+"\n"+*yyvsp[0].StrVal);
+  delete yyvsp[0].StrVal;
   CHECK_FOR_ERROR
-;}
-    break;
-
-  case 209:
-#line 2131 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    CurModule.CurrentModule->setTargetTriple(*(yyvsp[0].StrVal));
-    delete (yyvsp[0].StrVal);
-  ;}
-    break;
-
-  case 210:
-#line 2135 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    CurModule.CurrentModule->setDataLayout(*(yyvsp[0].StrVal));
-    delete (yyvsp[0].StrVal);
-  ;}
-    break;
-
-  case 212:
-#line 2142 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-          CurModule.CurrentModule->addLibrary(*(yyvsp[0].StrVal));
-          delete (yyvsp[0].StrVal);
+;
+    break;}
+case 209:
+#line 2132 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    CurModule.CurrentModule->setTargetTriple(*yyvsp[0].StrVal);
+    delete yyvsp[0].StrVal;
+  ;
+    break;}
+case 210:
+#line 2136 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    CurModule.CurrentModule->setDataLayout(*yyvsp[0].StrVal);
+    delete yyvsp[0].StrVal;
+  ;
+    break;}
+case 212:
+#line 2143 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+          CurModule.CurrentModule->addLibrary(*yyvsp[0].StrVal);
+          delete yyvsp[0].StrVal;
           CHECK_FOR_ERROR
-        ;}
-    break;
-
-  case 213:
-#line 2147 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-          CurModule.CurrentModule->addLibrary(*(yyvsp[0].StrVal));
-          delete (yyvsp[0].StrVal);
+        ;
+    break;}
+case 213:
+#line 2148 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+          CurModule.CurrentModule->addLibrary(*yyvsp[0].StrVal);
+          delete yyvsp[0].StrVal;
           CHECK_FOR_ERROR
-        ;}
-    break;
-
-  case 214:
-#line 2152 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+        ;
+    break;}
+case 214:
+#line 2153 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
           CHECK_FOR_ERROR
-        ;}
-    break;
-
-  case 215:
-#line 2161 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+        ;
+    break;}
+case 215:
+#line 2162 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
-    if (*(yyvsp[-2].TypeVal) == Type::VoidTy)
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
+    if (*yyvsp[-2].TypeVal == Type::VoidTy)
       GEN_ERROR("void typed arguments are invalid");
-    ArgListEntry E; E.Attrs = (yyvsp[-1].ParamAttrs); E.Ty = (yyvsp[-2].TypeVal); E.Name = (yyvsp[0].StrVal);
-    (yyval.ArgList) = (yyvsp[-4].ArgList);
-    (yyvsp[-4].ArgList)->push_back(E);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 216:
-#line 2171 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+    ArgListEntry E; E.Attrs = yyvsp[-1].ParamAttrs; E.Ty = yyvsp[-2].TypeVal; E.Name = yyvsp[0].StrVal;
+    yyval.ArgList = yyvsp[-4].ArgList;
+    yyvsp[-4].ArgList->push_back(E);
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 216:
+#line 2172 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
-    if (*(yyvsp[-2].TypeVal) == Type::VoidTy)
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
+    if (*yyvsp[-2].TypeVal == Type::VoidTy)
       GEN_ERROR("void typed arguments are invalid");
-    ArgListEntry E; E.Attrs = (yyvsp[-1].ParamAttrs); E.Ty = (yyvsp[-2].TypeVal); E.Name = (yyvsp[0].StrVal);
-    (yyval.ArgList) = new ArgListType;
-    (yyval.ArgList)->push_back(E);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 217:
-#line 2182 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ArgList) = (yyvsp[0].ArgList);
+    ArgListEntry E; E.Attrs = yyvsp[-1].ParamAttrs; E.Ty = yyvsp[-2].TypeVal; E.Name = yyvsp[0].StrVal;
+    yyval.ArgList = new ArgListType;
+    yyval.ArgList->push_back(E);
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 217:
+#line 2183 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ArgList = yyvsp[0].ArgList;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 218:
-#line 2186 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ArgList) = (yyvsp[-2].ArgList);
+  ;
+    break;}
+case 218:
+#line 2187 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ArgList = yyvsp[-2].ArgList;
     struct ArgListEntry E;
     E.Ty = new PATypeHolder(Type::VoidTy);
     E.Name = 0;
     E.Attrs = ParamAttr::None;
-    (yyval.ArgList)->push_back(E);
+    yyval.ArgList->push_back(E);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 219:
-#line 2195 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ArgList) = new ArgListType;
+  ;
+    break;}
+case 219:
+#line 2196 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ArgList = new ArgListType;
     struct ArgListEntry E;
     E.Ty = new PATypeHolder(Type::VoidTy);
     E.Name = 0;
     E.Attrs = ParamAttr::None;
-    (yyval.ArgList)->push_back(E);
+    yyval.ArgList->push_back(E);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 220:
-#line 2204 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ArgList) = 0;
+  ;
+    break;}
+case 220:
+#line 2205 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ArgList = 0;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 221:
-#line 2210 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-  std::string FunctionName(*(yyvsp[-6].StrVal));
-  delete (yyvsp[-6].StrVal);  // Free strdup'd memory!
+  ;
+    break;}
+case 221:
+#line 2211 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+  std::string FunctionName(*yyvsp[-6].StrVal);
+  delete yyvsp[-6].StrVal;  // Free strdup'd memory!
   
   // Check the function result for abstractness if this is a define. We should
   // have no abstract types at this point
-  if (!CurFun.isDeclare && CurModule.TypeIsUnresolved((yyvsp[-7].TypeVal)))
-    GEN_ERROR("Reference to abstract result: "+ (yyvsp[-7].TypeVal)->get()->getDescription());
+  if (!CurFun.isDeclare && CurModule.TypeIsUnresolved(yyvsp[-7].TypeVal))
+    GEN_ERROR("Reference to abstract result: "+ yyvsp[-7].TypeVal->get()->getDescription());
 
   std::vector<const Type*> ParamTypeList;
   ParamAttrsVector Attrs;
-  if ((yyvsp[-2].ParamAttrs) != ParamAttr::None) {
-    ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = (yyvsp[-2].ParamAttrs);
+  if (yyvsp[-2].ParamAttrs != ParamAttr::None) {
+    ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = yyvsp[-2].ParamAttrs;
     Attrs.push_back(PAWI);
   }
-  if ((yyvsp[-4].ArgList)) {   // If there are arguments...
+  if (yyvsp[-4].ArgList) {   // If there are arguments...
     unsigned index = 1;
-    for (ArgListType::iterator I = (yyvsp[-4].ArgList)->begin(); I != (yyvsp[-4].ArgList)->end(); ++I, ++index) {
+    for (ArgListType::iterator I = yyvsp[-4].ArgList->begin(); I != yyvsp[-4].ArgList->end(); ++I, ++index) {
       const Type* Ty = I->Ty->get();
       if (!CurFun.isDeclare && CurModule.TypeIsUnresolved(I->Ty))
         GEN_ERROR("Reference to abstract argument: " + Ty->getDescription());
@@ -4823,9 +4009,9 @@
   if (!Attrs.empty())
     PAL = ParamAttrsList::get(Attrs);
 
-  FunctionType *FT = FunctionType::get(*(yyvsp[-7].TypeVal), ParamTypeList, isVarArg, PAL);
+  FunctionType *FT = FunctionType::get(*yyvsp[-7].TypeVal, ParamTypeList, isVarArg, PAL);
   const PointerType *PFT = PointerType::get(FT);
-  delete (yyvsp[-7].TypeVal);
+  delete yyvsp[-7].TypeVal;
 
   ValID ID;
   if (!FunctionName.empty()) {
@@ -4874,26 +4060,26 @@
     Fn->setLinkage(CurFun.Linkage);
     Fn->setVisibility(CurFun.Visibility);
   }
-  Fn->setCallingConv((yyvsp[-8].UIntVal));
-  Fn->setAlignment((yyvsp[0].UIntVal));
-  if ((yyvsp[-1].StrVal)) {
-    Fn->setSection(*(yyvsp[-1].StrVal));
-    delete (yyvsp[-1].StrVal);
+  Fn->setCallingConv(yyvsp[-8].UIntVal);
+  Fn->setAlignment(yyvsp[0].UIntVal);
+  if (yyvsp[-1].StrVal) {
+    Fn->setSection(*yyvsp[-1].StrVal);
+    delete yyvsp[-1].StrVal;
   }
 
   // Add all of the arguments we parsed to the function...
-  if ((yyvsp[-4].ArgList)) {                     // Is null if empty...
+  if (yyvsp[-4].ArgList) {                     // Is null if empty...
     if (isVarArg) {  // Nuke the last entry
-      assert((yyvsp[-4].ArgList)->back().Ty->get() == Type::VoidTy && (yyvsp[-4].ArgList)->back().Name == 0 &&
+      assert(yyvsp[-4].ArgList->back().Ty->get() == Type::VoidTy && yyvsp[-4].ArgList->back().Name == 0 &&
              "Not a varargs marker!");
-      delete (yyvsp[-4].ArgList)->back().Ty;
-      (yyvsp[-4].ArgList)->pop_back();  // Delete the last entry
+      delete yyvsp[-4].ArgList->back().Ty;
+      yyvsp[-4].ArgList->pop_back();  // Delete the last entry
     }
     Function::arg_iterator ArgIt = Fn->arg_begin();
     Function::arg_iterator ArgEnd = Fn->arg_end();
     unsigned Idx = 1;
-    for (ArgListType::iterator I = (yyvsp[-4].ArgList)->begin(); 
-         I != (yyvsp[-4].ArgList)->end() && ArgIt != ArgEnd; ++I, ++ArgIt) {
+    for (ArgListType::iterator I = yyvsp[-4].ArgList->begin(); 
+         I != yyvsp[-4].ArgList->end() && ArgIt != ArgEnd; ++I, ++ArgIt) {
       delete I->Ty;                          // Delete the typeholder...
       setValueName(ArgIt, I->Name);       // Insert arg into symtab...
       CHECK_FOR_ERROR
@@ -4901,366 +4087,332 @@
       Idx++;
     }
 
-    delete (yyvsp[-4].ArgList);                     // We're now done with the argument list
+    delete yyvsp[-4].ArgList;                     // We're now done with the argument list
   }
   CHECK_FOR_ERROR
-;}
-    break;
-
-  case 224:
-#line 2332 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-  (yyval.FunctionVal) = CurFun.CurrentFunction;
+;
+    break;}
+case 224:
+#line 2333 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+  yyval.FunctionVal = CurFun.CurrentFunction;
 
   // Make sure that we keep track of the linkage type even if there was a
   // previous "declare".
-  (yyval.FunctionVal)->setLinkage((yyvsp[-3].Linkage));
-  (yyval.FunctionVal)->setVisibility((yyvsp[-2].Visibility));
-;}
-    break;
-
-  case 227:
-#line 2343 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-  (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
+  yyval.FunctionVal->setLinkage(yyvsp[-3].Linkage);
+  yyval.FunctionVal->setVisibility(yyvsp[-2].Visibility);
+;
+    break;}
+case 227:
+#line 2344 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+  yyval.FunctionVal = yyvsp[-1].FunctionVal;
   CHECK_FOR_ERROR
-;}
-    break;
-
-  case 228:
-#line 2348 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    CurFun.CurrentFunction->setLinkage((yyvsp[-2].Linkage));
-    CurFun.CurrentFunction->setVisibility((yyvsp[-1].Visibility));
-    (yyval.FunctionVal) = CurFun.CurrentFunction;
+;
+    break;}
+case 228:
+#line 2349 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    CurFun.CurrentFunction->setLinkage(yyvsp[-2].Linkage);
+    CurFun.CurrentFunction->setVisibility(yyvsp[-1].Visibility);
+    yyval.FunctionVal = CurFun.CurrentFunction;
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 229:
-#line 2360 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.BoolVal) = false;
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 230:
-#line 2364 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.BoolVal) = true;
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 231:
-#line 2369 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {    // A reference to a direct constant
-    (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val));
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 232:
-#line 2373 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val));
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 233:
-#line 2377 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {                     // Perhaps it's an FP constant?
-    (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal));
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 234:
-#line 2381 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue());
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 235:
-#line 2385 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse());
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 236:
-#line 2389 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ValIDVal) = ValID::createNull();
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 237:
-#line 2393 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ValIDVal) = ValID::createUndef();
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 238:
-#line 2397 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {     // A vector zero constant.
-    (yyval.ValIDVal) = ValID::createZeroInit();
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 239:
-#line 2401 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { // Nonempty unsized packed vector
-    const Type *ETy = (*(yyvsp[-1].ConstVector))[0]->getType();
-    int NumElements = (yyvsp[-1].ConstVector)->size(); 
-    
-    VectorType* pt = VectorType::get(ETy, NumElements);
-    PATypeHolder* PTy = new PATypeHolder(
-                                         HandleUpRefs(
-                                            VectorType::get(
-                                                ETy, 
-                                                NumElements)
-                                            )
-                                         );
-    
-    // Verify all elements are correct type!
-    for (unsigned i = 0; i < (yyvsp[-1].ConstVector)->size(); i++) {
-      if (ETy != (*(yyvsp[-1].ConstVector))[i]->getType())
-        GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
-                     ETy->getDescription() +"' as required!\nIt is of type '" +
-                     (*(yyvsp[-1].ConstVector))[i]->getType()->getDescription() + "'.");
-    }
-
-    (yyval.ValIDVal) = ValID::create(ConstantVector::get(pt, *(yyvsp[-1].ConstVector)));
-    delete PTy; delete (yyvsp[-1].ConstVector);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 240:
-#line 2426 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal));
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 241:
-#line 2430 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ValIDVal) = ValID::createInlineAsm(*(yyvsp[-2].StrVal), *(yyvsp[0].StrVal), (yyvsp[-3].BoolVal));
-    delete (yyvsp[-2].StrVal);
-    delete (yyvsp[0].StrVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 242:
-#line 2440 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {  // Is it an integer reference...?
-    (yyval.ValIDVal) = ValID::createLocalID((yyvsp[0].UIntVal));
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 243:
-#line 2444 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[0].UIntVal));
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 244:
-#line 2448 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {                   // Is it a named reference...?
-    (yyval.ValIDVal) = ValID::createLocalName(*(yyvsp[0].StrVal));
-    delete (yyvsp[0].StrVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 245:
-#line 2453 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {                   // Is it a named reference...?
-    (yyval.ValIDVal) = ValID::createGlobalName(*(yyvsp[0].StrVal));
-    delete (yyvsp[0].StrVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 248:
-#line 2466 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
-    (yyval.ValueVal) = getVal(*(yyvsp[-1].TypeVal), (yyvsp[0].ValIDVal)); 
-    delete (yyvsp[-1].TypeVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 249:
-#line 2475 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 250:
-#line 2479 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { // Do not allow functions with 0 basic blocks   
-    (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 251:
-#line 2488 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    setValueName((yyvsp[0].TermInstVal), (yyvsp[-1].StrVal));
+  ;
+    break;}
+case 229:
+#line 2361 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.BoolVal = false;
     CHECK_FOR_ERROR
-    InsertValue((yyvsp[0].TermInstVal));
-    (yyvsp[-2].BasicBlockVal)->getInstList().push_back((yyvsp[0].TermInstVal));
-    (yyval.BasicBlockVal) = (yyvsp[-2].BasicBlockVal);
+  ;
+    break;}
+case 230:
+#line 2365 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.BoolVal = true;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 252:
-#line 2497 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (CastInst *CI1 = dyn_cast<CastInst>((yyvsp[0].InstVal)))
-      if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
-        if (CI2->getParent() == 0)
-          (yyvsp[-1].BasicBlockVal)->getInstList().push_back(CI2);
-    (yyvsp[-1].BasicBlockVal)->getInstList().push_back((yyvsp[0].InstVal));
-    (yyval.BasicBlockVal) = (yyvsp[-1].BasicBlockVal);
+  ;
+    break;}
+case 231:
+#line 2370 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{    // A reference to a direct constant
+    yyval.ValIDVal = ValID::create(yyvsp[0].SInt64Val);
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 232:
+#line 2374 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ValIDVal = ValID::create(yyvsp[0].UInt64Val);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 253:
-#line 2506 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {          // Empty space between instruction lists
-    (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
+  ;
+    break;}
+case 233:
+#line 2378 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                     // Perhaps it's an FP constant?
+    yyval.ValIDVal = ValID::create(yyvsp[0].FPVal);
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 234:
+#line 2382 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ValIDVal = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 254:
-#line 2510 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {             // Labelled (named) basic block
-    (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[0].StrVal)));
-    delete (yyvsp[0].StrVal);
+  ;
+    break;}
+case 235:
+#line 2386 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ValIDVal = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
-
-  ;}
-    break;
-
-  case 255:
-#line 2517 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {              // Return with a result...
-    (yyval.TermInstVal) = new ReturnInst((yyvsp[0].ValueVal));
+  ;
+    break;}
+case 236:
+#line 2390 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ValIDVal = ValID::createNull();
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 256:
-#line 2521 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {                                    // Return with no result...
-    (yyval.TermInstVal) = new ReturnInst();
+  ;
+    break;}
+case 237:
+#line 2394 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ValIDVal = ValID::createUndef();
     CHECK_FOR_ERROR
-  ;}
-    break;
+  ;
+    break;}
+case 238:
+#line 2398 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{     // A vector zero constant.
+    yyval.ValIDVal = ValID::createZeroInit();
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 239:
+#line 2402 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ // Nonempty unsized packed vector
+    const Type *ETy = (*yyvsp[-1].ConstVector)[0]->getType();
+    int NumElements = yyvsp[-1].ConstVector->size(); 
+    
+    VectorType* pt = VectorType::get(ETy, NumElements);
+    PATypeHolder* PTy = new PATypeHolder(
+                                         HandleUpRefs(
+                                            VectorType::get(
+                                                ETy, 
+                                                NumElements)
+                                            )
+                                         );
+    
+    // Verify all elements are correct type!
+    for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) {
+      if (ETy != (*yyvsp[-1].ConstVector)[i]->getType())
+        GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
+                     ETy->getDescription() +"' as required!\nIt is of type '" +
+                     (*yyvsp[-1].ConstVector)[i]->getType()->getDescription() + "'.");
+    }
 
-  case 257:
-#line 2525 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {                           // Unconditional Branch...
-    BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
+    yyval.ValIDVal = ValID::create(ConstantVector::get(pt, *yyvsp[-1].ConstVector));
+    delete PTy; delete yyvsp[-1].ConstVector;
     CHECK_FOR_ERROR
-    (yyval.TermInstVal) = new BranchInst(tmpBB);
-  ;}
-    break;
-
-  case 258:
-#line 2530 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {  
-    assert(cast<IntegerType>((yyvsp[-7].PrimType))->getBitWidth() == 1 && "Not Bool?");
-    BasicBlock* tmpBBA = getBBVal((yyvsp[-3].ValIDVal));
+  ;
+    break;}
+case 240:
+#line 2427 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ValIDVal = ValID::create(yyvsp[0].ConstVal);
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 241:
+#line 2431 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ValIDVal = ValID::createInlineAsm(*yyvsp[-2].StrVal, *yyvsp[0].StrVal, yyvsp[-3].BoolVal);
+    delete yyvsp[-2].StrVal;
+    delete yyvsp[0].StrVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 242:
+#line 2441 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{  // Is it an integer reference...?
+    yyval.ValIDVal = ValID::createLocalID(yyvsp[0].UIntVal);
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 243:
+#line 2445 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ValIDVal = ValID::createGlobalID(yyvsp[0].UIntVal);
     CHECK_FOR_ERROR
-    BasicBlock* tmpBBB = getBBVal((yyvsp[0].ValIDVal));
+  ;
+    break;}
+case 244:
+#line 2449 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                   // Is it a named reference...?
+    yyval.ValIDVal = ValID::createLocalName(*yyvsp[0].StrVal);
+    delete yyvsp[0].StrVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 245:
+#line 2454 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                   // Is it a named reference...?
+    yyval.ValIDVal = ValID::createGlobalName(*yyvsp[0].StrVal);
+    delete yyvsp[0].StrVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 248:
+#line 2467 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!UpRefs.empty())
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
+    yyval.ValueVal = getVal(*yyvsp[-1].TypeVal, yyvsp[0].ValIDVal); 
+    delete yyvsp[-1].TypeVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 249:
+#line 2476 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.FunctionVal = yyvsp[-1].FunctionVal;
     CHECK_FOR_ERROR
-    Value* tmpVal = getVal(Type::Int1Ty, (yyvsp[-6].ValIDVal));
+  ;
+    break;}
+case 250:
+#line 2480 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ // Do not allow functions with 0 basic blocks   
+    yyval.FunctionVal = yyvsp[-1].FunctionVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 251:
+#line 2489 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    setValueName(yyvsp[0].TermInstVal, yyvsp[-1].StrVal);
     CHECK_FOR_ERROR
-    (yyval.TermInstVal) = new BranchInst(tmpBBA, tmpBBB, tmpVal);
-  ;}
-    break;
-
-  case 259:
-#line 2540 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    Value* tmpVal = getVal((yyvsp[-7].PrimType), (yyvsp[-6].ValIDVal));
+    InsertValue(yyvsp[0].TermInstVal);
+    yyvsp[-2].BasicBlockVal->getInstList().push_back(yyvsp[0].TermInstVal);
+    yyval.BasicBlockVal = yyvsp[-2].BasicBlockVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 252:
+#line 2498 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (CastInst *CI1 = dyn_cast<CastInst>(yyvsp[0].InstVal))
+      if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
+        if (CI2->getParent() == 0)
+          yyvsp[-1].BasicBlockVal->getInstList().push_back(CI2);
+    yyvsp[-1].BasicBlockVal->getInstList().push_back(yyvsp[0].InstVal);
+    yyval.BasicBlockVal = yyvsp[-1].BasicBlockVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 253:
+#line 2507 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{          // Empty space between instruction lists
+    yyval.BasicBlockVal = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 254:
+#line 2511 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{             // Labelled (named) basic block
+    yyval.BasicBlockVal = defineBBVal(ValID::createLocalName(*yyvsp[0].StrVal));
+    delete yyvsp[0].StrVal;
+    CHECK_FOR_ERROR
+
+  ;
+    break;}
+case 255:
+#line 2518 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{              // Return with a result...
+    yyval.TermInstVal = new ReturnInst(yyvsp[0].ValueVal);
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 256:
+#line 2522 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                                    // Return with no result...
+    yyval.TermInstVal = new ReturnInst();
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 257:
+#line 2526 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                           // Unconditional Branch...
+    BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal);
+    CHECK_FOR_ERROR
+    yyval.TermInstVal = new BranchInst(tmpBB);
+  ;
+    break;}
+case 258:
+#line 2531 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{  
+    assert(cast<IntegerType>(yyvsp[-7].PrimType)->getBitWidth() == 1 && "Not Bool?");
+    BasicBlock* tmpBBA = getBBVal(yyvsp[-3].ValIDVal);
+    CHECK_FOR_ERROR
+    BasicBlock* tmpBBB = getBBVal(yyvsp[0].ValIDVal);
+    CHECK_FOR_ERROR
+    Value* tmpVal = getVal(Type::Int1Ty, yyvsp[-6].ValIDVal);
+    CHECK_FOR_ERROR
+    yyval.TermInstVal = new BranchInst(tmpBBA, tmpBBB, tmpVal);
+  ;
+    break;}
+case 259:
+#line 2541 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    Value* tmpVal = getVal(yyvsp[-7].PrimType, yyvsp[-6].ValIDVal);
     CHECK_FOR_ERROR
-    BasicBlock* tmpBB = getBBVal((yyvsp[-3].ValIDVal));
+    BasicBlock* tmpBB = getBBVal(yyvsp[-3].ValIDVal);
     CHECK_FOR_ERROR
-    SwitchInst *S = new SwitchInst(tmpVal, tmpBB, (yyvsp[-1].JumpTable)->size());
-    (yyval.TermInstVal) = S;
+    SwitchInst *S = new SwitchInst(tmpVal, tmpBB, yyvsp[-1].JumpTable->size());
+    yyval.TermInstVal = S;
 
-    std::vector<std::pair<Constant*,BasicBlock*> >::iterator I = (yyvsp[-1].JumpTable)->begin(),
-      E = (yyvsp[-1].JumpTable)->end();
+    std::vector<std::pair<Constant*,BasicBlock*> >::iterator I = yyvsp[-1].JumpTable->begin(),
+      E = yyvsp[-1].JumpTable->end();
     for (; I != E; ++I) {
       if (ConstantInt *CI = dyn_cast<ConstantInt>(I->first))
           S->addCase(CI, I->second);
       else
         GEN_ERROR("Switch case is constant, but not a simple integer");
     }
-    delete (yyvsp[-1].JumpTable);
+    delete yyvsp[-1].JumpTable;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 260:
-#line 2559 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    Value* tmpVal = getVal((yyvsp[-6].PrimType), (yyvsp[-5].ValIDVal));
+  ;
+    break;}
+case 260:
+#line 2560 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    Value* tmpVal = getVal(yyvsp[-6].PrimType, yyvsp[-5].ValIDVal);
     CHECK_FOR_ERROR
-    BasicBlock* tmpBB = getBBVal((yyvsp[-2].ValIDVal));
+    BasicBlock* tmpBB = getBBVal(yyvsp[-2].ValIDVal);
     CHECK_FOR_ERROR
     SwitchInst *S = new SwitchInst(tmpVal, tmpBB, 0);
-    (yyval.TermInstVal) = S;
+    yyval.TermInstVal = S;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 261:
-#line 2569 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 261:
+#line 2570 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
 
     // Handle the short syntax
     const PointerType *PFTy = 0;
     const FunctionType *Ty = 0;
-    if (!(PFTy = dyn_cast<PointerType>((yyvsp[-11].TypeVal)->get())) ||
+    if (!(PFTy = dyn_cast<PointerType>(yyvsp[-11].TypeVal->get())) ||
         !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
       // Pull out the types of all of the arguments...
       std::vector<const Type*> ParamTypes;
       ParamAttrsVector Attrs;
-      if ((yyvsp[-6].ParamAttrs) != ParamAttr::None) {
-        ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = (yyvsp[-6].ParamAttrs);
+      if (yyvsp[-6].ParamAttrs != ParamAttr::None) {
+        ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = yyvsp[-6].ParamAttrs;
         Attrs.push_back(PAWI);
       }
-      ValueRefList::iterator I = (yyvsp[-8].ValueRefList)->begin(), E = (yyvsp[-8].ValueRefList)->end();
+      ValueRefList::iterator I = yyvsp[-8].ValueRefList->begin(), E = yyvsp[-8].ValueRefList->end();
       unsigned index = 1;
       for (; I != E; ++I, ++index) {
         const Type *Ty = I->Val->getType();
@@ -5276,22 +4428,22 @@
       ParamAttrsList *PAL = 0;
       if (!Attrs.empty())
         PAL = ParamAttrsList::get(Attrs);
-      Ty = FunctionType::get((yyvsp[-11].TypeVal)->get(), ParamTypes, false, PAL);
+      Ty = FunctionType::get(yyvsp[-11].TypeVal->get(), ParamTypes, false, PAL);
       PFTy = PointerType::get(Ty);
     }
 
-    delete (yyvsp[-11].TypeVal);
+    delete yyvsp[-11].TypeVal;
 
-    Value *V = getVal(PFTy, (yyvsp[-10].ValIDVal));   // Get the function we're calling...
+    Value *V = getVal(PFTy, yyvsp[-10].ValIDVal);   // Get the function we're calling...
     CHECK_FOR_ERROR
-    BasicBlock *Normal = getBBVal((yyvsp[-3].ValIDVal));
+    BasicBlock *Normal = getBBVal(yyvsp[-3].ValIDVal);
     CHECK_FOR_ERROR
-    BasicBlock *Except = getBBVal((yyvsp[0].ValIDVal));
+    BasicBlock *Except = getBBVal(yyvsp[0].ValIDVal);
     CHECK_FOR_ERROR
 
     // Check the arguments
     ValueList Args;
-    if ((yyvsp[-8].ValueRefList)->empty()) {                                   // Has no arguments?
+    if (yyvsp[-8].ValueRefList->empty()) {                                   // Has no arguments?
       // Make sure no arguments is a good thing!
       if (Ty->getNumParams() != 0)
         GEN_ERROR("No arguments passed to a function that "
@@ -5301,7 +4453,7 @@
       // correctly!
       FunctionType::param_iterator I = Ty->param_begin();
       FunctionType::param_iterator E = Ty->param_end();
-      ValueRefList::iterator ArgI = (yyvsp[-8].ValueRefList)->begin(), ArgE = (yyvsp[-8].ValueRefList)->end();
+      ValueRefList::iterator ArgI = yyvsp[-8].ValueRefList->begin(), ArgE = yyvsp[-8].ValueRefList->end();
 
       for (; ArgI != ArgE && I != E; ++ArgI, ++I) {
         if (ArgI->Val->getType() != *I)
@@ -5320,348 +4472,322 @@
 
     // Create the InvokeInst
     InvokeInst *II = new InvokeInst(V, Normal, Except, &Args[0], Args.size());
-    II->setCallingConv((yyvsp[-12].UIntVal));
-    (yyval.TermInstVal) = II;
-    delete (yyvsp[-8].ValueRefList);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 262:
-#line 2648 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.TermInstVal) = new UnwindInst();
+    II->setCallingConv(yyvsp[-12].UIntVal);
+    yyval.TermInstVal = II;
+    delete yyvsp[-8].ValueRefList;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 262:
+#line 2649 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.TermInstVal = new UnwindInst();
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 263:
-#line 2652 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.TermInstVal) = new UnreachableInst();
+  ;
+    break;}
+case 263:
+#line 2653 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.TermInstVal = new UnreachableInst();
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 264:
-#line 2659 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.JumpTable) = (yyvsp[-5].JumpTable);
-    Constant *V = cast<Constant>(getExistingVal((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
+  ;
+    break;}
+case 264:
+#line 2660 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.JumpTable = yyvsp[-5].JumpTable;
+    Constant *V = cast<Constant>(getExistingVal(yyvsp[-4].PrimType, yyvsp[-3].ValIDVal));
     CHECK_FOR_ERROR
     if (V == 0)
       GEN_ERROR("May only switch on a constant pool value");
 
-    BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
+    BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal);
     CHECK_FOR_ERROR
-    (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB));
-  ;}
-    break;
-
-  case 265:
-#line 2670 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
-    Constant *V = cast<Constant>(getExistingVal((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
+    yyval.JumpTable->push_back(std::make_pair(V, tmpBB));
+  ;
+    break;}
+case 265:
+#line 2671 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.JumpTable = new std::vector<std::pair<Constant*, BasicBlock*> >();
+    Constant *V = cast<Constant>(getExistingVal(yyvsp[-4].PrimType, yyvsp[-3].ValIDVal));
     CHECK_FOR_ERROR
 
     if (V == 0)
       GEN_ERROR("May only switch on a constant pool value");
 
-    BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
+    BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal);
     CHECK_FOR_ERROR
-    (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB)); 
-  ;}
-    break;
-
-  case 266:
-#line 2683 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+    yyval.JumpTable->push_back(std::make_pair(V, tmpBB)); 
+  ;
+    break;}
+case 266:
+#line 2684 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     // Is this definition named?? if so, assign the name...
-    setValueName((yyvsp[0].InstVal), (yyvsp[-1].StrVal));
+    setValueName(yyvsp[0].InstVal, yyvsp[-1].StrVal);
     CHECK_FOR_ERROR
-    InsertValue((yyvsp[0].InstVal));
-    (yyval.InstVal) = (yyvsp[0].InstVal);
+    InsertValue(yyvsp[0].InstVal);
+    yyval.InstVal = yyvsp[0].InstVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 267:
-#line 2693 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {    // Used for PHI nodes
+  ;
+    break;}
+case 267:
+#line 2694 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{    // Used for PHI nodes
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-5].TypeVal))->getDescription());
-    (yyval.PHIList) = new std::list<std::pair<Value*, BasicBlock*> >();
-    Value* tmpVal = getVal(*(yyvsp[-5].TypeVal), (yyvsp[-3].ValIDVal));
-    CHECK_FOR_ERROR
-    BasicBlock* tmpBB = getBBVal((yyvsp[-1].ValIDVal));
-    CHECK_FOR_ERROR
-    (yyval.PHIList)->push_back(std::make_pair(tmpVal, tmpBB));
-    delete (yyvsp[-5].TypeVal);
-  ;}
-    break;
-
-  case 268:
-#line 2704 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.PHIList) = (yyvsp[-6].PHIList);
-    Value* tmpVal = getVal((yyvsp[-6].PHIList)->front().first->getType(), (yyvsp[-3].ValIDVal));
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-5].TypeVal)->getDescription());
+    yyval.PHIList = new std::list<std::pair<Value*, BasicBlock*> >();
+    Value* tmpVal = getVal(*yyvsp[-5].TypeVal, yyvsp[-3].ValIDVal);
+    CHECK_FOR_ERROR
+    BasicBlock* tmpBB = getBBVal(yyvsp[-1].ValIDVal);
+    CHECK_FOR_ERROR
+    yyval.PHIList->push_back(std::make_pair(tmpVal, tmpBB));
+    delete yyvsp[-5].TypeVal;
+  ;
+    break;}
+case 268:
+#line 2705 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.PHIList = yyvsp[-6].PHIList;
+    Value* tmpVal = getVal(yyvsp[-6].PHIList->front().first->getType(), yyvsp[-3].ValIDVal);
     CHECK_FOR_ERROR
-    BasicBlock* tmpBB = getBBVal((yyvsp[-1].ValIDVal));
+    BasicBlock* tmpBB = getBBVal(yyvsp[-1].ValIDVal);
     CHECK_FOR_ERROR
-    (yyvsp[-6].PHIList)->push_back(std::make_pair(tmpVal, tmpBB));
-  ;}
-    break;
-
-  case 269:
-#line 2714 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {    
+    yyvsp[-6].PHIList->push_back(std::make_pair(tmpVal, tmpBB));
+  ;
+    break;}
+case 269:
+#line 2715 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{    
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
     // Used for call and invoke instructions
-    (yyval.ValueRefList) = new ValueRefList();
-    ValueRefListEntry E; E.Attrs = (yyvsp[0].ParamAttrs); E.Val = getVal((yyvsp[-2].TypeVal)->get(), (yyvsp[-1].ValIDVal));
-    (yyval.ValueRefList)->push_back(E);
-    delete (yyvsp[-2].TypeVal);
-  ;}
-    break;
-
-  case 270:
-#line 2723 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+    yyval.ValueRefList = new ValueRefList();
+    ValueRefListEntry E; E.Attrs = yyvsp[0].ParamAttrs; E.Val = getVal(yyvsp[-2].TypeVal->get(), yyvsp[-1].ValIDVal);
+    yyval.ValueRefList->push_back(E);
+    delete yyvsp[-2].TypeVal;
+  ;
+    break;}
+case 270:
+#line 2724 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
-    (yyval.ValueRefList) = (yyvsp[-4].ValueRefList);
-    ValueRefListEntry E; E.Attrs = (yyvsp[0].ParamAttrs); E.Val = getVal((yyvsp[-2].TypeVal)->get(), (yyvsp[-1].ValIDVal));
-    (yyval.ValueRefList)->push_back(E);
-    delete (yyvsp[-2].TypeVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 271:
-#line 2732 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ValueRefList) = new ValueRefList(); ;}
-    break;
-
-  case 272:
-#line 2735 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ValueList) = new std::vector<Value*>(); ;}
-    break;
-
-  case 273:
-#line 2736 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ValueList) = (yyvsp[-2].ValueList);
-    (yyval.ValueList)->push_back((yyvsp[0].ValueVal));
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
+    yyval.ValueRefList = yyvsp[-4].ValueRefList;
+    ValueRefListEntry E; E.Attrs = yyvsp[0].ParamAttrs; E.Val = getVal(yyvsp[-2].TypeVal->get(), yyvsp[-1].ValIDVal);
+    yyval.ValueRefList->push_back(E);
+    delete yyvsp[-2].TypeVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 271:
+#line 2733 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.ValueRefList = new ValueRefList(); ;
+    break;}
+case 272:
+#line 2736 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.ValueList = new std::vector<Value*>(); ;
+    break;}
+case 273:
+#line 2737 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ValueList = yyvsp[-2].ValueList;
+    yyval.ValueList->push_back(yyvsp[0].ValueVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 274:
-#line 2743 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.BoolVal) = true;
+  ;
+    break;}
+case 274:
+#line 2744 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.BoolVal = true;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 275:
-#line 2747 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.BoolVal) = false;
+  ;
+    break;}
+case 275:
+#line 2748 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.BoolVal = false;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 276:
-#line 2752 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 276:
+#line 2753 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
-    if (!(*(yyvsp[-3].TypeVal))->isInteger() && !(*(yyvsp[-3].TypeVal))->isFloatingPoint() && 
-        !isa<VectorType>((*(yyvsp[-3].TypeVal)).get()))
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
+    if (!(*yyvsp[-3].TypeVal)->isInteger() && !(*yyvsp[-3].TypeVal)->isFloatingPoint() && 
+        !isa<VectorType>((*yyvsp[-3].TypeVal).get()))
       GEN_ERROR(
         "Arithmetic operator requires integer, FP, or packed operands");
-    if (isa<VectorType>((*(yyvsp[-3].TypeVal)).get()) && 
-        ((yyvsp[-4].BinaryOpVal) == Instruction::URem || 
-         (yyvsp[-4].BinaryOpVal) == Instruction::SRem ||
-         (yyvsp[-4].BinaryOpVal) == Instruction::FRem))
+    if (isa<VectorType>((*yyvsp[-3].TypeVal).get()) && 
+        (yyvsp[-4].BinaryOpVal == Instruction::URem || 
+         yyvsp[-4].BinaryOpVal == Instruction::SRem ||
+         yyvsp[-4].BinaryOpVal == Instruction::FRem))
       GEN_ERROR("Remainder not supported on vector types");
-    Value* val1 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[-2].ValIDVal)); 
+    Value* val1 = getVal(*yyvsp[-3].TypeVal, yyvsp[-2].ValIDVal); 
     CHECK_FOR_ERROR
-    Value* val2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal));
+    Value* val2 = getVal(*yyvsp[-3].TypeVal, yyvsp[0].ValIDVal);
     CHECK_FOR_ERROR
-    (yyval.InstVal) = BinaryOperator::create((yyvsp[-4].BinaryOpVal), val1, val2);
-    if ((yyval.InstVal) == 0)
+    yyval.InstVal = BinaryOperator::create(yyvsp[-4].BinaryOpVal, val1, val2);
+    if (yyval.InstVal == 0)
       GEN_ERROR("binary operator returned null");
-    delete (yyvsp[-3].TypeVal);
-  ;}
-    break;
-
-  case 277:
-#line 2773 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+    delete yyvsp[-3].TypeVal;
+  ;
+    break;}
+case 277:
+#line 2774 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
-    if (!(*(yyvsp[-3].TypeVal))->isInteger()) {
-      if (Instruction::isShift((yyvsp[-4].BinaryOpVal)) || !isa<VectorType>((yyvsp[-3].TypeVal)->get()) ||
-          !cast<VectorType>((yyvsp[-3].TypeVal)->get())->getElementType()->isInteger())
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
+    if (!(*yyvsp[-3].TypeVal)->isInteger()) {
+      if (Instruction::isShift(yyvsp[-4].BinaryOpVal) || !isa<VectorType>(yyvsp[-3].TypeVal->get()) ||
+          !cast<VectorType>(yyvsp[-3].TypeVal->get())->getElementType()->isInteger())
         GEN_ERROR("Logical operator requires integral operands");
     }
-    Value* tmpVal1 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[-2].ValIDVal));
+    Value* tmpVal1 = getVal(*yyvsp[-3].TypeVal, yyvsp[-2].ValIDVal);
     CHECK_FOR_ERROR
-    Value* tmpVal2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal));
+    Value* tmpVal2 = getVal(*yyvsp[-3].TypeVal, yyvsp[0].ValIDVal);
     CHECK_FOR_ERROR
-    (yyval.InstVal) = BinaryOperator::create((yyvsp[-4].BinaryOpVal), tmpVal1, tmpVal2);
-    if ((yyval.InstVal) == 0)
+    yyval.InstVal = BinaryOperator::create(yyvsp[-4].BinaryOpVal, tmpVal1, tmpVal2);
+    if (yyval.InstVal == 0)
       GEN_ERROR("binary operator returned null");
-    delete (yyvsp[-3].TypeVal);
-  ;}
-    break;
-
-  case 278:
-#line 2790 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+    delete yyvsp[-3].TypeVal;
+  ;
+    break;}
+case 278:
+#line 2791 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
-    if (isa<VectorType>((*(yyvsp[-3].TypeVal)).get()))
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
+    if (isa<VectorType>((*yyvsp[-3].TypeVal).get()))
       GEN_ERROR("Vector types not supported by icmp instruction");
-    Value* tmpVal1 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[-2].ValIDVal));
+    Value* tmpVal1 = getVal(*yyvsp[-3].TypeVal, yyvsp[-2].ValIDVal);
     CHECK_FOR_ERROR
-    Value* tmpVal2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal));
+    Value* tmpVal2 = getVal(*yyvsp[-3].TypeVal, yyvsp[0].ValIDVal);
     CHECK_FOR_ERROR
-    (yyval.InstVal) = CmpInst::create((yyvsp[-5].OtherOpVal), (yyvsp[-4].IPredicate), tmpVal1, tmpVal2);
-    if ((yyval.InstVal) == 0)
+    yyval.InstVal = CmpInst::create(yyvsp[-5].OtherOpVal, yyvsp[-4].IPredicate, tmpVal1, tmpVal2);
+    if (yyval.InstVal == 0)
       GEN_ERROR("icmp operator returned null");
-    delete (yyvsp[-3].TypeVal);
-  ;}
-    break;
-
-  case 279:
-#line 2804 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+    delete yyvsp[-3].TypeVal;
+  ;
+    break;}
+case 279:
+#line 2805 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
-    if (isa<VectorType>((*(yyvsp[-3].TypeVal)).get()))
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
+    if (isa<VectorType>((*yyvsp[-3].TypeVal).get()))
       GEN_ERROR("Vector types not supported by fcmp instruction");
-    Value* tmpVal1 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[-2].ValIDVal));
+    Value* tmpVal1 = getVal(*yyvsp[-3].TypeVal, yyvsp[-2].ValIDVal);
     CHECK_FOR_ERROR
-    Value* tmpVal2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal));
+    Value* tmpVal2 = getVal(*yyvsp[-3].TypeVal, yyvsp[0].ValIDVal);
     CHECK_FOR_ERROR
-    (yyval.InstVal) = CmpInst::create((yyvsp[-5].OtherOpVal), (yyvsp[-4].FPredicate), tmpVal1, tmpVal2);
-    if ((yyval.InstVal) == 0)
+    yyval.InstVal = CmpInst::create(yyvsp[-5].OtherOpVal, yyvsp[-4].FPredicate, tmpVal1, tmpVal2);
+    if (yyval.InstVal == 0)
       GEN_ERROR("fcmp operator returned null");
-    delete (yyvsp[-3].TypeVal);
-  ;}
-    break;
-
-  case 280:
-#line 2818 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+    delete yyvsp[-3].TypeVal;
+  ;
+    break;}
+case 280:
+#line 2819 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
-    Value* Val = (yyvsp[-2].ValueVal);
-    const Type* DestTy = (yyvsp[0].TypeVal)->get();
-    if (!CastInst::castIsValid((yyvsp[-3].CastOpVal), Val, DestTy))
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
+    Value* Val = yyvsp[-2].ValueVal;
+    const Type* DestTy = yyvsp[0].TypeVal->get();
+    if (!CastInst::castIsValid(yyvsp[-3].CastOpVal, Val, DestTy))
       GEN_ERROR("invalid cast opcode for cast from '" +
                 Val->getType()->getDescription() + "' to '" +
                 DestTy->getDescription() + "'"); 
-    (yyval.InstVal) = CastInst::create((yyvsp[-3].CastOpVal), Val, DestTy);
-    delete (yyvsp[0].TypeVal);
-  ;}
-    break;
-
-  case 281:
-#line 2830 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    if ((yyvsp[-4].ValueVal)->getType() != Type::Int1Ty)
+    yyval.InstVal = CastInst::create(yyvsp[-3].CastOpVal, Val, DestTy);
+    delete yyvsp[0].TypeVal;
+  ;
+    break;}
+case 281:
+#line 2831 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (yyvsp[-4].ValueVal->getType() != Type::Int1Ty)
       GEN_ERROR("select condition must be boolean");
-    if ((yyvsp[-2].ValueVal)->getType() != (yyvsp[0].ValueVal)->getType())
+    if (yyvsp[-2].ValueVal->getType() != yyvsp[0].ValueVal->getType())
       GEN_ERROR("select value types should match");
-    (yyval.InstVal) = new SelectInst((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal));
+    yyval.InstVal = new SelectInst(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 282:
-#line 2838 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 282:
+#line 2839 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
-    (yyval.InstVal) = new VAArgInst((yyvsp[-2].ValueVal), *(yyvsp[0].TypeVal));
-    delete (yyvsp[0].TypeVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 283:
-#line 2845 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (!ExtractElementInst::isValidOperands((yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
+    yyval.InstVal = new VAArgInst(yyvsp[-2].ValueVal, *yyvsp[0].TypeVal);
+    delete yyvsp[0].TypeVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 283:
+#line 2846 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!ExtractElementInst::isValidOperands(yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
       GEN_ERROR("Invalid extractelement operands");
-    (yyval.InstVal) = new ExtractElementInst((yyvsp[-2].ValueVal), (yyvsp[0].ValueVal));
+    yyval.InstVal = new ExtractElementInst(yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 284:
-#line 2851 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (!InsertElementInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
+  ;
+    break;}
+case 284:
+#line 2852 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!InsertElementInst::isValidOperands(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
       GEN_ERROR("Invalid insertelement operands");
-    (yyval.InstVal) = new InsertElementInst((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal));
+    yyval.InstVal = new InsertElementInst(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 285:
-#line 2857 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (!ShuffleVectorInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
+  ;
+    break;}
+case 285:
+#line 2858 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!ShuffleVectorInst::isValidOperands(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
       GEN_ERROR("Invalid shufflevector operands");
-    (yyval.InstVal) = new ShuffleVectorInst((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal));
+    yyval.InstVal = new ShuffleVectorInst(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 286:
-#line 2863 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    const Type *Ty = (yyvsp[0].PHIList)->front().first->getType();
+  ;
+    break;}
+case 286:
+#line 2864 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    const Type *Ty = yyvsp[0].PHIList->front().first->getType();
     if (!Ty->isFirstClassType())
       GEN_ERROR("PHI node operands must be of first class type");
-    (yyval.InstVal) = new PHINode(Ty);
-    ((PHINode*)(yyval.InstVal))->reserveOperandSpace((yyvsp[0].PHIList)->size());
-    while ((yyvsp[0].PHIList)->begin() != (yyvsp[0].PHIList)->end()) {
-      if ((yyvsp[0].PHIList)->front().first->getType() != Ty) 
+    yyval.InstVal = new PHINode(Ty);
+    ((PHINode*)yyval.InstVal)->reserveOperandSpace(yyvsp[0].PHIList->size());
+    while (yyvsp[0].PHIList->begin() != yyvsp[0].PHIList->end()) {
+      if (yyvsp[0].PHIList->front().first->getType() != Ty) 
         GEN_ERROR("All elements of a PHI node must be of the same type");
-      cast<PHINode>((yyval.InstVal))->addIncoming((yyvsp[0].PHIList)->front().first, (yyvsp[0].PHIList)->front().second);
-      (yyvsp[0].PHIList)->pop_front();
+      cast<PHINode>(yyval.InstVal)->addIncoming(yyvsp[0].PHIList->front().first, yyvsp[0].PHIList->front().second);
+      yyvsp[0].PHIList->pop_front();
     }
-    delete (yyvsp[0].PHIList);  // Free the list...
+    delete yyvsp[0].PHIList;  // Free the list...
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 287:
-#line 2879 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 287:
+#line 2880 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
 
     // Handle the short syntax
     const PointerType *PFTy = 0;
     const FunctionType *Ty = 0;
-    if (!(PFTy = dyn_cast<PointerType>((yyvsp[-5].TypeVal)->get())) ||
+    if (!(PFTy = dyn_cast<PointerType>(yyvsp[-5].TypeVal->get())) ||
         !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
       // Pull out the types of all of the arguments...
       std::vector<const Type*> ParamTypes;
       ParamAttrsVector Attrs;
-      if ((yyvsp[0].ParamAttrs) != ParamAttr::None) {
-        ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = (yyvsp[0].ParamAttrs);
+      if (yyvsp[0].ParamAttrs != ParamAttr::None) {
+        ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = yyvsp[0].ParamAttrs;
         Attrs.push_back(PAWI);
       }
       unsigned index = 1;
-      ValueRefList::iterator I = (yyvsp[-2].ValueRefList)->begin(), E = (yyvsp[-2].ValueRefList)->end();
+      ValueRefList::iterator I = yyvsp[-2].ValueRefList->begin(), E = yyvsp[-2].ValueRefList->end();
       for (; I != E; ++I, ++index) {
         const Type *Ty = I->Val->getType();
         if (Ty == Type::VoidTy)
@@ -5677,11 +4803,11 @@
       if (!Attrs.empty())
         PAL = ParamAttrsList::get(Attrs);
 
-      Ty = FunctionType::get((yyvsp[-5].TypeVal)->get(), ParamTypes, false, PAL);
+      Ty = FunctionType::get(yyvsp[-5].TypeVal->get(), ParamTypes, false, PAL);
       PFTy = PointerType::get(Ty);
     }
 
-    Value *V = getVal(PFTy, (yyvsp[-4].ValIDVal));   // Get the function we're calling...
+    Value *V = getVal(PFTy, yyvsp[-4].ValIDVal);   // Get the function we're calling...
     CHECK_FOR_ERROR
 
     // Check for call to invalid intrinsic to avoid crashing later.
@@ -5695,7 +4821,7 @@
 
     // Check the arguments 
     ValueList Args;
-    if ((yyvsp[-2].ValueRefList)->empty()) {                                   // Has no arguments?
+    if (yyvsp[-2].ValueRefList->empty()) {                                   // Has no arguments?
       // Make sure no arguments is a good thing!
       if (Ty->getNumParams() != 0)
         GEN_ERROR("No arguments passed to a function that "
@@ -5706,7 +4832,7 @@
       //
       FunctionType::param_iterator I = Ty->param_begin();
       FunctionType::param_iterator E = Ty->param_end();
-      ValueRefList::iterator ArgI = (yyvsp[-2].ValueRefList)->begin(), ArgE = (yyvsp[-2].ValueRefList)->end();
+      ValueRefList::iterator ArgI = yyvsp[-2].ValueRefList->begin(), ArgE = yyvsp[-2].ValueRefList->end();
 
       for (; ArgI != ArgE && I != E; ++ArgI, ++I) {
         if (ArgI->Val->getType() != *I)
@@ -5723,428 +4849,365 @@
     }
     // Create the call node
     CallInst *CI = new CallInst(V, &Args[0], Args.size());
-    CI->setTailCall((yyvsp[-7].BoolVal));
-    CI->setCallingConv((yyvsp[-6].UIntVal));
-    (yyval.InstVal) = CI;
-    delete (yyvsp[-2].ValueRefList);
-    delete (yyvsp[-5].TypeVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 288:
-#line 2963 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.InstVal) = (yyvsp[0].InstVal);
+    CI->setTailCall(yyvsp[-7].BoolVal);
+    CI->setCallingConv(yyvsp[-6].UIntVal);
+    yyval.InstVal = CI;
+    delete yyvsp[-2].ValueRefList;
+    delete yyvsp[-5].TypeVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 288:
+#line 2964 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.InstVal = yyvsp[0].InstVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 289:
-#line 2968 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.BoolVal) = true;
+  ;
+    break;}
+case 289:
+#line 2969 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.BoolVal = true;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 290:
-#line 2972 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.BoolVal) = false;
+  ;
+    break;}
+case 290:
+#line 2973 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.BoolVal = false;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 291:
-#line 2979 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 291:
+#line 2980 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
-    (yyval.InstVal) = new MallocInst(*(yyvsp[-1].TypeVal), 0, (yyvsp[0].UIntVal));
-    delete (yyvsp[-1].TypeVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 292:
-#line 2986 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
+    yyval.InstVal = new MallocInst(*yyvsp[-1].TypeVal, 0, yyvsp[0].UIntVal);
+    delete yyvsp[-1].TypeVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 292:
+#line 2987 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
-    Value* tmpVal = getVal((yyvsp[-2].PrimType), (yyvsp[-1].ValIDVal));
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-4].TypeVal)->getDescription());
+    Value* tmpVal = getVal(yyvsp[-2].PrimType, yyvsp[-1].ValIDVal);
     CHECK_FOR_ERROR
-    (yyval.InstVal) = new MallocInst(*(yyvsp[-4].TypeVal), tmpVal, (yyvsp[0].UIntVal));
-    delete (yyvsp[-4].TypeVal);
-  ;}
-    break;
-
-  case 293:
-#line 2994 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+    yyval.InstVal = new MallocInst(*yyvsp[-4].TypeVal, tmpVal, yyvsp[0].UIntVal);
+    delete yyvsp[-4].TypeVal;
+  ;
+    break;}
+case 293:
+#line 2995 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
-    (yyval.InstVal) = new AllocaInst(*(yyvsp[-1].TypeVal), 0, (yyvsp[0].UIntVal));
-    delete (yyvsp[-1].TypeVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 294:
-#line 3001 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
+    yyval.InstVal = new AllocaInst(*yyvsp[-1].TypeVal, 0, yyvsp[0].UIntVal);
+    delete yyvsp[-1].TypeVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 294:
+#line 3002 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
-    Value* tmpVal = getVal((yyvsp[-2].PrimType), (yyvsp[-1].ValIDVal));
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-4].TypeVal)->getDescription());
+    Value* tmpVal = getVal(yyvsp[-2].PrimType, yyvsp[-1].ValIDVal);
     CHECK_FOR_ERROR
-    (yyval.InstVal) = new AllocaInst(*(yyvsp[-4].TypeVal), tmpVal, (yyvsp[0].UIntVal));
-    delete (yyvsp[-4].TypeVal);
-  ;}
-    break;
-
-  case 295:
-#line 3009 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (!isa<PointerType>((yyvsp[0].ValueVal)->getType()))
+    yyval.InstVal = new AllocaInst(*yyvsp[-4].TypeVal, tmpVal, yyvsp[0].UIntVal);
+    delete yyvsp[-4].TypeVal;
+  ;
+    break;}
+case 295:
+#line 3010 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!isa<PointerType>(yyvsp[0].ValueVal->getType()))
       GEN_ERROR("Trying to free nonpointer type " + 
-                     (yyvsp[0].ValueVal)->getType()->getDescription() + "");
-    (yyval.InstVal) = new FreeInst((yyvsp[0].ValueVal));
+                     yyvsp[0].ValueVal->getType()->getDescription() + "");
+    yyval.InstVal = new FreeInst(yyvsp[0].ValueVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 296:
-#line 3017 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 296:
+#line 3018 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
-    if (!isa<PointerType>((yyvsp[-2].TypeVal)->get()))
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
+    if (!isa<PointerType>(yyvsp[-2].TypeVal->get()))
       GEN_ERROR("Can't load from nonpointer type: " +
-                     (*(yyvsp[-2].TypeVal))->getDescription());
-    if (!cast<PointerType>((yyvsp[-2].TypeVal)->get())->getElementType()->isFirstClassType())
+                     (*yyvsp[-2].TypeVal)->getDescription());
+    if (!cast<PointerType>(yyvsp[-2].TypeVal->get())->getElementType()->isFirstClassType())
       GEN_ERROR("Can't load from pointer of non-first-class type: " +
-                     (*(yyvsp[-2].TypeVal))->getDescription());
-    Value* tmpVal = getVal(*(yyvsp[-2].TypeVal), (yyvsp[-1].ValIDVal));
+                     (*yyvsp[-2].TypeVal)->getDescription());
+    Value* tmpVal = getVal(*yyvsp[-2].TypeVal, yyvsp[-1].ValIDVal);
     CHECK_FOR_ERROR
-    (yyval.InstVal) = new LoadInst(tmpVal, "", (yyvsp[-4].BoolVal), (yyvsp[0].UIntVal));
-    delete (yyvsp[-2].TypeVal);
-  ;}
-    break;
-
-  case 297:
-#line 3031 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+    yyval.InstVal = new LoadInst(tmpVal, "", yyvsp[-4].BoolVal, yyvsp[0].UIntVal);
+    delete yyvsp[-2].TypeVal;
+  ;
+    break;}
+case 297:
+#line 3032 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
-    const PointerType *PT = dyn_cast<PointerType>((yyvsp[-2].TypeVal)->get());
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
+    const PointerType *PT = dyn_cast<PointerType>(yyvsp[-2].TypeVal->get());
     if (!PT)
       GEN_ERROR("Can't store to a nonpointer type: " +
-                     (*(yyvsp[-2].TypeVal))->getDescription());
+                     (*yyvsp[-2].TypeVal)->getDescription());
     const Type *ElTy = PT->getElementType();
-    if (ElTy != (yyvsp[-4].ValueVal)->getType())
-      GEN_ERROR("Can't store '" + (yyvsp[-4].ValueVal)->getType()->getDescription() +
+    if (ElTy != yyvsp[-4].ValueVal->getType())
+      GEN_ERROR("Can't store '" + yyvsp[-4].ValueVal->getType()->getDescription() +
                      "' into space of type '" + ElTy->getDescription() + "'");
 
-    Value* tmpVal = getVal(*(yyvsp[-2].TypeVal), (yyvsp[-1].ValIDVal));
+    Value* tmpVal = getVal(*yyvsp[-2].TypeVal, yyvsp[-1].ValIDVal);
     CHECK_FOR_ERROR
-    (yyval.InstVal) = new StoreInst((yyvsp[-4].ValueVal), tmpVal, (yyvsp[-6].BoolVal), (yyvsp[0].UIntVal));
-    delete (yyvsp[-2].TypeVal);
-  ;}
-    break;
-
-  case 298:
-#line 3048 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-    {
+    yyval.InstVal = new StoreInst(yyvsp[-4].ValueVal, tmpVal, yyvsp[-6].BoolVal, yyvsp[0].UIntVal);
+    delete yyvsp[-2].TypeVal;
+  ;
+    break;}
+case 298:
+#line 3049 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
-    if (!isa<PointerType>((yyvsp[-2].TypeVal)->get()))
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
+    if (!isa<PointerType>(yyvsp[-2].TypeVal->get()))
       GEN_ERROR("getelementptr insn requires pointer operand");
 
-    if (!GetElementPtrInst::getIndexedType(*(yyvsp[-2].TypeVal), &(*(yyvsp[0].ValueList))[0], (yyvsp[0].ValueList)->size(), true))
+    if (!GetElementPtrInst::getIndexedType(*yyvsp[-2].TypeVal, &(*yyvsp[0].ValueList)[0], yyvsp[0].ValueList->size(), true))
       GEN_ERROR("Invalid getelementptr indices for type '" +
-                     (*(yyvsp[-2].TypeVal))->getDescription()+ "'");
-    Value* tmpVal = getVal(*(yyvsp[-2].TypeVal), (yyvsp[-1].ValIDVal));
+                     (*yyvsp[-2].TypeVal)->getDescription()+ "'");
+    Value* tmpVal = getVal(*yyvsp[-2].TypeVal, yyvsp[-1].ValIDVal);
     CHECK_FOR_ERROR
-    (yyval.InstVal) = new GetElementPtrInst(tmpVal, &(*(yyvsp[0].ValueList))[0], (yyvsp[0].ValueList)->size());
-    delete (yyvsp[-2].TypeVal); 
-    delete (yyvsp[0].ValueList);
-  ;}
-    break;
-
-
-      default: break;
-    }
-
-/* Line 1126 of yacc.c.  */
-#line 5880 "llvmAsmParser.tab.c"
+    yyval.InstVal = new GetElementPtrInst(tmpVal, &(*yyvsp[0].ValueList)[0], yyvsp[0].ValueList->size());
+    delete yyvsp[-2].TypeVal; 
+    delete yyvsp[0].ValueList;
+  ;
+    break;}
+}
+   /* the action file gets copied in in place of this dollarsign */
+#line 543 "/usr/share/bison.simple"
 
   yyvsp -= yylen;
   yyssp -= yylen;
+#ifdef YYLSP_NEEDED
+  yylsp -= yylen;
+#endif
 
-
-  YY_STACK_PRINT (yyss, yyssp);
+#if YYDEBUG != 0
+  if (yydebug)
+    {
+      short *ssp1 = yyss - 1;
+      fprintf (stderr, "state stack now");
+      while (ssp1 != yyssp)
+	fprintf (stderr, " %d", *++ssp1);
+      fprintf (stderr, "\n");
+    }
+#endif
 
   *++yyvsp = yyval;
 
+#ifdef YYLSP_NEEDED
+  yylsp++;
+  if (yylen == 0)
+    {
+      yylsp->first_line = yylloc.first_line;
+      yylsp->first_column = yylloc.first_column;
+      yylsp->last_line = (yylsp-1)->last_line;
+      yylsp->last_column = (yylsp-1)->last_column;
+      yylsp->text = 0;
+    }
+  else
+    {
+      yylsp->last_line = (yylsp+yylen-1)->last_line;
+      yylsp->last_column = (yylsp+yylen-1)->last_column;
+    }
+#endif
 
-  /* Now `shift' the result of the reduction.  Determine what state
-     that goes to, based on the state we popped back to and the rule
-     number reduced by.  */
+  /* Now "shift" the result of the reduction.
+     Determine what state that goes to,
+     based on the state we popped back to
+     and the rule number reduced by.  */
 
   yyn = yyr1[yyn];
 
-  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
-  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
+  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
     yystate = yytable[yystate];
   else
-    yystate = yydefgoto[yyn - YYNTOKENS];
+    yystate = yydefgoto[yyn - YYNTBASE];
 
   goto yynewstate;
 
+yyerrlab:   /* here on detecting error */
 
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
-yyerrlab:
-  /* If not already recovering from an error, report this error.  */
-  if (!yyerrstatus)
+  if (! yyerrstatus)
+    /* If not already recovering from an error, report this error.  */
     {
       ++yynerrs;
-#if YYERROR_VERBOSE
+
+#ifdef YYERROR_VERBOSE
       yyn = yypact[yystate];
 
-      if (YYPACT_NINF < yyn && yyn < YYLAST)
+      if (yyn > YYFLAG && yyn < YYLAST)
 	{
-	  int yytype = YYTRANSLATE (yychar);
-	  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-	  YYSIZE_T yysize = yysize0;
-	  YYSIZE_T yysize1;
-	  int yysize_overflow = 0;
-	  char *yymsg = 0;
-#	  define YYERROR_VERBOSE_ARGS_MAXIMUM 5
-	  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-	  int yyx;
-
-#if 0
-	  /* This is so xgettext sees the translatable formats that are
-	     constructed on the fly.  */
-	  YY_("syntax error, unexpected %s");
-	  YY_("syntax error, unexpected %s, expecting %s");
-	  YY_("syntax error, unexpected %s, expecting %s or %s");
-	  YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-	  YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-#endif
-	  char *yyfmt;
-	  char const *yyf;
-	  static char const yyunexpected[] = "syntax error, unexpected %s";
-	  static char const yyexpecting[] = ", expecting %s";
-	  static char const yyor[] = " or %s";
-	  char yyformat[sizeof yyunexpected
-			+ sizeof yyexpecting - 1
-			+ ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-			   * (sizeof yyor - 1))];
-	  char const *yyprefix = yyexpecting;
-
-	  /* Start YYX at -YYN if negative to avoid negative indexes in
-	     YYCHECK.  */
-	  int yyxbegin = yyn < 0 ? -yyn : 0;
-
-	  /* Stay within bounds of both yycheck and yytname.  */
-	  int yychecklim = YYLAST - yyn;
-	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-	  int yycount = 1;
-
-	  yyarg[0] = yytname[yytype];
-	  yyfmt = yystpcpy (yyformat, yyunexpected);
-
-	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	      {
-		if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-		  {
-		    yycount = 1;
-		    yysize = yysize0;
-		    yyformat[sizeof yyunexpected - 1] = '\0';
-		    break;
-		  }
-		yyarg[yycount++] = yytname[yyx];
-		yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-		yysize_overflow |= yysize1 < yysize;
-		yysize = yysize1;
-		yyfmt = yystpcpy (yyfmt, yyprefix);
-		yyprefix = yyor;
-	      }
-
-	  yyf = YY_(yyformat);
-	  yysize1 = yysize + yystrlen (yyf);
-	  yysize_overflow |= yysize1 < yysize;
-	  yysize = yysize1;
-
-	  if (!yysize_overflow && yysize <= YYSTACK_ALLOC_MAXIMUM)
-	    yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg)
+	  int size = 0;
+	  char *msg;
+	  int x, count;
+
+	  count = 0;
+	  /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
+	  for (x = (yyn < 0 ? -yyn : 0);
+	       x < (sizeof(yytname) / sizeof(char *)); x++)
+	    if (yycheck[x + yyn] == x)
+	      size += strlen(yytname[x]) + 15, count++;
+	  msg = (char *) malloc(size + 15);
+	  if (msg != 0)
 	    {
-	      /* Avoid sprintf, as that infringes on the user's name space.
-		 Don't have undefined behavior even if the translation
-		 produced a string with the wrong number of "%s"s.  */
-	      char *yyp = yymsg;
-	      int yyi = 0;
-	      while ((*yyp = *yyf))
+	      strcpy(msg, "parse error");
+
+	      if (count < 5)
 		{
-		  if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		    {
-		      yyp += yytnamerr (yyp, yyarg[yyi++]);
-		      yyf += 2;
-		    }
-		  else
-		    {
-		      yyp++;
-		      yyf++;
-		    }
+		  count = 0;
+		  for (x = (yyn < 0 ? -yyn : 0);
+		       x < (sizeof(yytname) / sizeof(char *)); x++)
+		    if (yycheck[x + yyn] == x)
+		      {
+			strcat(msg, count == 0 ? ", expecting `" : " or `");
+			strcat(msg, yytname[x]);
+			strcat(msg, "'");
+			count++;
+		      }
 		}
-	      yyerror (yymsg);
-	      YYSTACK_FREE (yymsg);
+	      yyerror(msg);
+	      free(msg);
 	    }
 	  else
-	    {
-	      yyerror (YY_("syntax error"));
-	      goto yyexhaustedlab;
-	    }
+	    yyerror ("parse error; also virtual memory exceeded");
 	}
       else
 #endif /* YYERROR_VERBOSE */
-	yyerror (YY_("syntax error"));
+	yyerror("parse error");
     }
 
-
+  goto yyerrlab1;
+yyerrlab1:   /* here on error raised explicitly by an action */
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse look-ahead token after an
-	 error, discard it.  */
+      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
 
-      if (yychar <= YYEOF)
-        {
-	  /* Return failure if at end of input.  */
-	  if (yychar == YYEOF)
-	    YYABORT;
-        }
-      else
-	{
-	  yydestruct ("Error: discarding", yytoken, &yylval);
-	  yychar = YYEMPTY;
-	}
+      /* return failure if at end of input */
+      if (yychar == YYEOF)
+	YYABORT;
+
+#if YYDEBUG != 0
+      if (yydebug)
+	fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
+#endif
+
+      yychar = YYEMPTY;
     }
 
-  /* Else will try to reuse look-ahead token after shifting the error
-     token.  */
-  goto yyerrlab1;
+  /* Else will try to reuse lookahead token
+     after shifting the error token.  */
 
+  yyerrstatus = 3;		/* Each real token shifted decrements this */
 
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR.  |
-`---------------------------------------------------*/
-yyerrorlab:
-
-  /* Pacify compilers like GCC when the user code never invokes
-     YYERROR and the label yyerrorlab therefore never appears in user
-     code.  */
-  if (0)
-     goto yyerrorlab;
+  goto yyerrhandle;
 
-yyvsp -= yylen;
-  yyssp -= yylen;
-  yystate = *yyssp;
-  goto yyerrlab1;
+yyerrdefault:  /* current state does not do anything special for the error token. */
+
+#if 0
+  /* This is wrong; only states that explicitly want error tokens
+     should shift them.  */
+  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
+  if (yyn) goto yydefault;
+#endif
 
+yyerrpop:   /* pop the current state because it cannot handle the error token */
 
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-`-------------------------------------------------------------*/
-yyerrlab1:
-  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+  if (yyssp == yyss) YYABORT;
+  yyvsp--;
+  yystate = *--yyssp;
+#ifdef YYLSP_NEEDED
+  yylsp--;
+#endif
 
-  for (;;)
+#if YYDEBUG != 0
+  if (yydebug)
     {
-      yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
-	{
-	  yyn += YYTERROR;
-	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-	    {
-	      yyn = yytable[yyn];
-	      if (0 < yyn)
-		break;
-	    }
-	}
+      short *ssp1 = yyss - 1;
+      fprintf (stderr, "Error: state stack now");
+      while (ssp1 != yyssp)
+	fprintf (stderr, " %d", *++ssp1);
+      fprintf (stderr, "\n");
+    }
+#endif
 
-      /* Pop the current state because it cannot handle the error token.  */
-      if (yyssp == yyss)
-	YYABORT;
+yyerrhandle:
+
+  yyn = yypact[yystate];
+  if (yyn == YYFLAG)
+    goto yyerrdefault;
 
+  yyn += YYTERROR;
+  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
+    goto yyerrdefault;
 
-      yydestruct ("Error: popping", yystos[yystate], yyvsp);
-      YYPOPSTACK;
-      yystate = *yyssp;
-      YY_STACK_PRINT (yyss, yyssp);
+  yyn = yytable[yyn];
+  if (yyn < 0)
+    {
+      if (yyn == YYFLAG)
+	goto yyerrpop;
+      yyn = -yyn;
+      goto yyreduce;
     }
+  else if (yyn == 0)
+    goto yyerrpop;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  *++yyvsp = yylval;
-
+#if YYDEBUG != 0
+  if (yydebug)
+    fprintf(stderr, "Shifting error token, ");
+#endif
 
-  /* Shift the error token. */
-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+  *++yyvsp = yylval;
+#ifdef YYLSP_NEEDED
+  *++yylsp = yylloc;
+#endif
 
   yystate = yyn;
   goto yynewstate;
 
+ yyacceptlab:
+  /* YYACCEPT comes here.  */
+  if (yyfree_stacks)
+    {
+      free (yyss);
+      free (yyvs);
+#ifdef YYLSP_NEEDED
+      free (yyls);
+#endif
+    }
+  return 0;
 
-/*-------------------------------------.
-| yyacceptlab -- YYACCEPT comes here.  |
-`-------------------------------------*/
-yyacceptlab:
-  yyresult = 0;
-  goto yyreturn;
-
-/*-----------------------------------.
-| yyabortlab -- YYABORT comes here.  |
-`-----------------------------------*/
-yyabortlab:
-  yyresult = 1;
-  goto yyreturn;
-
-#ifndef yyoverflow
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here.  |
-`-------------------------------------------------*/
-yyexhaustedlab:
-  yyerror (YY_("memory exhausted"));
-  yyresult = 2;
-  /* Fall through.  */
-#endif
-
-yyreturn:
-  if (yychar != YYEOF && yychar != YYEMPTY)
-     yydestruct ("Cleanup: discarding lookahead",
-		 yytoken, &yylval);
-  while (yyssp != yyss)
-    {
-      yydestruct ("Cleanup: popping",
-		  yystos[*yyssp], yyvsp);
-      YYPOPSTACK;
-    }
-#ifndef yyoverflow
-  if (yyss != yyssa)
-    YYSTACK_FREE (yyss);
+ yyabortlab:
+  /* YYABORT comes here.  */
+  if (yyfree_stacks)
+    {
+      free (yyss);
+      free (yyvs);
+#ifdef YYLSP_NEEDED
+      free (yyls);
 #endif
-  return yyresult;
+    }
+  return 1;
 }
-
-
-#line 3065 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 3066 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 
 
 // common code from the two 'RunVMAsmParser' functions
@@ -6225,4 +5288,3 @@
   GenerateError(errMsg);
   return 0;
 }
-

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs?rev=37918&r1=37917&r2=37918&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs Thu Jul  5 12:26:49 2007
@@ -1,314 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.1.  */
-
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     ESINT64VAL = 258,
-     EUINT64VAL = 259,
-     ESAPINTVAL = 260,
-     EUAPINTVAL = 261,
-     LOCALVAL_ID = 262,
-     GLOBALVAL_ID = 263,
-     FPVAL = 264,
-     VOID = 265,
-     INTTYPE = 266,
-     FLOAT = 267,
-     DOUBLE = 268,
-     LABEL = 269,
-     TYPE = 270,
-     LOCALVAR = 271,
-     GLOBALVAR = 272,
-     LABELSTR = 273,
-     STRINGCONSTANT = 274,
-     ATSTRINGCONSTANT = 275,
-     PCTSTRINGCONSTANT = 276,
-     ZEROINITIALIZER = 277,
-     TRUETOK = 278,
-     FALSETOK = 279,
-     BEGINTOK = 280,
-     ENDTOK = 281,
-     DECLARE = 282,
-     DEFINE = 283,
-     GLOBAL = 284,
-     CONSTANT = 285,
-     SECTION = 286,
-     ALIAS = 287,
-     VOLATILE = 288,
-     THREAD_LOCAL = 289,
-     TO = 290,
-     DOTDOTDOT = 291,
-     NULL_TOK = 292,
-     UNDEF = 293,
-     INTERNAL = 294,
-     LINKONCE = 295,
-     WEAK = 296,
-     APPENDING = 297,
-     DLLIMPORT = 298,
-     DLLEXPORT = 299,
-     EXTERN_WEAK = 300,
-     OPAQUE = 301,
-     EXTERNAL = 302,
-     TARGET = 303,
-     TRIPLE = 304,
-     ALIGN = 305,
-     DEPLIBS = 306,
-     CALL = 307,
-     TAIL = 308,
-     ASM_TOK = 309,
-     MODULE = 310,
-     SIDEEFFECT = 311,
-     CC_TOK = 312,
-     CCC_TOK = 313,
-     FASTCC_TOK = 314,
-     COLDCC_TOK = 315,
-     X86_STDCALLCC_TOK = 316,
-     X86_FASTCALLCC_TOK = 317,
-     DATALAYOUT = 318,
-     RET = 319,
-     BR = 320,
-     SWITCH = 321,
-     INVOKE = 322,
-     UNWIND = 323,
-     UNREACHABLE = 324,
-     ADD = 325,
-     SUB = 326,
-     MUL = 327,
-     UDIV = 328,
-     SDIV = 329,
-     FDIV = 330,
-     UREM = 331,
-     SREM = 332,
-     FREM = 333,
-     AND = 334,
-     OR = 335,
-     XOR = 336,
-     SHL = 337,
-     LSHR = 338,
-     ASHR = 339,
-     ICMP = 340,
-     FCMP = 341,
-     EQ = 342,
-     NE = 343,
-     SLT = 344,
-     SGT = 345,
-     SLE = 346,
-     SGE = 347,
-     ULT = 348,
-     UGT = 349,
-     ULE = 350,
-     UGE = 351,
-     OEQ = 352,
-     ONE = 353,
-     OLT = 354,
-     OGT = 355,
-     OLE = 356,
-     OGE = 357,
-     ORD = 358,
-     UNO = 359,
-     UEQ = 360,
-     UNE = 361,
-     MALLOC = 362,
-     ALLOCA = 363,
-     FREE = 364,
-     LOAD = 365,
-     STORE = 366,
-     GETELEMENTPTR = 367,
-     TRUNC = 368,
-     ZEXT = 369,
-     SEXT = 370,
-     FPTRUNC = 371,
-     FPEXT = 372,
-     BITCAST = 373,
-     UITOFP = 374,
-     SITOFP = 375,
-     FPTOUI = 376,
-     FPTOSI = 377,
-     INTTOPTR = 378,
-     PTRTOINT = 379,
-     PHI_TOK = 380,
-     SELECT = 381,
-     VAARG = 382,
-     EXTRACTELEMENT = 383,
-     INSERTELEMENT = 384,
-     SHUFFLEVECTOR = 385,
-     NORETURN = 386,
-     INREG = 387,
-     SRET = 388,
-     NOUNWIND = 389,
-     DEFAULT = 390,
-     HIDDEN = 391,
-     PROTECTED = 392
-   };
-#endif
-/* Tokens.  */
-#define ESINT64VAL 258
-#define EUINT64VAL 259
-#define ESAPINTVAL 260
-#define EUAPINTVAL 261
-#define LOCALVAL_ID 262
-#define GLOBALVAL_ID 263
-#define FPVAL 264
-#define VOID 265
-#define INTTYPE 266
-#define FLOAT 267
-#define DOUBLE 268
-#define LABEL 269
-#define TYPE 270
-#define LOCALVAR 271
-#define GLOBALVAR 272
-#define LABELSTR 273
-#define STRINGCONSTANT 274
-#define ATSTRINGCONSTANT 275
-#define PCTSTRINGCONSTANT 276
-#define ZEROINITIALIZER 277
-#define TRUETOK 278
-#define FALSETOK 279
-#define BEGINTOK 280
-#define ENDTOK 281
-#define DECLARE 282
-#define DEFINE 283
-#define GLOBAL 284
-#define CONSTANT 285
-#define SECTION 286
-#define ALIAS 287
-#define VOLATILE 288
-#define THREAD_LOCAL 289
-#define TO 290
-#define DOTDOTDOT 291
-#define NULL_TOK 292
-#define UNDEF 293
-#define INTERNAL 294
-#define LINKONCE 295
-#define WEAK 296
-#define APPENDING 297
-#define DLLIMPORT 298
-#define DLLEXPORT 299
-#define EXTERN_WEAK 300
-#define OPAQUE 301
-#define EXTERNAL 302
-#define TARGET 303
-#define TRIPLE 304
-#define ALIGN 305
-#define DEPLIBS 306
-#define CALL 307
-#define TAIL 308
-#define ASM_TOK 309
-#define MODULE 310
-#define SIDEEFFECT 311
-#define CC_TOK 312
-#define CCC_TOK 313
-#define FASTCC_TOK 314
-#define COLDCC_TOK 315
-#define X86_STDCALLCC_TOK 316
-#define X86_FASTCALLCC_TOK 317
-#define DATALAYOUT 318
-#define RET 319
-#define BR 320
-#define SWITCH 321
-#define INVOKE 322
-#define UNWIND 323
-#define UNREACHABLE 324
-#define ADD 325
-#define SUB 326
-#define MUL 327
-#define UDIV 328
-#define SDIV 329
-#define FDIV 330
-#define UREM 331
-#define SREM 332
-#define FREM 333
-#define AND 334
-#define OR 335
-#define XOR 336
-#define SHL 337
-#define LSHR 338
-#define ASHR 339
-#define ICMP 340
-#define FCMP 341
-#define EQ 342
-#define NE 343
-#define SLT 344
-#define SGT 345
-#define SLE 346
-#define SGE 347
-#define ULT 348
-#define UGT 349
-#define ULE 350
-#define UGE 351
-#define OEQ 352
-#define ONE 353
-#define OLT 354
-#define OGT 355
-#define OLE 356
-#define OGE 357
-#define ORD 358
-#define UNO 359
-#define UEQ 360
-#define UNE 361
-#define MALLOC 362
-#define ALLOCA 363
-#define FREE 364
-#define LOAD 365
-#define STORE 366
-#define GETELEMENTPTR 367
-#define TRUNC 368
-#define ZEXT 369
-#define SEXT 370
-#define FPTRUNC 371
-#define FPEXT 372
-#define BITCAST 373
-#define UITOFP 374
-#define SITOFP 375
-#define FPTOUI 376
-#define FPTOSI 377
-#define INTTOPTR 378
-#define PTRTOINT 379
-#define PHI_TOK 380
-#define SELECT 381
-#define VAARG 382
-#define EXTRACTELEMENT 383
-#define INSERTELEMENT 384
-#define SHUFFLEVECTOR 385
-#define NORETURN 386
-#define INREG 387
-#define SRET 388
-#define NOUNWIND 389
-#define DEFAULT 390
-#define HIDDEN 391
-#define PROTECTED 392
-
-
-
-
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 957 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
-typedef union YYSTYPE {
+typedef union {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   llvm::BasicBlock                       *BasicBlockVal;
@@ -354,14 +44,142 @@
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
 } YYSTYPE;
-/* Line 1447 of yacc.c.  */
-#line 359 "llvmAsmParser.tab.h"
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
-#endif
-
-extern YYSTYPE llvmAsmlval;
-
+#define	ESINT64VAL	257
+#define	EUINT64VAL	258
+#define	ESAPINTVAL	259
+#define	EUAPINTVAL	260
+#define	LOCALVAL_ID	261
+#define	GLOBALVAL_ID	262
+#define	FPVAL	263
+#define	VOID	264
+#define	INTTYPE	265
+#define	FLOAT	266
+#define	DOUBLE	267
+#define	LABEL	268
+#define	TYPE	269
+#define	LOCALVAR	270
+#define	GLOBALVAR	271
+#define	LABELSTR	272
+#define	STRINGCONSTANT	273
+#define	ATSTRINGCONSTANT	274
+#define	PCTSTRINGCONSTANT	275
+#define	ZEROINITIALIZER	276
+#define	TRUETOK	277
+#define	FALSETOK	278
+#define	BEGINTOK	279
+#define	ENDTOK	280
+#define	DECLARE	281
+#define	DEFINE	282
+#define	GLOBAL	283
+#define	CONSTANT	284
+#define	SECTION	285
+#define	ALIAS	286
+#define	VOLATILE	287
+#define	THREAD_LOCAL	288
+#define	TO	289
+#define	DOTDOTDOT	290
+#define	NULL_TOK	291
+#define	UNDEF	292
+#define	INTERNAL	293
+#define	LINKONCE	294
+#define	WEAK	295
+#define	APPENDING	296
+#define	DLLIMPORT	297
+#define	DLLEXPORT	298
+#define	EXTERN_WEAK	299
+#define	OPAQUE	300
+#define	EXTERNAL	301
+#define	TARGET	302
+#define	TRIPLE	303
+#define	ALIGN	304
+#define	DEPLIBS	305
+#define	CALL	306
+#define	TAIL	307
+#define	ASM_TOK	308
+#define	MODULE	309
+#define	SIDEEFFECT	310
+#define	CC_TOK	311
+#define	CCC_TOK	312
+#define	FASTCC_TOK	313
+#define	COLDCC_TOK	314
+#define	X86_STDCALLCC_TOK	315
+#define	X86_FASTCALLCC_TOK	316
+#define	DATALAYOUT	317
+#define	RET	318
+#define	BR	319
+#define	SWITCH	320
+#define	INVOKE	321
+#define	UNWIND	322
+#define	UNREACHABLE	323
+#define	ADD	324
+#define	SUB	325
+#define	MUL	326
+#define	UDIV	327
+#define	SDIV	328
+#define	FDIV	329
+#define	UREM	330
+#define	SREM	331
+#define	FREM	332
+#define	AND	333
+#define	OR	334
+#define	XOR	335
+#define	SHL	336
+#define	LSHR	337
+#define	ASHR	338
+#define	ICMP	339
+#define	FCMP	340
+#define	EQ	341
+#define	NE	342
+#define	SLT	343
+#define	SGT	344
+#define	SLE	345
+#define	SGE	346
+#define	ULT	347
+#define	UGT	348
+#define	ULE	349
+#define	UGE	350
+#define	OEQ	351
+#define	ONE	352
+#define	OLT	353
+#define	OGT	354
+#define	OLE	355
+#define	OGE	356
+#define	ORD	357
+#define	UNO	358
+#define	UEQ	359
+#define	UNE	360
+#define	MALLOC	361
+#define	ALLOCA	362
+#define	FREE	363
+#define	LOAD	364
+#define	STORE	365
+#define	GETELEMENTPTR	366
+#define	TRUNC	367
+#define	ZEXT	368
+#define	SEXT	369
+#define	FPTRUNC	370
+#define	FPEXT	371
+#define	BITCAST	372
+#define	UITOFP	373
+#define	SITOFP	374
+#define	FPTOUI	375
+#define	FPTOSI	376
+#define	INTTOPTR	377
+#define	PTRTOINT	378
+#define	PHI_TOK	379
+#define	SELECT	380
+#define	VAARG	381
+#define	EXTRACTELEMENT	382
+#define	INSERTELEMENT	383
+#define	SHUFFLEVECTOR	384
+#define	NORETURN	385
+#define	INREG	386
+#define	SRET	387
+#define	NOUNWIND	388
+#define	NOALIAS	389
+#define	DEFAULT	390
+#define	HIDDEN	391
+#define	PROTECTED	392
 
 
+extern YYSTYPE llvmAsmlval;

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs?rev=37918&r1=37917&r2=37918&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs Thu Jul  5 12:26:49 2007
@@ -1101,7 +1101,7 @@
 %token <OtherOpVal> EXTRACTELEMENT INSERTELEMENT SHUFFLEVECTOR
 
 // Function Attributes
-%token NORETURN INREG SRET NOUNWIND
+%token NORETURN INREG SRET NOUNWIND NOALIAS
 
 // Visibility Styles
 %token DEFAULT HIDDEN PROTECTED
@@ -1224,10 +1224,11 @@
                   CHECK_FOR_ERROR
                  };
 
-ParamAttr     : ZEXT  { $$ = ParamAttr::ZExt;      }
-              | SEXT  { $$ = ParamAttr::SExt;      }
-              | INREG { $$ = ParamAttr::InReg;     }
-              | SRET  { $$ = ParamAttr::StructRet; }
+ParamAttr     : ZEXT    { $$ = ParamAttr::ZExt;      }
+              | SEXT    { $$ = ParamAttr::SExt;      }
+              | INREG   { $$ = ParamAttr::InReg;     }
+              | SRET    { $$ = ParamAttr::StructRet; }
+              | NOALIAS { $$ = ParamAttr::NoAlias;   }
               ;
 
 OptParamAttrs : /* empty */  { $$ = ParamAttr::None; }





More information about the llvm-commits mailing list