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

Chris Lattner sabre at nondot.org
Sat Oct 21 23:08:27 PDT 2006



Changes in directory llvm/lib/AsmParser:

Lexer.cpp.cvs updated: 1.11 -> 1.12
Lexer.l.cvs updated: 1.8 -> 1.9
llvmAsmParser.cpp.cvs updated: 1.19 -> 1.20
llvmAsmParser.h.cvs updated: 1.14 -> 1.15
llvmAsmParser.y.cvs updated: 1.19 -> 1.20
---
Log message:

regenerate


---
Diffs of the changes:  (+3282 -4270)

 Lexer.cpp.cvs         |  821 +++---
 Lexer.l.cvs           |    2 
 llvmAsmParser.cpp.cvs | 6355 +++++++++++++++++++++-----------------------------
 llvmAsmParser.h.cvs   |  370 --
 llvmAsmParser.y.cvs   |    4 
 5 files changed, 3282 insertions(+), 4270 deletions(-)


Index: llvm/lib/AsmParser/Lexer.cpp.cvs
diff -u llvm/lib/AsmParser/Lexer.cpp.cvs:1.11 llvm/lib/AsmParser/Lexer.cpp.cvs:1.12
--- llvm/lib/AsmParser/Lexer.cpp.cvs:1.11	Fri Oct 20 02:07:24 2006
+++ llvm/lib/AsmParser/Lexer.cpp.cvs	Sun Oct 22 01:08:13 2006
@@ -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: /home/vadve/shared/PublicCVS/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.11 2006/10/20 07:07:24 reid Exp $
+ * $Header: /home/vadve/shared/PublicCVS/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.12 2006/10/22 06:08:13 lattner Exp $
  */
 
 #define FLEX_SCANNER
@@ -28,7 +28,6 @@
 #define YY_FLEX_MINOR_VERSION 5
 
 #include <stdio.h>
-#include <unistd.h>
 
 
 /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
@@ -42,6 +41,7 @@
 #ifdef __cplusplus
 
 #include <stdlib.h>
+#include <unistd.h>
 
 /* Use prototypes in function declarations. */
 #define YY_USE_PROTOS
@@ -153,15 +153,6 @@
 
 #define unput(c) yyunput( c, yytext_ptr )
 
-/* Some routines like yy_flex_realloc() are emitted as static but are
-   not called by all lexers. This generates warnings in some compilers,
-   notably GCC. Arrange to suppress these. */
-#ifdef __GNUC__
-#define YY_MAY_BE_UNUSED __attribute__((unused))
-#else
-#define YY_MAY_BE_UNUSED
-#endif
-
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
@@ -268,7 +259,7 @@
 YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
 
 static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static inline void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) YY_MAY_BE_UNUSED;
+static inline void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
 static void yy_flex_free YY_PROTO(( void * ));
 
 #define yy_new_buffer yy_create_buffer
@@ -333,19 +324,19 @@
       110,  111,   63,   68,   39,   34,   42,   66,    3,   54,
 
        65,   25,   77,   67,   86,   81,   82,   64,   70,  103,
-      110,  110,   49,   78,   79,   32,   94,   95,   56,   22,
-      107,   26,    4,   61,   55,   48,   11,  110,   36,    2,
-        5,   58,   60,   50,   72,   76,   74,   75,   73,   71,
-       52,   96,   51,   57,   21,   84,   93,   45,   59,   30,
-       24,   44,    7,   89,   33,   92,   38,   62,   80,   88,
-       27,   28,   90,   53,   85,   83,   43,    6,   29,   37,
-        8,   17,    9,   10,   35,   12,   14,   13,   40,   15,
+      110,  110,   49,   78,   79,   94,   95,   56,   22,  107,
+       26,    4,   61,   55,   48,   11,  110,   36,    2,    5,
+       58,   60,   50,   72,   76,   74,   75,   73,   71,   52,
+       96,   51,   57,   21,   84,   93,   45,   59,   30,   24,
+       44,    7,   89,   33,   92,   38,   62,   80,   88,   27,
+       28,   90,   53,   85,   83,   43,    6,   29,   37,    8,
+       17,    9,   10,   35,   12,   14,   13,   32,   40,   15,
        31,   91,   97,   99,  100,   16,   46,   98,   18,   47,
        19
 
     } ;
 
-static yyconst short int yy_accept[505] =
+static yyconst short int yy_accept[511] =
     {   0,
         1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
        17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
@@ -371,38 +362,38 @@
 
       109,  109,  109,  109,  110,  110,  111,  112,  112,  112,
       112,  113,  113,  113,  113,  113,  114,  115,  116,  116,
-      116,  116,  117,  117,  117,  117,  117,  117,  117,  117,
-      117,  117,  117,  117,  117,  118,  118,  118,  118,  118,
-      118,  118,  118,  118,  118,  119,  120,  120,  120,  121,
-      121,  121,  122,  122,  122,  122,  122,  122,  122,  122,
-      122,  122,  122,  122,  122,  123,  123,  123,  124,  125,
-      125,  126,  126,  126,  126,  126,  126,  126,  126,  126,
-      126,  127,  127,  128,  128,  128,  129,  130,  130,  130,
-      131,  131,  131,  131,  131,  131,  131,  131,  131,  131,
-
-      131,  131,  131,  132,  132,  133,  133,  133,  133,  133,
-      133,  133,  134,  134,  134,  134,  134,  134,  134,  135,
-      135,  135,  136,  137,  138,  139,  140,  141,  142,  142,
-      142,  143,  143,  143,  143,  144,  145,  146,  146,  146,
-      146,  146,  146,  147,  147,  147,  147,  147,  147,  148,
-      148,  149,  149,  149,  149,  149,  149,  149,  150,  151,
-      152,  152,  152,  153,  153,  154,  154,  154,  154,  155,
-      155,  156,  157,  158,  159,  159,  159,  160,  160,  160,
-      161,  162,  163,  163,  163,  164,  165,  166,  167,  167,
-      167,  167,  167,  167,  167,  168,  169,  170,  170,  170,
-
-      170,  170,  170,  170,  170,  170,  170,  170,  170,  171,
-      171,  171,  171,  171,  171,  171,  171,  171,  171,  172,
-      172,  172,  172,  173,  173,  173,  173,  173,  174,  175,
-      175,  175,  175,  175,  175,  176,  176,  176,  176,  177,
-      178,  179,  179,  179,  179,  179,  179,  179,  179,  179,
-      179,  179,  179,  179,  179,  179,  179,  179,  179,  179,
-      179,  179,  180,  180,  180,  180,  180,  180,  181,  181,
-      181,  181,  181,  182,  182,  182,  183,  183,  183,  183,
-      183,  183,  183,  183,  183,  183,  183,  183,  183,  183,
-      184,  184,  185,  186,  187,  187,  188,  188,  189,  190,
+      116,  116,  116,  116,  116,  116,  116,  116,  116,  116,
+      116,  116,  116,  116,  116,  117,  117,  117,  117,  117,
+      117,  117,  117,  117,  117,  118,  119,  119,  119,  120,
+      120,  120,  121,  121,  121,  121,  121,  121,  121,  121,
+      121,  121,  121,  121,  121,  122,  122,  122,  123,  124,
+      124,  125,  125,  125,  125,  125,  125,  125,  125,  125,
+      125,  126,  126,  127,  127,  127,  128,  129,  129,  129,
+      130,  130,  130,  130,  130,  130,  130,  130,  130,  130,
+
+      130,  130,  130,  130,  131,  131,  132,  132,  132,  132,
+      132,  132,  132,  133,  133,  133,  133,  133,  133,  133,
+      134,  134,  134,  135,  136,  137,  138,  139,  140,  141,
+      141,  141,  142,  142,  142,  142,  143,  144,  145,  145,
+      145,  145,  145,  145,  146,  146,  146,  146,  146,  146,
+      147,  147,  148,  148,  148,  148,  148,  148,  148,  148,
+      149,  150,  151,  151,  151,  152,  152,  153,  153,  153,
+      153,  154,  154,  155,  156,  157,  158,  158,  158,  159,
+      159,  159,  160,  161,  162,  162,  162,  163,  164,  165,
+      166,  166,  166,  166,  166,  166,  166,  167,  167,  168,
+
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  170,  170,  170,  170,  170,  170,  170,  170,
+      170,  170,  171,  171,  171,  171,  171,  172,  172,  172,
+      172,  172,  173,  174,  174,  174,  174,  174,  174,  175,
+      175,  175,  175,  176,  176,  177,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      179,  179,  179,  179,  179,  179,  179,  179,  180,  180,
+      180,  180,  180,  180,  181,  181,  181,  181,  181,  182,
+      182,  182,  183,  183,  183,  183,  183,  183,  183,  183,
+      183,  183,  183,  183,  183,  183,  184,  184,  185,  186,
 
-      191,  191,  192,  192
+      187,  187,  188,  188,  189,  190,  191,  191,  192,  192
     } ;
 
 static yyconst int yy_ec[256] =
@@ -446,127 +437,129 @@
         3,    3,    3
     } ;
 
-static yyconst short int yy_base[509] =
+static yyconst short int yy_base[515] =
     {   0,
-        0,    0, 1096, 1097, 1097, 1097, 1091, 1080,   36,   40,
+        0,    0, 1108, 1109, 1109, 1109, 1103, 1092,   36,   40,
        44,   50,   56,   62,    0,   63,   66,   81,   89,   47,
        90,   91,   76,   96,  108,   49,   97,  110,   68,  137,
-      120,  168,  112,  115,  135,  127, 1089, 1097, 1078, 1097,
+      120,  168,  112,  115,  135,  127, 1101, 1109, 1090, 1109,
         0,  158,  173,  180,  196,   70,  201,  216,  221,    0,
-      121,  152,  123,  139,  166,  140,  162,  184, 1077,  222,
+      121,  152,  123,  139,  166,  140,  162,  184, 1089,  222,
       180,   31,  186,  119,  232,  208,  144,  225,  234,  236,
       235,  188,  238,  240,  246,  241,  245,  203,  248,  256,
-      254,  258,  262,  252,  272,  274, 1076,  276,  278,  280,
-      255,  253,  283,  284,  285,  286,  288,  297,  300, 1075,
+      254,  258,  262,  252,  272,  274, 1088,  276,  278,  280,
+      255,  253,  283,  284,  285,  286,  288,  297,  300, 1087,
 
       301,  292,  295,  307,  309,  318,  316,  315,  322,  312,
-      147,  329,  330, 1074,    0,  344,  349, 1073,  363,  380,
-        0, 1072,  338,  336, 1071,  355, 1070,  356, 1069,  353,
-      367,  334, 1068,  375,  365,  381,  384,  370,  371, 1067,
+      147,  329,  330, 1086,    0,  344,  349, 1085,  363,  380,
+        0, 1084,  338,  336, 1083,  355, 1082,  356, 1081,  353,
+      367,  334, 1080,  375,  365,  381,  384,  370,  371, 1079,
       388,  392,  391,  393,  394,  395,  396,  400,  399,  407,
       406,  409,  411,  413,  410,  414,  418,  421,  425,  426,
-      427,  429, 1066, 1065,  430,  431, 1064,  435, 1063, 1062,
-      458,  436,  439,  434,  469, 1061,  449, 1060,  438,  441,
-      458, 1059,  471,  472,  474,  473,  481,  482,  475,  476,
+      427,  429, 1078, 1077,  430,  431, 1076,  435, 1075, 1074,
+      458,  436,  439,  434,  469, 1073,  449, 1072,  438,  441,
+      458, 1071,  471,  472,  474,  473,  481,  482,  475,  476,
       483,  488,  489,  493,  495,  496,  504,  501,  503,  505,
 
-      510,  507,  516, 1058,  511, 1097,  527,  541,  545,  549,
-      554,  555,  440,  556,  557, 1057, 1056, 1055,  558,  559,
-      560, 1054,  527,  518,  561,  189,  562,  528,  566,  563,
-      564,  567,  568,  570, 1053,  571,  587,  580,  578,  579,
-      581,  590,  591,  596, 1052, 1051,  594,  598, 1050,  597,
-      601,    0,  606,  603,  607,  602,  608,  610,  618,  620,
-      625,  623,  628,  629, 1049,  630,  626, 1048, 1047,  638,
-     1046,  634,  640,  642,  644,  646,  648,  651,  653,  652,
-     1045,  654, 1044,  656,  657,  662, 1043,  662,  665, 1042,
-      668,  671,  674,  680,  682,  683,  684,  685,  687,  686,
-
-      689,  690, 1041,  691, 1040,  696,  692,  695,  693,  700,
-      699, 1039,  710,  712,  713,  714,  715,  719, 1038,  718,
-      722, 1037, 1036, 1035, 1034, 1033, 1032, 1031,  725,  729,
-     1030,  726,  730,  732, 1029, 1028, 1027,  731,  735,  743,
-      733,  737, 1026,  734,  746,  744,  747,  750, 1025,  752,
-     1024,  755,  761,  760,  758,  763,  764, 1023, 1022, 1021,
-      771,  762, 1020,  773, 1019,  774,  777,  779, 1018,  787,
-     1017, 1016, 1015, 1014,  778,  788, 1013,  791,  792, 1012,
-     1011, 1010,  790,  795, 1009, 1008, 1007, 1006,  793,  796,
-      798,  797,  804,  801, 1005, 1004, 1003,  809,  811,  812,
-
-      813,  814,  816,  817,  820,  822,  827,  819, 1002,  815,
-      833,  826,  839,  843,  845,  846,  847,  848,  999,  849,
-      850,  851,  990,  854,  857,  855,  856,  989,  987,  858,
-      866,  876,  862,  861,  986,  879,  880,  881,  984,  983,
-      982,  882,  884,  888,  890,  889,  863,  891,  896,  897,
-      899,  901,  900,  902,  903,  904,  908,  909,  912,  913,
-      916,  980,  918,  924,  923,  925,  926,  977,  928,  929,
-      930,  931,  975,  935,  936,  973,  934,  944,  942,  946,
-      950,  954,  956,  957,  958,  960,  961,  959,  962,  864,
-      964,  829,  766,  604,  969,  519,  965,  517,  477,  446,
+      510,  507,  516, 1070,  511, 1109,  527,  541,  545,  549,
+      554,  555,  440,  556,  557, 1069, 1068, 1067,  558,  559,
+      560,  517,  528,  518,  561,  189,  562,  563,  566,  569,
+      570,  567,  564,  578, 1066,  579,  581,  580,  584,  587,
+      592,  595,  591,  596, 1065, 1064,  597,  598, 1063,  593,
+      599,    0,  603,  607,  614,  604,  616,  618,  619,  600,
+      626,  629,  631,  630, 1062,  633,  632, 1061, 1060,  634,
+     1059,  635,  644,  645,  648,  649,  650,  651,  652,  655,
+     1058,  656, 1057,  659,  657,  677, 1056,  660,  519, 1055,
+      661,  662,  677,  678,  664,  680,  687,  688,  689,  691,
+
+      690,  692,  693, 1054,  694, 1053,  695,  696,  699,  697,
+      702,  703, 1052,  705,  714,  710,  716,  718,  721, 1051,
+      724,  726, 1050, 1049, 1048, 1047, 1046, 1045, 1044,  728,
+      729, 1043,  732,  731,  736, 1042, 1041, 1040,  733,  734,
+      738,  735,  737, 1039,  740,  747,  750,  751,  752, 1038,
+      753, 1037,  759,  757,  761,  762,  765,  767,  768, 1036,
+     1035, 1034,  773,  770, 1033,  772, 1032,  775,  781,  791,
+     1031,  792, 1030, 1029, 1028, 1027,  779,  780, 1026,  794,
+      795, 1025, 1024, 1023,  798,  801, 1022, 1021, 1020, 1019,
+      802,  782,  806,  807,  808,  809, 1018,  810, 1017, 1016,
+
+      812,  815,  816,  819,  818,  821,  822,  823,  826,  831,
+      824, 1015,  829,  835,  843,  845,  847,  837,  851,  849,
+      852, 1014,  853,  855,  857,  859, 1013,  861,  862,  864,
+      865, 1012, 1011,  869,  866,  881,  870,  867, 1010,  883,
+      884,  886, 1007,  871,  998,  997,  891,  892,  893,  895,
+      897,  898,  902,  903,  904,  905,  906,  907,  910,  995,
+      914,  908,  912,  918,  921,  923,  919,  994,  925,  929,
+      933,  934,  935,  992,  936,  937,  939,  940,  990,  943,
+      944,  989,  947,  951,  946,  955,  956,  963,  964,  965,
+      966,  968,  969,  967,  970,  985,  971,  984,  983,  979,
 
-      970,  333, 1097, 1005, 1007,   83, 1011,   80
+      973,  783,  982,  602,  477,  446,  978,  333, 1109, 1013,
+     1015,   83, 1019,   80
     } ;
 
-static yyconst short int yy_def[509] =
+static yyconst short int yy_def[515] =
     {   0,
-      503,    1,  503,  503,  503,  503,  504,  505,  506,  503,
-      505,  505,  505,  505,  507,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  504,  503,  505,  503,
-      508,  508,  503,  503,  505,  505,  505,  505,  505,  507,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  503,  508,  508,  503,  505,  505,  505,
-       49,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-       49,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-
-      505,  505,  505,  505,  505,  503,  503,  503,  503,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  171,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  503,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      509,    1,  509,  509,  509,  509,  510,  511,  512,  509,
+      511,  511,  511,  511,  513,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  510,  509,  511,  509,
+      514,  514,  509,  509,  511,  511,  511,  511,  511,  513,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  509,  514,  514,  509,  511,  511,  511,
+       49,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+       49,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+
+      511,  511,  511,  511,  511,  509,  509,  509,  509,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  171,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  509,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
 
-      505,  505,    0,  503,  503,  503,  503,  503
+      511,  511,  511,  511,  511,  511,  511,  511,    0,  509,
+      509,  509,  509,  509
     } ;
 
-static yyconst short int yy_nxt[1141] =
+static yyconst short int yy_nxt[1153] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   14,   14,    4,   15,    8,    8,    8,   16,   17,
@@ -591,7 +584,7 @@
        44,   44,   44,   40,  104,  127,  105,   40,  106,   40,
 
       133,   40,   40,  107,   47,   45,   45,   45,   45,   40,
-      119,  119,  119,  119,   40,  130,   40,  120,  297,  148,
+      119,  119,  119,  119,   40,  130,   40,  120,  298,  148,
       136,   40,  156,  120,   47,   48,   48,   48,   48,   40,
       121,  121,  121,  121,   40,   40,  121,  121,   40,  121,
       121,  121,  121,  121,  121,   40,  140,   40,   40,   40,
@@ -627,75 +620,77 @@
       273,  270,  271,  272,   40,  275,   40,   40,   40,  274,
        40,  276,  278,   40,   40,  280,  281,  277,  282,   40,
        40,   40,   40,  284,  283,  279,  207,  207,  207,  207,
-       40,   40,  285,  208,  295,  294,  299,  209,  209,  208,
+      351,   40,  285,  208,  296,  294,  295,  209,  209,  208,
       286,  286,  286,  286,  286,  286,  286,  286,  211,  211,
       211,  211,   40,  211,  211,  211,  211,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,  291,   40,
-       40,   40,  302,   40,   40,  287,  289,  290,  304,  303,
-      298,   40,   40,   40,   40,  292,  293,  301,  300,  306,
+       40,  300,   40,   40,  305,  287,  289,  290,  303,  304,
+      299,   40,   40,   40,   40,  292,  293,   40,  301,  308,
 
-       40,  296,  308,   40,   40,  307,  305,   40,  311,   40,
-       40,   40,  309,  310,   40,   40,   40,   40,  312,   40,
-       40,   40,  313,   40,  314,  315,  316,  321,  319,  320,
-      323,   40,  325,   40,  317,  322,   40,  318,   40,   40,
-      327,   40,   40,   40,  324,  330,  326,   40,  329,  332,
-      331,   40,  333,   40,  334,   40,  328,   40,  336,   40,
-      335,   40,  339,  337,   40,   40,   40,   40,  338,   40,
-       40,  286,  286,  286,  286,   40,  340,  343,   40,  346,
-      349,   40,  341,  348,   40,  342,  350,   40,  351,  352,
-      345,  347,  344,   40,  353,   40,   40,   40,   40,   40,
-
-       40,  355,   40,   40,   40,   40,   40,  358,   40,   40,
-      362,  363,   40,   40,  354,  356,  357,  359,  364,  361,
-      365,  369,  360,   40,  366,   40,   40,   40,   40,  367,
-      368,   40,   40,  372,  371,   40,  373,  374,   40,   40,
-      370,  375,   40,   40,   40,   40,   40,   40,   40,  376,
-       40,  380,  379,  378,  382,  384,   40,   40,  377,   40,
-       40,  387,  390,   40,  385,   40,  381,  383,   40,  386,
-      388,   40,  389,   40,   40,   40,   40,   40,  393,   40,
-      392,  395,  396,  391,   40,  394,   40,   40,  400,  401,
-       40,   40,   40,  397,  398,  399,  404,  406,  402,  405,
-
-       40,   40,  403,   40,   40,   40,   40,  407,   40,   40,
-       40,   40,  408,  410,   40,  411,  412,   40,  409,  416,
-      413,  414,   40,  417,   40,   40,   40,   40,   40,   40,
-       40,  415,   40,   40,  418,   40,  424,  419,  425,   40,
-       40,  423,   40,  420,  433,  421,   40,  426,  427,  429,
-      428,  422,   40,  431,  430,  432,   40,  434,   40,   40,
-       40,   40,   40,   40,   40,  435,  437,   40,   40,   40,
-       40,   40,  439,  442,   40,   40,   40,   40,  446,   40,
-      451,  436,  443,  438,  447,  440,  441,  444,  448,   40,
-      450,  445,   40,   40,   40,   40,  449,   40,  453,  452,
-
-      455,   40,   40,   40,   40,  460,  456,  454,  458,   40,
-       40,  461,   40,   40,   40,   40,   40,   40,  459,  465,
-      467,   40,   40,  463,  457,   40,   40,  464,  466,   40,
-      468,   40,  462,  469,  472,  473,   40,   40,   40,   40,
-      470,   40,   40,   40,   40,  471,  476,   40,   40,   40,
-      480,  477,  474,  478,  479,   40,  482,   40,  485,   40,
-      475,  483,  486,   40,  487,  481,  484,   40,  488,   40,
-       40,   40,   40,   40,   40,   40,  489,   40,   40,  494,
-      495,  496,   40,   40,  490,  491,   40,  501,   40,  500,
-       40,  493,  492,   40,  499,   40,   40,   40,  498,   40,
+       40,  297,  309,  302,   40,   40,   40,  307,   40,   40,
+       40,   40,   40,   40,  306,   40,   40,   40,  310,  312,
+       40,  311,  314,  313,  315,  320,  317,   40,  316,   40,
+      318,   40,   40,  321,  322,  319,  329,  323,  324,   40,
+      326,  328,   40,   40,   40,   40,   40,   40,   40,  330,
+      333,  331,  325,  332,  327,  334,  336,   40,   40,  337,
+      335,   40,   40,   40,   40,   40,  340,  338,   40,   40,
+       40,  339,   40,   40,   40,   40,  344,   40,  350,  341,
+      353,  352,  347,  349,  342,  343,  286,  286,  286,  286,
+       40,   40,  346,   40,  348,  345,  355,  354,  356,  357,
 
-       40,  497,   40,   40,  502,   37,   37,   37,   37,   39,
-       39,   50,   40,   50,   50,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,  360,   40,  364,  365,   40,   40,  366,   40,  358,
+      359,  361,  363,   40,  367,  371,  362,   40,  368,   40,
+      374,   40,  370,  369,   40,  372,  373,   40,  375,   40,
+      376,   40,   40,  377,   40,   40,   40,   40,   40,   40,
+       40,   40,  381,   40,  386,  378,  380,  382,  384,  387,
+       40,  389,  379,   40,   40,   40,   40,  383,  392,  385,
+       40,  388,   40,  391,   40,   40,  390,  397,   40,  395,
+       40,   40,  394,   40,  399,   40,   40,  393,   40,  396,
+      403,  404,   40,   40,   40,   40,   40,  407,  401,  402,
+
+      400,  406,  398,  408,   40,   40,  405,   40,   40,  409,
+      412,   40,  410,  411,   40,   40,  413,  418,  414,   40,
+       40,   40,   40,   40,  415,   40,  416,  419,   40,   40,
+      417,   40,   40,  420,   40,   40,   40,   40,  421,   40,
+      428,  423,   40,  429,   40,  422,  424,  427,   40,  425,
+       40,  431,  430,  433,  432,  426,   40,  436,   40,  434,
+       40,  437,   40,  438,   40,   40,   40,  435,   40,  439,
+       40,  441,   40,  440,   40,   40,  443,   40,   40,   40,
+       40,  447,   40,   40,   40,  442,  456,  451,  453,  448,
+      444,  445,  449,  446,   40,  452,   40,   40,  455,   40,
+
+      450,  454,  458,  457,   40,   40,   40,  460,   40,  461,
+       40,   40,  459,  464,  462,   40,   40,   40,   40,   40,
+       40,   40,  467,   40,  471,   40,  465,   40,  473,  463,
+      469,   40,   40,  470,   40,  472,   40,  475,   40,  468,
+      466,  474,   40,  478,  476,  479,   40,   40,   40,   40,
+       40,  482,   40,   40,  477,  480,   40,   40,  486,   40,
+       40,  483,  484,  485,   40,  488,  491,  481,   40,   40,
+      489,  493,  494,  487,  490,  492,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,  495,   40,  500,  501,  502,
+      496,   40,   40,  506,  497,   40,   40,   40,   40,  499,
+
+      498,  505,   40,   40,  507,   40,  504,   40,   40,  503,
+       40,   40,  508,   37,   37,   37,   37,   39,   39,   50,
+       40,   50,   50,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,  206,   40,   40,
-       40,   40,  114,   40,   38,  503,    3,  503,  503,  503,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,  206,
 
-      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-      503,  503,  503,  503,  503,  503,  503,  503,  503,  503
+       40,   40,   40,   40,  114,   40,   38,  509,    3,  509,
+      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
+      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
+      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
+      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
+      509,  509
     } ;
 
-static yyconst short int yy_chk[1141] =
+static yyconst short int yy_chk[1153] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -705,7 +700,7 @@
        10,   10,   10,   11,   11,   11,   11,   11,   12,   62,
        20,   62,   26,   12,   13,   13,   13,   13,   13,   13,
        14,   14,   14,   14,   14,   14,   16,   20,   46,   17,
-       26,   29,  508,   46,   16,  506,   26,   20,   17,   23,
+       26,   29,  514,   46,   16,  512,   26,   20,   17,   23,
        29,   16,   17,   16,   18,   16,   13,   17,   16,   18,
 
        17,   18,   19,   21,   22,   23,   23,   19,   21,   24,
@@ -734,7 +729,7 @@
        98,   93,   94,   99,  101,   94,   90,   96,   94,   93,
       104,   94,  105,   98,  102,  110,   99,  101,  108,  107,
       110,  106,  108,  108,   99,  109,  103,  104,  101,  106,
-      105,  107,  112,  113,  106,  108,  502,  132,  109,  124,
+      105,  107,  112,  113,  106,  108,  508,  132,  109,  124,
       109,  123,  106,  116,  116,  116,  116,  106,  117,  117,
       117,  117,  123,  112,  113,  117,  130,  124,  126,  128,
       132,  117,  119,  119,  119,  119,  119,  126,  135,  119,
@@ -746,82 +741,84 @@
       150,  149,  152,  155,  153,  151,  154,  156,  145,  150,
       146,  157,  147,  153,  158,  154,  156,  152,  159,  160,
       161,  155,  162,  165,  166,  157,  159,  174,  168,  172,
-      160,  179,  173,  213,  180,  161,  174,  158,  165,  500,
+      160,  179,  173,  213,  180,  161,  174,  158,  165,  506,
       213,  179,  177,  180,  166,  168,  162,  171,  171,  171,
       171,  181,  172,  171,  171,  173,  171,  171,  171,  171,
       171,  171,  175,  177,  183,  184,  186,  185,  189,  190,
-      499,  175,  181,  175,  187,  188,  191,  175,  185,  175,
+      505,  175,  181,  175,  187,  188,  191,  175,  185,  175,
 
       184,  192,  193,  187,  188,  186,  194,  183,  195,  196,
       192,  189,  190,  191,  198,  194,  199,  197,  200,  193,
       202,  195,  197,  201,  205,  199,  200,  196,  201,  203,
-      498,  224,  496,  203,  202,  198,  207,  207,  207,  207,
-      223,  228,  205,  207,  224,  223,  228,  208,  208,  207,
+      222,  224,  289,  203,  202,  198,  207,  207,  207,  207,
+      289,  223,  205,  207,  224,  222,  223,  208,  208,  207,
       208,  208,  208,  208,  209,  209,  209,  209,  210,  210,
       210,  210,  210,  211,  211,  211,  211,  211,  212,  214,
-      215,  219,  220,  221,  225,  227,  230,  231,  219,  229,
-      232,  233,  231,  234,  236,  212,  214,  215,  233,  232,
-      227,  239,  240,  238,  241,  220,  221,  230,  229,  236,
-
-      237,  225,  238,  242,  243,  237,  234,  247,  241,  244,
-      250,  248,  239,  240,  251,  256,  254,  494,  242,  253,
-      255,  257,  243,  258,  244,  247,  248,  255,  253,  254,
-      257,  259,  258,  260,  250,  256,  262,  251,  261,  267,
-      259,  263,  264,  266,  257,  262,  258,  272,  261,  264,
-      263,  270,  266,  273,  267,  274,  260,  275,  272,  276,
-      270,  277,  275,  273,  278,  280,  279,  282,  274,  284,
-      285,  286,  286,  286,  286,  288,  276,  279,  289,  284,
-      288,  291,  277,  285,  292,  278,  289,  293,  291,  292,
-      282,  284,  280,  294,  293,  295,  296,  297,  298,  300,
-
-      299,  295,  301,  302,  304,  307,  309,  298,  308,  306,
-      302,  304,  311,  310,  294,  296,  297,  299,  306,  301,
-      307,  311,  300,  313,  308,  314,  315,  316,  317,  309,
-      310,  320,  318,  315,  314,  321,  316,  317,  329,  332,
-      313,  318,  330,  333,  338,  334,  341,  344,  339,  320,
-      342,  332,  330,  329,  334,  339,  340,  346,  321,  345,
-      347,  342,  346,  348,  340,  350,  333,  338,  352,  341,
-      344,  355,  345,  354,  353,  362,  356,  357,  350,  493,
-      348,  353,  354,  347,  361,  352,  364,  366,  361,  361,
-      367,  375,  368,  355,  356,  357,  366,  368,  362,  367,
-
-      370,  376,  364,  383,  378,  379,  389,  370,  384,  390,
-      392,  391,  375,  378,  394,  379,  383,  393,  376,  391,
-      384,  389,  398,  392,  399,  400,  401,  402,  410,  403,
-      404,  390,  408,  405,  393,  406,  402,  394,  403,  412,
-      407,  401,  492,  398,  412,  399,  411,  404,  405,  407,
-      406,  400,  413,  410,  408,  411,  414,  413,  415,  416,
-      417,  418,  420,  421,  422,  414,  416,  424,  426,  427,
-      425,  430,  418,  422,  434,  433,  447,  490,  427,  431,
-      434,  415,  424,  417,  430,  420,  421,  425,  431,  432,
-      433,  426,  436,  437,  438,  442,  432,  443,  437,  436,
-
-      442,  444,  446,  445,  448,  447,  443,  438,  445,  449,
-      450,  448,  451,  453,  452,  454,  455,  456,  446,  452,
-      454,  457,  458,  450,  444,  459,  460,  451,  453,  461,
-      455,  463,  449,  456,  459,  460,  465,  464,  466,  467,
-      457,  469,  470,  471,  472,  458,  464,  477,  474,  475,
-      469,  465,  461,  466,  467,  479,  471,  478,  475,  480,
-      463,  472,  477,  481,  478,  470,  474,  482,  479,  483,
-      484,  485,  488,  486,  487,  489,  480,  491,  497,  485,
-      486,  487,  495,  501,  481,  482,  476,  497,  473,  495,
-      468,  484,  483,  462,  491,  441,  440,  439,  489,  435,
-
-      429,  488,  428,  423,  501,  504,  504,  504,  504,  505,
-      505,  507,  419,  507,  507,  409,  397,  396,  395,  388,
-      387,  386,  385,  382,  381,  380,  377,  374,  373,  372,
-      371,  369,  365,  363,  360,  359,  358,  351,  349,  343,
-      337,  336,  335,  331,  328,  327,  326,  325,  324,  323,
-      322,  319,  312,  305,  303,  290,  287,  283,  281,  271,
-      269,  268,  265,  249,  246,  245,  235,  222,  218,  217,
-      216,  204,  182,  178,  176,  170,  169,  167,  164,  163,
-      140,  133,  129,  127,  125,  122,  118,  114,  100,   87,
-       59,   39,   37,    8,    7,    3,  503,  503,  503,  503,
-
-      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-      503,  503,  503,  503,  503,  503,  503,  503,  503,  503
+      215,  219,  220,  221,  225,  227,  228,  233,  219,  229,
+      232,  228,  230,  231,  233,  212,  214,  215,  231,  232,
+      227,  234,  236,  238,  237,  220,  221,  239,  229,  237,
+
+      240,  225,  238,  230,  243,  241,  250,  236,  242,  244,
+      247,  248,  251,  260,  234,  504,  253,  256,  239,  241,
+      254,  240,  243,  242,  244,  253,  248,  255,  247,  257,
+      250,  258,  259,  254,  255,  251,  260,  256,  257,  261,
+      258,  259,  262,  264,  263,  267,  266,  270,  272,  261,
+      264,  262,  257,  263,  258,  266,  270,  273,  274,  272,
+      267,  275,  276,  277,  278,  279,  275,  273,  280,  282,
+      285,  274,  284,  288,  291,  292,  279,  295,  288,  276,
+      292,  291,  284,  285,  277,  278,  286,  286,  286,  286,
+      293,  294,  282,  296,  284,  280,  294,  293,  295,  296,
+
+      297,  298,  299,  301,  300,  302,  303,  305,  307,  308,
+      310,  299,  309,  303,  305,  311,  312,  307,  314,  297,
+      298,  300,  302,  316,  308,  312,  301,  315,  309,  317,
+      316,  318,  311,  310,  319,  314,  315,  321,  317,  322,
+      318,  330,  331,  319,  334,  333,  339,  340,  342,  335,
+      343,  341,  331,  345,  340,  321,  330,  333,  335,  341,
+      346,  343,  322,  347,  348,  349,  351,  334,  347,  339,
+      354,  342,  353,  346,  355,  356,  345,  354,  357,  351,
+      358,  359,  349,  364,  356,  366,  363,  348,  368,  353,
+      363,  363,  377,  378,  369,  392,  502,  368,  358,  359,
+
+      357,  366,  355,  369,  370,  372,  364,  380,  381,  370,
+      378,  385,  372,  377,  386,  391,  380,  392,  381,  393,
+      394,  395,  396,  398,  385,  401,  386,  393,  402,  403,
+      391,  405,  404,  394,  406,  407,  408,  411,  395,  409,
+      405,  398,  413,  406,  410,  396,  401,  404,  414,  402,
+      418,  408,  407,  410,  409,  403,  415,  414,  416,  411,
+      417,  415,  420,  416,  419,  421,  423,  413,  424,  417,
+      425,  419,  426,  418,  428,  429,  421,  430,  431,  435,
+      438,  426,  434,  437,  444,  420,  438,  431,  435,  428,
+      423,  424,  429,  425,  436,  434,  440,  441,  437,  442,
+
+      430,  436,  441,  440,  447,  448,  449,  444,  450,  447,
+      451,  452,  442,  450,  448,  453,  454,  455,  456,  457,
+      458,  462,  453,  459,  457,  463,  451,  461,  459,  449,
+      455,  464,  467,  456,  465,  458,  466,  462,  469,  454,
+      452,  461,  470,  465,  463,  466,  471,  472,  473,  475,
+      476,  470,  477,  478,  464,  467,  480,  481,  475,  485,
+      483,  471,  472,  473,  484,  477,  481,  469,  486,  487,
+      478,  484,  485,  476,  480,  483,  488,  489,  490,  491,
+      494,  492,  493,  495,  497,  486,  501,  491,  492,  493,
+      487,  507,  500,  501,  488,  503,  499,  498,  496,  490,
+
+      489,  497,  482,  479,  503,  474,  495,  468,  460,  494,
+      446,  445,  507,  510,  510,  510,  510,  511,  511,  513,
+      443,  513,  513,  439,  433,  432,  427,  422,  412,  400,
+      399,  397,  390,  389,  388,  387,  384,  383,  382,  379,
+      376,  375,  374,  373,  371,  367,  365,  362,  361,  360,
+      352,  350,  344,  338,  337,  336,  332,  329,  328,  327,
+      326,  325,  324,  323,  320,  313,  306,  304,  290,  287,
+      283,  281,  271,  269,  268,  265,  249,  246,  245,  235,
+      218,  217,  216,  204,  182,  178,  176,  170,  169,  167,
+      164,  163,  140,  133,  129,  127,  125,  122,  118,  114,
+
+      100,   87,   59,   39,   37,    8,    7,    3,  509,  509,
+      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
+      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
+      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
+      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
+      509,  509
     } ;
 
 static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
