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

Reid Spencer rspencer at reidspencer.com
Mon Jul 30 20:50:36 PDT 2007


Author: reid
Date: Mon Jul 30 22:50:36 2007
New Revision: 40611

URL: http://llvm.org/viewvc/llvm-project?rev=40611&view=rev
Log:
Regenerate.

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=40611&r1=40610&r2=40611&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/Lexer.cpp.cvs (original)
+++ llvm/trunk/lib/AsmParser/Lexer.cpp.cvs Mon Jul 30 22:50:36 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: /cvs/root/flex/flex/skel.c,v 1.2 2004/05/07 00:28:17 jkh Exp $
+ * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
  */
 
 #define FLEX_SCANNER
@@ -28,6 +28,7 @@
 #define YY_FLEX_MINOR_VERSION 5
 
 #include <stdio.h>
+#include <unistd.h>
 
 
 /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
@@ -41,7 +42,6 @@
 #ifdef __cplusplus
 
 #include <stdlib.h>
-#include <unistd.h>
 
 /* Use prototypes in function declarations. */
 #define YY_USE_PROTOS
@@ -153,6 +153,15 @@
 
 #define unput(c) yyunput( c, yytext_ptr )
 
+/* Some routines like yy_flex_realloc() are emitted as static but are
+   not called by all lexers. This generates warnings in some compilers,
+   notably GCC. Arrange to suppress these. */
+#ifdef __GNUC__
+#define YY_MAY_BE_UNUSED __attribute__((unused))
+#else
+#define YY_MAY_BE_UNUSED
+#endif
+
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
@@ -259,7 +268,7 @@
 YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
 
 static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static inline void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
+static inline void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) YY_MAY_BE_UNUSED;
 static void yy_flex_free YY_PROTO(( void * ));
 
 #define yy_new_buffer yy_create_buffer
@@ -308,37 +317,38 @@
 	*yy_cp = '\0'; \
 	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 140
-#define YY_END_OF_BUFFER 141
-static yyconst short int yy_acclist[221] =
+#define YY_NUM_RULES 146
+#define YY_END_OF_BUFFER 147
+static yyconst short int yy_acclist[227] =
     {   0,
-      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,
-
-       47,   46,  105,   31,   13,   15,   14,   17,   30,   37,
-       18,  114,   20,  120,  122,  123,   42,  121,   43,   21
+      147,  145,  146,  144,  145,  146,  144,  146,  145,  146,
+      145,  146,  145,  146,  145,  146,  145,  146,  145,  146,
+      137,  145,  146,  137,  145,  146,    1,  145,  146,  145,
+      146,  145,  146,  145,  146,  145,  146,  145,  146,  145,
+      146,  145,  146,  145,  146,  145,  146,  145,  146,  145,
+      146,  145,  146,  145,  146,  145,  146,  145,  146,  145,
+      146,  145,  146,  145,  146,  145,  146,  145,  146,  145,
+      146,  145,  146,  145,  146,  134,  132,  130,  140,  138,
+      142,  137,    1,  131,  141,  116,   38,   79,   61,   80,
+       75,   25,  134,  136,  130,  142,   22,  142,  143,  135,
+
+      131,   62,   74,   36,   39,    3,   64,   89,   94,   92,
+       93,   91,   90,   95,   99,  115,   84,   82,   71,   83,
+       81,   63,   97,   88,   86,   87,   85,   98,   96,   76,
+      133,  142,  142,   73,  100,   78,   67,  123,   70,   77,
+      124,   72,   52,   24,  139,   66,  103,   69,   47,   26,
+        4,   59,   65,   68,   55,   12,  102,  142,   34,   32,
+        2,   51,    5,   56,  105,   46,   58,   53,  125,  101,
+       23,   54,  122,   41,    7,   57,   40,  109,  108,    8,
+       16,  118,  121,   35,   60,  113,  107,  117,   27,   28,
+      106,  119,  114,  112,    6,   29,  104,   50,   33,   44,
+
+       45,    9,   19,   10,  110,   11,   49,   48,  111,   31,
+       13,   15,   14,   17,   30,   37,   18,  120,   20,  126,
+      128,  129,   42,  127,   43,   21
     } ;
 
-static yyconst short int yy_accept[569] =
+static yyconst short int yy_accept[587] =
     {   0,
         1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
        17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
@@ -346,62 +356,64 @@
        60,   62,   64,   66,   68,   70,   72,   74,   76,   76,
        77,   77,   78,   78,   79,   80,   80,   81,   81,   82,
        83,   83,   84,   84,   85,   86,   86,   86,   86,   86,
-       86,   86,   86,   87,   87,   88,   88,   88,   88,   88,
-       88,   88,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,   90,   90,   90,   90,   90,   90,   90,
-       90,   90,   90,   91,   91,   91,   91,   91,   91,   91,
+       86,   86,   86,   87,   87,   87,   88,   88,   88,   88,
+       88,   88,   88,   89,   89,   89,   89,   89,   89,   89,
+       89,   89,   89,   89,   90,   90,   90,   90,   90,   90,
+       90,   90,   90,   90,   91,   91,   91,   91,   91,   91,
 
-       91,   92,   92,   92,   92,   92,   92,   92,   92,   92,
-       92,   92,   92,   92,   92,   92,   92,   92,   92,   93,
+       91,   91,   92,   92,   92,   92,   92,   92,   92,   92,
+       92,   92,   92,   92,   92,   92,   92,   92,   92,   92,
        93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
-       93,   93,   93,   93,   93,   94,   94,   95,   96,   97,
-       98,   99,   99,  100,  100,  101,  102,  103,  103,  103,
-      104,  104,  104,  105,  105,  105,  105,  106,  106,  106,
-      106,  106,  106,  106,  106,  106,  107,  107,  107,  107,
+       93,   93,   93,   93,   93,   93,   94,   94,   95,   96,
+       97,   98,   99,   99,  100,  100,  101,  102,  103,  103,
+      103,  104,  104,  104,  105,  105,  105,  105,  105,  106,
+      106,  106,  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,
-      108,  108,  108,  108,  108,  109,  110,  111,  112,  113,
+      107,  107,  108,  108,  108,  108,  108,  108,  109,  110,
 
-      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
+      111,  112,  113,  114,  114,  115,  116,  116,  116,  117,
+      117,  117,  117,  117,  117,  118,  119,  120,  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,  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,  144,  144,  144,  144,
+      145,  145,  145,  145,  146,  147,  147,  147,  148,  148,
+      148,  148,  148,  149,  150,  150,  150,  151,  151,  151,
+      151,  152,  152,  153,  154,  154,  154,  154,  154,  155,
+      155,  156,  156,  157,  157,  157,  158,  159,  160,  161,
+      161,  161,  162,  162,  163,  163,  163,  163,  163,  163,
+      163,  163,  163,  163,  163,  163,  164,  164,  165,  166,
+      166,  166,  166,  166,  166,  166,  167,  167,  167,  167,
+      167,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+      168,  168,  168,  168,  169,  169,  169,  169,  169,  170,
+
+      170,  170,  170,  170,  171,  171,  172,  172,  172,  172,
+      172,  172,  172,  172,  172,  172,  173,  174,  174,  174,
+      175,  175,  175,  175,  176,  176,  176,  176,  177,  177,
+      177,  178,  179,  180,  180,  180,  181,  182,  182,  182,
+      182,  183,  183,  184,  185,  185,  185,  185,  186,  186,
+      186,  186,  187,  187,  187,  187,  188,  189,  190,  190,
+      191,  192,  192,  193,  194,  194,  194,  194,  194,  194,
+      194,  195,  195,  195,  196,  197,  197,  197,  197,  197,
+      197,  198,  198,  198,  198,  198,  198,  199,  199,  199,
+      199,  199,  200,  200,  200,  201,  201,  201,  201,  201,
+
+      201,  202,  202,  202,  203,  203,  203,  203,  203,  204,
+      204,  204,  204,  205,  206,  207,  208,  209,  209,  210,
+      210,  210,  210,  210,  211,  211,  211,  211,  212,  212,
+      213,  214,  214,  214,  214,  214,  215,  215,  215,  215,
+      215,  215,  215,  215,  216,  216,  216,  216,  216,  216,
+      217,  217,  217,  217,  217,  217,  218,  218,  218,  218,
+      218,  218,  219,  219,  219,  219,  219,  219,  219,  219,
+      220,  220,  220,  220,  220,  221,  222,  223,  223,  224,
+      224,  225,  226,  226,  227,  227
     } ;
 
 static yyconst int yy_ec[256] =
@@ -445,141 +457,147 @@
         4,    4,    4,    4
     } ;
 
-static yyconst short int yy_base[577] =
+static yyconst short int yy_base[595] =
     {   0,
-        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, 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, 1213,  295,  302,  298,  305,  313,  296,  321,
-
-      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
+        0,    0, 1276, 1277, 1277, 1277, 1271, 1260,   41,   36,
+       45,   51,   57,   63,    0,   74,   66,   69,   68,   90,
+       92,  121,   78,   36,  148,   93,  117,  114,  167,  138,
+       67,  194,  152,  226,  134,   95,  103,  101, 1269, 1277,
+     1258, 1277, 1267,    0,  199,  216,  232,  131,  253,  269,
+      274,    0, 1266,    0,  203,  119,  154,  150,  115,  163,
+      149,   80, 1255,  191,   49,  164,  157,  108,  279,   81,
+      184,  169, 1254,  223,  239,  188,  220,  224,  276,  182,
+      237,  241,  245,  295,  258,  288,  118,  289,  296,  233,
+      297,  306,  301,  298,  303,  304,  305,  308,  319,  323,
+
+      316,  327,  324,  330,  331,  334,  335,  337,  339,  340,
+      341,  356,  352,  344,  342,  186,  345,  360,  348, 1253,
+      369,  371,  372,  375,  377,  373,  378,  389,  385,  379,
+      390,  403,  407,  392,  393, 1252, 1261, 1277,    0,  421,
+     1250,  436,  454,    0, 1259, 1277,    0, 1248,  437,  381,
+     1247,  412,  423, 1246,  410,  430,  455,  413, 1245,  456,
+      439,  457,  426,  427,  428,  458,  459, 1244,  460,  464,
+      467,  469,  471,  473,  474,  476,  475,  478,  477,  481,
+      480,  483,  486,  494,  501,  499,  506,  503,  505,  507,
+      508, 1243,  510,  513,  514,  517,  515, 1242, 1241, 1240,
+
+     1239, 1238, 1237,  511, 1236, 1235,  516,  519, 1234,  548,
+      522,  525,  526,  537, 1233, 1232, 1231,  528,  550,  553,
+      562, 1230, 1229,  563,  542, 1228,  541,  566,  567,  568,
+      569,  573,  574,  570, 1227, 1226, 1225,  575, 1224, 1223,
+      576, 1222, 1221,  585,  588,  590,  592,  597,  593,  600,
+      572, 1220,  601,  603, 1277,  612,  632,  636,  640,  645,
+      623,  647,  530,  648, 1219,  649,  612,  605, 1218,  650,
+      651,  652,  613,  653,  655,  654,  656,  660,  657,  664,
+      604,  672, 1217, 1216,  659,  661,  663,  662, 1215, 1214,
+      674,  678,  681, 1213,  677,  692,  693,  694,  695,  696,
+
+      697, 1212, 1211,  698,  702, 1210,  705,  699,  700, 1209,
+      701,  711,  703,    0, 1208,  706,  724,  740,  725,  731,
+      733,  734, 1207, 1206,  737,  730, 1205,  739,  742,  735,
+     1204,  744, 1203, 1202,  746,  750,  753,  754, 1201,  755,
+     1200,  756, 1199,  758,  760,  775,  769, 1198, 1197,  773,
+      762, 1196,  776, 1195,  778,  782,  783,  784,  785,  617,
+      787,  790,  791,  793,  792, 1194,  794, 1193, 1192,  798,
+      803,  796,  805,  797,  804, 1191,  808,  809,  816,  818,
+     1190,  819,  821,  820,  825,  823,  824,  833,  826,  835,
+      839,  840,   59,  719,  841,  842,  844,  845, 1189,  846,
+
+      847,  851,  852, 1188,  850, 1187,  855,  866,  856,  867,
+      873,  854,  861,  869,  888,  894, 1186,  874,  880, 1185,
+      884,  885,  886, 1184,  890,  891,  892, 1183,  893,  894,
+     1182, 1181, 1180,  895,  900, 1179, 1178,  897,  906,  901,
+     1177,  908, 1176, 1175,  905,  909,  915, 1174,  919,  920,
+      921, 1173,  922,  923,  924, 1172, 1171, 1170,  704, 1169,
+     1168,  927, 1167, 1166,  926,  929,  935,  930,  936,  937,
+     1165,  941,  945, 1164, 1163,  946,  947,  949,  951,  953,
+     1162,  956,  957,  958,  959,  960, 1161,  961,  962,  972,
+      975, 1160,  977,  978, 1159,  980,  983,  984,  985,  987,
+
+     1158,  986,  990, 1157,  991,  993,  997,  998, 1156, 1004,
+     1000, 1001, 1155, 1154, 1153, 1137, 1125, 1005, 1124, 1012,
+     1007, 1006, 1019, 1122, 1023, 1024, 1013, 1121, 1028, 1120,
+     1119, 1029, 1032, 1033, 1034, 1117, 1036, 1037, 1038, 1039,
+     1041, 1040, 1043, 1116, 1045, 1048, 1050, 1053, 1054, 1115,
+     1058, 1059, 1066, 1067, 1068, 1114, 1062, 1071, 1073, 1074,
+     1076, 1113, 1080, 1077, 1075, 1079, 1081, 1086, 1087, 1112,
+     1090, 1094, 1088, 1099, 1107, 1106, 1105, 1100,  992, 1101,
+      346,  259, 1104,  256, 1277, 1140, 1142, 1145, 1149, 1152,
+     1156,  235, 1161,  165
+
     } ;
 
-static yyconst short int yy_def[577] =
+static yyconst short int yy_def[595] =
     {   0,
-      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
+      585,    1,  585,  585,  585,  585,  586,  587,  588,  585,
+      587,  587,  587,  587,  589,  590,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  586,  585,
+      587,  585,  591,  592,  585,  585,  587,  587,  587,  587,
+      587,  589,  593,  594,  585,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  585,  591,  585,  592,  585,
+      587,  587,  587,   51,  593,  585,  594,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+
+      587,  587,  587,  587,  587,  587,  587,  587,  587,   51,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  585,  585,  585,  585,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  210,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  585,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  585,  585,  587,  587,  587,  587,  587,  587,
+
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  585,  585,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,  587,  587,  587,  587,  587,  587,
+      587,  587,  587,  587,    0,  585,  585,  585,  585,  585,
+      585,  585,  585,  585
+
     } ;
 
-static yyconst short int yy_nxt[1282] =
+static yyconst short int yy_nxt[1322] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   14,   14,    4,   15,   16,    8,    8,    8,   17,
@@ -587,144 +605,149 @@
        27,   28,   29,   30,    8,   31,   32,   33,   34,   35,
        36,   37,    8,   38,   43,   46,   46,   46,   46,   42,
        45,   45,   45,   45,   47,   47,   47,   47,   42,   48,
-      146,  138,   42,   82,   42,   49,   50,   50,   50,   50,
-       42,   49,   50,   50,   50,   50,   42,   53,  156,   42,
-       42,   42,   42,   55,   55,   55,   55,   64,   56,   65,
-      105,   42,   61,   42,   42,   57,   62,   58,   51,   59,
-
-       66,   42,   60,  131,   63,   42,   42,   67,  140,   71,
-       42,   68,   72,   42,   42,  134,   80,   69,  155,   73,
-       70,   42,   81,   42,   93,   42,   42,   74,  185,   75,
-       76,  157,   42,   94,  147,  150,   42,   77,   90,   95,
-       42,   78,   86,   79,   83,   83,   83,   83,   42,   42,
-       87,   91,   42,  102,   42,   88,   84,   92,  117,   89,
-      129,  154,  103,   42,  104,  118,   85,   42,  132,   42,
-       42,  119,   42,  130,  120,   42,  152,   96,   42,   97,
-      153,  121,   42,   98,  148,   99,  149,  100,  133,  101,
-      106,  158,  151,  159,   42,   45,   45,   45,   45,   55,
-
-       55,   55,   55,  107,  108,   42,  109,  110,  111,   42,
-      112,  139,   46,   46,   46,   46,  113,   42,  114,  115,
-       42,  116,  106,   42,  172,   42,   42,   49,   47,   47,
-       47,   47,   42,  160,  166,  122,  123,   42,  124,  164,
-      125,  167,  126,   42,  127,  165,   42,   42,  128,  141,
-      141,  141,  141,   42,  170,   42,  178,  142,   42,   42,
-      171,  186,  177,  142,   49,   50,   50,   50,   50,   42,
-      143,  143,  143,  143,   42,   42,   42,  143,  143,   42,
-      143,  143,  143,  143,  143,  143,  173,  161,   42,   42,
-      162,  168,   42,   83,   83,   83,   83,   42,  169,  163,
-
-      174,   42,  175,   42,   42,   42,  179,   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,
+      393,  394,   42,   83,   42,   49,   50,   50,   50,   50,
+       42,   49,   50,   50,   50,   50,   42,   53,  158,   42,
+       42,   42,   42,   55,   55,   55,   55,   65,   56,   66,
+      106,   42,   61,   42,   42,   57,   62,   58,   51,   59,
+
+       67,   81,   60,   42,   63,   42,   42,   82,   42,   68,
+      166,   64,   87,   69,   42,  133,   42,  156,  132,   70,
+       88,   42,   71,   72,  135,   89,   73,   42,   42,   90,
+       42,   42,   42,   74,   42,  134,   91,   94,  186,  141,
+       75,  148,   76,   77,   42,  162,   95,   42,  152,   92,
+       78,   42,   96,  130,   79,   93,   80,   84,   84,   84,
+       84,   42,   42,   42,  103,   42,  131,   42,  147,   85,
+       42,  118,  151,  104,  155,  105,   42,   42,  119,   86,
+       42,  149,   42,  150,  120,  159,  160,  121,  161,  153,
+       97,  168,   98,  154,  122,   42,   99,   42,  100,   42,
+
+      101,   42,  102,  107,   42,  177,  226,   42,   45,   45,
+       45,   45,   55,   55,   55,   55,  108,  109,  172,  110,
+      111,  112,  167,  113,  140,   46,   46,   46,   46,  114,
+      157,  115,  116,   42,  117,  107,   42,   42,  139,   42,
+       49,   47,   47,   47,   47,   42,   42,  173,  123,  124,
+       42,  125,   42,  126,   42,  127,  174,  128,   42,  189,
+      169,  129,  142,  142,  142,  142,   42,  180,  170,   42,
+      143,   42,   42,  179,  178,  171,  143,   49,   50,   50,
+       50,   50,   42,  144,  144,  144,  144,   42,  181,   42,
+      144,  144,   42,  144,  144,  144,  144,  144,  144,  175,
+
+      163,   42,   42,  164,   84,   84,   84,   84,   42,   42,
+       42,   42,  165,  176,   42,  188,   42,   42,   42,   42,
+      187,   42,  194,  182,  183,  184,  190,  185,  191,   42,
+      192,  199,   42,  197,  193,  204,   42,   42,  195,  198,
+       42,  196,  201,   42,   42,  200,  203,   42,   42,  205,
+       42,  206,   42,   42,   42,   42,  202,   42,   42,   42,
+      212,   42,  207,  215,  211,   42,  208,  224,  213,   42,
+      217,  209,  227,   42,  225,  222,  210,  216,  219,  218,
+      214,  220,   42,  230,   42,   42,   42,  228,   42,  223,
+       42,   42,   42,  221,   42,  229,  231,  247,   42,  234,
+
+      236,  239,   42,   42,  233,   42,   42,  232,  246,  235,
+      238,  241,  242,  263,  237,  240,   42,  248,  251,  249,
+       42,  243,  250,   42,  244,   42,   42,  252,  253,  245,
+      256,  256,  256,  256,  254,  264,   42,  266,  257,   42,
+       42,   42,  269,   42,  257,  142,  142,  142,  142,   42,
+       42,  267,   42,  143,  274,  273,  261,  275,  265,  143,
+      258,  259,  262,  260,  260,  260,  260,   42,   42,   42,
+       42,   42,   42,   42,  268,  271,  272,   42,  270,  278,
+       42,  276,   42,  279,   42,  277,   42,   42,   42,   42,
+       42,   42,  285,   42,   42,  280,   42,  292,  289,   42,
+
+      281,  291,  283,  293,  282,  290,  295,   42,  287,  296,
+      284,  288,   42,  294,   42,  286,   42,  297,   42,   42,
+       42,   42,  300,   42,   42,  302,   42,   42,   42,   42,
+       42,  298,   42,  299,  301,   42,  304,  308,   42,   42,
+      303,   42,  307,   42,  310,  311,  305,  306,  309,  317,
+       42,  350,  319,  312,   42,   42,  313,  314,  314,  314,
+      314,  315,  316,   42,  314,  314,   42,  314,  314,  314,
+      314,  314,  314,  320,  318,   42,   42,  325,  326,   42,
+       42,   42,   42,   42,  321,   42,   42,   42,   42,   42,
+      344,  329,  328,  323,  322,  327,  331,  333,   42,  336,
+
+      324,   42,  330,   42,  332,   42,   42,  335,  337,  334,
+       42,  340,  342,   42,   42,  338,   42,   42,   42,  341,
+      339,  256,  256,  256,  256,   42,   42,  366,  343,  257,
+       42,  353,  358,  345,  354,  257,   42,  425,  258,  258,
+      346,  347,  347,  347,  347,  347,  347,  347,  347,  260,
+      260,  260,  260,   42,  260,  260,  260,  260,   42,  348,
        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,  355,   42,   42,   42,   42,   42,   42,  349,  351,
