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

Chris Lattner lattner at cs.uiuc.edu
Fri Apr 7 18:19:10 PDT 2006



Changes in directory llvm/lib/AsmParser:

Lexer.cpp.cvs updated: 1.3 -> 1.4
Lexer.l.cvs updated: 1.2 -> 1.3
llvmAsmParser.cpp.cvs updated: 1.2 -> 1.3
llvmAsmParser.h.cvs updated: 1.1 -> 1.2
llvmAsmParser.y.cvs updated: 1.2 -> 1.3
---
Log message:

regenerate


---
Diffs of the changes:  (+1115 -1088)

 Lexer.cpp.cvs         |  866 ++++++++++++++++-----------------
 Lexer.l.cvs           |    1 
 llvmAsmParser.cpp.cvs | 1294 +++++++++++++++++++++++++-------------------------
 llvmAsmParser.h.cvs   |    5 
 llvmAsmParser.y.cvs   |   11 
 5 files changed, 1115 insertions(+), 1062 deletions(-)


Index: llvm/lib/AsmParser/Lexer.cpp.cvs
diff -u llvm/lib/AsmParser/Lexer.cpp.cvs:1.3 llvm/lib/AsmParser/Lexer.cpp.cvs:1.4
--- llvm/lib/AsmParser/Lexer.cpp.cvs:1.3	Wed Feb 15 01:22:58 2006
+++ llvm/lib/AsmParser/Lexer.cpp.cvs	Fri Apr  7 20:18:56 2006
@@ -20,7 +20,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /var/cvs/llvm/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.3 2006/02/15 07:22:58 lattner Exp $
+ * $Header: /var/cvs/llvm/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.4 2006/04/08 01:18:56 lattner Exp $
  */
 
 #define FLEX_SCANNER
@@ -308,33 +308,33 @@
 	*yy_cp = '\0'; \
 	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 106
-#define YY_END_OF_BUFFER 107
-static yyconst short int yy_acclist[184] =
+#define YY_NUM_RULES 107
+#define YY_END_OF_BUFFER 108
+static yyconst short int yy_acclist[185] =
     {   0,
-      107,  105,  106,  104,  105,  106,  104,  106,  105,  106,
-      105,  106,  105,  106,  105,  106,  105,  106,  105,  106,
-       97,  105,  106,   97,  105,  106,    1,  105,  106,  105,
-      106,  105,  106,  105,  106,  105,  106,  105,  106,  105,
-      106,  105,  106,  105,  106,  105,  106,  105,  106,  105,
-      106,  105,  106,  105,  106,  105,  106,  105,  106,  105,
-      106,  105,  106,  105,  106,  105,  106,  105,  106,  105,
-      106,   96,   94,   93,   93,  100,   98,  102,   97,    1,
-       80,   37,   62,   20,   96,   93,   93,  101,  102,   17,
-      102,  103,   56,   61,   35,   30,   38,   59,    3,   47,
-
-       58,   22,   70,   60,   79,   74,   75,   57,   63,   95,
-      102,  102,   42,   71,   72,   87,   88,   49,   19,   99,
-       23,    4,   54,   48,   41,   11,  102,   32,    2,    5,
+      108,  106,  107,  105,  106,  107,  105,  107,  106,  107,
+      106,  107,  106,  107,  106,  107,  106,  107,  106,  107,
+       98,  106,  107,   98,  106,  107,    1,  106,  107,  106,
+      107,  106,  107,  106,  107,  106,  107,  106,  107,  106,
+      107,  106,  107,  106,  107,  106,  107,  106,  107,  106,
+      107,  106,  107,  106,  107,  106,  107,  106,  107,  106,
+      107,  106,  107,  106,  107,  106,  107,  106,  107,  106,
+      107,   97,   95,   94,   94,  101,   99,  103,   98,    1,
+       80,   37,   62,   20,   97,   94,   94,  102,  103,   17,
+      103,  104,   56,   61,   35,   30,   38,   59,    3,   47,
+
+       58,   22,   70,   60,   79,   74,   75,   57,   63,   96,
+      103,  103,   42,   71,   72,   87,   88,   49,   19,  100,
+       23,    4,   54,   48,   41,   11,  103,   32,    2,    5,
        51,   53,   43,   65,   69,   67,   68,   66,   64,   45,
        89,   44,   50,   18,   77,   86,   40,   52,   27,   21,
        39,    7,   82,   29,   85,   34,   55,   73,   81,   24,
        25,   83,   46,   78,   76,    6,   26,   33,    8,   14,
-        9,   10,   31,   12,   36,   28,   84,   90,   92,   13,
-       91,   15,   16
+        9,   10,   31,   12,   36,   28,   84,   90,   92,   93,
+       13,   91,   15,   16
     } ;
 
-static yyconst short int yy_accept[444] =
+static yyconst short int yy_accept[455] =
     {   0,
         1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
        17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
@@ -354,37 +354,38 @@
       100,  100,  100,  100,  100,  100,  100,  101,  101,  101,
       101,  101,  101,  101,  101,  101,  102,  103,  103,  103,
       104,  104,  105,  106,  106,  106,  106,  106,  106,  107,
-      107,  108,  108,  108,  109,  109,  109,  109,  109,  109,
+      107,  108,  108,  108,  108,  109,  109,  109,  109,  109,
       109,  109,  109,  109,  109,  109,  109,  109,  109,  109,
-      109,  109,  109,  109,  109,  110,  110,  111,  112,  112,
+      109,  109,  109,  109,  109,  109,  110,  110,  111,  112,
 
-      112,  112,  113,  113,  113,  113,  113,  114,  115,  116,
+      112,  112,  112,  113,  113,  113,  113,  113,  114,  115,
       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,
+      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,  122,  122,  122,  123,  124,  124,  125,  125,  125,
-      125,  125,  125,  125,  125,  125,  125,  126,  126,  127,
-      127,  128,  129,  129,  129,  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,  142,  142,  142,  142,  143,  144,  145,  145,
-      145,  145,  145,  145,  146,  146,  146,  146,  147,  147,
-      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,  160,  161,  162,  162,  162,
-      163,  164,  165,  166,  166,  166,  166,  166,  167,  168,
-      168,  168,  168,  168,  168,  168,  168,  168,  169,  169,
-      169,  169,  169,  169,  169,  170,  171,  171,  171,  171,
-      171,  172,  173,  173,  173,  173,  173,  174,  174,  175,
+      121,  121,  121,  122,  122,  122,  123,  124,  124,  125,
+      125,  125,  125,  125,  125,  125,  125,  125,  125,  126,
+      126,  127,  127,  128,  129,  129,  129,  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,  147,  147,  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,  167,  168,  168,  168,  168,  168,  168,  168,
+      168,  168,  169,  169,  169,  169,  169,  169,  169,  169,
+      170,  171,  171,  171,  171,  171,  172,  173,  173,  173,
 
+      173,  173,  173,  174,  174,  175,  175,  175,  175,  175,
       175,  175,  175,  175,  175,  175,  175,  175,  175,  175,
-      175,  175,  175,  175,  176,  176,  176,  176,  176,  176,
-      176,  176,  177,  177,  178,  178,  178,  178,  178,  178,
-      178,  178,  178,  179,  179,  180,  181,  181,  182,  183,
-      183,  184,  184
+      175,  175,  176,  176,  176,  176,  176,  176,  176,  176,
+      177,  177,  177,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  179,  179,  180,  181,  182,  182,  183,
+      184,  184,  185,  185
     } ;
 
 static yyconst int yy_ec[256] =
@@ -428,113 +429,115 @@
         3
     } ;
 
-static yyconst short int yy_base[448] =
+static yyconst short int yy_base[459] =
     {   0,
-        0,    0,  926,  927,  927,  927,  921,  912,   34,   36,
+        0,    0,  948,  949,  949,  949,  943,  934,   34,   36,
        38,   42,   46,   50,    0,   52,   57,   54,   68,   62,
        80,   82,   76,   94,   98,   40,   83,   88,   56,  125,
-      108,  154,  109,   87,  110,  111,  919,  927,  910,  927,
+      108,  154,  109,   87,  110,  111,  941,  949,  932,  949,
         0,  119,  134,  142,  145,  124,  159,  166,  179,    0,
-       55,  180,  147,  153,  119,  150,  183,  156,  909,  175,
+       55,  180,  147,  153,  119,  150,  183,  156,  931,  175,
       191,  192,  196,   90,  146,  200,  199,  201,  202,  204,
       205,  211,  212,  210,  218,  217,  221,  227,  236,  230,
-      214,  239,  241,  908,  243,  247,  248,  225,  249,  250,
-      251,  253,  258,  262,  267,  270,  907,  274,  259,  275,
+      214,  239,  241,  930,  243,  247,  248,  225,  249,  250,
+      251,  253,  258,  262,  267,  270,  929,  274,  259,  279,
 
-      279,  263,  284,   41,  285,  286,  288,   84,  294,  906,
-        0,  308,  310,  905,  318,  330,    0,  904,  300,  304,
-      903,  314,  902,  282,  901,  320,  324,  331,  900,  332,
-      312,  333,  336,  899,  337,  342,  338,  341,  344,  345,
-      352,  349,  356,  353,  346,  360,  363,  364,  367,  370,
-      371,  373,  374,  375,  377,  898,  897,  378,   31,  896,
-      379,  895,  894,  404,  392,  395,  380,  408,  893,  383,
-      892,  388,  399,  891,  398,  416,  422,  386,  391,  426,
-      424,  427,  428,  429,  432,  430,  440,  434,  436,  437,
-      442,  446,  443,  455,  890,  444,  927,  458,  475,  461,
-
-      465,  477,  466,  472,  468,  478,  889,  888,  887,  480,
-      481,  484,  486,  482,  488,  490,  491,  496,  494,  498,
-      492,  886,  502,  506,  507,  500,  508,  510,  513,  514,
-      518,  885,  884,  519,  520,  883,  522,  525,    0,  527,
-      526,  523,  531,  534,  538,  540,  541,  544,  545,  552,
-      882,  556,  555,  881,  880,  558,  879,  560,  562,  550,
-      568,  566,  569,  574,  575,  576,  878,  577,  877,  578,
-      581,  876,  582,  581,  875,  585,  588,  584,  596,  597,
-      594,  598,  599,  601,  874,  607,  873,  604,  609,  610,
-      612,  615,  618,  872,  617,  619,  622,  630,  631,  633,
-
-      871,  620,  623,  870,  869,  868,  867,  866,  865,  864,
-      637,  863,  636,  641,  643,  862,  861,  860,  644,  649,
-      645,  650,  651,  859,  654,  655,  657,  858,  658,  857,
-      659,  660,  661,  856,  855,  854,  665,  663,  853,  666,
-      852,  672,  675,  680,  851,  687,  850,  849,  848,  847,
-      678,  679,  846,  688,  845,  844,  843,  689,  691,  842,
-      839,  829,  828,  690,  693,  692,  695,  827,  825,  697,
-      701,  704,  700,  707,  708,  711,  714,  824,  715,  716,
-      725,  719,  726,  727,  823,  822,  729,  731,  732,  733,
-      819,  818,  734,  739,  735,  737,  817,  740,  816,  745,
-
-      741,  751,  752,  757,  758,  759,  760,  761,  762,  763,
-      765,  767,  770,  812,  769,  771,  774,  783,  773,  777,
-      784,  811,  785,  810,  787,  791,  793,  795,  797,  799,
-      802,  803,  805,  804,  625,  542,  806,  387,  255,  809,
-      219,  927,  843,  845,  182,  849,  139
+      282,  263,  284,   41,  285,  288,  295,   84,  293,  928,
+        0,  310,  313,  927,  320,  332,    0,  926,  304,  306,
+      925,  317,  924,  321,  923,  325,  333,  313,  922,  286,
+      335,  337,  338,  921,  339,  341,  342,  346,  343,  347,
+      344,  350,  360,  356,  358,  363,  366,  361,  368,  364,
+      371,  374,  376,  380,  381,  920,  919,  383,   31,  918,
+      384,  917,  916,  408,  385,  386,  388,  412,  915,  399,
+      914,  390,  393,  403,  913,  396,  389,  422,  425,  426,
+      428,  430,  431,  432,  434,  438,  436,  439,  440,  441,
+      442,  447,  451,  457,  450,  912,  448,  949,  462,  474,
+
+      393,  476,  479,  467,  480,  468,  481,  911,  910,  909,
+      482,  483,  486,  488,  490,  492,  493,  494,  495,  499,
+      496,  502,  908,  504,  509,  507,  510,  511,  513,  518,
+      517,  521,  907,  906,  520,  522,  905,  523,  526,    0,
+      530,  528,  543,  524,  542,  545,  546,  529,  548,  553,
+      557,  556,  904,  560,  559,  903,  902,  561,  901,  564,
+      567,  571,  573,  572,  576,  579,  580,  581,  900,  582,
+      899,  583,  587,  898,  587,  590,  897,  588,  594,  593,
+      534,  601,  602,  603,  604,  606,  896,  609,  895,  611,
+      607,  612,  615,  617,  618,  894,  623,  624,  625,  630,
+
+      635,  636,  893,  629,  631,  892,  891,  890,  889,  888,
+      887,  886,  637,  641,  885,  643,  642,  648,  884,  883,
+      882,  646,  649,  650,  653,  659,  881,  660,  661,  662,
+      880,  664,  879,  663,  666,  667,  878,  877,  876,  668,
+      671,  875,  672,  874,  678,  681,  686,  873,  685,  872,
+      871,  870,  869,  682,  684,  868,  693,  695,  867,  866,
+      865,  696,  698,  864,  863,  862,  861,  697,  700,  699,
+      704,  860,  857,  706,  708,  711,  707,  714,  715,  719,
+      718,  848,  722,  723,  726,  733,  725,  735,  737,  847,
+      845,  736,  739,  741,  743,  843,  842,  742,  744,  750,
+
+      745,  759,  841,  749,  840,  754,  746,  761,  767,  768,
+      770,  771,  772,  773,  774,  775,  776,  778,  780,  781,
+      782,  838,  784,  787,  792,  793,  786,  798,  799,  835,
+      800,  803,  834,  804,  806,  808,  810,  814,  815,  819,
+      820,  821,  832,  822,  831,  830,  826,  824,  296,  255,
+      825,  219,  949,  861,  863,  182,  867,  139
     } ;
 
-static yyconst short int yy_def[448] =
+static yyconst short int yy_def[459] =
     {   0,
-      442,    1,  442,  442,  442,  442,  443,  444,  445,  442,
-      444,  444,  444,  444,  446,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  443,  442,  444,  442,
-      447,  447,  442,  442,  444,  444,  444,  444,  444,  446,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  442,
-      447,  447,  442,  444,  444,  444,   49,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,   49,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  442,  442,  442,  442,
-
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  164,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      442,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-      444,    0,  442,  442,  442,  442,  442
+      453,    1,  453,  453,  453,  453,  454,  455,  456,  453,
+      455,  455,  455,  455,  457,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  454,  453,  455,  453,
+      458,  458,  453,  453,  455,  455,  455,  455,  455,  457,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  453,
+      458,  458,  453,  455,  455,  455,   49,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,   49,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  453,  453,  453,
+
+      453,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  164,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  453,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,  455,  455,  455,  455,  455,  455,  455,  455,
+      455,  455,    0,  453,  453,  453,  453,  453
     } ;
 
-static yyconst short int yy_nxt[969] =
+static yyconst short int yy_nxt[991] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,    4,   15,    8,    8,    8,   16,   17,   18,   19,
@@ -542,13 +545,13 @@
        28,    8,   29,   30,   31,   32,   33,   34,   35,    8,
        36,   42,   40,   43,   43,   44,   44,   45,   45,   40,
        46,   40,   40,   40,   47,   48,   48,   40,   47,   48,
-       48,   40,  237,   40,  188,   40,   40,   40,   40,   81,
+       48,   40,  238,   40,  189,   40,   40,   40,   40,   81,
        60,   51,   61,   40,  118,   82,   87,   56,   52,   40,
        53,   57,   54,   62,   49,   55,   58,   40,   63,   59,
        66,   40,   64,   40,   40,   40,   68,   65,   40,   40,
 
        67,   40,   71,   73,   74,   40,   69,  107,   72,   40,
-       75,   85,   70,   83,   78,   84,  195,   86,   76,   40,
+       75,   85,   70,   83,   78,   84,  196,   86,   76,   40,
        40,   40,   40,   77,   96,  105,  134,   79,  112,  112,
        40,  109,  114,   80,   88,   40,   40,   97,  106,  108,
        98,  111,   89,   43,   43,   90,  123,   99,   91,   92,
@@ -565,86 +568,88 @@
       144,   40,  145,  146,  147,  150,  148,   40,  157,  153,
        40,  151,   40,  154,   40,  155,  156,  159,   40,   40,
        40,   40,   40,  164,   40,  158,   40,  160,  166,   40,