@@ -838,7 +835,7 @@
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 1 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 #define INITIAL 0
 /*===-- Lexer.l - Scanner for llvm assembly files --------------*- C++ -*--===//
 //
@@ -853,7 +850,7 @@
 //
 //===----------------------------------------------------------------------===*/
 #define YY_NEVER_INTERACTIVE 1
-#line 28 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 28 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 #include "ParserInternals.h"
 #include "llvm/Module.h"
 #include <list>
@@ -979,7 +976,7 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 983 "Lexer.cpp"
+#line 980 "Lexer.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1127,13 +1124,13 @@
 YY_DECL
 	{
 	register yy_state_type yy_current_state;
-	register char *yy_cp = NULL, *yy_bp = NULL;
+	register char *yy_cp, *yy_bp;
 	register int yy_act;
 
-#line 179 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 179 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 
 
-#line 1137 "Lexer.cpp"
+#line 1134 "Lexer.cpp"
 
 	if ( yy_init )
 		{
@@ -1181,14 +1178,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 >= 504 )
+				if ( yy_current_state >= 510 )
 					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 != 503 );
+		while ( yy_current_state != 509 );
 
 yy_find_action:
 		yy_current_state = *--yy_state_ptr;
@@ -1226,507 +1223,507 @@
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 181 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 181 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { /* Ignore comments for now */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 183 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 183 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return BEGINTOK; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 184 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 184 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return ENDTOK; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 185 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 185 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return TRUETOK;  }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 186 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 186 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return FALSETOK; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 187 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 187 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return DECLARE; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 188 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 188 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return GLOBAL; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 189 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 189 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return CONSTANT; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 190 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 190 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return INTERNAL; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 191 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 191 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return LINKONCE; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 192 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 192 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return WEAK; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 193 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 193 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return APPENDING; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 194 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 194 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return DLLIMPORT; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 195 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 195 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return DLLEXPORT; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 196 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 196 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return EXTERN_WEAK; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 197 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 197 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return EXTERNAL; }    /* Deprecated, turn into external */
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 198 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 198 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return EXTERNAL; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 199 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 199 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return IMPLEMENTATION; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 200 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 200 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return ZEROINITIALIZER; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 201 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 201 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return DOTDOTDOT; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 202 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 202 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return UNDEF; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 203 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 203 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return NULL_TOK; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 204 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 204 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return TO; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 205 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 205 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 206 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 206 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return NOT; }  /* Deprecated, turned into XOR */
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 207 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 207 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return TAIL; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 208 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 208 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return TARGET; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 209 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 209 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return TRIPLE; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 210 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 210 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return DEPLIBS; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 211 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 211 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return ENDIAN; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 212 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 212 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return POINTERSIZE; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 213 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return DATA; }
+#line 213 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+{ return DATALAYOUT; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 214 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 214 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return LITTLE; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 215 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 215 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return BIG; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 216 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 216 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return VOLATILE; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 217 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 217 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return ALIGN;  }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 218 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 218 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return SECTION; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 219 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 219 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return MODULE; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 220 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 220 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return ASM_TOK; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 221 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 221 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return SIDEEFFECT; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 223 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 223 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return CC_TOK; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 224 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 224 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return CCC_TOK; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 225 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 225 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return CSRETCC_TOK; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 226 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 226 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return FASTCC_TOK; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 227 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 227 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return COLDCC_TOK; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 228 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 228 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return X86_STDCALLCC_TOK; }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 229 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 229 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return X86_FASTCALLCC_TOK; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 231 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 231 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::VoidTy  ; return VOID;   }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 232 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 232 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::BoolTy  ; return BOOL;   }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 233 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 233 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::SByteTy ; return SBYTE;  }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 234 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 234 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::UByteTy ; return UBYTE;  }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 235 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 235 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::ShortTy ; return SHORT;  }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 236 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 236 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::UShortTy; return USHORT; }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 237 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 237 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::IntTy   ; return INT;    }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 238 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 238 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::UIntTy  ; return UINT;   }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 239 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 239 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::LongTy  ; return LONG;   }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 240 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 240 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::ULongTy ; return ULONG;  }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 241 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 241 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::FloatTy ; return FLOAT;  }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 242 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 242 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::DoubleTy; return DOUBLE; }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 243 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 243 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::LabelTy ; return LABEL;  }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 244 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 244 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return TYPE;   }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 245 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 245 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return OPAQUE; }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 247 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 247 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Add, ADD); }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 248 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 248 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Sub, SUB); }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 249 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 249 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Mul, MUL); }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 250 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 250 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Div, DIV); }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 251 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 251 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Rem, REM); }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 252 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 252 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, And, AND); }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 253 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 253 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Or , OR ); }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 254 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 254 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Xor, XOR); }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 255 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 255 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SetNE, SETNE); }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 256 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 256 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SetEQ, SETEQ); }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 257 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 257 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SetLT, SETLT); }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 258 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 258 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SetGT, SETGT); }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 259 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 259 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SetLE, SETLE); }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 260 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 260 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SetGE, SETGE); }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 262 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 262 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, PHI, PHI_TOK); }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 263 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 263 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Call, CALL); }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 264 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 264 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Cast, CAST); }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 265 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 265 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Select, SELECT); }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 266 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 266 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Shl, SHL); }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 267 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 267 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Shr, SHR); }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 268 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 268 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return VANEXT_old; }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 269 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 269 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return VAARG_old; }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 270 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 270 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, VAArg , VAARG); }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 271 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 271 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Ret, RET); }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 272 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 272 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Br, BR); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 273 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 273 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Switch, SWITCH); }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 274 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 274 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Invoke, INVOKE); }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 275 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 275 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 276 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 276 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 278 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 278 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Malloc, MALLOC); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 279 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 279 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Alloca, ALLOCA); }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 280 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 280 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Free, FREE); }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 281 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 281 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Load, LOAD); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 282 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 282 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Store, STORE); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 283 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 283 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 285 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 285 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 286 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 286 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 287 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 287 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 290 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 290 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   UnEscapeLexed(yytext+1);
                   llvmAsmlval.StrVal = strdup(yytext+1);             // Skip %
@@ -1735,7 +1732,7 @@
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 295 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 295 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   yytext[strlen(yytext)-1] = 0;  // nuke colon
                   UnEscapeLexed(yytext);
@@ -1745,7 +1742,7 @@
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 301 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 301 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   yytext[strlen(yytext)-2] = 0;  // nuke colon, end quote
                   UnEscapeLexed(yytext+1);
@@ -1755,7 +1752,7 @@
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 308 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 308 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { // Note that we cannot unescape a string constant here!  The
                    // string constant might contain a \00 which would not be
                    // understood by the string stuff.  It is valid to make a
@@ -1768,12 +1765,12 @@
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 319 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 319 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.UInt64Val = atoull(yytext); return EUINT64VAL; }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 320 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 320 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   // +1:  we have bigger negative range
@@ -1785,7 +1782,7 @@
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 328 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 328 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                    llvmAsmlval.UInt64Val = HexIntToVal(yytext+3);
                    return yytext[0] == 's' ? ESINT64VAL : EUINT64VAL;
@@ -1793,7 +1790,7 @@
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 333 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 333 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   if ((unsigned)Val != Val)
@@ -1804,7 +1801,7 @@
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 340 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 340 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+2);
                   // +1:  we have bigger negative range
@@ -1816,16 +1813,16 @@
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 349 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 349 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = atof(yytext); return FPVAL; }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 350 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 350 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = HexToFP(yytext); return FPVAL; }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 352 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 352 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
@@ -1836,20 +1833,20 @@
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 360 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 360 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { /* Ignore whitespace */ }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 361 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 361 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 { return yytext[0]; }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 363 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 363 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 1853 "Lexer.cpp"
+#line 1850 "Lexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2136,7 +2133,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 >= 504 )
+			if ( yy_current_state >= 510 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2166,11 +2163,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 >= 504 )
+		if ( yy_current_state >= 510 )
 			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 == 503);
+	yy_is_jam = (yy_current_state == 509);
 	if ( ! yy_is_jam )
 		*yy_state_ptr++ = yy_current_state;
 
@@ -2225,7 +2222,6 @@
 #endif	/* ifndef YY_NO_UNPUT */
 
 
-#ifndef YY_NO_INPUT
 #ifdef __cplusplus
 static int yyinput()
 #else
@@ -2299,7 +2295,7 @@
 
 	return c;
 	}
-#endif /* YY_NO_INPUT */
+
 
 #ifdef YY_USE_PROTOS
 void yyrestart( FILE *input_file )
@@ -2410,6 +2406,11 @@
 	}
 
 
+#ifndef YY_ALWAYS_INTERACTIVE
+#ifndef YY_NEVER_INTERACTIVE
+extern int isatty YY_PROTO(( int ));
+#endif
+#endif
 
 #ifdef YY_USE_PROTOS
 void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
@@ -2727,5 +2728,5 @@
 	return 0;
 	}
 #endif
-#line 363 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 363 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
 


Index: llvm/lib/AsmParser/Lexer.l.cvs
diff -u llvm/lib/AsmParser/Lexer.l.cvs:1.8 llvm/lib/AsmParser/Lexer.l.cvs:1.9
--- llvm/lib/AsmParser/Lexer.l.cvs:1.8	Tue Oct 17 21:21:48 2006
+++ llvm/lib/AsmParser/Lexer.l.cvs	Sun Oct 22 01:08:13 2006
@@ -210,7 +210,7 @@
 deplibs         { return DEPLIBS; }
 endian          { return ENDIAN; }
 pointersize     { return POINTERSIZE; }
-data          { return DATA; }
+datalayout      { return DATALAYOUT; }
 little          { return LITTLE; }
 big             { return BIG; }
 volatile        { return VOLATILE; }


Index: llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.19 llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.20
--- llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.19	Fri Oct 20 02:07:24 2006
+++ llvm/lib/AsmParser/llvmAsmParser.cpp.cvs	Sun Oct 22 01:08:13 2006
@@ -1,290 +1,124 @@
-/* A Bison parser, made by GNU Bison 2.1.  */
 
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/*  A Bison parser, made from /Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y
+    by GNU Bison version 1.28  */
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* Written by Richard Stallman by simplifying the original so called
-   ``semantic'' parser.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
-
-/* Identify Bison output.  */
-#define YYBISON 1
-
-/* Bison version.  */
-#define YYBISON_VERSION "2.1"
-
-/* Skeleton name.  */
-#define YYSKELETON_NAME "yacc.c"
-
-/* Pure parsers.  */
-#define YYPURE 0
-
-/* Using locations.  */
-#define YYLSP_NEEDED 0
+#define YYBISON 1  /* Identify Bison output.  */
 
-/* Substitute the variable and function names.  */
 #define yyparse llvmAsmparse
-#define yylex   llvmAsmlex
+#define yylex llvmAsmlex
 #define yyerror llvmAsmerror
-#define yylval  llvmAsmlval
-#define yychar  llvmAsmchar
+#define yylval llvmAsmlval
+#define yychar llvmAsmchar
 #define yydebug llvmAsmdebug
 #define yynerrs llvmAsmnerrs
+#define	ESINT64VAL	257
+#define	EUINT64VAL	258
+#define	SINTVAL	259
+#define	UINTVAL	260
+#define	FPVAL	261
+#define	VOID	262
+#define	BOOL	263
+#define	SBYTE	264
+#define	UBYTE	265
+#define	SHORT	266
+#define	USHORT	267
+#define	INT	268
+#define	UINT	269
+#define	LONG	270
+#define	ULONG	271
+#define	FLOAT	272
+#define	DOUBLE	273
+#define	TYPE	274
+#define	LABEL	275
+#define	VAR_ID	276
+#define	LABELSTR	277
+#define	STRINGCONSTANT	278
+#define	IMPLEMENTATION	279
+#define	ZEROINITIALIZER	280
+#define	TRUETOK	281
+#define	FALSETOK	282
+#define	BEGINTOK	283
+#define	ENDTOK	284
+#define	DECLARE	285
+#define	GLOBAL	286
+#define	CONSTANT	287
+#define	SECTION	288
+#define	VOLATILE	289
+#define	TO	290
+#define	DOTDOTDOT	291
+#define	NULL_TOK	292
+#define	UNDEF	293
+#define	CONST	294
+#define	INTERNAL	295
+#define	LINKONCE	296
+#define	WEAK	297
+#define	APPENDING	298
+#define	DLLIMPORT	299
+#define	DLLEXPORT	300
+#define	EXTERN_WEAK	301
+#define	OPAQUE	302
+#define	NOT	303
+#define	EXTERNAL	304
+#define	TARGET	305
+#define	TRIPLE	306
+#define	ENDIAN	307
+#define	POINTERSIZE	308
+#define	LITTLE	309
+#define	BIG	310
+#define	ALIGN	311
+#define	DEPLIBS	312
+#define	CALL	313
+#define	TAIL	314
+#define	ASM_TOK	315
+#define	MODULE	316
+#define	SIDEEFFECT	317
+#define	CC_TOK	318
+#define	CCC_TOK	319
+#define	CSRETCC_TOK	320
+#define	FASTCC_TOK	321
+#define	COLDCC_TOK	322
+#define	X86_STDCALLCC_TOK	323
+#define	X86_FASTCALLCC_TOK	324
+#define	DATALAYOUT	325
+#define	RET	326
+#define	BR	327
+#define	SWITCH	328
+#define	INVOKE	329
+#define	UNWIND	330
+#define	UNREACHABLE	331
+#define	ADD	332
+#define	SUB	333
+#define	MUL	334
+#define	DIV	335
+#define	REM	336
+#define	AND	337
+#define	OR	338
+#define	XOR	339
+#define	SETLE	340
+#define	SETGE	341
+#define	SETLT	342
+#define	SETGT	343
+#define	SETEQ	344
+#define	SETNE	345
+#define	MALLOC	346
+#define	ALLOCA	347
+#define	FREE	348
+#define	LOAD	349
+#define	STORE	350
+#define	GETELEMENTPTR	351
+#define	PHI_TOK	352
+#define	CAST	353
+#define	SELECT	354
+#define	SHL	355
+#define	SHR	356
+#define	VAARG	357
+#define	EXTRACTELEMENT	358
+#define	INSERTELEMENT	359
+#define	SHUFFLEVECTOR	360
+#define	VAARG_old	361
+#define	VANEXT_old	362
 
-
-/* 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,
-     SINTVAL = 260,
-     UINTVAL = 261,
-     FPVAL = 262,
-     VOID = 263,
-     BOOL = 264,
-     SBYTE = 265,
-     UBYTE = 266,
-     SHORT = 267,
-     USHORT = 268,
-     INT = 269,
-     UINT = 270,
-     LONG = 271,
-     ULONG = 272,
-     FLOAT = 273,
-     DOUBLE = 274,
-     TYPE = 275,
-     LABEL = 276,
-     VAR_ID = 277,
-     LABELSTR = 278,
-     STRINGCONSTANT = 279,
-     IMPLEMENTATION = 280,
-     ZEROINITIALIZER = 281,
-     TRUETOK = 282,
-     FALSETOK = 283,
-     BEGINTOK = 284,
-     ENDTOK = 285,
-     DECLARE = 286,
-     GLOBAL = 287,
-     CONSTANT = 288,
-     SECTION = 289,
-     VOLATILE = 290,
-     TO = 291,
-     DOTDOTDOT = 292,
-     NULL_TOK = 293,
-     UNDEF = 294,
-     CONST = 295,
-     INTERNAL = 296,
-     LINKONCE = 297,
-     WEAK = 298,
-     APPENDING = 299,
-     DLLIMPORT = 300,
-     DLLEXPORT = 301,
-     EXTERN_WEAK = 302,
-     OPAQUE = 303,
-     NOT = 304,
-     EXTERNAL = 305,
-     TARGET = 306,
-     TRIPLE = 307,
-     ENDIAN = 308,
-     POINTERSIZE = 309,
-     LITTLE = 310,
-     BIG = 311,
-     ALIGN = 312,
-     DEPLIBS = 313,
-     CALL = 314,
-     TAIL = 315,
-     ASM_TOK = 316,
-     MODULE = 317,
-     SIDEEFFECT = 318,
-     CC_TOK = 319,
-     CCC_TOK = 320,
-     CSRETCC_TOK = 321,
-     FASTCC_TOK = 322,
-     COLDCC_TOK = 323,
-     X86_STDCALLCC_TOK = 324,
-     X86_FASTCALLCC_TOK = 325,
-     DATA = 326,
-     RET = 327,
-     BR = 328,
-     SWITCH = 329,
-     INVOKE = 330,
-     UNWIND = 331,
-     UNREACHABLE = 332,
-     ADD = 333,
-     SUB = 334,
-     MUL = 335,
-     DIV = 336,
-     REM = 337,
-     AND = 338,
-     OR = 339,
-     XOR = 340,
-     SETLE = 341,
-     SETGE = 342,
-     SETLT = 343,
-     SETGT = 344,
-     SETEQ = 345,
-     SETNE = 346,
-     MALLOC = 347,
-     ALLOCA = 348,
-     FREE = 349,
-     LOAD = 350,
-     STORE = 351,
-     GETELEMENTPTR = 352,
-     PHI_TOK = 353,
-     CAST = 354,
-     SELECT = 355,
-     SHL = 356,
-     SHR = 357,
-     VAARG = 358,
-     EXTRACTELEMENT = 359,
-     INSERTELEMENT = 360,
-     SHUFFLEVECTOR = 361,
-     VAARG_old = 362,
-     VANEXT_old = 363
-   };
-#endif
-/* Tokens.  */
-#define ESINT64VAL 258
-#define EUINT64VAL 259
-#define SINTVAL 260
-#define UINTVAL 261
-#define FPVAL 262
-#define VOID 263
-#define BOOL 264
-#define SBYTE 265
-#define UBYTE 266
-#define SHORT 267
-#define USHORT 268
-#define INT 269
-#define UINT 270
-#define LONG 271
-#define ULONG 272
-#define FLOAT 273
-#define DOUBLE 274
-#define TYPE 275
-#define LABEL 276
-#define VAR_ID 277
-#define LABELSTR 278
-#define STRINGCONSTANT 279
-#define IMPLEMENTATION 280
-#define ZEROINITIALIZER 281
-#define TRUETOK 282
-#define FALSETOK 283
-#define BEGINTOK 284
-#define ENDTOK 285
-#define DECLARE 286
-#define GLOBAL 287
-#define CONSTANT 288
-#define SECTION 289
-#define VOLATILE 290
-#define TO 291
-#define DOTDOTDOT 292
-#define NULL_TOK 293
-#define UNDEF 294
-#define CONST 295
-#define INTERNAL 296
-#define LINKONCE 297
-#define WEAK 298
-#define APPENDING 299
-#define DLLIMPORT 300
-#define DLLEXPORT 301
-#define EXTERN_WEAK 302
-#define OPAQUE 303
-#define NOT 304
-#define EXTERNAL 305
-#define TARGET 306
-#define TRIPLE 307
-#define ENDIAN 308
-#define POINTERSIZE 309
-#define LITTLE 310
-#define BIG 311
-#define ALIGN 312
-#define DEPLIBS 313
-#define CALL 314
-#define TAIL 315
-#define ASM_TOK 316
-#define MODULE 317
-#define SIDEEFFECT 318
-#define CC_TOK 319
-#define CCC_TOK 320
-#define CSRETCC_TOK 321
-#define FASTCC_TOK 322
-#define COLDCC_TOK 323
-#define X86_STDCALLCC_TOK 324
-#define X86_FASTCALLCC_TOK 325
-#define DATA 326
-#define RET 327
-#define BR 328
-#define SWITCH 329
-#define INVOKE 330
-#define UNWIND 331
-#define UNREACHABLE 332
-#define ADD 333
-#define SUB 334
-#define MUL 335
-#define DIV 336
-#define REM 337
-#define AND 338
-#define OR 339
-#define XOR 340
-#define SETLE 341
-#define SETGE 342
-#define SETLT 343
-#define SETGT 344
-#define SETEQ 345
-#define SETNE 346
-#define MALLOC 347
-#define ALLOCA 348
-#define FREE 349
-#define LOAD 350
-#define STORE 351
-#define GETELEMENTPTR 352
-#define PHI_TOK 353
-#define CAST 354
-#define SELECT 355
-#define SHL 356
-#define SHR 357
-#define VAARG 358
-#define EXTRACTELEMENT 359
-#define INSERTELEMENT 360
-#define SHUFFLEVECTOR 361
-#define VAARG_old 362
-#define VANEXT_old 363
-
-
-
-
-/* Copy the first part of user declarations.  */
-#line 14 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 14 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -1244,28 +1078,8 @@
 }
 
 
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
-
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 974 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-typedef union YYSTYPE {
+#line 974 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+typedef union {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   std::pair<llvm::PATypeHolder*, char*>  *ArgVal;
@@ -1304,1457 +1118,1003 @@
   llvm::Instruction::OtherOps             OtherOpVal;
   llvm::Module::Endianness                Endianness;
 } YYSTYPE;
-/* Line 196 of yacc.c.  */
-#line 1309 "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 1321 "llvmAsmParser.tab.c"
-
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus))
-# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
-#ifndef YY_
-# if YYENABLE_NLS
-#  if ENABLE_NLS
-#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
-#  endif
-# endif
-# ifndef YY_
-#  define YY_(msgid) msgid
-# endif
-#endif
-
-#if ! defined (yyoverflow) || YYERROR_VERBOSE
-
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-
-# ifdef YYSTACK_USE_ALLOCA
-#  if YYSTACK_USE_ALLOCA
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
-#   else
-#    define YYSTACK_ALLOC alloca
-#    if defined (__STDC__) || defined (__cplusplus)
-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     define YYINCLUDED_STDLIB_H
-#    endif
-#   endif
-#  endif
-# endif
-
-# ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning. */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-    /* The OS might guarantee only one guard page at the bottom of the stack,
-       and a page size can be as small as 4096 bytes.  So we cannot safely
-       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
-       to allow for a few compiler-allocated temporary stack slots.  */
-#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */
-#  endif
-# else
-#  define YYSTACK_ALLOC YYMALLOC
-#  define YYSTACK_FREE YYFREE
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-#   define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1)
-#  endif
-#  ifdef __cplusplus
-extern "C" {
-#  endif
-#  ifndef YYMALLOC
-#   define YYMALLOC malloc
-#   if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \
-	&& (defined (__STDC__) || defined (__cplusplus)))
-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-#  ifndef YYFREE
-#   define YYFREE free
-#   if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \
-	&& (defined (__STDC__) || defined (__cplusplus)))
-void free (void *); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-#  ifdef __cplusplus
-}
-#  endif
-# endif
-#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
+#include <stdio.h>
 
+#ifndef __cplusplus
+#ifndef __STDC__
+#define const
+#endif
+#endif
 
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
 
-/* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  short int yyss;
-  YYSTYPE yyvs;
-  };
 
-/* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+#define	YYFINAL		517
+#define	YYFLAG		-32768
+#define	YYNTBASE	123
+
+#define YYTRANSLATE(x) ((unsigned)(x) <= 362 ? yytranslate[x] : 197)
+
+static const 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,   112,
+   113,   121,     2,   110,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,   117,
+   109,   118,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+   114,   111,   116,     2,     2,     2,     2,     2,   122,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,   115,
+     2,     2,   119,     2,   120,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     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
+};
 
-/* The size of an array large to enough to hold all stacks, each with
-   N elements.  */
-# define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short int) + sizeof (YYSTYPE))			\
-      + YYSTACK_GAP_MAXIMUM)
-
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined (__GNUC__) && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  YYSIZE_T yyi;				\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (0)
-#  endif
-# endif
-
-/* Relocate STACK from its old location to the new one.  The
-   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-   elements in the stack, and YYPTR gives the new location of the
-   stack.  Advance YYPTR to a properly aligned location for the next
-   stack.  */
-# define YYSTACK_RELOCATE(Stack)					\
-    do									\
-      {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack, Stack, yysize);				\
-	Stack = &yyptr->Stack;						\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-	yyptr += yynewbytes / sizeof (*yyptr);				\
-      }									\
-    while (0)
+#if YYDEBUG != 0
+static const short yyprhs[] = {     0,
+     0,     2,     4,     6,     8,    10,    12,    14,    16,    18,
+    20,    22,    24,    26,    28,    30,    32,    34,    36,    38,
+    40,    42,    44,    46,    48,    50,    52,    54,    56,    58,
+    60,    62,    64,    67,    68,    70,    72,    74,    76,    78,
+    80,    82,    83,    84,    86,    88,    90,    92,    94,    96,
+    99,   100,   103,   104,   108,   111,   112,   114,   115,   119,
+   121,   124,   126,   128,   130,   132,   134,   136,   138,   140,
+   142,   144,   146,   148,   150,   152,   154,   156,   158,   160,
+   162,   164,   166,   169,   174,   180,   186,   190,   193,   196,
+   198,   202,   204,   208,   210,   211,   216,   220,   224,   229,
+   234,   238,   241,   244,   247,   250,   253,   256,   259,   262,
+   265,   268,   275,   281,   290,   297,   304,   311,   318,   325,
+   334,   343,   347,   349,   351,   353,   355,   358,   361,   366,
+   369,   371,   376,   379,   384,   385,   393,   394,   402,   403,
+   411,   412,   420,   424,   429,   430,   432,   434,   436,   440,
+   444,   448,   452,   456,   460,   462,   463,   465,   467,   469,
+   470,   473,   477,   479,   481,   485,   487,   488,   497,   499,
+   501,   505,   507,   509,   512,   513,   515,   517,   518,   523,
+   524,   526,   528,   530,   532,   534,   536,   538,   540,   542,
+   546,   548,   554,   556,   558,   560,   562,   565,   568,   571,
+   575,   578,   579,   581,   584,   587,   591,   601,   611,   620,
+   634,   636,   638,   645,   651,   654,   661,   669,   671,   675,
+   677,   678,   681,   683,   689,   695,   701,   704,   709,   714,
+   721,   726,   731,   736,   741,   748,   755,   758,   766,   768,
+   771,   772,   774,   775,   779,   786,   790,   797,   800,   805,
+   812
+};
 
-#endif
+static const short yyrhs[] = {     5,
+     0,     6,     0,     3,     0,     4,     0,    78,     0,    79,
+     0,    80,     0,    81,     0,    82,     0,    83,     0,    84,
+     0,    85,     0,    86,     0,    87,     0,    88,     0,    89,
+     0,    90,     0,    91,     0,   101,     0,   102,     0,    16,
+     0,    14,     0,    12,     0,    10,     0,    17,     0,    15,
+     0,    13,     0,    11,     0,   129,     0,   130,     0,    18,
+     0,    19,     0,   165,   109,     0,     0,    41,     0,    42,
+     0,    43,     0,    44,     0,    45,     0,    46,     0,    47,
+     0,     0,     0,    65,     0,    66,     0,    67,     0,    68,
+     0,    69,     0,    70,     0,    64,     4,     0,     0,    57,
+     4,     0,     0,   110,    57,     4,     0,    34,    24,     0,
+     0,   138,     0,     0,   110,   141,   140,     0,   138,     0,
+    57,     4,     0,   144,     0,     8,     0,   146,     0,     8,
+     0,   146,     0,     9,     0,    10,     0,    11,     0,    12,
+     0,    13,     0,    14,     0,    15,     0,    16,     0,    17,
+     0,    18,     0,    19,     0,    20,     0,    21,     0,    48,
+     0,   145,     0,   180,     0,   111,     4,     0,   143,   112,
+   148,   113,     0,   114,     4,   115,   146,   116,     0,   117,
+     4,   115,   146,   118,     0,   119,   147,   120,     0,   119,
+   120,     0,   146,   121,     0,   146,     0,   147,   110,   146,
+     0,   147,     0,   147,   110,    37,     0,    37,     0,     0,
+   144,   114,   151,   116,     0,   144,   114,   116,     0,   144,
+   122,    24,     0,   144,   117,   151,   118,     0,   144,   119,
+   151,   120,     0,   144,   119,   120,     0,   144,    38,     0,
+   144,    39,     0,   144,   180,     0,   144,   150,     0,   144,
+    26,     0,   129,   124,     0,   130,     4,     0,     9,    27,
+     0,     9,    28,     0,   132,     7,     0,    99,   112,   149,
+    36,   144,   113,     0,    97,   112,   149,   194,   113,     0,
+   100,   112,   149,   110,   149,   110,   149,   113,     0,   125,
+   112,   149,   110,   149,   113,     0,   126,   112,   149,   110,
+   149,   113,     0,   127,   112,   149,   110,   149,   113,     0,
+   128,   112,   149,   110,   149,   113,     0,   104,   112,   149,
+   110,   149,   113,     0,   105,   112,   149,   110,   149,   110,
+   149,   113,     0,   106,   112,   149,   110,   149,   110,   149,
+   113,     0,   151,   110,   149,     0,   149,     0,    32,     0,
+    33,     0,   154,     0,   154,   174,     0,   154,   176,     0,
+   154,    62,    61,   160,     0,   154,    25,     0,   155,     0,
+   155,   133,    20,   142,     0,   155,   176,     0,   155,    62,
+    61,   160,     0,     0,   155,   133,   134,   152,   149,   156,
+   140,     0,     0,   155,   133,    50,   152,   144,   157,   140,
+     0,     0,   155,   133,    45,   152,   144,   158,   140,     0,
+     0,   155,   133,    47,   152,   144,   159,   140,     0,   155,
+    51,   162,     0,   155,    58,   109,   163,     0,     0,    24,
+     0,    56,     0,    55,     0,    53,   109,   161,     0,    54,
+   109,     4,     0,    52,   109,    24,     0,    71,   109,    24,
+     0,   114,   164,   116,     0,   164,   110,    24,     0,    24,
+     0,     0,    22,     0,    24,     0,   165,     0,     0,   144,
+   166,     0,   168,   110,   167,     0,   167,     0,   168,     0,
+   168,   110,    37,     0,    37,     0,     0,   135,   142,   165,
+   112,   169,   113,   139,   136,     0,    29,     0,   119,     0,
+   134,   170,   171,     0,    30,     0,   120,     0,   183,   173,
+     0,     0,    45,     0,    47,     0,     0,    31,   177,   175,
+   170,     0,     0,    63,     0,     3,     0,     4,     0,     7,
+     0,    27,     0,    28,     0,    38,     0,    39,     0,    26,
+     0,   117,   151,   118,     0,   150,     0,    61,   178,    24,
+   110,    24,     0,   123,     0,   165,     0,   180,     0,   179,
+     0,   144,   181,     0,   183,   184,     0,   172,   184,     0,
+   185,   133,   186,     0,   185,   188,     0,     0,    23,     0,
+    72,   182,     0,    72,     8,     0,    73,    21,   181,     0,
+    73,     9,   181,   110,    21,   181,   110,    21,   181,     0,
+    74,   131,   181,   110,    21,   181,   114,   187,   116,     0,
+    74,   131,   181,   110,    21,   181,   114,   116,     0,    75,
+   135,   142,   181,   112,   191,   113,    36,    21,   181,    76,
+    21,   181,     0,    76,     0,    77,     0,   187,   131,   179,
+   110,    21,   181,     0,   131,   179,   110,    21,   181,     0,
+   133,   193,     0,   144,   114,   181,   110,   181,   116,     0,
+   189,   110,   114,   181,   110,   181,   116,     0,   182,     0,
+   190,   110,   182,     0,   190,     0,     0,    60,    59,     0,
+    59,     0,   125,   144,   181,   110,   181,     0,   126,   144,
+   181,   110,   181,     0,   127,   144,   181,   110,   181,     0,
+    49,   182,     0,   128,   182,   110,   182,     0,    99,   182,
+    36,   144,     0,   100,   182,   110,   182,   110,   182,     0,
+   103,   182,   110,   144,     0,   107,   182,   110,   144,     0,
+   108,   182,   110,   144,     0,   104,   182,   110,   182,     0,
+   105,   182,   110,   182,   110,   182,     0,   106,   182,   110,
+   182,   110,   182,     0,    98,   189,     0,   192,   135,   142,
+   181,   112,   191,   113,     0,   196,     0,   110,   190,     0,
+     0,    35,     0,     0,    92,   144,   137,     0,    92,   144,
+   110,    15,   181,   137,     0,    93,   144,   137,     0,    93,
+   144,   110,    15,   181,   137,     0,    94,   182,     0,   195,
+    95,   144,   181,     0,   195,    96,   182,   110,   144,   181,
+     0,    97,   144,   181,   194,     0
+};
 
-#if defined (__STDC__) || defined (__cplusplus)
-   typedef signed char yysigned_char;
-#else
-   typedef short int yysigned_char;
 #endif
 
-/* YYFINAL -- State number of the termination state. */
-#define YYFINAL  4
-/* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1339
-
-/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS  123
-/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS  75
-/* YYNRULES -- Number of rules. */
-#define YYNRULES  252
-/* YYNRULES -- Number of states. */
-#define YYNSTATES  517
-
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
-#define YYUNDEFTOK  2
-#define YYMAXUTOK   363
-
-#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,
-     112,   113,   121,     2,   110,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     117,   109,   118,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   114,   111,   116,     2,     2,     2,     2,     2,   122,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     115,     2,     2,   119,     2,   120,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     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
+#if YYDEBUG != 0
+static const short yyrline[] = { 0,
+  1097,  1098,  1106,  1107,  1117,  1117,  1117,  1117,  1117,  1118,
+  1118,  1118,  1119,  1119,  1119,  1119,  1119,  1119,  1121,  1121,
+  1125,  1125,  1125,  1125,  1126,  1126,  1126,  1126,  1127,  1127,
+  1128,  1128,  1131,  1135,  1140,  1140,  1141,  1142,  1143,  1144,
+  1145,  1146,  1149,  1149,  1150,  1151,  1152,  1153,  1154,  1155,
+  1165,  1165,  1172,  1172,  1181,  1189,  1189,  1195,  1195,  1197,
+  1202,  1216,  1216,  1217,  1217,  1219,  1229,  1229,  1229,  1229,
+  1229,  1229,  1229,  1230,  1230,  1230,  1230,  1230,  1230,  1231,
+  1235,  1239,  1247,  1255,  1268,  1273,  1285,  1295,  1299,  1310,
+  1315,  1321,  1322,  1326,  1330,  1341,  1367,  1381,  1411,  1437,
+  1458,  1471,  1481,  1486,  1547,  1554,  1563,  1569,  1575,  1579,
+  1583,  1591,  1602,  1634,  1642,  1664,  1675,  1681,  1689,  1695,
+  1701,  1710,  1714,  1722,  1722,  1732,  1740,  1745,  1749,  1753,
+  1757,  1772,  1794,  1797,  1800,  1805,  1808,  1812,  1816,  1820,
+  1824,  1829,  1833,  1836,  1839,  1843,  1856,  1857,  1859,  1863,
+  1872,  1877,  1883,  1885,  1890,  1895,  1904,  1904,  1905,  1905,
+  1907,  1914,  1920,  1927,  1931,  1937,  1942,  1947,  2042,  2042,
+  2044,  2052,  2052,  2054,  2059,  2059,  2060,  2063,  2063,  2073,
+  2077,  2082,  2086,  2090,  2094,  2098,  2102,  2106,  2110,  2114,
+  2139,  2143,  2157,  2161,  2167,  2167,  2173,  2178,  2182,  2191,
+  2202,  2207,  2219,  2232,  2236,  2240,  2245,  2254,  2273,  2282,
+  2338,  2342,  2349,  2360,  2373,  2382,  2391,  2401,  2405,  2412,
+  2412,  2414,  2418,  2423,  2439,  2454,  2468,  2481,  2489,  2497,
+  2505,  2511,  2531,  2554,  2560,  2566,  2572,  2587,  2646,  2653,
+  2656,  2661,  2665,  2672,  2677,  2683,  2688,  2694,  2702,  2714,
+  2729
 };