+      352,  357,  360,  365,  359,   42,  362,   42,  356,  363,
+       42,   42,  364,  367,   42,  361,  368,  374,  369,  370,
+
+      372,  371,  376,  373,  375,   42,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+      393,  394,  496,  380,   42,  381,  379,  377,  378,  382,
+      383,  384,  385,  391,  389,  390,  386,   42,   42,  388,
+      387,  393,  394,   42,   42,  392,   42,   42,   42,  395,
+       42,  400,   42,   42,  396,   42,  397,   42,  398,   42,
+      399,  402,  401,   42,  403,  404,   42,   42,   42,   42,
+      405,   42,  407,   42,  406,   42,  415,  416,  347,  347,
+      347,  347,  411,  413,  418,  408,   42,  414,   42,   42,
+      409,   42,  417,  410,  412,   42,   42,   42,   42,  420,
+
+       42,  421,  422,   42,   42,   42,   42,   42,  424,   42,
+       42,   42,  419,  430,  428,  431,   42,   42,   42,  423,
+      426,   42,   42,  427,  429,  432,  436,  434,  435,   42,
+      433,   42,   42,   42,   42,  437,   42,   42,   42,   42,
+      439,  441,  443,  444,  445,  438,   42,  449,   42,  440,
+      442,  447,   42,   42,   42,   42,  448,   42,   42,   42,
+       42,  446,  450,   42,   42,   42,  454,   42,   42,   42,
+      453,  451,  457,  459,   42,  460,  462,  452,  456,   42,
+       42,  464,   42,  461,  458,  455,   42,   42,  463,  415,
+      416,  467,  466,   42,  465,  415,  416,   42,   42,   42,
+
+      469,  470,  468,   42,   42,   42,   42,   42,   42,  474,
+       42,  478,  479,   42,   42,  472,  481,  471,   42,   42,
+      483,   42,   42,  476,  477,  484,  475,  473,   42,  486,
+      482,  480,   42,   42,   42,   42,   42,   42,  485,   42,
+       42,  487,   42,   42,  488,  493,  489,  494,   42,   42,
+       42,  491,  492,  497,   42,  498,  490,  500,   42,   42,
+       42,  495,   42,  502,   42,  499,   42,  501,  503,   42,
+       42,   42,   42,   42,   42,   42,  510,  505,  504,  511,
+      509,  506,  507,  515,  517,   42,  512,  513,   42,  508,
+       42,   42,  516,   42,  514,  518,   42,   42,   42,   42,
+
+       42,  521,  523,   42,   42,   42,   42,  524,  526,  522,
+       42,   42,  519,   42,   42,  528,  520,   42,   42,   42,
+       42,  532,  525,  527,  535,   42,   42,  536,  538,  529,
+      530,  534,   42,  533,  531,  537,   42,   42,  539,  540,
+      543,   42,   42,  542,  541,   42,   42,   42,  545,   42,
+       42,   42,   42,   42,   42,  546,   42,  549,   42,  551,
+      553,   42,  555,   42,  548,  544,   42,   42,  552,  554,
+      547,   42,   42,  556,  550,   42,  559,  561,  557,   42,
+       42,   42,  562,  558,   42,  566,   42,   42,   42,   42,
+       42,  560,   42,   42,   42,  563,  564,  565,  572,   42,
+
+       42,   42,  573,   42,  568,  570,  569,   42,  567,  571,
+      574,  578,   42,   42,   42,  579,  575,   42,   42,   42,
+       42,  582,  577,  576,  583,   42,   42,   42,   42,   42,
+       42,  580,   42,   42,   42,   42,  581,   42,   42,  584,
+       39,   39,   39,   39,   39,   41,   41,   44,   44,   52,
+       42,   52,   52,   52,   54,   54,  137,  137,  137,  137,
+      137,  145,  145,  145,  145,  145,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
-
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
        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
+       42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+       42,   42,  146,   42,  138,  255,   42,   42,   42,  146,
+      138,   42,  136,   42,   40,  585,    3,  585,  585,  585,
+      585,  585,  585,  585,  585,  585,  585,  585,  585,  585,
+      585,  585,  585,  585,  585,  585,  585,  585,  585,  585,
+
+      585,  585,  585,  585,  585,  585,  585,  585,  585,  585,
+      585,  585,  585,  585,  585,  585,  585,  585,  585,  585,
+      585
     } ;
 
-static yyconst short int yy_chk[1282] =
+static yyconst short int yy_chk[1322] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -732,141 +755,146 @@
         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,
-      576,  574,   64,   24,   12,   13,   13,   13,   13,   13,
-       13,   14,   14,   14,   14,   14,   14,   16,   64,   17,
+      393,  393,   65,   24,   12,   13,   13,   13,   13,   13,
+       13,   14,   14,   14,   14,   14,   14,   16,   65,   17,
        31,   19,   18,   16,   16,   16,   16,   19,   17,   19,
-       31,   21,   18,   36,   62,   17,   18,   17,   13,   17,
+       31,   23,   18,   62,   70,   17,   18,   17,   13,   17,
 
-       19,   20,   17,   36,   18,   38,   23,   20,   48,   21,
-       87,   20,   21,   48,   28,   38,   23,   20,   62,   21,
-       20,   22,   23,   65,   28,   56,   58,   22,   87,   22,
-       22,   65,   27,   28,   56,   58,   26,   22,   27,   28,
-       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,  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,
-       32,   46,   46,   46,   46,   46,   32,   73,   32,   32,
-       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,  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,   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,
-
-      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,  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
+       19,   23,   17,   20,   18,   21,   26,   23,   36,   20,
+       70,   18,   26,   20,   38,   37,   37,   62,   36,   20,
+       26,   68,   20,   21,   38,   26,   21,   28,   59,   26,
+       27,   87,   56,   21,   22,   37,   27,   28,   87,   48,
+       22,   56,   22,   22,   48,   68,   28,   35,   59,   27,
+       22,   30,   28,   35,   22,   27,   22,   25,   25,   25,
+       25,   25,   61,   58,   30,   33,   35,   57,  594,   25,
+       67,   33,   58,   30,   61,   30,   60,   66,   33,   25,
+       29,   57,   72,   57,   33,   66,   67,   33,   67,   60,
+       29,   72,   29,   60,   33,   80,   29,   71,   29,  116,
+
+       29,   76,   29,   32,   64,   80,  116,   32,   45,   45,
+       45,   45,   55,   55,   55,   55,   32,   32,   76,   32,
+       32,   32,   71,   32,   46,   46,   46,   46,   46,   32,
+       64,   32,   32,   77,   32,   34,   74,   78,  592,   34,
+       47,   47,   47,   47,   47,   47,   90,   77,   34,   34,
+       81,   34,   75,   34,   82,   34,   78,   34,   83,   90,
+       74,   34,   49,   49,   49,   49,   49,   83,   75,  584,
+       49,   85,  582,   82,   81,   75,   49,   50,   50,   50,
+       50,   50,   50,   51,   51,   51,   51,   51,   85,   79,
+       51,   51,   69,   51,   51,   51,   51,   51,   51,   79,
+
+       69,   86,   88,   69,   84,   84,   84,   84,   84,   89,
+       91,   94,   69,   79,   93,   89,   95,   96,   97,   92,
+       88,   98,   95,   86,   86,   86,   91,   86,   92,  101,
+       93,   98,   99,   96,   94,  101,  100,  103,   95,   97,
+      102,   95,   99,  104,  105,   98,  100,  106,  107,  102,
+      108,  103,  109,  110,  111,  115,   99,  114,  117,  581,
+      109,  119,  104,  110,  108,  113,  105,  114,  109,  112,
+      111,  106,  117,  118,  115,  113,  107,  110,  112,  111,
+      109,  112,  121,  119,  122,  123,  126,  118,  124,  113,
+      125,  127,  130,  112,  150,  118,  121,  130,  129,  123,
+
+      125,  127,  128,  131,  122,  134,  135,  121,  129,  124,
+      126,  128,  128,  150,  125,  127,  132,  131,  133,  131,
+      133,  128,  132,  155,  128,  152,  158,  134,  135,  128,
+      140,  140,  140,  140,  135,  152,  153,  155,  140,  163,
+      164,  165,  158,  156,  140,  142,  142,  142,  142,  142,
+      149,  156,  161,  142,  164,  163,  149,  165,  153,  142,
+      143,  143,  149,  143,  143,  143,  143,  143,  157,  160,
+      162,  166,  167,  169,  157,  161,  162,  170,  160,  167,
+      171,  166,  172,  169,  173,  166,  174,  175,  177,  176,
+      179,  178,  174,  181,  180,  169,  182,  179,  177,  183,
+
+      170,  178,  172,  180,  171,  177,  182,  184,  176,  183,
+      173,  176,  186,  181,  185,  175,  188,  184,  189,  187,
+      190,  191,  186,  193,  204,  188,  194,  195,  197,  207,
+      196,  184,  208,  185,  187,  211,  190,  195,  212,  213,
+      189,  218,  194,  263,  197,  204,  191,  193,  196,  213,
+      214,  263,  218,  207,  227,  225,  208,  210,  210,  210,
+      210,  211,  212,  219,  210,  210,  220,  210,  210,  210,
+      210,  210,  210,  219,  214,  221,  224,  225,  227,  228,
+      229,  230,  231,  234,  220,  251,  232,  233,  238,  241,
+      251,  230,  229,  224,  221,  228,  232,  233,  244,  241,
+
+      224,  245,  231,  246,  232,  247,  249,  238,  244,  234,
+      248,  247,  249,  250,  253,  245,  254,  281,  268,  248,
+      246,  256,  256,  256,  256,  267,  273,  281,  250,  256,
+      360,  267,  273,  253,  268,  256,  261,  360,  257,  257,
+      254,  257,  257,  257,  257,  258,  258,  258,  258,  259,
+      259,  259,  259,  259,  260,  260,  260,  260,  260,  261,
+      262,  264,  266,  270,  271,  272,  274,  276,  275,  277,
+      279,  270,  285,  278,  286,  288,  287,  280,  262,  264,
+      266,  272,  275,  280,  274,  282,  277,  291,  271,  278,
+      295,  292,  279,  282,  293,  276,  285,  292,  286,  287,
+
+      288,  287,  295,  291,  293,  296,  297,  298,  299,  300,
+      301,  304,  308,  309,  311,  305,  313,  459,  307,  316,
+      394,  394,  459,  299,  312,  300,  298,  296,  297,  301,
+      304,  305,  307,  316,  312,  313,  308,  317,  319,  311,
+      309,  318,  318,  326,  320,  317,  321,  322,  330,  319,
+      325,  326,  328,  318,  320,  329,  321,  332,  322,  335,
+      325,  329,  328,  336,  330,  332,  337,  338,  340,  342,
+      335,  344,  337,  345,  336,  351,  346,  346,  347,  347,
+      347,  347,  344,  345,  351,  338,  350,  345,  346,  353,
+      340,  355,  350,  342,  344,  356,  357,  358,  359,  355,
+
+      361,  356,  357,  362,  363,  365,  364,  367,  359,  372,
+      374,  370,  353,  365,  363,  367,  371,  375,  373,  358,
+      361,  377,  378,  362,  364,  370,  374,  372,  373,  379,
+      371,  380,  382,  384,  383,  375,  386,  387,  385,  389,
+      378,  380,  383,  384,  385,  377,  388,  389,  390,  379,
+      382,  387,  391,  392,  395,  396,  388,  397,  398,  400,
+      401,  386,  390,  405,  402,  403,  396,  412,  407,  409,
+      395,  391,  400,  402,  413,  403,  407,  392,  398,  408,
+      410,  409,  414,  405,  401,  397,  411,  418,  408,  415,
+      415,  412,  411,  419,  410,  416,  416,  421,  422,  423,
+
+      414,  418,  413,  425,  426,  427,  429,  430,  434,  423,
+      438,  429,  429,  435,  440,  421,  434,  419,  445,  439,
+      438,  442,  446,  426,  427,  439,  425,  422,  447,  442,
+      435,  430,  449,  450,  451,  453,  454,  455,  440,  465,
+      462,  445,  466,  468,  446,  453,  447,  454,  467,  469,
+      470,  450,  451,  462,  472,  465,  449,  467,  473,  476,
+      477,  455,  478,  469,  479,  466,  480,  468,  470,  482,
+      483,  484,  485,  486,  488,  489,  480,  473,  472,  482,
+      479,  476,  477,  486,  489,  490,  483,  484,  491,  478,
+      493,  494,  488,  496,  485,  490,  497,  498,  499,  502,
+
+      500,  494,  497,  503,  505,  579,  506,  498,  500,  496,
+      507,  508,  491,  511,  512,  503,  493,  510,  518,  522,
+      521,  508,  499,  502,  512,  520,  527,  518,  521,  505,
+      506,  511,  523,  510,  507,  520,  525,  526,  522,  523,
+      527,  529,  532,  526,  525,  533,  534,  535,  532,  537,
+      538,  539,  540,  542,  541,  533,  543,  537,  545,  539,
+      541,  546,  543,  547,  535,  529,  548,  549,  540,  542,
+      534,  551,  552,  545,  538,  557,  548,  551,  546,  553,
+      554,  555,  552,  547,  558,  557,  559,  560,  565,  561,
+      564,  549,  566,  563,  567,  553,  554,  555,  564,  568,
+
+      569,  573,  565,  571,  559,  561,  560,  572,  558,  563,
+      566,  571,  574,  578,  580,  572,  567,  583,  577,  576,
+      575,  578,  569,  568,  580,  570,  562,  556,  550,  544,
+      536,  573,  531,  530,  528,  524,  574,  519,  517,  583,
+      586,  586,  586,  586,  586,  587,  587,  588,  588,  589,
+      516,  589,  589,  589,  590,  590,  591,  591,  591,  591,
+      591,  593,  593,  593,  593,  593,  515,  514,  513,  509,
+      504,  501,  495,  492,  487,  481,  475,  474,  471,  464,
+      463,  461,  460,  458,  457,  456,  452,  448,  444,  443,
+      441,  437,  436,  433,  432,  431,  428,  424,  420,  417,
+
+      406,  404,  399,  381,  376,  369,  368,  366,  354,  352,
+      349,  348,  343,  341,  339,  334,  333,  331,  327,  324,
+      323,  315,  310,  306,  303,  302,  294,  290,  289,  284,
+      283,  269,  265,  252,  243,  242,  240,  239,  237,  236,
+      235,  226,  223,  222,  217,  216,  215,  209,  206,  205,
+      203,  202,  201,  200,  199,  198,  192,  168,  159,  154,
+      151,  148,  145,  141,  137,  136,  120,   73,   63,   53,
+       43,   41,   39,    8,    7,    3,  585,  585,  585,  585,
+      585,  585,  585,  585,  585,  585,  585,  585,  585,  585,
+      585,  585,  585,  585,  585,  585,  585,  585,  585,  585,
+
+      585,  585,  585,  585,  585,  585,  585,  585,  585,  585,
+      585,  585,  585,  585,  585,  585,  585,  585,  585,  585,
+      585
     } ;
 
 static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
@@ -883,7 +911,7 @@
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 1 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 #define INITIAL 0
 /*===-- Lexer.l - Scanner for llvm assembly files --------------*- C++ -*--===//
 //
@@ -898,7 +926,7 @@
 //
 //===----------------------------------------------------------------------===*/
 #define YY_NEVER_INTERACTIVE 1
-#line 28 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 28 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 #include "ParserInternals.h"
 #include "llvm/Module.h"
 #include "llvm/Support/MathExtras.h"
@@ -1020,7 +1048,8 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 1024 "Lexer.cpp"
+/* WSNL - shorthand for newline followed by whitespace */
+#line 1053 "Lexer.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1168,13 +1197,13 @@
 YY_DECL
 	{
 	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
+	register char *yy_cp = NULL, *yy_bp = NULL;
 	register int yy_act;
 
-#line 180 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 182 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 
 
-#line 1178 "Lexer.cpp"
+#line 1207 "Lexer.cpp"
 
 	if ( yy_init )
 		{
@@ -1222,14 +1251,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 >= 568 )
+				if ( yy_current_state >= 586 )
 					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 != 567 );
+		while ( yy_current_state != 585 );
 
 yy_find_action:
 		yy_current_state = *--yy_state_ptr;