-       40,  161,  172,   40,   40,  162,  167,  169,   40,  174,
-      170,   40,  163,  171,  168,   40,   40,  173,  165,  180,
-       40,  175,  183,   40,  176,   40,   40,   40,  178,   40,
-
-      189,  190,  177,  184,  194,   40,  206,  182,  185,  179,
-      192,   40,  193,  191,  181,   40,  186,  112,  112,  198,
-      198,  187,  203,   40,  199,   40,  196,  115,  115,   40,
-      199,   40,  116,  204,  205,   40,  200,  201,  116,  202,
-      202,   40,   40,   40,   40,  211,  207,   40,   40,   40,
-      208,  210,   40,   40,  214,   40,   40,   40,  216,  212,
-       40,  217,  213,   40,   40,  209,  215,   40,  221,  222,
-      224,   40,  225,  218,   40,   40,  223,  219,   40,  220,
-      226,   40,   40,  227,   40,   40,   40,  229,   40,   40,
-       40,   40,  232,  228,   40,  230,  233,   40,   40,   40,
-
-      242,  234,   40,   40,  236,  231,   40,  238,  248,   40,
-       40,  254,  235,  239,  239,  247,  253,  239,  239,   40,
-      239,  239,  239,  239,  239,  239,  240,   40,  243,  241,
-      244,  249,  250,   40,  245,   40,  246,   40,   40,   40,
-       40,   40,  251,   40,  252,   40,  255,   40,   40,  259,
-      261,   40,  264,   40,   40,   40,  258,   40,  256,  268,
-      260,  257,  266,  263,  262,  267,   40,  198,  198,  265,
-      271,  271,  199,  270,  202,  202,   40,   40,  199,   40,
-      269,  200,  200,   40,  271,  271,  202,  202,   40,   40,
-      273,   40,   40,   40,  272,   40,  274,   40,  276,   40,
-
-      278,   40,   40,   40,  281,   40,  275,   40,  280,   40,
-      279,   40,  284,   40,  285,  277,  286,   40,   40,   40,
-      282,   40,  289,  283,   40,   40,  287,  290,  288,   40,
-       40,   40,  291,   40,   40,  293,   40,   40,   40,  294,
-      292,  303,   40,  295,  296,   40,  298,  301,  297,   40,
-      302,   40,   40,   40,  305,   40,   40,  299,  307,  300,
-      309,   40,  304,   40,  311,  312,   40,   40,  306,   40,
-      313,   40,  308,   40,  319,  310,  314,   40,  316,   40,
-       40,  315,  317,  318,  320,   40,   40,   40,   40,   40,
-      271,  271,   40,   40,  321,   40,   40,  324,  328,   40,
-
-      329,  322,  327,  330,  331,   40,  323,   40,   40,   40,
-       40,  326,   40,  333,  325,   40,  332,  334,   40,  338,
-       40,   40,  335,   40,  340,  339,   40,  337,   40,   40,
-       40,   40,  336,   40,   40,  341,   40,  342,  345,  347,
-      348,   40,   40,  344,   40,  346,  343,   40,   40,  352,
-      349,  350,   40,  351,   40,   40,   40,  353,  354,  355,
-       40,   40,   40,  357,  360,   40,   40,  359,   40,   40,
-       40,   40,   40,  362,   40,  356,   40,   40,  358,  364,
-      368,  370,  366,   40,  361,  365,   40,  367,  363,   40,
-       40,   40,  373,  372,  369,  374,  375,  371,   40,   40,
-
-       40,   40,   40,   40,   40,  376,   40,  378,   40,  379,
-      377,   40,   40,  380,  381,   40,  382,  383,   40,   40,
-      384,  387,   40,  386,  388,   40,   40,   40,  389,  385,
-       40,  392,  395,  390,  391,  394,   40,   40,   40,  397,
-       40,  396,   40,   40,   40,   40,   40,  393,   40,  399,
-       40,   40,   40,  403,  407,  400,   40,  405,  404,  401,
-      398,  406,   40,   40,  408,  409,  402,  411,   40,   40,
-       40,   40,   40,   40,   40,  410,   40,  417,   40,  412,
-       40,   40,   40,  415,   40,   40,  416,  421,   40,  418,
-      422,  424,  414,  419,   40,   40,   40,  413,   40,  420,
-
-      425,  428,   40,  426,   40,  430,   40,  427,   40,  423,
-       40,  431,  429,   40,   40,   40,   40,   40,  436,  432,
-       40,   40,   40,   40,  434,  433,  440,   40,   40,   40,
-       40,  435,  439,   40,   40,   40,   40,  438,   40,   40,
-       40,  441,  437,   37,   37,   37,   37,   39,   39,   50,
-       40,   50,   50,   40,   40,   40,   40,   40,   40,   40,
+       40,  161,  173,   40,   40,  162,  167,  169,   40,  175,
+      170,   40,  163,  171,  168,   40,  172,  174,  165,  181,
+       40,  176,  184,   40,  177,   40,   40,   40,  179,   40,
+
+      190,  191,  178,  185,   40,  211,   40,   40,  186,  180,
+      183,  195,  193,  192,  194,   40,  187,   40,  182,  112,
+      112,  188,  199,  199,   40,  197,  204,  200,   40,  115,
+      115,   40,   40,  200,  116,  205,   40,  206,  201,  202,
+      116,  203,  203,   40,   40,  207,   40,  210,   40,   40,
+       40,  208,   40,   40,   40,   40,  215,   40,   40,  209,
+      222,   40,  217,  213,  214,  216,  218,   40,  212,   40,
+      223,   40,   40,  225,   40,   40,  220,   40,  219,   40,
+      224,  221,   40,  227,  226,   40,  228,   40,  230,  231,
+      229,   40,   40,  233,   40,   40,   40,   40,  234,   40,
+
+       40,   40,  273,  273,   40,  232,  235,   40,  243,  237,
+       40,  249,  239,  250,   40,  253,  236,  240,  240,  241,
+      242,  240,  240,   40,  240,  240,  240,  240,  240,  240,
+      252,  248,  244,   40,  245,  251,   40,   40,  246,   40,
+      247,   40,   40,   40,  254,   40,  256,   40,  257,   40,
+       40,   40,   40,   40,  261,  255,  263,  266,   40,   40,
+      260,   40,   40,  264,  258,  259,  262,  268,   40,  265,
+      269,  199,  199,  270,  267,  271,  200,  272,   40,   40,
+      201,  201,  200,  273,  273,  203,  203,   40,  203,  203,
+       40,   40,   40,   40,   40,  274,  276,   40,  275,   40,
+
+      278,   40,  280,   40,   40,   40,   40,   40,  283,  277,
+       40,  286,  281,   40,  288,   40,  282,  279,   40,  287,
+       40,   40,   40,  284,   40,  291,  285,  292,   40,   40,
+      290,   40,   40,   40,   40,   40,  289,   40,  295,   40,
+       40,   40,  293,  294,  296,   40,  297,  298,  300,  299,
+      303,  336,  304,   40,   40,  306,   40,   40,  301,   40,
+      302,  305,  307,  312,   40,  309,  311,   40,   40,  313,
+       40,   40,   40,  314,  316,   40,  308,  315,   40,  310,
+      317,  319,   40,   40,   40,  318,  320,   40,  321,  323,
+       40,   40,   40,   40,   40,  322,  273,  273,   40,   40,
+
+      324,   40,  327,  331,   40,   40,  333,  330,  325,  332,
+      334,  326,   40,   40,   40,   40,  329,   40,   40,  328,
+       40,  337,   40,   40,  341,  335,   40,  342,   40,   40,
+      338,  343,  340,  344,   40,   40,   40,  339,  348,  345,
+       40,   40,   40,  351,  350,  347,   40,   40,   40,  346,
+      352,  349,   40,   40,   40,  353,  354,   40,  355,   40,
+       40,   40,  358,  357,   40,  356,  359,  363,  361,  364,
+       40,   40,   40,   40,   40,   40,  360,   40,   40,   40,
+      362,  366,   40,   40,  374,  368,  372,  365,  370,   40,
+      369,  371,   40,   40,  367,   40,   40,   40,  377,  376,
+
+      373,  378,  379,  380,   40,  375,   40,   40,   40,   40,
+       40,   40,  382,  383,  381,   40,  384,   40,   40,   40,
+      385,  386,   40,  387,  388,   40,   40,  389,  392,   40,
+       40,  393,  391,   40,   40,  394,   40,   40,  390,  397,
+      395,  396,  401,  400,   40,  403,   40,   40,   40,  402,
+       40,  398,   40,   40,   40,   40,   40,   40,  399,  405,
+       40,   40,  406,  409,  411,   40,  410,  407,  412,  404,
+       40,  413,   40,  415,  416,  408,  414,  418,   40,   40,
+      417,   40,   40,   40,   40,   40,   40,   40,  421,   40,
+      425,   40,   40,   40,  419,   40,  423,   40,   40,  424,
+
+      429,  430,  426,   40,   40,  422,  427,  433,  420,   40,
+       40,   40,  428,  435,   40,   40,  431,   40,  434,   40,
+      436,   40,  437,  440,  432,   40,   40,  438,  441,  439,
+       40,   40,   40,   40,  442,   40,   40,   40,  447,  444,
+      443,   40,   40,   40,  451,   40,   40,  446,  445,   40,
+      450,   40,   40,   40,   40,  449,   40,  452,   40,   40,
+      448,   37,   37,   37,   37,   39,   39,   50,   40,   50,
+       50,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,  197,   40,   40,
-       40,   40,  110,   40,   38,  442,    3,  442,  442,  442,
-      442,  442,  442,  442,  442,  442,  442,  442,  442,  442,
-      442,  442,  442,  442,  442,  442,  442,  442,  442,  442,
-      442,  442,  442,  442,  442,  442,  442,  442,  442,  442,
-      442,  442,  442,  442,  442,  442,  442,  442
+       40,   40,   40,   40,   40,   40,   40,   40,   40,  198,
+       40,   40,   40,   40,  110,   40,   38,  453,    3,  453,
+      453,  453,  453,  453,  453,  453,  453,  453,  453,  453,
+      453,  453,  453,  453,  453,  453,  453,  453,  453,  453,
+      453,  453,  453,  453,  453,  453,  453,  453,  453,  453,
+      453,  453,  453,  453,  453,  453,  453,  453,  453,  453
     } ;
 
-static yyconst short int yy_chk[969] =
+static yyconst short int yy_chk[991] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -661,97 +666,99 @@
        24,   28,   21,   27,   25,   27,  108,   28,   24,   31,
        33,   35,   36,   24,   31,   33,   64,   25,   42,   42,
        55,   36,   46,   25,   30,   46,   30,   31,   33,   35,
-       31,  447,   30,   43,   43,   30,   55,   31,   30,   30,
+       31,  458,   30,   43,   43,   30,   55,   31,   30,   30,
        44,   44,   44,   45,   45,   45,   45,   65,   53,   30,
        30,   56,   30,   32,   54,   32,   53,   58,   47,   47,
        47,   32,   56,   47,   48,   48,   48,   48,   32,   47,
-       32,   65,   32,   54,  445,   58,   60,   32,   49,   49,
+       32,   65,   32,   54,  456,   58,   60,   32,   49,   49,
        49,   52,   49,   49,   57,   49,   49,   49,   49,   49,
 
        49,   60,   61,   62,   52,   57,   52,   63,   60,   61,
        67,   66,   68,   69,   63,   70,   71,   67,   62,   66,
        62,   74,   72,   73,   70,   81,   63,   68,   76,   75,
-      441,   69,   77,   67,   68,   75,   88,   77,   78,   71,
+      452,   69,   77,   67,   68,   75,   88,   77,   78,   71,
        72,   80,   73,   74,   74,   76,   74,   79,   81,   77,
        82,   76,   83,   78,   85,   79,   80,   83,   86,   87,
-       89,   90,   91,   88,   92,   82,  439,   85,   90,   93,
+       89,   90,   91,   88,   92,   82,  450,   85,   90,   93,
        99,   86,   92,   94,  102,   87,   90,   91,   95,   94,
-       91,   96,   87,   91,   90,   98,  100,   93,   89,   99,
-      101,   95,  102,  124,   96,  103,  105,  106,   98,  107,
+       91,   96,   87,   91,   90,   98,   91,   93,   89,   99,
+      100,   95,  102,  101,   96,  103,  105,  130,   98,  106,
 
-      105,  105,   96,  103,  107,  109,  124,  101,  103,   98,
-      106,  119,  106,  105,  100,  120,  103,  112,  112,  113,
-      113,  103,  119,  131,  113,  122,  109,  115,  115,  115,
-      113,  126,  115,  120,  122,  127,  116,  116,  115,  116,
-      116,  116,  128,  130,  132,  131,  126,  133,  135,  137,
-      127,  130,  138,  136,  135,  139,  140,  145,  137,  132,
-      142,  138,  133,  141,  144,  128,  136,  143,  141,  142,
-      144,  146,  145,  138,  147,  148,  143,  139,  149,  140,
-      146,  150,  151,  147,  152,  153,  154,  149,  155,  158,
-      161,  167,  152,  148,  170,  150,  153,  178,  438,  172,
-
-      167,  154,  179,  165,  158,  151,  166,  161,  172,  175,
-      173,  179,  155,  164,  164,  170,  178,  164,  164,  168,
-      164,  164,  164,  164,  164,  164,  165,  176,  168,  166,
-      168,  173,  175,  177,  168,  181,  168,  180,  182,  183,
-      184,  186,  176,  185,  177,  188,  180,  189,  190,  184,
-      186,  187,  189,  191,  193,  196,  183,  192,  181,  193,
-      185,  182,  191,  188,  187,  192,  194,  198,  198,  190,
-      200,  200,  198,  196,  201,  201,  201,  203,  198,  205,
-      194,  199,  199,  204,  199,  199,  202,  202,  202,  206,
-      204,  210,  211,  214,  203,  212,  205,  213,  210,  215,
-
-      212,  216,  217,  221,  215,  219,  206,  218,  214,  220,
-      213,  226,  218,  223,  219,  211,  220,  224,  225,  227,
-      216,  228,  224,  217,  229,  230,  221,  225,  223,  231,
-      234,  235,  226,  237,  242,  228,  238,  241,  240,  229,
-      227,  242,  243,  230,  231,  244,  235,  240,  234,  245,
-      241,  246,  247,  436,  244,  248,  249,  237,  245,  238,
-      246,  260,  243,  250,  248,  249,  253,  252,  244,  256,
-      250,  258,  245,  259,  260,  247,  252,  262,  256,  261,
-      263,  253,  258,  259,  261,  264,  265,  266,  268,  270,
-      271,  271,  274,  273,  262,  278,  276,  265,  273,  277,
-
-      274,  263,  270,  276,  277,  281,  264,  279,  280,  282,
-      283,  268,  284,  279,  266,  288,  278,  280,  286,  284,
-      289,  290,  281,  291,  288,  286,  292,  283,  295,  293,
-      296,  302,  282,  297,  303,  289,  435,  290,  293,  296,
-      297,  298,  299,  292,  300,  295,  291,  313,  311,  302,
-      298,  299,  314,  300,  315,  319,  321,  303,  311,  313,
-      320,  322,  323,  315,  321,  325,  326,  320,  327,  329,
-      331,  332,  333,  323,  338,  314,  337,  340,  319,  326,
-      332,  337,  329,  342,  322,  327,  343,  331,  325,  351,
-      352,  344,  342,  340,  333,  343,  344,  338,  346,  354,
-
-      358,  364,  359,  366,  365,  346,  367,  352,  370,  354,
-      351,  373,  371,  358,  359,  372,  364,  365,  374,  375,
-      366,  371,  376,  370,  372,  377,  379,  380,  373,  367,
-      382,  376,  380,  374,  375,  379,  381,  383,  384,  382,
-      387,  381,  388,  389,  390,  393,  395,  377,  396,  384,
-      394,  398,  401,  390,  396,  387,  400,  394,  393,  388,
-      383,  395,  402,  403,  398,  400,  389,  402,  404,  405,
-      406,  407,  408,  409,  410,  401,  411,  408,  412,  403,
-      415,  413,  416,  406,  419,  417,  407,  412,  420,  409,
-      413,  416,  405,  410,  418,  421,  423,  404,  425,  411,
-
-      417,  420,  426,  418,  427,  423,  428,  419,  429,  415,
-      430,  425,  421,  431,  432,  434,  433,  437,  430,  426,
-      440,  424,  422,  414,  428,  427,  437,  399,  397,  392,
-      391,  429,  434,  386,  385,  378,  369,  432,  368,  363,
-      362,  440,  431,  443,  443,  443,  443,  444,  444,  446,
-      361,  446,  446,  360,  357,  356,  355,  353,  350,  349,
-      348,  347,  345,  341,  339,  336,  335,  334,  330,  328,
-      324,  318,  317,  316,  312,  310,  309,  308,  307,  306,
-      305,  304,  301,  294,  287,  285,  275,  272,  269,  267,
-      257,  255,  254,  251,  236,  233,  232,  222,  209,  208,
-
-      207,  195,  174,  171,  169,  163,  162,  160,  157,  156,
-      134,  129,  125,  123,  121,  118,  114,  110,   97,   84,
-       59,   39,   37,    8,    7,    3,  442,  442,  442,  442,
-      442,  442,  442,  442,  442,  442,  442,  442,  442,  442,
-      442,  442,  442,  442,  442,  442,  442,  442,  442,  442,
-      442,  442,  442,  442,  442,  442,  442,  442,  442,  442,
-      442,  442,  442,  442,  442,  442,  442,  442
+      105,  105,   96,  103,  109,  130,  107,  449,  103,   98,
+      101,  107,  106,  105,  106,  119,  103,  120,  100,  112,
+      112,  103,  113,  113,  128,  109,  119,  113,  122,  115,
+      115,  115,  124,  113,  115,  120,  126,  122,  116,  116,
+      115,  116,  116,  116,  127,  124,  131,  128,  132,  133,
+      135,  126,  136,  137,  139,  141,  135,  138,  140,  127,
+      141,  142,  137,  132,  133,  136,  138,  144,  131,  145,
+      142,  143,  148,  144,  146,  150,  139,  147,  138,  149,
+      143,  140,  151,  146,  145,  152,  147,  153,  149,  150,
+      148,  154,  155,  152,  158,  161,  165,  166,  153,  167,
+
+      177,  172,  201,  201,  173,  151,  154,  176,  167,  158,
+      170,  172,  161,  173,  174,  177,  155,  164,  164,  165,
+      166,  164,  164,  168,  164,  164,  164,  164,  164,  164,
+      176,  170,  168,  178,  168,  174,  179,  180,  168,  181,
+      168,  182,  183,  184,  178,  185,  180,  187,  181,  186,
+      188,  189,  190,  191,  185,  179,  187,  190,  192,  197,
+      184,  195,  193,  188,  182,  183,  186,  192,  194,  189,
+      193,  199,  199,  194,  191,  195,  199,  197,  204,  206,
+      200,  200,  199,  200,  200,  202,  202,  202,  203,  203,
+      203,  205,  207,  211,  212,  204,  206,  213,  205,  214,
+
+      211,  215,  213,  216,  217,  218,  219,  221,  216,  207,
+      220,  219,  214,  222,  221,  224,  215,  212,  226,  220,
+      225,  227,  228,  217,  229,  225,  218,  226,  231,  230,
+      224,  235,  232,  236,  238,  244,  222,  239,  229,  242,
+      248,  241,  227,  228,  230,  281,  231,  232,  236,  235,
+      241,  281,  242,  245,  243,  244,  246,  247,  238,  249,
+      239,  243,  245,  248,  250,  246,  247,  252,  251,  249,
+      255,  254,  258,  250,  252,  260,  245,  251,  261,  246,
+      254,  258,  262,  264,  263,  255,  260,  265,  261,  263,
+      266,  267,  268,  270,  272,  262,  273,  273,  275,  278,
+
+      264,  276,  267,  275,  280,  279,  278,  272,  265,  276,
+      279,  266,  282,  283,  284,  285,  270,  286,  291,  268,
+      288,  282,  290,  292,  286,  280,  293,  288,  294,  295,
+      283,  290,  285,  291,  297,  298,  299,  284,  295,  292,
+      304,  300,  305,  299,  298,  294,  301,  302,  313,  293,
+      300,  297,  314,  317,  316,  301,  302,  322,  304,  318,
+      323,  324,  314,  313,  325,  305,  316,  323,  318,  324,
+      326,  328,  329,  330,  334,  332,  317,  335,  336,  340,
+      322,  326,  341,  343,  340,  329,  335,  325,  332,  345,
+      330,  334,  346,  354,  328,  355,  349,  347,  345,  343,
+
+      336,  346,  347,  349,  357,  341,  358,  362,  368,  363,
+      370,  369,  355,  357,  354,  371,  358,  374,  377,  375,
+      362,  363,  376,  368,  369,  378,  379,  370,  375,  381,
+      380,  376,  374,  383,  384,  377,  387,  385,  371,  380,
+      378,  379,  385,  384,  386,  387,  388,  392,  389,  386,
+      393,  381,  394,  398,  395,  399,  401,  407,  383,  389,
+      404,  400,  392,  395,  399,  406,  398,  393,  400,  388,
+      402,  401,  408,  404,  406,  394,  402,  408,  409,  410,
+      407,  411,  412,  413,  414,  415,  416,  417,  411,  418,
+      415,  419,  420,  421,  409,  423,  413,  427,  424,  414,
+
+      419,  420,  416,  425,  426,  412,  417,  424,  410,  428,
+      429,  431,  418,  426,  432,  434,  421,  435,  425,  436,
+      427,  437,  428,  432,  423,  438,  439,  429,  434,  431,
+      440,  441,  442,  444,  435,  448,  451,  447,  440,  437,
+      436,  446,  445,  443,  448,  433,  430,  439,  438,  422,
+      444,  405,  403,  397,  396,  442,  391,  451,  390,  382,
+      441,  454,  454,  454,  454,  455,  455,  457,  373,  457,
+      457,  372,  367,  366,  365,  364,  361,  360,  359,  356,
+      353,  352,  351,  350,  348,  344,  342,  339,  338,  337,
+      333,  331,  327,  321,  320,  319,  315,  312,  311,  310,
+
+      309,  308,  307,  306,  303,  296,  289,  287,  277,  274,
+      271,  269,  259,  257,  256,  253,  237,  234,  233,  223,
+      210,  209,  208,  196,  175,  171,  169,  163,  162,  160,
+      157,  156,  134,  129,  125,  123,  121,  118,  114,  110,
+       97,   84,   59,   39,   37,    8,    7,    3,  453,  453,
+      453,  453,  453,  453,  453,  453,  453,  453,  453,  453,
+      453,  453,  453,  453,  453,  453,  453,  453,  453,  453,
+      453,  453,  453,  453,  453,  453,  453,  453,  453,  453,
+      453,  453,  453,  453,  453,  453,  453,  453,  453,  453
     } ;
 
 static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