+#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,    70,    71,    73,    75,    77,
-      79,    81,    83,    85,    86,    87,    89,    91,    93,    95,
-      97,    99,   102,   103,   106,   107,   111,   114,   115,   117,
-     118,   122,   124,   127,   129,   131,   133,   135,   137,   139,
-     141,   143,   145,   147,   149,   151,   153,   155,   157,   159,
-     161,   163,   165,   167,   169,   172,   177,   183,   189,   193,
-     196,   199,   201,   205,   207,   211,   213,   214,   219,   223,
-     227,   232,   237,   241,   244,   247,   250,   253,   256,   259,
-     262,   265,   268,   271,   278,   284,   293,   300,   307,   314,
-     321,   328,   337,   346,   350,   352,   354,   356,   358,   361,
-     364,   369,   372,   374,   379,   382,   387,   388,   396,   397,
-     405,   406,   414,   415,   423,   427,   432,   433,   435,   437,
-     439,   443,   447,   451,   455,   459,   463,   465,   466,   468,
-     470,   472,   473,   476,   480,   482,   484,   488,   490,   491,
-     500,   502,   504,   508,   510,   512,   515,   516,   518,   520,
-     521,   526,   527,   529,   531,   533,   535,   537,   539,   541,
-     543,   545,   549,   551,   557,   559,   561,   563,   565,   568,
-     571,   574,   578,   581,   582,   584,   587,   590,   594,   604,
-     614,   623,   637,   639,   641,   648,   654,   657,   664,   672,
-     674,   678,   680,   681,   684,   686,   692,   698,   704,   707,
-     712,   717,   724,   729,   734,   739,   744,   751,   758,   761,
-     769,   771,   774,   775,   777,   778,   782,   789,   793,   800,
-     803,   808,   815
-};
 
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const short int yyrhs[] =
-{
-     154,     0,    -1,     5,    -1,     6,    -1,     3,    -1,     4,
-      -1,    78,    -1,    79,    -1,    80,    -1,    81,    -1,    82,
-      -1,    83,    -1,    84,    -1,    85,    -1,    86,    -1,    87,
-      -1,    88,    -1,    89,    -1,    90,    -1,    91,    -1,   101,
-      -1,   102,    -1,    16,    -1,    14,    -1,    12,    -1,    10,
-      -1,    17,    -1,    15,    -1,    13,    -1,    11,    -1,   130,
-      -1,   131,    -1,    18,    -1,    19,    -1,   166,   109,    -1,
-      -1,    41,    -1,    42,    -1,    43,    -1,    44,    -1,    45,
-      -1,    46,    -1,    47,    -1,    -1,    -1,    65,    -1,    66,
-      -1,    67,    -1,    68,    -1,    69,    -1,    70,    -1,    64,
-       4,    -1,    -1,    57,     4,    -1,    -1,   110,    57,     4,
-      -1,    34,    24,    -1,    -1,   139,    -1,    -1,   110,   142,
-     141,    -1,   139,    -1,    57,     4,    -1,   145,    -1,     8,
-      -1,   147,    -1,     8,    -1,   147,    -1,     9,    -1,    10,
-      -1,    11,    -1,    12,    -1,    13,    -1,    14,    -1,    15,
-      -1,    16,    -1,    17,    -1,    18,    -1,    19,    -1,    20,
-      -1,    21,    -1,    48,    -1,   146,    -1,   181,    -1,   111,
-       4,    -1,   144,   112,   149,   113,    -1,   114,     4,   115,
-     147,   116,    -1,   117,     4,   115,   147,   118,    -1,   119,
-     148,   120,    -1,   119,   120,    -1,   147,   121,    -1,   147,
-      -1,   148,   110,   147,    -1,   148,    -1,   148,   110,    37,
-      -1,    37,    -1,    -1,   145,   114,   152,   116,    -1,   145,
-     114,   116,    -1,   145,   122,    24,    -1,   145,   117,   152,
-     118,    -1,   145,   119,   152,   120,    -1,   145,   119,   120,
-      -1,   145,    38,    -1,   145,    39,    -1,   145,   181,    -1,
-     145,   151,    -1,   145,    26,    -1,   130,   125,    -1,   131,
-       4,    -1,     9,    27,    -1,     9,    28,    -1,   133,     7,
-      -1,    99,   112,   150,    36,   145,   113,    -1,    97,   112,
-     150,   195,   113,    -1,   100,   112,   150,   110,   150,   110,
-     150,   113,    -1,   126,   112,   150,   110,   150,   113,    -1,
-     127,   112,   150,   110,   150,   113,    -1,   128,   112,   150,
-     110,   150,   113,    -1,   129,   112,   150,   110,   150,   113,
-      -1,   104,   112,   150,   110,   150,   113,    -1,   105,   112,
-     150,   110,   150,   110,   150,   113,    -1,   106,   112,   150,
-     110,   150,   110,   150,   113,    -1,   152,   110,   150,    -1,
-     150,    -1,    32,    -1,    33,    -1,   155,    -1,   155,   175,
-      -1,   155,   177,    -1,   155,    62,    61,   161,    -1,   155,
-      25,    -1,   156,    -1,   156,   134,    20,   143,    -1,   156,
-     177,    -1,   156,    62,    61,   161,    -1,    -1,   156,   134,
-     135,   153,   150,   157,   141,    -1,    -1,   156,   134,    50,
-     153,   145,   158,   141,    -1,    -1,   156,   134,    45,   153,
-     145,   159,   141,    -1,    -1,   156,   134,    47,   153,   145,
-     160,   141,    -1,   156,    51,   163,    -1,   156,    58,   109,
-     164,    -1,    -1,    24,    -1,    56,    -1,    55,    -1,    53,
-     109,   162,    -1,    54,   109,     4,    -1,    52,   109,    24,
-      -1,    71,   109,    24,    -1,   114,   165,   116,    -1,   165,
-     110,    24,    -1,    24,    -1,    -1,    22,    -1,    24,    -1,
-     166,    -1,    -1,   145,   167,    -1,   169,   110,   168,    -1,
-     168,    -1,   169,    -1,   169,   110,    37,    -1,    37,    -1,
-      -1,   136,   143,   166,   112,   170,   113,   140,   137,    -1,
-      29,    -1,   119,    -1,   135,   171,   172,    -1,    30,    -1,
-     120,    -1,   184,   174,    -1,    -1,    45,    -1,    47,    -1,
-      -1,    31,   178,   176,   171,    -1,    -1,    63,    -1,     3,
-      -1,     4,    -1,     7,    -1,    27,    -1,    28,    -1,    38,
-      -1,    39,    -1,    26,    -1,   117,   152,   118,    -1,   151,
-      -1,    61,   179,    24,   110,    24,    -1,   124,    -1,   166,
-      -1,   181,    -1,   180,    -1,   145,   182,    -1,   184,   185,
-      -1,   173,   185,    -1,   186,   134,   187,    -1,   186,   189,
-      -1,    -1,    23,    -1,    72,   183,    -1,    72,     8,    -1,
-      73,    21,   182,    -1,    73,     9,   182,   110,    21,   182,
-     110,    21,   182,    -1,    74,   132,   182,   110,    21,   182,
-     114,   188,   116,    -1,    74,   132,   182,   110,    21,   182,
-     114,   116,    -1,    75,   136,   143,   182,   112,   192,   113,
-      36,    21,   182,    76,    21,   182,    -1,    76,    -1,    77,
-      -1,   188,   132,   180,   110,    21,   182,    -1,   132,   180,
-     110,    21,   182,    -1,   134,   194,    -1,   145,   114,   182,
-     110,   182,   116,    -1,   190,   110,   114,   182,   110,   182,
-     116,    -1,   183,    -1,   191,   110,   183,    -1,   191,    -1,
-      -1,    60,    59,    -1,    59,    -1,   126,   145,   182,   110,
-     182,    -1,   127,   145,   182,   110,   182,    -1,   128,   145,
-     182,   110,   182,    -1,    49,   183,    -1,   129,   183,   110,
-     183,    -1,    99,   183,    36,   145,    -1,   100,   183,   110,
-     183,   110,   183,    -1,   103,   183,   110,   145,    -1,   107,
-     183,   110,   145,    -1,   108,   183,   110,   145,    -1,   104,
-     183,   110,   183,    -1,   105,   183,   110,   183,   110,   183,
-      -1,   106,   183,   110,   183,   110,   183,    -1,    98,   190,
-      -1,   193,   136,   143,   182,   112,   192,   113,    -1,   197,
-      -1,   110,   191,    -1,    -1,    35,    -1,    -1,    92,   145,
-     138,    -1,    92,   145,   110,    15,   182,   138,    -1,    93,
-     145,   138,    -1,    93,   145,   110,    15,   182,   138,    -1,
-      94,   183,    -1,   196,    95,   145,   182,    -1,   196,    96,
-     183,   110,   145,   182,    -1,    97,   145,   182,   195,    -1
-};
+#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
 
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short int yyrline[] =
-{
-       0,  1097,  1097,  1098,  1106,  1107,  1117,  1117,  1117,  1117,
-    1117,  1118,  1118,  1118,  1119,  1119,  1119,  1119,  1119,  1119,
-    1121,  1121,  1125,  1125,  1125,  1125,  1126,  1126,  1126,  1126,
-    1127,  1127,  1128,  1128,  1131,  1135,  1140,  1141,  1142,  1143,
-    1144,  1145,  1146,  1147,  1149,  1150,  1151,  1152,  1153,  1154,
-    1155,  1156,  1165,  1166,  1172,  1173,  1181,  1189,  1190,  1195,
-    1196,  1197,  1202,  1216,  1216,  1217,  1217,  1219,  1229,  1229,
-    1229,  1229,  1229,  1229,  1229,  1230,  1230,  1230,  1230,  1230,
-    1230,  1231,  1235,  1239,  1247,  1255,  1268,  1273,  1285,  1295,
-    1299,  1310,  1315,  1321,  1322,  1326,  1330,  1341,  1367,  1381,
-    1411,  1437,  1458,  1471,  1481,  1486,  1547,  1554,  1563,  1569,
-    1575,  1579,  1583,  1591,  1602,  1634,  1642,  1664,  1675,  1681,
-    1689,  1695,  1701,  1710,  1714,  1722,  1722,  1732,  1740,  1745,
-    1749,  1753,  1757,  1772,  1794,  1797,  1800,  1800,  1808,  1808,
-    1816,  1816,  1824,  1824,  1833,  1836,  1839,  1843,  1856,  1857,
-    1859,  1863,  1872,  1877,  1883,  1885,  1890,  1895,  1904,  1904,
-    1905,  1905,  1907,  1914,  1920,  1927,  1931,  1937,  1942,  1947,
-    2042,  2042,  2044,  2052,  2052,  2054,  2059,  2060,  2061,  2063,
-    2063,  2073,  2077,  2082,  2086,  2090,  2094,  2098,  2102,  2106,
-    2110,  2114,  2139,  2143,  2157,  2161,  2167,  2167,  2173,  2178,
-    2182,  2191,  2202,  2207,  2219,  2232,  2236,  2240,  2245,  2254,
-    2273,  2282,  2338,  2342,  2349,  2360,  2373,  2382,  2391,  2401,
-    2405,  2412,  2412,  2414,  2418,  2423,  2439,  2454,  2468,  2481,
-    2489,  2497,  2505,  2511,  2531,  2554,  2560,  2566,  2572,  2587,
-    2646,  2653,  2656,  2661,  2665,  2672,  2677,  2683,  2688,  2694,
-    2702,  2714,  2729
+static const char * const yytname[] = {   "$","error","$undefined.","ESINT64VAL",
+"EUINT64VAL","SINTVAL","UINTVAL","FPVAL","VOID","BOOL","SBYTE","UBYTE","SHORT",
+"USHORT","INT","UINT","LONG","ULONG","FLOAT","DOUBLE","TYPE","LABEL","VAR_ID",
+"LABELSTR","STRINGCONSTANT","IMPLEMENTATION","ZEROINITIALIZER","TRUETOK","FALSETOK",
+"BEGINTOK","ENDTOK","DECLARE","GLOBAL","CONSTANT","SECTION","VOLATILE","TO",
+"DOTDOTDOT","NULL_TOK","UNDEF","CONST","INTERNAL","LINKONCE","WEAK","APPENDING",
+"DLLIMPORT","DLLEXPORT","EXTERN_WEAK","OPAQUE","NOT","EXTERNAL","TARGET","TRIPLE",
+"ENDIAN","POINTERSIZE","LITTLE","BIG","ALIGN","DEPLIBS","CALL","TAIL","ASM_TOK",
+"MODULE","SIDEEFFECT","CC_TOK","CCC_TOK","CSRETCC_TOK","FASTCC_TOK","COLDCC_TOK",
+"X86_STDCALLCC_TOK","X86_FASTCALLCC_TOK","DATALAYOUT","RET","BR","SWITCH","INVOKE",
+"UNWIND","UNREACHABLE","ADD","SUB","MUL","DIV","REM","AND","OR","XOR","SETLE",
+"SETGE","SETLT","SETGT","SETEQ","SETNE","MALLOC","ALLOCA","FREE","LOAD","STORE",
+"GETELEMENTPTR","PHI_TOK","CAST","SELECT","SHL","SHR","VAARG","EXTRACTELEMENT",
+"INSERTELEMENT","SHUFFLEVECTOR","VAARG_old","VANEXT_old","'='","','","'\\\\'",
+"'('","')'","'['","'x'","']'","'<'","'>'","'{'","'}'","'*'","'c'","INTVAL","EINT64VAL",
+"ArithmeticOps","LogicalOps","SetCondOps","ShiftOps","SIntType","UIntType","IntType",
+"FPType","OptAssign","OptLinkage","OptCallingConv","OptAlign","OptCAlign","SectionString",
+"OptSection","GlobalVarAttributes","GlobalVarAttribute","TypesV","UpRTypesV",
+"Types","PrimType","UpRTypes","TypeListI","ArgTypeListI","ConstVal","ConstExpr",
+"ConstVector","GlobalType","Module","FunctionList","ConstPool","@1","@2","@3",
+"@4","AsmBlock","BigOrLittle","TargetDefinition","LibrariesDefinition","LibList",
+"Name","OptName","ArgVal","ArgListH","ArgList","FunctionHeaderH","BEGIN","FunctionHeader",
+"END","Function","FnDeclareLinkage","FunctionProto","@5","OptSideEffect","ConstValueRef",
+"SymbolicValueRef","ValueRef","ResolvedVal","BasicBlockList","BasicBlock","InstructionList",
+"BBTerminatorInst","JumpTable","Inst","PHIList","ValueRefList","ValueRefListE",
+"OptTailCall","InstVal","IndexList","OptVolatile","MemoryInst", NULL
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
-static const char *const yytname[] =
-{
-  "$end", "error", "$undefined", "ESINT64VAL", "EUINT64VAL", "SINTVAL",
-  "UINTVAL", "FPVAL", "VOID", "BOOL", "SBYTE", "UBYTE", "SHORT", "USHORT",
-  "INT", "UINT", "LONG", "ULONG", "FLOAT", "DOUBLE", "TYPE", "LABEL",
-  "VAR_ID", "LABELSTR", "STRINGCONSTANT", "IMPLEMENTATION",
-  "ZEROINITIALIZER", "TRUETOK", "FALSETOK", "BEGINTOK", "ENDTOK",
-  "DECLARE", "GLOBAL", "CONSTANT", "SECTION", "VOLATILE", "TO",
-  "DOTDOTDOT", "NULL_TOK", "UNDEF", "CONST", "INTERNAL", "LINKONCE",
-  "WEAK", "APPENDING", "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "OPAQUE",
-  "NOT", "EXTERNAL", "TARGET", "TRIPLE", "ENDIAN", "POINTERSIZE", "LITTLE",
-  "BIG", "ALIGN", "DEPLIBS", "CALL", "TAIL", "ASM_TOK", "MODULE",
-  "SIDEEFFECT", "CC_TOK", "CCC_TOK", "CSRETCC_TOK", "FASTCC_TOK",
-  "COLDCC_TOK", "X86_STDCALLCC_TOK", "X86_FASTCALLCC_TOK", "DATA", "RET",
-  "BR", "SWITCH", "INVOKE", "UNWIND", "UNREACHABLE", "ADD", "SUB", "MUL",
-  "DIV", "REM", "AND", "OR", "XOR", "SETLE", "SETGE", "SETLT", "SETGT",
-  "SETEQ", "SETNE", "MALLOC", "ALLOCA", "FREE", "LOAD", "STORE",
-  "GETELEMENTPTR", "PHI_TOK", "CAST", "SELECT", "SHL", "SHR", "VAARG",
-  "EXTRACTELEMENT", "INSERTELEMENT", "SHUFFLEVECTOR", "VAARG_old",
-  "VANEXT_old", "'='", "','", "'\\\\'", "'('", "')'", "'['", "'x'", "']'",
-  "'<'", "'>'", "'{'", "'}'", "'*'", "'c'", "$accept", "INTVAL",
-  "EINT64VAL", "ArithmeticOps", "LogicalOps", "SetCondOps", "ShiftOps",
-  "SIntType", "UIntType", "IntType", "FPType", "OptAssign", "OptLinkage",
-  "OptCallingConv", "OptAlign", "OptCAlign", "SectionString", "OptSection",
-  "GlobalVarAttributes", "GlobalVarAttribute", "TypesV", "UpRTypesV",
-  "Types", "PrimType", "UpRTypes", "TypeListI", "ArgTypeListI", "ConstVal",
-  "ConstExpr", "ConstVector", "GlobalType", "Module", "FunctionList",
-  "ConstPool", "@1", "@2", "@3", "@4", "AsmBlock", "BigOrLittle",
-  "TargetDefinition", "LibrariesDefinition", "LibList", "Name", "OptName",
-  "ArgVal", "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN",
-  "FunctionHeader", "END", "Function", "FnDeclareLinkage", "FunctionProto",
-  "@5", "OptSideEffect", "ConstValueRef", "SymbolicValueRef", "ValueRef",
-  "ResolvedVal", "BasicBlockList", "BasicBlock", "InstructionList",
-  "BBTerminatorInst", "JumpTable", "Inst", "PHIList", "ValueRefList",
-  "ValueRefListE", "OptTailCall", "InstVal", "IndexList", "OptVolatile",
-  "MemoryInst", 0
+static const short yyr1[] = {     0,
+   123,   123,   124,   124,   125,   125,   125,   125,   125,   126,
+   126,   126,   127,   127,   127,   127,   127,   127,   128,   128,
+   129,   129,   129,   129,   130,   130,   130,   130,   131,   131,
+   132,   132,   133,   133,   134,   134,   134,   134,   134,   134,
+   134,   134,   135,   135,   135,   135,   135,   135,   135,   135,
+   136,   136,   137,   137,   138,   139,   139,   140,   140,   141,
+   141,   142,   142,   143,   143,   144,   145,   145,   145,   145,
+   145,   145,   145,   145,   145,   145,   145,   145,   145,   146,
+   146,   146,   146,   146,   146,   146,   146,   146,   146,   147,
+   147,   148,   148,   148,   148,   149,   149,   149,   149,   149,
+   149,   149,   149,   149,   149,   149,   149,   149,   149,   149,
+   149,   150,   150,   150,   150,   150,   150,   150,   150,   150,
+   150,   151,   151,   152,   152,   153,   154,   154,   154,   154,
+   154,   155,   155,   155,   156,   155,   157,   155,   158,   155,
+   159,   155,   155,   155,   155,   160,   161,   161,   162,   162,
+   162,   162,   163,   164,   164,   164,   165,   165,   166,   166,
+   167,   168,   168,   169,   169,   169,   169,   170,   171,   171,
+   172,   173,   173,   174,   175,   175,   175,   177,   176,   178,
+   178,   179,   179,   179,   179,   179,   179,   179,   179,   179,
+   179,   179,   180,   180,   181,   181,   182,   183,   183,   184,
+   185,   185,   185,   186,   186,   186,   186,   186,   186,   186,
+   186,   186,   187,   187,   188,   189,   189,   190,   190,   191,
+   191,   192,   192,   193,   193,   193,   193,   193,   193,   193,
+   193,   193,   193,   193,   193,   193,   193,   193,   193,   194,
+   194,   195,   195,   196,   196,   196,   196,   196,   196,   196,
+   196
 };
-#endif
 
-# ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
-static const unsigned short int yytoknum[] =
-{
-       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
-     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
-     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
-     355,   356,   357,   358,   359,   360,   361,   362,   363,    61,
-      44,    92,    40,    41,    91,   120,    93,    60,    62,   123,
-     125,    42,    99
+static const short yyr2[] = {     0,
+     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+     1,     1,     2,     0,     1,     1,     1,     1,     1,     1,
+     1,     0,     0,     1,     1,     1,     1,     1,     1,     2,
+     0,     2,     0,     3,     2,     0,     1,     0,     3,     1,
+     2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+     1,     1,     2,     4,     5,     5,     3,     2,     2,     1,
+     3,     1,     3,     1,     0,     4,     3,     3,     4,     4,
+     3,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     6,     5,     8,     6,     6,     6,     6,     6,     8,
+     8,     3,     1,     1,     1,     1,     2,     2,     4,     2,
+     1,     4,     2,     4,     0,     7,     0,     7,     0,     7,
+     0,     7,     3,     4,     0,     1,     1,     1,     3,     3,
+     3,     3,     3,     3,     1,     0,     1,     1,     1,     0,
+     2,     3,     1,     1,     3,     1,     0,     8,     1,     1,
+     3,     1,     1,     2,     0,     1,     1,     0,     4,     0,
+     1,     1,     1,     1,     1,     1,     1,     1,     1,     3,
+     1,     5,     1,     1,     1,     1,     2,     2,     2,     3,
+     2,     0,     1,     2,     2,     3,     9,     9,     8,    13,
+     1,     1,     6,     5,     2,     6,     7,     1,     3,     1,
+     0,     2,     1,     5,     5,     5,     2,     4,     4,     6,
+     4,     4,     4,     4,     6,     6,     2,     7,     1,     2,
+     0,     1,     0,     3,     6,     3,     6,     2,     4,     6,
+     4
 };
-# endif
 
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const unsigned char yyr1[] =
-{
-       0,   123,   124,   124,   125,   125,   126,   126,   126,   126,
-     126,   127,   127,   127,   128,   128,   128,   128,   128,   128,
-     129,   129,   130,   130,   130,   130,   131,   131,   131,   131,
-     132,   132,   133,   133,   134,   134,   135,   135,   135,   135,
-     135,   135,   135,   135,   136,   136,   136,   136,   136,   136,
-     136,   136,   137,   137,   138,   138,   139,   140,   140,   141,
-     141,   142,   142,   143,   143,   144,   144,   145,   146,   146,
-     146,   146,   146,   146,   146,   146,   146,   146,   146,   146,
-     146,   147,   147,   147,   147,   147,   147,   147,   147,   147,
-     147,   148,   148,   149,   149,   149,   149,   150,   150,   150,
-     150,   150,   150,   150,   150,   150,   150,   150,   150,   150,
-     150,   150,   150,   151,   151,   151,   151,   151,   151,   151,
-     151,   151,   151,   152,   152,   153,   153,   154,   155,   155,
-     155,   155,   155,   156,   156,   156,   157,   156,   158,   156,
-     159,   156,   160,   156,   156,   156,   156,   161,   162,   162,
-     163,   163,   163,   163,   164,   165,   165,   165,   166,   166,
-     167,   167,   168,   169,   169,   170,   170,   170,   170,   171,
-     172,   172,   173,   174,   174,   175,   176,   176,   176,   178,
-     177,   179,   179,   180,   180,   180,   180,   180,   180,   180,
-     180,   180,   180,   180,   181,   181,   182,   182,   183,   184,
-     184,   185,   186,   186,   186,   187,   187,   187,   187,   187,
-     187,   187,   187,   187,   188,   188,   189,   190,   190,   191,
-     191,   192,   192,   193,   193,   194,   194,   194,   194,   194,
-     194,   194,   194,   194,   194,   194,   194,   194,   194,   194,
-     194,   195,   195,   196,   196,   197,   197,   197,   197,   197,
-     197,   197,   197
+static const short yydefact[] = {   145,
+    42,   131,   130,   178,    35,    36,    37,    38,    39,    40,
+    41,     0,    43,   202,   127,   128,   202,   157,   158,     0,
+     0,     0,    42,     0,   133,   175,     0,     0,    44,    45,
+    46,    47,    48,    49,     0,     0,   203,   199,    34,   172,
+   173,   174,   198,     0,     0,     0,     0,   143,     0,     0,
+     0,     0,     0,     0,     0,    33,   176,   177,    43,   146,
+   129,    50,     1,     2,    63,    67,    68,    69,    70,    71,
+    72,    73,    74,    75,    76,    77,    78,    79,    80,     0,
+     0,     0,     0,   193,     0,     0,    62,    81,    66,   194,
+    82,   169,   170,   171,   243,   201,     0,     0,     0,     0,
+   156,   144,   134,   132,   124,   125,     0,     0,     0,     0,
+   179,    83,     0,     0,    65,    88,    90,     0,     0,    95,
+    89,   242,     0,   223,     0,     0,     0,     0,    43,   211,
+   212,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+    14,    15,    16,    17,    18,     0,     0,     0,     0,     0,
+     0,     0,    19,    20,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,   200,    43,   215,     0,   239,   151,
+   148,   147,   149,   150,   152,   155,     0,   139,   141,   137,
+    67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+    77,     0,     0,     0,     0,   135,     0,     0,     0,    87,
+   167,    94,    92,     0,     0,   227,   222,   205,   204,     0,
+     0,    24,    28,    23,    27,    22,    26,    21,    25,    29,
+    30,     0,     0,    53,    53,   248,     0,     0,   237,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,   153,    58,    58,    58,   109,
+   110,     3,     4,   107,   108,   111,   106,   102,   103,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,   105,   104,    58,    64,    64,    91,   166,
+   160,   163,   164,     0,     0,    84,   182,   183,   184,   189,
+   185,   186,   187,   188,   180,     0,   191,   196,   195,   197,
+     0,   206,     0,     0,     0,   244,     0,   246,   241,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,   154,     0,   140,   142,
+   138,     0,     0,     0,     0,     0,     0,    97,   123,     0,
+     0,   101,     0,    98,     0,     0,     0,     0,   136,    85,
+    86,   159,   161,     0,    56,    93,   181,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,   251,     0,     0,   229,
+     0,   231,   234,     0,     0,   232,   233,     0,     0,     0,
+   228,     0,   249,     0,     0,     0,    60,    58,   241,     0,
+     0,     0,     0,     0,     0,    96,    99,   100,     0,     0,
+     0,     0,   165,   162,    57,    51,     0,   190,     0,     0,
+   221,    53,    54,    53,   218,   240,     0,     0,     0,     0,
+     0,   224,   225,   226,   221,     0,    55,    61,    59,     0,
+     0,     0,     0,     0,     0,   122,     0,     0,     0,     0,
+     0,   168,     0,     0,     0,   220,     0,     0,   245,   247,
+     0,     0,     0,   230,   235,   236,     0,   250,   113,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,    52,   192,
+     0,     0,     0,   219,   216,     0,   238,   112,     0,   119,
+     0,     0,   115,   116,   117,   118,     0,   209,     0,     0,
+     0,   217,     0,     0,     0,   207,     0,   208,     0,     0,
+   114,   120,   121,     0,     0,     0,     0,     0,     0,   214,
+     0,     0,   213,   210,     0,     0,     0
 };
 
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const unsigned char yyr2[] =
-{
-       0,     2,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     2,     0,     1,     1,     1,     1,
-       1,     1,     1,     0,     0,     1,     1,     1,     1,     1,
-       1,     2,     0,     2,     0,     3,     2,     0,     1,     0,
-       3,     1,     2,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     2,     4,     5,     5,     3,     2,
-       2,     1,     3,     1,     3,     1,     0,     4,     3,     3,
-       4,     4,     3,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     6,     5,     8,     6,     6,     6,     6,
-       6,     8,     8,     3,     1,     1,     1,     1,     2,     2,
-       4,     2,     1,     4,     2,     4,     0,     7,     0,     7,
-       0,     7,     0,     7,     3,     4,     0,     1,     1,     1,
-       3,     3,     3,     3,     3,     3,     1,     0,     1,     1,
-       1,     0,     2,     3,     1,     1,     3,     1,     0,     8,
-       1,     1,     3,     1,     1,     2,     0,     1,     1,     0,
-       4,     0,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     3,     1,     5,     1,     1,     1,     1,     2,     2,
-       2,     3,     2,     0,     1,     2,     2,     3,     9,     9,
-       8,    13,     1,     1,     6,     5,     2,     6,     7,     1,
-       3,     1,     0,     2,     1,     5,     5,     5,     2,     4,
-       4,     6,     4,     4,     4,     4,     6,     6,     2,     7,
-       1,     2,     0,     1,     0,     3,     6,     3,     6,     2,
-       4,     6,     4
+static const short yydefgoto[] = {    84,
+   254,   270,   271,   272,   273,   192,   193,   222,   194,    23,
+    13,    35,   442,   306,   387,   406,   329,   388,    85,    86,
+   195,    88,    89,   118,   204,   339,   297,   340,   107,   515,
+     1,     2,   276,   249,   247,   248,    61,   173,    48,   102,
+   177,    90,   353,   282,   283,   284,    36,    94,    14,    42,
+    15,    59,    16,    26,   358,   298,    91,   300,   415,    17,
+    38,    39,   165,   490,    96,   229,   446,   447,   166,   167,
+   367,   168,   169
 };
 
-/* 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 char yydefact[] =
-{
-     146,     0,    43,   132,     1,   131,   179,    36,    37,    38,
-      39,    40,    41,    42,     0,    44,   203,   128,   129,   203,
-     158,   159,     0,     0,     0,    43,     0,   134,   176,     0,
-       0,    45,    46,    47,    48,    49,    50,     0,     0,   204,
-     200,    35,   173,   174,   175,   199,     0,     0,     0,     0,
-     144,     0,     0,     0,     0,     0,     0,     0,    34,   177,
-     178,    44,   147,   130,    51,     2,     3,    64,    68,    69,
-      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
-      80,    81,     0,     0,     0,     0,   194,     0,     0,    63,
-      82,    67,   195,    83,   170,   171,   172,   244,   202,     0,
-       0,     0,     0,   157,   145,   135,   133,   125,   126,     0,
-       0,     0,     0,   180,    84,     0,     0,    66,    89,    91,
-       0,     0,    96,    90,   243,     0,   224,     0,     0,     0,
-       0,    44,   212,   213,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,     0,     0,
-       0,     0,     0,     0,     0,    20,    21,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   201,    44,   216,
-       0,   240,   152,   149,   148,   150,   151,   153,   156,     0,
-     140,   142,   138,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,     0,     0,     0,     0,   136,     0,
-       0,     0,    88,   168,    95,    93,     0,     0,   228,   223,
-     206,   205,     0,     0,    25,    29,    24,    28,    23,    27,
-      22,    26,    30,    31,     0,     0,    54,    54,   249,     0,
-       0,   238,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   154,    59,
-      59,    59,   110,   111,     4,     5,   108,   109,   112,   107,
-     103,   104,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   106,   105,    59,    65,
-      65,    92,   167,   161,   164,   165,     0,     0,    85,   183,
-     184,   185,   190,   186,   187,   188,   189,   181,     0,   192,
-     197,   196,   198,     0,   207,     0,     0,     0,   245,     0,
-     247,   242,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   155,
-       0,   141,   143,   139,     0,     0,     0,     0,     0,     0,
-      98,   124,     0,     0,   102,     0,    99,     0,     0,     0,
-       0,   137,    86,    87,   160,   162,     0,    57,    94,   182,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   252,
-       0,     0,   230,     0,   232,   235,     0,     0,   233,   234,
-       0,     0,     0,   229,     0,   250,     0,     0,     0,    61,
-      59,   242,     0,     0,     0,     0,     0,     0,    97,   100,
-     101,     0,     0,     0,     0,   166,   163,    58,    52,     0,
-     191,     0,     0,   222,    54,    55,    54,   219,   241,     0,
-       0,     0,     0,     0,   225,   226,   227,   222,     0,    56,
-      62,    60,     0,     0,     0,     0,     0,     0,   123,     0,
-       0,     0,     0,     0,   169,     0,     0,     0,   221,     0,
-       0,   246,   248,     0,     0,     0,   231,   236,   237,     0,
-     251,   114,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    53,   193,     0,     0,     0,   220,   217,     0,   239,
-     113,     0,   120,     0,     0,   116,   117,   118,   119,     0,
-     210,     0,     0,     0,   218,     0,     0,     0,   208,     0,
-     209,     0,     0,   115,   121,   122,     0,     0,     0,     0,
-       0,     0,   215,     0,     0,   214,   211
+static const short yypact[] = {-32768,
+   118,   605,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,   -46,   131,    10,-32768,-32768,   -18,-32768,-32768,    29,
+   -69,    58,    51,   -19,-32768,   106,   114,   144,-32768,-32768,
+-32768,-32768,-32768,-32768,  1060,   -20,-32768,-32768,   130,-32768,
+-32768,-32768,-32768,    80,    81,    83,    94,-32768,    57,   114,
+  1060,    44,    44,    44,    44,-32768,-32768,-32768,   131,-32768,
+-32768,-32768,-32768,-32768,    90,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   200,
+   201,   202,   572,-32768,   130,    99,-32768,-32768,   -34,-32768,
+-32768,-32768,-32768,-32768,  1231,-32768,   191,    77,   212,   193,
+   194,-32768,-32768,-32768,-32768,-32768,  1101,  1101,  1101,  1142,
+-32768,-32768,   104,   107,-32768,-32768,   -34,   -74,   109,   852,
+-32768,-32768,  1101,-32768,   165,  1183,    30,    93,   131,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,  1101,  1101,  1101,  1101,  1101,
+  1101,  1101,-32768,-32768,  1101,  1101,  1101,  1101,  1101,  1101,
+  1101,  1101,  1101,  1101,-32768,   131,-32768,    62,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,   -72,-32768,-32768,-32768,
+   142,   170,   221,   173,   222,   175,   223,   178,   224,   231,
+   232,   183,   225,   233,   425,-32768,  1101,  1101,  1101,-32768,
+   893,-32768,   120,   128,   638,-32768,-32768,    90,-32768,   638,
+   638,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,   638,  1060,   121,   132,-32768,   638,   129,   134,   214,
+   141,   143,   146,   147,   148,   149,   150,   638,   638,   638,
+   151,  1060,  1101,  1101,   228,-32768,   152,   152,   152,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   153,
+   154,   155,   156,   159,   160,   934,  1142,   592,   230,   161,
+   164,   177,   180,-32768,-32768,   152,   -37,   -99,   -34,-32768,
+   130,-32768,   184,   174,   978,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,   227,  1142,-32768,-32768,-32768,-32768,
+   186,-32768,   187,   638,     2,-32768,     3,-32768,   188,   638,
+   179,  1101,  1101,  1101,  1101,  1101,  1101,  1101,  1101,   189,
+   190,   195,  1101,   638,   638,   196,-32768,   -23,-32768,-32768,
+-32768,  1142,  1142,  1142,  1142,  1142,  1142,-32768,-32768,   -30,
+    21,-32768,   -73,-32768,  1142,  1142,  1142,  1142,-32768,-32768,
+-32768,-32768,-32768,  1019,   229,-32768,-32768,   240,    24,   280,
+   286,   197,   638,   307,   638,  1101,-32768,   203,   638,-32768,
+   205,-32768,-32768,   210,   211,-32768,-32768,   638,   638,   638,
+-32768,   215,-32768,  1101,   288,   318,-32768,   152,   188,   290,
+   218,   219,   220,   226,  1142,-32768,-32768,-32768,   234,   237,
+   241,   242,-32768,-32768,-32768,   284,   243,-32768,   638,   638,
+  1101,   246,-32768,   246,-32768,   247,   638,   248,  1101,  1101,
+  1101,-32768,-32768,-32768,  1101,   638,-32768,-32768,-32768,   252,
+  1101,  1142,  1142,  1142,  1142,-32768,  1142,  1142,  1142,  1142,
+   338,-32768,   319,   249,   236,   247,   253,   303,-32768,-32768,
+  1101,   245,   638,-32768,-32768,-32768,   254,-32768,-32768,   256,
+   260,   259,   263,   265,   264,   267,   270,   274,-32768,-32768,
+   357,    14,   355,-32768,-32768,   276,-32768,-32768,  1142,-32768,
+  1142,  1142,-32768,-32768,-32768,-32768,   638,-32768,   742,    52,
+   372,-32768,   281,   282,   287,-32768,   289,-32768,   742,   638,
+-32768,-32768,-32768,   376,   291,   326,   638,   382,   383,-32768,
+   638,   638,-32768,-32768,   405,   406,-32768
 };
 
-/* YYDEFGOTO[NTERM-NUM]. */
-static const short int yydefgoto[] =
-{
-      -1,    86,   256,   272,   273,   274,   275,   194,   195,   224,
-     196,    25,    15,    37,   444,   308,   389,   408,   331,   390,
-      87,    88,   197,    90,    91,   120,   206,   341,   299,   342,
-     109,     1,     2,     3,   278,   251,   249,   250,    63,   175,
-      50,   104,   179,    92,   355,   284,   285,   286,    38,    96,
-      16,    44,    17,    61,    18,    28,   360,   300,    93,   302,
-     417,    19,    40,    41,   167,   492,    98,   231,   448,   449,
-     168,   169,   369,   170,   171
+static const short yypgoto[] = {-32768,
+-32768,   312,   313,   314,   315,  -127,  -126,  -458,-32768,   373,
+   388,  -116,-32768,  -221,    59,-32768,  -241,-32768,   -48,-32768,
+   -35,-32768,   -62,   293,-32768,  -100,   239,  -226,    91,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,   365,-32768,-32768,-32768,
+-32768,     4,-32768,    63,-32768,-32768,   359,-32768,-32768,-32768,
+-32768,-32768,   417,-32768,-32768,  -414,   -55,    64,  -103,-32768,
+   403,-32768,-32768,-32768,-32768,-32768,    55,    -3,-32768,-32768,
+    34,-32768,-32768
 };
 
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -410
-static const short int yypact[] =
-{
-    -410,    17,   118,   605,  -410,  -410,  -410,  -410,  -410,  -410,
-    -410,  -410,  -410,  -410,    24,   160,    67,  -410,  -410,   -15,
-    -410,  -410,    27,    -5,    46,    -6,    10,  -410,    86,   147,
-     138,  -410,  -410,  -410,  -410,  -410,  -410,  1060,   -20,  -410,
-    -410,   110,  -410,  -410,  -410,  -410,    69,    70,    72,    73,
-    -410,    63,   147,  1060,    68,    68,    68,    68,  -410,  -410,
-    -410,   160,  -410,  -410,  -410,  -410,  -410,    64,  -410,  -410,
-    -410,  -410,  -410,  -410,  -410,  -410,  -410,  -410,  -410,  -410,
-    -410,  -410,   182,   183,   186,   572,  -410,   110,    77,  -410,
-    -410,   -28,  -410,  -410,  -410,  -410,  -410,  1231,  -410,   168,
-      83,   199,   180,   181,  -410,  -410,  -410,  -410,  -410,  1101,
-    1101,  1101,  1142,  -410,  -410,    91,    96,  -410,  -410,   -28,
-     -98,   103,   852,  -410,  -410,  1101,  -410,   157,  1183,    50,
-     185,   160,  -410,  -410,  -410,  -410,  -410,  -410,  -410,  -410,
-    -410,  -410,  -410,  -410,  -410,  -410,  -410,  -410,  1101,  1101,
-    1101,  1101,  1101,  1101,  1101,  -410,  -410,  1101,  1101,  1101,
-    1101,  1101,  1101,  1101,  1101,  1101,  1101,  -410,   160,  -410,
-      49,  -410,  -410,  -410,  -410,  -410,  -410,  -410,  -410,   -14,
-    -410,  -410,  -410,   120,   148,   213,   150,   214,   154,   215,
-     166,   217,   224,   231,   170,   218,   232,   425,  -410,  1101,
-    1101,  1101,  -410,   893,  -410,   130,   128,   638,  -410,  -410,
-      64,  -410,   638,   638,  -410,  -410,  -410,  -410,  -410,  -410,
-    -410,  -410,  -410,  -410,   638,  1060,   132,   133,  -410,   638,
-     136,   134,   216,   141,   143,   144,   146,   149,   151,   152,
-     638,   638,   638,   153,  1060,  1101,  1101,   233,  -410,   155,
-     155,   155,  -410,  -410,  -410,  -410,  -410,  -410,  -410,  -410,
-    -410,  -410,   156,   159,   161,   164,   175,   177,   934,  1142,
-     592,   234,   178,   184,   187,   188,  -410,  -410,   155,   -70,
-     -35,   -28,  -410,   110,  -410,   162,   179,   978,  -410,  -410,
-    -410,  -410,  -410,  -410,  -410,  -410,  -410,   197,  1142,  -410,
-    -410,  -410,  -410,   191,  -410,   195,   638,     3,  -410,    18,
-    -410,   196,   638,   193,  1101,  1101,  1101,  1101,  1101,  1101,
-    1101,  1101,   201,   202,   203,  1101,   638,   638,   205,  -410,
-      13,  -410,  -410,  -410,  1142,  1142,  1142,  1142,  1142,  1142,
-    -410,  -410,   -13,   -99,  -410,   -78,  -410,  1142,  1142,  1142,
-    1142,  -410,  -410,  -410,  -410,  -410,  1019,   230,  -410,  -410,
-     242,   -23,   246,   272,   208,   638,   290,   638,  1101,  -410,
-     211,   638,  -410,   212,  -410,  -410,   219,   220,  -410,  -410,
-     638,   638,   638,  -410,   229,  -410,  1101,   273,   294,  -410,
-     155,   196,   291,   226,   237,   240,   241,  1142,  -410,  -410,
-    -410,   243,   247,   248,   249,  -410,  -410,  -410,   252,   250,
-    -410,   638,   638,  1101,   251,  -410,   251,  -410,   255,   638,
-     256,  1101,  1101,  1101,  -410,  -410,  -410,  1101,   638,  -410,
-    -410,  -410,   239,  1101,  1142,  1142,  1142,  1142,  -410,  1142,
-    1142,  1142,  1142,   322,  -410,   304,   257,   228,   255,   259,
-     286,  -410,  -410,  1101,   253,   638,  -410,  -410,  -410,   260,
-    -410,  -410,   262,   267,   265,   270,   277,   278,   279,   280,
-     281,  -410,  -410,   323,    14,   320,  -410,  -410,   254,  -410,
-    -410,  1142,  -410,  1142,  1142,  -410,  -410,  -410,  -410,   638,
-    -410,   742,    52,   362,  -410,   282,   284,   287,  -410,   289,
-    -410,   742,   638,  -410,  -410,  -410,   380,   292,   327,   638,
-     383,   384,  -410,   638,   638,  -410,  -410
-};
 
-/* YYPGOTO[NTERM-NUM].  */
-static const short int yypgoto[] =
-{
-    -410,  -410,  -410,   309,   310,   311,   312,  -129,  -128,  -398,
-    -410,   369,   386,  -118,  -410,  -223,    55,  -410,  -244,  -410,
-     -50,  -410,   -37,  -410,   -64,   293,  -410,  -102,   221,  -192,
-      53,  -410,  -410,  -410,  -410,  -410,  -410,  -410,   361,  -410,
-    -410,  -410,  -410,     2,  -410,    58,  -410,  -410,   356,  -410,
-    -410,  -410,  -410,  -410,   416,  -410,  -410,  -409,   -57,    62,
-    -105,  -410,   401,  -410,  -410,  -410,  -410,  -410,    54,    -4,
-    -410,  -410,    30,  -410,  -410
-};
+#define	YYLAST		1339
 
-/* 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 -128
-static const short int yytable[] =
-{
-      89,   222,   223,   106,   310,    26,   332,   333,    39,    94,
-     198,   397,   201,   225,    53,    42,    89,     4,   365,   399,
-     208,   119,   202,   211,   214,   215,   216,   217,   218,   219,
-     220,   221,   397,   367,   351,     7,     8,     9,    10,    54,
-      12,    55,   400,    26,    56,   228,   352,   387,   232,   233,
-     244,   123,   234,   235,   236,   237,   238,   239,   119,   212,
-     366,   243,   214,   215,   216,   217,   218,   219,   220,   221,
-     388,   213,   180,   181,   182,   366,   491,   343,   345,    46,
-      47,    48,   499,   353,   -65,    29,   123,   397,   207,   121,
-      39,   207,   507,   123,   501,   410,   247,   397,    49,    95,
-     107,   108,   248,   398,    51,    43,   361,    52,   110,   111,
-     112,   226,   227,   207,   229,   230,   207,   207,  -127,    58,
-     207,   207,   207,   207,   207,   207,   240,   241,   242,   207,
-     490,    59,    20,    60,    21,   279,   280,   281,   173,   174,
-     277,   328,    64,     5,   245,   246,   431,   252,   253,     6,
-     301,   -25,   -25,   -24,   -24,   301,   301,   -23,   -23,     7,
-       8,     9,    10,    11,    12,    13,   283,   301,   500,   -22,
-     -22,    62,   301,   254,   255,   306,   -66,   103,    99,   100,
-      14,   101,   102,   301,   301,   301,   114,   115,    89,   122,
-     116,   451,   172,   452,   326,   214,   215,   216,   217,   218,
-     219,   220,   221,   176,   177,   178,   199,    89,   327,   207,
-     373,   200,   375,   376,   377,   203,   209,   -29,   -28,   -27,
-     383,   -26,   257,   281,    30,    31,    32,    33,    34,    35,
-      36,   -32,   391,   392,   393,   394,   395,   396,   -33,   258,
-     287,   288,   307,   309,   313,   401,   402,   403,   404,   301,
-     312,   315,   314,   316,   317,   301,   318,   329,   346,   319,
-     359,   320,   321,   325,   387,   330,   409,   411,   334,   301,
-     301,   335,   356,   336,   303,   304,   337,   372,   207,   374,
-     207,   207,   207,   378,   379,   354,   305,   338,   207,   339,
-     347,   311,   357,   412,   415,   438,   348,   429,   430,   349,
-     350,   362,   322,   323,   324,   363,   368,   371,   301,   443,
-     301,   380,   381,   382,   301,   386,   456,   457,   458,   283,
-     413,   419,   421,   301,   301,   301,   471,   433,   472,   422,
-     423,   207,   463,   464,   465,   466,   434,   467,   468,   469,
-     470,   427,   474,   366,   489,   222,   223,   435,   476,   428,
-     436,   437,   461,   439,   301,   301,   493,   440,   441,   442,
-     445,   450,   301,   222,   223,   453,   455,   473,   364,   477,
-     494,   301,   475,   479,   370,   480,   207,   481,   482,   495,
-     483,   496,   497,   502,   207,   207,   207,   484,   384,   385,
-     207,   485,   486,   487,   488,   503,   462,   504,   301,   506,
-     505,   509,   510,   511,   513,   514,   163,   164,   165,   166,
-      97,    57,   407,   105,   406,   205,   207,   113,   276,    27,
-      45,   432,   418,   459,     0,     0,     0,   414,     0,   416,
-      65,    66,   301,   420,     0,     0,     0,     0,     0,     0,
-       0,     0,   424,   425,   426,   301,     0,    20,     0,    21,
-       0,   259,   301,     0,     0,     0,   301,   301,     0,     0,
-       0,     0,     0,   260,   261,     0,     0,     0,     0,     0,
-       0,     0,     0,   446,   447,     0,     0,     0,     0,     0,
-       0,   454,     0,     0,     0,     0,     0,     0,     0,     0,
-     460,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,   478,     0,     0,
-       0,     0,   262,     0,   263,   264,   155,   156,     0,   265,
-     266,   267,     0,     0,     0,     0,     0,     0,     0,   268,
-       0,     0,   269,     0,   270,     0,     0,   271,     0,     0,
-       0,   498,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   508,     0,     0,     0,     0,     0,
-       0,   512,     0,     0,     0,   515,   516,    65,    66,     0,
-     117,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    20,     0,    21,    65,    66,     0,
-     117,   183,   184,   185,   186,   187,   188,   189,   190,   191,
-     192,   193,    79,    80,    20,     0,    21,     0,     0,     0,
-      81,     0,     0,     0,     0,   -35,     0,    20,     0,    21,
-       0,     0,     0,     0,     0,     0,     6,   -35,   -35,     0,
-      81,   289,   290,    65,    66,   291,   -35,   -35,   -35,   -35,
-     -35,   -35,   -35,     0,     0,   -35,    22,     0,     0,     0,
-      20,     0,    21,    23,   292,   293,   294,    24,     0,     0,
-       0,     0,     0,     0,     0,     0,   295,   296,     0,     0,
-       0,     0,     0,    82,     0,     0,    83,     0,     0,    84,
-       0,    85,   118,     0,     0,     0,     0,     0,     0,   297,
-       0,     0,     0,    82,     0,     0,    83,     0,     0,    84,
-       0,    85,   344,     0,     0,     0,   134,   135,   136,   137,
-     138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
-       0,     0,     0,     0,     0,   262,     0,   263,   264,   155,
-     156,     0,   265,   266,   267,   289,   290,     0,     0,   291,
-       0,     0,     0,     0,     0,   298,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   292,   293,
-     294,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     295,   296,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   297,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     134,   135,   136,   137,   138,   139,   140,   141,   142,   143,
-     144,   145,   146,   147,     0,     0,     0,     0,     0,   262,
-       0,   263,   264,   155,   156,     0,   265,   266,   267,     0,
-       0,     0,     0,     0,     0,     0,     0,    65,    66,   298,
-     117,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    20,     0,    21,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   204,
-       0,     0,     0,     0,     0,     0,     0,     0,    65,    66,
-      81,   117,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    20,     0,    21,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     282,     0,     0,     0,     0,     0,     0,     0,     0,    65,
-      66,    81,   117,   183,   184,   185,   186,   187,   188,   189,
-     190,   191,   192,   193,    79,    80,    20,     0,    21,     0,
-       0,     0,     0,    82,     0,     0,    83,     0,     0,    84,
-       0,    85,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    81,    65,    66,     0,   117,    68,    69,    70,
-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
-      20,     0,    21,     0,    82,     0,     0,    83,     0,     0,
-      84,     0,    85,     0,     0,   358,     0,     0,     0,     0,
-       0,     0,     0,     0,    65,    66,    81,   117,    68,    69,
-      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
-      80,    20,     0,    21,     0,    82,     0,     0,    83,     0,
-     340,    84,     0,    85,     0,     0,   405,     0,     0,     0,
-       0,     0,     0,     0,     0,    65,    66,    81,    67,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    20,     0,    21,     0,     0,     0,     0,    82,
-       0,     0,    83,     0,     0,    84,     0,    85,     0,     0,
-       0,     0,     0,     0,     0,     0,    65,    66,    81,   117,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    20,     0,    21,     0,     0,     0,     0,
-      82,     0,     0,    83,     0,     0,    84,     0,    85,     0,
-       0,     0,     0,     0,     0,     0,     0,    65,    66,    81,
-     117,   183,   184,   185,   186,   187,   188,   189,   190,   191,
-     192,   193,    79,    80,    20,     0,    21,     0,     0,     0,
-       0,    82,     0,     0,    83,     0,     0,    84,     0,    85,
-       0,     0,     0,     0,     0,     0,     0,     0,    65,    66,
-      81,   210,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    20,     0,    21,     0,     0,
-       0,     0,    82,     0,     0,    83,     0,     0,    84,     0,
-      85,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    81,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    82,     0,     0,    83,     0,     0,    84,
-       0,    85,     0,     0,     0,     0,   124,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     125,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     126,   127,     0,     0,    82,     0,     0,    83,     0,     0,
-      84,     0,    85,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,     0,     0,   151,   152,
-     153,   154,   155,   156,   157,   158,   159,   160,   161,   162
-};
 
-static const short int yycheck[] =
-{
-      37,   130,   130,    53,   227,     3,   250,   251,    23,    29,
-     112,   110,   110,   131,    20,    30,    53,     0,    15,   118,
-     125,    85,   120,   128,    10,    11,    12,    13,    14,    15,
-      16,    17,   110,    15,   278,    41,    42,    43,    44,    45,
-      46,    47,   120,    41,    50,   150,   116,    34,   153,   154,
-     168,   121,   157,   158,   159,   160,   161,   162,   122,     9,
-      57,   166,    10,    11,    12,    13,    14,    15,    16,    17,
-      57,    21,   109,   110,   111,    57,   474,   269,   270,    52,
-      53,    54,   491,   118,   112,    61,   121,   110,   125,    87,
-      23,   128,   501,   121,   492,   118,   110,   110,    71,   119,
-      32,    33,   116,   116,   109,   120,   298,    61,    55,    56,
-      57,   148,   149,   150,   151,   152,   153,   154,     0,   109,
-     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
-     116,    45,    22,    47,    24,   199,   200,   201,    55,    56,
-     197,   246,     4,    25,    95,    96,   390,    27,    28,    31,
-     207,     3,     4,     3,     4,   212,   213,     3,     4,    41,
-      42,    43,    44,    45,    46,    47,   203,   224,   116,     3,
-       4,    24,   229,     3,     4,   225,   112,   114,   109,   109,
-      62,   109,   109,   240,   241,   242,     4,     4,   225,   112,
-       4,   414,    24,   416,   244,    10,    11,    12,    13,    14,
-      15,    16,    17,     4,    24,    24,   115,   244,   245,   246,
-     315,   115,   317,   318,   319,   112,    59,     4,     4,     4,
-     325,     4,     4,   287,    64,    65,    66,    67,    68,    69,
-      70,     7,   334,   335,   336,   337,   338,   339,     7,     7,
-     110,   113,   110,   110,   110,   347,   348,   349,   350,   306,
-     114,   110,    36,   110,   110,   312,   110,    24,    24,   110,
-      63,   110,   110,   110,    34,   110,    24,    21,   112,   326,
-     327,   112,   110,   112,   212,   213,   112,   314,   315,   316,
-     317,   318,   319,   320,   321,   283,   224,   112,   325,   112,
-     112,   229,   113,    21,     4,   397,   112,    24,     4,   112,
-     112,   110,   240,   241,   242,   110,   110,   114,   365,    57,
-     367,   110,   110,   110,   371,   110,   421,   422,   423,   356,
-     112,   110,   110,   380,   381,   382,     4,    36,    24,   110,
-     110,   368,   434,   435,   436,   437,   110,   439,   440,   441,
-     442,   112,   114,    57,    21,   474,   474,   110,   453,   386,
-     110,   110,   113,   110,   411,   412,    36,   110,   110,   110,
-     110,   110,   419,   492,   492,   110,   110,   110,   306,   116,
-     116,   428,   113,   113,   312,   113,   413,   110,   113,   481,
-     110,   483,   484,    21,   421,   422,   423,   110,   326,   327,
-     427,   113,   113,   113,   113,   113,   433,   113,   455,   110,
-     113,    21,   110,    76,    21,    21,    97,    97,    97,    97,
-      41,    25,   357,    52,   356,   122,   453,    61,   197,     3,
-      19,   391,   368,   427,    -1,    -1,    -1,   365,    -1,   367,
-       5,     6,   489,   371,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   380,   381,   382,   502,    -1,    22,    -1,    24,
-      -1,    26,   509,    -1,    -1,    -1,   513,   514,    -1,    -1,
-      -1,    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   411,   412,    -1,    -1,    -1,    -1,    -1,
-      -1,   419,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     428,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,    91,   455,    -1,    -1,
-      -1,    -1,    97,    -1,    99,   100,   101,   102,    -1,   104,
-     105,   106,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   114,
-      -1,    -1,   117,    -1,   119,    -1,    -1,   122,    -1,    -1,
-      -1,   489,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   502,    -1,    -1,    -1,    -1,    -1,
-      -1,   509,    -1,    -1,    -1,   513,   514,     5,     6,    -1,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    -1,    24,     5,     6,    -1,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,
-      48,    -1,    -1,    -1,    -1,    20,    -1,    22,    -1,    24,
-      -1,    -1,    -1,    -1,    -1,    -1,    31,    32,    33,    -1,
-      48,     3,     4,     5,     6,     7,    41,    42,    43,    44,
-      45,    46,    47,    -1,    -1,    50,    51,    -1,    -1,    -1,
-      22,    -1,    24,    58,    26,    27,    28,    62,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    38,    39,    -1,    -1,
-      -1,    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,   117,
-      -1,   119,   120,    -1,    -1,    -1,    -1,    -1,    -1,    61,
-      -1,    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,   117,
-      -1,   119,   120,    -1,    -1,    -1,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      -1,    -1,    -1,    -1,    -1,    97,    -1,    99,   100,   101,
-     102,    -1,   104,   105,   106,     3,     4,    -1,    -1,     7,
-      -1,    -1,    -1,    -1,    -1,   117,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    26,    27,
-      28,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      38,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    61,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,    90,    91,    -1,    -1,    -1,    -1,    -1,    97,
-      -1,    99,   100,   101,   102,    -1,   104,   105,   106,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,   117,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,
-      48,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    -1,    24,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      37,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,
-       6,    48,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    -1,    24,    -1,
-      -1,    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,   117,
-      -1,   119,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    48,     5,     6,    -1,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    -1,    24,    -1,   111,    -1,    -1,   114,    -1,    -1,
-     117,    -1,   119,    -1,    -1,    37,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,     5,     6,    48,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    -1,    24,    -1,   111,    -1,    -1,   114,    -1,
-     116,   117,    -1,   119,    -1,    -1,    37,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     5,     6,    48,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    -1,    24,    -1,    -1,    -1,    -1,   111,
-      -1,    -1,   114,    -1,    -1,   117,    -1,   119,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,     5,     6,    48,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,    -1,
-     111,    -1,    -1,   114,    -1,    -1,   117,    -1,   119,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,    48,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,
-      -1,   111,    -1,    -1,   114,    -1,    -1,   117,    -1,   119,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,
-      48,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    -1,    24,    -1,    -1,
-      -1,    -1,   111,    -1,    -1,   114,    -1,    -1,   117,    -1,
-     119,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    48,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,   117,
-      -1,   119,    -1,    -1,    -1,    -1,    35,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      59,    60,    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,
-     117,    -1,   119,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    -1,    -1,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108
+static const short yytable[] = {    87,
+   220,   221,   104,   308,    37,    24,   330,   331,    92,   196,
+   385,    40,   223,   489,    27,    87,   363,   365,   351,   206,
+   117,   121,   209,   212,   213,   214,   215,   216,   217,   218,
+   219,   499,    37,   386,   349,   199,   395,   245,   210,    49,
+   341,   343,    24,   246,   226,   200,   398,   230,   231,   242,
+   211,   232,   233,   234,   235,   236,   237,   117,   364,   364,
+   241,   212,   213,   214,   215,   216,   217,   218,   219,   359,
+    51,   178,   179,   180,   497,   105,   106,   -64,   350,   395,
+    44,    45,    46,   121,   505,   396,   121,   205,   119,    56,
+   205,     5,     6,     7,     8,    52,    10,    53,    93,    47,
+    54,    41,   212,   213,   214,   215,   216,   217,   218,   219,
+   224,   225,   205,   227,   228,   205,   205,  -126,    50,   205,
+   205,   205,   205,   205,   205,   238,   239,   240,   205,   488,
+   395,   171,   172,   395,   277,   278,   279,    60,   397,   275,
+   326,   408,     3,   108,   109,   110,   429,    62,     4,   299,
+    57,    18,    58,    19,   299,   299,   243,   244,     5,     6,
+     7,     8,     9,    10,    11,   281,   299,   498,   250,   251,
+   101,   299,   -24,   -24,   304,   -23,   -23,   -22,   -22,    12,
+   -21,   -21,   299,   299,   299,   252,   253,    87,    97,    98,
+   449,    99,   450,   324,    28,    29,    30,    31,    32,    33,
+    34,   -65,   100,   112,   113,   114,    87,   325,   205,   371,
+   120,   373,   374,   375,   170,   174,   175,   176,   197,   381,
+   201,   198,   279,   207,   -28,   -27,   -26,   -25,   255,   285,
+   305,   389,   390,   391,   392,   393,   394,   -31,   -32,   256,
+   286,   307,   310,   311,   399,   400,   401,   402,   299,   312,
+   313,   327,   314,   344,   299,   315,   316,   317,   318,   319,
+   323,   328,   385,   407,   332,   333,   334,   335,   299,   299,
+   336,   337,   345,   301,   302,   346,   370,   205,   372,   205,
+   205,   205,   376,   377,   352,   303,   355,   205,   347,   357,
+   309,   348,   369,   354,   436,   360,   361,   366,   378,   379,
+   409,   320,   321,   322,   380,   384,   410,   299,   411,   299,
+   413,   427,   417,   299,   419,   454,   455,   456,   281,   420,
+   421,   428,   299,   299,   299,   431,   425,   432,   433,   434,
+   205,   461,   462,   463,   464,   435,   465,   466,   467,   468,
+   441,   469,   470,   437,   220,   221,   438,   474,   426,   472,
+   439,   440,   443,   299,   299,   448,   451,   453,   471,   364,
+   475,   299,   220,   221,   459,   473,   477,   362,   478,   479,
+   299,   480,   481,   368,   482,   205,   483,   487,   493,   484,
+   494,   495,   485,   205,   205,   205,   486,   382,   383,   205,
+   491,   492,   500,   501,   502,   460,   507,   299,   504,   503,
+   508,   509,   511,   512,   516,   517,   161,   162,   163,   164,
+    55,    95,   203,   405,   103,   205,   404,   111,    25,    43,
+   416,   457,   430,     0,     0,     0,   412,     0,   414,    63,
+    64,   299,   418,   274,     0,     0,     0,     0,     0,     0,
+     0,   422,   423,   424,   299,     0,    18,     0,    19,     0,
+   257,   299,     0,     0,     0,   299,   299,     0,     0,     0,
+     0,     0,   258,   259,     0,     0,     0,     0,     0,     0,
+     0,     0,   444,   445,     0,     0,     0,     0,     0,     0,
+   452,     0,     0,     0,     0,     0,     0,     0,     0,   458,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,   132,   133,   134,   135,   136,   137,   138,   139,
+   140,   141,   142,   143,   144,   145,   476,     0,     0,     0,
+     0,   260,     0,   261,   262,   153,   154,     0,   263,   264,
+   265,     0,     0,     0,     0,     0,     0,     0,   266,     0,
+     0,   267,     0,   268,     0,     0,   269,     0,     0,     0,
+   496,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,   506,     0,     0,     0,     0,     0,     0,
+   510,     0,     0,     0,   513,   514,    63,    64,     0,   115,
+    66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
+    76,    77,    78,    18,     0,    19,    63,    64,     0,   115,
+   181,   182,   183,   184,   185,   186,   187,   188,   189,   190,
+   191,    77,    78,    18,     0,    19,     0,     0,     0,    79,
+     0,     0,     0,     0,   -34,     0,    18,     0,    19,     0,
+     0,     0,     0,     0,     0,     4,   -34,   -34,     0,    79,
+   287,   288,    63,    64,   289,   -34,   -34,   -34,   -34,   -34,
+   -34,   -34,     0,     0,   -34,    20,     0,     0,     0,    18,
+     0,    19,    21,   290,   291,   292,    22,     0,     0,     0,
+     0,     0,     0,     0,     0,   293,   294,     0,     0,     0,
+     0,     0,    80,     0,     0,    81,     0,     0,    82,     0,
+    83,   116,     0,     0,     0,     0,     0,     0,   295,     0,
+     0,     0,    80,     0,     0,    81,     0,     0,    82,     0,
+    83,   342,     0,     0,     0,   132,   133,   134,   135,   136,
+   137,   138,   139,   140,   141,   142,   143,   144,   145,     0,
+     0,     0,     0,     0,   260,     0,   261,   262,   153,   154,
+     0,   263,   264,   265,   287,   288,     0,     0,   289,     0,
+     0,     0,     0,     0,   296,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,   290,   291,   292,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,   293,
+   294,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,   295,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,   132,
+   133,   134,   135,   136,   137,   138,   139,   140,   141,   142,
+   143,   144,   145,     0,     0,     0,     0,     0,   260,     0,
+   261,   262,   153,   154,     0,   263,   264,   265,     0,     0,
+     0,     0,     0,     0,     0,     0,    63,    64,   296,   115,
+    66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
+    76,    77,    78,    18,     0,    19,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,   202,     0,
+     0,     0,     0,     0,     0,     0,     0,    63,    64,    79,
+   115,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+    75,    76,    77,    78,    18,     0,    19,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,   280,
+     0,     0,     0,     0,     0,     0,     0,     0,    63,    64,
+    79,   115,   181,   182,   183,   184,   185,   186,   187,   188,
+   189,   190,   191,    77,    78,    18,     0,    19,     0,     0,
+     0,     0,    80,     0,     0,    81,     0,     0,    82,     0,
+    83,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,    79,    63,    64,     0,   115,    66,    67,    68,    69,
+    70,    71,    72,    73,    74,    75,    76,    77,    78,    18,
+     0,    19,     0,    80,     0,     0,    81,     0,     0,    82,
+     0,    83,     0,     0,   356,     0,     0,     0,     0,     0,
+     0,     0,     0,    63,    64,    79,   115,    66,    67,    68,
+    69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
+    18,     0,    19,     0,    80,     0,     0,    81,     0,   338,
+    82,     0,    83,     0,     0,   403,     0,     0,     0,     0,
+     0,     0,     0,     0,    63,    64,    79,    65,    66,    67,
+    68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
+    78,    18,     0,    19,     0,     0,     0,     0,    80,     0,
+     0,    81,     0,     0,    82,     0,    83,     0,     0,     0,
+     0,     0,     0,     0,     0,    63,    64,    79,   115,    66,
+    67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+    77,    78,    18,     0,    19,     0,     0,     0,     0,    80,
+     0,     0,    81,     0,     0,    82,     0,    83,     0,     0,
+     0,     0,     0,     0,     0,     0,    63,    64,    79,   115,
+   181,   182,   183,   184,   185,   186,   187,   188,   189,   190,
+   191,    77,    78,    18,     0,    19,     0,     0,     0,     0,
+    80,     0,     0,    81,     0,     0,    82,     0,    83,     0,
+     0,     0,     0,     0,     0,     0,     0,    63,    64,    79,
+   208,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+    75,    76,    77,    78,    18,     0,    19,     0,     0,     0,
+     0,    80,     0,     0,    81,     0,     0,    82,     0,    83,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    79,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,    80,     0,     0,    81,     0,     0,    82,     0,
+    83,     0,     0,     0,     0,   122,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,   123,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,   124,
+   125,     0,     0,    80,     0,     0,    81,     0,     0,    82,
+     0,    83,   126,   127,   128,   129,   130,   131,   132,   133,
+   134,   135,   136,   137,   138,   139,   140,   141,   142,   143,
+   144,   145,   146,   147,   148,     0,     0,   149,   150,   151,
+   152,   153,   154,   155,   156,   157,   158,   159,   160
 };
 
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
-static const unsigned char yystos[] =
-{
-       0,   154,   155,   156,     0,    25,    31,    41,    42,    43,
-      44,    45,    46,    47,    62,   135,   173,   175,   177,   184,
-      22,    24,    51,    58,    62,   134,   166,   177,   178,    61,
-      64,    65,    66,    67,    68,    69,    70,   136,   171,    23,
-     185,   186,    30,   120,   174,   185,    52,    53,    54,    71,
-     163,   109,    61,    20,    45,    47,    50,   135,   109,    45,
-      47,   176,    24,   161,     4,     5,     6,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    48,   111,   114,   117,   119,   124,   143,   144,   145,
-     146,   147,   166,   181,    29,   119,   172,   134,   189,   109,
-     109,   109,   109,   114,   164,   161,   143,    32,    33,   153,
-     153,   153,   153,   171,     4,     4,     4,     8,   120,   147,
-     148,   166,   112,   121,    35,    49,    59,    60,    72,    73,
-      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
-      94,    97,    98,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,   126,   127,   128,   129,   187,   193,   194,
-     196,   197,    24,    55,    56,   162,     4,    24,    24,   165,
-     145,   145,   145,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,   130,   131,   133,   145,   150,   115,
-     115,   110,   120,   112,    37,   148,   149,   145,   183,    59,
-       8,   183,     9,    21,    10,    11,    12,    13,    14,    15,
-      16,    17,   130,   131,   132,   136,   145,   145,   183,   145,
-     145,   190,   183,   183,   183,   183,   183,   183,   183,   183,
-     145,   145,   145,   183,   136,    95,    96,   110,   116,   159,
-     160,   158,    27,    28,     3,     4,   125,     4,     7,    26,
-      38,    39,    97,    99,   100,   104,   105,   106,   114,   117,
-     119,   122,   126,   127,   128,   129,   151,   181,   157,   147,
-     147,   147,    37,   145,   168,   169,   170,   110,   113,     3,
-       4,     7,    26,    27,    28,    38,    39,    61,   117,   151,
-     180,   181,   182,   182,   182,   182,   143,   110,   138,   110,
-     138,   182,   114,   110,    36,   110,   110,   110,   110,   110,
-     110,   110,   182,   182,   182,   110,   143,   145,   183,    24,
-     110,   141,   141,   141,   112,   112,   112,   112,   112,   112,
-     116,   150,   152,   152,   120,   152,    24,   112,   112,   112,
-     112,   141,   116,   118,   166,   167,   110,   113,    37,    63,
-     179,   152,   110,   110,   182,    15,    57,    15,   110,   195,
-     182,   114,   145,   183,   145,   183,   183,   183,   145,   145,
-     110,   110,   110,   183,   182,   182,   110,    34,    57,   139,
-     142,   150,   150,   150,   150,   150,   150,   110,   116,   118,
-     120,   150,   150,   150,   150,    37,   168,   139,   140,    24,
-     118,    21,    21,   112,   182,     4,   182,   183,   191,   110,
-     182,   110,   110,   110,   182,   182,   182,   112,   145,    24,
-       4,   141,   195,    36,   110,   110,   110,   110,   150,   110,
-     110,   110,   110,    57,   137,   110,   182,   182,   191,   192,
-     110,   138,   138,   110,   182,   110,   183,   183,   183,   192,
-     182,   113,   145,   150,   150,   150,   150,   150,   150,   150,
-     150,     4,    24,   110,   114,   113,   183,   116,   182,   113,
-     113,   110,   113,   110,   110,   113,   113,   113,   113,    21,
-     116,   132,   188,    36,   116,   150,   150,   150,   182,   180,
-     116,   132,    21,   113,   113,   113,   110,   180,   182,    21,
-     110,    76,   182,    21,    21,   182,   182
+static const short yycheck[] = {    35,
+   128,   128,    51,   225,    23,     2,   248,   249,    29,   110,
+    34,    30,   129,   472,    61,    51,    15,    15,   118,   123,
+    83,   121,   126,    10,    11,    12,    13,    14,    15,    16,
+    17,   490,    23,    57,   276,   110,   110,   110,     9,   109,
+   267,   268,    39,   116,   148,   120,   120,   151,   152,   166,
+    21,   155,   156,   157,   158,   159,   160,   120,    57,    57,
+   164,    10,    11,    12,    13,    14,    15,    16,    17,   296,
+    20,   107,   108,   109,   489,    32,    33,   112,   116,   110,
+    52,    53,    54,   121,   499,   116,   121,   123,    85,   109,
+   126,    41,    42,    43,    44,    45,    46,    47,   119,    71,
+    50,   120,    10,    11,    12,    13,    14,    15,    16,    17,
+   146,   147,   148,   149,   150,   151,   152,     0,    61,   155,
+   156,   157,   158,   159,   160,   161,   162,   163,   164,   116,
+   110,    55,    56,   110,   197,   198,   199,    24,   118,   195,
+   244,   118,    25,    53,    54,    55,   388,     4,    31,   205,
+    45,    22,    47,    24,   210,   211,    95,    96,    41,    42,
+    43,    44,    45,    46,    47,   201,   222,   116,    27,    28,
+   114,   227,     3,     4,   223,     3,     4,     3,     4,    62,
+     3,     4,   238,   239,   240,     3,     4,   223,   109,   109,
+   412,   109,   414,   242,    64,    65,    66,    67,    68,    69,
+    70,   112,   109,     4,     4,     4,   242,   243,   244,   313,
+   112,   315,   316,   317,    24,     4,    24,    24,   115,   323,
+   112,   115,   285,    59,     4,     4,     4,     4,     4,   110,
+   110,   332,   333,   334,   335,   336,   337,     7,     7,     7,
+   113,   110,   114,   110,   345,   346,   347,   348,   304,    36,
+   110,    24,   110,    24,   310,   110,   110,   110,   110,   110,
+   110,   110,    34,    24,   112,   112,   112,   112,   324,   325,
+   112,   112,   112,   210,   211,   112,   312,   313,   314,   315,
+   316,   317,   318,   319,   281,   222,   113,   323,   112,    63,
+   227,   112,   114,   110,   395,   110,   110,   110,   110,   110,
+    21,   238,   239,   240,   110,   110,    21,   363,   112,   365,
+     4,    24,   110,   369,   110,   419,   420,   421,   354,   110,
+   110,     4,   378,   379,   380,    36,   112,   110,   110,   110,
+   366,   432,   433,   434,   435,   110,   437,   438,   439,   440,
+    57,     4,    24,   110,   472,   472,   110,   451,   384,   114,
+   110,   110,   110,   409,   410,   110,   110,   110,   110,    57,
+   116,   417,   490,   490,   113,   113,   113,   304,   113,   110,
+   426,   113,   110,   310,   110,   411,   113,    21,   479,   113,
+   481,   482,   113,   419,   420,   421,   113,   324,   325,   425,
+    36,   116,    21,   113,   113,   431,    21,   453,   110,   113,
+   110,    76,    21,    21,     0,     0,    95,    95,    95,    95,
+    23,    39,   120,   355,    50,   451,   354,    59,     2,    17,
+   366,   425,   389,    -1,    -1,    -1,   363,    -1,   365,     5,
+     6,   487,   369,   195,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,   378,   379,   380,   500,    -1,    22,    -1,    24,    -1,
+    26,   507,    -1,    -1,    -1,   511,   512,    -1,    -1,    -1,
+    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,   409,   410,    -1,    -1,    -1,    -1,    -1,    -1,
+   417,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   426,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    78,    79,    80,    81,    82,    83,    84,    85,
+    86,    87,    88,    89,    90,    91,   453,    -1,    -1,    -1,
+    -1,    97,    -1,    99,   100,   101,   102,    -1,   104,   105,
+   106,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   114,    -1,
+    -1,   117,    -1,   119,    -1,    -1,   122,    -1,    -1,    -1,
+   487,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,   500,    -1,    -1,    -1,    -1,    -1,    -1,
+   507,    -1,    -1,    -1,   511,   512,     5,     6,    -1,     8,
+     9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+    19,    20,    21,    22,    -1,    24,     5,     6,    -1,     8,
+     9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,    48,
+    -1,    -1,    -1,    -1,    20,    -1,    22,    -1,    24,    -1,
+    -1,    -1,    -1,    -1,    -1,    31,    32,    33,    -1,    48,
+     3,     4,     5,     6,     7,    41,    42,    43,    44,    45,
+    46,    47,    -1,    -1,    50,    51,    -1,    -1,    -1,    22,
+    -1,    24,    58,    26,    27,    28,    62,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    38,    39,    -1,    -1,    -1,
+    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,   117,    -1,
+   119,   120,    -1,    -1,    -1,    -1,    -1,    -1,    61,    -1,
+    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,   117,    -1,
+   119,   120,    -1,    -1,    -1,    78,    79,    80,    81,    82,
+    83,    84,    85,    86,    87,    88,    89,    90,    91,    -1,
+    -1,    -1,    -1,    -1,    97,    -1,    99,   100,   101,   102,
+    -1,   104,   105,   106,     3,     4,    -1,    -1,     7,    -1,
+    -1,    -1,    -1,    -1,   117,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    26,    27,    28,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    38,
+    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    61,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,
+    79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
+    89,    90,    91,    -1,    -1,    -1,    -1,    -1,    97,    -1,
+    99,   100,   101,   102,    -1,   104,   105,   106,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,   117,     8,
+     9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,    48,
+     8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+    18,    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,
+    48,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+    17,    18,    19,    20,    21,    22,    -1,    24,    -1,    -1,
+    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,   117,    -1,
+   119,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    48,     5,     6,    -1,     8,     9,    10,    11,    12,
+    13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+    -1,    24,    -1,   111,    -1,    -1,   114,    -1,    -1,   117,
+    -1,   119,    -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,     5,     6,    48,     8,     9,    10,    11,
+    12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+    22,    -1,    24,    -1,   111,    -1,    -1,   114,    -1,   116,
+   117,    -1,   119,    -1,    -1,    37,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,     5,     6,    48,     8,     9,    10,
+    11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+    21,    22,    -1,    24,    -1,    -1,    -1,    -1,   111,    -1,
+    -1,   114,    -1,    -1,   117,    -1,   119,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,     5,     6,    48,     8,     9,
+    10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+    20,    21,    22,    -1,    24,    -1,    -1,    -1,    -1,   111,
+    -1,    -1,   114,    -1,    -1,   117,    -1,   119,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,    48,     8,
+     9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,    -1,
+   111,    -1,    -1,   114,    -1,    -1,   117,    -1,   119,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,    48,
+     8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+    18,    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,
+    -1,   111,    -1,    -1,   114,    -1,    -1,   117,    -1,   119,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    48,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,   117,    -1,
+   119,    -1,    -1,    -1,    -1,    35,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    49,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    59,
+    60,    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,   117,
+    -1,   119,    72,    73,    74,    75,    76,    77,    78,    79,
+    80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+    90,    91,    92,    93,    94,    -1,    -1,    97,    98,    99,
+   100,   101,   102,   103,   104,   105,   106,   107,   108
 };
+/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
+#line 3 "/usr/share/bison.simple"
+/* This file comes from bison-1.28.  */
+
+/* Skeleton output parser for bison,
+   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
+
+/* This is the parser code that is written into each bison parser
+  when the %semantic_parser declaration is not specified in the grammar.
+  It was written by Richard Stallman by simplifying the hairy parser
+  used when %semantic_parser is specified.  */
+
+#ifndef YYSTACK_USE_ALLOCA
+#ifdef alloca
+#define YYSTACK_USE_ALLOCA
+#else /* alloca not defined */
+#ifdef __GNUC__
+#define YYSTACK_USE_ALLOCA
+#define alloca __builtin_alloca
+#else /* not GNU C.  */
+#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
+#define YYSTACK_USE_ALLOCA
+#include <alloca.h>
+#else /* not sparc */
+/* We think this test detects Watcom and Microsoft C.  */
+/* This used to test MSDOS, but that is a bad idea
+   since that symbol is in the user namespace.  */
+#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
+#if 0 /* No need for malloc.h, which pollutes the namespace;
+	 instead, just don't use alloca.  */
+#include <malloc.h>
+#endif
+#else /* not MSDOS, or __TURBOC__ */
+#if defined(_AIX)
+/* I don't know what this was needed for, but it pollutes the namespace.
+   So I turned it off.   rms, 2 May 1997.  */
+/* #include <malloc.h>  */
+ #pragma alloca
+#define YYSTACK_USE_ALLOCA
+#else /* not MSDOS, or __TURBOC__, or _AIX */
+#if 0
+#ifdef __hpux /* haible at ilog.fr says this works for HPUX 9.05 and up,
+		 and on HPUX 10.  Eventually we can turn this on.  */
+#define YYSTACK_USE_ALLOCA
+#define alloca __builtin_alloca
+#endif /* __hpux */
+#endif
+#endif /* not _AIX */
+#endif /* not MSDOS, or __TURBOC__ */
+#endif /* not sparc */
+#endif /* not GNU C */
+#endif /* alloca not defined */
+#endif /* YYSTACK_USE_ALLOCA not defined */
+
+#ifdef YYSTACK_USE_ALLOCA
+#define YYSTACK_ALLOC alloca
+#else
+#define YYSTACK_ALLOC malloc
+#endif
+
+/* Note: there must be only one dollar sign in this file.
+   It is replaced by the list of actions, each action
+   as one case of the switch.  */
 
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		(-2)
+#define YYEMPTY		-2
 #define YYEOF		0
-
 #define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
-
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
+#define YYABORT 	goto yyabortlab
+#define YYERROR		goto yyerrlab1
+/* Like YYERROR except do call yyerror.
+   This remains here temporarily to ease the
+   transition to the new meaning of YYERROR, for GCC.
    Once GCC version 2 has supplanted version 1, this can go.  */
-
 #define YYFAIL		goto yyerrlab
-
 #define YYRECOVERING()  (!!yyerrstatus)
-
-#define YYBACKUP(Token, Value)					\
+#define YYBACKUP(token, value) \
 do								\
   if (yychar == YYEMPTY && yylen == 1)				\
-    {								\
-      yychar = (Token);						\
-      yylval = (Value);						\
-      yytoken = YYTRANSLATE (yychar);				\
+    { yychar = (token), yylval = (value);			\
+      yychar1 = YYTRANSLATE (yychar);				\
       YYPOPSTACK;						\
       goto yybackup;						\
     }								\
   else								\
-    {								\
-      yyerror (YY_("syntax error: cannot back up")); \
-      YYERROR;							\
-    }								\
+    { yyerror ("syntax error: cannot back up"); YYERROR; }	\
 while (0)
 
-
 #define YYTERROR	1
 #define YYERRCODE	256
 
-
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
-   If N is 0, then set CURRENT to the empty location which ends
-   the previous symbol: RHS[0] (always defined).  */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)				\
-    do									\
-      if (N)								\
-	{								\
-	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
-	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
-	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
-	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
-	}								\
-      else								\
-	{								\
-	  (Current).first_line   = (Current).last_line   =		\
-	    YYRHSLOC (Rhs, 0).last_line;				\
-	  (Current).first_column = (Current).last_column =		\
-	    YYRHSLOC (Rhs, 0).last_column;				\
-	}								\
-    while (0)
+#ifndef YYPURE
+#define YYLEX		yylex()
 #endif
 
-
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
-
-#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)			\
-     fprintf (File, "%d.%d-%d.%d",			\
-              (Loc).first_line, (Loc).first_column,	\
-              (Loc).last_line,  (Loc).last_column)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
+#ifdef YYPURE
+#ifdef YYLSP_NEEDED
+#ifdef YYLEX_PARAM
+#define YYLEX		yylex(&yylval, &yylloc, YYLEX_PARAM)
+#else
+#define YYLEX		yylex(&yylval, &yylloc)
 #endif
-
-
-/* YYLEX -- calling `yylex' with the right arguments.  */
-
+#else /* not YYLSP_NEEDED */
 #ifdef YYLEX_PARAM
-# define YYLEX yylex (YYLEX_PARAM)
+#define YYLEX		yylex(&yylval, YYLEX_PARAM)
 #else
-# define YYLEX yylex ()
+#define YYLEX		yylex(&yylval)
+#endif
+#endif /* not YYLSP_NEEDED */
 #endif
 
-/* Enable debugging if requested.  */
-#if YYDEBUG
+/* If nonreentrant, generate the variables here */
 
-# ifndef YYFPRINTF
-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYFPRINTF fprintf
-# endif
-
-# define YYDPRINTF(Args)			\
-do {						\
-  if (yydebug)					\
-    YYFPRINTF Args;				\
-} while (0)
-
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)		\
-do {								\
-  if (yydebug)							\
-    {								\
-      YYFPRINTF (stderr, "%s ", Title);				\
-      yysymprint (stderr,					\
-                  Type, Value);	\
-      YYFPRINTF (stderr, "\n");					\
-    }								\
-} while (0)
+#ifndef YYPURE
 
-/*------------------------------------------------------------------.
-| yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included).                                                   |
-`------------------------------------------------------------------*/
+int	yychar;			/*  the lookahead symbol		*/
+YYSTYPE	yylval;			/*  the semantic value of the		*/
+				/*  lookahead symbol			*/
 
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yy_stack_print (short int *bottom, short int *top)
-#else
-static void
-yy_stack_print (bottom, top)
-    short int *bottom;
-    short int *top;
+#ifdef YYLSP_NEEDED
+YYLTYPE yylloc;			/*  location data for the lookahead	*/
+				/*  symbol				*/
 #endif
-{
-  YYFPRINTF (stderr, "Stack now");
-  for (/* Nothing. */; bottom <= top; ++bottom)
-    YYFPRINTF (stderr, " %d", *bottom);
-  YYFPRINTF (stderr, "\n");
-}
-
-# define YY_STACK_PRINT(Bottom, Top)				\
-do {								\
-  if (yydebug)							\
-    yy_stack_print ((Bottom), (Top));				\
-} while (0)
 
+int yynerrs;			/*  number of parse errors so far       */
+#endif  /* not YYPURE */
 
-/*------------------------------------------------.
-| Report that the YYRULE is going to be reduced.  |
-`------------------------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yy_reduce_print (int yyrule)
-#else
-static void
-yy_reduce_print (yyrule)
-    int yyrule;
+#if YYDEBUG != 0
+int yydebug;			/*  nonzero means print parse trace	*/
+/* Since this is uninitialized, it does not stop multiple parsers
+   from coexisting.  */
 #endif
-{
-  int yyi;
-  unsigned long int yylno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ",
-             yyrule - 1, yylno);
-  /* Print the symbols being reduced, and their result.  */
-  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
-    YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
-  YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyrule]]);
-}
 
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
-  if (yydebug)				\
-    yy_reduce_print (Rule);		\
-} while (0)
-
-/* Nonzero means print parse trace.  It is left uninitialized so that
-   multiple parsers can coexist.  */
-int yydebug;
-#else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-# define YY_STACK_PRINT(Bottom, Top)
-# define YY_REDUCE_PRINT(Rule)
-#endif /* !YYDEBUG */
+/*  YYINITDEPTH indicates the initial size of the parser's stacks	*/
 
-
-/* YYINITDEPTH -- initial size of the parser's stacks.  */
 #ifndef	YYINITDEPTH
-# define YYINITDEPTH 200
+#define YYINITDEPTH 200
 #endif
 
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
-   if the built-in stack extension method is used).
+/*  YYMAXDEPTH is the maximum size the stacks can grow to
+    (effective only if the built-in stack extension method is used).  */
 