@@ -1267,277 +1296,315 @@
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 182 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 184 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { /* Ignore comments for now */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 184 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 186 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return BEGINTOK; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 185 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 187 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return ENDTOK; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 186 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 188 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return TRUETOK;  }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 187 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 189 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return FALSETOK; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 188 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 190 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return DECLARE; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 189 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 191 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return DEFINE; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 190 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 192 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return GLOBAL; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 191 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 193 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return CONSTANT; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 192 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 194 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return INTERNAL; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 193 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 195 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return LINKONCE; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 194 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 196 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return WEAK; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 195 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 197 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return APPENDING; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 196 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 198 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return DLLIMPORT; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 197 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 199 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return DLLEXPORT; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 198 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 200 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return HIDDEN; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 199 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 201 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return PROTECTED; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 200 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 202 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return EXTERN_WEAK; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 201 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 203 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return EXTERNAL; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 202 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 204 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return THREAD_LOCAL; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 203 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 205 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return ZEROINITIALIZER; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 204 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 206 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return DOTDOTDOT; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 205 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 207 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return UNDEF; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 206 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 208 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return NULL_TOK; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 207 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 209 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return TO; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 208 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 210 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return TAIL; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 209 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 211 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return TARGET; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 210 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 212 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return TRIPLE; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 211 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 213 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return DEPLIBS; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 212 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 214 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return DATALAYOUT; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 213 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 215 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return VOLATILE; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 214 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 216 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return ALIGN;  }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 215 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 217 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return SECTION; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 216 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 218 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return ALIAS; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 217 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 219 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return MODULE; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 218 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 220 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return ASM_TOK; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 219 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 221 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return SIDEEFFECT; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 221 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 223 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return CC_TOK; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 222 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 224 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return CCC_TOK; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 223 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 225 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return FASTCC_TOK; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 224 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 226 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return COLDCC_TOK; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 225 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 227 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return X86_STDCALLCC_TOK; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 226 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 228 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return X86_FASTCALLCC_TOK; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 228 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
-{ return INREG; }
+#line 230 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
+{ return SIGNEXT; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 229 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
-{ return SRET;  }
+#line 231 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
+{ return ZEROEXT; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 230 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
-{ return NOUNWIND; }
+#line 232 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
+{ return INREG; }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 231 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
-{ return NORETURN; }
+#line 233 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
+{ return SRET;  }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 232 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
-{ return NOALIAS; }
+#line 234 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
+{ return NOUNWIND; }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 234 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::VoidTy,  VOID);  }
+#line 235 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
+{ return NORETURN; }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 235 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::FloatTy, FLOAT); }
+#line 236 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
+{ return NOALIAS; }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 236 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::DoubleTy,DOUBLE);}
+#line 237 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
+{ return BYVAL; }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 237 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::LabelTy, LABEL); }
+#line 238 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
+{ return NEST; }
 	YY_BREAK
 case 53:
+*yy_cp = yy_hold_char; /* undo effects of setting up yytext */
+yy_c_buf_p = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up yytext again */
+YY_RULE_SETUP
+#line 239 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
+{ // For auto-upgrade only, drop in LLVM 3.0 
+                  return SIGNEXT; } 
+	YY_BREAK
+case 54:
+*yy_cp = yy_hold_char; /* undo effects of setting up yytext */
+yy_c_buf_p = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up yytext again */
+YY_RULE_SETUP
+#line 241 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
+{ // For auto-upgrade only, drop in LLVM 3.0
+                  return ZEROEXT; } 
+	YY_BREAK
+case 55:
+YY_RULE_SETUP
+#line 244 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::VoidTy,  VOID);  }
+	YY_BREAK
+case 56:
 YY_RULE_SETUP
-#line 238 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 245 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::FloatTy, FLOAT); }
+	YY_BREAK
+case 57:
+YY_RULE_SETUP
+#line 246 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::DoubleTy,DOUBLE);}
+	YY_BREAK
+case 58:
+YY_RULE_SETUP
+#line 247 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::LabelTy, LABEL); }
+	YY_BREAK
+case 59:
+YY_RULE_SETUP
+#line 248 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return TYPE;   }
 	YY_BREAK
-case 54:
+case 60:
 YY_RULE_SETUP
-#line 239 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 249 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return OPAQUE; }
 	YY_BREAK
-case 55:
+case 61:
 YY_RULE_SETUP
-#line 240 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 250 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { uint64_t NumBits = atoull(yytext+1);
                   if (NumBits < IntegerType::MIN_INT_BITS || 
                       NumBits > IntegerType::MAX_INT_BITS)
@@ -1546,374 +1613,374 @@
                   RET_TY(Ty, INTTYPE);
                 }
 	YY_BREAK
-case 56:
+case 62:
 YY_RULE_SETUP
-#line 248 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 258 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Add, ADD); }
 	YY_BREAK
-case 57:
+case 63:
 YY_RULE_SETUP
-#line 249 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 259 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Sub, SUB); }
 	YY_BREAK
-case 58:
+case 64:
 YY_RULE_SETUP
-#line 250 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 260 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Mul, MUL); }
 	YY_BREAK
-case 59:
+case 65:
 YY_RULE_SETUP
-#line 251 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 261 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, UDiv, UDIV); }
 	YY_BREAK
-case 60:
+case 66:
 YY_RULE_SETUP
-#line 252 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 262 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SDiv, SDIV); }
 	YY_BREAK
-case 61:
+case 67:
 YY_RULE_SETUP
-#line 253 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 263 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, FDiv, FDIV); }
 	YY_BREAK
-case 62:
+case 68:
 YY_RULE_SETUP
-#line 254 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 264 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, URem, UREM); }
 	YY_BREAK
-case 63:
+case 69:
 YY_RULE_SETUP
-#line 255 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 265 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SRem, SREM); }
 	YY_BREAK
-case 64:
+case 70:
 YY_RULE_SETUP
-#line 256 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 266 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, FRem, FREM); }
 	YY_BREAK
-case 65:
+case 71:
 YY_RULE_SETUP
-#line 257 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 267 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Shl, SHL); }
 	YY_BREAK
-case 66:
+case 72:
 YY_RULE_SETUP
-#line 258 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 268 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, LShr, LSHR); }
 	YY_BREAK
-case 67:
+case 73:
 YY_RULE_SETUP
-#line 259 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 269 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, AShr, ASHR); }
 	YY_BREAK
-case 68:
+case 74:
 YY_RULE_SETUP
-#line 260 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 270 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, And, AND); }
 	YY_BREAK
-case 69:
+case 75:
 YY_RULE_SETUP
-#line 261 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 271 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Or , OR ); }
 	YY_BREAK
-case 70:
+case 76:
 YY_RULE_SETUP
-#line 262 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 272 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Xor, XOR); }
 	YY_BREAK
-case 71:
+case 77:
 YY_RULE_SETUP
-#line 263 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 273 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal,  ICmp,  ICMP); }
 	YY_BREAK
-case 72:
+case 78:
 YY_RULE_SETUP
-#line 264 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 274 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal,  FCmp,  FCMP); }
 	YY_BREAK
-case 73:
+case 79:
 YY_RULE_SETUP
-#line 266 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 276 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return EQ;  }
 	YY_BREAK
-case 74:
+case 80:
 YY_RULE_SETUP
-#line 267 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 277 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return NE;  }
 	YY_BREAK
-case 75:
+case 81:
 YY_RULE_SETUP
-#line 268 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 278 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return SLT; }
 	YY_BREAK
-case 76:
+case 82:
 YY_RULE_SETUP
-#line 269 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 279 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return SGT; }
 	YY_BREAK
-case 77:
+case 83:
 YY_RULE_SETUP
-#line 270 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 280 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return SLE; }
 	YY_BREAK
-case 78:
+case 84:
 YY_RULE_SETUP
-#line 271 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 281 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return SGE; }
 	YY_BREAK
-case 79:
+case 85:
 YY_RULE_SETUP
-#line 272 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 282 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return ULT; }
 	YY_BREAK
-case 80:
+case 86:
 YY_RULE_SETUP
-#line 273 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 283 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return UGT; }
 	YY_BREAK
-case 81:
+case 87:
 YY_RULE_SETUP
-#line 274 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 284 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return ULE; }
 	YY_BREAK
-case 82:
+case 88:
 YY_RULE_SETUP
-#line 275 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 285 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return UGE; }
 	YY_BREAK
-case 83:
+case 89:
 YY_RULE_SETUP
-#line 276 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 286 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return OEQ; }
 	YY_BREAK
-case 84:
+case 90:
 YY_RULE_SETUP
-#line 277 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 287 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return ONE; }
 	YY_BREAK
-case 85:
+case 91:
 YY_RULE_SETUP
-#line 278 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 288 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return OLT; }
 	YY_BREAK
-case 86:
+case 92:
 YY_RULE_SETUP
-#line 279 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 289 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return OGT; }
 	YY_BREAK
-case 87:
+case 93:
 YY_RULE_SETUP
-#line 280 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 290 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return OLE; }
 	YY_BREAK
-case 88:
+case 94:
 YY_RULE_SETUP
-#line 281 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 291 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return OGE; }
 	YY_BREAK
-case 89:
+case 95:
 YY_RULE_SETUP
-#line 282 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 292 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return ORD; }
 	YY_BREAK
-case 90:
+case 96:
 YY_RULE_SETUP
-#line 283 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 293 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return UNO; }
 	YY_BREAK
-case 91:
+case 97:
 YY_RULE_SETUP
-#line 284 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 294 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return UEQ; }
 	YY_BREAK
-case 92:
+case 98:
 YY_RULE_SETUP
-#line 285 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 295 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return UNE; }
 	YY_BREAK
-case 93:
+case 99:
 YY_RULE_SETUP
-#line 287 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 297 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, PHI, PHI_TOK); }
 	YY_BREAK
-case 94:
+case 100:
 YY_RULE_SETUP
-#line 288 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 298 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Call, CALL); }
 	YY_BREAK
-case 95:
+case 101:
 YY_RULE_SETUP
-#line 289 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 299 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, Trunc, TRUNC); }
 	YY_BREAK
-case 96:
+case 102:
 YY_RULE_SETUP
-#line 290 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 300 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, ZExt, ZEXT); }
 	YY_BREAK
-case 97:
+case 103:
 YY_RULE_SETUP
-#line 291 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 301 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, SExt, SEXT); }
 	YY_BREAK
-case 98:
+case 104:
 YY_RULE_SETUP
-#line 292 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 302 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, FPTrunc, FPTRUNC); }
 	YY_BREAK
-case 99:
+case 105:
 YY_RULE_SETUP
-#line 293 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 303 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, FPExt, FPEXT); }
 	YY_BREAK
-case 100:
+case 106:
 YY_RULE_SETUP
-#line 294 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 304 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, UIToFP, UITOFP); }
 	YY_BREAK
-case 101:
+case 107:
 YY_RULE_SETUP
-#line 295 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 305 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, SIToFP, SITOFP); }
 	YY_BREAK
-case 102:
+case 108:
 YY_RULE_SETUP
-#line 296 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 306 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, FPToUI, FPTOUI); }
 	YY_BREAK
-case 103:
+case 109:
 YY_RULE_SETUP
-#line 297 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 307 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, FPToSI, FPTOSI); }
 	YY_BREAK
-case 104:
+case 110:
 YY_RULE_SETUP
-#line 298 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 308 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, IntToPtr, INTTOPTR); }
 	YY_BREAK
-case 105:
+case 111:
 YY_RULE_SETUP
-#line 299 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 309 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, PtrToInt, PTRTOINT); }
 	YY_BREAK
-case 106:
+case 112:
 YY_RULE_SETUP
-#line 300 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 310 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, BitCast, BITCAST); }
 	YY_BREAK
-case 107:
+case 113:
 YY_RULE_SETUP
-#line 301 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 311 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Select, SELECT); }
 	YY_BREAK
-case 108:
+case 114:
 YY_RULE_SETUP
-#line 302 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 312 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, VAArg , VAARG); }
 	YY_BREAK
-case 109:
+case 115:
 YY_RULE_SETUP
-#line 303 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 313 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Ret, RET); }
 	YY_BREAK
-case 110:
+case 116:
 YY_RULE_SETUP
-#line 304 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 314 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Br, BR); }
 	YY_BREAK
-case 111:
+case 117:
 YY_RULE_SETUP
-#line 305 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 315 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Switch, SWITCH); }
 	YY_BREAK
-case 112:
+case 118:
 YY_RULE_SETUP
-#line 306 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 316 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Invoke, INVOKE); }
 	YY_BREAK
-case 113:
+case 119:
 YY_RULE_SETUP
-#line 307 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 317 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
-case 114:
+case 120:
 YY_RULE_SETUP
-#line 308 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 318 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
 	YY_BREAK
-case 115:
+case 121:
 YY_RULE_SETUP
-#line 310 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 320 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Malloc, MALLOC); }
 	YY_BREAK
-case 116:
+case 122:
 YY_RULE_SETUP
-#line 311 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 321 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Alloca, ALLOCA); }
 	YY_BREAK
-case 117:
+case 123:
 YY_RULE_SETUP
-#line 312 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 322 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Free, FREE); }
 	YY_BREAK
-case 118:
+case 124:
 YY_RULE_SETUP
-#line 313 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 323 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Load, LOAD); }
 	YY_BREAK
-case 119:
+case 125:
 YY_RULE_SETUP
-#line 314 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 324 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Store, STORE); }
 	YY_BREAK
-case 120:
+case 126:
 YY_RULE_SETUP
-#line 315 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 325 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
 	YY_BREAK
-case 121:
+case 127:
 YY_RULE_SETUP
-#line 317 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 327 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
 	YY_BREAK
-case 122:
+case 128:
 YY_RULE_SETUP
-#line 318 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 328 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
 	YY_BREAK
-case 123:
+case 129:
 YY_RULE_SETUP
-#line 319 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 329 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
 	YY_BREAK
-case 124:
+case 130:
 YY_RULE_SETUP
-#line 322 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 332 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 {
                   llvmAsmlval.StrVal = new std::string(yytext+1);   // Skip %
                   return LOCALVAR;
                 }
 	YY_BREAK
-case 125:
+case 131:
 YY_RULE_SETUP
-#line 326 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 336 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 {
                   llvmAsmlval.StrVal = new std::string(yytext+1);   // Skip @
                   return GLOBALVAR;
                 }
 	YY_BREAK
-case 126:
+case 132:
 YY_RULE_SETUP
-#line 330 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 340 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 {
                   yytext[yyleng-1] = 0;            // nuke colon
                   llvmAsmlval.StrVal = new std::string(yytext);
                   return LABELSTR;
                 }
 	YY_BREAK
-case 127:
+case 133:
 YY_RULE_SETUP
-#line 335 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 345 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 {
                   yytext[yyleng-2] = 0;  // nuke colon, end quote
                   const char* EndChar = UnEscapeLexed(yytext+1, yytext+yyleng);
@@ -1922,9 +1989,9 @@
                   return LABELSTR;
                 }
 	YY_BREAK
-case 128:
+case 134:
 YY_RULE_SETUP
-#line 343 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 353 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { yytext[yyleng-1] = 0;           // nuke end quote
                    const char* EndChar = UnEscapeLexed(yytext+1, yytext+yyleng);
                    llvmAsmlval.StrVal = 
@@ -1932,9 +1999,9 @@
                    return STRINGCONSTANT;
                  }
 	YY_BREAK
-case 129:
+case 135:
 YY_RULE_SETUP
-#line 349 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 359 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 {
                      yytext[yyleng-1] = 0;         // nuke end quote
                      const char* EndChar = 
@@ -1944,9 +2011,9 @@
                      return ATSTRINGCONSTANT;
                    }
 	YY_BREAK
-case 130:
+case 136:
 YY_RULE_SETUP
-#line 357 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 367 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 {
                      yytext[yyleng-1] = 0;           // nuke end quote
                      const char* EndChar = 
@@ -1956,9 +2023,9 @@
                      return PCTSTRINGCONSTANT;
                    }
 	YY_BREAK
-case 131:
+case 137:
 YY_RULE_SETUP
-#line 365 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 375 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { 
                   uint32_t numBits = ((yyleng * 64) / 19) + 1;
                   APInt Tmp(numBits, yytext, yyleng, 10);
@@ -1974,9 +2041,9 @@
                   }
                 }
 	YY_BREAK
-case 132:
+case 138:
 YY_RULE_SETUP
-#line 379 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 389 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 {
                   uint32_t numBits = (((yyleng-1) * 64) / 19) + 2;
                   APInt Tmp(numBits, yytext, yyleng, 10);
@@ -1992,9 +2059,9 @@
                   }
                 }
 	YY_BREAK
-case 133:
+case 139:
 YY_RULE_SETUP
-#line 394 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 404 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { int len = yyleng - 3;
                    uint32_t bits = len * 4;
                    APInt Tmp(bits, yytext+3, len, 16);
@@ -2013,9 +2080,9 @@
                    }
                  }
 	YY_BREAK
-case 134:
+case 140:
 YY_RULE_SETUP
-#line 412 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 422 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   if ((unsigned)Val != Val)
@@ -2024,9 +2091,9 @@
                   return LOCALVAL_ID;
                 }
 	YY_BREAK
-case 135:
+case 141:
 YY_RULE_SETUP
-#line 419 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 429 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   if ((unsigned)Val != Val)
@@ -2035,18 +2102,18 @@
                   return GLOBALVAL_ID;
                 }
 	YY_BREAK
-case 136:
+case 142:
 YY_RULE_SETUP
-#line 427 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 437 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = atof(yytext); return FPVAL; }
 	YY_BREAK
-case 137:
+case 143:
 YY_RULE_SETUP
-#line 428 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 438 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = HexToFP(yytext); return FPVAL; }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 430 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 440 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
@@ -2055,22 +2122,22 @@
                   return EOF;
                 }
 	YY_BREAK
-case 138:
+case 144:
 YY_RULE_SETUP
-#line 438 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 448 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { /* Ignore whitespace */ }
 	YY_BREAK
-case 139:
+case 145:
 YY_RULE_SETUP
-#line 439 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 449 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 { return yytext[0]; }
 	YY_BREAK
-case 140:
+case 146:
 YY_RULE_SETUP
-#line 441 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 451 "/proj/llvm/head/llvm/lib/AsmParser/Lexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2074 "Lexer.cpp"
+#line 2141 "Lexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2357,7 +2424,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 >= 568 )
+			if ( yy_current_state >= 586 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2387,11 +2454,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 >= 568 )
+		if ( yy_current_state >= 586 )
 			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 == 567);
+	yy_is_jam = (yy_current_state == 585);
 	if ( ! yy_is_jam )
 		*yy_state_ptr++ = yy_current_state;
 
@@ -2446,6 +2513,7 @@
 #endif	/* ifndef YY_NO_UNPUT */
 
 
+#ifndef YY_NO_INPUT
 #ifdef __cplusplus
 static int yyinput()
 #else
@@ -2519,7 +2587,7 @@
 
 	return c;
 	}
-
+#endif /* YY_NO_INPUT */
 
 #ifdef YY_USE_PROTOS
 void yyrestart( FILE *input_file )
@@ -2630,11 +2698,6 @@
 	}
 
 
-#ifndef YY_ALWAYS_INTERACTIVE
-#ifndef YY_NEVER_INTERACTIVE
-extern int isatty YY_PROTO(( int ));
-#endif
-#endif
 
 #ifdef YY_USE_PROTOS
 void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
@@ -2952,5 +3015,5 @@
 	return 0;
 	}
 #endif
-#line 441 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 451 "/proj/llvm/head/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=40611&r1=40610&r2=40611&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/Lexer.l.cvs (original)
+++ llvm/trunk/lib/AsmParser/Lexer.l.cvs Mon Jul 30 22:50:36 2007
@@ -177,6 +177,8 @@
  */
 HexIntConstant [us]0x[0-9A-Fa-f]+
 
+/* WSNL - shorthand for newline followed by whitespace */
+WSNL [ \r\t\n]*$
 %%
 
 {Comment}       { /* Ignore comments for now */ }
@@ -225,11 +227,19 @@
 x86_stdcallcc   { return X86_STDCALLCC_TOK; }
 x86_fastcallcc  { return X86_FASTCALLCC_TOK; }
 
+signext         { return SIGNEXT; }
+zeroext         { return ZEROEXT; }
 inreg           { return INREG; }
 sret            { return SRET;  }
 nounwind        { return NOUNWIND; }
 noreturn        { return NORETURN; }
 noalias         { return NOALIAS; }
+byval           { return BYVAL; }
+nest            { return NEST; }
+sext{WSNL}      { // For auto-upgrade only, drop in LLVM 3.0 
+                  return SIGNEXT; } 
+zext{WSNL}      { // For auto-upgrade only, drop in LLVM 3.0
+                  return ZEROEXT; } 
 
 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=40611&r1=40610&r2=40611&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs Mon Jul 30 22:50:36 2007