@@ -768,7 +775,7 @@
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 1 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 #define INITIAL 0
 /*===-- Lexer.l - Scanner for llvm assembly files --------------*- C++ -*--===//
 //
@@ -783,7 +790,7 @@
 //
 //===----------------------------------------------------------------------===*/
 #define YY_NEVER_INTERACTIVE 1
-#line 28 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 28 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 #include "ParserInternals.h"
 #include "llvm/Module.h"
 #include <list>
@@ -909,7 +916,7 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 913 "Lexer.cpp"
+#line 920 "Lexer.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1060,10 +1067,10 @@
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
 
-#line 179 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 179 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 
 
-#line 1067 "Lexer.cpp"
+#line 1074 "Lexer.cpp"
 
 	if ( yy_init )
 		{
@@ -1111,14 +1118,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 >= 443 )
+				if ( yy_current_state >= 454 )
 					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 != 442 );
+		while ( yy_current_state != 453 );
 
 yy_find_action:
 		yy_current_state = *--yy_state_ptr;
@@ -1156,476 +1163,481 @@
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 181 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 181 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { /* Ignore comments for now */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 183 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 183 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return BEGINTOK; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 184 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 184 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return ENDTOK; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 185 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 185 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return TRUETOK;  }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 186 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 186 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return FALSETOK; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 187 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 187 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return DECLARE; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 188 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 188 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return GLOBAL; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 189 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 189 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return CONSTANT; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 190 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 190 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return INTERNAL; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 191 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 191 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return LINKONCE; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 192 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 192 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return WEAK; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 193 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 193 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return APPENDING; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 194 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 194 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return EXTERNAL; }    /* Deprecated, turn into external */
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 195 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 195 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return EXTERNAL; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 196 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 196 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return IMPLEMENTATION; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 197 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 197 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return ZEROINITIALIZER; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 198 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 198 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return DOTDOTDOT; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 199 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 199 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return UNDEF; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 200 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 200 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return NULL_TOK; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 201 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 201 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return TO; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 202 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 202 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 203 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 203 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return NOT; }  /* Deprecated, turned into XOR */
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 204 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 204 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return TAIL; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 205 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 205 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return TARGET; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 206 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 206 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return TRIPLE; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 207 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 207 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return DEPLIBS; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 208 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 208 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return ENDIAN; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 209 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 209 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return POINTERSIZE; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 210 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 210 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return LITTLE; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 211 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 211 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return BIG; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 212 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 212 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return VOLATILE; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 213 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 213 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return ALIGN;  }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 214 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 214 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return SECTION; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 215 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 215 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return MODULE; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 216 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 216 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return ASM_TOK; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 217 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 217 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return SIDEEFFECT; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 219 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 219 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return CC_TOK; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 220 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 220 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return CCC_TOK; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 221 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 221 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return FASTCC_TOK; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 222 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 222 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return COLDCC_TOK; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 224 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 224 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::VoidTy  ; return VOID;   }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 225 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 225 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::BoolTy  ; return BOOL;   }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 226 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 226 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::SByteTy ; return SBYTE;  }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 227 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 227 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::UByteTy ; return UBYTE;  }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 228 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 228 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::ShortTy ; return SHORT;  }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 229 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 229 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::UShortTy; return USHORT; }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 230 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 230 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::IntTy   ; return INT;    }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 231 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 231 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::UIntTy  ; return UINT;   }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 232 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 232 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::LongTy  ; return LONG;   }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 233 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 233 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::ULongTy ; return ULONG;  }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 234 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 234 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::FloatTy ; return FLOAT;  }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 235 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 235 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::DoubleTy; return DOUBLE; }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 236 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 236 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::LabelTy ; return LABEL;  }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 237 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 237 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return TYPE;   }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 238 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 238 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return OPAQUE; }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 240 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 240 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Add, ADD); }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 241 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 241 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Sub, SUB); }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 242 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 242 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Mul, MUL); }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 243 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 243 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Div, DIV); }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 244 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 244 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Rem, REM); }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 245 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 245 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, And, AND); }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 246 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 246 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Or , OR ); }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 247 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 247 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Xor, XOR); }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 248 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 248 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SetNE, SETNE); }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 249 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 249 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SetEQ, SETEQ); }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 250 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 250 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SetLT, SETLT); }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 251 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 251 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SetGT, SETGT); }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 252 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 252 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SetLE, SETLE); }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 253 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 253 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SetGE, SETGE); }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 255 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 255 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, PHI, PHI_TOK); }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 256 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 256 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Call, CALL); }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 257 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 257 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Cast, CAST); }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 258 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 258 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Select, SELECT); }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 259 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 259 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Shl, SHL); }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 260 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 260 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Shr, SHR); }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 261 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 261 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return VANEXT_old; }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 262 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 262 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return VAARG_old; }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 263 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 263 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, VAArg , VAARG); }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 264 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 264 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Ret, RET); }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 265 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 265 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Br, BR); }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 266 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 266 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Switch, SWITCH); }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 267 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 267 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Invoke, INVOKE); }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 268 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 268 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 269 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 269 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 271 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 271 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Malloc, MALLOC); }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 272 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 272 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Alloca, ALLOCA); }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 273 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 273 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Free, FREE); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 274 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 274 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Load, LOAD); }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 275 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 275 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Store, STORE); }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 276 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 276 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 278 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 278 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 279 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 279 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 282 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 280 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
+	YY_BREAK
+case 94:
+YY_RULE_SETUP
+#line 283 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   UnEscapeLexed(yytext+1);
                   llvmAsmlval.StrVal = strdup(yytext+1);             // Skip %
                   return VAR_ID;
                 }
 	YY_BREAK
-case 94:
+case 95:
 YY_RULE_SETUP
-#line 287 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 288 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   yytext[strlen(yytext)-1] = 0;  // nuke colon
                   UnEscapeLexed(yytext);
@@ -1633,9 +1645,9 @@
                   return LABELSTR;
                 }
 	YY_BREAK
-case 95:
+case 96:
 YY_RULE_SETUP
-#line 293 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 294 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   yytext[strlen(yytext)-2] = 0;  // nuke colon, end quote
                   UnEscapeLexed(yytext+1);
@@ -1643,9 +1655,9 @@
                   return LABELSTR;
                 }
 	YY_BREAK
-case 96:
+case 97:
 YY_RULE_SETUP
-#line 300 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 301 "/Volumes/Projects/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
@@ -1656,14 +1668,14 @@
                    return STRINGCONSTANT;
                  }
 	YY_BREAK
-case 97:
+case 98:
 YY_RULE_SETUP
-#line 311 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 312 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.UInt64Val = atoull(yytext); return EUINT64VAL; }
 	YY_BREAK
-case 98:
+case 99:
 YY_RULE_SETUP
-#line 312 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 313 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   // +1:  we have bigger negative range
@@ -1673,17 +1685,17 @@
                   return ESINT64VAL;
                 }
 	YY_BREAK
-case 99:
+case 100:
 YY_RULE_SETUP
-#line 320 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 321 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                    llvmAsmlval.UInt64Val = HexIntToVal(yytext+3);
                    return yytext[0] == 's' ? ESINT64VAL : EUINT64VAL;
                  }
 	YY_BREAK
-case 100:
+case 101:
 YY_RULE_SETUP
-#line 325 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 326 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   if ((unsigned)Val != Val)
@@ -1692,9 +1704,9 @@
                   return UINTVAL;
                 }
 	YY_BREAK
-case 101:
+case 102:
 YY_RULE_SETUP
-#line 332 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 333 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+2);
                   // +1:  we have bigger negative range
@@ -1704,18 +1716,18 @@
                   return SINTVAL;
                 }
 	YY_BREAK
-case 102:
+case 103:
 YY_RULE_SETUP
-#line 341 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 342 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = atof(yytext); return FPVAL; }
 	YY_BREAK
-case 103:
+case 104:
 YY_RULE_SETUP
-#line 342 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 343 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = HexToFP(yytext); return FPVAL; }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 344 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 345 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
@@ -1724,22 +1736,22 @@
                   return EOF;
                 }
 	YY_BREAK
-case 104:
+case 105:
 YY_RULE_SETUP
-#line 352 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 353 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { /* Ignore whitespace */ }
 	YY_BREAK
-case 105:
+case 106:
 YY_RULE_SETUP
-#line 353 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 354 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return yytext[0]; }
 	YY_BREAK
-case 106:
+case 107:
 YY_RULE_SETUP
-#line 355 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 356 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 1743 "Lexer.cpp"
+#line 1755 "Lexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2026,7 +2038,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 >= 443 )
+			if ( yy_current_state >= 454 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2056,11 +2068,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 >= 443 )
+		if ( yy_current_state >= 454 )
 			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 == 442);
+	yy_is_jam = (yy_current_state == 453);
 	if ( ! yy_is_jam )
 		*yy_state_ptr++ = yy_current_state;
 
@@ -2621,6 +2633,6 @@
 	return 0;
 	}
 #endif
-#line 355 "/Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 356 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 
 


Index: llvm/lib/AsmParser/Lexer.l.cvs
diff -u llvm/lib/AsmParser/Lexer.l.cvs:1.2 llvm/lib/AsmParser/Lexer.l.cvs:1.3
--- llvm/lib/AsmParser/Lexer.l.cvs:1.2	Wed Feb 15 01:02:59 2006
+++ llvm/lib/AsmParser/Lexer.l.cvs	Fri Apr  7 20:18:56 2006
@@ -277,6 +277,7 @@
 
 extractelement  { RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
 insertelement   { RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
+shufflevector   { RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
 
 
 {VarID}         {


Index: llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.2 llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.3
--- llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.2	Sat Mar  4 01:53:40 2006
+++ llvm/lib/AsmParser/llvmAsmParser.cpp.cvs	Fri Apr  7 20:18:56 2006
@@ -1,5 +1,5 @@
 
-/*  A Bison parser, made from /Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y
+/*  A Bison parser, made from /Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y
     by GNU Bison version 1.28  */
 
 #define YYBISON 1  /* Identify Bison output.  */
@@ -107,10 +107,11 @@
 #define	VAARG	350
 #define	EXTRACTELEMENT	351
 #define	INSERTELEMENT	352
-#define	VAARG_old	353
-#define	VANEXT_old	354
+#define	SHUFFLEVECTOR	353
+#define	VAARG_old	354
+#define	VANEXT_old	355
 
-#line 14 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 14 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -207,8 +208,8 @@
     }
 
     // Look for intrinsic functions and CallInst that need to be upgraded
-    for (Module::iterator FI = CurrentModule->begin(),FE = CurrentModule->end();
-         FI != FE; )
+    for (Module::iterator FI = CurrentModule->begin(),
+         FE = CurrentModule->end(); FI != FE; )
       UpgradeCallsToIntrinsic(FI++);
 
     Values.clear();         // Clear out function local definitions
@@ -986,7 +987,7 @@
 }
 
 
-#line 890 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 890 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 typedef union {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -1036,26 +1037,26 @@
 
 
 
-#define	YYFINAL		473
+#define	YYFINAL		479
 #define	YYFLAG		-32768
-#define	YYNTBASE	115
+#define	YYNTBASE	116
 
-#define YYTRANSLATE(x) ((unsigned)(x) <= 354 ? yytranslate[x] : 186)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 355 ? yytranslate[x] : 187)
 
 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,   104,
-   105,   113,     2,   102,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,   109,
-   101,   110,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,   105,
+   106,   114,     2,   103,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,   110,
+   102,   111,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-   106,   103,   108,     2,     2,     2,     2,     2,   114,     2,
+   107,   104,   109,     2,     2,     2,     2,     2,   115,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,   107,
-     2,     2,   111,     2,   112,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,   108,
+     2,     2,   112,     2,   113,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -1078,7 +1079,7 @@
     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
+    97,    98,    99,   100,   101
 };
 
 #if YYDEBUG != 0
@@ -1105,8 +1106,8 @@
    533,   543,   553,   562,   576,   578,   580,   587,   593,   596,
    603,   611,   613,   617,   619,   620,   623,   625,   631,   637,
    643,   646,   651,   656,   663,   668,   673,   678,   683,   690,
-   693,   701,   703,   706,   707,   709,   710,   714,   721,   725,
-   732,   735,   740,   747
+   697,   700,   708,   710,   713,   714,   716,   717,   721,   728,
+   732,   739,   742,   747,   754
 };
 
 static const short yyrhs[] = {     5,
@@ -1115,77 +1116,77 @@
      0,    78,     0,    79,     0,    80,     0,    81,     0,    82,
      0,    83,     0,    84,     0,    94,     0,    95,     0,    16,
      0,    14,     0,    12,     0,    10,     0,    17,     0,    15,
-     0,    13,     0,    11,     0,   121,     0,   122,     0,    18,
-     0,    19,     0,   155,   101,     0,     0,    41,     0,    42,
+     0,    13,     0,    11,     0,   122,     0,   123,     0,    18,
+     0,    19,     0,   156,   102,     0,     0,    41,     0,    42,
      0,    43,     0,    44,     0,     0,     0,    62,     0,    63,
      0,    64,     0,    61,     4,     0,     0,    54,     4,     0,
-     0,   102,    54,     4,     0,    34,    24,     0,     0,   130,
-     0,     0,   102,   133,   132,     0,   130,     0,    54,     4,
-     0,   136,     0,     8,     0,   138,     0,     8,     0,   138,
+     0,   103,    54,     4,     0,    34,    24,     0,     0,   131,
+     0,     0,   103,   134,   133,     0,   131,     0,    54,     4,
+     0,   137,     0,     8,     0,   139,     0,     8,     0,   139,
      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,    45,     0,   137,
-     0,   169,     0,   103,     4,     0,   135,   104,   140,   105,
-     0,   106,     4,   107,   138,   108,     0,   109,     4,   107,
-   138,   110,     0,   111,   139,   112,     0,   111,   112,     0,
-   138,   113,     0,   138,     0,   139,   102,   138,     0,   139,
-     0,   139,   102,    37,     0,    37,     0,     0,   136,   106,
-   143,   108,     0,   136,   106,   108,     0,   136,   114,    24,
-     0,   136,   109,   143,   110,     0,   136,   111,   143,   112,
-     0,   136,   111,   112,     0,   136,    38,     0,   136,    39,
-     0,   136,   169,     0,   136,   142,     0,   136,    26,     0,
-   121,   116,     0,   122,     4,     0,     9,    27,     0,     9,
-    28,     0,   124,     7,     0,    92,   104,   141,    36,   136,
-   105,     0,    90,   104,   141,   183,   105,     0,    93,   104,
-   141,   102,   141,   102,   141,   105,     0,   117,   104,   141,
-   102,   141,   105,     0,   118,   104,   141,   102,   141,   105,
-     0,   119,   104,   141,   102,   141,   105,     0,   120,   104,
-   141,   102,   141,   105,     0,    97,   104,   141,   102,   141,
-   105,     0,   143,   102,   141,     0,   141,     0,    32,     0,
-    33,     0,   146,     0,   146,   164,     0,   146,   165,     0,
-   146,    59,    58,   150,     0,   146,    25,     0,   147,     0,
-   147,   125,    20,   134,     0,   147,   165,     0,   147,    59,
-    58,   150,     0,     0,   147,   125,   126,   144,   141,   148,
-   132,     0,     0,   147,   125,    47,   144,   136,   149,   132,
-     0,   147,    48,   152,     0,   147,    55,   101,   153,     0,
-     0,    24,     0,    53,     0,    52,     0,    50,   101,   151,
-     0,    51,   101,     4,     0,    49,   101,    24,     0,   106,
-   154,   108,     0,   154,   102,    24,     0,    24,     0,     0,
-    22,     0,    24,     0,   155,     0,     0,   136,   156,     0,
-   158,   102,   157,     0,   157,     0,   158,     0,   158,   102,
-    37,     0,    37,     0,     0,   127,   134,   155,   104,   159,
-   105,   131,   128,     0,    29,     0,   111,     0,   126,   160,
-   161,     0,    30,     0,   112,     0,   172,   163,     0,     0,
-    31,   166,   160,     0,     0,    60,     0,     3,     0,     4,
+     0,    19,     0,    20,     0,    21,     0,    45,     0,   138,
+     0,   170,     0,   104,     4,     0,   136,   105,   141,   106,
+     0,   107,     4,   108,   139,   109,     0,   110,     4,   108,
+   139,   111,     0,   112,   140,   113,     0,   112,   113,     0,
+   139,   114,     0,   139,     0,   140,   103,   139,     0,   140,
+     0,   140,   103,    37,     0,    37,     0,     0,   137,   107,
+   144,   109,     0,   137,   107,   109,     0,   137,   115,    24,
+     0,   137,   110,   144,   111,     0,   137,   112,   144,   113,
+     0,   137,   112,   113,     0,   137,    38,     0,   137,    39,
+     0,   137,   170,     0,   137,   143,     0,   137,    26,     0,
+   122,   117,     0,   123,     4,     0,     9,    27,     0,     9,
+    28,     0,   125,     7,     0,    92,   105,   142,    36,   137,
+   106,     0,    90,   105,   142,   184,   106,     0,    93,   105,
+   142,   103,   142,   103,   142,   106,     0,   118,   105,   142,
+   103,   142,   106,     0,   119,   105,   142,   103,   142,   106,
+     0,   120,   105,   142,   103,   142,   106,     0,   121,   105,
+   142,   103,   142,   106,     0,    97,   105,   142,   103,   142,
+   106,     0,   144,   103,   142,     0,   142,     0,    32,     0,
+    33,     0,   147,     0,   147,   165,     0,   147,   166,     0,
+   147,    59,    58,   151,     0,   147,    25,     0,   148,     0,
+   148,   126,    20,   135,     0,   148,   166,     0,   148,    59,
+    58,   151,     0,     0,   148,   126,   127,   145,   142,   149,
+   133,     0,     0,   148,   126,    47,   145,   137,   150,   133,
+     0,   148,    48,   153,     0,   148,    55,   102,   154,     0,
+     0,    24,     0,    53,     0,    52,     0,    50,   102,   152,
+     0,    51,   102,     4,     0,    49,   102,    24,     0,   107,
+   155,   109,     0,   155,   103,    24,     0,    24,     0,     0,
+    22,     0,    24,     0,   156,     0,     0,   137,   157,     0,
+   159,   103,   158,     0,   158,     0,   159,     0,   159,   103,
+    37,     0,    37,     0,     0,   128,   135,   156,   105,   160,
+   106,   132,   129,     0,    29,     0,   112,     0,   127,   161,
+   162,     0,    30,     0,   113,     0,   173,   164,     0,     0,
+    31,   167,   161,     0,     0,    60,     0,     3,     0,     4,
      0,     7,     0,    27,     0,    28,     0,    38,     0,    39,
-     0,    26,     0,   109,   143,   110,     0,   142,     0,    58,
-   167,    24,   102,    24,     0,   115,     0,   155,     0,   169,
-     0,   168,     0,   136,   170,     0,   172,   173,     0,   162,
-   173,     0,   174,   125,   175,     0,   174,   177,     0,     0,
-    23,     0,    65,   171,     0,    65,     8,     0,    66,    21,
-   170,     0,    66,     9,   170,   102,    21,   170,   102,    21,
-   170,     0,    67,   123,   170,   102,    21,   170,   106,   176,
-   108,     0,    67,   123,   170,   102,    21,   170,   106,   108,
-     0,    68,   127,   134,   170,   104,   180,   105,    36,    21,
-   170,    69,    21,   170,     0,    69,     0,    70,     0,   176,
-   123,   168,   102,    21,   170,     0,   123,   168,   102,    21,
-   170,     0,   125,   182,     0,   136,   106,   170,   102,   170,
-   108,     0,   178,   102,   106,   170,   102,   170,   108,     0,
-   171,     0,   179,   102,   171,     0,   179,     0,     0,    57,
-    56,     0,    56,     0,   117,   136,   170,   102,   170,     0,
-   118,   136,   170,   102,   170,     0,   119,   136,   170,   102,
-   170,     0,    46,   171,     0,   120,   171,   102,   171,     0,
-    92,   171,    36,   136,     0,    93,   171,   102,   171,   102,
-   171,     0,    96,   171,   102,   136,     0,    99,   171,   102,
-   136,     0,   100,   171,   102,   136,     0,    97,   171,   102,
-   171,     0,    98,   171,   102,   171,   102,   171,     0,    91,
-   178,     0,   181,   127,   134,   170,   104,   180,   105,     0,
-   185,     0,   102,   179,     0,     0,    35,     0,     0,    85,
-   136,   129,     0,    85,   136,   102,    15,   170,   129,     0,
-    86,   136,   129,     0,    86,   136,   102,    15,   170,   129,
-     0,    87,   171,     0,   184,    88,   136,   170,     0,   184,
-    89,   171,   102,   136,   170,     0,    90,   136,   170,   183,
-     0
+     0,    26,     0,   110,   144,   111,     0,   143,     0,    58,
+   168,    24,   103,    24,     0,   116,     0,   156,     0,   170,
+     0,   169,     0,   137,   171,     0,   173,   174,     0,   163,
+   174,     0,   175,   126,   176,     0,   175,   178,     0,     0,
+    23,     0,    65,   172,     0,    65,     8,     0,    66,    21,
+   171,     0,    66,     9,   171,   103,    21,   171,   103,    21,
+   171,     0,    67,   124,   171,   103,    21,   171,   107,   177,
+   109,     0,    67,   124,   171,   103,    21,   171,   107,   109,
+     0,    68,   128,   135,   171,   105,   181,   106,    36,    21,
+   171,    69,    21,   171,     0,    69,     0,    70,     0,   177,
+   124,   169,   103,    21,   171,     0,   124,   169,   103,    21,
+   171,     0,   126,   183,     0,   137,   107,   171,   103,   171,
+   109,     0,   179,   103,   107,   171,   103,   171,   109,     0,
+   172,     0,   180,   103,   172,     0,   180,     0,     0,    57,
+    56,     0,    56,     0,   118,   137,   171,   103,   171,     0,
+   119,   137,   171,   103,   171,     0,   120,   137,   171,   103,
+   171,     0,    46,   172,     0,   121,   172,   103,   172,     0,
+    92,   172,    36,   137,     0,    93,   172,   103,   172,   103,
+   172,     0,    96,   172,   103,   137,     0,   100,   172,   103,
+   137,     0,   101,   172,   103,   137,     0,    97,   172,   103,
+   172,     0,    98,   172,   103,   172,   103,   172,     0,    99,
+   172,   103,   172,   103,   172,     0,    91,   179,     0,   182,
+   128,   135,   171,   105,   181,   106,     0,   186,     0,   103,
+   180,     0,     0,    35,     0,     0,    85,   137,   130,     0,
+    85,   137,   103,    15,   171,   130,     0,    86,   137,   130,
+     0,    86,   137,   103,    15,   171,   130,     0,    87,   172,
+     0,   185,    88,   137,   171,     0,   185,    89,   172,   103,
+   137,   171,     0,    90,   137,   171,   184,     0
 };
 
 #endif