-   Do not make this value too large; the results are undefined if
-   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
-   evaluated with infinite-precision integer arithmetic.  */
+#if YYMAXDEPTH == 0
+#undef YYMAXDEPTH
+#endif
 
 #ifndef YYMAXDEPTH
-# define YYMAXDEPTH 10000
+#define YYMAXDEPTH 10000
 #endif
-
 
+/* Define __yy_memcpy.  Note that the size argument
+   should be passed with type unsigned int, because that is what the non-GCC
+   definitions require.  With GCC, __builtin_memcpy takes an arg
+   of type size_t, but it can handle unsigned int.  */
+
+#if __GNUC__ > 1		/* GNU C and GNU C++ define this.  */
+#define __yy_memcpy(TO,FROM,COUNT)	__builtin_memcpy(TO,FROM,COUNT)
+#else				/* not GNU C or C++ */
+#ifndef __cplusplus
 
-#if YYERROR_VERBOSE
-
-# ifndef yystrlen
-#  if defined (__GLIBC__) && defined (_STRING_H)
-#   define yystrlen strlen
-#  else
-/* Return the length of YYSTR.  */
-static YYSIZE_T
-#   if defined (__STDC__) || defined (__cplusplus)
-yystrlen (const char *yystr)
-#   else
-yystrlen (yystr)
-     const char *yystr;
-#   endif
-{
-  const char *yys = yystr;
-
-  while (*yys++ != '\0')
-    continue;
-
-  return yys - yystr - 1;
-}
-#  endif
-# endif
-
-# ifndef yystpcpy
-#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
-#   define yystpcpy stpcpy
-#  else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-static char *
-#   if defined (__STDC__) || defined (__cplusplus)
-yystpcpy (char *yydest, const char *yysrc)
-#   else
-yystpcpy (yydest, yysrc)
-     char *yydest;
-     const char *yysrc;
-#   endif
-{
-  char *yyd = yydest;
-  const char *yys = yysrc;
-
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
-
-  return yyd - 1;
-}
-#  endif
-# endif
-
-# ifndef yytnamerr
-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
-   quotes and backslashes, so that it's suitable for yyerror.  The
-   heuristic is that double-quoting is unnecessary unless the string
-   contains an apostrophe, a comma, or backslash (other than
-   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
-   null, do not copy; instead, return the length of what the result
-   would have been.  */
-static YYSIZE_T
-yytnamerr (char *yyres, const char *yystr)
+/* This is the most reliable way to avoid incompatibilities
+   in available built-in functions on various systems.  */
+static void
+__yy_memcpy (to, from, count)
+     char *to;
+     char *from;
+     unsigned int count;
 {
-  if (*yystr == '"')
-    {
-      size_t yyn = 0;
-      char const *yyp = yystr;
-
-      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: ;
-    }
+  register char *f = from;
+  register char *t = to;
+  register int i = count;
 
-  if (! yyres)
-    return yystrlen (yystr);
-
-  return yystpcpy (yyres, yystr) - yyres;
+  while (i-- > 0)
+    *t++ = *f++;
 }
-# endif
-
-#endif /* YYERROR_VERBOSE */
-
-
 
-#if YYDEBUG
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+#else /* __cplusplus */
 
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
-#else
+/* This is the most reliable way to avoid incompatibilities
+   in available built-in functions on various systems.  */
 static void
-yysymprint (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
+__yy_memcpy (char *to, char *from, unsigned int count)
 {
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
+  register char *t = to;
+  register char *f = from;
+  register int i = count;
 
-  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, ")");
+  while (i-- > 0)
+    *t++ = *f++;
 }
 
-#endif /* ! YYDEBUG */
-/*-----------------------------------------------.
-| Release the memory associated to this symbol.  |
-`-----------------------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
-    const char *yymsg;
-    int yytype;
-    YYSTYPE *yyvaluep;
 #endif
-{
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
-
-  if (!yymsg)
-    yymsg = "Deleting";
-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
-  switch (yytype)
-    {
-
-      default:
-        break;
-    }
-}
+#endif
 
+#line 217 "/usr/share/bison.simple"
 
-/* Prevent warnings from -Wmissing-prototypes.  */
+/* The user can define YYPARSE_PARAM as the name of an argument to be passed
+   into yyparse.  The argument should have type void *.
+   It should actually point to an object.
+   Grammar actions can access the variable by casting it
+   to the proper pointer type.  */
 
 #ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM);
-# else
-int yyparse ();
-# endif
-#else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
-
-
-/* The look-ahead symbol.  */
-int yychar;
-
-/* The semantic value of the look-ahead symbol.  */
-YYSTYPE yylval;
-
-/* Number of syntax errors so far.  */
-int yynerrs;
-
-
-
-/*----------.
-| yyparse.  |
-`----------*/
+#ifdef __cplusplus
+#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
+#define YYPARSE_PARAM_DECL
+#else /* not __cplusplus */
+#define YYPARSE_PARAM_ARG YYPARSE_PARAM
+#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
+#endif /* not __cplusplus */
+#else /* not YYPARSE_PARAM */
+#define YYPARSE_PARAM_ARG
+#define YYPARSE_PARAM_DECL
+#endif /* not YYPARSE_PARAM */
 
+/* Prevent warning if -Wstrict-prototypes.  */
+#ifdef __GNUC__
 #ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM)
-# else
-int yyparse (YYPARSE_PARAM)
-  void *YYPARSE_PARAM;
-# endif
-#else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
-int
-yyparse (void)
+int yyparse (void *);
 #else
-int
-yyparse ()
-
+int yyparse (void);
 #endif
 #endif
-{
-  
-  int yystate;
-  int yyn;
-  int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Look-ahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-
-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
-
-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
-
-  /* The state stack.  */
-  short int yyssa[YYINITDEPTH];
-  short int *yyss = yyssa;
-  short int *yyssp;
-
-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  YYSTYPE *yyvsp;
-
 
+int
+yyparse(YYPARSE_PARAM_ARG)
+     YYPARSE_PARAM_DECL
+{
+  register int yystate;
+  register int yyn;
+  register short *yyssp;
+  register YYSTYPE *yyvsp;
+  int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
+  int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
+
+  short	yyssa[YYINITDEPTH];	/*  the state stack			*/
+  YYSTYPE yyvsa[YYINITDEPTH];	/*  the semantic value stack		*/
+
+  short *yyss = yyssa;		/*  refer to the stacks thru separate pointers */
+  YYSTYPE *yyvs = yyvsa;	/*  to allow yyoverflow to reallocate them elsewhere */
+
+#ifdef YYLSP_NEEDED
+  YYLTYPE yylsa[YYINITDEPTH];	/*  the location stack			*/
+  YYLTYPE *yyls = yylsa;
+  YYLTYPE *yylsp;
 
+#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
+#else
 #define YYPOPSTACK   (yyvsp--, yyssp--)
+#endif
 
-  YYSIZE_T yystacksize = YYINITDEPTH;
+  int yystacksize = YYINITDEPTH;
+  int yyfree_stacks = 0;
 
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
+#ifdef YYPURE
+  int yychar;
+  YYSTYPE yylval;
+  int yynerrs;
+#ifdef YYLSP_NEEDED
+  YYLTYPE yylloc;
+#endif
+#endif
 
+  YYSTYPE yyval;		/*  the variable used to return		*/
+				/*  semantic values from the action	*/
+				/*  routines				*/
 
-  /* When reducing, the number of symbols on the RHS of the reduced
-     rule.  */
   int yylen;
 
-  YYDPRINTF ((stderr, "Starting parse\n"));
+#if YYDEBUG != 0
+  if (yydebug)
+    fprintf(stderr, "Starting parse\n");
+#endif
 
   yystate = 0;
   yyerrstatus = 0;
@@ -2766,749 +2126,742 @@
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
 
-  yyssp = yyss;
+  yyssp = yyss - 1;
   yyvsp = yyvs;
+#ifdef YYLSP_NEEDED
+  yylsp = yyls;
+#endif
 
-  goto yysetstate;
-
-/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
-`------------------------------------------------------------*/
- yynewstate:
-  /* In all cases, when you get here, the value and location stacks
-     have just been pushed. so pushing a state here evens the stacks.
-     */
-  yyssp++;
-
- yysetstate:
-  *yyssp = yystate;
+/* Push a new state, which is found in  yystate  .  */
+/* In all cases, when you get here, the value and location stacks
+   have just been pushed. so pushing a state here evens the stacks.  */
+yynewstate:
+
+  *++yyssp = yystate;
+
+  if (yyssp >= yyss + yystacksize - 1)
+    {
+      /* Give user a chance to reallocate the stack */
+      /* Use copies of these so that the &'s don't force the real ones into memory. */
+      YYSTYPE *yyvs1 = yyvs;
+      short *yyss1 = yyss;
+#ifdef YYLSP_NEEDED
+      YYLTYPE *yyls1 = yyls;
+#endif
 
-  if (yyss + yystacksize - 1 <= yyssp)
-    {
       /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
+      int size = yyssp - yyss + 1;
 
 #ifdef yyoverflow
-      {
-	/* Give user a chance to reallocate the stack. Use copies of
-	   these so that the &'s don't force the real ones into
-	   memory.  */
-	YYSTYPE *yyvs1 = yyvs;
-	short int *yyss1 = yyss;
-
-
-	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  This used to be a
-	   conditional around just the two extra args, but that might
-	   be undefined if yyoverflow is a macro.  */
-	yyoverflow (YY_("memory exhausted"),
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-
-		    &yystacksize);
+      /* Each stack pointer address is followed by the size of
+	 the data in use in that stack, in bytes.  */
+#ifdef YYLSP_NEEDED
+      /* This used to be a conditional around just the two extra args,
+	 but that might be undefined if yyoverflow is a macro.  */
+      yyoverflow("parser stack overflow",
+		 &yyss1, size * sizeof (*yyssp),
+		 &yyvs1, size * sizeof (*yyvsp),
+		 &yyls1, size * sizeof (*yylsp),
+		 &yystacksize);
+#else
+      yyoverflow("parser stack overflow",
+		 &yyss1, size * sizeof (*yyssp),
+		 &yyvs1, size * sizeof (*yyvsp),
+		 &yystacksize);
+#endif
 
-	yyss = yyss1;
-	yyvs = yyvs1;
-      }
+      yyss = yyss1; yyvs = yyvs1;
+#ifdef YYLSP_NEEDED
+      yyls = yyls1;
+#endif
 #else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
-      goto yyexhaustedlab;
-# else
       /* Extend the stack our own way.  */
-      if (YYMAXDEPTH <= yystacksize)
-	goto yyexhaustedlab;
+      if (yystacksize >= YYMAXDEPTH)
+	{
+	  yyerror("parser stack overflow");
+	  if (yyfree_stacks)
+	    {
+	      free (yyss);
+	      free (yyvs);
+#ifdef YYLSP_NEEDED
+	      free (yyls);
+#endif
+	    }
+	  return 2;
+	}
       yystacksize *= 2;
-      if (YYMAXDEPTH < yystacksize)
+      if (yystacksize > YYMAXDEPTH)
 	yystacksize = YYMAXDEPTH;
-
-      {
-	short int *yyss1 = yyss;
-	union yyalloc *yyptr =
-	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-	if (! yyptr)
-	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss);
-	YYSTACK_RELOCATE (yyvs);
-
-#  undef YYSTACK_RELOCATE
-	if (yyss1 != yyssa)
-	  YYSTACK_FREE (yyss1);
-      }
-# endif
+#ifndef YYSTACK_USE_ALLOCA
+      yyfree_stacks = 1;
+#endif
+      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
+      __yy_memcpy ((char *)yyss, (char *)yyss1,
+		   size * (unsigned int) sizeof (*yyssp));
+      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
+      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
+		   size * (unsigned int) sizeof (*yyvsp));
+#ifdef YYLSP_NEEDED
+      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
+      __yy_memcpy ((char *)yyls, (char *)yyls1,
+		   size * (unsigned int) sizeof (*yylsp));
+#endif
 #endif /* no yyoverflow */
 
-      yyssp = yyss + yysize - 1;
-      yyvsp = yyvs + yysize - 1;
-
+      yyssp = yyss + size - 1;
+      yyvsp = yyvs + size - 1;
+#ifdef YYLSP_NEEDED
+      yylsp = yyls + size - 1;
+#endif
 
-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-		  (unsigned long int) yystacksize));
+#if YYDEBUG != 0
+      if (yydebug)
+	fprintf(stderr, "Stack size increased to %d\n", yystacksize);
+#endif
 
-      if (yyss + yystacksize - 1 <= yyssp)
+      if (yyssp >= yyss + yystacksize - 1)
 	YYABORT;
     }
 
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+#if YYDEBUG != 0
+  if (yydebug)
+    fprintf(stderr, "Entering state %d\n", yystate);
+#endif
 
   goto yybackup;
-
-/*-----------.
-| yybackup.  |
-`-----------*/
-yybackup:
+ yybackup:
 
 /* Do appropriate processing given the current state.  */
-/* Read a look-ahead token if we need one and don't already have one.  */
+/* Read a lookahead token if we need one and don't already have one.  */
 /* yyresume: */
 
-  /* First try to decide what to do without reference to look-ahead token.  */
+  /* First try to decide what to do without reference to lookahead token.  */
 
   yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
+  if (yyn == YYFLAG)
     goto yydefault;
 
-  /* Not known => get a look-ahead token if don't already have one.  */
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* yychar is either YYEMPTY or YYEOF
+     or a valid token in external form.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
-      YYDPRINTF ((stderr, "Reading a token: "));
+#if YYDEBUG != 0
+      if (yydebug)
+	fprintf(stderr, "Reading a token: ");
+#endif
       yychar = YYLEX;
     }
 
-  if (yychar <= YYEOF)
+  /* Convert token to internal form (in yychar1) for indexing tables with */
+
+  if (yychar <= 0)		/* This means end of input. */
     {
-      yychar = yytoken = YYEOF;
-      YYDPRINTF ((stderr, "Now at end of input.\n"));
+      yychar1 = 0;
+      yychar = YYEOF;		/* Don't call YYLEX any more */
+
+#if YYDEBUG != 0
+      if (yydebug)
+	fprintf(stderr, "Now at end of input.\n");
+#endif
     }
   else
     {
-      yytoken = YYTRANSLATE (yychar);
-      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+      yychar1 = YYTRANSLATE(yychar);
+
+#if YYDEBUG != 0
+      if (yydebug)
+	{
+	  fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
+	  /* Give the individual parser a way to print the precise meaning
+	     of a token, for further debugging info.  */
+#ifdef YYPRINT
+	  YYPRINT (stderr, yychar, yylval);
+#endif
+	  fprintf (stderr, ")\n");
+	}
+#endif
     }
 
-  /* If the proper action on seeing token YYTOKEN is to reduce or to
-     detect an error, take that action.  */
-  yyn += yytoken;
-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+  yyn += yychar1;
+  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
     goto yydefault;
+
   yyn = yytable[yyn];
-  if (yyn <= 0)
+
+  /* yyn is what to do for this token type in this state.
+     Negative => reduce, -yyn is rule number.
+     Positive => shift, yyn is new state.
+       New state is final state => don't bother to shift,
+       just return success.
+     0, or most negative number => error.  */
+
+  if (yyn < 0)
     {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
+      if (yyn == YYFLAG)
 	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
+  else if (yyn == 0)
+    goto yyerrlab;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  /* Shift the look-ahead token.  */
-  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+  /* Shift the lookahead token.  */
+
+#if YYDEBUG != 0
+  if (yydebug)
+    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
+#endif
 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
     yychar = YYEMPTY;
 
   *++yyvsp = yylval;
+#ifdef YYLSP_NEEDED
+  *++yylsp = yylloc;
+#endif
 
-
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
+  /* count tokens shifted since error; after three, turn off error status.  */
+  if (yyerrstatus) yyerrstatus--;
 
   yystate = yyn;
   goto yynewstate;
 
-
-/*-----------------------------------------------------------.
-| yydefault -- do the default action for the current state.  |
-`-----------------------------------------------------------*/
+/* Do the default action for the current state.  */
 yydefault:
+
   yyn = yydefact[yystate];
   if (yyn == 0)
     goto yyerrlab;
-  goto yyreduce;
 
-
-/*-----------------------------.
-| yyreduce -- Do a reduction.  |
-`-----------------------------*/
+/* Do a reduction.  yyn is the number of a rule to reduce with.  */
 yyreduce:
-  /* yyn is the number of a rule to reduce with.  */
   yylen = yyr2[yyn];
+  if (yylen > 0)
+    yyval = yyvsp[1-yylen]; /* implement default value of the action */
+
+#if YYDEBUG != 0
+  if (yydebug)
+    {
+      int i;
 
-  /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
+      fprintf (stderr, "Reducing via rule %d (line %d), ",
+	       yyn, yyrline[yyn]);
 
-     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];
+      /* 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
 
 
-  YY_REDUCE_PRINT (yyn);
-  switch (yyn)
-    {
-        case 3:
-#line 1098 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-  if ((yyvsp[0].UIntVal) > (uint32_t)INT32_MAX)     // Outside of my range!
+  switch (yyn) {
+
+case 2:
+#line 1098 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+  if (yyvsp[0].UIntVal > (uint32_t)INT32_MAX)     // Outside of my range!
     GEN_ERROR("Value too large for type!");
-  (yyval.SIntVal) = (int32_t)(yyvsp[0].UIntVal);
+  yyval.SIntVal = (int32_t)yyvsp[0].UIntVal;
   CHECK_FOR_ERROR
-;}
-    break;
-
-  case 5:
-#line 1107 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-  if ((yyvsp[0].UInt64Val) > (uint64_t)INT64_MAX)     // Outside of my range!
+;
+    break;}
+case 4:
+#line 1107 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+  if (yyvsp[0].UInt64Val > (uint64_t)INT64_MAX)     // Outside of my range!
     GEN_ERROR("Value too large for type!");
-  (yyval.SInt64Val) = (int64_t)(yyvsp[0].UInt64Val);
+  yyval.SInt64Val = (int64_t)yyvsp[0].UInt64Val;
   CHECK_FOR_ERROR
-;}
-    break;
-
-  case 34:
-#line 1131 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.StrVal) = (yyvsp[-1].StrVal);
+;
+    break;}
+case 33:
+#line 1131 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.StrVal = yyvsp[-1].StrVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 35:
-#line 1135 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.StrVal) = 0;
+  ;
+    break;}
+case 34:
+#line 1135 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.StrVal = 0;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 36:
-#line 1140 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
-    break;
-
-  case 37:
-#line 1141 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
-    break;
-
-  case 38:
-#line 1142 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
-    break;
-
-  case 39:
-#line 1143 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
-    break;
-
-  case 40:
-#line 1144 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
-    break;
-
-  case 41:
-#line 1145 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
-    break;
-
-  case 42:
-#line 1146 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
-    break;
-
-  case 43:
-#line 1147 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
-    break;
-
-  case 44:
-#line 1149 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = CallingConv::C; ;}
-    break;
-
-  case 45:
-#line 1150 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = CallingConv::C; ;}
-    break;
-
-  case 46:
-#line 1151 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = CallingConv::CSRet; ;}
-    break;
-
-  case 47:
-#line 1152 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = CallingConv::Fast; ;}
-    break;
-
-  case 48:
-#line 1153 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = CallingConv::Cold; ;}
-    break;
-
-  case 49:
-#line 1154 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = CallingConv::X86_StdCall; ;}
-    break;
-
-  case 50:
-#line 1155 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = CallingConv::X86_FastCall; ;}
-    break;
-
-  case 51:
-#line 1156 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-                   if ((unsigned)(yyvsp[0].UInt64Val) != (yyvsp[0].UInt64Val))
+  ;
+    break;}
+case 35:
+#line 1140 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::InternalLinkage; ;
+    break;}
+case 36:
+#line 1141 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::LinkOnceLinkage; ;
+    break;}
+case 37:
+#line 1142 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::WeakLinkage; ;
+    break;}
+case 38:
+#line 1143 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::AppendingLinkage; ;
+    break;}
+case 39:
+#line 1144 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::DLLImportLinkage; ;
+    break;}
+case 40:
+#line 1145 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::DLLExportLinkage; ;
+    break;}
+case 41:
+#line 1146 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::ExternalWeakLinkage; ;
+    break;}
+case 42:
+#line 1147 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Linkage = GlobalValue::ExternalLinkage; ;
+    break;}
+case 43:
+#line 1149 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.UIntVal = CallingConv::C; ;
+    break;}
+case 44:
+#line 1150 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.UIntVal = CallingConv::C; ;
+    break;}
+case 45:
+#line 1151 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.UIntVal = CallingConv::CSRet; ;
+    break;}
+case 46:
+#line 1152 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.UIntVal = CallingConv::Fast; ;
+    break;}
+case 47:
+#line 1153 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.UIntVal = CallingConv::Cold; ;
+    break;}
+case 48:
+#line 1154 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.UIntVal = CallingConv::X86_StdCall; ;
+    break;}
+case 49:
+#line 1155 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.UIntVal = CallingConv::X86_FastCall; ;
+    break;}
+case 50:
+#line 1156 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+                   if ((unsigned)yyvsp[0].UInt64Val != yyvsp[0].UInt64Val)
                      GEN_ERROR("Calling conv too large!");
-                   (yyval.UIntVal) = (yyvsp[0].UInt64Val);
+                   yyval.UIntVal = yyvsp[0].UInt64Val;
                   CHECK_FOR_ERROR
-                 ;}
-    break;
-
-  case 52:
-#line 1165 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = 0; ;}
-    break;
-
-  case 53:
-#line 1166 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-  (yyval.UIntVal) = (yyvsp[0].UInt64Val);
-  if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
+                 ;
+    break;}
+case 51:
+#line 1165 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.UIntVal = 0; ;
+    break;}
+case 52:
+#line 1166 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+  yyval.UIntVal = yyvsp[0].UInt64Val;
+  if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal))
     GEN_ERROR("Alignment must be a power of two!");
   CHECK_FOR_ERROR
-;}
-    break;
-
-  case 54:
-#line 1172 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = 0; ;}
-    break;
-
-  case 55:
-#line 1173 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-  (yyval.UIntVal) = (yyvsp[0].UInt64Val);
-  if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
+;
+    break;}
+case 53:
+#line 1172 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.UIntVal = 0; ;
+    break;}
+case 54:
+#line 1173 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+  yyval.UIntVal = yyvsp[0].UInt64Val;
+  if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal))
     GEN_ERROR("Alignment must be a power of two!");
   CHECK_FOR_ERROR
-;}
-    break;
-
-  case 56:
-#line 1181 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-  for (unsigned i = 0, e = strlen((yyvsp[0].StrVal)); i != e; ++i)
-    if ((yyvsp[0].StrVal)[i] == '"' || (yyvsp[0].StrVal)[i] == '\\')
+;
+    break;}
+case 55:
+#line 1181 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+  for (unsigned i = 0, e = strlen(yyvsp[0].StrVal); 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 57:
-#line 1189 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.StrVal) = 0; ;}
-    break;
-
-  case 58:
-#line 1190 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.StrVal) = (yyvsp[0].StrVal); ;}
-    break;
-
-  case 59:
-#line 1195 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {;}
-    break;
-
-  case 60:
-#line 1196 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {;}
-    break;
-
-  case 61:
-#line 1197 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    CurGV->setSection((yyvsp[0].StrVal));
-    free((yyvsp[0].StrVal));
+;
+    break;}
+case 56:
+#line 1189 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.StrVal = 0; ;
+    break;}
+case 57:
+#line 1190 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.StrVal = yyvsp[0].StrVal; ;
+    break;}
+case 58:
+#line 1195 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{;
+    break;}
+case 59:
+#line 1196 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{;
+    break;}
+case 60:
+#line 1197 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    CurGV->setSection(yyvsp[0].StrVal);
+    free(yyvsp[0].StrVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 62:
-#line 1202 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if ((yyvsp[0].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[0].UInt64Val)))
+  ;
+    break;}
+case 61:
+#line 1202 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (yyvsp[0].UInt64Val != 0 && !isPowerOf2_32(yyvsp[0].UInt64Val))
       GEN_ERROR("Alignment must be a power of two!");
-    CurGV->setAlignment((yyvsp[0].UInt64Val));
+    CurGV->setAlignment(yyvsp[0].UInt64Val);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 64:
-#line 1216 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType)); ;}
-    break;
-
-  case 66:
-#line 1217 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType)); ;}
-    break;
-
-  case 67:
-#line 1219 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 63:
+#line 1216 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.TypeVal = new PATypeHolder(yyvsp[0].PrimType); ;
+    break;}
+case 65:
+#line 1217 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.TypeVal = new PATypeHolder(yyvsp[0].PrimType); ;
+    break;}
+case 66:
+#line 1219 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
-    (yyval.TypeVal) = (yyvsp[0].TypeVal);
+      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
+    yyval.TypeVal = yyvsp[0].TypeVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 81:
-#line 1231 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
+  ;
+    break;}
+case 80:
+#line 1231 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.TypeVal = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 82:
-#line 1235 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType));
+  ;
+    break;}
+case 81:
+#line 1235 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.TypeVal = new PATypeHolder(yyvsp[0].PrimType);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 83:
-#line 1239 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {            // Named types are also simple types...
-  const Type* tmp = getTypeVal((yyvsp[0].ValIDVal));
+  ;
+    break;}
+case 82:
+#line 1239 "/Users/sabre/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 84:
-#line 1247 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {                   // Type UpReference
-    if ((yyvsp[0].UInt64Val) > (uint64_t)~0U) GEN_ERROR("Value out of range!");
+  yyval.TypeVal = new PATypeHolder(tmp);
+;
+    break;}
+case 83:
+#line 1247 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                   // Type UpReference
+    if (yyvsp[0].UInt64Val > (uint64_t)~0U) GEN_ERROR("Value out of range!");
     OpaqueType *OT = OpaqueType::get();        // Use temporary placeholder
-    UpRefs.push_back(UpRefRecord((unsigned)(yyvsp[0].UInt64Val), OT));  // Add to vector...
-    (yyval.TypeVal) = new PATypeHolder(OT);
+    UpRefs.push_back(UpRefRecord((unsigned)yyvsp[0].UInt64Val, OT));  // Add to vector...
+    yyval.TypeVal = new PATypeHolder(OT);
     UR_OUT("New Upreference!\n");
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 85:
-#line 1255 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {           // Function derived type?
+  ;
+    break;}
+case 84:
+#line 1255 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{           // Function derived type?
     std::vector<const Type*> Params;
-    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)
       Params.push_back(*I);
     bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
     if (isVarArg) Params.pop_back();
 
-    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(FunctionType::get(*(yyvsp[-3].TypeVal),Params,isVarArg)));
-    delete (yyvsp[-1].TypeList);      // Delete the argument list
-    delete (yyvsp[-3].TypeVal);      // Delete the return type handle
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 86:
-#line 1268 "/proj/llvm/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 87:
-#line 1273 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {          // Packed array type?
-     const llvm::Type* ElemTy = (yyvsp[-1].TypeVal)->get();
-     if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val))
+    yyval.TypeVal = new PATypeHolder(HandleUpRefs(FunctionType::get(*yyvsp[-3].TypeVal,Params,isVarArg)));
+    delete yyvsp[-1].TypeList;      // Delete the argument list
+    delete yyvsp[-3].TypeVal;      // Delete the return type handle
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 85:
+#line 1268 "/Users/sabre/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 86:
+#line 1273 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{          // Packed array 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->isPrimitiveType())
         GEN_ERROR("Elemental type of a PackedType 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(PackedType::get(*(yyvsp[-1].TypeVal), (unsigned)(yyvsp[-3].UInt64Val))));
-     delete (yyvsp[-1].TypeVal);
+     yyval.TypeVal = new PATypeHolder(HandleUpRefs(PackedType::get(*yyvsp[-1].TypeVal, (unsigned)yyvsp[-3].UInt64Val)));
+     delete yyvsp[-1].TypeVal;
      CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 88:
-#line 1285 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {                        // Structure type?
+  ;
+    break;}
+case 87:
+#line 1285 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                        // Structure type?
     std::vector<const Type*> Elements;
-    for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-1].TypeList)->begin(),
-           E = (yyvsp[-1].TypeList)->end(); I != E; ++I)
+    for (std::list<llvm::PATypeHolder>::iterator I = yyvsp[-1].TypeList->begin(),
+           E = yyvsp[-1].TypeList->end(); I != E; ++I)
       Elements.push_back(*I);
 
-    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(StructType::get(Elements)));
-    delete (yyvsp[-1].TypeList);
+    yyval.TypeVal = new PATypeHolder(HandleUpRefs(StructType::get(Elements)));
+    delete yyvsp[-1].TypeList;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 89:
-#line 1295 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {                                  // Empty structure type?
-    (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 90:
-#line 1299 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {                             // Pointer type?
-    if (*(yyvsp[-1].TypeVal) == Type::LabelTy)
+  ;
+    break;}
+case 88:
+#line 1295 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                                  // Empty structure type?
+    yyval.TypeVal = new PATypeHolder(StructType::get(std::vector<const Type*>()));
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 89:
+#line 1299 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                             // Pointer type?
+    if (*yyvsp[-1].TypeVal == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
-    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(PointerType::get(*(yyvsp[-1].TypeVal))));
-    delete (yyvsp[-1].TypeVal);
+    yyval.TypeVal = new PATypeHolder(HandleUpRefs(PointerType::get(*yyvsp[-1].TypeVal)));
+    delete yyvsp[-1].TypeVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 91:
-#line 1310 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.TypeList) = new std::list<PATypeHolder>();
-    (yyval.TypeList)->push_back(*(yyvsp[0].TypeVal)); delete (yyvsp[0].TypeVal);
+  ;
+    break;}
+case 90:
+#line 1310 "/Users/sabre/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 92:
-#line 1315 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(*(yyvsp[0].TypeVal)); delete (yyvsp[0].TypeVal);
+  ;
+    break;}
+case 91:
+#line 1315 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    (yyval.TypeList=yyvsp[-2].TypeList)->push_back(*yyvsp[0].TypeVal); delete yyvsp[0].TypeVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 94:
-#line 1322 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(Type::VoidTy);
+  ;
+    break;}
+case 93:
+#line 1322 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    (yyval.TypeList=yyvsp[-2].TypeList)->push_back(Type::VoidTy);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 95:
-#line 1326 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    ((yyval.TypeList) = new std::list<PATypeHolder>())->push_back(Type::VoidTy);
+  ;
+    break;}
+case 94:
+#line 1326 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    (yyval.TypeList = new std::list<PATypeHolder>())->push_back(Type::VoidTy);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 96:
-#line 1330 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.TypeList) = new std::list<PATypeHolder>();
+  ;
+    break;}
+case 95:
+#line 1330 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.TypeList = new std::list<PATypeHolder>();
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 97:
-#line 1341 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { // Nonempty unsized arr
-    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-3].TypeVal)->get());
+  ;
+    break;}
+case 96:
+#line 1341 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ // Nonempty unsized arr
+    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 98:
-#line 1367 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal)->get());
+  ;
+    break;}
+case 97:
+#line 1367 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    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 99:
-#line 1381 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal)->get());
+  ;
+    break;}
+case 98:
+#line 1381 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    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();
-    char *EndStr = UnEscapeLexed((yyvsp[0].StrVal), true);
-    if (NumElements != -1 && NumElements != (EndStr-(yyvsp[0].StrVal)))
+    char *EndStr = UnEscapeLexed(yyvsp[0].StrVal, true);
+    if (NumElements != -1 && NumElements != (EndStr-yyvsp[0].StrVal))
       GEN_ERROR("Can't build string constant of size " + 
-                     itostr((int)(EndStr-(yyvsp[0].StrVal))) +
+                     itostr((int)(EndStr-yyvsp[0].StrVal)) +
                      " when array has size " + itostr(NumElements) + "!");
     std::vector<Constant*> Vals;
     if (ETy == Type::SByteTy) {
-      for (signed char *C = (signed char *)(yyvsp[0].StrVal); C != (signed char *)EndStr; ++C)
+      for (signed char *C = (signed char *)yyvsp[0].StrVal; C != (signed char *)EndStr; ++C)
         Vals.push_back(ConstantInt::get(ETy, *C));
     } else if (ETy == Type::UByteTy) {
-      for (unsigned char *C = (unsigned char *)(yyvsp[0].StrVal); 
+      for (unsigned char *C = (unsigned char *)yyvsp[0].StrVal; 
            C != (unsigned char*)EndStr; ++C)
         Vals.push_back(ConstantInt::get(ETy, *C));
     } else {
-      free((yyvsp[0].StrVal));
+      free(yyvsp[0].StrVal);
       GEN_ERROR("Cannot build string arrays of non byte sized elements!");
     }
-    free((yyvsp[0].StrVal));
-    (yyval.ConstVal) = ConstantArray::get(ATy, Vals);
-    delete (yyvsp[-2].TypeVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 100:
-#line 1411 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { // Nonempty unsized arr
-    const PackedType *PTy = dyn_cast<PackedType>((yyvsp[-3].TypeVal)->get());
+    free(yyvsp[0].StrVal);
+    yyval.ConstVal = ConstantArray::get(ATy, Vals);
+    delete yyvsp[-2].TypeVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 99:
+#line 1411 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ // Nonempty unsized arr
+    const PackedType *PTy = dyn_cast<PackedType>(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) = ConstantPacked::get(PTy, *(yyvsp[-1].ConstVector));
-    delete (yyvsp[-3].TypeVal); delete (yyvsp[-1].ConstVector);
+    yyval.ConstVal = ConstantPacked::get(PTy, *yyvsp[-1].ConstVector);
+    delete yyvsp[-3].TypeVal; delete yyvsp[-1].ConstVector;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 101:
-#line 1437 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    const StructType *STy = dyn_cast<StructType>((yyvsp[-3].TypeVal)->get());
+  ;
+    break;}
+case 100:
+#line 1437 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    const StructType *STy = dyn_cast<StructType>(yyvsp[-3].TypeVal->get());
     if (STy == 0)
       GEN_ERROR("Cannot make struct constant with type: '" + 
-                     (*(yyvsp[-3].TypeVal))->getDescription() + "'!");
+                     (*yyvsp[-3].TypeVal)->getDescription() + "'!");
 
-    if ((yyvsp[-1].ConstVector)->size() != STy->getNumContainedTypes())
+    if (yyvsp[-1].ConstVector->size() != STy->getNumContainedTypes())
       GEN_ERROR("Illegal number of initializers for structure type!");
 
     // Check to ensure that constants are compatible with the type initializer!
-    for (unsigned i = 0, e = (yyvsp[-1].ConstVector)->size(); i != e; ++i)
-      if ((*(yyvsp[-1].ConstVector))[i]->getType() != STy->getElementType(i))
+    for (unsigned i = 0, e = yyvsp[-1].ConstVector->size(); i != e; ++i)
+      if ((*yyvsp[-1].ConstVector)[i]->getType() != STy->getElementType(i))
         GEN_ERROR("Expected type '" +
                        STy->getElementType(i)->getDescription() +
                        "' for element #" + utostr(i) +
                        " of structure initializer!");
 
-    (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 102:
-#line 1458 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    const StructType *STy = dyn_cast<StructType>((yyvsp[-2].TypeVal)->get());
+  ;
+    break;}
+case 101:
+#line 1458 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    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!");
 
-    (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 103:
-#line 1471 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    const PointerType *PTy = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
+  ;
+    break;}
+case 102:
+#line 1471 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    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 104:
-#line 1481 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ConstVal) = UndefValue::get((yyvsp[-1].TypeVal)->get());
-    delete (yyvsp[-1].TypeVal);
+  ;
+    break;}
+case 103:
+#line 1481 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ConstVal = UndefValue::get(yyvsp[-1].TypeVal->get());
+    delete yyvsp[-1].TypeVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 105:
-#line 1486 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    const PointerType *Ty = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
+  ;
+    break;}
+case 104:
+#line 1486 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    const PointerType *Ty = dyn_cast<PointerType>(yyvsp[-1].TypeVal->get());
     if (Ty == 0)
       GEN_ERROR("Global const reference must be a pointer type!");
 
@@ -3522,7 +2875,7 @@
     Function *SavedCurFn = CurFun.CurrentFunction;
     CurFun.CurrentFunction = 0;
 
-    Value *V = getValNonImprovising(Ty, (yyvsp[0].ValIDVal));
+    Value *V = getValNonImprovising(Ty, yyvsp[0].ValIDVal);
     CHECK_FOR_ERROR
 
     CurFun.CurrentFunction = SavedCurFn;
@@ -3537,14 +2890,14 @@
 
       // 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::NameVal) Name = (yyvsp[0].ValIDVal).Name;
+        if (yyvsp[0].ValIDVal.Type == ValID::NameVal) Name = yyvsp[0].ValIDVal.Name;
 
         // Create the forward referenced global.
         GlobalValue *GV;
@@ -3559,160 +2912,149 @@
         }
 
         // 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 106:
-#line 1547 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if ((yyvsp[-1].TypeVal)->get() != (yyvsp[0].ConstVal)->getType())
+  ;
+    break;}
+case 105:
+#line 1547 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (yyvsp[-1].TypeVal->get() != yyvsp[0].ConstVal->getType())
       GEN_ERROR("Mismatched types for constant expression!");
-    (yyval.ConstVal) = (yyvsp[0].ConstVal);
-    delete (yyvsp[-1].TypeVal);
+    yyval.ConstVal = yyvsp[0].ConstVal;
+    delete yyvsp[-1].TypeVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 107:
-#line 1554 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    const Type *Ty = (yyvsp[-1].TypeVal)->get();
+  ;
+    break;}
+case 106:
+#line 1554 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    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 108:
-#line 1563 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {      // integral constants
-    if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].SInt64Val)))
+  ;
+    break;}
+case 107:
+#line 1563 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{      // integral constants
+    if (!ConstantInt::isValueValidForType(yyvsp[-1].PrimType, yyvsp[0].SInt64Val))
       GEN_ERROR("Constant value doesn't fit in type!");
-    (yyval.ConstVal) = ConstantInt::get((yyvsp[-1].PrimType), (yyvsp[0].SInt64Val));
+    yyval.ConstVal = ConstantInt::get(yyvsp[-1].PrimType, yyvsp[0].SInt64Val);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 109:
-#line 1569 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {            // integral constants
-    if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].UInt64Val)))
+  ;
+    break;}
+case 108:
+#line 1569 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{            // integral constants
+    if (!ConstantInt::isValueValidForType(yyvsp[-1].PrimType, yyvsp[0].UInt64Val))
       GEN_ERROR("Constant value doesn't fit in type!");
-    (yyval.ConstVal) = ConstantInt::get((yyvsp[-1].PrimType), (yyvsp[0].UInt64Val));
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 110:
-#line 1575 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {                      // Boolean constants
-    (yyval.ConstVal) = ConstantBool::getTrue();
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 111:
-#line 1579 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {                     // Boolean constants
-    (yyval.ConstVal) = ConstantBool::getFalse();
+    yyval.ConstVal = ConstantInt::get(yyvsp[-1].PrimType, yyvsp[0].UInt64Val);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 112:
-#line 1583 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {                   // Float & Double constants
-    if (!ConstantFP::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].FPVal)))
+  ;
+    break;}
+case 109:
+#line 1575 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                      // Boolean constants
+    yyval.ConstVal = ConstantBool::getTrue();
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 110:
+#line 1579 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                     // Boolean constants
+    yyval.ConstVal = ConstantBool::getFalse();
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 111:
+#line 1583 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                   // Float & Double constants
+    if (!ConstantFP::isValueValidForType(yyvsp[-1].PrimType, yyvsp[0].FPVal))
       GEN_ERROR("Floating point constant invalid for type!!");
-    (yyval.ConstVal) = ConstantFP::get((yyvsp[-1].PrimType), (yyvsp[0].FPVal));
+    yyval.ConstVal = ConstantFP::get(yyvsp[-1].PrimType, yyvsp[0].FPVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 113:
-#line 1591 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (!(yyvsp[-3].ConstVal)->getType()->isFirstClassType())
+  ;
+    break;}
+case 112:
+#line 1591 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!yyvsp[-3].ConstVal->getType()->isFirstClassType())
       GEN_ERROR("cast constant expression from a non-primitive type: '" +
-                     (yyvsp[-3].ConstVal)->getType()->getDescription() + "'!");
-    if (!(yyvsp[-1].TypeVal)->get()->isFirstClassType())
+                     yyvsp[-3].ConstVal->getType()->getDescription() + "'!");
+    if (!yyvsp[-1].TypeVal->get()->isFirstClassType())
       GEN_ERROR("cast constant expression to a non-primitive type: '" +
-                     (yyvsp[-1].TypeVal)->get()->getDescription() + "'!");
-    (yyval.ConstVal) = ConstantExpr::getCast((yyvsp[-3].ConstVal), (yyvsp[-1].TypeVal)->get());
-    delete (yyvsp[-1].TypeVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 114:
-#line 1602 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (!isa<PointerType>((yyvsp[-2].ConstVal)->getType()))
+                     yyvsp[-1].TypeVal->get()->getDescription() + "'!");
+    yyval.ConstVal = ConstantExpr::getCast(yyvsp[-3].ConstVal, yyvsp[-1].TypeVal->get());
+    delete yyvsp[-1].TypeVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 113:
+#line 1602 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!isa<PointerType>(yyvsp[-2].ConstVal->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand!");
 
     // LLVM 1.2 and earlier used ubyte struct indices.  Convert any ubyte struct
     // indices to uint struct indices for compatibility.
     generic_gep_type_iterator<std::vector<Value*>::iterator>
-      GTI = gep_type_begin((yyvsp[-2].ConstVal)->getType(), (yyvsp[-1].ValueList)->begin(), (yyvsp[-1].ValueList)->end()),
-      GTE = gep_type_end((yyvsp[-2].ConstVal)->getType(), (yyvsp[-1].ValueList)->begin(), (yyvsp[-1].ValueList)->end());
-    for (unsigned i = 0, e = (yyvsp[-1].ValueList)->size(); i != e && GTI != GTE; ++i, ++GTI)
+      GTI = gep_type_begin(yyvsp[-2].ConstVal->getType(), yyvsp[-1].ValueList->begin(), yyvsp[-1].ValueList->end()),
+      GTE = gep_type_end(yyvsp[-2].ConstVal->getType(), yyvsp[-1].ValueList->begin(), yyvsp[-1].ValueList->end());
+    for (unsigned i = 0, e = yyvsp[-1].ValueList->size(); i != e && GTI != GTE; ++i, ++GTI)
       if (isa<StructType>(*GTI))        // Only change struct indices
-        if (ConstantInt *CUI = dyn_cast<ConstantInt>((*(yyvsp[-1].ValueList))[i]))
+        if (ConstantInt *CUI = dyn_cast<ConstantInt>((*yyvsp[-1].ValueList)[i]))
           if (CUI->getType() == Type::UByteTy)
-            (*(yyvsp[-1].ValueList))[i] = ConstantExpr::getCast(CUI, Type::UIntTy);
+            (*yyvsp[-1].ValueList)[i] = ConstantExpr::getCast(CUI, Type::UIntTy);
 
     const Type *IdxTy =
-      GetElementPtrInst::getIndexedType((yyvsp[-2].ConstVal)->getType(), *(yyvsp[-1].ValueList), true);
+      GetElementPtrInst::getIndexedType(yyvsp[-2].ConstVal->getType(), *yyvsp[-1].ValueList, true);
     if (!IdxTy)
       GEN_ERROR("Index list invalid for constant getelementptr!");
 
     std::vector<Constant*> 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);
+    yyval.ConstVal = ConstantExpr::getGetElementPtr(yyvsp[-2].ConstVal, IdxVec);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 115:
-#line 1634 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if ((yyvsp[-5].ConstVal)->getType() != Type::BoolTy)
+  ;
+    break;}
+case 114:
+#line 1634 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (yyvsp[-5].ConstVal->getType() != Type::BoolTy)
       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 116:
-#line 1642 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
+  ;
+    break;}
+case 115:
+#line 1642 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
       GEN_ERROR("Binary operator types must match!");
     // HACK: llvm 1.3 and earlier used to emit invalid pointer constant exprs.
     // To retain backward compatibility with these early compilers, we emit a
     // cast to the appropriate integer type automatically if we are in the
     // broken case.  See PR424 for more information.
-    if (!isa<PointerType>((yyvsp[-3].ConstVal)->getType())) {
-      (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].BinaryOpVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+    if (!isa<PointerType>(yyvsp[-3].ConstVal->getType())) {
+      yyval.ConstVal = ConstantExpr::get(yyvsp[-5].BinaryOpVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
     } else {
       const Type *IntPtrTy = 0;
       switch (CurModule.CurrentModule->getPointerSize()) {
@@ -3720,154 +3062,138 @@
       case Module::Pointer64: IntPtrTy = Type::LongTy; break;
       default: GEN_ERROR("invalid pointer binary constant expr!");
       }
-      (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].BinaryOpVal), ConstantExpr::getCast((yyvsp[-3].ConstVal), IntPtrTy),
-                             ConstantExpr::getCast((yyvsp[-1].ConstVal), IntPtrTy));
-      (yyval.ConstVal) = ConstantExpr::getCast((yyval.ConstVal), (yyvsp[-3].ConstVal)->getType());
+      yyval.ConstVal = ConstantExpr::get(yyvsp[-5].BinaryOpVal, ConstantExpr::getCast(yyvsp[-3].ConstVal, IntPtrTy),
+                             ConstantExpr::getCast(yyvsp[-1].ConstVal, IntPtrTy));
+      yyval.ConstVal = ConstantExpr::getCast(yyval.ConstVal, yyvsp[-3].ConstVal->getType());
     }
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 117:
-#line 1664 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
+  ;
+    break;}
+case 116:
+#line 1664 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
       GEN_ERROR("Logical operator types must match!");
-    if (!(yyvsp[-3].ConstVal)->getType()->isIntegral()) {
-      if (!isa<PackedType>((yyvsp[-3].ConstVal)->getType()) || 
-          !cast<PackedType>((yyvsp[-3].ConstVal)->getType())->getElementType()->isIntegral())
+    if (!yyvsp[-3].ConstVal->getType()->isIntegral()) {
+      if (!isa<PackedType>(yyvsp[-3].ConstVal->getType()) || 
+          !cast<PackedType>(yyvsp[-3].ConstVal->getType())->getElementType()->isIntegral())
         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 118:
-#line 1675 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
+  ;
+    break;}
+case 117:
+#line 1675 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
       GEN_ERROR("setcc operand types must match!");
-    (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 119:
-#line 1681 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if ((yyvsp[-1].ConstVal)->getType() != Type::UByteTy)
+  ;
+    break;}
+case 118:
+#line 1681 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (yyvsp[-1].ConstVal->getType() != Type::UByteTy)
       GEN_ERROR("Shift count for shift constant must be unsigned byte!");
-    if (!(yyvsp[-3].ConstVal)->getType()->isInteger())
+    if (!yyvsp[-3].ConstVal->getType()->isInteger())
       GEN_ERROR("Shift constant expression requires integer operand!");
-    (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].OtherOpVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+    yyval.ConstVal = ConstantExpr::get(yyvsp[-5].OtherOpVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 120:
-#line 1689 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (!ExtractElementInst::isValidOperands((yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
+  ;
+    break;}
+case 119:
+#line 1689 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!ExtractElementInst::isValidOperands(yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
       GEN_ERROR("Invalid extractelement operands!");
-    (yyval.ConstVal) = ConstantExpr::getExtractElement((yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+    yyval.ConstVal = ConstantExpr::getExtractElement(yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 121:
-#line 1695 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (!InsertElementInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
+  ;
+    break;}
+case 120:
+#line 1695 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!InsertElementInst::isValidOperands(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
       GEN_ERROR("Invalid insertelement operands!");
-    (yyval.ConstVal) = ConstantExpr::getInsertElement((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+    yyval.ConstVal = ConstantExpr::getInsertElement(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 122:
-#line 1701 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (!ShuffleVectorInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
+  ;
+    break;}
+case 121:
+#line 1701 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!ShuffleVectorInst::isValidOperands(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
       GEN_ERROR("Invalid shufflevector operands!");
-    (yyval.ConstVal) = ConstantExpr::getShuffleVector((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+    yyval.ConstVal = ConstantExpr::getShuffleVector(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 123:
-#line 1710 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    ((yyval.ConstVector) = (yyvsp[-2].ConstVector))->push_back((yyvsp[0].ConstVal));
+  ;
+    break;}
+case 122:
+#line 1710 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    (yyval.ConstVector = yyvsp[-2].ConstVector)->push_back(yyvsp[0].ConstVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 124:
-#line 1714 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ConstVector) = new std::vector<Constant*>();
-    (yyval.ConstVector)->push_back((yyvsp[0].ConstVal));
+  ;
+    break;}
+case 123:
+#line 1714 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ConstVector = new std::vector<Constant*>();
+    yyval.ConstVector->push_back(yyvsp[0].ConstVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 125:
-#line 1722 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.BoolVal) = false; ;}
-    break;
-
-  case 126:
-#line 1722 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.BoolVal) = true; ;}
-    break;
-
-  case 127:
-#line 1732 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-  (yyval.ModuleVal) = ParserResult = (yyvsp[0].ModuleVal);
+  ;
+    break;}
+case 124:
+#line 1722 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.BoolVal = false; ;
+    break;}
+case 125:
+#line 1722 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.BoolVal = true; ;
+    break;}
+case 126:
+#line 1732 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+  yyval.ModuleVal = ParserResult = yyvsp[0].ModuleVal;
   CurModule.ModuleDone();
   CHECK_FOR_ERROR;
-;}
-    break;
-
-  case 128:
-#line 1740 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ModuleVal) = (yyvsp[-1].ModuleVal);
+;
+    break;}
+case 127:
+#line 1740 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ModuleVal = yyvsp[-1].ModuleVal;
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 129:
-#line 1745 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ModuleVal) = (yyvsp[-1].ModuleVal);
+  ;
+    break;}
+case 128:
+#line 1745 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ModuleVal = yyvsp[-1].ModuleVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 130:
-#line 1749 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ModuleVal) = (yyvsp[-3].ModuleVal);
+  ;
+    break;}
+case 129:
+#line 1749 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ModuleVal = yyvsp[-3].ModuleVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 131:
-#line 1753 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ModuleVal) = (yyvsp[-1].ModuleVal);
+  ;
+    break;}
+case 130:
+#line 1753 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ModuleVal = yyvsp[-1].ModuleVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 132:
-#line 1757 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ModuleVal) = CurModule.CurrentModule;
+  ;
+    break;}
+case 131:
+#line 1757 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ModuleVal = CurModule.CurrentModule;
     // Emit an error if there are any unresolved types left.
     if (!CurModule.LateResolveTypes.empty()) {
       const ValID &DID = CurModule.LateResolveTypes.begin()->first;
@@ -3878,12 +3204,11 @@
       }
     }
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 133:
-#line 1772 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 132:
+#line 1772 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     // Eagerly resolve types.  This is not an optimization, this is a
     // requirement that is due to the fact that we could have this:
     //
@@ -3893,306 +3218,274 @@
     // 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);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 134:
-#line 1794 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {       // Function prototypes can be in const pool
+    delete yyvsp[0].TypeVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 135:
-#line 1797 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {  // Asm blocks can be in the const pool
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 136:
-#line 1800 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if ((yyvsp[0].ConstVal) == 0) 
+  ;
+    break;}
+case 133:
+#line 1794 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{       // Function prototypes can be in const pool
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 134:
+#line 1797 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{  // Asm blocks can be in the const pool
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 135:
+#line 1800 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (yyvsp[0].ConstVal == 0) 
       GEN_ERROR("Global value initializer is not a constant!");
-    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), (yyvsp[-2].Linkage), (yyvsp[-1].BoolVal), (yyvsp[0].ConstVal)->getType(), (yyvsp[0].ConstVal));
+    CurGV = ParseGlobalVariable(yyvsp[-3].StrVal, yyvsp[-2].Linkage, yyvsp[-1].BoolVal, yyvsp[0].ConstVal->getType(), yyvsp[0].ConstVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 137:
-#line 1805 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 136:
+#line 1805 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     CurGV = 0;
-  ;}
-    break;
-
-  case 138:
-#line 1808 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalLinkage, (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0);
+  ;
+    break;}
+case 137:
+#line 1808 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    CurGV = ParseGlobalVariable(yyvsp[-3].StrVal, GlobalValue::ExternalLinkage, yyvsp[-1].BoolVal, *yyvsp[0].TypeVal, 0);
     CHECK_FOR_ERROR
-    delete (yyvsp[0].TypeVal);
-  ;}
-    break;
-
-  case 139:
-#line 1812 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
+    delete yyvsp[0].TypeVal;
+  ;
+    break;}
+case 138:
+#line 1812 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     CurGV = 0;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 140:
-#line 1816 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::DLLImportLinkage, (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0);
+  ;
+    break;}
+case 139:
+#line 1816 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    CurGV = ParseGlobalVariable(yyvsp[-3].StrVal, GlobalValue::DLLImportLinkage, yyvsp[-1].BoolVal, *yyvsp[0].TypeVal, 0);
     CHECK_FOR_ERROR
-    delete (yyvsp[0].TypeVal);
-  ;}
-    break;
-
-  case 141:
-#line 1820 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
+    delete yyvsp[0].TypeVal;
+  ;
+    break;}
+case 140:
+#line 1820 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     CurGV = 0;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 142:
-#line 1824 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 141:
+#line 1824 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     CurGV = 
-      ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalWeakLinkage, (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0);
+      ParseGlobalVariable(yyvsp[-3].StrVal, GlobalValue::ExternalWeakLinkage, yyvsp[-1].BoolVal, *yyvsp[0].TypeVal, 0);
     CHECK_FOR_ERROR
-    delete (yyvsp[0].TypeVal);
-  ;}
-    break;
-
-  case 143:
-#line 1829 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
+    delete yyvsp[0].TypeVal;
+  ;
+    break;}
+case 142:
+#line 1829 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     CurGV = 0;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 144:
-#line 1833 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { 
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 145:
-#line 1836 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 143:
+#line 1833 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ 
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 144:
+#line 1836 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 146:
-#line 1839 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { 
-  ;}
-    break;
-
-  case 147:
-#line 1843 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 145:
+#line 1839 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ 
+  ;
+    break;}
+case 146:
+#line 1843 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
-  char *EndStr = UnEscapeLexed((yyvsp[0].StrVal), true);
-  std::string NewAsm((yyvsp[0].StrVal), EndStr);
-  free((yyvsp[0].StrVal));
+  char *EndStr = UnEscapeLexed(yyvsp[0].StrVal, true);
+  std::string NewAsm(yyvsp[0].StrVal, EndStr);
+  free(yyvsp[0].StrVal);
 
   if (AsmSoFar.empty())
     CurModule.CurrentModule->setModuleInlineAsm(NewAsm);
   else
     CurModule.CurrentModule->setModuleInlineAsm(AsmSoFar+"\n"+NewAsm);
   CHECK_FOR_ERROR
-;}
-    break;
-
-  case 148:
-#line 1856 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Endianness) = Module::BigEndian; ;}
-    break;
-
-  case 149:
-#line 1857 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Endianness) = Module::LittleEndian; ;}
-    break;
-
-  case 150:
-#line 1859 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    CurModule.CurrentModule->setEndianness((yyvsp[0].Endianness));
+;
+    break;}
+case 147:
+#line 1856 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Endianness = Module::BigEndian; ;
+    break;}
+case 148:
+#line 1857 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.Endianness = Module::LittleEndian; ;
+    break;}
+case 149:
+#line 1859 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    CurModule.CurrentModule->setEndianness(yyvsp[0].Endianness);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 151:
-#line 1863 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if ((yyvsp[0].UInt64Val) == 32)
+  ;
+    break;}
+case 150:
+#line 1863 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (yyvsp[0].UInt64Val == 32)
       CurModule.CurrentModule->setPointerSize(Module::Pointer32);
-    else if ((yyvsp[0].UInt64Val) == 64)
+    else if (yyvsp[0].UInt64Val == 64)
       CurModule.CurrentModule->setPointerSize(Module::Pointer64);
     else
-      GEN_ERROR("Invalid pointer size: '" + utostr((yyvsp[0].UInt64Val)) + "'!");
+      GEN_ERROR("Invalid pointer size: '" + utostr(yyvsp[0].UInt64Val) + "'!");
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 152:
-#line 1872 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    CurModule.CurrentModule->setTargetTriple((yyvsp[0].StrVal));
-    free((yyvsp[0].StrVal));
+  ;
+    break;}
+case 151:
+#line 1872 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    CurModule.CurrentModule->setTargetTriple(yyvsp[0].StrVal);
+    free(yyvsp[0].StrVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 153:
-#line 1877 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    CurModule.CurrentModule->setDataLayout((yyvsp[0].StrVal));
-    free((yyvsp[0].StrVal));
+  ;
+    break;}
+case 152:
+#line 1877 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    CurModule.CurrentModule->setDataLayout(yyvsp[0].StrVal);
+    free(yyvsp[0].StrVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 155:
-#line 1885 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-          CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
-          free((yyvsp[0].StrVal));
+  ;
+    break;}
+case 154:
+#line 1885 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+          CurModule.CurrentModule->addLibrary(yyvsp[0].StrVal);
+          free(yyvsp[0].StrVal);
           CHECK_FOR_ERROR
-        ;}
-    break;
-
-  case 156:
-#line 1890 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-          CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
-          free((yyvsp[0].StrVal));
+        ;
+    break;}
+case 155:
+#line 1890 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+          CurModule.CurrentModule->addLibrary(yyvsp[0].StrVal);
+          free(yyvsp[0].StrVal);
           CHECK_FOR_ERROR
-        ;}
-    break;
-
-  case 157:
-#line 1895 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
+        ;
+    break;}
+case 156:
+#line 1895 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
           CHECK_FOR_ERROR
-        ;}
-    break;
-
-  case 161:
-#line 1905 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.StrVal) = 0; ;}
-    break;
-
-  case 162:
-#line 1907 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-  if (*(yyvsp[-1].TypeVal) == Type::VoidTy)
+        ;
+    break;}
+case 160:
+#line 1905 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.StrVal = 0; ;
+    break;}
+case 161:
+#line 1907 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+  if (*yyvsp[-1].TypeVal == Type::VoidTy)
     GEN_ERROR("void typed arguments are invalid!");
-  (yyval.ArgVal) = new std::pair<PATypeHolder*, char*>((yyvsp[-1].TypeVal), (yyvsp[0].StrVal));
+  yyval.ArgVal = new std::pair<PATypeHolder*, char*>(yyvsp[-1].TypeVal, yyvsp[0].StrVal);
   CHECK_FOR_ERROR
-;}
-    break;
-
-  case 163:
-#line 1914 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ArgList) = (yyvsp[-2].ArgList);
-    (yyvsp[-2].ArgList)->push_back(*(yyvsp[0].ArgVal));
-    delete (yyvsp[0].ArgVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 164:
-#line 1920 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ArgList) = new std::vector<std::pair<PATypeHolder*,char*> >();
-    (yyval.ArgList)->push_back(*(yyvsp[0].ArgVal));
-    delete (yyvsp[0].ArgVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 165:
-#line 1927 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ArgList) = (yyvsp[0].ArgList);
+;
+    break;}
+case 162:
+#line 1914 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ArgList = yyvsp[-2].ArgList;
+    yyvsp[-2].ArgList->push_back(*yyvsp[0].ArgVal);
+    delete yyvsp[0].ArgVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 163:
+#line 1920 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ArgList = new std::vector<std::pair<PATypeHolder*,char*> >();
+    yyval.ArgList->push_back(*yyvsp[0].ArgVal);
+    delete yyvsp[0].ArgVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 164:
+#line 1927 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ArgList = yyvsp[0].ArgList;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 166:
-#line 1931 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ArgList) = (yyvsp[-2].ArgList);
-    (yyval.ArgList)->push_back(std::pair<PATypeHolder*,
+  ;
+    break;}
+case 165:
+#line 1931 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ArgList = yyvsp[-2].ArgList;
+    yyval.ArgList->push_back(std::pair<PATypeHolder*,
                             char*>(new PATypeHolder(Type::VoidTy), 0));
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 167:
-#line 1937 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ArgList) = new std::vector<std::pair<PATypeHolder*,char*> >();
-    (yyval.ArgList)->push_back(std::make_pair(new PATypeHolder(Type::VoidTy), (char*)0));
+  ;
+    break;}
+case 166:
+#line 1937 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ArgList = new std::vector<std::pair<PATypeHolder*,char*> >();
+    yyval.ArgList->push_back(std::make_pair(new PATypeHolder(Type::VoidTy), (char*)0));
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 168:
-#line 1942 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ArgList) = 0;
+  ;
+    break;}
+case 167:
+#line 1942 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ArgList = 0;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 169:
-#line 1948 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-  UnEscapeLexed((yyvsp[-5].StrVal));
-  std::string FunctionName((yyvsp[-5].StrVal));
-  free((yyvsp[-5].StrVal));  // Free strdup'd memory!
+  ;
+    break;}
+case 168:
+#line 1948 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+  UnEscapeLexed(yyvsp[-5].StrVal);
+  std::string FunctionName(yyvsp[-5].StrVal);
+  free(yyvsp[-5].StrVal);  // Free strdup'd memory!
   
-  if (!(*(yyvsp[-6].TypeVal))->isFirstClassType() && *(yyvsp[-6].TypeVal) != Type::VoidTy)
+  if (!(*yyvsp[-6].TypeVal)->isFirstClassType() && *yyvsp[-6].TypeVal != Type::VoidTy)
     GEN_ERROR("LLVM functions cannot return aggregate types!");
 
   std::vector<const Type*> ParamTypeList;
-  if ((yyvsp[-3].ArgList)) {   // If there are arguments...
-    for (std::vector<std::pair<PATypeHolder*,char*> >::iterator I = (yyvsp[-3].ArgList)->begin();
-         I != (yyvsp[-3].ArgList)->end(); ++I)
+  if (yyvsp[-3].ArgList) {   // If there are arguments...
+    for (std::vector<std::pair<PATypeHolder*,char*> >::iterator I = yyvsp[-3].ArgList->begin();
+         I != yyvsp[-3].ArgList->end(); ++I)
       ParamTypeList.push_back(I->first->get());
   }
 
   bool isVarArg = ParamTypeList.size() && ParamTypeList.back() == Type::VoidTy;
   if (isVarArg) ParamTypeList.pop_back();
 
-  const FunctionType *FT = FunctionType::get(*(yyvsp[-6].TypeVal), ParamTypeList, isVarArg);
+  const FunctionType *FT = FunctionType::get(*yyvsp[-6].TypeVal, ParamTypeList, isVarArg);
   const PointerType *PFT = PointerType::get(FT);
-  delete (yyvsp[-6].TypeVal);
+  delete yyvsp[-6].TypeVal;
 
   ValID ID;
   if (!FunctionName.empty()) {
@@ -4236,24 +3529,24 @@
     // another function.
     Fn->setLinkage(CurFun.Linkage);
   }
-  Fn->setCallingConv((yyvsp[-7].UIntVal));
-  Fn->setAlignment((yyvsp[0].UIntVal));
-  if ((yyvsp[-1].StrVal)) {
-    Fn->setSection((yyvsp[-1].StrVal));
-    free((yyvsp[-1].StrVal));
+  Fn->setCallingConv(yyvsp[-7].UIntVal);
+  Fn->setAlignment(yyvsp[0].UIntVal);
+  if (yyvsp[-1].StrVal) {
+    Fn->setSection(yyvsp[-1].StrVal);
+    free(yyvsp[-1].StrVal);
   }
 
   // Add all of the arguments we parsed to the function...
-  if ((yyvsp[-3].ArgList)) {                     // Is null if empty...
+  if (yyvsp[-3].ArgList) {                     // Is null if empty...
     if (isVarArg) {  // Nuke the last entry
-      assert((yyvsp[-3].ArgList)->back().first->get() == Type::VoidTy && (yyvsp[-3].ArgList)->back().second == 0&&
+      assert(yyvsp[-3].ArgList->back().first->get() == Type::VoidTy && yyvsp[-3].ArgList->back().second == 0&&
              "Not a varargs marker!");
-      delete (yyvsp[-3].ArgList)->back().first;
-      (yyvsp[-3].ArgList)->pop_back();  // Delete the last entry
+      delete yyvsp[-3].ArgList->back().first;
+      yyvsp[-3].ArgList->pop_back();  // Delete the last entry
     }
     Function::arg_iterator ArgIt = Fn->arg_begin();
-    for (std::vector<std::pair<PATypeHolder*,char*> >::iterator I = (yyvsp[-3].ArgList)->begin();
-         I != (yyvsp[-3].ArgList)->end(); ++I, ++ArgIt) {
+    for (std::vector<std::pair<PATypeHolder*,char*> >::iterator I = yyvsp[-3].ArgList->begin();
+         I != yyvsp[-3].ArgList->end(); ++I, ++ArgIt) {
       delete I->first;                          // Delete the typeholder...
 
       setValueName(ArgIt, I->second);           // Insert arg into symtab...
@@ -4261,140 +3554,123 @@
       InsertValue(ArgIt);
     }
 
-    delete (yyvsp[-3].ArgList);                     // We're now done with the argument list
+    delete yyvsp[-3].ArgList;                     // We're now done with the argument list
   }
   CHECK_FOR_ERROR
-;}
-    break;
-
-  case 172:
-#line 2044 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-  (yyval.FunctionVal) = CurFun.CurrentFunction;
+;
+    break;}
+case 171:
+#line 2044 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+  yyval.FunctionVal = CurFun.CurrentFunction;
 
   // Make sure that we keep track of the linkage type even if there was a
   // previous "declare".
-  (yyval.FunctionVal)->setLinkage((yyvsp[-2].Linkage));
-;}
-    break;
-
-  case 175:
-#line 2054 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-  (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
+  yyval.FunctionVal->setLinkage(yyvsp[-2].Linkage);
+;
+    break;}
+case 174:
+#line 2054 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+  yyval.FunctionVal = yyvsp[-1].FunctionVal;
   CHECK_FOR_ERROR
-;}
-    break;
-
-  case 177:
-#line 2060 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { CurFun.Linkage = GlobalValue::DLLImportLinkage ;}
-    break;
-
-  case 178:
-#line 2061 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { CurFun.Linkage = GlobalValue::DLLImportLinkage ;}
-    break;
-
-  case 179:
-#line 2063 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { CurFun.isDeclare = true; ;}
-    break;
-
-  case 180:
-#line 2063 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.FunctionVal) = CurFun.CurrentFunction;
+;
+    break;}
+case 176:
+#line 2060 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ CurFun.Linkage = GlobalValue::DLLImportLinkage ;
+    break;}
+case 177:
+#line 2061 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ CurFun.Linkage = GlobalValue::DLLImportLinkage ;
+    break;}
+case 178:
+#line 2063 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ CurFun.isDeclare = true; ;
+    break;}
+case 179:
+#line 2063 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.FunctionVal = CurFun.CurrentFunction;
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 181:
-#line 2073 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.BoolVal) = false;
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 182:
-#line 2077 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.BoolVal) = true;
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 183:
-#line 2082 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {    // A reference to a direct constant
-    (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val));
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 184:
-#line 2086 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val));
+  ;
+    break;}
+case 180:
+#line 2073 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.BoolVal = false;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 185:
-#line 2090 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {                     // Perhaps it's an FP constant?
-    (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal));
+  ;
+    break;}
+case 181:
+#line 2077 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.BoolVal = true;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 186:
-#line 2094 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ValIDVal) = ValID::create(ConstantBool::getTrue());
+  ;
+    break;}
+case 182:
+#line 2082 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{    // A reference to a direct constant
+    yyval.ValIDVal = ValID::create(yyvsp[0].SInt64Val);
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 183:
+#line 2086 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ValIDVal = ValID::create(yyvsp[0].UInt64Val);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 187:
-#line 2098 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ValIDVal) = ValID::create(ConstantBool::getFalse());
+  ;
+    break;}
+case 184:
+#line 2090 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                     // Perhaps it's an FP constant?
+    yyval.ValIDVal = ValID::create(yyvsp[0].FPVal);
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 185:
+#line 2094 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ValIDVal = ValID::create(ConstantBool::getTrue());
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 188:
-#line 2102 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ValIDVal) = ValID::createNull();
+  ;
+    break;}
+case 186:
+#line 2098 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ValIDVal = ValID::create(ConstantBool::getFalse());
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 189:
-#line 2106 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ValIDVal) = ValID::createUndef();
+  ;
+    break;}
+case 187:
+#line 2102 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ValIDVal = ValID::createNull();
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 190:
-#line 2110 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {     // A vector zero constant.
-    (yyval.ValIDVal) = ValID::createZeroInit();
+  ;
+    break;}
+case 188:
+#line 2106 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ValIDVal = ValID::createUndef();
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 191:
-#line 2114 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { // Nonempty unsized packed vector
-    const Type *ETy = (*(yyvsp[-1].ConstVector))[0]->getType();
-    int NumElements = (yyvsp[-1].ConstVector)->size(); 
+  ;
+    break;}
+case 189:
+#line 2110 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{     // A vector zero constant.
+    yyval.ValIDVal = ValID::createZeroInit();
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 190:
+#line 2114 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ // Nonempty unsized packed vector
+    const Type *ETy = (*yyvsp[-1].ConstVector)[0]->getType();
+    int NumElements = yyvsp[-1].ConstVector->size(); 
     
     PackedType* pt = PackedType::get(ETy, NumElements);
     PATypeHolder* PTy = new PATypeHolder(
@@ -4406,108 +3682,98 @@
                                          );
     
     // 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.ValIDVal) = ValID::create(ConstantPacked::get(pt, *(yyvsp[-1].ConstVector)));
-    delete PTy; delete (yyvsp[-1].ConstVector);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 192:
-#line 2139 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal));
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 193:
-#line 2143 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    char *End = UnEscapeLexed((yyvsp[-2].StrVal), true);
-    std::string AsmStr = std::string((yyvsp[-2].StrVal), End);
-    End = UnEscapeLexed((yyvsp[0].StrVal), true);
-    std::string Constraints = std::string((yyvsp[0].StrVal), End);
-    (yyval.ValIDVal) = ValID::createInlineAsm(AsmStr, Constraints, (yyvsp[-3].BoolVal));
-    free((yyvsp[-2].StrVal));
-    free((yyvsp[0].StrVal));
+    yyval.ValIDVal = ValID::create(ConstantPacked::get(pt, *yyvsp[-1].ConstVector));
+    delete PTy; delete yyvsp[-1].ConstVector;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 194:
-#line 2157 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {  // Is it an integer reference...?
-    (yyval.ValIDVal) = ValID::create((yyvsp[0].SIntVal));
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 195:
-#line 2161 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {                   // Is it a named reference...?
-    (yyval.ValIDVal) = ValID::create((yyvsp[0].StrVal));
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 198:
-#line 2173 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ValueVal) = getVal(*(yyvsp[-1].TypeVal), (yyvsp[0].ValIDVal)); delete (yyvsp[-1].TypeVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 199:
-#line 2178 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 200:
-#line 2182 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { // Do not allow functions with 0 basic blocks   
-    (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
+  ;
+    break;}
+case 191:
+#line 2139 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ValIDVal = ValID::create(yyvsp[0].ConstVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 201:
-#line 2191 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    setValueName((yyvsp[0].TermInstVal), (yyvsp[-1].StrVal));
+  ;
+    break;}
+case 192:
+#line 2143 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    char *End = UnEscapeLexed(yyvsp[-2].StrVal, true);
+    std::string AsmStr = std::string(yyvsp[-2].StrVal, End);
+    End = UnEscapeLexed(yyvsp[0].StrVal, true);
+    std::string Constraints = std::string(yyvsp[0].StrVal, End);
+    yyval.ValIDVal = ValID::createInlineAsm(AsmStr, Constraints, yyvsp[-3].BoolVal);
+    free(yyvsp[-2].StrVal);
+    free(yyvsp[0].StrVal);
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 193:
+#line 2157 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{  // Is it an integer reference...?
+    yyval.ValIDVal = ValID::create(yyvsp[0].SIntVal);
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 194:
+#line 2161 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                   // Is it a named reference...?
+    yyval.ValIDVal = ValID::create(yyvsp[0].StrVal);
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 197:
+#line 2173 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ValueVal = getVal(*yyvsp[-1].TypeVal, yyvsp[0].ValIDVal); delete yyvsp[-1].TypeVal;
     CHECK_FOR_ERROR
-    InsertValue((yyvsp[0].TermInstVal));
-
-    (yyvsp[-2].BasicBlockVal)->getInstList().push_back((yyvsp[0].TermInstVal));
-    InsertValue((yyvsp[-2].BasicBlockVal));
-    (yyval.BasicBlockVal) = (yyvsp[-2].BasicBlockVal);
+  ;
+    break;}
+case 198:
+#line 2178 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.FunctionVal = yyvsp[-1].FunctionVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 202:
-#line 2202 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyvsp[-1].BasicBlockVal)->getInstList().push_back((yyvsp[0].InstVal));
-    (yyval.BasicBlockVal) = (yyvsp[-1].BasicBlockVal);
+  ;
+    break;}
+case 199:
+#line 2182 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ // Do not allow functions with 0 basic blocks   
+    yyval.FunctionVal = yyvsp[-1].FunctionVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 200:
+#line 2191 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    setValueName(yyvsp[0].TermInstVal, yyvsp[-1].StrVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
+    InsertValue(yyvsp[0].TermInstVal);
 
-  case 203:
-#line 2207 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++), true);
+    yyvsp[-2].BasicBlockVal->getInstList().push_back(yyvsp[0].TermInstVal);
+    InsertValue(yyvsp[-2].BasicBlockVal);
+    yyval.BasicBlockVal = yyvsp[-2].BasicBlockVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 201:
+#line 2202 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyvsp[-1].BasicBlockVal->getInstList().push_back(yyvsp[0].InstVal);
+    yyval.BasicBlockVal = yyvsp[-1].BasicBlockVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 202:
+#line 2207 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.BasicBlockVal = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++), true);
     CHECK_FOR_ERROR
 
     // Make sure to move the basic block to the correct location in the
@@ -4515,15 +3781,14 @@
     // referenced.
     Function::BasicBlockListType &BBL = 
       CurFun.CurrentFunction->getBasicBlockList();
-    BBL.splice(BBL.end(), BBL, (yyval.BasicBlockVal));
+    BBL.splice(BBL.end(), BBL, yyval.BasicBlockVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 204:
-#line 2219 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((yyvsp[0].StrVal)), true);
+  ;
+    break;}
+case 203:
+#line 2219 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.BasicBlockVal = CurBB = getBBVal(ValID::create(yyvsp[0].StrVal), true);
     CHECK_FOR_ERROR
 
     // Make sure to move the basic block to the correct location in the
@@ -4531,97 +3796,90 @@
     // referenced.
     Function::BasicBlockListType &BBL = 
       CurFun.CurrentFunction->getBasicBlockList();
-    BBL.splice(BBL.end(), BBL, (yyval.BasicBlockVal));
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 205:
-#line 2232 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {              // Return with a result...
-    (yyval.TermInstVal) = new ReturnInst((yyvsp[0].ValueVal));
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 206:
-#line 2236 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {                                       // Return with no result...
-    (yyval.TermInstVal) = new ReturnInst();
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 207:
-#line 2240 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {                         // Unconditional Branch...
-    BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
-    CHECK_FOR_ERROR
-    (yyval.TermInstVal) = new BranchInst(tmpBB);
-  ;}
-    break;
-
-  case 208:
-#line 2245 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {  
-    BasicBlock* tmpBBA = getBBVal((yyvsp[-3].ValIDVal));
-    CHECK_FOR_ERROR
-    BasicBlock* tmpBBB = getBBVal((yyvsp[0].ValIDVal));
+    BBL.splice(BBL.end(), BBL, yyval.BasicBlockVal);
     CHECK_FOR_ERROR
-    Value* tmpVal = getVal(Type::BoolTy, (yyvsp[-6].ValIDVal));
-    CHECK_FOR_ERROR
-    (yyval.TermInstVal) = new BranchInst(tmpBBA, tmpBBB, tmpVal);
-  ;}
-    break;
-
-  case 209:
-#line 2254 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    Value* tmpVal = getVal((yyvsp[-7].PrimType), (yyvsp[-6].ValIDVal));
+  ;
+    break;}
+case 204:
+#line 2232 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{              // Return with a result...
+    yyval.TermInstVal = new ReturnInst(yyvsp[0].ValueVal);
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 205:
+#line 2236 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                                       // Return with no result...
+    yyval.TermInstVal = new ReturnInst();
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 206:
+#line 2240 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{                         // Unconditional Branch...
+    BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal);
+    CHECK_FOR_ERROR
+    yyval.TermInstVal = new BranchInst(tmpBB);
+  ;
+    break;}
+case 207:
+#line 2245 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{  
+    BasicBlock* tmpBBA = getBBVal(yyvsp[-3].ValIDVal);
+    CHECK_FOR_ERROR
+    BasicBlock* tmpBBB = getBBVal(yyvsp[0].ValIDVal);
+    CHECK_FOR_ERROR
+    Value* tmpVal = getVal(Type::BoolTy, yyvsp[-6].ValIDVal);
+    CHECK_FOR_ERROR
+    yyval.TermInstVal = new BranchInst(tmpBBA, tmpBBB, tmpVal);
+  ;
+    break;}
+case 208:
+#line 2254 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    Value* tmpVal = getVal(yyvsp[-7].PrimType, yyvsp[-6].ValIDVal);
     CHECK_FOR_ERROR
-    BasicBlock* tmpBB = getBBVal((yyvsp[-3].ValIDVal));
+    BasicBlock* tmpBB = getBBVal(yyvsp[-3].ValIDVal);
     CHECK_FOR_ERROR
-    SwitchInst *S = new SwitchInst(tmpVal, tmpBB, (yyvsp[-1].JumpTable)->size());
-    (yyval.TermInstVal) = S;
+    SwitchInst *S = new SwitchInst(tmpVal, tmpBB, yyvsp[-1].JumpTable->size());
+    yyval.TermInstVal = S;
 
-    std::vector<std::pair<Constant*,BasicBlock*> >::iterator I = (yyvsp[-1].JumpTable)->begin(),
-      E = (yyvsp[-1].JumpTable)->end();
+    std::vector<std::pair<Constant*,BasicBlock*> >::iterator I = yyvsp[-1].JumpTable->begin(),
+      E = yyvsp[-1].JumpTable->end();
     for (; I != E; ++I) {
       if (ConstantInt *CI = dyn_cast<ConstantInt>(I->first))
           S->addCase(CI, I->second);
       else
         GEN_ERROR("Switch case is constant, but not a simple integer!");
     }
-    delete (yyvsp[-1].JumpTable);
+    delete yyvsp[-1].JumpTable;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 210:
-#line 2273 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    Value* tmpVal = getVal((yyvsp[-6].PrimType), (yyvsp[-5].ValIDVal));
+  ;
+    break;}
+case 209:
+#line 2273 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    Value* tmpVal = getVal(yyvsp[-6].PrimType, yyvsp[-5].ValIDVal);
     CHECK_FOR_ERROR
-    BasicBlock* tmpBB = getBBVal((yyvsp[-2].ValIDVal));
+    BasicBlock* tmpBB = getBBVal(yyvsp[-2].ValIDVal);
     CHECK_FOR_ERROR
     SwitchInst *S = new SwitchInst(tmpVal, tmpBB, 0);
-    (yyval.TermInstVal) = S;
+    yyval.TermInstVal = S;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 211:
-#line 2283 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 210:
+#line 2283 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     const PointerType *PFTy;
     const FunctionType *Ty;
 
-    if (!(PFTy = dyn_cast<PointerType>((yyvsp[-10].TypeVal)->get())) ||
+    if (!(PFTy = dyn_cast<PointerType>(yyvsp[-10].TypeVal->get())) ||
         !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
       // Pull out the types of all of the arguments...
       std::vector<const Type*> ParamTypes;
-      if ((yyvsp[-7].ValueList)) {
-        for (std::vector<Value*>::iterator I = (yyvsp[-7].ValueList)->begin(), E = (yyvsp[-7].ValueList)->end();
+      if (yyvsp[-7].ValueList) {
+        for (std::vector<Value*>::iterator I = yyvsp[-7].ValueList->begin(), E = yyvsp[-7].ValueList->end();
              I != E; ++I)
           ParamTypes.push_back((*I)->getType());
       }
@@ -4629,27 +3887,27 @@
       bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy;
       if (isVarArg) ParamTypes.pop_back();
 
-      Ty = FunctionType::get((yyvsp[-10].TypeVal)->get(), ParamTypes, isVarArg);
+      Ty = FunctionType::get(yyvsp[-10].TypeVal->get(), ParamTypes, isVarArg);
       PFTy = PointerType::get(Ty);
     }
 
-    Value *V = getVal(PFTy, (yyvsp[-9].ValIDVal));   // Get the function we're calling...
+    Value *V = getVal(PFTy, yyvsp[-9].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
 
     // Create the call node...
-    if (!(yyvsp[-7].ValueList)) {                                   // Has no arguments?
-      (yyval.TermInstVal) = new InvokeInst(V, Normal, Except, std::vector<Value*>());
+    if (!yyvsp[-7].ValueList) {                                   // Has no arguments?
+      yyval.TermInstVal = new InvokeInst(V, Normal, Except, std::vector<Value*>());
     } else {                                     // Has arguments?
       // Loop through FunctionType's arguments and ensure they are specified
       // correctly!
       //
       FunctionType::param_iterator I = Ty->param_begin();
       FunctionType::param_iterator E = Ty->param_end();
-      std::vector<Value*>::iterator ArgI = (yyvsp[-7].ValueList)->begin(), ArgE = (yyvsp[-7].ValueList)->end();
+      std::vector<Value*>::iterator ArgI = yyvsp[-7].ValueList->begin(), ArgE = yyvsp[-7].ValueList->end();
 
       for (; ArgI != ArgE && I != E; ++ArgI, ++I)
         if ((*ArgI)->getType() != *I)
@@ -4659,263 +3917,242 @@
       if (I != E || (ArgI != ArgE && !Ty->isVarArg()))
         GEN_ERROR("Invalid number of parameters detected!");
 
-      (yyval.TermInstVal) = new InvokeInst(V, Normal, Except, *(yyvsp[-7].ValueList));
+      yyval.TermInstVal = new InvokeInst(V, Normal, Except, *yyvsp[-7].ValueList);
     }
-    cast<InvokeInst>((yyval.TermInstVal))->setCallingConv((yyvsp[-11].UIntVal));
+    cast<InvokeInst>(yyval.TermInstVal)->setCallingConv(yyvsp[-11].UIntVal);
   
-    delete (yyvsp[-10].TypeVal);
-    delete (yyvsp[-7].ValueList);
+    delete yyvsp[-10].TypeVal;
+    delete yyvsp[-7].ValueList;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 212:
-#line 2338 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.TermInstVal) = new UnwindInst();
+  ;
+    break;}
+case 211:
+#line 2338 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.TermInstVal = new UnwindInst();
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 213:
-#line 2342 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.TermInstVal) = new UnreachableInst();
+  ;
+    break;}
+case 212:
+#line 2342 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.TermInstVal = new UnreachableInst();
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 214:
-#line 2349 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.JumpTable) = (yyvsp[-5].JumpTable);
-    Constant *V = cast<Constant>(getValNonImprovising((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
+  ;
+    break;}
+case 213:
+#line 2349 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.JumpTable = yyvsp[-5].JumpTable;
+    Constant *V = cast<Constant>(getValNonImprovising(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 215:
-#line 2360 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
-    Constant *V = cast<Constant>(getValNonImprovising((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
+    yyval.JumpTable->push_back(std::make_pair(V, tmpBB));
+  ;
+    break;}
+case 214:
+#line 2360 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.JumpTable = new std::vector<std::pair<Constant*, BasicBlock*> >();
+    Constant *V = cast<Constant>(getValNonImprovising(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 216:
-#line 2373 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
+    yyval.JumpTable->push_back(std::make_pair(V, tmpBB)); 
+  ;
+    break;}
+case 215:
+#line 2373 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
   // Is this definition named?? if so, assign the name...
-  setValueName((yyvsp[0].InstVal), (yyvsp[-1].StrVal));
+  setValueName(yyvsp[0].InstVal, yyvsp[-1].StrVal);
   CHECK_FOR_ERROR
-  InsertValue((yyvsp[0].InstVal));
-  (yyval.InstVal) = (yyvsp[0].InstVal);
+  InsertValue(yyvsp[0].InstVal);
+  yyval.InstVal = yyvsp[0].InstVal;
   CHECK_FOR_ERROR
-;}
-    break;
-
-  case 217:
-#line 2382 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {    // Used for PHI nodes
-    (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 218:
-#line 2391 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.PHIList) = (yyvsp[-6].PHIList);
-    Value* tmpVal = getVal((yyvsp[-6].PHIList)->front().first->getType(), (yyvsp[-3].ValIDVal));
+;
+    break;}
+case 216:
+#line 2382 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{    // Used for PHI nodes
+    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 217:
+#line 2391 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.PHIList = yyvsp[-6].PHIList;
+    Value* tmpVal = getVal(yyvsp[-6].PHIList->front().first->getType(), yyvsp[-3].ValIDVal);
     CHECK_FOR_ERROR
-    BasicBlock* tmpBB = getBBVal((yyvsp[-1].ValIDVal));
+    BasicBlock* tmpBB = getBBVal(yyvsp[-1].ValIDVal);
     CHECK_FOR_ERROR
-    (yyvsp[-6].PHIList)->push_back(std::make_pair(tmpVal, tmpBB));
-  ;}
-    break;
-
-  case 219:
-#line 2401 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {    // Used for call statements, and memory insts...
-    (yyval.ValueList) = new std::vector<Value*>();
-    (yyval.ValueList)->push_back((yyvsp[0].ValueVal));
-  ;}
-    break;
-
-  case 220:
-#line 2405 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.ValueList) = (yyvsp[-2].ValueList);
-    (yyvsp[-2].ValueList)->push_back((yyvsp[0].ValueVal));
+    yyvsp[-6].PHIList->push_back(std::make_pair(tmpVal, tmpBB));
+  ;
+    break;}
+case 218:
+#line 2401 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{    // Used for call statements, and memory insts...
+    yyval.ValueList = new std::vector<Value*>();
+    yyval.ValueList->push_back(yyvsp[0].ValueVal);
+  ;
+    break;}
+case 219:
+#line 2405 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.ValueList = yyvsp[-2].ValueList;
+    yyvsp[-2].ValueList->push_back(yyvsp[0].ValueVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 222:
-#line 2412 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ValueList) = 0; ;}
-    break;
-
-  case 223:
-#line 2414 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.BoolVal) = true;
+  ;
+    break;}
+case 221:
+#line 2412 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.ValueList = 0; ;
+    break;}
+case 222:
+#line 2414 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.BoolVal = true;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 224:
-#line 2418 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.BoolVal) = false;
+  ;
+    break;}
+case 223:
+#line 2418 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.BoolVal = false;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 225:
-#line 2423 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (!(*(yyvsp[-3].TypeVal))->isInteger() && !(*(yyvsp[-3].TypeVal))->isFloatingPoint() && 
-        !isa<PackedType>((*(yyvsp[-3].TypeVal)).get()))
+  ;
+    break;}
+case 224:
+#line 2423 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!(*yyvsp[-3].TypeVal)->isInteger() && !(*yyvsp[-3].TypeVal)->isFloatingPoint() && 
+        !isa<PackedType>((*yyvsp[-3].TypeVal).get()))
       GEN_ERROR(
         "Arithmetic operator requires integer, FP, or packed operands!");
-    if (isa<PackedType>((*(yyvsp[-3].TypeVal)).get()) && (yyvsp[-4].BinaryOpVal) == Instruction::Rem)
+    if (isa<PackedType>((*yyvsp[-3].TypeVal).get()) && yyvsp[-4].BinaryOpVal == Instruction::Rem)
       GEN_ERROR("Rem not supported on packed 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 226:
-#line 2439 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (!(*(yyvsp[-3].TypeVal))->isIntegral()) {
-      if (!isa<PackedType>((yyvsp[-3].TypeVal)->get()) ||
-          !cast<PackedType>((yyvsp[-3].TypeVal)->get())->getElementType()->isIntegral())
+    delete yyvsp[-3].TypeVal;
+  ;
+    break;}
+case 225:
+#line 2439 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!(*yyvsp[-3].TypeVal)->isIntegral()) {
+      if (!isa<PackedType>(yyvsp[-3].TypeVal->get()) ||
+          !cast<PackedType>(yyvsp[-3].TypeVal->get())->getElementType()->isIntegral())
         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 227:
-#line 2454 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if(isa<PackedType>((*(yyvsp[-3].TypeVal)).get())) {
+    delete yyvsp[-3].TypeVal;
+  ;
+    break;}
+case 226:
+#line 2454 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if(isa<PackedType>((*yyvsp[-3].TypeVal).get())) {
       GEN_ERROR(
         "PackedTypes currently not supported in setcc instructions!");
     }
-    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) = new SetCondInst((yyvsp[-4].BinaryOpVal), tmpVal1, tmpVal2);
-    if ((yyval.InstVal) == 0)
+    yyval.InstVal = new SetCondInst(yyvsp[-4].BinaryOpVal, tmpVal1, tmpVal2);
+    if (yyval.InstVal == 0)
       GEN_ERROR("binary operator returned null!");
-    delete (yyvsp[-3].TypeVal);
-  ;}
-    break;
-
-  case 228:
-#line 2468 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
+    delete yyvsp[-3].TypeVal;
+  ;
+    break;}
+case 227:
+#line 2468 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     std::cerr << "WARNING: Use of eliminated 'not' instruction:"
               << " Replacing with 'xor'.\n";
 
-    Value *Ones = ConstantIntegral::getAllOnesValue((yyvsp[0].ValueVal)->getType());
+    Value *Ones = ConstantIntegral::getAllOnesValue(yyvsp[0].ValueVal->getType());
     if (Ones == 0)
       GEN_ERROR("Expected integral type for not instruction!");
 
-    (yyval.InstVal) = BinaryOperator::create(Instruction::Xor, (yyvsp[0].ValueVal), Ones);
-    if ((yyval.InstVal) == 0)
+    yyval.InstVal = BinaryOperator::create(Instruction::Xor, yyvsp[0].ValueVal, Ones);
+    if (yyval.InstVal == 0)
       GEN_ERROR("Could not create a xor instruction!");
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 229:
-#line 2481 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if ((yyvsp[0].ValueVal)->getType() != Type::UByteTy)
+  ;
+    break;}
+case 228:
+#line 2481 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (yyvsp[0].ValueVal->getType() != Type::UByteTy)
       GEN_ERROR("Shift amount must be ubyte!");
-    if (!(yyvsp[-2].ValueVal)->getType()->isInteger())
+    if (!yyvsp[-2].ValueVal->getType()->isInteger())
       GEN_ERROR("Shift constant expression requires integer operand!");
-    (yyval.InstVal) = new ShiftInst((yyvsp[-3].OtherOpVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal));
+    yyval.InstVal = new ShiftInst(yyvsp[-3].OtherOpVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 230:
-#line 2489 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (!(yyvsp[0].TypeVal)->get()->isFirstClassType())
+  ;
+    break;}
+case 229:
+#line 2489 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!yyvsp[0].TypeVal->get()->isFirstClassType())
       GEN_ERROR("cast instruction to a non-primitive type: '" +
-                     (yyvsp[0].TypeVal)->get()->getDescription() + "'!");
-    (yyval.InstVal) = new CastInst((yyvsp[-2].ValueVal), *(yyvsp[0].TypeVal));
-    delete (yyvsp[0].TypeVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 231:
-#line 2497 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if ((yyvsp[-4].ValueVal)->getType() != Type::BoolTy)
+                     yyvsp[0].TypeVal->get()->getDescription() + "'!");
+    yyval.InstVal = new CastInst(yyvsp[-2].ValueVal, *yyvsp[0].TypeVal);
+    delete yyvsp[0].TypeVal;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 230:
+#line 2497 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (yyvsp[-4].ValueVal->getType() != Type::BoolTy)
       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 232:
-#line 2505 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 231:
+#line 2505 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     NewVarArgs = true;
-    (yyval.InstVal) = new VAArgInst((yyvsp[-2].ValueVal), *(yyvsp[0].TypeVal));
-    delete (yyvsp[0].TypeVal);
+    yyval.InstVal = new VAArgInst(yyvsp[-2].ValueVal, *yyvsp[0].TypeVal);
+    delete yyvsp[0].TypeVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 233:
-#line 2511 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 232:
+#line 2511 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     ObsoleteVarArgs = true;
-    const Type* ArgTy = (yyvsp[-2].ValueVal)->getType();
+    const Type* ArgTy = yyvsp[-2].ValueVal->getType();
     Function* NF = CurModule.CurrentModule->
       getOrInsertFunction("llvm.va_copy", ArgTy, ArgTy, (Type *)0);
 
@@ -4926,20 +4163,19 @@
     //b = vaarg foo, t
     AllocaInst* foo = new AllocaInst(ArgTy, 0, "vaarg.fix");
     CurBB->getInstList().push_back(foo);
-    CallInst* bar = new CallInst(NF, (yyvsp[-2].ValueVal));
+    CallInst* bar = new CallInst(NF, yyvsp[-2].ValueVal);
     CurBB->getInstList().push_back(bar);
     CurBB->getInstList().push_back(new StoreInst(bar, foo));
-    (yyval.InstVal) = new VAArgInst(foo, *(yyvsp[0].TypeVal));
-    delete (yyvsp[0].TypeVal);
+    yyval.InstVal = new VAArgInst(foo, *yyvsp[0].TypeVal);
+    delete yyvsp[0].TypeVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 234:
-#line 2531 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 233:
+#line 2531 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     ObsoleteVarArgs = true;
-    const Type* ArgTy = (yyvsp[-2].ValueVal)->getType();
+    const Type* ArgTy = yyvsp[-2].ValueVal->getType();
     Function* NF = CurModule.CurrentModule->
       getOrInsertFunction("llvm.va_copy", ArgTy, ArgTy, (Type *)0);
 
@@ -4951,78 +4187,73 @@
     //b = load foo
     AllocaInst* foo = new AllocaInst(ArgTy, 0, "vanext.fix");
     CurBB->getInstList().push_back(foo);
-    CallInst* bar = new CallInst(NF, (yyvsp[-2].ValueVal));
+    CallInst* bar = new CallInst(NF, yyvsp[-2].ValueVal);
     CurBB->getInstList().push_back(bar);
     CurBB->getInstList().push_back(new StoreInst(bar, foo));
-    Instruction* tmp = new VAArgInst(foo, *(yyvsp[0].TypeVal));
+    Instruction* tmp = new VAArgInst(foo, *yyvsp[0].TypeVal);
     CurBB->getInstList().push_back(tmp);
-    (yyval.InstVal) = new LoadInst(foo);
-    delete (yyvsp[0].TypeVal);
+    yyval.InstVal = new LoadInst(foo);
+    delete yyvsp[0].TypeVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 235:
-#line 2554 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (!ExtractElementInst::isValidOperands((yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
+  ;
+    break;}
+case 234:
+#line 2554 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!ExtractElementInst::isValidOperands(yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
       GEN_ERROR("Invalid extractelement operands!");
-    (yyval.InstVal) = new ExtractElementInst((yyvsp[-2].ValueVal), (yyvsp[0].ValueVal));
+    yyval.InstVal = new ExtractElementInst(yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 236:
-#line 2560 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (!InsertElementInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
+  ;
+    break;}
+case 235:
+#line 2560 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!InsertElementInst::isValidOperands(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
       GEN_ERROR("Invalid insertelement operands!");
-    (yyval.InstVal) = new InsertElementInst((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal));
+    yyval.InstVal = new InsertElementInst(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 237:
-#line 2566 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (!ShuffleVectorInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
+  ;
+    break;}
+case 236:
+#line 2566 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!ShuffleVectorInst::isValidOperands(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
       GEN_ERROR("Invalid shufflevector operands!");
-    (yyval.InstVal) = new ShuffleVectorInst((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal));
+    yyval.InstVal = new ShuffleVectorInst(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 238:
-#line 2572 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    const Type *Ty = (yyvsp[0].PHIList)->front().first->getType();
+  ;
+    break;}
+case 237:
+#line 2572 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    const Type *Ty = yyvsp[0].PHIList->front().first->getType();
     if (!Ty->isFirstClassType())
       GEN_ERROR("PHI node operands must be of first class type!");
-    (yyval.InstVal) = new PHINode(Ty);
-    ((PHINode*)(yyval.InstVal))->reserveOperandSpace((yyvsp[0].PHIList)->size());
-    while ((yyvsp[0].PHIList)->begin() != (yyvsp[0].PHIList)->end()) {
-      if ((yyvsp[0].PHIList)->front().first->getType() != Ty) 
+    yyval.InstVal = new PHINode(Ty);
+    ((PHINode*)yyval.InstVal)->reserveOperandSpace(yyvsp[0].PHIList->size());
+    while (yyvsp[0].PHIList->begin() != yyvsp[0].PHIList->end()) {
+      if (yyvsp[0].PHIList->front().first->getType() != Ty) 
         GEN_ERROR("All elements of a PHI node must be of the same type!");
-      cast<PHINode>((yyval.InstVal))->addIncoming((yyvsp[0].PHIList)->front().first, (yyvsp[0].PHIList)->front().second);
-      (yyvsp[0].PHIList)->pop_front();
+      cast<PHINode>(yyval.InstVal)->addIncoming(yyvsp[0].PHIList->front().first, yyvsp[0].PHIList->front().second);
+      yyvsp[0].PHIList->pop_front();
     }
-    delete (yyvsp[0].PHIList);  // Free the list...
+    delete yyvsp[0].PHIList;  // Free the list...
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 239:
-#line 2587 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
+  ;
+    break;}
+case 238:
+#line 2587 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
     const PointerType *PFTy;
     const FunctionType *Ty;
 
-    if (!(PFTy = dyn_cast<PointerType>((yyvsp[-4].TypeVal)->get())) ||
+    if (!(PFTy = dyn_cast<PointerType>(yyvsp[-4].TypeVal->get())) ||
         !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
       // Pull out the types of all of the arguments...
       std::vector<const Type*> ParamTypes;
-      if ((yyvsp[-1].ValueList)) {
-        for (std::vector<Value*>::iterator I = (yyvsp[-1].ValueList)->begin(), E = (yyvsp[-1].ValueList)->end();
+      if (yyvsp[-1].ValueList) {
+        for (std::vector<Value*>::iterator I = yyvsp[-1].ValueList->begin(), E = yyvsp[-1].ValueList->end();
              I != E; ++I)
           ParamTypes.push_back((*I)->getType());
       }
@@ -5030,31 +4261,31 @@
       bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy;
       if (isVarArg) ParamTypes.pop_back();
 
-      if (!(*(yyvsp[-4].TypeVal))->isFirstClassType() && *(yyvsp[-4].TypeVal) != Type::VoidTy)
+      if (!(*yyvsp[-4].TypeVal)->isFirstClassType() && *yyvsp[-4].TypeVal != Type::VoidTy)
         GEN_ERROR("LLVM functions cannot return aggregate types!");
 
-      Ty = FunctionType::get((yyvsp[-4].TypeVal)->get(), ParamTypes, isVarArg);
+      Ty = FunctionType::get(yyvsp[-4].TypeVal->get(), ParamTypes, isVarArg);
       PFTy = PointerType::get(Ty);
     }
 
-    Value *V = getVal(PFTy, (yyvsp[-3].ValIDVal));   // Get the function we're calling...
+    Value *V = getVal(PFTy, yyvsp[-3].ValIDVal);   // Get the function we're calling...
     CHECK_FOR_ERROR
 
     // Create the call node...
-    if (!(yyvsp[-1].ValueList)) {                                   // Has no arguments?
+    if (!yyvsp[-1].ValueList) {                                   // Has no arguments?
       // Make sure no arguments is a good thing!
       if (Ty->getNumParams() != 0)
         GEN_ERROR("No arguments passed to a function that "
                        "expects arguments!");
 
-      (yyval.InstVal) = new CallInst(V, std::vector<Value*>());
+      yyval.InstVal = new CallInst(V, std::vector<Value*>());
     } else {                                     // Has arguments?
       // Loop through FunctionType's arguments and ensure they are specified
       // correctly!
       //
       FunctionType::param_iterator I = Ty->param_begin();
       FunctionType::param_iterator E = Ty->param_end();
-      std::vector<Value*>::iterator ArgI = (yyvsp[-1].ValueList)->begin(), ArgE = (yyvsp[-1].ValueList)->end();
+      std::vector<Value*>::iterator ArgI = yyvsp[-1].ValueList->begin(), ArgE = yyvsp[-1].ValueList->end();
 
       for (; ArgI != ArgE && I != E; ++ArgI, ++I)
         if ((*ArgI)->getType() != *I)
@@ -5064,442 +4295,377 @@
       if (I != E || (ArgI != ArgE && !Ty->isVarArg()))
         GEN_ERROR("Invalid number of parameters detected!");
 
-      (yyval.InstVal) = new CallInst(V, *(yyvsp[-1].ValueList));
+      yyval.InstVal = new CallInst(V, *yyvsp[-1].ValueList);
     }
-    cast<CallInst>((yyval.InstVal))->setTailCall((yyvsp[-6].BoolVal));
-    cast<CallInst>((yyval.InstVal))->setCallingConv((yyvsp[-5].UIntVal));
-    delete (yyvsp[-4].TypeVal);
-    delete (yyvsp[-1].ValueList);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 240:
-#line 2646 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.InstVal) = (yyvsp[0].InstVal);
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 241:
-#line 2653 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { 
-    (yyval.ValueList) = (yyvsp[0].ValueList); 
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 242:
-#line 2656 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    { 
-    (yyval.ValueList) = new std::vector<Value*>(); 
+    cast<CallInst>(yyval.InstVal)->setTailCall(yyvsp[-6].BoolVal);
+    cast<CallInst>(yyval.InstVal)->setCallingConv(yyvsp[-5].UIntVal);
+    delete yyvsp[-4].TypeVal;
+    delete yyvsp[-1].ValueList;
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 239:
+#line 2646 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.InstVal = yyvsp[0].InstVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 243:
-#line 2661 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.BoolVal) = true;
+  ;
+    break;}
+case 240:
+#line 2653 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ 
+    yyval.ValueList = yyvsp[0].ValueList; 
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 241:
+#line 2656 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ 
+    yyval.ValueList = new std::vector<Value*>(); 
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 242:
+#line 2661 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.BoolVal = true;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 244:
-#line 2665 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.BoolVal) = false;
+  ;
+    break;}
+case 243:
+#line 2665 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.BoolVal = false;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 245:
-#line 2672 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.InstVal) = new MallocInst(*(yyvsp[-1].TypeVal), 0, (yyvsp[0].UIntVal));
-    delete (yyvsp[-1].TypeVal);
+  ;
+    break;}
+case 244:
+#line 2672 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.InstVal = new MallocInst(*yyvsp[-1].TypeVal, 0, yyvsp[0].UIntVal);
+    delete yyvsp[-1].TypeVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 246:
-#line 2677 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    Value* tmpVal = getVal((yyvsp[-2].PrimType), (yyvsp[-1].ValIDVal));
+  ;
+    break;}
+case 245:
+#line 2677 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    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 247:
-#line 2683 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.InstVal) = new AllocaInst(*(yyvsp[-1].TypeVal), 0, (yyvsp[0].UIntVal));
-    delete (yyvsp[-1].TypeVal);
+    yyval.InstVal = new MallocInst(*yyvsp[-4].TypeVal, tmpVal, yyvsp[0].UIntVal);
+    delete yyvsp[-4].TypeVal;
+  ;
+    break;}
+case 246:
+#line 2683 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    yyval.InstVal = new AllocaInst(*yyvsp[-1].TypeVal, 0, yyvsp[0].UIntVal);
+    delete yyvsp[-1].TypeVal;
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 248:
-#line 2688 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    Value* tmpVal = getVal((yyvsp[-2].PrimType), (yyvsp[-1].ValIDVal));
+  ;
+    break;}
+case 247:
+#line 2688 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    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 249:
-#line 2694 "/proj/llvm/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 248:
+#line 2694 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!isa<PointerType>(yyvsp[0].ValueVal->getType()))
       GEN_ERROR("Trying to free nonpointer type " + 
-                     (yyvsp[0].ValueVal)->getType()->getDescription() + "!");
-    (yyval.InstVal) = new FreeInst((yyvsp[0].ValueVal));
+                     yyvsp[0].ValueVal->getType()->getDescription() + "!");
+    yyval.InstVal = new FreeInst(yyvsp[0].ValueVal);
     CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 250:
-#line 2702 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (!isa<PointerType>((yyvsp[-1].TypeVal)->get()))
+  ;
+    break;}
+case 249:
+#line 2702 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!isa<PointerType>(yyvsp[-1].TypeVal->get()))
       GEN_ERROR("Can't load from nonpointer type: " +
-                     (*(yyvsp[-1].TypeVal))->getDescription());
-    if (!cast<PointerType>((yyvsp[-1].TypeVal)->get())->getElementType()->isFirstClassType())
+                     (*yyvsp[-1].TypeVal)->getDescription());
+    if (!cast<PointerType>(yyvsp[-1].TypeVal->get())->getElementType()->isFirstClassType())
       GEN_ERROR("Can't load from pointer of non-first-class type: " +
-                     (*(yyvsp[-1].TypeVal))->getDescription());
-    Value* tmpVal = getVal(*(yyvsp[-1].TypeVal), (yyvsp[0].ValIDVal));
+                     (*yyvsp[-1].TypeVal)->getDescription());
+    Value* tmpVal = getVal(*yyvsp[-1].TypeVal, yyvsp[0].ValIDVal);
     CHECK_FOR_ERROR
-    (yyval.InstVal) = new LoadInst(tmpVal, "", (yyvsp[-3].BoolVal));
-    delete (yyvsp[-1].TypeVal);
-  ;}
-    break;
-
-  case 251:
-#line 2714 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    const PointerType *PT = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
+    yyval.InstVal = new LoadInst(tmpVal, "", yyvsp[-3].BoolVal);
+    delete yyvsp[-1].TypeVal;
+  ;
+    break;}
+case 250:
+#line 2714 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    const PointerType *PT = dyn_cast<PointerType>(yyvsp[-1].TypeVal->get());
     if (!PT)
       GEN_ERROR("Can't store to a nonpointer type: " +
-                     (*(yyvsp[-1].TypeVal))->getDescription());
+                     (*yyvsp[-1].TypeVal)->getDescription());
     const Type *ElTy = PT->getElementType();
-    if (ElTy != (yyvsp[-3].ValueVal)->getType())
-      GEN_ERROR("Can't store '" + (yyvsp[-3].ValueVal)->getType()->getDescription() +
+    if (ElTy != yyvsp[-3].ValueVal->getType())
+      GEN_ERROR("Can't store '" + yyvsp[-3].ValueVal->getType()->getDescription() +
                      "' into space of type '" + ElTy->getDescription() + "'!");
 
-    Value* tmpVal = getVal(*(yyvsp[-1].TypeVal), (yyvsp[0].ValIDVal));
+    Value* tmpVal = getVal(*yyvsp[-1].TypeVal, yyvsp[0].ValIDVal);
     CHECK_FOR_ERROR
-    (yyval.InstVal) = new StoreInst((yyvsp[-3].ValueVal), tmpVal, (yyvsp[-5].BoolVal));
-    delete (yyvsp[-1].TypeVal);
-  ;}
-    break;
-
-  case 252:
-#line 2729 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (!isa<PointerType>((yyvsp[-2].TypeVal)->get()))
+    yyval.InstVal = new StoreInst(yyvsp[-3].ValueVal, tmpVal, yyvsp[-5].BoolVal);
+    delete yyvsp[-1].TypeVal;
+  ;
+    break;}
+case 251:
+#line 2729 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    if (!isa<PointerType>(yyvsp[-2].TypeVal->get()))
       GEN_ERROR("getelementptr insn requires pointer operand!");
 
     // LLVM 1.2 and earlier used ubyte struct indices.  Convert any ubyte struct
     // indices to uint struct indices for compatibility.
     generic_gep_type_iterator<std::vector<Value*>::iterator>
-      GTI = gep_type_begin((yyvsp[-2].TypeVal)->get(), (yyvsp[0].ValueList)->begin(), (yyvsp[0].ValueList)->end()),
-      GTE = gep_type_end((yyvsp[-2].TypeVal)->get(), (yyvsp[0].ValueList)->begin(), (yyvsp[0].ValueList)->end());
-    for (unsigned i = 0, e = (yyvsp[0].ValueList)->size(); i != e && GTI != GTE; ++i, ++GTI)
+      GTI = gep_type_begin(yyvsp[-2].TypeVal->get(), yyvsp[0].ValueList->begin(), yyvsp[0].ValueList->end()),
+      GTE = gep_type_end(yyvsp[-2].TypeVal->get(), yyvsp[0].ValueList->begin(), yyvsp[0].ValueList->end());
+    for (unsigned i = 0, e = yyvsp[0].ValueList->size(); i != e && GTI != GTE; ++i, ++GTI)
       if (isa<StructType>(*GTI))        // Only change struct indices
-        if (ConstantInt *CUI = dyn_cast<ConstantInt>((*(yyvsp[0].ValueList))[i]))
+        if (ConstantInt *CUI = dyn_cast<ConstantInt>((*yyvsp[0].ValueList)[i]))
           if (CUI->getType() == Type::UByteTy)
-            (*(yyvsp[0].ValueList))[i] = ConstantExpr::getCast(CUI, Type::UIntTy);
+            (*yyvsp[0].ValueList)[i] = ConstantExpr::getCast(CUI, Type::UIntTy);
 
-    if (!GetElementPtrInst::getIndexedType(*(yyvsp[-2].TypeVal), *(yyvsp[0].ValueList), true))
+    if (!GetElementPtrInst::getIndexedType(*yyvsp[-2].TypeVal, *yyvsp[0].ValueList, 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));
-    delete (yyvsp[-2].TypeVal); 
-    delete (yyvsp[0].ValueList);
-  ;}
-    break;
-
-
-      default: break;
-    }
-
-/* Line 1126 of yacc.c.  */
-#line 5235 "llvmAsmParser.tab.c"
+    yyval.InstVal = new GetElementPtrInst(tmpVal, *yyvsp[0].ValueList);
+    delete yyvsp[-2].TypeVal; 
+    delete yyvsp[0].ValueList;
+  ;
+    break;}
+}
+   /* the action file gets copied in in place of this dollarsign */
+#line 543 "/usr/share/bison.simple"
 
   yyvsp -= yylen;
   yyssp -= yylen;
+#ifdef YYLSP_NEEDED
+  yylsp -= yylen;
+#endif
 
-
-  YY_STACK_PRINT (yyss, yyssp);
+#if YYDEBUG != 0
+  if (yydebug)
+    {
+      short *ssp1 = yyss - 1;
+      fprintf (stderr, "state stack now");
+      while (ssp1 != yyssp)
+	fprintf (stderr, " %d", *++ssp1);
+      fprintf (stderr, "\n");
+    }
+#endif
 
   *++yyvsp = yyval;
 
+#ifdef YYLSP_NEEDED
+  yylsp++;
+  if (yylen == 0)
+    {
+      yylsp->first_line = yylloc.first_line;
+      yylsp->first_column = yylloc.first_column;
+      yylsp->last_line = (yylsp-1)->last_line;
+      yylsp->last_column = (yylsp-1)->last_column;
+      yylsp->text = 0;
+    }
+  else
+    {
+      yylsp->last_line = (yylsp+yylen-1)->last_line;
+      yylsp->last_column = (yylsp+yylen-1)->last_column;
+    }
+#endif
 
-  /* Now `shift' the result of the reduction.  Determine what state
-     that goes to, based on the state we popped back to and the rule
-     number reduced by.  */
+  /* Now "shift" the result of the reduction.
+     Determine what state that goes to,
+     based on the state we popped back to
+     and the rule number reduced by.  */
 
   yyn = yyr1[yyn];
 
-  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
-  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
+  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
     yystate = yytable[yystate];
   else
-    yystate = yydefgoto[yyn - YYNTOKENS];
+    yystate = yydefgoto[yyn - YYNTBASE];
 
   goto yynewstate;
 
+yyerrlab:   /* here on detecting error */
 
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
-yyerrlab:
-  /* If not already recovering from an error, report this error.  */
-  if (!yyerrstatus)
+  if (! yyerrstatus)
+    /* If not already recovering from an error, report this error.  */
     {
       ++yynerrs;
-#if YYERROR_VERBOSE
+
+#ifdef YYERROR_VERBOSE
       yyn = yypact[yystate];
 
-      if (YYPACT_NINF < yyn && yyn < YYLAST)
+      if (yyn > YYFLAG && yyn < YYLAST)
 	{
-	  int yytype = YYTRANSLATE (yychar);
-	  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-	  YYSIZE_T yysize = yysize0;
-	  YYSIZE_T yysize1;
-	  int yysize_overflow = 0;
-	  char *yymsg = 0;
-#	  define YYERROR_VERBOSE_ARGS_MAXIMUM 5
-	  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-	  int yyx;
-
-#if 0
-	  /* This is so xgettext sees the translatable formats that are
-	     constructed on the fly.  */
-	  YY_("syntax error, unexpected %s");
-	  YY_("syntax error, unexpected %s, expecting %s");
-	  YY_("syntax error, unexpected %s, expecting %s or %s");
-	  YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-	  YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-#endif
-	  char *yyfmt;
-	  char const *yyf;
-	  static char const yyunexpected[] = "syntax error, unexpected %s";
-	  static char const yyexpecting[] = ", expecting %s";
-	  static char const yyor[] = " or %s";
-	  char yyformat[sizeof yyunexpected
-			+ sizeof yyexpecting - 1
-			+ ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-			   * (sizeof yyor - 1))];
-	  char const *yyprefix = yyexpecting;
-
-	  /* Start YYX at -YYN if negative to avoid negative indexes in
-	     YYCHECK.  */
-	  int yyxbegin = yyn < 0 ? -yyn : 0;
-
-	  /* Stay within bounds of both yycheck and yytname.  */
-	  int yychecklim = YYLAST - yyn;
-	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-	  int yycount = 1;
-
-	  yyarg[0] = yytname[yytype];
-	  yyfmt = yystpcpy (yyformat, yyunexpected);
-
-	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	      {
-		if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-		  {
-		    yycount = 1;
-		    yysize = yysize0;
-		    yyformat[sizeof yyunexpected - 1] = '\0';
-		    break;
-		  }
-		yyarg[yycount++] = yytname[yyx];
-		yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-		yysize_overflow |= yysize1 < yysize;
-		yysize = yysize1;
-		yyfmt = yystpcpy (yyfmt, yyprefix);
-		yyprefix = yyor;
-	      }
-
-	  yyf = YY_(yyformat);
-	  yysize1 = yysize + yystrlen (yyf);
-	  yysize_overflow |= yysize1 < yysize;
-	  yysize = yysize1;
-
-	  if (!yysize_overflow && yysize <= YYSTACK_ALLOC_MAXIMUM)
-	    yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg)
+	  int size = 0;
+	  char *msg;
+	  int x, count;
+
+	  count = 0;
+	  /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
+	  for (x = (yyn < 0 ? -yyn : 0);
+	       x < (sizeof(yytname) / sizeof(char *)); x++)
+	    if (yycheck[x + yyn] == x)
+	      size += strlen(yytname[x]) + 15, count++;
+	  msg = (char *) malloc(size + 15);
+	  if (msg != 0)
 	    {
-	      /* Avoid sprintf, as that infringes on the user's name space.
-		 Don't have undefined behavior even if the translation
-		 produced a string with the wrong number of "%s"s.  */
-	      char *yyp = yymsg;
-	      int yyi = 0;
-	      while ((*yyp = *yyf))
+	      strcpy(msg, "parse error");
+
+	      if (count < 5)
 		{
-		  if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		    {
-		      yyp += yytnamerr (yyp, yyarg[yyi++]);
-		      yyf += 2;
-		    }
-		  else
-		    {
-		      yyp++;
-		      yyf++;
-		    }
+		  count = 0;
+		  for (x = (yyn < 0 ? -yyn : 0);
+		       x < (sizeof(yytname) / sizeof(char *)); x++)
+		    if (yycheck[x + yyn] == x)
+		      {
+			strcat(msg, count == 0 ? ", expecting `" : " or `");
+			strcat(msg, yytname[x]);
+			strcat(msg, "'");
+			count++;
+		      }
 		}
-	      yyerror (yymsg);
-	      YYSTACK_FREE (yymsg);
+	      yyerror(msg);
+	      free(msg);
 	    }
 	  else
-	    {
-	      yyerror (YY_("syntax error"));
-	      goto yyexhaustedlab;
-	    }
+	    yyerror ("parse error; also virtual memory exceeded");
 	}
       else
 #endif /* YYERROR_VERBOSE */