@@ -1,154 +1,358 @@
+/* A Bison parser, made by GNU Bison 2.1.  */
 
-/*  A Bison parser, made from /Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y
-    by GNU Bison version 1.28  */
+/* Skeleton parser for Yacc-like parsing with Bison,
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-#define YYBISON 1  /* Identify Bison output.  */
+   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
 
+/* 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
 
-#line 14 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+
+/* 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,
+     SIGNEXT = 386,
+     ZEROEXT = 387,
+     NORETURN = 388,
+     INREG = 389,
+     SRET = 390,
+     NOUNWIND = 391,
+     NOALIAS = 392,
+     BYVAL = 393,
+     NEST = 394,
+     DEFAULT = 395,
+     HIDDEN = 396,
+     PROTECTED = 397
+   };
+#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 SIGNEXT 386
+#define ZEROEXT 387
+#define NORETURN 388
+#define INREG 389
+#define SRET 390
+#define NOUNWIND 391
+#define NOALIAS 392
+#define BYVAL 393
+#define NEST 394
+#define DEFAULT 395
+#define HIDDEN 396
+#define PROTECTED 397
+
+
+
+
+/* Copy the first part of user declarations.  */
+#line 14 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -1091,8 +1295,28 @@
 }
 
 
-#line 957 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-typedef union {
+
+/* 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/head/llvm/lib/AsmParser/llvmAsmParser.y"
+typedef union YYSTYPE {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   llvm::BasicBlock                       *BasicBlockVal;
@@ -1138,1097 +1362,1572 @@
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
 } YYSTYPE;
-#include <stdio.h>
+/* Line 196 of yacc.c.  */
+#line 1367 "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 1379 "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 */
 
-#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;
+  };
 
-#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 the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
 
-#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
-};
+/* 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)
 
-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
-};
+#endif
 
+#if defined (__STDC__) || defined (__cplusplus)
+   typedef signed char yysigned_char;
+#else
+   typedef short int yysigned_char;
 #endif
 
-#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
+/* YYFINAL -- State number of the termination state. */
+#define YYFINAL  43
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   1553
+
+/* YYNTOKENS -- Number of terminals. */
+#define YYNTOKENS  157
+/* YYNNTS -- Number of nonterminals. */
+#define YYNNTS  82
+/* YYNRULES -- Number of rules. */
+#define YYNRULES  304
+/* YYNRULES -- Number of states. */
+#define YYNSTATES  588
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   397
+
+#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,
+     147,   148,   145,     2,   144,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     152,   143,   153,     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,   149,   146,   151,     2,     2,     2,     2,     2,   156,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     150,     2,     2,   154,     2,   155,     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,   138,   139,   140,   141,   142
 };
-#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,   204,   206,   208,   210,   212,
+     213,   216,   218,   220,   222,   224,   225,   228,   229,   232,
+     233,   237,   240,   241,   243,   244,   248,   250,   253,   255,
+     257,   259,   261,   263,   265,   268,   270,   273,   279,   285,
+     291,   297,   301,   304,   310,   315,   318,   320,   322,   324,
+     328,   330,   334,   336,   337,   339,   343,   348,   352,   356,
+     361,   366,   370,   377,   383,   386,   389,   392,   395,   398,
+     401,   404,   407,   410,   413,   416,   419,   426,   432,   441,
+     448,   455,   463,   471,   478,   487,   496,   500,   502,   504,
+     506,   508,   509,   512,   519,   521,   522,   524,   527,   528,
+     532,   533,   537,   541,   545,   549,   550,   558,   559,   568,
+     569,   578,   584,   587,   591,   593,   597,   601,   605,   609,
+     611,   612,   618,   622,   624,   628,   630,   631,   641,   643,
+     645,   650,   652,   654,   657,   661,   662,   664,   666,   668,
+     670,   672,   674,   676,   678,   680,   684,   686,   692,   694,
+     696,   698,   700,   702,   704,   707,   710,   713,   717,   720,
+     721,   723,   726,   729,   733,   743,   753,   762,   777,   779,
+     781,   788,   794,   797,   804,   812,   816,   822,   823,   824,
+     828,   831,   833,   839,   845,   852,   859,   864,   871,   876,
+     881,   888,   895,   898,   907,   909,   911,   912,   916,   923,
+     927,   934,   937,   943,   951
+};
 
-#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
+/* YYRHS -- A `-1'-separated list of the rules' RHS. */
+static const short int yyrhs[] =
+{
+     201,     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,   165,    -1,    -1,   165,   143,    -1,    -1,    17,    -1,
+      20,    -1,   170,    -1,    -1,   168,   143,    -1,    39,    -1,
+      41,    -1,    40,    -1,    42,    -1,    44,    -1,    43,    -1,
+      45,    -1,    47,    -1,    -1,   140,    -1,   141,    -1,   142,
+      -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,   132,    -1,   114,    -1,   131,    -1,
+     115,    -1,   134,    -1,   135,    -1,   137,    -1,   138,    -1,
+     139,    -1,    -1,   179,   178,    -1,   133,    -1,   136,    -1,
+     132,    -1,   131,    -1,    -1,   181,   180,    -1,    -1,    50,
+       4,    -1,    -1,   144,    50,     4,    -1,    31,    19,    -1,
+      -1,   184,    -1,    -1,   144,   187,   186,    -1,   184,    -1,
+      50,     4,    -1,    11,    -1,    12,    -1,    13,    -1,    14,
+      -1,    46,    -1,   188,    -1,   189,   145,    -1,   223,    -1,
+     146,     4,    -1,   189,   147,   193,   148,   181,    -1,    10,
+     147,   193,   148,   181,    -1,   149,     4,   150,   189,   151,
+      -1,   152,     4,   150,   189,   153,    -1,   154,   194,   155,
+      -1,   154,   155,    -1,   152,   154,   194,   155,   153,    -1,
+     152,   154,   155,   153,    -1,   189,   179,    -1,   189,    -1,
+      10,    -1,   190,    -1,   192,   144,   190,    -1,   192,    -1,
+     192,   144,    36,    -1,    36,    -1,    -1,   189,    -1,   194,
+     144,   189,    -1,   189,   149,   197,   151,    -1,   189,   149,
+     151,    -1,   189,   156,    19,    -1,   189,   152,   197,   153,
+      -1,   189,   154,   197,   155,    -1,   189,   154,   155,    -1,
+     189,   152,   154,   197,   155,   153,    -1,   189,   152,   154,
+     155,   153,    -1,   189,    37,    -1,   189,    38,    -1,   189,
+     223,    -1,   189,   196,    -1,   189,    22,    -1,   163,     3,
+      -1,   163,     5,    -1,   163,     4,    -1,   163,     6,    -1,
+      11,    23,    -1,    11,    24,    -1,   164,     9,    -1,   160,
+     147,   195,    35,   189,   148,    -1,   112,   147,   195,   234,
+     148,    -1,   126,   147,   195,   144,   195,   144,   195,   148,
+      -1,   158,   147,   195,   144,   195,   148,    -1,   159,   147,
+     195,   144,   195,   148,    -1,    85,   161,   147,   195,   144,
+     195,   148,    -1,    86,   162,   147,   195,   144,   195,   148,
+      -1,   128,   147,   195,   144,   195,   148,    -1,   129,   147,
+     195,   144,   195,   144,   195,   148,    -1,   130,   147,   195,
+     144,   195,   144,   195,   148,    -1,   197,   144,   195,    -1,
+     195,    -1,    29,    -1,    30,    -1,    34,    -1,    -1,   191,
+     223,    -1,   118,   147,   200,    35,   189,   148,    -1,   202,
+      -1,    -1,   203,    -1,   202,   203,    -1,    -1,    28,   204,
+     219,    -1,    -1,    27,   205,   220,    -1,    55,    54,   209,
+      -1,   167,    15,   189,    -1,   167,    15,    10,    -1,    -1,
+     169,   173,   199,   198,   195,   206,   186,    -1,    -1,   169,
+     171,   173,   199,   198,   195,   207,   186,    -1,    -1,   169,
+     172,   173,   199,   198,   189,   208,   186,    -1,   169,   173,
+      32,   176,   200,    -1,    48,   210,    -1,    51,   143,   211,
+      -1,    19,    -1,    49,   143,    19,    -1,    63,   143,    19,
+      -1,   149,   212,   151,    -1,   212,   144,    19,    -1,    19,
+      -1,    -1,   213,   144,   189,   179,   166,    -1,   189,   179,
+     166,    -1,   213,    -1,   213,   144,    36,    -1,    36,    -1,
+      -1,   177,   191,   168,   147,   214,   148,   181,   185,   182,
+      -1,    25,    -1,   154,    -1,   175,   173,   215,   216,    -1,
+      26,    -1,   155,    -1,   226,   218,    -1,   174,   173,   215,
+      -1,    -1,    56,    -1,     3,    -1,     4,    -1,     9,    -1,
+      23,    -1,    24,    -1,    37,    -1,    38,    -1,    22,    -1,
+     152,   197,   153,    -1,   196,    -1,    54,   221,    19,   144,
+      19,    -1,     7,    -1,     8,    -1,   165,    -1,   168,    -1,
+     223,    -1,   222,    -1,   189,   224,    -1,   226,   227,    -1,
+     217,   227,    -1,   228,   167,   229,    -1,   228,   231,    -1,
+      -1,    18,    -1,    64,   225,    -1,    64,    10,    -1,    65,
+      14,   224,    -1,    65,    11,   224,   144,    14,   224,   144,
+      14,   224,    -1,    66,   163,   224,   144,    14,   224,   149,
+     230,   151,    -1,    66,   163,   224,   144,    14,   224,   149,
+     151,    -1,    67,   177,   191,   224,   147,   233,   148,   181,
+      35,    14,   224,    68,    14,   224,    -1,    68,    -1,    69,
+      -1,   230,   163,   222,   144,    14,   224,    -1,   163,   222,
+     144,    14,   224,    -1,   167,   236,    -1,   189,   149,   224,
+     144,   224,   151,    -1,   232,   144,   149,   224,   144,   224,
+     151,    -1,   189,   224,   179,    -1,   233,   144,   189,   224,
+     179,    -1,    -1,    -1,   234,   144,   225,    -1,    53,    52,
+      -1,    52,    -1,   158,   189,   224,   144,   224,    -1,   159,
+     189,   224,   144,   224,    -1,    85,   161,   189,   224,   144,
+     224,    -1,    86,   162,   189,   224,   144,   224,    -1,   160,
+     225,    35,   189,    -1,   126,   225,   144,   225,   144,   225,
+      -1,   127,   225,   144,   189,    -1,   128,   225,   144,   225,
+      -1,   129,   225,   144,   225,   144,   225,    -1,   130,   225,
+     144,   225,   144,   225,    -1,   125,   232,    -1,   235,   177,
+     191,   224,   147,   233,   148,   181,    -1,   238,    -1,    33,
+      -1,    -1,   107,   189,   183,    -1,   107,   189,   144,    11,
+     224,   183,    -1,   108,   189,   183,    -1,   108,   189,   144,
+      11,   224,   183,    -1,   109,   225,    -1,   237,   110,   189,
+     224,   183,    -1,   237,   111,   225,   144,   189,   224,   183,
+      -1,   112,   189,   224,   234,    -1
+};
 
-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
+/* 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,  1231,  1232,  1233,  1234,  1235,  1238,
+    1239,  1244,  1245,  1246,  1247,  1250,  1251,  1258,  1259,  1265,
+    1266,  1274,  1282,  1283,  1288,  1289,  1290,  1295,  1308,  1308,
+    1308,  1308,  1311,  1315,  1319,  1326,  1331,  1339,  1369,  1400,
+    1405,  1417,  1427,  1431,  1441,  1448,  1455,  1462,  1467,  1472,
+    1479,  1480,  1487,  1494,  1502,  1508,  1520,  1548,  1564,  1591,
+    1619,  1645,  1665,  1691,  1711,  1723,  1730,  1796,  1806,  1816,
+    1822,  1832,  1838,  1848,  1853,  1858,  1866,  1878,  1900,  1908,
+    1914,  1925,  1930,  1935,  1941,  1947,  1956,  1960,  1968,  1968,
+    1971,  1971,  1974,  1985,  2006,  2011,  2019,  2020,  2024,  2024,
+    2028,  2028,  2031,  2034,  2058,  2069,  2069,  2080,  2079,  2089,
+    2088,  2099,  2118,  2121,  2127,  2137,  2141,  2146,  2148,  2153,
+    2158,  2167,  2177,  2188,  2192,  2201,  2210,  2215,  2336,  2336,
+    2338,  2347,  2347,  2349,  2354,  2366,  2370,  2375,  2379,  2383,
+    2387,  2391,  2395,  2399,  2403,  2407,  2432,  2436,  2446,  2450,
+    2454,  2459,  2466,  2466,  2472,  2481,  2485,  2494,  2503,  2512,
+    2516,  2523,  2527,  2531,  2536,  2546,  2565,  2574,  2654,  2658,
+    2665,  2676,  2689,  2699,  2710,  2720,  2729,  2738,  2741,  2742,
+    2749,  2753,  2758,  2779,  2796,  2810,  2824,  2836,  2844,  2851,
+    2857,  2863,  2869,  2884,  2969,  2974,  2978,  2985,  2992,  3000,
+    3007,  3015,  3023,  3037,  3054
 };
 #endif
 
-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
+#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", "SIGNEXT", "ZEROEXT", "NORETURN", "INREG", "SRET",
+  "NOUNWIND", "NOALIAS", "BYVAL", "NEST", "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
 };
+#endif
 
-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
+# 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,   393,   394,
+     395,   396,   397,    61,    44,    42,    92,    40,    41,    91,
+     120,    93,    60,    62,   123,   125,    99
 };
+# endif
 
-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
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const unsigned char yyr1[] =
+{
+       0,   157,   158,   158,   158,   158,   158,   158,   158,   158,
+     158,   159,   159,   159,   159,   159,   159,   160,   160,   160,
+     160,   160,   160,   160,   160,   160,   160,   160,   160,   161,
+     161,   161,   161,   161,   161,   161,   161,   161,   161,   162,
+     162,   162,   162,   162,   162,   162,   162,   162,   162,   162,
+     162,   162,   162,   162,   162,   163,   164,   164,   165,   165,
+     165,   166,   166,   167,   167,   168,   168,   169,   169,   170,
+     171,   171,   171,   171,   171,   172,   172,   172,   173,   173,
+     173,   173,   174,   174,   174,   175,   175,   175,   175,   175,
+     176,   176,   176,   177,   177,   177,   177,   177,   177,   177,
+     178,   178,   178,   178,   178,   178,   178,   178,   178,   179,
+     179,   180,   180,   180,   180,   181,   181,   182,   182,   183,
+     183,   184,   185,   185,   186,   186,   187,   187,   188,   188,
+     188,   188,   189,   189,   189,   189,   189,   189,   189,   189,
+     189,   189,   189,   189,   189,   190,   191,   191,   192,   192,
+     193,   193,   193,   193,   194,   194,   195,   195,   195,   195,
+     195,   195,   195,   195,   195,   195,   195,   195,   195,   195,
+     195,   195,   195,   195,   195,   195,   196,   196,   196,   196,
+     196,   196,   196,   196,   196,   196,   197,   197,   198,   198,
+     199,   199,   200,   200,   201,   201,   202,   202,   204,   203,
+     205,   203,   203,   203,   203,   206,   203,   207,   203,   208,
+     203,   203,   203,   203,   209,   210,   210,   211,   212,   212,
+     212,   213,   213,   214,   214,   214,   214,   215,   216,   216,
+     217,   218,   218,   219,   220,   221,   221,   222,   222,   222,
+     222,   222,   222,   222,   222,   222,   222,   222,   223,   223,
+     223,   223,   224,   224,   225,   226,   226,   227,   228,   228,
+     228,   229,   229,   229,   229,   229,   229,   229,   229,   229,
+     230,   230,   231,   232,   232,   233,   233,   233,   234,   234,
+     235,   235,   236,   236,   236,   236,   236,   236,   236,   236,
+     236,   236,   236,   236,   236,   237,   237,   238,   238,   238,
+     238,   238,   238,   238,   238
 };
 
-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
+/* 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,     1,     1,     1,     1,     1,     0,
+       2,     1,     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 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
+/* 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,   200,   198,     0,     0,
+       0,     0,     0,     0,    78,    67,     0,    68,   196,    82,
+      85,     0,     0,   212,     0,     0,    63,     0,    69,    70,
+      72,    71,    73,    75,    74,    76,    77,    79,    80,    81,
+      78,    78,   191,     1,   197,    83,    84,    78,   201,    86,
+      87,    88,    89,    78,   259,   199,   259,     0,     0,   220,
+     213,   214,   202,   248,   249,   204,   128,   129,   130,   131,
+     132,     0,     0,     0,     0,   250,   251,   133,   203,   135,
+     191,   191,    90,   190,     0,    93,    93,   260,   256,    64,
+     231,   232,   233,   255,   215,   216,   219,     0,   153,   136,
+       0,     0,     0,     0,   142,   154,     0,   134,   153,     0,
+       0,    92,    91,     0,   188,   189,     0,     0,    94,    95,
+      96,    97,    98,     0,   234,     0,   296,   258,     0,   217,
+     152,   109,   148,   150,     0,     0,     0,     0,     0,     0,
+     141,     0,     0,     0,   147,     0,   146,     0,   211,   128,
+     129,   130,     0,     0,     0,   205,    99,     0,   228,   229,
+     230,   295,   281,     0,     0,     0,     0,    93,   268,   269,
+       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,   257,    93,   272,     0,   294,   218,   145,     0,
+     115,     0,     0,   144,     0,   155,   115,   207,   209,     0,
+     192,   173,   174,   169,   171,   170,   172,   175,   168,   164,
+     165,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   167,   166,   124,     0,   280,
+     262,     0,   261,     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,   119,   119,   301,     0,
+       0,   292,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   101,   103,   102,   100,   104,   105,   106,
+     107,   108,   110,   151,   149,   138,   139,   140,   143,   137,
+     124,   124,     0,     0,     0,     0,     0,     0,     0,     0,
+     157,   187,     0,     0,     0,   161,     0,   158,     0,     0,
+       0,     0,   206,   226,   237,   238,   239,   244,   240,   241,
+     242,   243,   235,     0,   246,   253,   252,   254,     0,   263,
+       0,     0,     0,     0,     0,   297,     0,   299,   278,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   114,   113,   111,   112,   116,   208,   210,     0,
+       0,     0,   278,     0,     0,     0,     0,     0,   156,   142,
+     154,     0,   159,   160,     0,     0,     0,     0,     0,   126,
+     124,   225,   109,   223,     0,   236,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   304,     0,     0,     0,
+     288,   289,     0,     0,     0,     0,   286,     0,   119,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   186,   163,
+       0,     0,     0,     0,   121,   127,   125,    62,     0,   115,
+       0,   245,     0,     0,   277,     0,     0,   119,   120,   119,
+       0,     0,     0,     0,     0,     0,   282,   283,   277,     0,
+     302,     0,   193,     0,     0,   177,     0,     0,     0,     0,
+     162,     0,     0,     0,    61,   222,   224,   109,   122,     0,
+       0,     0,     0,     0,   284,   285,   298,   300,   279,     0,
+       0,   287,   290,   291,     0,   119,     0,     0,     0,   183,
+       0,     0,   179,   180,   176,    62,   123,   117,   247,     0,
+       0,   109,     0,   115,   273,     0,   115,   303,   181,   182,
+       0,     0,     0,   221,     0,   227,     0,   266,     0,     0,
+     275,     0,     0,   274,   293,   178,   184,   185,   118,   264,
+       0,   265,     0,   109,     0,     0,     0,   276,     0,     0,
+       0,     0,   271,     0,     0,   270,     0,   267
 };
 
-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
+/* YYDEFGOTO[NTERM-NUM]. */
+static const short int yydefgoto[] =
+{
+      -1,   252,   253,   254,   278,   295,   152,   153,    75,   505,
+      12,    76,    14,    15,    40,    41,    42,    47,    53,   113,
+     123,   322,   218,   396,   325,   555,   375,   419,   537,   352,
+     420,    77,   154,   132,   147,   133,   134,   106,   341,   364,
+     342,   116,    84,   148,    16,    17,    18,    20,    19,   257,
+     330,   331,    62,    23,    60,    97,   423,   424,   124,   160,
+      54,    92,    55,    48,   426,   365,    79,   367,   262,    56,
+      88,    89,   212,   559,   127,   301,   513,   436,   213,   214,
+     215,   216
 };
 