@@ -1214,8 +1215,8 @@
   1990,  1993,  2007,  2011,  2064,  2067,  2073,  2081,  2091,  2098,
   2103,  2110,  2114,  2120,  2120,  2122,  2125,  2131,  2143,  2154,
   2164,  2176,  2183,  2190,  2197,  2202,  2221,  2243,  2251,  2263,
-  2277,  2334,  2340,  2342,  2346,  2349,  2355,  2359,  2363,  2367,
-  2371,  2378,  2388,  2401
+  2268,  2282,  2339,  2345,  2347,  2351,  2354,  2360,  2364,  2368,
+  2372,  2376,  2383,  2393,  2406
 };
 #endif
 
@@ -1233,47 +1234,48 @@
 "CCC_TOK","FASTCC_TOK","COLDCC_TOK","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","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","AsmBlock","BigOrLittle","TargetDefinition","LibrariesDefinition",
-"LibList","Name","OptName","ArgVal","ArgListH","ArgList","FunctionHeaderH","BEGIN",
-"FunctionHeader","END","Function","FunctionProto","@3","OptSideEffect","ConstValueRef",
-"SymbolicValueRef","ValueRef","ResolvedVal","BasicBlockList","BasicBlock","InstructionList",
-"BBTerminatorInst","JumpTable","Inst","PHIList","ValueRefList","ValueRefListE",
-"OptTailCall","InstVal","IndexList","OptVolatile","MemoryInst", NULL
+"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","AsmBlock","BigOrLittle","TargetDefinition",
+"LibrariesDefinition","LibList","Name","OptName","ArgVal","ArgListH","ArgList",
+"FunctionHeaderH","BEGIN","FunctionHeader","END","Function","FunctionProto",
+"@3","OptSideEffect","ConstValueRef","SymbolicValueRef","ValueRef","ResolvedVal",
+"BasicBlockList","BasicBlock","InstructionList","BBTerminatorInst","JumpTable",
+"Inst","PHIList","ValueRefList","ValueRefListE","OptTailCall","InstVal","IndexList",
+"OptVolatile","MemoryInst", NULL
 };
 #endif
 
 static const short yyr1[] = {     0,
-   115,   115,   116,   116,   117,   117,   117,   117,   117,   118,
-   118,   118,   119,   119,   119,   119,   119,   119,   120,   120,
-   121,   121,   121,   121,   122,   122,   122,   122,   123,   123,
-   124,   124,   125,   125,   126,   126,   126,   126,   126,   127,
-   127,   127,   127,   127,   128,   128,   129,   129,   130,   131,
-   131,   132,   132,   133,   133,   134,   134,   135,   135,   136,
-   137,   137,   137,   137,   137,   137,   137,   137,   137,   137,
-   137,   137,   137,   138,   138,   138,   138,   138,   138,   138,
-   138,   138,   138,   139,   139,   140,   140,   140,   140,   141,
-   141,   141,   141,   141,   141,   141,   141,   141,   141,   141,
-   141,   141,   141,   141,   141,   142,   142,   142,   142,   142,
-   142,   142,   142,   143,   143,   144,   144,   145,   146,   146,
-   146,   146,   146,   147,   147,   147,   148,   147,   149,   147,
-   147,   147,   147,   150,   151,   151,   152,   152,   152,   153,
-   154,   154,   154,   155,   155,   156,   156,   157,   158,   158,
-   159,   159,   159,   159,   160,   161,   161,   162,   163,   163,
-   164,   166,   165,   167,   167,   168,   168,   168,   168,   168,
-   168,   168,   168,   168,   168,   168,   169,   169,   170,   170,
-   171,   172,   172,   173,   174,   174,   174,   175,   175,   175,
-   175,   175,   175,   175,   175,   175,   176,   176,   177,   178,
-   178,   179,   179,   180,   180,   181,   181,   182,   182,   182,
-   182,   182,   182,   182,   182,   182,   182,   182,   182,   182,
-   182,   182,   183,   183,   184,   184,   185,   185,   185,   185,
-   185,   185,   185,   185
+   116,   116,   117,   117,   118,   118,   118,   118,   118,   119,
+   119,   119,   120,   120,   120,   120,   120,   120,   121,   121,
+   122,   122,   122,   122,   123,   123,   123,   123,   124,   124,
+   125,   125,   126,   126,   127,   127,   127,   127,   127,   128,
+   128,   128,   128,   128,   129,   129,   130,   130,   131,   132,
+   132,   133,   133,   134,   134,   135,   135,   136,   136,   137,
+   138,   138,   138,   138,   138,   138,   138,   138,   138,   138,
+   138,   138,   138,   139,   139,   139,   139,   139,   139,   139,
+   139,   139,   139,   140,   140,   141,   141,   141,   141,   142,
+   142,   142,   142,   142,   142,   142,   142,   142,   142,   142,
+   142,   142,   142,   142,   142,   143,   143,   143,   143,   143,
+   143,   143,   143,   144,   144,   145,   145,   146,   147,   147,
+   147,   147,   147,   148,   148,   148,   149,   148,   150,   148,
+   148,   148,   148,   151,   152,   152,   153,   153,   153,   154,
+   155,   155,   155,   156,   156,   157,   157,   158,   159,   159,
+   160,   160,   160,   160,   161,   162,   162,   163,   164,   164,
+   165,   167,   166,   168,   168,   169,   169,   169,   169,   169,
+   169,   169,   169,   169,   169,   169,   170,   170,   171,   171,
+   172,   173,   173,   174,   175,   175,   175,   176,   176,   176,
+   176,   176,   176,   176,   176,   176,   177,   177,   178,   179,
+   179,   180,   180,   181,   181,   182,   182,   183,   183,   183,
+   183,   183,   183,   183,   183,   183,   183,   183,   183,   183,
+   183,   183,   183,   184,   184,   185,   185,   186,   186,   186,
+   186,   186,   186,   186,   186
 };
 
 static const short yyr2[] = {     0,
@@ -1298,9 +1300,9 @@
      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,     2,
-     7,     1,     2,     0,     1,     0,     3,     6,     3,     6,
-     2,     4,     6,     4
+     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 yydefact[] = {   133,
@@ -1312,375 +1314,373 @@
     44,     1,     2,    57,    61,    62,    63,    64,    65,    66,
     67,    68,    69,    70,    71,    72,    73,    74,     0,     0,
      0,     0,   177,     0,     0,    56,    75,    60,   178,    76,
-   156,   157,   158,   226,   185,     0,     0,     0,   143,   132,
+   156,   157,   158,   227,   185,     0,     0,     0,   143,   132,
    126,   124,   116,   117,     0,     0,    77,     0,     0,    59,
-    82,    84,     0,     0,    89,    83,   225,     0,   207,     0,
+    82,    84,     0,     0,    89,    83,   226,     0,   207,     0,
      0,     0,     0,    40,   195,   196,     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,   184,    40,
-   199,     0,   222,   139,   136,   135,   137,   138,   142,     0,
-   129,    61,    62,    63,    64,    65,    66,    67,    68,    69,
-    70,    71,     0,     0,     0,     0,   127,     0,     0,     0,
-    81,   154,    88,    86,     0,     0,   211,   206,   189,   188,
-     0,     0,    24,    28,    23,    27,    22,    26,    21,    25,
-    29,    30,     0,     0,    47,    47,   231,     0,     0,   220,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,   184,
+    40,   199,     0,   223,   139,   136,   135,   137,   138,   142,
+     0,   129,    61,    62,    63,    64,    65,    66,    67,    68,
+    69,    70,    71,     0,     0,     0,     0,   127,     0,     0,
+     0,    81,   154,    88,    86,     0,     0,   211,   206,   189,
+   188,     0,     0,    24,    28,    23,    27,    22,    26,    21,
+    25,    29,    30,     0,     0,    47,    47,   232,     0,     0,
+   221,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,   140,    52,   103,
+   104,     3,     4,   101,   102,   105,   100,    96,    97,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,   140,    52,   103,   104,     3,
-     4,   101,   102,   105,   100,    96,    97,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,    99,
-    98,    52,    58,    58,    85,   153,   147,   150,   151,     0,
-     0,    78,   166,   167,   168,   173,   169,   170,   171,   172,
-   164,     0,   175,   180,   179,   181,     0,   190,     0,     0,
-     0,   227,     0,   229,   224,     0,     0,     0,     0,     0,
+     0,    99,    98,    52,    58,    58,    85,   153,   147,   150,
+   151,     0,     0,    78,   166,   167,   168,   173,   169,   170,
+   171,   172,   164,     0,   175,   180,   179,   181,     0,   190,
+     0,     0,     0,   228,     0,   230,   225,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,   141,     0,   130,     0,     0,     0,     0,    91,   115,
-     0,     0,    95,     0,    92,     0,     0,     0,     0,   128,
-    79,    80,   146,   148,     0,    50,    87,   165,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,   234,     0,     0,
-   213,     0,   215,   218,     0,   216,   217,     0,     0,     0,
-   212,     0,   232,     0,     0,     0,    54,    52,   224,     0,
-     0,     0,     0,    90,    93,    94,     0,     0,     0,     0,
-   152,   149,    51,    45,     0,   174,     0,     0,   205,    47,
-    48,    47,   202,   223,     0,     0,     0,     0,   208,   209,
-   210,   205,     0,    49,    55,    53,     0,     0,     0,     0,
-   114,     0,     0,     0,     0,     0,   155,     0,     0,     0,
-   204,     0,     0,   228,   230,     0,     0,     0,   214,   219,
-     0,   233,   107,     0,     0,     0,     0,     0,     0,     0,
-    46,   176,     0,     0,     0,   203,   200,     0,   221,   106,
-     0,   113,   109,   110,   111,   112,     0,   193,     0,     0,
-     0,   201,     0,   191,     0,   192,     0,     0,   108,     0,
-     0,     0,     0,     0,     0,   198,     0,     0,   197,   194,
-     0,     0,     0
+     0,     0,     0,     0,   141,     0,   130,     0,     0,     0,
+     0,    91,   115,     0,     0,    95,     0,    92,     0,     0,
+     0,     0,   128,    79,    80,   146,   148,     0,    50,    87,
+   165,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+   235,     0,     0,   213,     0,   215,   218,     0,     0,   216,
+   217,     0,     0,     0,   212,     0,   233,     0,     0,     0,
+    54,    52,   225,     0,     0,     0,     0,    90,    93,    94,
+     0,     0,     0,     0,   152,   149,    51,    45,     0,   174,
+     0,     0,   205,    47,    48,    47,   202,   224,     0,     0,
+     0,     0,     0,   208,   209,   210,   205,     0,    49,    55,
+    53,     0,     0,     0,     0,   114,     0,     0,     0,     0,
+     0,   155,     0,     0,     0,   204,     0,     0,   229,   231,
+     0,     0,     0,   214,   219,   220,     0,   234,   107,     0,
+     0,     0,     0,     0,     0,     0,    46,   176,     0,     0,
+     0,   203,   200,     0,   222,   106,     0,   113,   109,   110,
+   111,   112,     0,   193,     0,     0,     0,   201,     0,   191,
+     0,   192,     0,     0,   108,     0,     0,     0,     0,     0,
+     0,   198,     0,     0,   197,   194,     0,     0,     0
 };
 
 static const short yydefgoto[] = {    73,
-   232,   246,   247,   248,   249,   173,   174,   203,   175,    20,
-    10,    29,   407,   282,   357,   374,   304,   358,    74,    75,
-   186,    77,    78,   103,   185,   310,   273,   311,    95,   471,
-     1,     2,   252,   227,    50,   157,    41,    90,   160,    79,
-   324,   258,   259,   260,    30,    83,    11,    36,    12,    13,
-    23,   329,   274,    80,   276,   383,    14,    32,    33,   149,
-   450,    85,   210,   411,   412,   150,   151,   338,   152,   153
+   234,   248,   249,   250,   251,   174,   175,   204,   176,    20,
+    10,    29,   412,   284,   361,   378,   307,   362,    74,    75,
+   187,    77,    78,   103,   186,   313,   275,   314,    95,   477,
+     1,     2,   254,   229,    50,   158,    41,    90,   161,    79,
+   327,   260,   261,   262,    30,    83,    11,    36,    12,    13,
+    23,   332,   276,    80,   278,   387,    14,    32,    33,   150,
+   456,    85,   211,   416,   417,   151,   152,   341,   153,   154
 };
 
 static const short yypact[] = {-32768,
-    30,    99,-32768,-32768,-32768,-32768,-32768,-32768,   -47,    46,
-    33,-32768,-32768,   -13,-32768,-32768,    75,   -32,    26,    21,
-    -3,-32768,    46,    63,   100,-32768,-32768,-32768,   974,   -21,
--32768,-32768,   105,-32768,-32768,-32768,-32768,    10,    27,    32,
--32768,    38,    63,   974,   103,   103,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,    18,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   135,   148,
-   155,   490,-32768,   105,    67,-32768,-32768,   -64,-32768,-32768,
--32768,-32768,-32768,  1136,-32768,   149,    85,   172,   154,-32768,
--32768,-32768,-32768,-32768,  1012,  1050,-32768,    73,    76,-32768,
--32768,   -64,   -17,    80,   784,-32768,-32768,  1012,-32768,   129,
-  1088,    23,   221,    46,-32768,-32768,-32768,-32768,-32768,-32768,
+   107,   362,-32768,-32768,-32768,-32768,-32768,-32768,   -37,    78,
+    23,-32768,-32768,   -12,-32768,-32768,    75,     2,    32,    -6,
+    27,-32768,    78,    85,   140,-32768,-32768,-32768,   957,   -20,
+-32768,-32768,   121,-32768,-32768,-32768,-32768,    45,    53,    70,
+-32768,    68,    85,   957,    31,    31,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,    76,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   178,   179,
+   182,    67,-32768,   121,    88,-32768,-32768,    16,-32768,-32768,
+-32768,-32768,-32768,  1120,-32768,   170,   100,   184,   173,-32768,
+-32768,-32768,-32768,-32768,   995,  1033,-32768,    91,    92,-32768,
+-32768,    16,   -42,    96,   767,-32768,-32768,   995,-32768,   147,
+  1071,    22,   223,    78,-32768,-32768,-32768,-32768,-32768,-32768,
 -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  1012,  1012,  1012,  1012,  1012,  1012,  1012,-32768,-32768,  1012,
-  1012,  1012,  1012,  1012,  1012,  1012,  1012,  1012,-32768,    46,
--32768,    60,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   -14,
--32768,   123,   153,   182,   159,   186,   162,   187,   164,   188,
-   189,   190,   166,   194,   193,   372,-32768,  1012,  1012,  1012,
--32768,   822,-32768,   101,   102,   622,-32768,-32768,    18,-32768,
-   622,   622,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,   622,   974,   104,   107,-32768,   622,    98,   108,
-   169,   109,   110,   118,   119,   120,   121,   622,   622,   622,
-   122,   974,  1012,  1012,   201,-32768,   124,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,   136,   137,   138,
-   141,   860,  1050,   531,   215,   142,   143,   144,   146,-32768,
--32768,   124,   -75,   -53,   -64,-32768,   105,-32768,   150,   139,
-   898,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-   191,  1050,-32768,-32768,-32768,-32768,   151,-32768,   152,   622,
-     5,-32768,    16,-32768,   158,   622,   156,  1012,  1012,  1012,
-  1012,  1012,  1012,  1012,   161,   165,   168,  1012,   622,   622,
-   170,-32768,   -18,-32768,  1050,  1050,  1050,  1050,-32768,-32768,
-   -11,   -65,-32768,   -16,-32768,  1050,  1050,  1050,  1050,-32768,
--32768,-32768,-32768,-32768,   936,   222,-32768,-32768,   233,   -10,
-   245,   250,   171,   622,   269,   622,  1012,-32768,   178,   622,
--32768,   179,-32768,-32768,   180,-32768,-32768,   622,   622,   622,
--32768,   181,-32768,  1012,   259,   280,-32768,   124,   158,   255,
-   184,   192,  1050,-32768,-32768,-32768,   197,   198,   199,   200,
--32768,-32768,-32768,   238,   202,-32768,   622,   622,  1012,   204,
--32768,   204,-32768,   205,   622,   206,  1012,  1012,-32768,-32768,
--32768,  1012,   622,-32768,-32768,-32768,   207,  1012,  1050,  1050,
--32768,  1050,  1050,  1050,  1050,   289,-32768,   271,   218,   223,
-   205,   216,   270,-32768,-32768,  1012,   219,   622,-32768,-32768,
-   225,-32768,-32768,   228,   226,   230,   231,   232,   235,   236,
--32768,-32768,   321,    12,   308,-32768,-32768,   237,-32768,-32768,
-  1050,-32768,-32768,-32768,-32768,-32768,   622,-32768,   682,    66,
-   328,-32768,   246,-32768,   248,-32768,   682,   622,-32768,   332,
-   253,   287,   622,   336,   340,-32768,   622,   622,-32768,-32768,
-   363,   364,-32768
+   995,   995,   995,   995,   995,   995,   995,-32768,-32768,   995,
+   995,   995,   995,   995,   995,   995,   995,   995,   995,-32768,
+    78,-32768,    47,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+    24,-32768,    41,   154,   203,   156,   204,   160,   205,   164,
+   206,   207,   215,   166,   209,   216,   425,-32768,   995,   995,
+   995,-32768,   805,-32768,   108,   118,   604,-32768,-32768,    76,
+-32768,   604,   604,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,   604,   957,   122,   123,-32768,   604,   120,
+   125,   208,   138,   139,   143,   144,   145,   146,   149,   604,
+   604,   604,   150,   957,   995,   995,   219,-32768,   151,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   153,
+   155,   157,   159,   843,  1033,   548,   226,   161,   165,   168,
+   169,-32768,-32768,   151,   -75,    -3,    16,-32768,   121,-32768,
+   152,   163,   881,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,   196,  1033,-32768,-32768,-32768,-32768,   162,-32768,
+   172,   604,    -5,-32768,     5,-32768,   175,   604,   176,   995,
+   995,   995,   995,   995,   995,   995,   995,   181,   183,   185,
+   995,   604,   604,   186,-32768,   -22,-32768,  1033,  1033,  1033,
+  1033,-32768,-32768,    25,   -46,-32768,     7,-32768,  1033,  1033,
+  1033,  1033,-32768,-32768,-32768,-32768,-32768,   919,   242,-32768,
+-32768,   261,   -41,   266,   273,   190,   604,   292,   604,   995,
+-32768,   194,   604,-32768,   195,-32768,-32768,   197,   198,-32768,
+-32768,   604,   604,   604,-32768,   200,-32768,   995,   283,   305,
+-32768,   151,   175,   274,   210,   213,  1033,-32768,-32768,-32768,
+   224,   228,   230,   231,-32768,-32768,-32768,   257,   232,-32768,
+   604,   604,   995,   234,-32768,   234,-32768,   236,   604,   237,
+   995,   995,   995,-32768,-32768,-32768,   995,   604,-32768,-32768,
+-32768,   220,   995,  1033,  1033,-32768,  1033,  1033,  1033,  1033,
+   338,-32768,   319,   244,   238,   236,   243,   294,-32768,-32768,
+   995,   246,   604,-32768,-32768,-32768,   250,-32768,-32768,   253,
+   258,   254,   256,   259,   260,   262,-32768,-32768,   342,    13,
+   328,-32768,-32768,   263,-32768,-32768,  1033,-32768,-32768,-32768,
+-32768,-32768,   604,-32768,   664,    83,   348,-32768,   264,-32768,
+   268,-32768,   664,   604,-32768,   352,   280,   308,   604,   364,
+   366,-32768,   604,   604,-32768,-32768,   388,   389,-32768
 };
 
 static const short yypgoto[] = {-32768,
--32768,   281,   282,   283,   284,  -112,  -111,  -415,-32768,   339,
-   359,  -102,-32768,  -201,    54,-32768,  -243,-32768,   -40,-32768,
-   -29,-32768,   -66,   276,-32768,   -89,   208,  -230,   337,-32768,
--32768,-32768,-32768,-32768,   342,-32768,-32768,-32768,-32768,     1,
--32768,    57,-32768,-32768,   365,-32768,-32768,-32768,-32768,   384,
--32768,-32768,  -356,   -31,   140,   -90,-32768,   375,-32768,-32768,
--32768,-32768,-32768,    53,    -1,-32768,-32768,    34,-32768,-32768
+-32768,   306,   307,   312,   313,  -112,  -110,  -398,-32768,   365,
+   379,  -101,-32768,  -199,    71,-32768,  -249,-32768,   -40,-32768,
+   -29,-32768,   -65,   296,-32768,   -90,   225,  -229,   361,-32768,
+-32768,-32768,-32768,-32768,   368,-32768,-32768,-32768,-32768,     0,
+-32768,    80,-32768,-32768,   390,-32768,-32768,-32768,-32768,   410,
+-32768,-32768,  -332,   -31,   132,   -89,-32768,   401,-32768,-32768,
+-32768,-32768,-32768,    79,    19,-32768,-32768,    60,-32768,-32768
 };
 
 
-#define	YYLAST		1236
+#define	YYLAST		1221
 
 
 static const short yytable[] = {    76,
-   201,   202,    21,    92,   284,   102,   177,    81,   320,    31,
-    24,   204,   312,   314,    76,   355,    34,   187,   449,   334,
-   190,   193,   194,   195,   196,   197,   198,   199,   200,  -118,
-   336,   191,   321,    21,   457,   356,   363,   106,   102,   -58,
-    44,   330,   207,   192,   365,   211,   212,   222,   106,   213,
-   214,   215,   216,   217,     3,    31,   322,   221,   335,   106,
-     4,     5,     6,     7,     8,   161,   176,    45,    42,   335,
-     5,     6,     7,     8,   104,   193,   194,   195,   196,   197,
-   198,   199,   200,    43,   180,   363,    49,   225,     9,    82,
-   363,   363,   455,   226,   181,   366,   364,    47,    35,   376,
-   461,   205,   206,    51,   208,   209,    25,    26,    27,    28,
-    86,   253,   254,   255,   396,   218,   219,   220,   -34,   448,
-    15,   -59,    16,    38,    39,    40,    15,    87,    16,     4,
-   -34,   -34,    88,   301,    93,    94,   155,   156,    97,   -34,
-   -34,   -34,   -34,    89,   251,   -34,    17,   223,   224,   228,
-   229,    98,   257,    18,   275,   -24,   -24,    19,    99,   275,
-   275,   -23,   -23,   280,   -22,   -22,   -21,   -21,   230,   231,
-   105,   275,   154,   456,    76,   158,   275,   159,   414,   178,
-   415,   299,   179,   182,   188,   -28,   275,   275,   275,   -27,
-   -26,   -25,    76,   300,   255,   -31,   -32,   233,   342,   234,
-   344,   345,   261,   286,   288,   281,   262,   351,   283,   287,
-   289,   290,   176,   176,   176,   359,   360,   361,   362,   291,
-   292,   293,   294,   298,   302,   303,   367,   368,   369,   370,
-   193,   194,   195,   196,   197,   198,   199,   200,   315,   305,
-   306,   307,   176,   326,   308,   316,   317,   318,   275,   319,
-   328,   325,   331,   332,   275,   355,   375,   323,   341,   337,
-   343,   340,   348,   346,   347,   377,   349,   275,   275,   350,
-   378,   354,   381,   401,   379,   176,   176,   176,   176,   385,
-   387,   388,   394,   395,   392,   399,   176,   176,   176,   176,
-   398,   406,   431,   400,   432,   257,   419,   420,   402,   403,
-   404,   405,   275,   408,   275,   413,   416,   418,   275,   425,
-   426,   423,   427,   428,   429,   430,   275,   275,   275,   433,
-   435,   201,   202,   335,   393,   436,   437,   441,   434,   439,
-   277,   278,   440,   176,   442,   443,   444,   201,   202,   445,
-   446,   447,   279,   451,   452,   275,   275,   285,   458,   460,
-   459,   453,   463,   275,   464,   465,   467,   295,   296,   297,
-   468,   275,   472,   473,   145,   146,   147,   148,   424,   176,
-   176,    84,   176,   176,   176,   176,    52,    53,    46,   373,
-   184,   372,    96,   250,    91,    22,   275,    48,    37,   384,
-   421,     0,   397,    15,     0,    16,     0,   235,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,   236,
-   237,   176,     0,     0,     0,   275,     0,     0,     0,   333,
-     0,     0,     0,     0,     0,   339,   275,     0,     0,     0,
-     0,   275,     0,     0,     0,   275,   275,     0,   352,   353,
-     0,     0,   117,   118,   119,   120,   121,   122,   123,   124,
-   125,   126,   127,   128,   129,   130,     0,     0,     0,     0,
-     0,   238,     0,   239,   240,   138,   139,     0,   241,     0,
-     0,     0,     0,   380,     0,   382,     0,   242,     0,   386,
-   243,     0,   244,     0,     0,   245,     0,   389,   390,   391,
-     0,     0,     0,     0,    52,    53,     0,   100,    55,    56,
-    57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-    67,    15,     0,    16,     0,     0,   409,   410,     0,     0,
-     0,     0,     0,     0,   417,     0,     0,     0,     0,     0,
-     0,     0,   422,     0,    68,    52,    53,     0,   100,   162,
-   163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
-    66,    67,    15,     0,    16,     0,     0,   438,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,    68,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,   454,     0,     0,     0,
-     0,     0,    69,     0,     0,    70,     0,   462,    71,     0,
-    72,   101,   466,     0,     0,     0,   469,   470,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,   263,   264,    52,    53,   265,     0,
-     0,     0,     0,    69,     0,     0,    70,     0,     0,    71,
-     0,    72,   313,    15,     0,    16,     0,   266,   267,   268,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,   269,
-   270,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,   271,
-     0,     0,     0,     0,   263,   264,     0,     0,   265,     0,
-     0,     0,   117,   118,   119,   120,   121,   122,   123,   124,
-   125,   126,   127,   128,   129,   130,     0,   266,   267,   268,
-     0,   238,     0,   239,   240,   138,   139,     0,   241,   269,
-   270,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-   272,     0,     0,     0,     0,     0,     0,     0,     0,   271,
+   202,    21,   203,    92,   323,   178,   102,   286,    81,   337,
+    31,   359,   205,    44,    76,   315,   317,    34,   188,   339,
+    24,   191,   194,   195,   196,   197,   198,   199,   200,   201,
+   192,   360,    21,   324,     5,     6,     7,     8,   106,   102,
+    45,   455,   193,   208,   333,    31,   212,   213,   338,   224,
+   214,   215,   216,   217,   218,   219,   367,   463,   338,   223,
+   181,   367,    93,    94,   369,   162,   177,   230,   231,   380,
+   182,    52,    53,   104,   100,    55,    56,    57,    58,    59,
+    60,    61,    62,    63,    64,    65,    66,    67,    15,    43,
+    16,    82,   194,   195,   196,   197,   198,   199,   200,   201,
+    35,   206,   207,    42,   209,   210,  -118,   325,    49,   367,
+   106,    68,   401,   255,   256,   257,   220,   221,   222,   370,
+   -58,   454,   461,    38,    39,    40,   227,   367,    47,   106,
+   467,     3,   228,   368,   225,   226,   304,     4,    25,    26,
+    27,    28,    15,    51,    16,   253,    86,     5,     6,     7,
+     8,   156,   157,   259,    87,   277,   -24,   -24,   -23,   -23,
+   277,   277,   -22,   -22,   282,     9,   -21,   -21,   232,   233,
+    69,    88,   277,    70,    89,    76,    71,   277,    72,   101,
+   -59,    97,    98,   302,   419,    99,   420,   159,   277,   277,
+   277,   462,   105,   155,    76,   303,   160,   257,   179,   180,
+   183,   345,   189,   347,   348,   349,   -28,   -27,   -26,   -25,
+   263,   355,   235,   -31,   177,   177,   177,   363,   364,   365,
+   366,   -32,   236,   264,   283,   285,   288,   289,   371,   372,
+   373,   374,   194,   195,   196,   197,   198,   199,   200,   201,
+   291,   292,   305,   290,   177,   293,   294,   295,   296,   318,
+   277,   297,   301,   306,   328,   331,   277,   308,   326,   309,
+   344,   310,   346,   311,   334,   319,   350,   351,   329,   320,
+   277,   277,   321,   322,   335,   359,   406,   340,   177,   177,
+   177,   177,   343,   352,   379,   353,   381,   354,   358,   177,
+   177,   177,   177,   382,   383,   385,   389,   391,   259,   392,
+   393,   424,   425,   426,   397,   277,   399,   277,   400,   403,
+   411,   277,   404,   431,   432,   405,   433,   434,   435,   436,
+   277,   277,   277,   279,   280,   429,   407,   202,   398,   203,
+   408,   442,   409,   410,   413,   281,   418,   177,   421,   423,
+   287,   437,   438,   202,   440,   203,   439,   338,   441,   277,
+   277,   298,   299,   300,   443,   445,   459,   277,   446,   448,
+   447,   449,   453,   457,   450,   451,   277,   452,   464,   465,
+   466,   458,   469,   430,   177,   177,   471,   177,   177,   177,
+   177,   -34,   470,    15,   473,    16,   474,   478,   479,   146,
+   147,   277,     4,   -34,   -34,   148,   149,    84,    46,   377,
+   185,   252,   -34,   -34,   -34,   -34,    96,   376,   -34,    17,
+    91,    22,    48,   336,    37,   427,    18,   177,   388,   342,
+    19,   277,   402,     0,     0,     0,     0,     0,     0,    52,
+    53,     0,   277,   356,   357,     0,     0,   277,     0,     0,
+     0,   277,   277,     0,     0,     0,    15,     0,    16,     0,
+   237,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,   238,   239,     0,     0,     0,     0,   384,     0,
+   386,     0,     0,     0,   390,     0,     0,     0,     0,     0,
+     0,     0,     0,   394,   395,   396,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,   117,   118,   119,   120,   121,
+   122,   123,   124,   125,   126,   127,   128,   129,   130,     0,
+     0,     0,   414,   415,   240,     0,   241,   242,   138,   139,
+   422,   243,     0,     0,     0,     0,     0,     0,     0,   428,
+     0,   244,     0,     0,   245,     0,   246,     0,     0,   247,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,   117,   118,   119,   120,   121,   122,   123,   124,
-   125,   126,   127,   128,   129,   130,     0,     0,     0,     0,
-     0,   238,     0,   239,   240,   138,   139,     0,   241,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,    52,    53,
-   272,   100,    55,    56,    57,    58,    59,    60,    61,    62,
-    63,    64,    65,    66,    67,    15,     0,    16,     0,     0,
+     0,     0,    52,    53,   444,   100,   163,   164,   165,   166,
+   167,   168,   169,   170,   171,   172,   173,    66,    67,    15,
+     0,    16,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,   460,     0,     0,     0,     0,     0,
+     0,     0,    68,     0,     0,   468,     0,     0,     0,     0,
+   472,     0,     0,     0,   475,   476,   265,   266,    52,    53,
+   267,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,    15,     0,    16,     0,   268,
+   269,   270,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,   271,   272,     0,     0,     0,     0,     0,     0,     0,
+     0,    69,     0,     0,    70,     0,     0,    71,     0,    72,
+   316,   273,     0,     0,     0,     0,   265,   266,     0,     0,
+   267,     0,     0,     0,   117,   118,   119,   120,   121,   122,
+   123,   124,   125,   126,   127,   128,   129,   130,     0,   268,
+   269,   270,     0,   240,     0,   241,   242,   138,   139,     0,
+   243,   271,   272,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,   274,     0,     0,     0,     0,     0,     0,
+     0,   273,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,   117,   118,   119,   120,   121,   122,
+   123,   124,   125,   126,   127,   128,   129,   130,     0,     0,
+     0,     0,     0,   240,     0,   241,   242,   138,   139,     0,
+   243,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,    52,    53,   274,   100,    55,    56,    57,    58,    59,
+    60,    61,    62,    63,    64,    65,    66,    67,    15,     0,
+    16,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,   184,     0,     0,     0,     0,     0,    52,
+    53,    68,   100,    55,    56,    57,    58,    59,    60,    61,
+    62,    63,    64,    65,    66,    67,    15,     0,    16,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-   183,     0,     0,     0,     0,     0,    52,    53,    68,   100,
-    55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-    65,    66,    67,    15,     0,    16,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,   256,     0,
-     0,     0,     0,     0,    52,    53,    68,   100,   162,   163,
-   164,   165,   166,   167,   168,   169,   170,   171,   172,    66,
-    67,    15,     0,    16,     0,     0,    69,     0,     0,    70,
-     0,     0,    71,     0,    72,     0,     0,     0,     0,     0,
-     0,     0,    52,    53,    68,   100,    55,    56,    57,    58,
-    59,    60,    61,    62,    63,    64,    65,    66,    67,    15,
-     0,    16,     0,     0,    69,     0,     0,    70,     0,     0,
-    71,     0,    72,     0,   327,     0,     0,     0,     0,     0,
-    52,    53,    68,   100,    55,    56,    57,    58,    59,    60,
-    61,    62,    63,    64,    65,    66,    67,    15,     0,    16,
-     0,     0,    69,     0,     0,    70,     0,   309,    71,     0,
-    72,     0,   371,     0,     0,     0,     0,     0,    52,    53,
-    68,    54,    55,    56,    57,    58,    59,    60,    61,    62,
-    63,    64,    65,    66,    67,    15,     0,    16,     0,     0,
+     0,   258,     0,     0,     0,     0,     0,    52,    53,    68,
+   100,   163,   164,   165,   166,   167,   168,   169,   170,   171,
+   172,   173,    66,    67,    15,     0,    16,     0,     0,     0,
+    69,     0,     0,    70,     0,     0,    71,     0,    72,     0,
+     0,     0,     0,     0,     0,    52,    53,    68,   100,    55,
+    56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+    66,    67,    15,     0,    16,     0,     0,     0,    69,     0,
+     0,    70,     0,     0,    71,     0,    72,   330,     0,     0,
+     0,     0,     0,    52,    53,    68,   100,    55,    56,    57,
+    58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
+    15,     0,    16,     0,     0,     0,    69,     0,     0,    70,
+     0,   312,    71,     0,    72,   375,     0,     0,     0,     0,
+     0,    52,    53,    68,    54,    55,    56,    57,    58,    59,
+    60,    61,    62,    63,    64,    65,    66,    67,    15,     0,
+    16,     0,     0,     0,    69,     0,     0,    70,     0,     0,
+    71,     0,    72,     0,     0,     0,     0,     0,     0,    52,
+    53,    68,   100,    55,    56,    57,    58,    59,    60,    61,
+    62,    63,    64,    65,    66,    67,    15,     0,    16,     0,
+     0,     0,    69,     0,     0,    70,     0,     0,    71,     0,
+    72,     0,     0,     0,     0,     0,     0,    52,    53,    68,
+   100,   163,   164,   165,   166,   167,   168,   169,   170,   171,
+   172,   173,    66,    67,    15,     0,    16,     0,     0,     0,
     69,     0,     0,    70,     0,     0,    71,     0,    72,     0,
-     0,     0,     0,     0,     0,     0,    52,    53,    68,   100,
-    55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-    65,    66,    67,    15,     0,    16,     0,     0,    69,     0,
+     0,     0,     0,     0,     0,    52,    53,    68,   190,    55,
+    56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+    66,    67,    15,     0,    16,     0,     0,     0,    69,     0,
      0,    70,     0,     0,    71,     0,    72,     0,     0,     0,
-     0,     0,     0,     0,    52,    53,    68,   100,   162,   163,
-   164,   165,   166,   167,   168,   169,   170,   171,   172,    66,
-    67,    15,     0,    16,     0,     0,    69,     0,     0,    70,
-     0,     0,    71,     0,    72,     0,     0,     0,     0,     0,
-     0,     0,    52,    53,    68,   189,    55,    56,    57,    58,
-    59,    60,    61,    62,    63,    64,    65,    66,    67,    15,
-     0,    16,     0,     0,    69,     0,     0,    70,     0,     0,
-    71,     0,    72,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,    68,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,    68,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,    69,     0,     0,    70,     0,     0,    71,     0,
-    72,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-   107,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,   108,     0,     0,     0,     0,     0,     0,     0,     0,
-    69,   109,   110,    70,     0,     0,    71,     0,    72,     0,
-   111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-   121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-   131,   132,   133,     0,     0,   134,   135,   136,   137,   138,
-   139,   140,   141,   142,   143,   144
+     0,     0,     0,     0,     0,     0,    69,     0,     0,    70,
+     0,     0,    71,     0,    72,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,   107,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,   108,     0,     0,     0,     0,
+     0,     0,     0,     0,    69,   109,   110,    70,     0,     0,
+    71,     0,    72,     0,   111,   112,   113,   114,   115,   116,
+   117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+   127,   128,   129,   130,   131,   132,   133,     0,     0,   134,
+   135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+   145
 };
 
 static const short yycheck[] = {    29,
-   113,   113,     2,    44,   206,    72,    96,    29,   252,    23,
-    58,   114,   243,   244,    44,    34,    30,   108,   434,    15,
-   111,    10,    11,    12,    13,    14,    15,    16,    17,     0,
-    15,     9,   108,    33,   450,    54,   102,   113,   105,   104,
-    20,   272,   133,    21,   110,   136,   137,   150,   113,   140,
-   141,   142,   143,   144,    25,    23,   110,   148,    54,   113,
-    31,    41,    42,    43,    44,    95,    96,    47,   101,    54,
-    41,    42,    43,    44,    74,    10,    11,    12,    13,    14,
-    15,    16,    17,    58,   102,   102,    24,   102,    59,   111,
-   102,   102,   449,   108,   112,   112,   108,   101,   112,   110,
-   457,   131,   132,     4,   134,   135,    61,    62,    63,    64,
-   101,   178,   179,   180,   358,   145,   146,   147,    20,   108,
-    22,   104,    24,    49,    50,    51,    22,   101,    24,    31,
-    32,    33,   101,   224,    32,    33,    52,    53,     4,    41,
-    42,    43,    44,   106,   176,    47,    48,    88,    89,    27,
-    28,     4,   182,    55,   186,     3,     4,    59,     4,   191,
-   192,     3,     4,   204,     3,     4,     3,     4,     3,     4,
-   104,   203,    24,   108,   204,     4,   208,    24,   380,   107,
-   382,   222,   107,   104,    56,     4,   218,   219,   220,     4,
-     4,     4,   222,   223,   261,     7,     7,     4,   289,     7,
-   291,   292,   102,   106,    36,   102,   105,   298,   102,   102,
-   102,   102,   242,   243,   244,   305,   306,   307,   308,   102,
-   102,   102,   102,   102,    24,   102,   316,   317,   318,   319,
-    10,    11,    12,    13,    14,    15,    16,    17,    24,   104,
-   104,   104,   272,   105,   104,   104,   104,   104,   280,   104,
-    60,   102,   102,   102,   286,    34,    24,   257,   288,   102,
-   290,   106,   102,   293,   294,    21,   102,   299,   300,   102,
-    21,   102,     4,   363,   104,   305,   306,   307,   308,   102,
-   102,   102,    24,     4,   104,   102,   316,   317,   318,   319,
-    36,    54,     4,   102,    24,   325,   387,   388,   102,   102,
-   102,   102,   334,   102,   336,   102,   102,   102,   340,   399,
-   400,   105,   402,   403,   404,   405,   348,   349,   350,   102,
-   105,   434,   434,    54,   354,   416,   108,   102,   106,   105,
-   191,   192,   105,   363,   105,   105,   105,   450,   450,   105,
-   105,    21,   203,    36,   108,   377,   378,   208,    21,   102,
-   105,   441,    21,   385,   102,    69,    21,   218,   219,   220,
-    21,   393,     0,     0,    84,    84,    84,    84,   398,   399,
-   400,    33,   402,   403,   404,   405,     5,     6,    20,   326,
-   105,   325,    46,   176,    43,     2,   418,    23,    14,   337,
-   392,    -1,   359,    22,    -1,    24,    -1,    26,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    38,
-    39,   441,    -1,    -1,    -1,   447,    -1,    -1,    -1,   280,
-    -1,    -1,    -1,    -1,    -1,   286,   458,    -1,    -1,    -1,
-    -1,   463,    -1,    -1,    -1,   467,   468,    -1,   299,   300,
-    -1,    -1,    71,    72,    73,    74,    75,    76,    77,    78,
-    79,    80,    81,    82,    83,    84,    -1,    -1,    -1,    -1,
-    -1,    90,    -1,    92,    93,    94,    95,    -1,    97,    -1,
-    -1,    -1,    -1,   334,    -1,   336,    -1,   106,    -1,   340,
-   109,    -1,   111,    -1,    -1,   114,    -1,   348,   349,   350,
-    -1,    -1,    -1,    -1,     5,     6,    -1,     8,     9,    10,
-    11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-    21,    22,    -1,    24,    -1,    -1,   377,   378,    -1,    -1,
-    -1,    -1,    -1,    -1,   385,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,   393,    -1,    45,     5,     6,    -1,     8,     9,
-    10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-    20,    21,    22,    -1,    24,    -1,    -1,   418,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    45,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,   447,    -1,    -1,    -1,
-    -1,    -1,   103,    -1,    -1,   106,    -1,   458,   109,    -1,
-   111,   112,   463,    -1,    -1,    -1,   467,   468,    -1,    -1,
+   113,     2,   113,    44,   254,    96,    72,   207,    29,    15,
+    23,    34,   114,    20,    44,   245,   246,    30,   108,    15,
+    58,   111,    10,    11,    12,    13,    14,    15,    16,    17,
+     9,    54,    33,   109,    41,    42,    43,    44,   114,   105,
+    47,   440,    21,   133,   274,    23,   136,   137,    54,   151,
+   140,   141,   142,   143,   144,   145,   103,   456,    54,   149,
+   103,   103,    32,    33,   111,    95,    96,    27,    28,   111,
+   113,     5,     6,    74,     8,     9,    10,    11,    12,    13,
+    14,    15,    16,    17,    18,    19,    20,    21,    22,    58,
+    24,   112,    10,    11,    12,    13,    14,    15,    16,    17,
+   113,   131,   132,   102,   134,   135,     0,   111,    24,   103,
+   114,    45,   362,   179,   180,   181,   146,   147,   148,   113,
+   105,   109,   455,    49,    50,    51,   103,   103,   102,   114,
+   463,    25,   109,   109,    88,    89,   226,    31,    61,    62,
+    63,    64,    22,     4,    24,   177,   102,    41,    42,    43,
+    44,    52,    53,   183,   102,   187,     3,     4,     3,     4,
+   192,   193,     3,     4,   205,    59,     3,     4,     3,     4,
+   104,   102,   204,   107,   107,   205,   110,   209,   112,   113,
+   105,     4,     4,   224,   384,     4,   386,     4,   220,   221,
+   222,   109,   105,    24,   224,   225,    24,   263,   108,   108,
+   105,   291,    56,   293,   294,   295,     4,     4,     4,     4,
+   103,   301,     4,     7,   244,   245,   246,   308,   309,   310,
+   311,     7,     7,   106,   103,   103,   107,   103,   319,   320,
+   321,   322,    10,    11,    12,    13,    14,    15,    16,    17,
+   103,   103,    24,    36,   274,   103,   103,   103,   103,    24,
+   282,   103,   103,   103,   103,    60,   288,   105,   259,   105,
+   290,   105,   292,   105,   103,   105,   296,   297,   106,   105,
+   302,   303,   105,   105,   103,    34,   367,   103,   308,   309,
+   310,   311,   107,   103,    24,   103,    21,   103,   103,   319,
+   320,   321,   322,    21,   105,     4,   103,   103,   328,   103,
+   103,   391,   392,   393,   105,   337,    24,   339,     4,    36,
+    54,   343,   103,   404,   405,   103,   407,   408,   409,   410,
+   352,   353,   354,   192,   193,   106,   103,   440,   358,   440,
+   103,   421,   103,   103,   103,   204,   103,   367,   103,   103,
+   209,     4,    24,   456,   107,   456,   103,    54,   106,   381,
+   382,   220,   221,   222,   109,   106,   447,   389,   106,   106,
+   103,   106,    21,    36,   106,   106,   398,   106,    21,   106,
+   103,   109,    21,   403,   404,   405,    69,   407,   408,   409,
+   410,    20,   103,    22,    21,    24,    21,     0,     0,    84,
+    84,   423,    31,    32,    33,    84,    84,    33,    20,   329,
+   105,   177,    41,    42,    43,    44,    46,   328,    47,    48,
+    43,     2,    23,   282,    14,   397,    55,   447,   340,   288,
+    59,   453,   363,    -1,    -1,    -1,    -1,    -1,    -1,     5,
+     6,    -1,   464,   302,   303,    -1,    -1,   469,    -1,    -1,
+    -1,   473,   474,    -1,    -1,    -1,    22,    -1,    24,    -1,
+    26,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,   337,    -1,
+   339,    -1,    -1,    -1,   343,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,   352,   353,   354,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    71,    72,    73,    74,    75,
+    76,    77,    78,    79,    80,    81,    82,    83,    84,    -1,
+    -1,    -1,   381,   382,    90,    -1,    92,    93,    94,    95,
+   389,    97,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   398,
+    -1,   107,    -1,    -1,   110,    -1,   112,    -1,    -1,   115,
     -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,     3,     4,     5,     6,     7,    -1,
-    -1,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,   109,
-    -1,   111,   112,    22,    -1,    24,    -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,    58,
-    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,     7,    -1,
-    -1,    -1,    71,    72,    73,    74,    75,    76,    77,    78,
-    79,    80,    81,    82,    83,    84,    -1,    26,    27,    28,
-    -1,    90,    -1,    92,    93,    94,    95,    -1,    97,    38,
-    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-   109,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    58,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    71,    72,    73,    74,    75,    76,    77,    78,
-    79,    80,    81,    82,    83,    84,    -1,    -1,    -1,    -1,
-    -1,    90,    -1,    92,    93,    94,    95,    -1,    97,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,
-   109,     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,     5,     6,    45,     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,     5,     6,    45,     8,     9,    10,
-    11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-    21,    22,    -1,    24,    -1,    -1,   103,    -1,    -1,   106,
-    -1,    -1,   109,    -1,   111,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,     5,     6,    45,     8,     9,    10,    11,    12,
+    -1,    -1,     5,     6,   423,     8,     9,    10,    11,    12,
     13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-    -1,    24,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-   109,    -1,   111,    -1,    37,    -1,    -1,    -1,    -1,    -1,
-     5,     6,    45,     8,     9,    10,    11,    12,    13,    14,
-    15,    16,    17,    18,    19,    20,    21,    22,    -1,    24,
-    -1,    -1,   103,    -1,    -1,   106,    -1,   108,   109,    -1,
-   111,    -1,    37,    -1,    -1,    -1,    -1,    -1,     5,     6,
-    45,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-    17,    18,    19,    20,    21,    22,    -1,    24,    -1,    -1,
-   103,    -1,    -1,   106,    -1,    -1,   109,    -1,   111,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,    45,     8,
-     9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-    19,    20,    21,    22,    -1,    24,    -1,    -1,   103,    -1,
-    -1,   106,    -1,    -1,   109,    -1,   111,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,     5,     6,    45,     8,     9,    10,
-    11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-    21,    22,    -1,    24,    -1,    -1,   103,    -1,    -1,   106,
-    -1,    -1,   109,    -1,   111,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,     5,     6,    45,     8,     9,    10,    11,    12,
-    13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-    -1,    24,    -1,    -1,   103,    -1,    -1,   106,    -1,    -1,
-   109,    -1,   111,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    45,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,   453,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    45,    -1,    -1,   464,    -1,    -1,    -1,    -1,
+   469,    -1,    -1,    -1,   473,   474,     3,     4,     5,     6,
+     7,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    22,    -1,    24,    -1,    26,
+    27,    28,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    38,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,   104,    -1,    -1,   107,    -1,    -1,   110,    -1,   112,
+   113,    58,    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,
+     7,    -1,    -1,    -1,    71,    72,    73,    74,    75,    76,
+    77,    78,    79,    80,    81,    82,    83,    84,    -1,    26,
+    27,    28,    -1,    90,    -1,    92,    93,    94,    95,    -1,
+    97,    38,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,   110,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    58,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    71,    72,    73,    74,    75,    76,
+    77,    78,    79,    80,    81,    82,    83,    84,    -1,    -1,
+    -1,    -1,    -1,    90,    -1,    92,    93,    94,    95,    -1,
+    97,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,     5,     6,   110,     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,     5,
+     6,    45,     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,    -1,   103,    -1,    -1,   106,    -1,    -1,   109,    -1,
-   111,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    35,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    46,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-   103,    56,    57,   106,    -1,    -1,   109,    -1,   111,    -1,
-    65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-    75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-    85,    86,    87,    -1,    -1,    90,    91,    92,    93,    94,
-    95,    96,    97,    98,    99,   100
+    -1,    37,    -1,    -1,    -1,    -1,    -1,     5,     6,    45,
+     8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+    18,    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,
+   104,    -1,    -1,   107,    -1,    -1,   110,    -1,   112,    -1,
+    -1,    -1,    -1,    -1,    -1,     5,     6,    45,     8,     9,
+    10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+    20,    21,    22,    -1,    24,    -1,    -1,    -1,   104,    -1,
+    -1,   107,    -1,    -1,   110,    -1,   112,    37,    -1,    -1,
+    -1,    -1,    -1,     5,     6,    45,     8,     9,    10,    11,
+    12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+    22,    -1,    24,    -1,    -1,    -1,   104,    -1,    -1,   107,
+    -1,   109,   110,    -1,   112,    37,    -1,    -1,    -1,    -1,
+    -1,     5,     6,    45,     8,     9,    10,    11,    12,    13,
+    14,    15,    16,    17,    18,    19,    20,    21,    22,    -1,
+    24,    -1,    -1,    -1,   104,    -1,    -1,   107,    -1,    -1,
+   110,    -1,   112,    -1,    -1,    -1,    -1,    -1,    -1,     5,
+     6,    45,     8,     9,    10,    11,    12,    13,    14,    15,
+    16,    17,    18,    19,    20,    21,    22,    -1,    24,    -1,
+    -1,    -1,   104,    -1,    -1,   107,    -1,    -1,   110,    -1,
+   112,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,    45,
+     8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+    18,    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,
+   104,    -1,    -1,   107,    -1,    -1,   110,    -1,   112,    -1,
+    -1,    -1,    -1,    -1,    -1,     5,     6,    45,     8,     9,
+    10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+    20,    21,    22,    -1,    24,    -1,    -1,    -1,   104,    -1,
+    -1,   107,    -1,    -1,   110,    -1,   112,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    45,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,   104,    -1,    -1,   107,
+    -1,    -1,   110,    -1,   112,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    35,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    46,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,   104,    56,    57,   107,    -1,    -1,
+   110,    -1,   112,    -1,    65,    66,    67,    68,    69,    70,
+    71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
+    81,    82,    83,    84,    85,    86,    87,    -1,    -1,    90,
+    91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
+   101
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
 #line 3 "/usr/share/bison.simple"
@@ -2226,7 +2226,7 @@
   switch (yyn) {
 
 case 2:
-#line 1011 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1011 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   if (yyvsp[0].UIntVal > (uint32_t)INT32_MAX)     // Outside of my range!
     ThrowException("Value too large for type!");
@@ -2234,7 +2234,7 @@
 ;
     break;}
 case 4:
-#line 1019 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1019 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   if (yyvsp[0].UInt64Val > (uint64_t)INT64_MAX)     // Outside of my range!
     ThrowException("Value too large for type!");
@@ -2242,55 +2242,55 @@
 ;
     break;}
 case 33:
-#line 1042 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1042 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.StrVal = yyvsp[-1].StrVal;
   ;
     break;}
 case 34:
-#line 1045 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1045 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.StrVal = 0;
   ;
     break;}
 case 35:
-#line 1049 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1049 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.Linkage = GlobalValue::InternalLinkage; ;
     break;}
 case 36:
-#line 1050 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1050 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.Linkage = GlobalValue::LinkOnceLinkage; ;
     break;}
 case 37:
-#line 1051 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1051 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.Linkage = GlobalValue::WeakLinkage; ;
     break;}
 case 38:
-#line 1052 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1052 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.Linkage = GlobalValue::AppendingLinkage; ;
     break;}
 case 39:
-#line 1053 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1053 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.Linkage = GlobalValue::ExternalLinkage; ;
     break;}
 case 40:
-#line 1055 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1055 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.UIntVal = CallingConv::C; ;
     break;}
 case 41:
-#line 1056 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1056 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.UIntVal = CallingConv::C; ;
     break;}
 case 42:
-#line 1057 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1057 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.UIntVal = CallingConv::Fast; ;
     break;}
 case 43:
-#line 1058 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1058 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.UIntVal = CallingConv::Cold; ;
     break;}
 case 44:
-#line 1059 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1059 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
                    if ((unsigned)yyvsp[0].UInt64Val != yyvsp[0].UInt64Val)
                      ThrowException("Calling conv too large!");