-	yyerror (YY_("syntax error"));
+	yyerror("parse error");
     }
 
-
+  goto yyerrlab1;
+yyerrlab1:   /* here on error raised explicitly by an action */
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse look-ahead token after an
-	 error, discard it.  */
+      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
 
-      if (yychar <= YYEOF)
-        {
-	  /* Return failure if at end of input.  */
-	  if (yychar == YYEOF)
-	    YYABORT;
-        }
-      else
-	{
-	  yydestruct ("Error: discarding", yytoken, &yylval);
-	  yychar = YYEMPTY;
-	}
+      /* return failure if at end of input */
+      if (yychar == YYEOF)
+	YYABORT;
+
+#if YYDEBUG != 0
+      if (yydebug)
+	fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
+#endif
+
+      yychar = YYEMPTY;
     }
 
-  /* Else will try to reuse look-ahead token after shifting the error
-     token.  */
-  goto yyerrlab1;
+  /* Else will try to reuse lookahead token
+     after shifting the error token.  */
 
+  yyerrstatus = 3;		/* Each real token shifted decrements this */
 
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR.  |
-`---------------------------------------------------*/
-yyerrorlab:
-
-  /* Pacify compilers like GCC when the user code never invokes
-     YYERROR and the label yyerrorlab therefore never appears in user
-     code.  */
-  if (0)
-     goto yyerrorlab;
+  goto yyerrhandle;
 
-yyvsp -= yylen;
-  yyssp -= yylen;
-  yystate = *yyssp;
-  goto yyerrlab1;
+yyerrdefault:  /* current state does not do anything special for the error token. */
+
+#if 0
+  /* This is wrong; only states that explicitly want error tokens
+     should shift them.  */
+  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
+  if (yyn) goto yydefault;
+#endif
 
+yyerrpop:   /* pop the current state because it cannot handle the error token */
 
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-`-------------------------------------------------------------*/
-yyerrlab1:
-  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+  if (yyssp == yyss) YYABORT;
+  yyvsp--;
+  yystate = *--yyssp;
+#ifdef YYLSP_NEEDED
+  yylsp--;
+#endif
 