-
-#define	YYLAST		1545
-
-
-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
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -522
+static const short int yypact[] =
+{
+      40,  -522,  -522,  -522,  -522,  -522,  -522,  -522,   -24,  -105,
+      -4,   -80,    60,   -32,   461,  -522,   134,  1386,  -522,   153,
+     150,     1,    15,  -522,    16,   130,  -522,  1208,  -522,  -522,
+    -522,  -522,  -522,  -522,  -522,  -522,  -522,  -522,  -522,  -522,
+     126,   126,   239,  -522,  -522,  -522,  -522,   126,  -522,  -522,
+    -522,  -522,  -522,   126,   158,  -522,    -7,   168,   183,   194,
+    -522,  -522,  -522,  -522,  -522,    45,  -522,  -522,  -522,  -522,
+    -522,   212,   226,     6,   198,  -522,  -522,  -522,   127,  -522,
+     204,   204,   248,  -522,   218,   113,   113,  -522,  -522,   135,
+    -522,  -522,  -522,  -522,  -522,  -522,  -522,   -44,  1006,  -522,
+     101,   107,   371,    45,  -522,   127,  -103,  -522,  1006,   218,
+     218,  -522,  -522,  1043,  -522,  -522,  1223,   259,  -522,  -522,
+    -522,  -522,  -522,  1274,  -522,   -13,  1423,  -522,   269,  -522,
+    -522,   127,  -522,   162,   146,  1305,  1305,   144,  -101,  1305,
+    -522,   159,  1223,  1305,    45,   161,   127,    85,  -522,    41,
+     301,   302,   250,   304,   782,  -522,  -522,    79,  -522,  -522,
+    -522,  -522,  -522,   263,  1320,   193,   305,   113,  -522,  -522,
+    -522,  -522,  -522,  -522,  -522,  -522,  -522,  -522,  -522,  -522,
+    -522,  -522,  -522,  -522,  -522,   133,   456,  1305,  1305,  1305,
+    1305,  -522,  -522,  -522,  -522,  -522,  -522,  -522,  -522,  -522,
+    -522,  -522,  -522,  1305,  1305,  1305,  1305,  1305,  1305,  1305,
+    1305,  1305,  -522,   113,  -522,   165,  -522,  -522,   519,  1060,
+    -522,   -18,   -33,  -522,   166,   127,  -522,  -522,   127,  1043,
+    -522,  -522,  -522,  -522,  -522,  -522,  -522,  -522,  -522,  -522,
+    -522,   133,   456,   171,   174,   175,   177,   178,  1111,  1371,
+     579,   307,   181,   182,   184,  -522,  -522,   186,   187,  -522,
+      45,   623,  -522,   757,   757,  -522,   757,  1274,  -522,  -522,
+    -522,  -522,  -522,  -522,  -522,  -522,  -522,  -522,  1305,  -522,
+    -522,  -522,  -522,  -522,  -522,  -522,  -522,  -522,  -522,  -522,
+    -522,  -522,  -522,  -522,  -522,  1305,    98,   114,  -522,   623,
+     -64,   195,   196,   201,   202,   210,   216,   623,   623,   303,
+    1274,  1305,  1305,  -522,  -522,  -522,  -522,  -522,  -522,  -522,
+    -522,  -522,  -522,  -522,  -522,   104,  -522,  -522,  -522,   104,
+     186,   186,   313,   190,   214,  1223,  1223,  1223,  1223,  1223,
+    -522,  -522,   -36,   962,  -111,  -522,   -78,  -522,  1223,  1223,
+    1223,     3,  -522,  1126,  -522,  -522,  -522,  -522,  -522,  -522,
+    -522,  -522,   308,  1223,  -522,  -522,  -522,  -522,   219,  -522,
+     221,   757,   623,   623,    20,  -522,    21,  -522,  -522,   757,
+     225,  1305,  1305,  1305,  1305,  1305,   224,   227,  1305,   757,
+     623,   231,  -522,  -522,  -522,  -522,  -522,  -522,  -522,  1305,
+    1223,  1223,  -522,   233,   242,   245,   249,  1223,  -522,   217,
+     782,   -65,  -522,  -522,   256,   257,   359,   386,   402,  -522,
+     186,  -522,   127,   265,   264,  -522,   394,   -75,   400,   401,
+     271,   275,   276,   757,   418,   757,   282,   285,   757,   289,
+     127,  -522,   290,   296,   757,   757,   127,   294,   300,  1305,
+     -29,   306,   309,   -50,  1223,  1223,  1223,  1223,  -522,  -522,
+     292,  1223,  1223,  1305,  -522,  -522,  -522,   293,  1157,  -522,
+     311,  -522,   757,   757,  1305,   757,   757,   300,  -522,   300,
+    1305,   757,   312,  1305,  1305,  1305,  -522,  -522,  1305,   397,
+    -522,   623,  -522,  1223,  1223,  -522,   316,   315,   317,   320,
+    -522,   318,   321,   117,  -522,  -522,  -522,   127,    -1,   430,
+     324,   322,   623,    -8,  -522,  -522,  -522,  -522,  -522,   314,
+     757,  -522,  -522,  -522,    -5,   300,   329,   330,  1223,  -522,
+    1223,  1223,  -522,  -522,  -522,   293,  -522,   431,  -522,   437,
+       2,  -522,  1305,  -522,  -522,   332,  -522,  -522,  -522,  -522,
+     336,   337,   338,  -522,   448,  -522,   757,  -522,   917,     4,
+     519,   623,    14,  -522,   104,  -522,  -522,  -522,  -522,  -522,
+     343,  -522,   917,  -522,   474,   475,   346,   519,   757,   757,
+     477,   426,  -522,   757,   481,  -522,   757,  -522
 };
 
-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
+/* YYPGOTO[NTERM-NUM].  */
+static const short int yypgoto[] =
+{
+    -522,   370,   372,   373,   266,   255,  -164,  -522,     0,   -25,
+     420,     9,  -522,  -522,  -522,  -522,    33,  -522,  -522,  -522,
+    -151,  -522,  -404,  -522,  -223,  -522,  -291,     5,  -522,  -295,
+    -522,  -522,   -26,   295,  -115,  -522,   403,   410,   -58,  -150,
+    -221,   173,   222,   286,  -522,  -522,   501,  -522,  -522,  -522,
+    -522,  -522,  -522,  -522,  -522,  -522,  -522,  -522,   433,  -522,
+    -522,  -522,  -522,  -522,  -522,  -521,  -140,   103,  -184,  -522,
+     465,  -522,  -522,  -522,  -522,  -522,    34,   122,  -522,  -522,
+    -522,  -522
 };
-/* -*-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 */
+/* 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 -196
+static const short int yytable[] =
+{
+      11,    78,   266,   329,   255,   298,   377,   230,   157,    13,
+     101,    87,   158,   265,   256,   265,   267,    11,   467,    90,
+     302,   303,   304,   305,   306,    21,    13,   309,   344,   346,
+     417,   433,   435,   407,   417,   397,   398,   570,    24,    22,
+    -195,   139,   412,   139,   -55,   -55,   -55,   -55,   105,   574,
+      25,   576,   140,   418,   224,   -64,     1,     2,   155,     3,
+       4,     5,   310,    26,   231,   232,   407,     6,     7,   407,
+     434,   434,   131,    80,    81,    27,   105,   413,   471,   407,
+      85,   107,   131,   108,   227,   379,    86,   146,     8,    11,
+     460,     9,    63,    64,   480,    10,     2,   146,   495,     4,
+     128,     1,     2,   535,     3,     4,     5,   129,   407,   221,
+     222,    28,   107,   225,   108,   408,   107,   228,   108,   492,
+     327,   366,   411,   366,   366,   466,   366,   107,   391,   108,
+     392,   393,   394,   326,    43,   395,   542,   560,   261,   542,
+     543,   159,   427,   546,    57,   392,   393,   394,    91,    61,
+     395,     1,   371,   557,     3,   571,     5,   490,    58,   366,
+     102,   296,   297,   261,   299,    59,   258,   366,   366,   577,
+     117,   118,   119,   120,   121,   122,    87,   300,   261,   261,
+     261,   261,   261,   307,   308,   261,   516,    94,   517,    49,
+      50,    51,    98,   131,    52,   389,    45,   439,    46,   441,
+     442,   443,    95,   146,   263,    63,    64,   264,   103,    66,
+      67,    68,    69,    96,     1,     2,    99,     3,     4,     5,
+     268,   269,   270,   271,   272,   273,   274,   275,   276,   277,
+     100,   366,   366,   366,   547,   392,   393,   394,    83,   366,
+     395,   146,   374,   107,    70,   108,   508,   114,   115,   366,
+     366,   135,   372,   233,   234,   235,   236,   136,   376,   107,
+     255,   108,   107,   156,   108,   534,    37,    38,    39,   373,
+     256,    82,   107,    83,   108,   311,   312,   402,   403,   404,
+     405,   406,   142,   143,   146,   390,   261,   111,   217,   112,
+     414,   415,   416,   366,   220,   366,   518,   223,   366,   521,
+     522,   523,   109,   110,   366,   366,   219,   226,   229,     1,
+     -56,   -57,     3,   237,     5,   259,   265,   410,   335,   328,
+     562,   336,   337,   564,   338,   339,   347,   422,   348,   349,
+     351,   350,   366,   366,   353,   366,   366,   400,   388,   380,
+     381,   366,   451,   452,    71,   382,   383,    72,   399,   458,
+      73,   366,    74,   104,   384,   261,   440,   261,   261,   261,
+     385,   401,   446,   428,   425,   429,   368,   369,   444,   370,
+     459,   445,   366,   450,   438,   449,   558,   454,    63,    64,
+     366,   103,    66,    67,    68,    69,   455,     1,     2,   456,
+       3,     4,     5,   457,   463,   572,   496,   497,   498,   499,
+     461,   462,   378,   501,   502,   464,   465,   313,   314,   468,
+     386,   387,   469,   470,   472,   473,   366,    70,   474,   475,
+     476,   366,   478,   491,   315,   316,   480,   317,   318,   481,
+     319,   320,   321,   483,   484,   526,   527,   503,   366,   366,
+     485,   488,   507,   366,   489,   500,   366,   434,   512,   538,
+     493,   556,   568,   494,   261,   509,   520,   261,   261,   261,
+     528,   530,   512,   529,   531,   544,   532,   504,   539,   533,
+     550,   540,   551,   552,   430,   431,   432,   548,   549,   279,
+     280,   554,   437,   563,   565,   566,   567,   575,   578,   579,
+     580,   583,   447,   448,   584,   586,   209,   334,   210,   211,
+      29,    30,    31,    32,    33,    34,    35,   333,    36,   126,
+     553,   141,   138,   536,   324,   332,   561,    71,    44,   125,
+      72,    93,   524,    73,   453,    74,   137,     0,     0,     0,
+       0,     0,     0,     0,     0,   504,   477,     0,   479,     0,
+       0,   482,     0,     0,     0,     0,     0,   486,   487,   281,
+     282,   283,   284,   285,   286,   287,   288,   289,   290,   291,
+     292,   293,   294,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   510,   511,     0,   514,   515,
+       0,     0,     0,     0,   519,     0,    63,    64,     0,   103,
+     149,   150,   151,    69,   525,     1,     2,     0,     3,     4,
+       5,    37,    38,    39,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   541,     0,     0,     0,     0,
+       0,     0,     0,   545,     0,    70,   354,   355,     0,     0,
+      63,    64,   356,   313,   314,     0,     0,     0,     0,     1,
+       2,     0,     3,     4,     5,   357,   358,   359,     0,     0,
+     315,   316,     0,   317,   318,     0,   319,   320,   321,   569,
+     360,   361,     0,     0,   573,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   362,     0,     0,
+       0,   581,   582,     0,     0,     0,   585,     0,     0,   587,
+       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,
+       0,     0,     0,     0,     0,    71,     0,     0,    72,     0,
+       0,    73,     0,    74,   345,   243,   191,   192,   193,   194,
+     195,   196,   197,   198,   199,   200,   201,   202,     0,   244,
+       0,   245,   246,   247,     0,     0,     0,     0,     0,     0,
+     354,   355,     0,     0,    63,    64,   356,     0,   107,     0,
+     108,     0,     0,     1,     2,   363,     3,     4,     5,   357,
+     358,   359,     0,     0,     0,     0,     0,     0,     0,    63,
+      64,     0,     0,     0,   360,   361,     0,     0,     1,     2,
+       0,     3,     4,     5,   238,     0,     0,     0,     0,     0,
+       0,   362,     0,     0,     0,     0,     0,     0,     0,   239,
+     240,     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,   170,   171,   172,   173,   174,   175,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,   241,   242,   243,
+     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
+     201,   202,     0,   244,     0,   245,   246,   247,     0,     0,
+       0,     0,     0,     0,   243,   191,   192,   193,   194,   195,
+     196,   197,   198,   199,   200,   201,   202,     0,   244,   363,
+     245,   246,   247,     0,     0,     0,     0,     0,     0,     0,
+     354,   355,     0,     0,     0,     0,   356,   107,     0,   108,
+       0,   248,     0,     0,   249,     0,   250,     0,   251,   357,
+     358,   359,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   360,   361,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    63,
+      64,   362,   103,   149,   150,   151,    69,     0,     1,     2,
+       0,     3,     4,     5,     0,     0,     0,   170,   171,   172,
+     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+     183,   184,   241,   242,     0,     0,     0,     0,    70,     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,
+      63,    64,    70,   144,    66,    67,    68,    69,     0,     1,
+       2,     0,     3,     4,     5,     0,     0,    63,    64,   363,
+     103,    66,    67,    68,    69,     0,     1,     2,     0,     3,
+       4,     5,     0,     0,     0,     0,     0,     0,     0,    70,
+       0,     0,     0,     0,     0,     0,   323,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    70,     0,    71,     0,
+       0,    72,     0,     0,    73,     0,    74,   409,    63,    64,
+       0,   103,   149,   150,   151,    69,     0,     1,     2,     0,
+       3,     4,     5,    63,    64,     0,   103,    66,    67,    68,
+      69,     0,     1,     2,     0,     3,     4,     5,     0,     0,
+       0,     0,    71,     0,     0,    72,     0,    70,    73,     0,
+      74,   145,   421,     0,    63,    64,     0,   103,    66,    67,
+      68,    69,    70,     1,     2,     0,     3,     4,     5,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    71,
+       0,     0,    72,   506,     0,    73,     0,    74,     0,     0,
+       0,     0,     0,    70,     0,     0,    71,     0,     0,    72,
+       0,     0,    73,     0,    74,    63,    64,     0,    65,    66,
+      67,    68,    69,     0,     1,     2,     0,     3,     4,     5,
+      63,    64,     0,   103,   149,   150,   151,    69,     0,     1,
+       2,     0,     3,     4,     5,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    70,     0,     0,    71,     0,     0,
+      72,     0,   340,    73,     0,    74,     0,     0,     0,    70,
+       0,     0,    71,     0,     0,    72,     0,     0,    73,     0,
+      74,    63,    64,     0,   144,    66,    67,    68,    69,     0,
+       1,     2,     0,     3,     4,     5,     0,     0,     0,     0,
+       0,     0,     0,    71,     0,     0,    72,     0,     0,    73,
+       0,    74,    63,    64,     0,   103,    66,    67,    68,    69,
+      70,     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,     0,     0,     0,
+       0,    70,     0,     0,    71,     0,     0,    72,     0,     0,
+      73,     0,    74,     0,     0,     0,    70,     0,     0,    71,
+       0,     0,    72,     0,     0,    73,     0,    74,    63,    64,
+       0,   103,   149,   150,   151,    69,  -194,     1,     2,     0,
+       3,     4,     5,     0,     0,     0,     0,     0,     0,     0,
+       0,   -64,     1,     2,     0,     3,     4,     5,     0,     0,
+       0,     0,     0,     6,     7,     0,     0,    70,     0,     0,
+      71,     0,     0,    72,     0,     0,    73,     0,    74,     0,
+       0,     0,     0,     0,     8,     0,     0,     9,     0,     0,
+       0,    10,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    71,     0,     0,    72,     0,   161,    73,     0,    74,
+       0,     0,     0,     0,     0,     0,    71,     0,     0,    72,
+       0,     0,    73,     0,    74,   162,   163,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   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,     0,     0,    71,     0,     0,
+      72,     0,     0,    73,     0,   343,     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
+};
 
-#ifdef YYSTACK_USE_ALLOCA
-#define YYSTACK_ALLOC alloca
-#else
-#define YYSTACK_ALLOC malloc
-#endif
+static const short int yycheck[] =
+{
+       0,    27,   166,   226,   154,   189,   297,   147,   123,     0,
+       4,    18,    25,    11,   154,    11,   167,    17,   422,    26,
+     204,   205,   206,   207,   208,    49,    17,   211,   249,   250,
+      31,    11,    11,   144,    31,   330,   331,   558,   143,    63,
+       0,   144,   153,   144,     3,     4,     5,     6,    74,    35,
+      54,   572,   155,    50,   155,    15,    16,    17,   116,    19,
+      20,    21,   213,   143,    23,    24,   144,    27,    28,   144,
+      50,    50,    98,    40,    41,    15,   102,   155,   153,   144,
+      47,   145,   108,   147,   142,   149,    53,   113,    48,    89,
+     155,    51,     7,     8,   144,    55,    17,   123,   148,    20,
+     144,    16,    17,   507,    19,    20,    21,   151,   144,   135,
+     136,   143,   145,   139,   147,   151,   145,   143,   147,   148,
+     153,   261,   343,   263,   264,   420,   266,   145,   312,   147,
+     131,   132,   133,   151,     0,   136,   144,   541,   164,   144,
+     148,   154,   363,   148,   143,   131,   132,   133,   155,    19,
+     136,    16,   267,   151,    19,   151,    21,   448,   143,   299,
+     154,   187,   188,   189,   190,   149,   157,   307,   308,   573,
+      57,    58,    59,    60,    61,    62,    18,   203,   204,   205,
+     206,   207,   208,   209,   210,   211,   477,    19,   479,    39,
+      40,    41,   147,   219,    44,   310,    43,   381,    45,   383,
+     384,   385,    19,   229,    11,     7,     8,    14,    10,    11,
+      12,    13,    14,    19,    16,    17,     4,    19,    20,    21,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+       4,   371,   372,   373,   525,   131,   132,   133,    34,   379,
+     136,   267,   144,   145,    46,   147,   469,    29,    30,   389,
+     390,   150,   278,     3,     4,     5,     6,   150,   144,   145,
+     410,   147,   145,     4,   147,   148,   140,   141,   142,   295,
+     410,    32,   145,    34,   147,   110,   111,   335,   336,   337,
+     338,   339,   109,   110,   310,   311,   312,    39,    19,    41,
+     348,   349,   350,   433,   148,   435,   480,   153,   438,   483,
+     484,   485,    80,    81,   444,   445,   144,   148,   147,    16,
+       9,     9,    19,     9,    21,    52,    11,   343,   147,   153,
+     543,   147,   147,   546,   147,   147,    19,   353,   147,   147,
+     144,   147,   472,   473,   147,   475,   476,   147,    35,   144,
+     144,   481,   400,   401,   146,   144,   144,   149,    35,   407,
+     152,   491,   154,   155,   144,   381,   382,   383,   384,   385,
+     144,   147,   388,   144,    56,   144,   263,   264,   144,   266,
+     153,   144,   512,   399,   149,   144,   540,   144,     7,     8,
+     520,    10,    11,    12,    13,    14,   144,    16,    17,   144,
+      19,    20,    21,   144,    35,   559,   454,   455,   456,   457,
+     144,   144,   299,   461,   462,    19,     4,   114,   115,   144,
+     307,   308,   148,    19,    14,    14,   556,    46,   147,   144,
+     144,   561,     4,   449,   131,   132,   144,   134,   135,   144,
+     137,   138,   139,   144,   144,   493,   494,   463,   578,   579,
+     144,   147,   468,   583,   144,   153,   586,    50,   474,    19,
+     144,    14,     4,   144,   480,   144,   144,   483,   484,   485,
+     144,   144,   488,   148,   144,   151,   148,   467,   144,   148,
+     528,   149,   530,   531,   371,   372,   373,   148,   148,    23,
+      24,    50,   379,   151,   148,   148,   148,   144,    14,    14,
+     144,    14,   389,   390,    68,    14,   126,   242,   126,   126,
+      39,    40,    41,    42,    43,    44,    45,   241,    47,    89,
+     535,   108,   102,   508,   219,   229,   542,   146,    17,    86,
+     149,    56,   488,   152,   402,   154,   155,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   535,   433,    -1,   435,    -1,
+      -1,   438,    -1,    -1,    -1,    -1,    -1,   444,   445,    93,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   472,   473,    -1,   475,   476,
+      -1,    -1,    -1,    -1,   481,    -1,     7,     8,    -1,    10,
+      11,    12,    13,    14,   491,    16,    17,    -1,    19,    20,
+      21,   140,   141,   142,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   512,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   520,    -1,    46,     3,     4,    -1,    -1,
+       7,     8,     9,   114,   115,    -1,    -1,    -1,    -1,    16,
+      17,    -1,    19,    20,    21,    22,    23,    24,    -1,    -1,
+     131,   132,    -1,   134,   135,    -1,   137,   138,   139,   556,
+      37,    38,    -1,    -1,   561,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    54,    -1,    -1,
+      -1,   578,   579,    -1,    -1,    -1,   583,    -1,    -1,   586,
+      -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,
+      -1,    -1,    -1,    -1,    -1,   146,    -1,    -1,   149,    -1,
+      -1,   152,    -1,   154,   155,   112,   113,   114,   115,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,    -1,   126,
+      -1,   128,   129,   130,    -1,    -1,    -1,    -1,    -1,    -1,
+       3,     4,    -1,    -1,     7,     8,     9,    -1,   145,    -1,
+     147,    -1,    -1,    16,    17,   152,    19,    20,    21,    22,
+      23,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     7,
+       8,    -1,    -1,    -1,    37,    38,    -1,    -1,    16,    17,
+      -1,    19,    20,    21,    22,    -1,    -1,    -1,    -1,    -1,
+      -1,    54,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,
+      38,    -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,    70,    71,    72,    73,    74,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    86,   112,
+     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
+     123,   124,    -1,   126,    -1,   128,   129,   130,    -1,    -1,
+      -1,    -1,    -1,    -1,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,   121,   122,   123,   124,    -1,   126,   152,
+     128,   129,   130,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       3,     4,    -1,    -1,    -1,    -1,     9,   145,    -1,   147,
+      -1,   149,    -1,    -1,   152,    -1,   154,    -1,   156,    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,     7,
+       8,    54,    10,    11,    12,    13,    14,    -1,    16,    17,
+      -1,    19,    20,    21,    -1,    -1,    -1,    70,    71,    72,
+      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    -1,    -1,    -1,    -1,    46,    -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,
+       7,     8,    46,    10,    11,    12,    13,    14,    -1,    16,
+      17,    -1,    19,    20,    21,    -1,    -1,     7,     8,   152,
+      10,    11,    12,    13,    14,    -1,    16,    17,    -1,    19,
+      20,    21,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    46,
+      -1,    -1,    -1,    -1,    -1,    -1,    36,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    46,    -1,   146,    -1,
+      -1,   149,    -1,    -1,   152,    -1,   154,   155,     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,   146,    -1,    -1,   149,    -1,    46,   152,    -1,
+     154,   118,    36,    -1,     7,     8,    -1,    10,    11,    12,
+      13,    14,    46,    16,    17,    -1,    19,    20,    21,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   146,
+      -1,    -1,   149,    36,    -1,   152,    -1,   154,    -1,    -1,
+      -1,    -1,    -1,    46,    -1,    -1,   146,    -1,    -1,   149,
+      -1,    -1,   152,    -1,   154,     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,    -1,    46,    -1,    -1,   146,    -1,    -1,
+     149,    -1,   151,   152,    -1,   154,    -1,    -1,    -1,    46,
+      -1,    -1,   146,    -1,    -1,   149,    -1,    -1,   152,    -1,
+     154,     7,     8,    -1,    10,    11,    12,    13,    14,    -1,
+      16,    17,    -1,    19,    20,    21,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   146,    -1,    -1,   149,    -1,    -1,   152,
+      -1,   154,     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,    -1,    -1,   146,    -1,    -1,   149,    -1,    -1,
+     152,    -1,   154,    -1,    -1,    -1,    46,    -1,    -1,   146,
+      -1,    -1,   149,    -1,    -1,   152,    -1,   154,     7,     8,
+      -1,    10,    11,    12,    13,    14,     0,    16,    17,    -1,
+      19,    20,    21,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    15,    16,    17,    -1,    19,    20,    21,    -1,    -1,
+      -1,    -1,    -1,    27,    28,    -1,    -1,    46,    -1,    -1,
+     146,    -1,    -1,   149,    -1,    -1,   152,    -1,   154,    -1,
+      -1,    -1,    -1,    -1,    48,    -1,    -1,    51,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   146,    -1,    -1,   149,    -1,    33,   152,    -1,   154,
+      -1,    -1,    -1,    -1,    -1,    -1,   146,    -1,    -1,   149,
+      -1,    -1,   152,    -1,   154,    52,    53,    -1,    -1,    -1,
+      -1,    -1,    -1,    -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,   146,    -1,    -1,
+     149,    -1,    -1,   152,    -1,   154,    -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
+};
 
-/* 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.  */
+/* 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,   165,   167,   168,   169,   170,   201,   202,   203,   205,
+     204,    49,    63,   210,   143,    54,   143,    15,   143,    39,
+      40,    41,    42,    43,    44,    45,    47,   140,   141,   142,
+     171,   172,   173,     0,   203,    43,    45,   174,   220,    39,
+      40,    41,    44,   175,   217,   219,   226,   143,   143,   149,
+     211,    19,   209,     7,     8,    10,    11,    12,    13,    14,
+      46,   146,   149,   152,   154,   165,   168,   188,   189,   223,
+     173,   173,    32,    34,   199,   173,   173,    18,   227,   228,
+      26,   155,   218,   227,    19,    19,    19,   212,   147,     4,
+       4,     4,   154,    10,   155,   189,   194,   145,   147,   199,
+     199,    39,    41,   176,    29,    30,   198,    57,    58,    59,
+      60,    61,    62,   177,   215,   215,   167,   231,   144,   151,
+      36,   189,   190,   192,   193,   150,   150,   155,   194,   144,
+     155,   193,   198,   198,    10,   118,   189,   191,   200,    11,
+      12,    13,   163,   164,   189,   195,     4,   191,    25,   154,
+     216,    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,   158,
+     159,   160,   229,   235,   236,   237,   238,    19,   179,   144,
+     148,   189,   189,   153,   155,   189,   148,   195,   189,   147,
+     223,    23,    24,     3,     4,     5,     6,     9,    22,    37,
+      38,    85,    86,   112,   126,   128,   129,   130,   149,   152,
+     154,   156,   158,   159,   160,   196,   223,   206,   168,    52,
+      10,   189,   225,    11,    14,    11,   163,   177,    87,    88,
+      89,    90,    91,    92,    93,    94,    95,    96,   161,    23,
+      24,    93,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,   104,   105,   106,   162,   189,   189,   225,   189,
+     189,   232,   225,   225,   225,   225,   225,   189,   189,   225,
+     177,   110,   111,   114,   115,   131,   132,   134,   135,   137,
+     138,   139,   178,    36,   190,   181,   151,   153,   153,   181,
+     207,   208,   200,   161,   162,   147,   147,   147,   147,   147,
+     151,   195,   197,   154,   197,   155,   197,    19,   147,   147,
+     147,   144,   186,   147,     3,     4,     9,    22,    23,    24,
+      37,    38,    54,   152,   196,   222,   223,   224,   224,   224,
+     224,   191,   189,   189,   144,   183,   144,   183,   224,   149,
+     144,   144,   144,   144,   144,   144,   224,   224,    35,   191,
+     189,   225,   131,   132,   133,   136,   180,   186,   186,    35,
+     147,   147,   195,   195,   195,   195,   195,   144,   151,   155,
+     189,   197,   153,   155,   195,   195,   195,    31,    50,   184,
+     187,    36,   189,   213,   214,    56,   221,   197,   144,   144,
+     224,   224,   224,    11,    50,    11,   234,   224,   149,   225,
+     189,   225,   225,   225,   144,   144,   189,   224,   224,   144,
+     189,   195,   195,   234,   144,   144,   144,   144,   195,   153,
+     155,   144,   144,    35,    19,     4,   186,   179,   144,   148,
+      19,   153,    14,    14,   147,   144,   144,   224,     4,   224,
+     144,   144,   224,   144,   144,   144,   224,   224,   147,   144,
+     183,   189,   148,   144,   144,   148,   195,   195,   195,   195,
+     153,   195,   195,   189,   165,   166,    36,   189,   181,   144,
+     224,   224,   189,   233,   224,   224,   183,   183,   225,   224,
+     144,   225,   225,   225,   233,   224,   195,   195,   144,   148,
+     144,   144,   148,   148,   148,   179,   184,   185,    19,   144,
+     149,   224,   144,   148,   151,   224,   148,   183,   148,   148,
+     195,   195,   195,   166,    50,   182,    14,   151,   163,   230,
+     179,   189,   181,   151,   181,   148,   148,   148,     4,   224,
+     222,   151,   163,   224,    35,   144,   222,   179,    14,    14,
+     144,   224,   224,    14,    68,   224,    14,   224
+};
 
 #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 yyerrlab1
-/* 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 yyerrorlab
+
+
+/* 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);			\
-      yychar1 = YYTRANSLATE (yychar);				\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
       YYPOPSTACK;						\
       goto yybackup;						\
     }								\
   else								\
-    { yyerror ("syntax error: cannot back up"); YYERROR; }	\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;							\
+    }								\
 while (0)
 
+
 #define YYTERROR	1
 #define YYERRCODE	256
 
-#ifndef YYPURE
-#define YYLEX		yylex()
+
+/* 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)
 #endif
 
-#ifdef YYPURE
-#ifdef YYLSP_NEEDED
-#ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, &yylloc, YYLEX_PARAM)
-#else
-#define YYLEX		yylex(&yylval, &yylloc)
+
+/* 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
 #endif
-#else /* not YYLSP_NEEDED */
+
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
 #ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, YYLEX_PARAM)