@@ -2298,11 +2298,11 @@
                  ;
     break;}
 case 45:
-#line 1067 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1067 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.UIntVal = 0; ;
     break;}
 case 46:
-#line 1068 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1068 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   yyval.UIntVal = yyvsp[0].UInt64Val;
   if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal))
@@ -2310,11 +2310,11 @@
 ;
     break;}
 case 47:
-#line 1073 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1073 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.UIntVal = 0; ;
     break;}
 case 48:
-#line 1074 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1074 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   yyval.UIntVal = yyvsp[0].UInt64Val;
   if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal))
@@ -2322,7 +2322,7 @@
 ;
     break;}
 case 49:
-#line 1081 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1081 "/Volumes/Projects/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] == '\\')
@@ -2331,30 +2331,30 @@
 ;
     break;}
 case 50:
-#line 1088 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1088 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.StrVal = 0; ;
     break;}
 case 51:
-#line 1089 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1089 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.StrVal = yyvsp[0].StrVal; ;
     break;}
 case 52:
-#line 1094 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1094 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {;
     break;}
 case 53:
-#line 1095 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1095 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {;
     break;}
 case 54:
-#line 1096 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1096 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CurGV->setSection(yyvsp[0].StrVal);
     free(yyvsp[0].StrVal);
   ;
     break;}
 case 55:
-#line 1100 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1100 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[0].UInt64Val != 0 && !isPowerOf2_32(yyvsp[0].UInt64Val))
       ThrowException("Alignment must be a power of two!");
@@ -2362,15 +2362,15 @@
   ;
     break;}
 case 57:
-#line 1113 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1113 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.TypeVal = new PATypeHolder(yyvsp[0].PrimType); ;
     break;}
 case 59:
-#line 1114 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1114 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.TypeVal = new PATypeHolder(yyvsp[0].PrimType); ;
     break;}
 case 60:
-#line 1116 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1116 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!UpRefs.empty())
       ThrowException("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
@@ -2378,25 +2378,25 @@
   ;
     break;}
 case 74:
-#line 1127 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1127 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.TypeVal = new PATypeHolder(OpaqueType::get());
   ;
     break;}
 case 75:
-#line 1130 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1130 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.TypeVal = new PATypeHolder(yyvsp[0].PrimType);
   ;
     break;}
 case 76:
-#line 1133 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1133 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {            // Named types are also simple types...
   yyval.TypeVal = new PATypeHolder(getTypeVal(yyvsp[0].ValIDVal));
 ;
     break;}
 case 77:
-#line 1139 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1139 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {                   // Type UpReference
     if (yyvsp[0].UInt64Val > (uint64_t)~0U) ThrowException("Value out of range!");
     OpaqueType *OT = OpaqueType::get();        // Use temporary placeholder
@@ -2406,7 +2406,7 @@
   ;
     break;}
 case 78:
-#line 1146 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1146 "/Volumes/Projects/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(),
@@ -2421,14 +2421,14 @@
   ;
     break;}
 case 79:
-#line 1158 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1158 "/Volumes/Projects/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;
   ;
     break;}
 case 80:
-#line 1162 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1162 "/Volumes/Projects/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)
@@ -2442,7 +2442,7 @@
   ;
     break;}
 case 81:
-#line 1173 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1173 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {                        // Structure type?
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = yyvsp[-1].TypeList->begin(),
@@ -2454,51 +2454,51 @@
   ;
     break;}
 case 82:
-#line 1182 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1182 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {                                  // Empty structure type?
     yyval.TypeVal = new PATypeHolder(StructType::get(std::vector<const Type*>()));
   ;
     break;}
 case 83:
-#line 1185 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1185 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {                             // Pointer type?
     yyval.TypeVal = new PATypeHolder(HandleUpRefs(PointerType::get(*yyvsp[-1].TypeVal)));
     delete yyvsp[-1].TypeVal;
   ;
     break;}
 case 84:
-#line 1193 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1193 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.TypeList = new std::list<PATypeHolder>();
     yyval.TypeList->push_back(*yyvsp[0].TypeVal); delete yyvsp[0].TypeVal;
   ;
     break;}
 case 85:
-#line 1197 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1197 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     (yyval.TypeList=yyvsp[-2].TypeList)->push_back(*yyvsp[0].TypeVal); delete yyvsp[0].TypeVal;
   ;
     break;}
 case 87:
-#line 1203 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1203 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     (yyval.TypeList=yyvsp[-2].TypeList)->push_back(Type::VoidTy);
   ;
     break;}
 case 88:
-#line 1206 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1206 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     (yyval.TypeList = new std::list<PATypeHolder>())->push_back(Type::VoidTy);
   ;
     break;}
 case 89:
-#line 1209 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1209 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.TypeList = new std::list<PATypeHolder>();
   ;
     break;}
 case 90:
-#line 1219 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1219 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { // Nonempty unsized arr
     const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-3].TypeVal->get());
     if (ATy == 0)
@@ -2526,7 +2526,7 @@
   ;
     break;}
 case 91:
-#line 1244 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1244 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-2].TypeVal->get());
     if (ATy == 0)
@@ -2542,7 +2542,7 @@
   ;
     break;}
 case 92:
-#line 1257 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1257 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-2].TypeVal->get());
     if (ATy == 0)
@@ -2574,7 +2574,7 @@
   ;
     break;}
 case 93:
-#line 1286 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1286 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { // Nonempty unsized arr
     const PackedType *PTy = dyn_cast<PackedType>(yyvsp[-3].TypeVal->get());
     if (PTy == 0)
@@ -2602,7 +2602,7 @@
   ;
     break;}
 case 94:
-#line 1311 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1311 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const StructType *STy = dyn_cast<StructType>(yyvsp[-3].TypeVal->get());
     if (STy == 0)
@@ -2625,7 +2625,7 @@
   ;
     break;}
 case 95:
-#line 1331 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1331 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const StructType *STy = dyn_cast<StructType>(yyvsp[-2].TypeVal->get());
     if (STy == 0)
@@ -2640,7 +2640,7 @@
   ;
     break;}
 case 96:
-#line 1343 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1343 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const PointerType *PTy = dyn_cast<PointerType>(yyvsp[-1].TypeVal->get());
     if (PTy == 0)
@@ -2652,14 +2652,14 @@
   ;
     break;}
 case 97:
-#line 1352 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1352 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ConstVal = UndefValue::get(yyvsp[-1].TypeVal->get());
     delete yyvsp[-1].TypeVal;
   ;
     break;}
 case 98:
-#line 1356 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1356 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const PointerType *Ty = dyn_cast<PointerType>(yyvsp[-1].TypeVal->get());
     if (Ty == 0)
@@ -2721,7 +2721,7 @@
   ;
     break;}
 case 99:
-#line 1415 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1415 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[-1].TypeVal->get() != yyvsp[0].ConstVal->getType())
       ThrowException("Mismatched types for constant expression!");
@@ -2730,7 +2730,7 @@
   ;
     break;}
 case 100:
-#line 1421 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1421 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const Type *Ty = yyvsp[-1].TypeVal->get();
     if (isa<FunctionType>(Ty) || Ty == Type::LabelTy || isa<OpaqueType>(Ty))
@@ -2740,7 +2740,7 @@
   ;
     break;}
 case 101:
-#line 1429 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1429 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {      // integral constants
     if (!ConstantSInt::isValueValidForType(yyvsp[-1].PrimType, yyvsp[0].SInt64Val))
       ThrowException("Constant value doesn't fit in type!");
@@ -2748,7 +2748,7 @@
   ;
     break;}
 case 102:
-#line 1434 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1434 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {            // integral constants
     if (!ConstantUInt::isValueValidForType(yyvsp[-1].PrimType, yyvsp[0].UInt64Val))
       ThrowException("Constant value doesn't fit in type!");
@@ -2756,19 +2756,19 @@
   ;
     break;}
 case 103:
-#line 1439 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1439 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {                      // Boolean constants
     yyval.ConstVal = ConstantBool::True;
   ;
     break;}
 case 104:
-#line 1442 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1442 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {                     // Boolean constants
     yyval.ConstVal = ConstantBool::False;
   ;
     break;}
 case 105:
-#line 1445 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1445 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {                   // Float & Double constants
     if (!ConstantFP::isValueValidForType(yyvsp[-1].PrimType, yyvsp[0].FPVal))
       ThrowException("Floating point constant invalid for type!!");
@@ -2776,7 +2776,7 @@
   ;
     break;}
 case 106:
-#line 1452 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1452 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!yyvsp[-3].ConstVal->getType()->isFirstClassType())
       ThrowException("cast constant expression from a non-primitive type: '" +
@@ -2789,7 +2789,7 @@
   ;
     break;}
 case 107:
-#line 1462 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1462 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!isa<PointerType>(yyvsp[-2].ConstVal->getType()))
       ThrowException("GetElementPtr requires a pointer operand!");
@@ -2823,7 +2823,7 @@
   ;
     break;}
 case 108:
-#line 1493 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1493 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[-5].ConstVal->getType() != Type::BoolTy)
       ThrowException("Select condition must be of boolean type!");
@@ -2833,7 +2833,7 @@
   ;
     break;}
 case 109:
-#line 1500 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1500 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
       ThrowException("Binary operator types must match!");
@@ -2857,7 +2857,7 @@
   ;
     break;}
 case 110:
-#line 1521 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1521 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
       ThrowException("Logical operator types must match!");
@@ -2870,7 +2870,7 @@
   ;
     break;}
 case 111:
-#line 1531 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1531 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
       ThrowException("setcc operand types must match!");
@@ -2878,7 +2878,7 @@
   ;
     break;}
 case 112:
-#line 1536 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1536 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[-1].ConstVal->getType() != Type::UByteTy)
       ThrowException("Shift count for shift constant must be unsigned byte!");
@@ -2888,7 +2888,7 @@
   ;
     break;}
 case 113:
-#line 1543 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1543 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
         if (!isa<PackedType>(yyvsp[-3].ConstVal->getType()))
       ThrowException("First operand of extractelement must be "
@@ -2899,60 +2899,60 @@
   ;
     break;}
 case 114:
-#line 1553 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1553 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     (yyval.ConstVector = yyvsp[-2].ConstVector)->push_back(yyvsp[0].ConstVal);
   ;
     break;}
 case 115:
-#line 1556 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1556 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ConstVector = new std::vector<Constant*>();
     yyval.ConstVector->push_back(yyvsp[0].ConstVal);
   ;
     break;}
 case 116:
-#line 1563 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1563 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.BoolVal = false; ;
     break;}
 case 117:
-#line 1563 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1563 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.BoolVal = true; ;
     break;}
 case 118:
-#line 1573 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1573 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   yyval.ModuleVal = ParserResult = yyvsp[0].ModuleVal;
   CurModule.ModuleDone();
 ;
     break;}
 case 119:
-#line 1580 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1580 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ModuleVal = yyvsp[-1].ModuleVal;
     CurFun.FunctionDone();
   ;
     break;}
 case 120:
-#line 1584 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1584 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ModuleVal = yyvsp[-1].ModuleVal;
   ;
     break;}
 case 121:
-#line 1587 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1587 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ModuleVal = yyvsp[-3].ModuleVal;
   ;
     break;}
 case 122:
-#line 1590 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1590 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ModuleVal = yyvsp[-1].ModuleVal;
   ;
     break;}
 case 123:
-#line 1593 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1593 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ModuleVal = CurModule.CurrentModule;
     // Emit an error if there are any unresolved types left.
@@ -2966,7 +2966,7 @@
   ;
     break;}
 case 124:
-#line 1606 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1606 "/Volumes/Projects/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:
@@ -2989,30 +2989,30 @@
   ;
     break;}
 case 125:
-#line 1626 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1626 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {       // Function prototypes can be in const pool
   ;
     break;}
 case 126:
-#line 1628 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1628 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {  // Asm blocks can be in the const pool
   ;
     break;}
 case 127:
-#line 1630 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1630 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[0].ConstVal == 0) ThrowException("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);
                                                        ;
     break;}
 case 128:
-#line 1633 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1633 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CurGV = 0;
   ;
     break;}
 case 129:
-#line 1636 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1636 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CurGV = ParseGlobalVariable(yyvsp[-3].StrVal, GlobalValue::ExternalLinkage,
                                              yyvsp[-1].BoolVal, *yyvsp[0].TypeVal, 0);
@@ -3020,28 +3020,28 @@
                                                    ;
     break;}
 case 130:
-#line 1640 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1640 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CurGV = 0;
   ;
     break;}
 case 131:
-#line 1643 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1643 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { 
   ;
     break;}
 case 132:
-#line 1645 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1645 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   ;
     break;}
 case 133:
-#line 1647 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1647 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { 
   ;
     break;}
 case 134:
-#line 1651 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1651 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   char *EndStr = UnEscapeLexed(yyvsp[0].StrVal, true);
@@ -3055,21 +3055,21 @@
 ;
     break;}
 case 135:
-#line 1663 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1663 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.Endianness = Module::BigEndian; ;
     break;}
 case 136:
-#line 1664 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1664 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.Endianness = Module::LittleEndian; ;
     break;}
 case 137:
-#line 1666 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1666 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CurModule.CurrentModule->setEndianness(yyvsp[0].Endianness);
   ;
     break;}
 case 138:
-#line 1669 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1669 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[0].UInt64Val == 32)
       CurModule.CurrentModule->setPointerSize(Module::Pointer32);
@@ -3080,37 +3080,37 @@
   ;
     break;}
 case 139:
-#line 1677 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1677 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CurModule.CurrentModule->setTargetTriple(yyvsp[0].StrVal);
     free(yyvsp[0].StrVal);
   ;
     break;}
 case 141:
-#line 1684 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1684 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
           CurModule.CurrentModule->addLibrary(yyvsp[0].StrVal);
           free(yyvsp[0].StrVal);
         ;
     break;}
 case 142:
-#line 1688 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1688 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
           CurModule.CurrentModule->addLibrary(yyvsp[0].StrVal);
           free(yyvsp[0].StrVal);
         ;
     break;}
 case 143:
-#line 1692 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1692 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
         ;
     break;}
 case 147:
-#line 1701 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1701 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.StrVal = 0; ;
     break;}
 case 148:
-#line 1703 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1703 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   if (*yyvsp[-1].TypeVal == Type::VoidTy)
     ThrowException("void typed arguments are invalid!");