-  for (;;)
+#if YYDEBUG != 0
+  if (yydebug)
     {
-      yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
-	{
-	  yyn += YYTERROR;
-	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-	    {
-	      yyn = yytable[yyn];
-	      if (0 < yyn)
-		break;
-	    }
-	}
+      short *ssp1 = yyss - 1;
+      fprintf (stderr, "Error: state stack now");
+      while (ssp1 != yyssp)
+	fprintf (stderr, " %d", *++ssp1);
+      fprintf (stderr, "\n");
+    }
+#endif
 
-      /* Pop the current state because it cannot handle the error token.  */
-      if (yyssp == yyss)
-	YYABORT;
+yyerrhandle:
+
+  yyn = yypact[yystate];
+  if (yyn == YYFLAG)
+    goto yyerrdefault;
 
+  yyn += YYTERROR;
+  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
+    goto yyerrdefault;
 
-      yydestruct ("Error: popping", yystos[yystate], yyvsp);
-      YYPOPSTACK;
-      yystate = *yyssp;
-      YY_STACK_PRINT (yyss, yyssp);
+  yyn = yytable[yyn];
+  if (yyn < 0)
+    {
+      if (yyn == YYFLAG)
+	goto yyerrpop;
+      yyn = -yyn;
+      goto yyreduce;
     }