+# define YYLEX yylex (YYLEX_PARAM)
 #else
-#define YYLEX		yylex(&yylval)
-#endif
-#endif /* not YYLSP_NEEDED */
+# define YYLEX yylex ()
 #endif
 
-/* If nonreentrant, generate the variables here */
+/* Enable debugging if requested.  */
+#if YYDEBUG
 
-#ifndef YYPURE
+# 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)
 
-int	yychar;			/*  the lookahead symbol		*/
-YYSTYPE	yylval;			/*  the semantic value of the		*/
-				/*  lookahead symbol			*/
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
 
-#ifdef YYLSP_NEEDED
-YYLTYPE yylloc;			/*  location data for 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;
 #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 */
 
-#if YYDEBUG != 0
-int yydebug;			/*  nonzero means print parse trace	*/
-/* Since this is uninitialized, it does not stop multiple parsers
-   from coexisting.  */
+/*------------------------------------------------.
+| 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;
 #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]]);
+}
 
-/*  YYINITDEPTH indicates the initial size of the parser's stacks	*/
+# 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 -- initial size of the parser's stacks.  */
 #ifndef	YYINITDEPTH
-#define YYINITDEPTH 200
+# define YYINITDEPTH 200
 #endif
 
-/*  YYMAXDEPTH is the maximum size the stacks can grow to
-    (effective only if the built-in stack extension method is used).  */
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
 
-#if YYMAXDEPTH == 0
-#undef YYMAXDEPTH
-#endif
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
 
 #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
 
-/* 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 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
 {
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
+  const char *yys = yystr;
+
+  while (*yys++ != '\0')
+    continue;
 
-  while (i-- > 0)
-    *t++ = *f++;
+  return yys - yystr - 1;
 }
+#  endif
+# endif
 
-#else /* __cplusplus */
+# 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;
 
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (char *to, char *from, unsigned int count)
+  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)
 {
-  register char *t = to;
-  register char *f = from;
-  register int i = count;
+  if (*yystr == '"')
+    {
+      size_t yyn = 0;
+      char const *yyp = yystr;
 
-  while (i-- > 0)
-    *t++ = *f++;
+      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;
 }
+# endif
+
+#endif /* YYERROR_VERBOSE */
+
+
+
+#if YYDEBUG
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
 
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yysymprint (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE *yyvaluep;
 #endif
+{
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
+
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+  switch (yytype)
+    {
+      default:
+        break;
+    }
+  YYFPRINTF (yyoutput, ")");
+}
+
+#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;
+    }
+}
 
-#line 217 "/usr/share/bison.simple"
 
-/* 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.  */
+/* Prevent warnings from -Wmissing-prototypes.  */
 
 #ifdef YYPARSE_PARAM