@@ -3118,7 +3118,7 @@
 ;
     break;}
 case 149:
-#line 1709 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1709 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ArgList = yyvsp[-2].ArgList;
     yyvsp[-2].ArgList->push_back(*yyvsp[0].ArgVal);
@@ -3126,7 +3126,7 @@
   ;
     break;}
 case 150:
-#line 1714 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1714 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ArgList = new std::vector<std::pair<PATypeHolder*,char*> >();
     yyval.ArgList->push_back(*yyvsp[0].ArgVal);
@@ -3134,13 +3134,13 @@
   ;
     break;}
 case 151:
-#line 1720 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1720 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ArgList = yyvsp[0].ArgList;
   ;
     break;}
 case 152:
-#line 1723 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1723 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ArgList = yyvsp[-2].ArgList;
     yyval.ArgList->push_back(std::pair<PATypeHolder*,
@@ -3148,20 +3148,20 @@
   ;
     break;}
 case 153:
-#line 1728 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1728 "/Volumes/Projects/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));
   ;
     break;}
 case 154:
-#line 1732 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1732 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ArgList = 0;
   ;
     break;}
 case 155:
-#line 1737 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1737 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   UnEscapeLexed(yyvsp[-5].StrVal);
   std::string FunctionName(yyvsp[-5].StrVal);
@@ -3248,7 +3248,7 @@
 ;
     break;}
 case 158:
-#line 1824 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1824 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   yyval.FunctionVal = CurFun.CurrentFunction;
 
@@ -3258,84 +3258,84 @@
 ;
     break;}
 case 161:
-#line 1834 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1834 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   yyval.FunctionVal = yyvsp[-1].FunctionVal;
 ;
     break;}
 case 162:
-#line 1838 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1838 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { CurFun.isDeclare = true; ;
     break;}
 case 163:
-#line 1838 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1838 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   yyval.FunctionVal = CurFun.CurrentFunction;
   CurFun.FunctionDone();
 ;
     break;}
 case 164:
-#line 1847 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1847 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BoolVal = false;
   ;
     break;}
 case 165:
-#line 1850 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1850 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BoolVal = true;
   ;
     break;}
 case 166:
-#line 1854 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1854 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {    // A reference to a direct constant
     yyval.ValIDVal = ValID::create(yyvsp[0].SInt64Val);
   ;
     break;}
 case 167:
-#line 1857 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1857 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValIDVal = ValID::create(yyvsp[0].UInt64Val);
   ;
     break;}
 case 168:
-#line 1860 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1860 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {                     // Perhaps it's an FP constant?
     yyval.ValIDVal = ValID::create(yyvsp[0].FPVal);
   ;
     break;}
 case 169:
-#line 1863 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1863 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValIDVal = ValID::create(ConstantBool::True);
   ;
     break;}
 case 170:
-#line 1866 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1866 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValIDVal = ValID::create(ConstantBool::False);
   ;
     break;}
 case 171:
-#line 1869 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1869 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValIDVal = ValID::createNull();
   ;
     break;}
 case 172:
-#line 1872 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1872 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValIDVal = ValID::createUndef();
   ;
     break;}
 case 173:
-#line 1875 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1875 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {     // A vector zero constant.
     yyval.ValIDVal = ValID::createZeroInit();
   ;
     break;}
 case 174:
-#line 1878 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1878 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { // Nonempty unsized packed vector
     const Type *ETy = (*yyvsp[-1].ConstVector)[0]->getType();
     int NumElements = yyvsp[-1].ConstVector->size(); 
@@ -3362,13 +3362,13 @@
   ;
     break;}
 case 175:
-#line 1902 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1902 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValIDVal = ValID::create(yyvsp[0].ConstVal);
   ;
     break;}
 case 176:
-#line 1905 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1905 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     char *End = UnEscapeLexed(yyvsp[-2].StrVal, true);
     std::string AsmStr = std::string(yyvsp[-2].StrVal, End);
@@ -3380,37 +3380,37 @@
   ;
     break;}
 case 177:
-#line 1918 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1918 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {  // Is it an integer reference...?
     yyval.ValIDVal = ValID::create(yyvsp[0].SIntVal);
   ;
     break;}
 case 178:
-#line 1921 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1921 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {                   // Is it a named reference...?
     yyval.ValIDVal = ValID::create(yyvsp[0].StrVal);
   ;
     break;}
 case 181:
-#line 1932 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1932 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValueVal = getVal(*yyvsp[-1].TypeVal, yyvsp[0].ValIDVal); delete yyvsp[-1].TypeVal;
   ;
     break;}
 case 182:
-#line 1936 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1936 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.FunctionVal = yyvsp[-1].FunctionVal;
   ;
     break;}
 case 183:
-#line 1939 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1939 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { // Do not allow functions with 0 basic blocks   
     yyval.FunctionVal = yyvsp[-1].FunctionVal;
   ;
     break;}
 case 184:
-#line 1947 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1947 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     setValueName(yyvsp[0].TermInstVal, yyvsp[-1].StrVal);
     InsertValue(yyvsp[0].TermInstVal);
@@ -3421,14 +3421,14 @@
   ;
     break;}
 case 185:
-#line 1956 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1956 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyvsp[-1].BasicBlockVal->getInstList().push_back(yyvsp[0].InstVal);
     yyval.BasicBlockVal = yyvsp[-1].BasicBlockVal;
   ;
     break;}
 case 186:
-#line 1960 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1960 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BasicBlockVal = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++), true);
 
@@ -3441,7 +3441,7 @@
   ;
     break;}
 case 187:
-#line 1970 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1970 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BasicBlockVal = CurBB = getBBVal(ValID::create(yyvsp[0].StrVal), true);
 
@@ -3454,31 +3454,31 @@
   ;
     break;}
 case 188:
-#line 1981 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1981 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {              // Return with a result...
     yyval.TermInstVal = new ReturnInst(yyvsp[0].ValueVal);
   ;
     break;}
 case 189:
-#line 1984 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1984 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {                                       // Return with no result...
     yyval.TermInstVal = new ReturnInst();
   ;
     break;}
 case 190:
-#line 1987 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1987 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {                         // Unconditional Branch...
     yyval.TermInstVal = new BranchInst(getBBVal(yyvsp[0].ValIDVal));
   ;
     break;}
 case 191:
-#line 1990 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1990 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {  
     yyval.TermInstVal = new BranchInst(getBBVal(yyvsp[-3].ValIDVal), getBBVal(yyvsp[0].ValIDVal), getVal(Type::BoolTy, yyvsp[-6].ValIDVal));
   ;
     break;}
 case 192:
-#line 1993 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1993 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     SwitchInst *S = new SwitchInst(getVal(yyvsp[-7].PrimType, yyvsp[-6].ValIDVal), getBBVal(yyvsp[-3].ValIDVal), yyvsp[-1].JumpTable->size());
     yyval.TermInstVal = S;
@@ -3495,14 +3495,14 @@
   ;
     break;}
 case 193:
-#line 2007 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2007 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     SwitchInst *S = new SwitchInst(getVal(yyvsp[-6].PrimType, yyvsp[-5].ValIDVal), getBBVal(yyvsp[-2].ValIDVal), 0);
     yyval.TermInstVal = S;
   ;
     break;}
 case 194:
-#line 2012 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2012 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const PointerType *PFTy;
     const FunctionType *Ty;
@@ -3557,19 +3557,19 @@
   ;
     break;}
 case 195:
-#line 2064 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2064 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.TermInstVal = new UnwindInst();
   ;
     break;}
 case 196:
-#line 2067 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2067 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.TermInstVal = new UnreachableInst();
   ;
     break;}
 case 197:
-#line 2073 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2073 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.JumpTable = yyvsp[-5].JumpTable;
     Constant *V = cast<Constant>(getValNonImprovising(yyvsp[-4].PrimType, yyvsp[-3].ValIDVal));
@@ -3580,7 +3580,7 @@
   ;
     break;}
 case 198:
-#line 2081 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2081 "/Volumes/Projects/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));
@@ -3592,7 +3592,7 @@
   ;
     break;}
 case 199:
-#line 2091 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2091 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   // Is this definition named?? if so, assign the name...
   setValueName(yyvsp[0].InstVal, yyvsp[-1].StrVal);
@@ -3601,7 +3601,7 @@
 ;
     break;}
 case 200:
-#line 2098 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2098 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {    // Used for PHI nodes
     yyval.PHIList = new std::list<std::pair<Value*, BasicBlock*> >();
     yyval.PHIList->push_back(std::make_pair(getVal(*yyvsp[-5].TypeVal, yyvsp[-3].ValIDVal), getBBVal(yyvsp[-1].ValIDVal)));
@@ -3609,7 +3609,7 @@
   ;
     break;}
 case 201:
-#line 2103 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2103 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.PHIList = yyvsp[-6].PHIList;
     yyvsp[-6].PHIList->push_back(std::make_pair(getVal(yyvsp[-6].PHIList->front().first->getType(), yyvsp[-3].ValIDVal),
@@ -3617,37 +3617,37 @@
   ;
     break;}
 case 202:
-#line 2110 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2110 "/Volumes/Projects/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 203:
-#line 2114 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2114 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValueList = yyvsp[-2].ValueList;
     yyvsp[-2].ValueList->push_back(yyvsp[0].ValueVal);
   ;
     break;}
 case 205:
-#line 2120 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2120 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.ValueList = 0; ;
     break;}
 case 206:
-#line 2122 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2122 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BoolVal = true;
   ;
     break;}
 case 207:
-#line 2125 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2125 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BoolVal = false;
   ;
     break;}
 case 208:
-#line 2131 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2131 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!(*yyvsp[-3].TypeVal)->isInteger() && !(*yyvsp[-3].TypeVal)->isFloatingPoint() && 
         !isa<PackedType>((*yyvsp[-3].TypeVal).get()))
@@ -3662,7 +3662,7 @@
   ;
     break;}
 case 209:
-#line 2143 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2143 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!(*yyvsp[-3].TypeVal)->isIntegral()) {
       if (!isa<PackedType>(yyvsp[-3].TypeVal->get()) ||
@@ -3676,7 +3676,7 @@
   ;
     break;}
 case 210:
-#line 2154 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2154 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if(isa<PackedType>((*yyvsp[-3].TypeVal).get())) {
       ThrowException(
@@ -3689,7 +3689,7 @@
   ;
     break;}
 case 211:
-#line 2164 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2164 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     std::cerr << "WARNING: Use of eliminated 'not' instruction:"
               << " Replacing with 'xor'.\n";
@@ -3704,7 +3704,7 @@
   ;
     break;}
 case 212:
-#line 2176 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2176 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[0].ValueVal->getType() != Type::UByteTy)
       ThrowException("Shift amount must be ubyte!");
@@ -3714,7 +3714,7 @@
   ;
     break;}
 case 213:
-#line 2183 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2183 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!yyvsp[0].TypeVal->get()->isFirstClassType())
       ThrowException("cast instruction to a non-primitive type: '" +
@@ -3724,7 +3724,7 @@
   ;
     break;}
 case 214:
-#line 2190 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2190 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[-4].ValueVal->getType() != Type::BoolTy)
       ThrowException("select condition must be boolean!");
@@ -3734,7 +3734,7 @@
   ;
     break;}
 case 215:
-#line 2197 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2197 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     NewVarArgs = true;
     yyval.InstVal = new VAArgInst(yyvsp[-2].ValueVal, *yyvsp[0].TypeVal);
@@ -3742,7 +3742,7 @@
   ;
     break;}
 case 216:
-#line 2202 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2202 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     ObsoleteVarArgs = true;
     const Type* ArgTy = yyvsp[-2].ValueVal->getType();
@@ -3764,7 +3764,7 @@
   ;
     break;}
 case 217:
-#line 2221 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2221 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     ObsoleteVarArgs = true;
     const Type* ArgTy = yyvsp[-2].ValueVal->getType();
@@ -3789,7 +3789,7 @@
   ;
     break;}
 case 218:
-#line 2243 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2243 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!isa<PackedType>(yyvsp[-2].ValueVal->getType()))
       ThrowException("First operand of extractelement must be "
@@ -3800,7 +3800,7 @@
   ;
     break;}
 case 219:
-#line 2251 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2251 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!isa<PackedType>(yyvsp[-4].ValueVal->getType()))
       ThrowException("First operand of insertelement must be "
@@ -3815,7 +3815,15 @@
   ;
     break;}
 case 220:
-#line 2263 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2263 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+  if (!ShuffleVectorInst::isValidOperands(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
+    ThrowException("Invalid shufflevector operands!");
+    yyval.InstVal = new ShuffleVectorInst(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
+  ;
+    break;}
+case 221:
+#line 2268 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const Type *Ty = yyvsp[0].PHIList->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -3831,8 +3839,8 @@
     delete yyvsp[0].PHIList;  // Free the list...
   ;
     break;}
-case 221:
-#line 2277 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+case 222:
+#line 2282 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const PointerType *PFTy;
     const FunctionType *Ty;
@@ -3891,66 +3899,66 @@
     delete yyvsp[-1].ValueList;
   ;
     break;}
-case 222:
-#line 2334 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+case 223:
+#line 2339 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.InstVal = yyvsp[0].InstVal;
   ;
     break;}
-case 223:
-#line 2340 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+case 224:
+#line 2345 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { 
     yyval.ValueList = yyvsp[0].ValueList; 
   ;
     break;}
-case 224:
-#line 2342 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+case 225:
+#line 2347 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { 
     yyval.ValueList = new std::vector<Value*>(); 
   ;
     break;}
-case 225:
-#line 2346 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+case 226:
+#line 2351 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BoolVal = true;
   ;
     break;}
-case 226:
-#line 2349 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+case 227:
+#line 2354 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BoolVal = false;
   ;
     break;}
-case 227:
-#line 2355 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+case 228:
+#line 2360 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.InstVal = new MallocInst(*yyvsp[-1].TypeVal, 0, yyvsp[0].UIntVal);
     delete yyvsp[-1].TypeVal;
   ;
     break;}
-case 228:
-#line 2359 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+case 229:
+#line 2364 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.InstVal = new MallocInst(*yyvsp[-4].TypeVal, getVal(yyvsp[-2].PrimType, yyvsp[-1].ValIDVal), yyvsp[0].UIntVal);
     delete yyvsp[-4].TypeVal;
   ;
     break;}
-case 229:
-#line 2363 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+case 230:
+#line 2368 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.InstVal = new AllocaInst(*yyvsp[-1].TypeVal, 0, yyvsp[0].UIntVal);
     delete yyvsp[-1].TypeVal;
   ;
     break;}
-case 230:
-#line 2367 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+case 231:
+#line 2372 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.InstVal = new AllocaInst(*yyvsp[-4].TypeVal, getVal(yyvsp[-2].PrimType, yyvsp[-1].ValIDVal), yyvsp[0].UIntVal);
     delete yyvsp[-4].TypeVal;
   ;
     break;}
-case 231:
-#line 2371 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+case 232:
+#line 2376 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!isa<PointerType>(yyvsp[0].ValueVal->getType()))
       ThrowException("Trying to free nonpointer type " + 
@@ -3958,8 +3966,8 @@
     yyval.InstVal = new FreeInst(yyvsp[0].ValueVal);
   ;
     break;}
-case 232:
-#line 2378 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+case 233:
+#line 2383 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!isa<PointerType>(yyvsp[-1].TypeVal->get()))
       ThrowException("Can't load from nonpointer type: " +
@@ -3971,8 +3979,8 @@
     delete yyvsp[-1].TypeVal;
   ;
     break;}
-case 233:
-#line 2388 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+case 234:
+#line 2393 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const PointerType *PT = dyn_cast<PointerType>(yyvsp[-1].TypeVal->get());
     if (!PT)
@@ -3987,8 +3995,8 @@
     delete yyvsp[-1].TypeVal;
   ;
     break;}
-case 234:
-#line 2401 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+case 235:
+#line 2406 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!isa<PointerType>(yyvsp[-2].TypeVal->get()))
       ThrowException("getelementptr insn requires pointer operand!");
@@ -4233,7 +4241,7 @@
     }
   return 1;
 }
-#line 2424 "/Users/sabre/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2429 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 
 int yyerror(const char *ErrorMsg) {
   std::string where 


Index: llvm/lib/AsmParser/llvmAsmParser.h.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.1 llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.2
--- llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.1	Wed Feb 15 01:22:58 2006
+++ llvm/lib/AsmParser/llvmAsmParser.h.cvs	Fri Apr  7 20:18:56 2006
@@ -133,8 +133,9 @@
 #define	VAARG	350
 #define	EXTRACTELEMENT	351
 #define	INSERTELEMENT	352
-#define	VAARG_old	353
-#define	VANEXT_old	354
+#define	SHUFFLEVECTOR	353
+#define	VAARG_old	354
+#define	VANEXT_old	355
 
 
 extern YYSTYPE llvmAsmlval;


Index: llvm/lib/AsmParser/llvmAsmParser.y.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.2 llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.3
--- llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.2	Sat Mar  4 01:53:41 2006
+++ llvm/lib/AsmParser/llvmAsmParser.y.cvs	Fri Apr  7 20:18:56 2006
@@ -107,8 +107,8 @@
     }
 
     // Look for intrinsic functions and CallInst that need to be upgraded
-    for (Module::iterator FI = CurrentModule->begin(),FE = CurrentModule->end();
-         FI != FE; )
+    for (Module::iterator FI = CurrentModule->begin(),
+         FE = CurrentModule->end(); FI != FE; )
       UpgradeCallsToIntrinsic(FI++);
 
     Values.clear();         // Clear out function local definitions
@@ -998,7 +998,7 @@
 // Other Operators
 %type  <OtherOpVal> ShiftOps
 %token <OtherOpVal> PHI_TOK CAST SELECT SHL SHR VAARG
-%token <OtherOpVal> EXTRACTELEMENT INSERTELEMENT
+%token <OtherOpVal> EXTRACTELEMENT INSERTELEMENT SHUFFLEVECTOR
 %token VAARG_old VANEXT_old //OBSOLETE
 
 
@@ -2260,6 +2260,11 @@
       ThrowException("Third operand of insertelement must be uint!");
     $$ = new InsertElementInst($2, $4, $6);
   }
+  | SHUFFLEVECTOR ResolvedVal ',' ResolvedVal ',' ResolvedVal {
+  if (!ShuffleVectorInst::isValidOperands($2, $4, $6))
+    ThrowException("Invalid shufflevector operands!");
+    $$ = new ShuffleVectorInst($2, $4, $6);
+  }
   | PHI_TOK PHIList {
     const Type *Ty = $2->front().first->getType();
     if (!Ty->isFirstClassType())






More information about the llvm-commits mailing list