+  else if (yyn == 0)
+    goto yyerrpop;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  *++yyvsp = yylval;
-
+#if YYDEBUG != 0
+  if (yydebug)
+    fprintf(stderr, "Shifting error token, ");
+#endif
 
-  /* Shift the error token. */
-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+  *++yyvsp = yylval;
+#ifdef YYLSP_NEEDED
+  *++yylsp = yylloc;
+#endif
 
   yystate = yyn;
   goto yynewstate;
 
+ yyacceptlab:
+  /* YYACCEPT comes here.  */
+  if (yyfree_stacks)
+    {
+      free (yyss);
+      free (yyvs);
+#ifdef YYLSP_NEEDED
+      free (yyls);
+#endif
+    }
+  return 0;
 
-/*-------------------------------------.
-| yyacceptlab -- YYACCEPT comes here.  |
-`-------------------------------------*/
-yyacceptlab:
-  yyresult = 0;
-  goto yyreturn;
-
-/*-----------------------------------.
-| yyabortlab -- YYABORT comes here.  |
-`-----------------------------------*/
-yyabortlab:
-  yyresult = 1;
-  goto yyreturn;
-
-#ifndef yyoverflow
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here.  |
-`-------------------------------------------------*/
-yyexhaustedlab:
-  yyerror (YY_("memory exhausted"));
-  yyresult = 2;
-  /* Fall through.  */
-#endif
-
-yyreturn:
-  if (yychar != YYEOF && yychar != YYEMPTY)
-     yydestruct ("Cleanup: discarding lookahead",
-		 yytoken, &yylval);
-  while (yyssp != yyss)
-    {
-      yydestruct ("Cleanup: popping",
-		  yystos[*yyssp], yyvsp);
-      YYPOPSTACK;
-    }
-#ifndef yyoverflow
-  if (yyss != yyssa)
-    YYSTACK_FREE (yyss);
+ yyabortlab:
+  /* YYABORT comes here.  */
+  if (yyfree_stacks)
+    {
+      free (yyss);
+      free (yyvs);
+#ifdef YYLSP_NEEDED
+      free (yyls);
 #endif
-  return yyresult;
+    }
+  return 1;
 }
-
-
-#line 2755 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2755 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 
 
 void llvm::GenerateError(const std::string &message, int LineNo) {
@@ -5522,4 +4688,3 @@
   GenerateError(errMsg);
   return 0;
 }
-


Index: llvm/lib/AsmParser/llvmAsmParser.h.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.14 llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.15
--- llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.14	Fri Oct 20 02:07:24 2006
+++ llvm/lib/AsmParser/llvmAsmParser.h.cvs	Sun Oct 22 01:08:13 2006
@@ -1,256 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.1.  */
-
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     ESINT64VAL = 258,
-     EUINT64VAL = 259,
-     SINTVAL = 260,
-     UINTVAL = 261,
-     FPVAL = 262,
-     VOID = 263,
-     BOOL = 264,
-     SBYTE = 265,
-     UBYTE = 266,
-     SHORT = 267,
-     USHORT = 268,
-     INT = 269,
-     UINT = 270,
-     LONG = 271,
-     ULONG = 272,
-     FLOAT = 273,
-     DOUBLE = 274,
-     TYPE = 275,
-     LABEL = 276,
-     VAR_ID = 277,
-     LABELSTR = 278,
-     STRINGCONSTANT = 279,
-     IMPLEMENTATION = 280,
-     ZEROINITIALIZER = 281,
-     TRUETOK = 282,
-     FALSETOK = 283,
-     BEGINTOK = 284,
-     ENDTOK = 285,
-     DECLARE = 286,
-     GLOBAL = 287,
-     CONSTANT = 288,
-     SECTION = 289,
-     VOLATILE = 290,
-     TO = 291,
-     DOTDOTDOT = 292,
-     NULL_TOK = 293,
-     UNDEF = 294,
-     CONST = 295,
-     INTERNAL = 296,
-     LINKONCE = 297,
-     WEAK = 298,
-     APPENDING = 299,
-     DLLIMPORT = 300,
-     DLLEXPORT = 301,
-     EXTERN_WEAK = 302,
-     OPAQUE = 303,
-     NOT = 304,
-     EXTERNAL = 305,
-     TARGET = 306,
-     TRIPLE = 307,
-     ENDIAN = 308,
-     POINTERSIZE = 309,
-     LITTLE = 310,
-     BIG = 311,
-     ALIGN = 312,
-     DEPLIBS = 313,
-     CALL = 314,
-     TAIL = 315,
-     ASM_TOK = 316,
-     MODULE = 317,
-     SIDEEFFECT = 318,
-     CC_TOK = 319,
-     CCC_TOK = 320,
-     CSRETCC_TOK = 321,
-     FASTCC_TOK = 322,
-     COLDCC_TOK = 323,
-     X86_STDCALLCC_TOK = 324,
-     X86_FASTCALLCC_TOK = 325,
-     DATA = 326,
-     RET = 327,
-     BR = 328,
-     SWITCH = 329,
-     INVOKE = 330,
-     UNWIND = 331,
-     UNREACHABLE = 332,
-     ADD = 333,
-     SUB = 334,
-     MUL = 335,
-     DIV = 336,
-     REM = 337,
-     AND = 338,
-     OR = 339,
-     XOR = 340,
-     SETLE = 341,
-     SETGE = 342,
-     SETLT = 343,
-     SETGT = 344,
-     SETEQ = 345,
-     SETNE = 346,
-     MALLOC = 347,
-     ALLOCA = 348,
-     FREE = 349,
-     LOAD = 350,
-     STORE = 351,
-     GETELEMENTPTR = 352,
-     PHI_TOK = 353,
-     CAST = 354,
-     SELECT = 355,
-     SHL = 356,
-     SHR = 357,
-     VAARG = 358,
-     EXTRACTELEMENT = 359,
-     INSERTELEMENT = 360,
-     SHUFFLEVECTOR = 361,
-     VAARG_old = 362,
-     VANEXT_old = 363
-   };
-#endif
-/* Tokens.  */
-#define ESINT64VAL 258
-#define EUINT64VAL 259
-#define SINTVAL 260
-#define UINTVAL 261
-#define FPVAL 262
-#define VOID 263
-#define BOOL 264
-#define SBYTE 265
-#define UBYTE 266
-#define SHORT 267
-#define USHORT 268
-#define INT 269
-#define UINT 270
-#define LONG 271
-#define ULONG 272
-#define FLOAT 273
-#define DOUBLE 274
-#define TYPE 275
-#define LABEL 276
-#define VAR_ID 277
-#define LABELSTR 278
-#define STRINGCONSTANT 279
-#define IMPLEMENTATION 280
-#define ZEROINITIALIZER 281
-#define TRUETOK 282
-#define FALSETOK 283
-#define BEGINTOK 284
-#define ENDTOK 285
-#define DECLARE 286
-#define GLOBAL 287
-#define CONSTANT 288
-#define SECTION 289
-#define VOLATILE 290
-#define TO 291
-#define DOTDOTDOT 292
-#define NULL_TOK 293
-#define UNDEF 294
-#define CONST 295
-#define INTERNAL 296
-#define LINKONCE 297
-#define WEAK 298
-#define APPENDING 299
-#define DLLIMPORT 300
-#define DLLEXPORT 301
-#define EXTERN_WEAK 302
-#define OPAQUE 303
-#define NOT 304
-#define EXTERNAL 305
-#define TARGET 306
-#define TRIPLE 307
-#define ENDIAN 308
-#define POINTERSIZE 309
-#define LITTLE 310
-#define BIG 311
-#define ALIGN 312
-#define DEPLIBS 313
-#define CALL 314
-#define TAIL 315
-#define ASM_TOK 316
-#define MODULE 317
-#define SIDEEFFECT 318
-#define CC_TOK 319
-#define CCC_TOK 320
-#define CSRETCC_TOK 321
-#define FASTCC_TOK 322
-#define COLDCC_TOK 323
-#define X86_STDCALLCC_TOK 324
-#define X86_FASTCALLCC_TOK 325
-#define DATA 326
-#define RET 327
-#define BR 328
-#define SWITCH 329
-#define INVOKE 330
-#define UNWIND 331
-#define UNREACHABLE 332
-#define ADD 333
-#define SUB 334
-#define MUL 335
-#define DIV 336
-#define REM 337
-#define AND 338
-#define OR 339
-#define XOR 340
-#define SETLE 341
-#define SETGE 342
-#define SETLT 343
-#define SETGT 344
-#define SETEQ 345
-#define SETNE 346
-#define MALLOC 347
-#define ALLOCA 348
-#define FREE 349
-#define LOAD 350
-#define STORE 351
-#define GETELEMENTPTR 352
-#define PHI_TOK 353
-#define CAST 354
-#define SELECT 355
-#define SHL 356
-#define SHR 357
-#define VAARG 358
-#define EXTRACTELEMENT 359
-#define INSERTELEMENT 360
-#define SHUFFLEVECTOR 361
-#define VAARG_old 362
-#define VANEXT_old 363
-
-
-
-
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 974 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
-typedef union YYSTYPE {
+typedef union {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   std::pair<llvm::PATypeHolder*, char*>  *ArgVal;
@@ -289,14 +37,112 @@
   llvm::Instruction::OtherOps             OtherOpVal;
   llvm::Module::Endianness                Endianness;
 } YYSTYPE;
-/* Line 1447 of yacc.c.  */
-#line 294 "llvmAsmParser.tab.h"
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
-#endif
-
-extern YYSTYPE llvmAsmlval;
-
+#define	ESINT64VAL	257
+#define	EUINT64VAL	258
+#define	SINTVAL	259
+#define	UINTVAL	260
+#define	FPVAL	261
+#define	VOID	262
+#define	BOOL	263
+#define	SBYTE	264
+#define	UBYTE	265
+#define	SHORT	266
+#define	USHORT	267
+#define	INT	268
+#define	UINT	269
+#define	LONG	270
+#define	ULONG	271
+#define	FLOAT	272
+#define	DOUBLE	273
+#define	TYPE	274
+#define	LABEL	275
+#define	VAR_ID	276
+#define	LABELSTR	277
+#define	STRINGCONSTANT	278
+#define	IMPLEMENTATION	279
+#define	ZEROINITIALIZER	280
+#define	TRUETOK	281
+#define	FALSETOK	282
+#define	BEGINTOK	283
+#define	ENDTOK	284
+#define	DECLARE	285
+#define	GLOBAL	286
+#define	CONSTANT	287
+#define	SECTION	288
+#define	VOLATILE	289
+#define	TO	290
+#define	DOTDOTDOT	291
+#define	NULL_TOK	292
+#define	UNDEF	293
+#define	CONST	294
+#define	INTERNAL	295
+#define	LINKONCE	296
+#define	WEAK	297
+#define	APPENDING	298
+#define	DLLIMPORT	299
+#define	DLLEXPORT	300
+#define	EXTERN_WEAK	301
+#define	OPAQUE	302
+#define	NOT	303
+#define	EXTERNAL	304
+#define	TARGET	305
+#define	TRIPLE	306
+#define	ENDIAN	307
+#define	POINTERSIZE	308
+#define	LITTLE	309
+#define	BIG	310
+#define	ALIGN	311
+#define	DEPLIBS	312
+#define	CALL	313
+#define	TAIL	314
+#define	ASM_TOK	315
+#define	MODULE	316
+#define	SIDEEFFECT	317
+#define	CC_TOK	318
+#define	CCC_TOK	319
+#define	CSRETCC_TOK	320
+#define	FASTCC_TOK	321
+#define	COLDCC_TOK	322
+#define	X86_STDCALLCC_TOK	323
+#define	X86_FASTCALLCC_TOK	324
+#define	DATALAYOUT	325
+#define	RET	326
+#define	BR	327
+#define	SWITCH	328
+#define	INVOKE	329
+#define	UNWIND	330
+#define	UNREACHABLE	331
+#define	ADD	332
+#define	SUB	333
+#define	MUL	334
+#define	DIV	335
+#define	REM	336
+#define	AND	337
+#define	OR	338
+#define	XOR	339
+#define	SETLE	340
+#define	SETGE	341
+#define	SETLT	342
+#define	SETGT	343
+#define	SETEQ	344
+#define	SETNE	345
+#define	MALLOC	346
+#define	ALLOCA	347
+#define	FREE	348
+#define	LOAD	349
+#define	STORE	350
+#define	GETELEMENTPTR	351
+#define	PHI_TOK	352
+#define	CAST	353
+#define	SELECT	354
+#define	SHL	355
+#define	SHR	356
+#define	VAARG	357
+#define	EXTRACTELEMENT	358
+#define	INSERTELEMENT	359
+#define	SHUFFLEVECTOR	360
+#define	VAARG_old	361
+#define	VANEXT_old	362
 
 
+extern YYSTYPE llvmAsmlval;


Index: llvm/lib/AsmParser/llvmAsmParser.y.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.19 llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.20
--- llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.19	Fri Oct 20 02:07:24 2006
+++ llvm/lib/AsmParser/llvmAsmParser.y.cvs	Sun Oct 22 01:08:13 2006
@@ -1068,7 +1068,7 @@
 %token DEPLIBS CALL TAIL ASM_TOK MODULE SIDEEFFECT
 %token CC_TOK CCC_TOK CSRETCC_TOK FASTCC_TOK COLDCC_TOK
 %token X86_STDCALLCC_TOK X86_FASTCALLCC_TOK
-%token DATA
+%token DATALAYOUT
 %type <UIntVal> OptCallingConv
 
 // Basic Block Terminating Operators
@@ -1874,7 +1874,7 @@
     free($3);
     CHECK_FOR_ERROR
   };
-  | DATA '=' STRINGCONSTANT {
+  | DATALAYOUT '=' STRINGCONSTANT {
     CurModule.CurrentModule->setDataLayout($3);
     free($3);
     CHECK_FOR_ERROR






More information about the llvm-commits mailing list