-#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 */
+# 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.  |
+`----------*/
 
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
 #ifdef YYPARSE_PARAM
-int yyparse (void *);
+# 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)
 #else
-int yyparse (void);
+int
+yyparse ()
+
 #endif
 #endif
-
-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;
+  
+  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;
+
+
 
-#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
-#else
 #define YYPOPSTACK   (yyvsp--, yyssp--)
-#endif
 
-  int yystacksize = YYINITDEPTH;
-  int yyfree_stacks = 0;
+  YYSIZE_T yystacksize = YYINITDEPTH;
 
-#ifdef YYPURE
-  int yychar;
-  YYSTYPE yylval;
-  int yynerrs;
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylloc;
-#endif
-#endif
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
 
-  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;
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Starting parse\n");
-#endif
+  YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
@@ -2240,676 +2939,744 @@
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
 
-  yyssp = yyss - 1;
+  yyssp = yyss;
   yyvsp = yyvs;
-#ifdef YYLSP_NEEDED
-  yylsp = yyls;
-#endif
 
-/* 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
+  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;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
       /* Get the current used size of the three stacks, in elements.  */
-      int size = yyssp - yyss + 1;
+      YYSIZE_T yysize = yyssp - yyss + 1;
 
 #ifdef yyoverflow
-      /* 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
+      {
+	/* 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),
 
-      yyss = yyss1; yyvs = yyvs1;
-#ifdef YYLSP_NEEDED
-      yyls = yyls1;
-#endif
+		    &yystacksize);
+
+	yyss = yyss1;
+	yyvs = yyvs1;
+      }
 #else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
       /* Extend the stack our own way.  */
-      if (yystacksize >= YYMAXDEPTH)
-	{
-	  yyerror("parser stack overflow");
-	  if (yyfree_stacks)
-	    {
-	      free (yyss);
-	      free (yyvs);
-#ifdef YYLSP_NEEDED
-	      free (yyls);
-#endif
-	    }
-	  return 2;
-	}
+      if (YYMAXDEPTH <= yystacksize)
+	goto yyexhaustedlab;
       yystacksize *= 2;
-      if (yystacksize > YYMAXDEPTH)
+      if (YYMAXDEPTH < yystacksize)
 	yystacksize = YYMAXDEPTH;
-#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
+
+      {
+	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
 #endif /* no yyoverflow */
 
-      yyssp = yyss + size - 1;
-      yyvsp = yyvs + size - 1;
-#ifdef YYLSP_NEEDED
-      yylsp = yyls + size - 1;
-#endif
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
 
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Stack size increased to %d\n", yystacksize);
-#endif
 
-      if (yyssp >= yyss + yystacksize - 1)
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+		  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
 	YYABORT;
     }
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Entering state %d\n", yystate);
-#endif
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
   goto yybackup;
- yybackup:
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
 
 /* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
+/* Read a look-ahead token if we need one and don't already have one.  */
 /* yyresume: */
 
-  /* First try to decide what to do without reference to lookahead token.  */
+  /* First try to decide what to do without reference to look-ahead token.  */
 
   yyn = yypact[yystate];
-  if (yyn == YYFLAG)
+  if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* 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.  */
+  /* Not known => get a look-ahead token if don't already have one.  */
 
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Reading a token: ");
-#endif
+      YYDPRINTF ((stderr, "Reading a token: "));
       yychar = YYLEX;
     }
 
-  /* Convert token to internal form (in yychar1) for indexing tables with */
-
-  if (yychar <= 0)		/* This means end of input. */
+  if (yychar <= YYEOF)
     {
-      yychar1 = 0;
-      yychar = YYEOF;		/* Don't call YYLEX any more */
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Now at end of input.\n");
-#endif
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
   else
     {
-      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
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
     }
 
-  yyn += yychar1;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
+  /* 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)
     goto yydefault;
-
   yyn = yytable[yyn];
-
-  /* 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)
     {
-      if (yyn == YYFLAG)
+      if (yyn == 0 || yyn == YYTABLE_NINF)
 	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
-  else if (yyn == 0)
-    goto yyerrlab;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  /* Shift the lookahead token.  */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
-#endif
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
   /* 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;
 
-/* Do the default action for the current state.  */
-yydefault:
 
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
   yyn = yydefact[yystate];
   if (yyn == 0)
     goto yyerrlab;
+  goto yyreduce;
+
 
-/* Do a reduction.  yyn is the number of a rule to reduce with.  */
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
 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 YYDEBUG != 0
-  if (yydebug)
+  /* 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)
     {
-      int i;
+        case 29:
+#line 1122 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_EQ; ;}
+    break;
 
-      fprintf (stderr, "Reducing via rule %d (line %d), ",
-	       yyn, yyrline[yyn]);
+  case 30:
+#line 1122 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_NE; ;}
+    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 31:
+#line 1123 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_SLT; ;}
+    break;
 
+  case 32:
+#line 1123 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_SGT; ;}
+    break;
 
-  switch (yyn) {
+  case 33:
+#line 1124 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_SLE; ;}
+    break;
 
-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 63:
-#line 1155 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.StrVal = 0;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 67:
-#line 1163 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.StrVal = 0;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 68:
-#line 1168 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.StrVal = yyvsp[-1].StrVal;
-    CHECK_FOR_ERROR
-  ;
-    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;
-                  CHECK_FOR_ERROR
-                 ;
-    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))
+  case 34:
+#line 1124 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_SGE; ;}
+    break;
+
+  case 35:
+#line 1125 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_ULT; ;}
+    break;
+
+  case 36:
+#line 1125 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_UGT; ;}
+    break;
+
+  case 37:
+#line 1126 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_ULE; ;}
+    break;
+
+  case 38:
+#line 1126 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_UGE; ;}
+    break;
+
+  case 39:
+#line 1130 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_OEQ; ;}
+    break;
+
+  case 40:
+#line 1130 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_ONE; ;}
+    break;
+
+  case 41:
+#line 1131 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_OLT; ;}
+    break;
+
+  case 42:
+#line 1131 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_OGT; ;}
+    break;
+
+  case 43:
+#line 1132 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_OLE; ;}
+    break;
+
+  case 44:
+#line 1132 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_OGE; ;}
+    break;
+
+  case 45:
+#line 1133 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_ORD; ;}
+    break;
+
+  case 46:
+#line 1133 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_UNO; ;}
+    break;
+
+  case 47:
+#line 1134 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_UEQ; ;}
+    break;
+
+  case 48:
+#line 1134 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_UNE; ;}
+    break;
+
+  case 49:
+#line 1135 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_ULT; ;}
+    break;
+
+  case 50:
+#line 1135 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_UGT; ;}
+    break;
+
+  case 51:
+#line 1136 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_ULE; ;}
+    break;
+
+  case 52:
+#line 1136 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_UGE; ;}
+    break;
+
+  case 53:
+#line 1137 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_TRUE; ;}
+    break;
+
+  case 54:
+#line 1138 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_FALSE; ;}
+    break;
+
+  case 62:
+#line 1147 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.StrVal) = 0; ;}
+    break;
+
+  case 63:
+#line 1151 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.StrVal) = (yyvsp[-1].StrVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 64:
+#line 1155 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.StrVal) = 0;
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 68:
+#line 1163 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.StrVal) = 0;
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 69:
+#line 1168 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.StrVal) = (yyvsp[-1].StrVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 70:
+#line 1174 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
+    break;
+
+  case 71:
+#line 1175 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
+    break;
+
+  case 72:
+#line 1176 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
+    break;
+
+  case 73:
+#line 1177 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
+    break;
+
+  case 74:
+#line 1178 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
+    break;
+
+  case 75:
+#line 1182 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
+    break;
+
+  case 76:
+#line 1183 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
+    break;
+
+  case 77:
+#line 1184 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
+    break;
+
+  case 78:
+#line 1188 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Visibility) = GlobalValue::DefaultVisibility;   ;}
+    break;
+
+  case 79:
+#line 1189 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Visibility) = GlobalValue::DefaultVisibility;   ;}
+    break;
+
+  case 80:
+#line 1190 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Visibility) = GlobalValue::HiddenVisibility;    ;}
+    break;
+
+  case 81:
+#line 1191 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Visibility) = GlobalValue::ProtectedVisibility; ;}
+    break;
+
+  case 82:
+#line 1195 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
+    break;
+
+  case 83:
+#line 1196 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
+    break;
+
+  case 84:
+#line 1197 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
+    break;
+
+  case 85:
+#line 1201 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
+    break;
+
+  case 86:
+#line 1202 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
+    break;
+
+  case 87:
+#line 1203 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
+    break;
+
+  case 88:
+#line 1204 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
+    break;
+
+  case 89:
+#line 1205 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
+    break;
+
+  case 90:
+#line 1209 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
+    break;
+
+  case 91:
+#line 1210 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
+    break;
+
+  case 92:
+#line 1211 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
+    break;
+
+  case 93:
+#line 1214 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::C; ;}
+    break;
+
+  case 94:
+#line 1215 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::C; ;}
+    break;
+
+  case 95:
+#line 1216 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::Fast; ;}
+    break;
+
+  case 96:
+#line 1217 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::Cold; ;}
+    break;
+
+  case 97:
+#line 1218 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::X86_StdCall; ;}
+    break;
+
+  case 98:
+#line 1219 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::X86_FastCall; ;}
+    break;
+
+  case 99:
+#line 1220 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+                   if ((unsigned)(yyvsp[0].UInt64Val) != (yyvsp[0].UInt64Val))
+                     GEN_ERROR("Calling conv too large");
+                   (yyval.UIntVal) = (yyvsp[0].UInt64Val);
+                  CHECK_FOR_ERROR
+                 ;}
+    break;
+
+  case 100:
+#line 1227 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::ZExt;      ;}
+    break;
+
+  case 101:
+#line 1228 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::ZExt;      ;}
+    break;
+
+  case 102:
+#line 1229 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::SExt;      ;}
+    break;
+
+  case 103:
+#line 1230 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::SExt;      ;}
+    break;
+
+  case 104:
+#line 1231 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::InReg;     ;}
+    break;
+
+  case 105:
+#line 1232 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::StructRet; ;}
+    break;
+
+  case 106:
+#line 1233 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::NoAlias;   ;}
+    break;
+
+  case 107:
+#line 1234 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::ByVal;     ;}
+    break;
+
+  case 108:
+#line 1235 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::Nest;      ;}
+    break;
+
+  case 109:
+#line 1238 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::None; ;}
+    break;
+
+  case 110:
+#line 1239 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+                (yyval.ParamAttrs) = (yyvsp[-1].ParamAttrs) | (yyvsp[0].ParamAttrs);
+              ;}
+    break;
+
+  case 111:
+#line 1244 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::NoReturn; ;}
+    break;
+
+  case 112:
+#line 1245 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::NoUnwind; ;}
+    break;
+
+  case 113:
+#line 1246 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::ZExt;     ;}
+    break;
+
+  case 114:
+#line 1247 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::SExt;     ;}
+    break;
+
+  case 115:
+#line 1250 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::None; ;}
+    break;
+
+  case 116:
+#line 1251 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+                (yyval.ParamAttrs) = (yyvsp[-1].ParamAttrs) | (yyvsp[0].ParamAttrs);
+              ;}
+    break;
+
+  case 117:
+#line 1258 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = 0; ;}
+    break;
+
+  case 118:
+#line 1259 "/proj/llvm/head/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 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))
+;}
+    break;
+
+  case 119:
+#line 1265 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = 0; ;}
+    break;
+
+  case 120:
+#line 1266 "/proj/llvm/head/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 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] == '\\')
+;}
+    break;
+
+  case 121:
+#line 1274 "/proj/llvm/head/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 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;
+;}
+    break;
+
+  case 122:
+#line 1282 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.StrVal) = 0; ;}
+    break;
+
+  case 123:
+#line 1283 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.StrVal) = (yyvsp[0].StrVal); ;}
+    break;
+
+  case 124:
+#line 1288 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {;}
+    break;
+
+  case 125:
+#line 1289 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {;}
+    break;
+
+  case 126:
+#line 1290 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    CurGV->setSection(*(yyvsp[0].StrVal));
+    delete (yyvsp[0].StrVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 121:
-#line 1290 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[0].UInt64Val != 0 && !isPowerOf2_32(yyvsp[0].UInt64Val))
+  ;}
+    break;
+
+  case 127:
+#line 1295 "/proj/llvm/head/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 1306 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TypeVal = new PATypeHolder(OpaqueType::get());
+  ;}
+    break;
+
+  case 132:
+#line 1311 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 127:
-#line 1310 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TypeVal = new PATypeHolder(yyvsp[0].PrimType);
+  ;}
+    break;
+
+  case 133:
+#line 1315 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 128:
-#line 1314 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{                             // Pointer type?
-    if (*yyvsp[-1].TypeVal == Type::LabelTy)
+  ;}
+    break;
+
+  case 134:
+#line 1319 "/proj/llvm/head/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 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");
+  ;}
+    break;
+
+  case 135:
+#line 1326 "/proj/llvm/head/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 136:
+#line 1331 "/proj/llvm/head/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 1334 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 137:
+#line 1339 "/proj/llvm/head/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);
@@ -2925,23 +3692,24 @@
     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 1364 "/Volumes/ProjectsDisk/cvs/llvm/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 138:
+#line 1369 "/proj/llvm/head/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();
@@ -2959,282 +3727,303 @@
     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 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)
+    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 139:
+#line 1400 "/proj/llvm/head/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 140:
+#line 1405 "/proj/llvm/head/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 1412 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{                        // Structure type?
+  ;}
+    break;
+
+  case 141:
+#line 1417 "/proj/llvm/head/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;
+    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(StructType::get(Elements)));
+    delete (yyvsp[-1].TypeList);
     CHECK_FOR_ERROR
-  ;
-    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"
-{
+  ;}
+    break;
+
+  case 142:
+#line 1427 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {                                  // Empty structure type?
+    (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 143:
+#line 1431 "/proj/llvm/head/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;
+    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true)));
+    delete (yyvsp[-2].TypeList);
     CHECK_FOR_ERROR
-  ;
-    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"
-{
+  ;}
+    break;
+
+  case 144:
+#line 1441 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {                         // Empty structure type?
+    (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 145:
+#line 1448 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { 
+    (yyval.TypeWithAttrs).Ty = (yyvsp[-1].TypeVal); 
+    (yyval.TypeWithAttrs).Attrs = (yyvsp[0].ParamAttrs); 
+  ;}
+    break;
+
+  case 146:
+#line 1455 "/proj/llvm/head/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 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);
+    (yyval.TypeVal) = (yyvsp[0].TypeVal);
+  ;}
+    break;
+
+  case 147:
+#line 1462 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TypeVal) = new PATypeHolder(Type::VoidTy);
+  ;}
+    break;
+
+  case 148:
+#line 1467 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
+    (yyval.TypeWithAttrsList)->push_back((yyvsp[0].TypeWithAttrs));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 143:
-#line 1467 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    (yyval.TypeWithAttrsList=yyvsp[-2].TypeWithAttrsList)->push_back(yyvsp[0].TypeWithAttrs);
+  ;}
+    break;
+
+  case 149:
+#line 1472 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    ((yyval.TypeWithAttrsList)=(yyvsp[-2].TypeWithAttrsList))->push_back((yyvsp[0].TypeWithAttrs));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 145:
-#line 1475 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TypeWithAttrsList=yyvsp[-2].TypeWithAttrsList;
+  ;}
+    break;
+
+  case 151:
+#line 1480 "/proj/llvm/head/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 1482 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TypeWithAttrsList = new TypeWithAttrsList;
+  ;}
+    break;
+
+  case 152:
+#line 1487 "/proj/llvm/head/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);
+    (yyval.TypeWithAttrsList)->push_back(TWA);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 147:
-#line 1489 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TypeWithAttrsList = new TypeWithAttrsList();
+  ;}
+    break;
+
+  case 153:
+#line 1494 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     CHECK_FOR_ERROR
-  ;
-    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;
+  ;}
+    break;
+
+  case 154:
+#line 1502 "/proj/llvm/head/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 155:
+#line 1508 "/proj/llvm/head/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 1515 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ // Nonempty unsized arr
+  ;}
+    break;
+
+  case 156:
+#line 1520 "/proj/llvm/head/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 1543 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 157:
+#line 1548 "/proj/llvm/head/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 1559 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 158:
+#line 1564 "/proj/llvm/head/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 1586 "/Volumes/ProjectsDisk/cvs/llvm/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 159:
+#line 1591 "/proj/llvm/head/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 1614 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    const StructType *STy = dyn_cast<StructType>(yyvsp[-3].TypeVal->get());
+  ;}
+    break;
+
+  case 160:
+#line 1619 "/proj/llvm/head/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) +
@@ -3245,20 +4034,21 @@
       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 1640 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 161:
+#line 1645 "/proj/llvm/head/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");
@@ -3268,25 +4058,26 @@
       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 1660 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    const StructType *STy = dyn_cast<StructType>(yyvsp[-5].TypeVal->get());
+  ;}
+    break;
+
+  case 162:
+#line 1665 "/proj/llvm/head/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) +
@@ -3297,20 +4088,21 @@
       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 1686 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 163:
+#line 1691 "/proj/llvm/head/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");
@@ -3320,42 +4112,45 @@
       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 1706 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 164:
+#line 1711 "/proj/llvm/head/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 1718 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 165:
+#line 1723 "/proj/llvm/head/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 1725 "/Volumes/ProjectsDisk/cvs/llvm/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 166:
+#line 1730 "/proj/llvm/head/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");
 
@@ -3369,7 +4164,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;
@@ -3384,16 +4179,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.
@@ -3409,336 +4204,371 @@
         }
 
         // 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 1791 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 167:
+#line 1796 "/proj/llvm/head/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 1801 "/Volumes/ProjectsDisk/cvs/llvm/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 168:
+#line 1806 "/proj/llvm/head/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 1811 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{      // integral constants
-    if (!ConstantInt::isValueValidForType(yyvsp[-1].PrimType, yyvsp[0].SInt64Val))
+  ;}
+    break;
+
+  case 169:
+#line 1816 "/proj/llvm/head/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 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) {
+  ;}
+    break;
+
+  case 170:
+#line 1822 "/proj/llvm/head/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 1827 "/Volumes/ProjectsDisk/cvs/llvm/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 171:
+#line 1832 "/proj/llvm/head/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 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) {
+  ;}
+    break;
+
+  case 172:
+#line 1838 "/proj/llvm/head/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 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))
+    (yyvsp[0].APIntVal)->zextOrTrunc(BitWidth);
+    (yyval.ConstVal) = ConstantInt::get(*(yyvsp[0].APIntVal));
+    delete (yyvsp[0].APIntVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 173:
+#line 1848 "/proj/llvm/head/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 174:
+#line 1853 "/proj/llvm/head/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 175:
+#line 1858 "/proj/llvm/head/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 1861 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 176:
+#line 1866 "/proj/llvm/head/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 1873 "/Volumes/ProjectsDisk/cvs/llvm/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 177:
+#line 1878 "/proj/llvm/head/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 1895 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[-5].ConstVal->getType() != Type::Int1Ty)
+  ;}
+    break;
+
+  case 178:
+#line 1900 "/proj/llvm/head/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 1903 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
+  ;}
+    break;
+
+  case 179:
+#line 1908 "/proj/llvm/head/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 1909 "/Volumes/ProjectsDisk/cvs/llvm/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 180:
+#line 1914 "/proj/llvm/head/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 1920 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
+  ;}
+    break;
+
+  case 181:
+#line 1925 "/proj/llvm/head/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 1925 "/Volumes/ProjectsDisk/cvs/llvm/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 182:
+#line 1930 "/proj/llvm/head/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 1930 "/Volumes/ProjectsDisk/cvs/llvm/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 183:
+#line 1935 "/proj/llvm/head/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 1936 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (!InsertElementInst::isValidOperands(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
+  ;}
+    break;
+
+  case 184:
+#line 1941 "/proj/llvm/head/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 1942 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (!ShuffleVectorInst::isValidOperands(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
+  ;}
+    break;
+
+  case 185:
+#line 1947 "/proj/llvm/head/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 1951 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    (yyval.ConstVector = yyvsp[-2].ConstVector)->push_back(yyvsp[0].ConstVal);
+  ;}
+    break;
+
+  case 186:
+#line 1956 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    ((yyval.ConstVector) = (yyvsp[-2].ConstVector))->push_back((yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
-  ;
-    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);
+  ;}
+    break;
+
+  case 187:
+#line 1960 "/proj/llvm/head/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 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);
+  ;}
+    break;
+
+  case 188:
+#line 1968 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.BoolVal) = false; ;}
+    break;
+
+  case 189:
+#line 1968 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.BoolVal) = true; ;}
+    break;
+
+  case 190:
+#line 1971 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.BoolVal) = true; ;}
+    break;
+
+  case 191:
+#line 1971 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.BoolVal) = false; ;}
+    break;
+
+  case 192:
+#line 1974 "/proj/llvm/head/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 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))
+    delete (yyvsp[-1].TypeVal);
+   ;}
+    break;
+
+  case 193:
+#line 1985 "/proj/llvm/head/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 2001 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ModuleVal = ParserResult = CurModule.CurrentModule;
+    delete (yyvsp[-1].TypeVal);
+   ;}
+    break;
+
+  case 194:
+#line 2006 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
     CHECK_FOR_ERROR;
-  ;
-    break;}
-case 189:
-#line 2006 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ModuleVal = ParserResult = CurModule.CurrentModule;
+  ;}
+    break;
+
+  case 195:
+#line 2011 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
     CHECK_FOR_ERROR;
-  ;
-    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"
-{
+  ;}
+    break;
+
+  case 198:
+#line 2024 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { CurFun.isDeclare = false; ;}
+    break;
+
+  case 199:
+#line 2024 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
-  ;
-    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"
-{
+  ;}
+    break;
+
+  case 200:
+#line 2028 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { CurFun.isDeclare = true; ;}
+    break;
+
+  case 201:
+#line 2028 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 196:
-#line 2026 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 202:
+#line 2031 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 197:
-#line 2029 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 203:
+#line 2034 "/proj/llvm/head/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:
     //
@@ -3748,248 +4578,271 @@
     // 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 2053 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    ResolveTypeTo(yyvsp[-2].StrVal, yyvsp[0].PrimType);
+  ;}
+    break;
 
-    if (!setTypeName(yyvsp[0].PrimType, yyvsp[-2].StrVal) && !yyvsp[-2].StrVal) {
+  case 204:
+#line 2058 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    ResolveTypeTo((yyvsp[-2].StrVal), (yyvsp[0].PrimType));
+
+    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 2064 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ 
+  ;}
+    break;
+
+  case 205:
+#line 2069 "/proj/llvm/head/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 2071 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 206:
+#line 2076 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     CurGV = 0;
-  ;
-    break;}
-case 201:
-#line 2075 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[0].ConstVal == 0) 
+  ;}
+    break;
+
+  case 207:
+#line 2080 "/proj/llvm/head/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 2080 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 208:
+#line 2085 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     CurGV = 0;
-  ;
-    break;}
-case 203:
-#line 2084 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 209:
+#line 2089 "/proj/llvm/head/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 2090 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    delete (yyvsp[0].TypeVal);
+  ;}
+    break;
+
+  case 210:
+#line 2095 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     CurGV = 0;
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 205:
-#line 2094 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 211:
+#line 2099 "/proj/llvm/head/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 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"
-{
+  ;}
+    break;
+
+  case 212:
+#line 2118 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { 
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 208:
-#line 2122 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 213:
+#line 2121 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 214:
+#line 2127 "/proj/llvm/head/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 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;
+;}
+    break;
+
+  case 215:
+#line 2137 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    CurModule.CurrentModule->setTargetTriple(*(yyvsp[0].StrVal));
+    delete (yyvsp[0].StrVal);
+  ;}
+    break;
+
+  case 216:
+#line 2141 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    CurModule.CurrentModule->setDataLayout(*(yyvsp[0].StrVal));
+    delete (yyvsp[0].StrVal);
+  ;}
+    break;
+
+  case 218:
+#line 2148 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+          CurModule.CurrentModule->addLibrary(*(yyvsp[0].StrVal));
+          delete (yyvsp[0].StrVal);
           CHECK_FOR_ERROR
-        ;
-    break;}
-case 213:
-#line 2148 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-          CurModule.CurrentModule->addLibrary(*yyvsp[0].StrVal);
-          delete yyvsp[0].StrVal;
+        ;}
+    break;
+
+  case 219:
+#line 2153 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+          CurModule.CurrentModule->addLibrary(*(yyvsp[0].StrVal));
+          delete (yyvsp[0].StrVal);
           CHECK_FOR_ERROR
-        ;
-    break;}
-case 214:
-#line 2153 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+        ;}
+    break;
+
+  case 220:
+#line 2158 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
           CHECK_FOR_ERROR
-        ;
-    break;}
-case 215:
-#line 2162 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+        ;}
+    break;
+
+  case 221:
+#line 2167 "/proj/llvm/head/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 2172 "/Volumes/ProjectsDisk/cvs/llvm/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 222:
+#line 2177 "/proj/llvm/head/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 2183 "/Volumes/ProjectsDisk/cvs/llvm/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 218:
-#line 2187 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ArgList = yyvsp[-2].ArgList;
+  ;}
+    break;
+
+  case 223:
+#line 2188 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ArgList) = (yyvsp[0].ArgList);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 224:
+#line 2192 "/proj/llvm/head/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 2196 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ArgList = new ArgListType;
+  ;}
+    break;
+
+  case 225:
+#line 2201 "/proj/llvm/head/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 2205 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ArgList = 0;
+  ;}
+    break;
+
+  case 226:
+#line 2210 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
-  ;
-    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!
+  ;}
+    break;
+
+  case 227:
+#line 2216 "/proj/llvm/head/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());
@@ -4009,9 +4862,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()) {
@@ -4060,26 +4913,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
@@ -4087,332 +4940,366 @@
       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 2333 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-  yyval.FunctionVal = CurFun.CurrentFunction;
+;}
+    break;
+
+  case 230:
+#line 2338 "/proj/llvm/head/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 2344 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-  yyval.FunctionVal = yyvsp[-1].FunctionVal;
+  (yyval.FunctionVal)->setLinkage((yyvsp[-3].Linkage));
+  (yyval.FunctionVal)->setVisibility((yyvsp[-2].Visibility));
+;}
+    break;
+
+  case 233:
+#line 2349 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+  (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
   CHECK_FOR_ERROR
-;
-    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;
+;}
+    break;
+
+  case 234:
+#line 2354 "/proj/llvm/head/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 2361 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.BoolVal = false;
+  ;}
+    break;
+
+  case 235:
+#line 2366 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 230:
-#line 2365 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.BoolVal = true;
+  ;}
+    break;
+
+  case 236:
+#line 2370 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
-  ;
-    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);
+  ;}
+    break;
+
+  case 237:
+#line 2375 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {    // A reference to a direct constant
+    (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val));
     CHECK_FOR_ERROR
-  ;
-    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());
+  ;}
+    break;
+
+  case 238:
+#line 2379 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 235:
-#line 2386 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ValIDVal = ValID::create(ConstantInt::getFalse());
+  ;}
+    break;
+
+  case 239:
+#line 2383 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {                     // Perhaps it's an FP constant?
+    (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 236:
-#line 2390 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ValIDVal = ValID::createNull();
+  ;}
+    break;
+
+  case 240:
+#line 2387 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 237:
-#line 2394 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ValIDVal = ValID::createUndef();
+  ;}
+    break;
+
+  case 241:
+#line 2391 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse());
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 242:
+#line 2395 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::createNull();
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 243:
+#line 2399 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::createUndef();
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 244:
+#line 2403 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {     // A vector zero constant.
+    (yyval.ValIDVal) = ValID::createZeroInit();
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 245:
+#line 2407 "/proj/llvm/head/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() + "'.");
+    }
+
+    (yyval.ValIDVal) = ValID::create(ConstantVector::get(pt, *(yyvsp[-1].ConstVector)));
+    delete PTy; delete (yyvsp[-1].ConstVector);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 246:
+#line 2432 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal));
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 247:
+#line 2436 "/proj/llvm/head/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 248:
+#line 2446 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {  // Is it an integer reference...?
+    (yyval.ValIDVal) = ValID::createLocalID((yyvsp[0].UIntVal));
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 249:
+#line 2450 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[0].UIntVal));
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 250:
+#line 2454 "/proj/llvm/head/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 251:
+#line 2459 "/proj/llvm/head/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 254:
+#line 2472 "/proj/llvm/head/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 255:
+#line 2481 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 256:
+#line 2485 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { // Do not allow functions with 0 basic blocks   
+    (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 257:
+#line 2494 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    setValueName((yyvsp[0].TermInstVal), (yyvsp[-1].StrVal));
+    CHECK_FOR_ERROR
+    InsertValue((yyvsp[0].TermInstVal));
+    (yyvsp[-2].BasicBlockVal)->getInstList().push_back((yyvsp[0].TermInstVal));
+    (yyval.BasicBlockVal) = (yyvsp[-2].BasicBlockVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 258:
+#line 2503 "/proj/llvm/head/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 259:
+#line 2512 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {          // Empty space between instruction lists
+    (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 260:
+#line 2516 "/proj/llvm/head/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 261:
+#line 2523 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {              // Return with a result...
+    (yyval.TermInstVal) = new ReturnInst((yyvsp[0].ValueVal));
     CHECK_FOR_ERROR
-  ;
-    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() + "'.");
-    }
+  ;}
+    break;
 
-    yyval.ValIDVal = ValID::create(ConstantVector::get(pt, *yyvsp[-1].ConstVector));
-    delete PTy; delete yyvsp[-1].ConstVector;
+  case 262:
+#line 2527 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {                                    // Return with no result...
+    (yyval.TermInstVal) = new ReturnInst();
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 240:
-#line 2427 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ValIDVal = ValID::create(yyvsp[0].ConstVal);
+  ;}
+    break;
+
+  case 263:
+#line 2531 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {                           // Unconditional Branch...
+    BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
     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);
+    (yyval.TermInstVal) = new BranchInst(tmpBB);
+  ;}
+    break;
+
+  case 264:
+#line 2536 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {  
+    assert(cast<IntegerType>((yyvsp[-7].PrimType))->getBitWidth() == 1 && "Not Bool?");
+    BasicBlock* tmpBBA = getBBVal((yyvsp[-3].ValIDVal));
     CHECK_FOR_ERROR
-  ;
-    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;
+    BasicBlock* tmpBBB = getBBVal((yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
-  ;
-    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);
+    Value* tmpVal = getVal(Type::Int1Ty, (yyvsp[-6].ValIDVal));
     CHECK_FOR_ERROR
-    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);
+    (yyval.TermInstVal) = new BranchInst(tmpBBA, tmpBBB, tmpVal);
+  ;}
+    break;
+
+  case 265:
+#line 2546 "/proj/llvm/head/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 2560 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    Value* tmpVal = getVal(yyvsp[-6].PrimType, yyvsp[-5].ValIDVal);
+  ;}
+    break;
+
+  case 266:
+#line 2565 "/proj/llvm/head/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 2570 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 267:
+#line 2575 "/proj/llvm/head/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();
@@ -4428,22 +5315,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 "
@@ -4453,7 +5340,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)
@@ -4472,322 +5359,348 @@
 
     // 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 2649 "/Volumes/ProjectsDisk/cvs/llvm/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 263:
-#line 2653 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TermInstVal = new UnreachableInst();
+  ;}
+    break;
+
+  case 268:
+#line 2654 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
-  ;
-    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));
+  ;}
+    break;
+
+  case 269:
+#line 2658 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TermInstVal) = new UnreachableInst();
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 270:
+#line 2665 "/proj/llvm/head/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 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));
+    (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB));
+  ;}
+    break;
+
+  case 271:
+#line 2676 "/proj/llvm/head/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 2684 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB)); 
+  ;}
+    break;
+
+  case 272:
+#line 2689 "/proj/llvm/head/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 2694 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{    // Used for PHI nodes
+  ;}
+    break;
+
+  case 273:
+#line 2699 "/proj/llvm/head/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 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);
+      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 274:
+#line 2710 "/proj/llvm/head/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 2715 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{    
+    (yyvsp[-6].PHIList)->push_back(std::make_pair(tmpVal, tmpBB));
+  ;}
+    break;
+
+  case 275:
+#line 2720 "/proj/llvm/head/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 2724 "/Volumes/ProjectsDisk/cvs/llvm/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 276:
+#line 2729 "/proj/llvm/head/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 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);
+      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 274:
-#line 2744 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.BoolVal = true;
+  ;}
+    break;
+
+  case 277:
+#line 2738 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ValueRefList) = new ValueRefList(); ;}
+    break;
+
+  case 278:
+#line 2741 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ValueList) = new std::vector<Value*>(); ;}
+    break;
+
+  case 279:
+#line 2742 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValueList) = (yyvsp[-2].ValueList);
+    (yyval.ValueList)->push_back((yyvsp[0].ValueVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 275:
-#line 2748 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.BoolVal = false;
+  ;}
+    break;
+
+  case 280:
+#line 2749 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 276:
-#line 2753 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 281:
+#line 2753 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BoolVal) = false;
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 282:
+#line 2758 "/proj/llvm/head/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 2774 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    delete (yyvsp[-3].TypeVal);
+  ;}
+    break;
+
+  case 283:
+#line 2779 "/proj/llvm/head/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 2791 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    delete (yyvsp[-3].TypeVal);
+  ;}
+    break;
+
+  case 284:
+#line 2796 "/proj/llvm/head/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 2805 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    delete (yyvsp[-3].TypeVal);
+  ;}
+    break;
+
+  case 285:
+#line 2810 "/proj/llvm/head/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 2819 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    delete (yyvsp[-3].TypeVal);
+  ;}
+    break;
+
+  case 286:
+#line 2824 "/proj/llvm/head/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 2831 "/Volumes/ProjectsDisk/cvs/llvm/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 287:
+#line 2836 "/proj/llvm/head/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 2839 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 288:
+#line 2844 "/proj/llvm/head/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 2846 "/Volumes/ProjectsDisk/cvs/llvm/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 289:
+#line 2851 "/proj/llvm/head/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 2852 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (!InsertElementInst::isValidOperands(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
+  ;}
+    break;
+
+  case 290:
+#line 2857 "/proj/llvm/head/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 2858 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (!ShuffleVectorInst::isValidOperands(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
+  ;}
+    break;
+
+  case 291:
+#line 2863 "/proj/llvm/head/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 2864 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    const Type *Ty = yyvsp[0].PHIList->front().first->getType();
+  ;}
+    break;
+
+  case 292:
+#line 2869 "/proj/llvm/head/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 2880 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 293:
+#line 2885 "/proj/llvm/head/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)
@@ -4803,11 +5716,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.
@@ -4821,7 +5734,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 "
@@ -4832,7 +5745,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)
@@ -4849,365 +5762,428 @@
     }
     // 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 2964 "/Volumes/ProjectsDisk/cvs/llvm/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 289:
-#line 2969 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.BoolVal = true;
+  ;}
+    break;
+
+  case 294:
+#line 2969 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.InstVal) = (yyvsp[0].InstVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 290:
-#line 2973 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.BoolVal = false;
+  ;}
+    break;
+
+  case 295:
+#line 2974 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 291:
-#line 2980 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 296:
+#line 2978 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BoolVal) = false;
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 297:
+#line 2985 "/proj/llvm/head/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 2987 "/Volumes/ProjectsDisk/cvs/llvm/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 298:
+#line 2992 "/proj/llvm/head/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 2995 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    (yyval.InstVal) = new MallocInst(*(yyvsp[-4].TypeVal), tmpVal, (yyvsp[0].UIntVal));
+    delete (yyvsp[-4].TypeVal);
+  ;}
+    break;
+
+  case 299:
+#line 3000 "/proj/llvm/head/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 3002 "/Volumes/ProjectsDisk/cvs/llvm/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 300:
+#line 3007 "/proj/llvm/head/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 3010 "/Volumes/ProjectsDisk/cvs/llvm/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 301:
+#line 3015 "/proj/llvm/head/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 3018 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 302:
+#line 3023 "/proj/llvm/head/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 3032 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    (yyval.InstVal) = new LoadInst(tmpVal, "", (yyvsp[-4].BoolVal), (yyvsp[0].UIntVal));
+    delete (yyvsp[-2].TypeVal);
+  ;}
+    break;
+
+  case 303:
+#line 3037 "/proj/llvm/head/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 3049 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    (yyval.InstVal) = new StoreInst((yyvsp[-4].ValueVal), tmpVal, (yyvsp[-6].BoolVal), (yyvsp[0].UIntVal));
+    delete (yyvsp[-2].TypeVal);
+  ;}
+    break;
+
+  case 304:
+#line 3054 "/proj/llvm/head/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;}
-}
-   /* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/share/bison.simple"
+    (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 5919 "llvmAsmParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
-#ifdef YYLSP_NEEDED
-  yylsp -= yylen;
-#endif
 
-#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
+
+  YY_STACK_PRINT (yyss, yyssp);
 
   *++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 - YYNTBASE] + *yyssp;
-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
     yystate = yytable[yystate];
   else
-    yystate = yydefgoto[yyn - YYNTBASE];
+    yystate = yydefgoto[yyn - YYNTOKENS];
 
   goto yynewstate;
 
-yyerrlab:   /* here on detecting error */
 
-  if (! yyerrstatus)
-    /* If not already recovering from an error, report this error.  */
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
     {
       ++yynerrs;
-
-#ifdef YYERROR_VERBOSE
+#if YYERROR_VERBOSE
       yyn = yypact[yystate];
 
-      if (yyn > YYFLAG && yyn < YYLAST)
+      if (YYPACT_NINF < yyn && yyn < YYLAST)
 	{
-	  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)
-	    {
-	      strcpy(msg, "parse error");
+	  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 (count < 5)
+#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)
+	    {
+	      /* 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))
 		{
-		  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++;
-		      }
+		  if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		    {
+		      yyp += yytnamerr (yyp, yyarg[yyi++]);
+		      yyf += 2;
+		    }
+		  else
+		    {
+		      yyp++;
+		      yyf++;
+		    }
 		}
-	      yyerror(msg);
-	      free(msg);
+	      yyerror (yymsg);
+	      YYSTACK_FREE (yymsg);
 	    }
 	  else
-	    yyerror ("parse error; also virtual memory exceeded");
+	    {
+	      yyerror (YY_("syntax error"));
+	      goto yyexhaustedlab;
+	    }
 	}
       else
 #endif /* YYERROR_VERBOSE */
-	yyerror("parse error");
+	yyerror (YY_("syntax error"));
     }
 
-  goto yyerrlab1;
-yyerrlab1:   /* here on error raised explicitly by an action */
+
 
   if (yyerrstatus == 3)
     {
-      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
-
-      /* return failure if at end of input */
-      if (yychar == YYEOF)
-	YYABORT;
+      /* If just tried and failed to reuse look-ahead token after an
+	 error, discard it.  */
 
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
-#endif
-
-      yychar = YYEMPTY;
+      if (yychar <= YYEOF)
+        {
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
+        }
+      else
+	{
+	  yydestruct ("Error: discarding", yytoken, &yylval);
+	  yychar = YYEMPTY;
+	}
     }
 
-  /* Else will try to reuse lookahead token
-     after shifting the error token.  */
-
-  yyerrstatus = 3;		/* Each real token shifted decrements this */
+  /* Else will try to reuse look-ahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
 
-  goto yyerrhandle;
 
-yyerrdefault:  /* current state does not do anything special for the error token. */
+/*---------------------------------------------------.
+| 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;
 
-#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
+yyvsp -= yylen;
+  yyssp -= yylen;
+  yystate = *yyssp;
+  goto yyerrlab1;
 
-yyerrpop:   /* pop the current state because it cannot handle the error token */
 
-  if (yyssp == yyss) YYABORT;
-  yyvsp--;
-  yystate = *--yyssp;
-#ifdef YYLSP_NEEDED
-  yylsp--;
-#endif
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
-#if YYDEBUG != 0
-  if (yydebug)
+  for (;;)
     {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "Error: state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
-
-yyerrhandle:
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+	{
+	  yyn += YYTERROR;
+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+	    {
+	      yyn = yytable[yyn];
+	      if (0 < yyn)
+		break;
+	    }
+	}
 
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yyerrdefault;
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+	YYABORT;
 
-  yyn += YYTERROR;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
-    goto yyerrdefault;
 
-  yyn = yytable[yyn];
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrpop;
-      yyn = -yyn;
-      goto yyreduce;
+      yydestruct ("Error: popping", yystos[yystate], yyvsp);
+      YYPOPSTACK;
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
     }
-  else if (yyn == 0)
-    goto yyerrpop;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting error token, ");
-#endif
-
   *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
+
+
+  /* Shift the error token. */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
 
   yystate = yyn;
   goto yynewstate;
 
- yyacceptlab:
-  /* YYACCEPT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
-#endif
-    }
-  return 0;
 
- yyabortlab:
-  /* YYABORT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
+/*-------------------------------------.
+| 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);
 #endif
-    }
-  return 1;
+  return yyresult;
 }
-#line 3066 "/Volumes/ProjectsDisk/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+
+
+#line 3071 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
 
 
 // common code from the two 'RunVMAsmParser' functions
@@ -5288,3 +6264,4 @@
   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=40611&r1=40610&r2=40611&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs Mon Jul 30 22:50:36 2007
@@ -1,4 +1,324 @@
-typedef union {
+/* 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,
+     SIGNEXT = 386,
+     ZEROEXT = 387,
+     NORETURN = 388,
+     INREG = 389,
+     SRET = 390,
+     NOUNWIND = 391,
+     NOALIAS = 392,
+     BYVAL = 393,
+     NEST = 394,
+     DEFAULT = 395,
+     HIDDEN = 396,
+     PROTECTED = 397
+   };
+#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 SIGNEXT 386
+#define ZEROEXT 387
+#define NORETURN 388
+#define INREG 389
+#define SRET 390
+#define NOUNWIND 391
+#define NOALIAS 392
+#define BYVAL 393
+#define NEST 394
+#define DEFAULT 395
+#define HIDDEN 396
+#define PROTECTED 397
+
+
+
+
+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+#line 957 "/proj/llvm/head/llvm/lib/AsmParser/llvmAsmParser.y"
+typedef union YYSTYPE {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   llvm::BasicBlock                       *BasicBlockVal;
@@ -44,142 +364,14 @@
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
 } YYSTYPE;
-#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
-
+/* Line 1447 of yacc.c.  */
+#line 369 "llvmAsmParser.tab.h"
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
 
 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=40611&r1=40610&r2=40611&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs Mon Jul 30 22:50:36 2007
@@ -1101,7 +1101,7 @@
 %token <OtherOpVal> EXTRACTELEMENT INSERTELEMENT SHUFFLEVECTOR
 
 // Function Attributes
-%token NORETURN INREG SRET NOUNWIND NOALIAS
+%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS BYVAL NEST
 
 // Visibility Styles
 %token DEFAULT HIDDEN PROTECTED
@@ -1224,11 +1224,15 @@
                   CHECK_FOR_ERROR
                  };
 
-ParamAttr     : ZEXT    { $$ = ParamAttr::ZExt;      }
+ParamAttr     : ZEROEXT { $$ = ParamAttr::ZExt;      }
+              | ZEXT    { $$ = ParamAttr::ZExt;      }
+              | SIGNEXT { $$ = ParamAttr::SExt;      }
               | SEXT    { $$ = ParamAttr::SExt;      }
               | INREG   { $$ = ParamAttr::InReg;     }
               | SRET    { $$ = ParamAttr::StructRet; }
               | NOALIAS { $$ = ParamAttr::NoAlias;   }
+              | BYVAL   { $$ = ParamAttr::ByVal;     }
+              | NEST    { $$ = ParamAttr::Nest;      }
               ;
 
 OptParamAttrs : /* empty */  { $$ = ParamAttr::None; }
@@ -1239,7 +1243,8 @@
 
 FuncAttr      : NORETURN { $$ = ParamAttr::NoReturn; }
               | NOUNWIND { $$ = ParamAttr::NoUnwind; }
-              | ParamAttr
+              | ZEROEXT  { $$ = ParamAttr::ZExt;     }
+              | SIGNEXT  { $$ = ParamAttr::SExt;     }
               ;
 
 OptFuncAttrs  : /* empty */ { $$ = ParamAttr::None; }





More information about the llvm-commits mailing list