[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 May 19 14:29:06 PDT 2006



Changes in directory llvm/lib/AsmParser:

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

Regenerate


---
Diffs of the changes:  (+1451 -1438)

 Lexer.cpp.cvs         |  939 ++++++++++++-------------
 Lexer.l.cvs           |    1 
 llvmAsmParser.cpp.cvs | 1842 +++++++++++++++++++++++++-------------------------
 llvmAsmParser.h.cvs   |   79 +-
 llvmAsmParser.y.cvs   |    3 
 5 files changed, 1451 insertions(+), 1413 deletions(-)


Index: llvm/lib/AsmParser/Lexer.cpp.cvs
diff -u llvm/lib/AsmParser/Lexer.cpp.cvs:1.4 llvm/lib/AsmParser/Lexer.cpp.cvs:1.5
--- llvm/lib/AsmParser/Lexer.cpp.cvs:1.4	Fri Apr  7 20:18:56 2006
+++ llvm/lib/AsmParser/Lexer.cpp.cvs	Fri May 19 16:28:53 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.4 2006/04/08 01:18:56 lattner Exp $
+ * $Header: /var/cvs/llvm/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.5 2006/05/19 21:28:53 lattner Exp $
  */
 
 #define FLEX_SCANNER
@@ -308,33 +308,33 @@
 	*yy_cp = '\0'; \
 	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 107
-#define YY_END_OF_BUFFER 108
-static yyconst short int yy_acclist[185] =
+#define YY_NUM_RULES 108
+#define YY_END_OF_BUFFER 109
+static yyconst short int yy_acclist[186] =
     {   0,
-      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,   93,
-       13,   91,   15,   16
+      109,  107,  108,  106,  107,  108,  106,  108,  107,  108,
+      107,  108,  107,  108,  107,  108,  107,  108,  107,  108,
+       99,  107,  108,   99,  107,  108,    1,  107,  108,  107,
+      108,  107,  108,  107,  108,  107,  108,  107,  108,  107,
+      108,  107,  108,  107,  108,  107,  108,  107,  108,  107,
+      108,  107,  108,  107,  108,  107,  108,  107,  108,  107,
+      108,  107,  108,  107,  108,  107,  108,  107,  108,  107,
+      108,   98,   96,   95,   95,  102,  100,  104,   99,    1,
+       81,   37,   63,   20,   98,   95,   95,  103,  104,   17,
+      104,  105,   57,   62,   35,   30,   38,   60,    3,   48,
+
+       59,   22,   71,   61,   80,   75,   76,   58,   64,   97,
+      104,  104,   43,   72,   73,   88,   89,   50,   19,  101,
+       23,    4,   55,   49,   42,   11,  104,   32,    2,    5,
+       52,   54,   44,   66,   70,   68,   69,   67,   65,   46,
+       90,   45,   51,   18,   78,   87,   41,   53,   27,   21,
+       40,    7,   83,   29,   86,   34,   56,   74,   82,   24,
+       25,   84,   47,   79,   77,   39,    6,   26,   33,    8,
+       14,    9,   10,   31,   12,   36,   28,   85,   91,   93,
+       94,   13,   92,   15,   16
     } ;
 
-static yyconst short int yy_accept[455] =
+static yyconst short int yy_accept[461] =
     {   0,
         1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
        17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
@@ -344,48 +344,48 @@
        81,   81,   81,   81,   81,   81,   81,   81,   81,   82,
        82,   83,   83,   83,   83,   83,   83,   83,   83,   83,
        83,   83,   83,   83,   83,   83,   83,   83,   83,   83,
-       83,   83,   83,   83,   84,   84,   84,   84,   84,   84,
-       84,   84,   84,   84,   84,   84,   84,   85,   85,   85,
+       83,   83,   83,   83,   83,   84,   84,   84,   84,   84,
+       84,   84,   84,   84,   84,   84,   84,   84,   85,   85,
 
        85,   85,   85,   85,   85,   85,   85,   85,   85,   85,
-       86,   87,   89,   90,   91,   92,   92,   93,   94,   94,
-       94,   95,   95,   96,   96,   97,   97,   97,   97,   98,
-       98,   98,   98,   98,   99,   99,  100,  100,  100,  100,
-      100,  100,  100,  100,  100,  100,  100,  101,  101,  101,
-      101,  101,  101,  101,  101,  101,  102,  103,  103,  103,
-      104,  104,  105,  106,  106,  106,  106,  106,  106,  107,
-      107,  108,  108,  108,  108,  109,  109,  109,  109,  109,
+       85,   86,   87,   89,   90,   91,   92,   92,   93,   94,
+       94,   94,   95,   95,   96,   96,   97,   97,   97,   97,
+       98,   98,   98,   98,   98,   98,   99,   99,  100,  100,
+      100,  100,  100,  100,  100,  100,  100,  100,  100,  101,
+      101,  101,  101,  101,  101,  101,  101,  101,  102,  103,
+      103,  103,  104,  104,  105,  106,  106,  106,  106,  106,
+      106,  107,  107,  108,  108,  108,  108,  109,  109,  109,
       109,  109,  109,  109,  109,  109,  109,  109,  109,  109,
-      109,  109,  109,  109,  109,  109,  110,  110,  111,  112,
+      109,  109,  109,  109,  109,  109,  109,  109,  110,  110,
 
-      112,  112,  112,  113,  113,  113,  113,  113,  114,  115,
-      116,  116,  116,  116,  116,  116,  116,  116,  116,  116,
-      116,  116,  116,  117,  117,  117,  117,  117,  117,  117,
-      117,  117,  117,  118,  119,  119,  119,  120,  120,  120,
-      121,  121,  121,  121,  121,  121,  121,  121,  121,  121,
-      121,  121,  121,  122,  122,  122,  123,  124,  124,  125,
-      125,  125,  125,  125,  125,  125,  125,  125,  125,  126,
-      126,  127,  127,  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,  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
+      111,  112,  112,  112,  112,  113,  113,  113,  113,  113,
+      114,  115,  116,  116,  116,  116,  116,  116,  116,  116,
+      116,  116,  116,  116,  116,  116,  117,  117,  117,  117,
+      117,  117,  117,  117,  117,  117,  118,  119,  119,  119,
+      120,  120,  120,  121,  121,  121,  121,  121,  121,  121,
+      121,  121,  121,  121,  121,  121,  122,  122,  122,  123,
+      124,  124,  125,  125,  125,  125,  125,  125,  125,  125,
+      125,  125,  126,  126,  127,  127,  128,  129,  129,  129,
+      130,  130,  130,  130,  130,  130,  130,  130,  130,  130,
+      130,  131,  131,  132,  132,  132,  132,  132,  132,  132,
+
+      133,  133,  133,  133,  133,  133,  133,  134,  134,  134,
+      135,  136,  137,  138,  139,  140,  141,  141,  141,  142,
+      142,  142,  142,  143,  144,  145,  145,  145,  145,  145,
+      145,  146,  146,  146,  146,  147,  147,  148,  148,  148,
+      148,  148,  149,  150,  151,  151,  151,  152,  152,  153,
+      153,  153,  153,  154,  154,  155,  156,  157,  158,  158,
+      158,  159,  159,  159,  160,  161,  162,  162,  162,  163,
+      164,  165,  166,  166,  166,  166,  166,  167,  168,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  170,  170,
+      170,  170,  170,  170,  170,  170,  171,  172,  172,  172,
+
+      172,  172,  173,  174,  174,  174,  174,  174,  174,  175,
+      175,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  177,  177,
+      177,  177,  177,  177,  177,  177,  178,  178,  178,  179,
+      179,  179,  179,  179,  179,  179,  179,  179,  179,  180,
+      180,  181,  182,  183,  183,  184,  185,  185,  186,  186
     } ;
 
 static yyconst int yy_ec[256] =
@@ -429,115 +429,117 @@
         3
     } ;
 
-static yyconst short int yy_base[459] =
+static yyconst short int yy_base[465] =
     {   0,
-        0,    0,  948,  949,  949,  949,  943,  934,   34,   36,
+        0,    0,  960,  961,  961,  961,  955,  946,   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,  941,  949,  932,  949,
-        0,  119,  134,  142,  145,  124,  159,  166,  179,    0,
-       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,  930,  243,  247,  248,  225,  249,  250,
-      251,  253,  258,  262,  267,  270,  929,  274,  259,  279,
-
-      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
+       80,   82,   83,   93,  102,   40,   84,   92,   56,  129,
+      112,  158,  113,   87,   90,  114,  953,  961,  944,  961,
+        0,  117,  123,  146,  149,  128,  163,  170,  183,    0,
+       55,  119,  151,  157,  178,  139,  154,  177,  943,  184,
+      196,  187,   88,  198,  197,  136,  200,  207,  201,  209,
+      210,  211,  213,  218,  220,  215,  212,  233,  224,  228,
+      225,  226,  232,  174,  942,  124,  241,  244,  246,  248,
+      251,  257,  253,  252,  256,  255,  264,  941,  269,  265,
+
+      259,  263,  271,  283,   41,  290,  286,  292,  279,  298,
+      940,    0,  304,  307,  939,  314,  326,    0,  938,  318,
+      315,  937,  311,  936,  327,  935,  328,  330,  308,  934,
+      334,  332,  335,  336,  337,  933,  341,  346,  339,  349,
+      338,  350,  356,  353,  355,  357,  365,  366,  367,  368,
+      369,  371,  372,  374,  377,  379,  381,  932,  931,  383,
+       31,  930,  384,  929,  928,  408,  389,  396,  390,  420,
+      927,  387,  926,  392,  391,  403,  925,  404,  421,  422,
+      409,  423,  425,  426,  430,  438,  439,  440,  441,  443,
+      442,  446,  444,  445,  458,  447,  459,  924,  461,  961,
+
+      465,  482,  471,  484,  487,  471,  489,  475,  476,  923,
+      922,  921,  490,  472,  491,  462,  494,  498,  499,  500,
+      501,  503,  502,  505,  506,  920,  509,  510,  516,  517,
+      518,  520,  521,  523,  527,  919,  918,  526,  528,  917,
+      530,  532,    0,  531,  533,  545,  537,  547,  549,  550,
+      548,  551,  553,  560,  566,  916,  565,  563,  915,  914,
+      567,  913,  564,  577,  568,  579,  580,  582,  583,  585,
+      586,  912,  588,  911,  589,  592,  910,  593,  592,  909,
+      594,  605,  599,  595,  608,  609,  607,  612,  615,  619,
+      908,  620,  907,  621,  622,  617,  623,  625,  629,  906,
+
+      628,  631,  634,  639,  643,  644,  905,  636,  647,  904,
+      903,  902,  901,  900,  899,  898,  649,  650,  897,  651,
+      655,  656,  896,  895,  894,  657,  659,  661,  658,  662,
+      893,  667,  671,  668,  892,  674,  891,  672,  675,  677,
+      676,  890,  889,  888,  683,  679,  887,  691,  886,  692,
+      694,  695,  885,  697,  884,  883,  882,  881,  693,  696,
+      880,  699,  705,  879,  878,  877,  706,  709,  876,  875,
+      874,  873,  710,  711,  712,  716,  872,  871,  868,  717,
+      718,  722,  720,  723,  726,  733,  728,  858,  730,  734,
+      735,  744,  736,  746,  747,  857,  856,  748,  751,  752,
+
+      753,  854,  853,  754,  756,  757,  759,  760,  851,  770,
+      850,  771,  761,  772,  773,  776,  778,  779,  781,  782,
+      786,  787,  788,  790,  792,  795,  793,  848,  796,  799,
+      800,  809,  798,  806,  810,  846,  811,  814,  844,  817,
+      820,  812,  822,  824,  828,  826,  831,  832,  843,  835,
+      842,  841,  839,  836,  535,  397,  838,  393,  961,  872,
+      874,  297,  878,  103
     } ;
 
-static yyconst short int yy_def[459] =
+static yyconst short int yy_def[465] =
     {   0,
-      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
+      459,    1,  459,  459,  459,  459,  460,  461,  462,  459,
+      461,  461,  461,  461,  463,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  460,  459,  461,  459,
+      464,  464,  459,  459,  461,  461,  461,  461,  461,  463,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      459,  464,  464,  459,  461,  461,  461,   49,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,   49,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  459,
+
+      459,  459,  459,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  166,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  459,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,  461,  461,
+      461,  461,  461,  461,  461,  461,  461,  461,    0,  459,
+      459,  459,  459,  459
     } ;
 
-static yyconst short int yy_nxt[991] =
+static yyconst short int yy_nxt[1003] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,    4,   15,    8,    8,    8,   16,   17,   18,   19,
@@ -545,220 +547,226 @@
        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,  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,  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,
-      113,   44,   44,   47,   45,   45,   40,   40,   40,   93,
-       94,   40,   95,   88,   40,   40,  121,   40,  115,  115,
-       40,  100,  124,  116,   47,   48,   48,   40,  101,  116,
-      102,  135,  103,  122,   41,  126,   40,  104,  117,  117,
-       40,   40,  117,  117,   40,  117,  117,  117,  117,  117,
-
-      117,  127,   40,   40,  119,  125,  120,   40,  128,  129,
-       40,   40,   40,   40,  132,   40,   40,  137,  130,  136,
-      131,   40,   40,   40,  142,   40,  133,  139,   40,   40,
-       40,  141,   40,  138,  140,  149,   40,  152,   40,  143,
-      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,  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,
+       48,   40,  241,   40,  191,   40,   40,   40,   40,   82,
+       60,   51,   61,   40,  119,   83,   88,   56,   52,   40,
+       53,   57,   54,   62,   49,   55,   58,   63,   64,   59,
+       67,   40,   65,   40,   40,   40,   69,   66,   40,   40,
+
+       68,   40,   72,   40,   40,  112,   70,  108,   73,   76,
+       74,   75,   71,   40,   84,   86,   85,   77,   79,  109,
+      133,   87,   78,   40,   40,   40,  113,  113,   97,  106,
+       40,   80,   43,   43,  110,   40,  115,   81,   89,   40,
+       40,   98,  107,  120,   99,  121,   90,   40,  162,   91,
+       40,  100,   92,   93,  114,   44,   44,   47,   45,   45,
+       40,  125,   40,   94,   95,   40,   96,   89,   40,   40,
+      122,  137,  116,  116,   40,  101,  126,  117,   47,   48,
+       48,   40,  102,  117,  103,   40,  104,  123,   40,   40,
+      161,  105,  118,  118,   40,   40,  118,  118,   40,  118,
+
+      118,  118,  118,  118,  118,  124,  127,   40,   40,   40,
+      128,   40,   40,  131,  130,  132,  134,  129,   40,  138,
+       40,   40,   40,   40,   40,  139,   40,  141,  135,   40,
+      144,   40,  151,  136,  142,   40,   40,   40,  143,   40,
+      152,  140,  146,   40,   40,  145,  153,  157,  147,  154,
+      156,  158,   40,  148,  149,   40,  150,   40,  160,   40,
+      159,  155,   40,   40,   40,  163,   40,   40,   40,  168,
+       40,  164,  175,  177,   40,   40,   40,  169,  165,  178,
+       40,  176,   40,  171,  166,  170,  172,  167,  179,  173,
+       40,  185,  174,  181,   40,  183,  180,   40,  184,   41,
+
+      186,   40,  187,   40,  182,  192,  193,  188,  197,   40,
+      195,  198,  196,  113,  113,  189,  201,  201,  194,   40,
+      190,  202,   40,  116,  116,   40,   40,  202,  117,   40,
+      199,  208,  203,  204,  117,  205,  205,   40,   40,   40,
+      206,   40,  212,   40,  207,   40,   40,   40,   40,   40,
+       40,  209,   40,  213,  210,  215,  211,   40,  218,  220,
+       40,   40,  216,  217,   40,  214,   40,   40,   40,  221,
+      219,  223,  225,  226,  228,  227,   40,   40,   40,   40,
+       40,  222,   40,   40,  224,   40,  230,  231,   40,  233,
+       40,  229,   40,  236,   40,   40,  234,  232,   40,  237,
+
+       40,   40,   40,   40,   40,  238,  235,   40,   40,  240,
+      246,  253,  242,  252,   40,   40,  239,  243,  243,  251,
+       40,  243,  243,  244,  243,  243,  243,  243,  243,  243,
+      245,   40,   40,   40,   40,  254,   40,   40,  255,  258,
+      247,   40,  248,  259,  257,  260,  249,  256,  250,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,  264,
+      261,  266,  269,  273,  262,  271,  263,  267,  265,   40,
+       40,  268,   40,   40,  201,  201,  270,  272,  284,  202,
+      276,  276,   40,   40,  274,  202,   40,   40,  203,  203,
+      275,  276,  276,  205,  205,   40,  205,  205,   40,  277,
+
+       40,   40,   40,  279,  280,   40,  282,  278,  281,   40,
+       40,   40,   40,   40,   40,  287,   40,   40,  285,  290,
+       40,   40,  291,  292,  286,  283,  295,   40,   40,   40,
+      288,   40,   40,  289,   40,  294,  296,   40,   40,   40,
+      293,   40,   40,   40,   40,  299,   40,  300,   40,  297,
+      298,  307,  301,  302,  304,  303,   40,  308,   40,   40,
+       40,   40,   40,  309,   40,  305,  306,  311,  310,  313,
+      315,   40,  317,  318,   40,   40,   40,   40,   40,   40,
+      319,  312,  316,  314,  320,  321,  324,  323,   40,  322,
+       40,   40,  326,   40,   40,  327,   40,   40,  325,   40,
+
+       40,  276,  276,   40,   40,   40,   40,  331,  328,  335,
+       40,  336,  337,  334,  329,  330,   40,  339,   40,   40,
+       40,  338,  333,   40,  332,  341,   40,  340,   40,  342,
+       40,   40,   40,   40,   40,  343,   40,  346,  347,   40,
+       40,  348,   40,  345,  350,   40,  344,   40,  349,  353,
+       40,  355,  356,  352,   40,   40,  354,  351,   40,  357,
+       40,   40,   40,  358,  359,  360,   40,   40,   40,   40,
+       40,  363,   40,   40,  364,  362,  366,  368,   40,   40,
+      369,  361,   40,   40,  371,   40,   40,   40,   40,  365,
+       40,  367,  370,  377,   40,  373,  374,  378,  375,  380,
+
+      376,  372,   40,   40,   40,   40,   40,   40,   40,  379,
+       40,  385,  383,  381,  384,  386,   40,   40,  382,  389,
+       40,   40,   40,   40,  388,  387,  390,   40,   40,   40,
+      391,   40,  392,   40,   40,  394,  393,   40,  398,   40,
+      395,   40,  399,  397,   40,   40,   40,   40,  400,  401,
+      396,  407,  402,  403,  406,   40,  409,   40,   40,   40,
+      408,  404,   40,   40,   40,   40,  405,   40,   40,  411,
+       40,   40,   40,  415,  412,  418,  417,  420,  416,  413,
+      410,   40,   40,   40,   40,  419,  414,   40,  424,   40,
+       40,  422,   40,   40,  421,  423,  427,   40,   40,   40,
+
+      425,   40,  431,   40,   40,  429,   40,   40,  430,   40,
+       40,   40,  435,  428,  432,  436,  426,   40,  433,  439,
+       40,   40,   40,   40,  434,   40,  440,  437,   40,  441,
+      443,   40,  442,   40,  446,   40,  438,   40,  444,   40,
+      445,  447,   40,   40,  449,  453,   40,   40,  448,   40,
+       40,  450,   40,   40,   40,   40,  457,   40,  451,   40,
+      452,   40,   40,  456,   40,   40,  455,   40,   40,   40,
+      458,  454,   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,  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
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,  200,   40,   40,   40,   40,  111,   40,   38,  459,
+        3,  459,  459,  459,  459,  459,  459,  459,  459,  459,
+      459,  459,  459,  459,  459,  459,  459,  459,  459,  459,
+      459,  459,  459,  459,  459,  459,  459,  459,  459,  459,
+      459,  459,  459,  459,  459,  459,  459,  459,  459,  459,
+
+      459,  459
     } ;
 
-static yyconst short int yy_chk[991] =
+static yyconst short int yy_chk[1003] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    9,  159,    9,    9,   10,   10,   11,   11,   11,
-       12,   26,  104,   12,   13,   13,   13,   13,   14,   14,
-       14,   14,  159,   16,  104,   18,   51,   29,   17,   26,
+        1,    9,  161,    9,    9,   10,   10,   11,   11,   11,
+       12,   26,  105,   12,   13,   13,   13,   13,   14,   14,
+       14,   14,  161,   16,  105,   18,   51,   29,   17,   26,
        18,   16,   18,   20,   51,   26,   29,   17,   16,   19,
-       16,   17,   16,   18,   13,   16,   17,   23,   19,   17,
-       20,   21,   19,   22,   27,  108,   21,   19,   34,   28,
+       16,   17,   16,   18,   13,   16,   17,   18,   19,   17,
+       20,   21,   19,   22,   23,   27,   21,   19,   34,   63,
+
+       20,   35,   22,   28,   24,  464,   21,   34,   22,   24,
+       23,   23,   21,   25,   27,   28,   27,   24,   25,   35,
+       63,   28,   24,   31,   33,   36,   42,   42,   31,   33,
+       52,   25,   43,   43,   36,   86,   46,   25,   30,   46,
+       30,   31,   33,   52,   31,   52,   30,   66,   86,   30,
+       56,   31,   30,   30,   44,   44,   44,   45,   45,   45,
+       45,   56,   53,   30,   30,   57,   30,   32,   54,   32,
+       53,   66,   47,   47,   47,   32,   57,   47,   48,   48,
+       48,   48,   32,   47,   32,   84,   32,   54,   58,   55,
+       84,   32,   49,   49,   49,   60,   49,   49,   62,   49,
+
+       49,   49,   49,   49,   49,   55,   58,   61,   65,   64,
+       60,   67,   69,   62,   61,   62,   64,   60,   68,   67,
+       70,   71,   72,   77,   73,   68,   76,   69,   64,   74,
+       71,   75,   76,   65,   69,   79,   81,   82,   70,   80,
+       77,   68,   73,   83,   78,   72,   77,   80,   74,   78,
+       79,   81,   87,   75,   75,   88,   75,   89,   83,   90,
+       82,   78,   91,   94,   93,   87,   96,   95,   92,   91,
+      101,   88,   93,   95,  102,   97,  100,   91,   88,   96,
+       99,   94,  103,   92,   89,   91,   92,   90,   97,   92,
+      109,  102,   92,   99,  104,  100,   97,  107,  101,  462,
+
+      103,  106,  104,  108,   99,  106,  106,  104,  108,  110,
+      107,  109,  107,  113,  113,  104,  114,  114,  106,  129,
+      104,  114,  123,  116,  116,  116,  121,  114,  116,  120,
+      110,  123,  117,  117,  116,  117,  117,  117,  125,  127,
+      120,  128,  129,  132,  121,  131,  133,  134,  135,  141,
+      139,  125,  137,  131,  127,  133,  128,  138,  137,  139,
+      140,  142,  134,  135,  144,  132,  145,  143,  146,  140,
+      138,  141,  143,  144,  146,  145,  147,  148,  149,  150,
+      151,  140,  152,  153,  142,  154,  148,  149,  155,  151,
+      156,  147,  157,  154,  160,  163,  152,  150,  172,  155,
+
+      167,  169,  175,  174,  458,  156,  153,  168,  456,  160,
+      169,  175,  163,  174,  176,  178,  157,  166,  166,  172,
+      181,  166,  166,  167,  166,  166,  166,  166,  166,  166,
+      168,  170,  179,  180,  182,  176,  183,  184,  178,  181,
+      170,  185,  170,  182,  180,  183,  170,  179,  170,  186,
+      187,  188,  189,  191,  190,  193,  194,  192,  196,  187,
+      184,  189,  192,  196,  185,  194,  186,  190,  188,  195,
+      197,  191,  199,  216,  201,  201,  193,  195,  216,  201,
+      203,  203,  206,  214,  197,  201,  208,  209,  202,  202,
+      199,  202,  202,  204,  204,  204,  205,  205,  205,  206,
+
+      207,  213,  215,  208,  209,  217,  214,  207,  213,  218,
+      219,  220,  221,  223,  222,  219,  224,  225,  217,  222,
+      227,  228,  223,  224,  218,  215,  228,  229,  230,  231,
+      220,  232,  233,  221,  234,  227,  229,  238,  235,  239,
+      225,  241,  244,  242,  245,  232,  455,  233,  247,  230,
+      231,  244,  234,  235,  239,  238,  246,  245,  248,  251,
+      249,  250,  252,  246,  253,  241,  242,  248,  247,  249,
+      250,  254,  252,  253,  258,  263,  257,  255,  261,  265,
+      254,  248,  251,  249,  255,  257,  263,  261,  264,  258,
+      266,  267,  265,  268,  269,  266,  270,  271,  264,  273,
+
+      275,  276,  276,  279,  278,  281,  284,  270,  267,  278,
+      283,  279,  281,  275,  268,  269,  282,  283,  287,  285,
+      286,  282,  273,  288,  271,  285,  289,  284,  296,  286,
+      290,  292,  294,  295,  297,  287,  298,  290,  292,  301,
+      299,  294,  302,  289,  296,  303,  288,  308,  295,  299,
+      304,  302,  303,  298,  305,  306,  301,  297,  309,  304,
+      317,  318,  320,  305,  306,  308,  321,  322,  326,  329,
+      327,  318,  328,  330,  320,  317,  322,  327,  332,  334,
+      328,  309,  333,  338,  330,  336,  339,  341,  340,  321,
+      346,  326,  329,  339,  345,  333,  334,  340,  336,  345,
+
+      338,  332,  348,  350,  359,  351,  352,  360,  354,  341,
+      362,  352,  350,  346,  351,  354,  363,  367,  348,  362,
+      368,  373,  374,  375,  360,  359,  363,  376,  380,  381,
+      367,  383,  368,  382,  384,  374,  373,  385,  381,  387,
+      375,  389,  382,  380,  386,  390,  391,  393,  383,  384,
+      376,  391,  385,  386,  390,  392,  393,  394,  395,  398,
+      392,  387,  399,  400,  401,  404,  389,  405,  406,  395,
+      407,  408,  413,  401,  398,  406,  405,  408,  404,  399,
+      394,  410,  412,  414,  415,  407,  400,  416,  414,  417,
+      418,  412,  419,  420,  410,  413,  417,  421,  422,  423,
+
+      415,  424,  421,  425,  427,  419,  426,  429,  420,  433,
+      430,  431,  425,  418,  422,  426,  416,  434,  423,  430,
+      432,  435,  437,  442,  424,  438,  431,  427,  440,  432,
+      434,  441,  433,  443,  438,  444,  429,  446,  435,  445,
+      437,  440,  447,  448,  442,  446,  450,  454,  441,  457,
+      453,  443,  452,  451,  449,  439,  454,  436,  444,  428,
+      445,  411,  409,  450,  403,  402,  448,  397,  396,  388,
+      457,  447,  460,  460,  460,  460,  461,  461,  463,  379,
+      463,  463,  378,  377,  372,  371,  370,  369,  366,  365,
+      364,  361,  358,  357,  356,  355,  353,  349,  347,  344,
+
+      343,  342,  337,  335,  331,  325,  324,  323,  319,  316,
+      315,  314,  313,  312,  311,  310,  307,  300,  293,  291,
+      280,  277,  274,  272,  262,  260,  259,  256,  240,  237,
+      236,  226,  212,  211,  210,  198,  177,  173,  171,  165,
+      164,  162,  159,  158,  136,  130,  126,  124,  122,  119,
+      115,  111,   98,   85,   59,   39,   37,    8,    7,    3,
+      459,  459,  459,  459,  459,  459,  459,  459,  459,  459,
+      459,  459,  459,  459,  459,  459,  459,  459,  459,  459,
+      459,  459,  459,  459,  459,  459,  459,  459,  459,  459,
+      459,  459,  459,  459,  459,  459,  459,  459,  459,  459,
 
-       20,   64,   22,   23,   23,   24,   21,   34,   22,   25,
-       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,  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,  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,
-      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,  450,   85,   90,   93,
-       99,   86,   92,   94,  102,   87,   90,   91,   95,   94,
-       91,   96,   87,   91,   90,   98,   91,   93,   89,   99,
-      100,   95,  102,  101,   96,  103,  105,  130,   98,  106,
-
-      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
+      459,  459
     } ;
 
 static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
@@ -916,7 +924,7 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 920 "Lexer.cpp"
+#line 928 "Lexer.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1070,7 +1078,7 @@
 #line 179 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 
 
-#line 1074 "Lexer.cpp"
+#line 1082 "Lexer.cpp"
 
 	if ( yy_init )
 		{
@@ -1118,14 +1126,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 >= 454 )
+				if ( yy_current_state >= 460 )
 					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 != 453 );
+		while ( yy_current_state != 459 );
 
 yy_find_action:
 		yy_current_state = *--yy_state_ptr;
@@ -1354,290 +1362,295 @@
 case 39:
 YY_RULE_SETUP
 #line 221 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ return FASTCC_TOK; }
+{ return CSRETCC_TOK; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
 #line 222 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ return COLDCC_TOK; }
+{ return FASTCC_TOK; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 224 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::VoidTy  ; return VOID;   }
+#line 223 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+{ return COLDCC_TOK; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
 #line 225 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::BoolTy  ; return BOOL;   }
+{ llvmAsmlval.PrimType = Type::VoidTy  ; return VOID;   }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
 #line 226 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::SByteTy ; return SBYTE;  }
+{ llvmAsmlval.PrimType = Type::BoolTy  ; return BOOL;   }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
 #line 227 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::UByteTy ; return UBYTE;  }
+{ llvmAsmlval.PrimType = Type::SByteTy ; return SBYTE;  }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
 #line 228 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::ShortTy ; return SHORT;  }
+{ llvmAsmlval.PrimType = Type::UByteTy ; return UBYTE;  }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
 #line 229 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::UShortTy; return USHORT; }
+{ llvmAsmlval.PrimType = Type::ShortTy ; return SHORT;  }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
 #line 230 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::IntTy   ; return INT;    }
+{ llvmAsmlval.PrimType = Type::UShortTy; return USHORT; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
 #line 231 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::UIntTy  ; return UINT;   }
+{ llvmAsmlval.PrimType = Type::IntTy   ; return INT;    }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
 #line 232 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::LongTy  ; return LONG;   }
+{ llvmAsmlval.PrimType = Type::UIntTy  ; return UINT;   }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
 #line 233 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::ULongTy ; return ULONG;  }
+{ llvmAsmlval.PrimType = Type::LongTy  ; return LONG;   }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
 #line 234 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::FloatTy ; return FLOAT;  }
+{ llvmAsmlval.PrimType = Type::ULongTy ; return ULONG;  }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
 #line 235 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::DoubleTy; return DOUBLE; }
+{ llvmAsmlval.PrimType = Type::FloatTy ; return FLOAT;  }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
 #line 236 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::LabelTy ; return LABEL;  }
+{ llvmAsmlval.PrimType = Type::DoubleTy; return DOUBLE; }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
 #line 237 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ return TYPE;   }
+{ llvmAsmlval.PrimType = Type::LabelTy ; return LABEL;  }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
 #line 238 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ return OPAQUE; }
+{ return TYPE;   }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 240 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Add, ADD); }
+#line 239 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+{ return OPAQUE; }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
 #line 241 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Sub, SUB); }
+{ RET_TOK(BinaryOpVal, Add, ADD); }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
 #line 242 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Mul, MUL); }
+{ RET_TOK(BinaryOpVal, Sub, SUB); }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
 #line 243 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Div, DIV); }
+{ RET_TOK(BinaryOpVal, Mul, MUL); }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
 #line 244 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Rem, REM); }
+{ RET_TOK(BinaryOpVal, Div, DIV); }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
 #line 245 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, And, AND); }
+{ RET_TOK(BinaryOpVal, Rem, REM); }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
 #line 246 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Or , OR ); }
+{ RET_TOK(BinaryOpVal, And, AND); }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
 #line 247 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Xor, XOR); }
+{ RET_TOK(BinaryOpVal, Or , OR ); }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
 #line 248 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetNE, SETNE); }
+{ RET_TOK(BinaryOpVal, Xor, XOR); }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
 #line 249 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetEQ, SETEQ); }
+{ RET_TOK(BinaryOpVal, SetNE, SETNE); }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
 #line 250 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetLT, SETLT); }
+{ RET_TOK(BinaryOpVal, SetEQ, SETEQ); }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
 #line 251 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetGT, SETGT); }
+{ RET_TOK(BinaryOpVal, SetLT, SETLT); }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
 #line 252 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetLE, SETLE); }
+{ RET_TOK(BinaryOpVal, SetGT, SETGT); }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
 #line 253 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetGE, SETGE); }
+{ RET_TOK(BinaryOpVal, SetLE, SETLE); }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 255 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, PHI, PHI_TOK); }
+#line 254 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SetGE, SETGE); }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
 #line 256 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Call, CALL); }
+{ RET_TOK(OtherOpVal, PHI, PHI_TOK); }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
 #line 257 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Cast, CAST); }
+{ RET_TOK(OtherOpVal, Call, CALL); }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
 #line 258 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Select, SELECT); }
+{ RET_TOK(OtherOpVal, Cast, CAST); }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
 #line 259 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Shl, SHL); }
+{ RET_TOK(OtherOpVal, Select, SELECT); }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
 #line 260 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Shr, SHR); }
+{ RET_TOK(OtherOpVal, Shl, SHL); }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
 #line 261 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ return VANEXT_old; }
+{ RET_TOK(OtherOpVal, Shr, SHR); }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
 #line 262 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ return VAARG_old; }
+{ return VANEXT_old; }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
 #line 263 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, VAArg , VAARG); }
+{ return VAARG_old; }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
 #line 264 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Ret, RET); }
+{ RET_TOK(OtherOpVal, VAArg , VAARG); }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
 #line 265 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Br, BR); }
+{ RET_TOK(TermOpVal, Ret, RET); }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
 #line 266 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Switch, SWITCH); }
+{ RET_TOK(TermOpVal, Br, BR); }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
 #line 267 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Invoke, INVOKE); }
+{ RET_TOK(TermOpVal, Switch, SWITCH); }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
 #line 268 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unwind, UNWIND); }
+{ RET_TOK(TermOpVal, Invoke, INVOKE); }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
 #line 269 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
+{ RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 271 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Malloc, MALLOC); }
+#line 270 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
 #line 272 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
+{ RET_TOK(MemOpVal, Malloc, MALLOC); }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
 #line 273 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Free, FREE); }
+{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
 #line 274 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Load, LOAD); }
+{ RET_TOK(MemOpVal, Free, FREE); }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
 #line 275 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Store, STORE); }
+{ RET_TOK(MemOpVal, Load, LOAD); }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
 #line 276 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
+{ RET_TOK(MemOpVal, Store, STORE); }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 278 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
+#line 277 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
 #line 279 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
+{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
 #line 280 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
+{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 283 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 281 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
+	YY_BREAK
+case 95:
+YY_RULE_SETUP
+#line 284 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   UnEscapeLexed(yytext+1);
                   llvmAsmlval.StrVal = strdup(yytext+1);             // Skip %
                   return VAR_ID;
                 }
 	YY_BREAK
-case 95:
+case 96:
 YY_RULE_SETUP
-#line 288 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 289 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   yytext[strlen(yytext)-1] = 0;  // nuke colon
                   UnEscapeLexed(yytext);
@@ -1645,9 +1658,9 @@
                   return LABELSTR;
                 }
 	YY_BREAK
-case 96:
+case 97:
 YY_RULE_SETUP
-#line 294 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 295 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   yytext[strlen(yytext)-2] = 0;  // nuke colon, end quote
                   UnEscapeLexed(yytext+1);
@@ -1655,9 +1668,9 @@
                   return LABELSTR;
                 }
 	YY_BREAK
-case 97:
+case 98:
 YY_RULE_SETUP
-#line 301 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 302 "/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
@@ -1668,14 +1681,14 @@
                    return STRINGCONSTANT;
                  }
 	YY_BREAK
-case 98:
+case 99:
 YY_RULE_SETUP
-#line 312 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 313 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.UInt64Val = atoull(yytext); return EUINT64VAL; }
 	YY_BREAK
-case 99:
+case 100:
 YY_RULE_SETUP
-#line 313 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 314 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   // +1:  we have bigger negative range
@@ -1685,17 +1698,17 @@
                   return ESINT64VAL;
                 }
 	YY_BREAK
-case 100:
+case 101:
 YY_RULE_SETUP
-#line 321 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 322 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                    llvmAsmlval.UInt64Val = HexIntToVal(yytext+3);
                    return yytext[0] == 's' ? ESINT64VAL : EUINT64VAL;
                  }
 	YY_BREAK
-case 101:
+case 102:
 YY_RULE_SETUP
-#line 326 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 327 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   if ((unsigned)Val != Val)
@@ -1704,9 +1717,9 @@
                   return UINTVAL;
                 }
 	YY_BREAK
-case 102:
+case 103:
 YY_RULE_SETUP
-#line 333 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 334 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+2);
                   // +1:  we have bigger negative range
@@ -1716,18 +1729,18 @@
                   return SINTVAL;
                 }
 	YY_BREAK
-case 103:
+case 104:
 YY_RULE_SETUP
-#line 342 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 343 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = atof(yytext); return FPVAL; }
 	YY_BREAK
-case 104:
+case 105:
 YY_RULE_SETUP
-#line 343 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 344 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = HexToFP(yytext); return FPVAL; }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 345 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 346 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
@@ -1736,22 +1749,22 @@
                   return EOF;
                 }
 	YY_BREAK
-case 105:
+case 106:
 YY_RULE_SETUP
-#line 353 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 354 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { /* Ignore whitespace */ }
 	YY_BREAK
-case 106:
+case 107:
 YY_RULE_SETUP
-#line 354 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 355 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 { return yytext[0]; }
 	YY_BREAK
-case 107:
+case 108:
 YY_RULE_SETUP
-#line 356 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 357 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 1755 "Lexer.cpp"
+#line 1768 "Lexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2038,7 +2051,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 >= 454 )
+			if ( yy_current_state >= 460 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2068,11 +2081,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 >= 454 )
+		if ( yy_current_state >= 460 )
 			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 == 453);
+	yy_is_jam = (yy_current_state == 459);
 	if ( ! yy_is_jam )
 		*yy_state_ptr++ = yy_current_state;
 
@@ -2173,7 +2186,7 @@
 				case EOB_ACT_END_OF_FILE:
 					{
 					if ( yywrap() )
-						return EOF;
+						return 0;
 
 					if ( ! yy_did_buffer_switch_on_eof )
 						YY_NEW_FILE;
@@ -2633,6 +2646,6 @@
 	return 0;
 	}
 #endif
-#line 356 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
+#line 357 "/Volumes/Projects/cvs/llvm/lib/AsmParser/Lexer.l"
 
 


Index: llvm/lib/AsmParser/Lexer.l.cvs
diff -u llvm/lib/AsmParser/Lexer.l.cvs:1.3 llvm/lib/AsmParser/Lexer.l.cvs:1.4
--- llvm/lib/AsmParser/Lexer.l.cvs:1.3	Fri Apr  7 20:18:56 2006
+++ llvm/lib/AsmParser/Lexer.l.cvs	Fri May 19 16:28:53 2006
@@ -218,6 +218,7 @@
 
 cc              { return CC_TOK; }
 ccc             { return CCC_TOK; }
+csretcc         { return CSRETCC_TOK; }
 fastcc          { return FASTCC_TOK; }
 coldcc          { return COLDCC_TOK; }
 


Index: llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.5 llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.6
--- llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.5	Fri Apr  7 23:09:02 2006
+++ llvm/lib/AsmParser/llvmAsmParser.cpp.cvs	Fri May 19 16:28:53 2006
@@ -1,5 +1,5 @@
 
-/*  A Bison parser, made from /Users/sabre/cvs/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.  */
@@ -71,47 +71,48 @@
 #define	SIDEEFFECT	314
 #define	CC_TOK	315
 #define	CCC_TOK	316
-#define	FASTCC_TOK	317
-#define	COLDCC_TOK	318
-#define	RET	319
-#define	BR	320
-#define	SWITCH	321
-#define	INVOKE	322
-#define	UNWIND	323
-#define	UNREACHABLE	324
-#define	ADD	325
-#define	SUB	326
-#define	MUL	327
-#define	DIV	328
-#define	REM	329
-#define	AND	330
-#define	OR	331
-#define	XOR	332
-#define	SETLE	333
-#define	SETGE	334
-#define	SETLT	335
-#define	SETGT	336
-#define	SETEQ	337
-#define	SETNE	338
-#define	MALLOC	339
-#define	ALLOCA	340
-#define	FREE	341
-#define	LOAD	342
-#define	STORE	343
-#define	GETELEMENTPTR	344
-#define	PHI_TOK	345
-#define	CAST	346
-#define	SELECT	347
-#define	SHL	348
-#define	SHR	349
-#define	VAARG	350
-#define	EXTRACTELEMENT	351
-#define	INSERTELEMENT	352
-#define	SHUFFLEVECTOR	353
-#define	VAARG_old	354
-#define	VANEXT_old	355
+#define	CSRETCC_TOK	317
+#define	FASTCC_TOK	318
+#define	COLDCC_TOK	319
+#define	RET	320
+#define	BR	321
+#define	SWITCH	322
+#define	INVOKE	323
+#define	UNWIND	324
+#define	UNREACHABLE	325
+#define	ADD	326
+#define	SUB	327
+#define	MUL	328
+#define	DIV	329
+#define	REM	330
+#define	AND	331
+#define	OR	332
+#define	XOR	333
+#define	SETLE	334
+#define	SETGE	335
+#define	SETLT	336
+#define	SETGT	337
+#define	SETEQ	338
+#define	SETNE	339
+#define	MALLOC	340
+#define	ALLOCA	341
+#define	FREE	342
+#define	LOAD	343
+#define	STORE	344
+#define	GETELEMENTPTR	345
+#define	PHI_TOK	346
+#define	CAST	347
+#define	SELECT	348
+#define	SHL	349
+#define	SHR	350
+#define	VAARG	351
+#define	EXTRACTELEMENT	352
+#define	INSERTELEMENT	353
+#define	SHUFFLEVECTOR	354
+#define	VAARG_old	355
+#define	VANEXT_old	356
 
-#line 14 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 14 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -987,7 +988,7 @@
 }
 
 
-#line 890 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 890 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 typedef union {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -1037,26 +1038,26 @@
 
 
 
-#define	YYFINAL		495
+#define	YYFINAL		496
 #define	YYFLAG		-32768
-#define	YYNTBASE	116
+#define	YYNTBASE	117
 
-#define YYTRANSLATE(x) ((unsigned)(x) <= 355 ? yytranslate[x] : 187)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 356 ? yytranslate[x] : 188)
 
 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,   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,   106,
+   107,   115,     2,   104,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,   111,
+   103,   112,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-   107,   104,   109,     2,     2,     2,     2,     2,   115,     2,
+   108,   105,   110,     2,     2,     2,     2,     2,   116,     2,
      2,     2,     2,     2,     2,     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,   109,
+     2,     2,   113,     2,   114,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -1079,7 +1080,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,   101
+    97,    98,    99,   100,   101,   102
 };
 
 #if YYDEBUG != 0
@@ -1088,107 +1089,107 @@
     20,    22,    24,    26,    28,    30,    32,    34,    36,    38,
     40,    42,    44,    46,    48,    50,    52,    54,    56,    58,
     60,    62,    64,    67,    68,    70,    72,    74,    76,    77,
-    78,    80,    82,    84,    87,    88,    91,    92,    96,    99,
-   100,   102,   103,   107,   109,   112,   114,   116,   118,   120,
+    78,    80,    82,    84,    86,    89,    90,    93,    94,    98,
+   101,   102,   104,   105,   109,   111,   114,   116,   118,   120,
    122,   124,   126,   128,   130,   132,   134,   136,   138,   140,
-   142,   144,   146,   148,   150,   152,   154,   157,   162,   168,
-   174,   178,   181,   184,   186,   190,   192,   196,   198,   199,
-   204,   208,   212,   217,   222,   226,   229,   232,   235,   238,
-   241,   244,   247,   250,   253,   256,   263,   269,   278,   285,
-   292,   299,   306,   313,   322,   331,   335,   337,   339,   341,
-   343,   346,   349,   354,   357,   359,   364,   367,   372,   373,
-   381,   382,   390,   394,   399,   400,   402,   404,   406,   410,
-   414,   418,   422,   426,   428,   429,   431,   433,   435,   436,
-   439,   443,   445,   447,   451,   453,   454,   463,   465,   467,
-   471,   473,   475,   478,   479,   483,   484,   486,   488,   490,
-   492,   494,   496,   498,   500,   502,   506,   508,   514,   516,
-   518,   520,   522,   525,   528,   531,   535,   538,   539,   541,
-   544,   547,   551,   561,   571,   580,   594,   596,   598,   605,
-   611,   614,   621,   629,   631,   635,   637,   638,   641,   643,
-   649,   655,   661,   664,   669,   674,   681,   686,   691,   696,
-   701,   708,   715,   718,   726,   728,   731,   732,   734,   735,
-   739,   746,   750,   757,   760,   765,   772
+   142,   144,   146,   148,   150,   152,   154,   156,   159,   164,
+   170,   176,   180,   183,   186,   188,   192,   194,   198,   200,
+   201,   206,   210,   214,   219,   224,   228,   231,   234,   237,
+   240,   243,   246,   249,   252,   255,   258,   265,   271,   280,
+   287,   294,   301,   308,   315,   324,   333,   337,   339,   341,
+   343,   345,   348,   351,   356,   359,   361,   366,   369,   374,
+   375,   383,   384,   392,   396,   401,   402,   404,   406,   408,
+   412,   416,   420,   424,   428,   430,   431,   433,   435,   437,
+   438,   441,   445,   447,   449,   453,   455,   456,   465,   467,
+   469,   473,   475,   477,   480,   481,   485,   486,   488,   490,
+   492,   494,   496,   498,   500,   502,   504,   508,   510,   516,
+   518,   520,   522,   524,   527,   530,   533,   537,   540,   541,
+   543,   546,   549,   553,   563,   573,   582,   596,   598,   600,
+   607,   613,   616,   623,   631,   633,   637,   639,   640,   643,
+   645,   651,   657,   663,   666,   671,   676,   683,   688,   693,
+   698,   703,   710,   717,   720,   728,   730,   733,   734,   736,
+   737,   741,   748,   752,   759,   762,   767,   774
 };
 
 static const short yyrhs[] = {     5,
-     0,     6,     0,     3,     0,     4,     0,    71,     0,    72,
-     0,    73,     0,    74,     0,    75,     0,    76,     0,    77,
-     0,    78,     0,    79,     0,    80,     0,    81,     0,    82,
-     0,    83,     0,    84,     0,    94,     0,    95,     0,    16,
+     0,     6,     0,     3,     0,     4,     0,    72,     0,    73,
+     0,    74,     0,    75,     0,    76,     0,    77,     0,    78,
+     0,    79,     0,    80,     0,    81,     0,    82,     0,    83,
+     0,    84,     0,    85,     0,    95,     0,    96,     0,    16,
      0,    14,     0,    12,     0,    10,     0,    17,     0,    15,
-     0,    13,     0,    11,     0,   122,     0,   123,     0,    18,
-     0,    19,     0,   156,   102,     0,     0,    41,     0,    42,
+     0,    13,     0,    11,     0,   123,     0,   124,     0,    18,
+     0,    19,     0,   157,   103,     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,   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,   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,    98,   105,   142,   103,   142,   103,   142,   106,
-     0,    99,   105,   142,   103,   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,   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
+     0,    64,     0,    65,     0,    61,     4,     0,     0,    54,
+     4,     0,     0,   104,    54,     4,     0,    34,    24,     0,
+     0,   132,     0,     0,   104,   135,   134,     0,   132,     0,
+    54,     4,     0,   138,     0,     8,     0,   140,     0,     8,
+     0,   140,     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,   139,     0,   171,     0,   105,     4,     0,   137,   106,
+   142,   107,     0,   108,     4,   109,   140,   110,     0,   111,
+     4,   109,   140,   112,     0,   113,   141,   114,     0,   113,
+   114,     0,   140,   115,     0,   140,     0,   141,   104,   140,
+     0,   141,     0,   141,   104,    37,     0,    37,     0,     0,
+   138,   108,   145,   110,     0,   138,   108,   110,     0,   138,
+   116,    24,     0,   138,   111,   145,   112,     0,   138,   113,
+   145,   114,     0,   138,   113,   114,     0,   138,    38,     0,
+   138,    39,     0,   138,   171,     0,   138,   144,     0,   138,
+    26,     0,   123,   118,     0,   124,     4,     0,     9,    27,
+     0,     9,    28,     0,   126,     7,     0,    93,   106,   143,
+    36,   138,   107,     0,    91,   106,   143,   185,   107,     0,
+    94,   106,   143,   104,   143,   104,   143,   107,     0,   119,
+   106,   143,   104,   143,   107,     0,   120,   106,   143,   104,
+   143,   107,     0,   121,   106,   143,   104,   143,   107,     0,
+   122,   106,   143,   104,   143,   107,     0,    98,   106,   143,
+   104,   143,   107,     0,    99,   106,   143,   104,   143,   104,
+   143,   107,     0,   100,   106,   143,   104,   143,   104,   143,
+   107,     0,   145,   104,   143,     0,   143,     0,    32,     0,
+    33,     0,   148,     0,   148,   166,     0,   148,   167,     0,
+   148,    59,    58,   152,     0,   148,    25,     0,   149,     0,
+   149,   127,    20,   136,     0,   149,   167,     0,   149,    59,
+    58,   152,     0,     0,   149,   127,   128,   146,   143,   150,
+   134,     0,     0,   149,   127,    47,   146,   138,   151,   134,
+     0,   149,    48,   154,     0,   149,    55,   103,   155,     0,
+     0,    24,     0,    53,     0,    52,     0,    50,   103,   153,
+     0,    51,   103,     4,     0,    49,   103,    24,     0,   108,
+   156,   110,     0,   156,   104,    24,     0,    24,     0,     0,
+    22,     0,    24,     0,   157,     0,     0,   138,   158,     0,
+   160,   104,   159,     0,   159,     0,   160,     0,   160,   104,
+    37,     0,    37,     0,     0,   129,   136,   157,   106,   161,
+   107,   133,   130,     0,    29,     0,   113,     0,   128,   162,
+   163,     0,    30,     0,   114,     0,   174,   165,     0,     0,
+    31,   168,   162,     0,     0,    60,     0,     3,     0,     4,
+     0,     7,     0,    27,     0,    28,     0,    38,     0,    39,
+     0,    26,     0,   111,   145,   112,     0,   144,     0,    58,
+   169,    24,   104,    24,     0,   117,     0,   157,     0,   171,
+     0,   170,     0,   138,   172,     0,   174,   175,     0,   164,
+   175,     0,   176,   127,   177,     0,   176,   179,     0,     0,
+    23,     0,    66,   173,     0,    66,     8,     0,    67,    21,
+   172,     0,    67,     9,   172,   104,    21,   172,   104,    21,
+   172,     0,    68,   125,   172,   104,    21,   172,   108,   178,
+   110,     0,    68,   125,   172,   104,    21,   172,   108,   110,
+     0,    69,   129,   136,   172,   106,   182,   107,    36,    21,
+   172,    70,    21,   172,     0,    70,     0,    71,     0,   178,
+   125,   170,   104,    21,   172,     0,   125,   170,   104,    21,
+   172,     0,   127,   184,     0,   138,   108,   172,   104,   172,
+   110,     0,   180,   104,   108,   172,   104,   172,   110,     0,
+   173,     0,   181,   104,   173,     0,   181,     0,     0,    57,
+    56,     0,    56,     0,   119,   138,   172,   104,   172,     0,
+   120,   138,   172,   104,   172,     0,   121,   138,   172,   104,
+   172,     0,    46,   173,     0,   122,   173,   104,   173,     0,
+    93,   173,    36,   138,     0,    94,   173,   104,   173,   104,
+   173,     0,    97,   173,   104,   138,     0,   101,   173,   104,
+   138,     0,   102,   173,   104,   138,     0,    98,   173,   104,
+   173,     0,    99,   173,   104,   173,   104,   173,     0,   100,
+   173,   104,   173,   104,   173,     0,    92,   180,     0,   183,
+   129,   136,   172,   106,   182,   107,     0,   187,     0,   104,
+   181,     0,     0,    35,     0,     0,    86,   138,   131,     0,
+    86,   138,   104,    15,   172,   131,     0,    87,   138,   131,
+     0,    87,   138,   104,    15,   172,   131,     0,    88,   173,
+     0,   186,    89,   138,   172,     0,   186,    90,   173,   104,
+   138,   172,     0,    91,   138,   172,   185,     0
 };
 
 #endif
@@ -1199,26 +1200,26 @@
   1029,  1029,  1030,  1030,  1030,  1030,  1030,  1030,  1032,  1032,
   1036,  1036,  1036,  1036,  1037,  1037,  1037,  1037,  1038,  1038,
   1039,  1039,  1042,  1045,  1049,  1049,  1050,  1051,  1052,  1055,
-  1055,  1056,  1057,  1058,  1067,  1067,  1073,  1073,  1081,  1088,
-  1088,  1094,  1094,  1096,  1100,  1113,  1113,  1114,  1114,  1116,
-  1125,  1125,  1125,  1125,  1125,  1125,  1125,  1126,  1126,  1126,
-  1126,  1126,  1126,  1127,  1130,  1133,  1139,  1146,  1158,  1162,
-  1173,  1182,  1185,  1193,  1197,  1202,  1203,  1206,  1209,  1219,
-  1244,  1257,  1286,  1311,  1331,  1343,  1352,  1356,  1415,  1421,
-  1429,  1434,  1439,  1442,  1445,  1452,  1462,  1493,  1500,  1521,
-  1531,  1536,  1543,  1548,  1553,  1561,  1564,  1571,  1571,  1581,
-  1588,  1592,  1595,  1598,  1601,  1614,  1634,  1636,  1638,  1641,
-  1644,  1648,  1651,  1653,  1655,  1659,  1671,  1672,  1674,  1677,
-  1685,  1690,  1692,  1696,  1700,  1708,  1708,  1709,  1709,  1711,
-  1717,  1722,  1728,  1731,  1736,  1740,  1744,  1830,  1830,  1832,
-  1840,  1840,  1842,  1846,  1846,  1855,  1858,  1862,  1865,  1868,
-  1871,  1874,  1877,  1880,  1883,  1886,  1910,  1913,  1926,  1929,
-  1934,  1934,  1940,  1944,  1947,  1955,  1964,  1968,  1978,  1989,
-  1992,  1995,  1998,  2001,  2015,  2019,  2072,  2075,  2081,  2089,
-  2099,  2106,  2111,  2118,  2122,  2128,  2128,  2130,  2133,  2139,
-  2151,  2162,  2172,  2184,  2191,  2198,  2205,  2210,  2229,  2251,
-  2256,  2261,  2266,  2280,  2337,  2343,  2345,  2349,  2352,  2358,
-  2362,  2366,  2370,  2374,  2381,  2391,  2404
+  1055,  1056,  1057,  1058,  1059,  1068,  1068,  1074,  1074,  1082,
+  1089,  1089,  1095,  1095,  1097,  1101,  1114,  1114,  1115,  1115,
+  1117,  1126,  1126,  1126,  1126,  1126,  1126,  1126,  1127,  1127,
+  1127,  1127,  1127,  1127,  1128,  1131,  1134,  1140,  1147,  1159,
+  1163,  1174,  1183,  1186,  1194,  1198,  1203,  1204,  1207,  1210,
+  1220,  1245,  1258,  1287,  1312,  1332,  1344,  1353,  1357,  1416,
+  1422,  1430,  1435,  1440,  1443,  1446,  1453,  1463,  1494,  1501,
+  1522,  1532,  1537,  1544,  1549,  1554,  1562,  1565,  1572,  1572,
+  1582,  1589,  1593,  1596,  1599,  1602,  1615,  1635,  1637,  1639,
+  1642,  1645,  1649,  1652,  1654,  1656,  1660,  1672,  1673,  1675,
+  1678,  1686,  1691,  1693,  1697,  1701,  1709,  1709,  1710,  1710,
+  1712,  1718,  1723,  1729,  1732,  1737,  1741,  1745,  1831,  1831,
+  1833,  1841,  1841,  1843,  1847,  1847,  1856,  1859,  1863,  1866,
+  1869,  1872,  1875,  1878,  1881,  1884,  1887,  1911,  1914,  1927,
+  1930,  1935,  1935,  1941,  1945,  1948,  1956,  1965,  1969,  1979,
+  1990,  1993,  1996,  1999,  2002,  2016,  2020,  2073,  2076,  2082,
+  2090,  2100,  2107,  2112,  2119,  2123,  2129,  2129,  2131,  2134,
+  2140,  2152,  2163,  2173,  2185,  2192,  2199,  2206,  2211,  2230,
+  2252,  2257,  2262,  2267,  2281,  2338,  2344,  2346,  2350,  2353,
+  2359,  2363,  2367,  2371,  2375,  2382,  2392,  2405
 };
 #endif
 
@@ -1233,51 +1234,51 @@
 "DOTDOTDOT","NULL_TOK","UNDEF","CONST","INTERNAL","LINKONCE","WEAK","APPENDING",
 "OPAQUE","NOT","EXTERNAL","TARGET","TRIPLE","ENDIAN","POINTERSIZE","LITTLE",
 "BIG","ALIGN","DEPLIBS","CALL","TAIL","ASM_TOK","MODULE","SIDEEFFECT","CC_TOK",
-"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","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
+"CCC_TOK","CSRETCC_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","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,
-   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,   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
+   117,   117,   118,   118,   119,   119,   119,   119,   119,   120,
+   120,   120,   121,   121,   121,   121,   121,   121,   122,   122,
+   123,   123,   123,   123,   124,   124,   124,   124,   125,   125,
+   126,   126,   127,   127,   128,   128,   128,   128,   128,   129,
+   129,   129,   129,   129,   129,   130,   130,   131,   131,   132,
+   133,   133,   134,   134,   135,   135,   136,   136,   137,   137,
+   138,   139,   139,   139,   139,   139,   139,   139,   139,   139,
+   139,   139,   139,   139,   140,   140,   140,   140,   140,   140,
+   140,   140,   140,   140,   141,   141,   142,   142,   142,   142,
+   143,   143,   143,   143,   143,   143,   143,   143,   143,   143,
+   143,   143,   143,   143,   143,   143,   144,   144,   144,   144,
+   144,   144,   144,   144,   144,   144,   145,   145,   146,   146,
+   147,   148,   148,   148,   148,   148,   149,   149,   149,   150,
+   149,   151,   149,   149,   149,   149,   152,   153,   153,   154,
+   154,   154,   155,   156,   156,   156,   157,   157,   158,   158,
+   159,   160,   160,   161,   161,   161,   161,   162,   163,   163,
+   164,   165,   165,   166,   168,   167,   169,   169,   170,   170,
+   170,   170,   170,   170,   170,   170,   170,   170,   170,   171,
+   171,   172,   172,   173,   174,   174,   175,   176,   176,   176,
+   177,   177,   177,   177,   177,   177,   177,   177,   177,   178,
+   178,   179,   180,   180,   181,   181,   182,   182,   183,   183,
+   184,   184,   184,   184,   184,   184,   184,   184,   184,   184,
+   184,   184,   184,   184,   184,   184,   185,   185,   186,   186,
+   187,   187,   187,   187,   187,   187,   187,   187
 };
 
 static const short yyr2[] = {     0,
@@ -1285,426 +1286,418 @@
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
      1,     1,     2,     0,     1,     1,     1,     1,     0,     0,
-     1,     1,     1,     2,     0,     2,     0,     3,     2,     0,
-     1,     0,     3,     1,     2,     1,     1,     1,     1,     1,
+     1,     1,     1,     1,     2,     0,     2,     0,     3,     2,
+     0,     1,     0,     3,     1,     2,     1,     1,     1,     1,
      1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     2,     4,     5,     5,
-     3,     2,     2,     1,     3,     1,     3,     1,     0,     4,
-     3,     3,     4,     4,     3,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     6,     5,     8,     6,     6,
-     6,     6,     6,     8,     8,     3,     1,     1,     1,     1,
-     2,     2,     4,     2,     1,     4,     2,     4,     0,     7,
-     0,     7,     3,     4,     0,     1,     1,     1,     3,     3,
-     3,     3,     3,     1,     0,     1,     1,     1,     0,     2,
-     3,     1,     1,     3,     1,     0,     8,     1,     1,     3,
-     1,     1,     2,     0,     3,     0,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     3,     1,     5,     1,     1,
-     1,     1,     2,     2,     2,     3,     2,     0,     1,     2,
-     2,     3,     9,     9,     8,    13,     1,     1,     6,     5,
-     2,     6,     7,     1,     3,     1,     0,     2,     1,     5,
-     5,     5,     2,     4,     4,     6,     4,     4,     4,     4,
-     6,     6,     2,     7,     1,     2,     0,     1,     0,     3,
-     6,     3,     6,     2,     4,     6,     4
+     1,     1,     1,     1,     1,     1,     1,     2,     4,     5,
+     5,     3,     2,     2,     1,     3,     1,     3,     1,     0,
+     4,     3,     3,     4,     4,     3,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     6,     5,     8,     6,
+     6,     6,     6,     6,     8,     8,     3,     1,     1,     1,
+     1,     2,     2,     4,     2,     1,     4,     2,     4,     0,
+     7,     0,     7,     3,     4,     0,     1,     1,     1,     3,
+     3,     3,     3,     3,     1,     0,     1,     1,     1,     0,
+     2,     3,     1,     1,     3,     1,     0,     8,     1,     1,
+     3,     1,     1,     2,     0,     3,     0,     1,     1,     1,
+     1,     1,     1,     1,     1,     1,     3,     1,     5,     1,
+     1,     1,     1,     2,     2,     2,     3,     2,     0,     1,
+     2,     2,     3,     9,     9,     8,    13,     1,     1,     6,
+     5,     2,     6,     7,     1,     3,     1,     0,     2,     1,
+     5,     5,     5,     2,     4,     4,     6,     4,     4,     4,
+     4,     6,     6,     2,     7,     1,     2,     0,     1,     0,
+     3,     6,     3,     6,     2,     4,     6,     4
 };
 
-static const short yydefact[] = {   135,
-    39,   125,   124,   164,    35,    36,    37,    38,     0,    40,
-   188,   121,   122,   188,   146,   147,     0,     0,     0,    39,
-     0,   127,    40,     0,     0,    41,    42,    43,     0,     0,
-   189,   185,    34,   161,   162,   163,   184,     0,     0,     0,
-   133,     0,     0,     0,     0,     0,    33,   165,   136,   123,
-    44,     1,     2,    57,    61,    62,    63,    64,    65,    66,
-    67,    68,    69,    70,    71,    72,    73,    74,     0,     0,
-     0,     0,   179,     0,     0,    56,    75,    60,   180,    76,
-   158,   159,   160,   229,   187,     0,     0,     0,   145,   134,
-   128,   126,   118,   119,     0,     0,    77,     0,     0,    59,
-    82,    84,     0,     0,    89,    83,   228,     0,   209,     0,
-     0,     0,     0,    40,   197,   198,     5,     6,     7,     8,
-     9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-     0,     0,     0,     0,     0,     0,     0,    19,    20,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,   186,
-    40,   201,     0,   225,   141,   138,   137,   139,   140,   144,
-     0,   131,    61,    62,    63,    64,    65,    66,    67,    68,
-    69,    70,    71,     0,     0,     0,     0,   129,     0,     0,
-     0,    81,   156,    88,    86,     0,     0,   213,   208,   191,
-   190,     0,     0,    24,    28,    23,    27,    22,    26,    21,
-    25,    29,    30,     0,     0,    47,    47,   234,     0,     0,
-   223,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,   142,    52,   103,
-   104,     3,     4,   101,   102,   105,   100,    96,    97,     0,
+static const short yydefact[] = {   136,
+    39,   126,   125,   165,    35,    36,    37,    38,     0,    40,
+   189,   122,   123,   189,   147,   148,     0,     0,     0,    39,
+     0,   128,    40,     0,     0,    41,    42,    43,    44,     0,
+     0,   190,   186,    34,   162,   163,   164,   185,     0,     0,
+     0,   134,     0,     0,     0,     0,     0,    33,   166,   137,
+   124,    45,     1,     2,    58,    62,    63,    64,    65,    66,
+    67,    68,    69,    70,    71,    72,    73,    74,    75,     0,
+     0,     0,     0,   180,     0,     0,    57,    76,    61,   181,
+    77,   159,   160,   161,   230,   188,     0,     0,     0,   146,
+   135,   129,   127,   119,   120,     0,     0,    78,     0,     0,
+    60,    83,    85,     0,     0,    90,    84,   229,     0,   210,
+     0,     0,     0,     0,    40,   198,   199,     5,     6,     7,
+     8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+    18,     0,     0,     0,     0,     0,     0,     0,    19,    20,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+   187,    40,   202,     0,   226,   142,   139,   138,   140,   141,
+   145,     0,   132,    62,    63,    64,    65,    66,    67,    68,
+    69,    70,    71,    72,     0,     0,     0,     0,   130,     0,
+     0,     0,    82,   157,    89,    87,     0,     0,   214,   209,
+   192,   191,     0,     0,    24,    28,    23,    27,    22,    26,
+    21,    25,    29,    30,     0,     0,    48,    48,   235,     0,
+     0,   224,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,   143,    53,
+   104,   105,     3,     4,   102,   103,   106,   101,    97,    98,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,    99,    98,    52,    58,    58,    85,   155,
-   149,   152,   153,     0,     0,    78,   168,   169,   170,   175,
-   171,   172,   173,   174,   166,     0,   177,   182,   181,   183,
-     0,   192,     0,     0,     0,   230,     0,   232,   227,     0,
+     0,     0,     0,     0,   100,    99,    53,    59,    59,    86,
+   156,   150,   153,   154,     0,     0,    79,   169,   170,   171,
+   176,   172,   173,   174,   175,   167,     0,   178,   183,   182,
+   184,     0,   193,     0,     0,     0,   231,     0,   233,   228,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,   143,     0,   132,     0,
-     0,     0,     0,     0,     0,    91,   117,     0,     0,    95,
-     0,    92,     0,     0,     0,     0,   130,    79,    80,   148,
-   150,     0,    50,    87,   167,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,   237,     0,     0,   215,     0,   217,
-   220,     0,     0,   218,   219,     0,     0,     0,   214,     0,
-   235,     0,     0,     0,    54,    52,   227,     0,     0,     0,
-     0,     0,     0,    90,    93,    94,     0,     0,     0,     0,
-   154,   151,    51,    45,     0,   176,     0,     0,   207,    47,
-    48,    47,   204,   226,     0,     0,     0,     0,     0,   210,
-   211,   212,   207,     0,    49,    55,    53,     0,     0,     0,
-     0,     0,     0,   116,     0,     0,     0,     0,     0,   157,
-     0,     0,     0,   206,     0,     0,   231,   233,     0,     0,
-     0,   216,   221,   222,     0,   236,   107,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,    46,   178,     0,     0,
-     0,   205,   202,     0,   224,   106,     0,   113,     0,     0,
-   109,   110,   111,   112,     0,   195,     0,     0,     0,   203,
-     0,     0,     0,   193,     0,   194,     0,     0,   108,   114,
-   115,     0,     0,     0,     0,     0,     0,   200,     0,     0,
-   199,   196,     0,     0,     0
+     0,     0,     0,     0,     0,     0,     0,   144,     0,   133,
+     0,     0,     0,     0,     0,     0,    92,   118,     0,     0,
+    96,     0,    93,     0,     0,     0,     0,   131,    80,    81,
+   149,   151,     0,    51,    88,   168,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,   238,     0,     0,   216,     0,
+   218,   221,     0,     0,   219,   220,     0,     0,     0,   215,
+     0,   236,     0,     0,     0,    55,    53,   228,     0,     0,
+     0,     0,     0,     0,    91,    94,    95,     0,     0,     0,
+     0,   155,   152,    52,    46,     0,   177,     0,     0,   208,
+    48,    49,    48,   205,   227,     0,     0,     0,     0,     0,
+   211,   212,   213,   208,     0,    50,    56,    54,     0,     0,
+     0,     0,     0,     0,   117,     0,     0,     0,     0,     0,
+   158,     0,     0,     0,   207,     0,     0,   232,   234,     0,
+     0,     0,   217,   222,   223,     0,   237,   108,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,    47,   179,     0,
+     0,     0,   206,   203,     0,   225,   107,     0,   114,     0,
+     0,   110,   111,   112,   113,     0,   196,     0,     0,     0,
+   204,     0,     0,     0,   194,     0,   195,     0,     0,   109,
+   115,   116,     0,     0,     0,     0,     0,     0,   201,     0,
+     0,   200,   197,     0,     0,     0
 };
 
-static const short yydefgoto[] = {    73,
-   234,   250,   251,   252,   253,   174,   175,   204,   176,    20,
-    10,    29,   420,   286,   365,   384,   309,   366,    74,    75,
-   177,    77,    78,   103,   186,   317,   277,   318,    95,   493,
-     1,     2,   256,   229,    50,   158,    41,    90,   161,    79,
-   331,   262,   263,   264,    30,    83,    11,    36,    12,    13,
-    23,   336,   278,    80,   280,   393,    14,    32,    33,   150,
-   468,    85,   211,   424,   425,   151,   152,   345,   153,   154
+static const short yydefgoto[] = {    74,
+   235,   251,   252,   253,   254,   175,   176,   205,   177,    20,
+    10,    30,   421,   287,   366,   385,   310,   367,    75,    76,
+   178,    78,    79,   104,   187,   318,   278,   319,    96,   494,
+     1,     2,   257,   230,    51,   159,    42,    91,   162,    80,
+   332,   263,   264,   265,    31,    84,    11,    37,    12,    13,
+    23,   337,   279,    81,   281,   394,    14,    33,    34,   151,
+   469,    86,   212,   425,   426,   152,   153,   346,   154,   155
 };
 
 static const short yypact[] = {-32768,
-   181,   364,-32768,-32768,-32768,-32768,-32768,-32768,     6,    -1,
-    60,-32768,-32768,   -14,-32768,-32768,    47,   -22,    72,    45,
-    33,-32768,    -1,   125,   157,-32768,-32768,-32768,  1050,   -21,
--32768,-32768,    22,-32768,-32768,-32768,-32768,    61,    67,    68,
--32768,    55,   125,  1050,    -6,    -6,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,    66,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   168,   170,
-   171,   566,-32768,    22,    73,-32768,-32768,   -24,-32768,-32768,
--32768,-32768,-32768,  1213,-32768,   149,    57,   173,   155,-32768,
--32768,-32768,-32768,-32768,  1088,  1126,-32768,    74,    75,-32768,
--32768,   -24,   -82,    79,   860,-32768,-32768,  1088,-32768,   124,
-  1164,    14,   128,    -1,-32768,-32768,-32768,-32768,-32768,-32768,
+   181,   372,-32768,-32768,-32768,-32768,-32768,-32768,   -32,    94,
+    38,-32768,-32768,   -14,-32768,-32768,    45,   -40,    18,    44,
+   -25,-32768,    94,    57,    79,-32768,-32768,-32768,-32768,  1012,
+   -21,-32768,-32768,    22,-32768,-32768,-32768,-32768,    -6,    -4,
+    27,-32768,    26,    57,  1012,    77,    77,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,    46,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   167,
+   170,   171,   524,-32768,    22,    71,-32768,-32768,   -17,-32768,
+-32768,-32768,-32768,-32768,  1176,-32768,   154,    76,   175,   156,
+-32768,-32768,-32768,-32768,-32768,  1050,  1088,-32768,    73,    74,
+-32768,-32768,   -17,   -83,    78,   819,-32768,-32768,  1050,-32768,
+   129,  1126,    56,   128,    94,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,  1050,  1050,  1050,  1050,  1050,  1050,  1050,-32768,-32768,
+  1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,
+-32768,    94,-32768,    43,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,   -82,-32768,   119,   146,   183,   157,   190,   159,   194,
+   166,   196,   195,   197,   169,   199,   198,   406,-32768,  1050,
+  1050,  1050,-32768,   857,-32768,    97,   100,   617,-32768,-32768,
+    46,-32768,   617,   617,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,   617,  1012,   104,   105,-32768,   617,
+   103,   109,   178,   111,   122,   123,   131,   132,   133,   134,
+   617,   617,   617,   135,  1012,  1050,  1050,   209,-32768,   137,
 -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  1088,  1088,  1088,  1088,  1088,  1088,  1088,-32768,-32768,  1088,
-  1088,  1088,  1088,  1088,  1088,  1088,  1088,  1088,  1088,-32768,
-    -1,-32768,    40,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-    -9,-32768,   106,   143,   183,   148,   190,   152,   194,   154,
-   196,   178,   195,   156,   197,   198,   425,-32768,  1088,  1088,
-  1088,-32768,   898,-32768,   100,    98,   660,-32768,-32768,    66,
--32768,   660,   660,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,   660,  1050,   104,   105,-32768,   660,   102,
-   108,   177,   111,   112,   123,   130,   132,   133,   134,   660,
-   660,   660,   135,  1050,  1088,  1088,   203,-32768,   136,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   137,
-   138,   139,   140,   141,   142,   936,  1126,   604,   217,   145,
-   146,   147,   150,-32768,-32768,   136,    18,   -86,   -24,-32768,
-    22,-32768,   151,   153,   974,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,   193,  1126,-32768,-32768,-32768,-32768,
-   158,-32768,   159,   660,    -5,-32768,     5,-32768,   172,   660,
-   165,  1088,  1088,  1088,  1088,  1088,  1088,  1088,  1088,   174,
-   175,   179,  1088,   660,   660,   180,-32768,   -20,-32768,  1126,
-  1126,  1126,  1126,  1126,  1126,-32768,-32768,    -8,   -81,-32768,
-   -36,-32768,  1126,  1126,  1126,  1126,-32768,-32768,-32768,-32768,
--32768,  1012,   222,-32768,-32768,   233,   -18,   237,   239,   176,
-   660,   269,   660,  1088,-32768,   185,   660,-32768,   186,-32768,
--32768,   187,   189,-32768,-32768,   660,   660,   660,-32768,   191,
--32768,  1088,   252,   276,-32768,   136,   172,   248,   201,   202,
-   204,   205,  1126,-32768,-32768,-32768,   206,   207,   208,   209,
--32768,-32768,-32768,   232,   210,-32768,   660,   660,  1088,   211,
--32768,   211,-32768,   223,   660,   224,  1088,  1088,  1088,-32768,
--32768,-32768,  1088,   660,-32768,-32768,-32768,   192,  1088,  1126,
-  1126,  1126,  1126,-32768,  1126,  1126,  1126,  1126,   293,-32768,
-   275,   225,   199,   223,   214,   280,-32768,-32768,  1088,   220,
-   660,-32768,-32768,-32768,   229,-32768,-32768,   230,   227,   231,
-   238,   240,   236,   241,   243,   244,-32768,-32768,   323,    41,
-   309,-32768,-32768,   242,-32768,-32768,  1126,-32768,  1126,  1126,
--32768,-32768,-32768,-32768,   660,-32768,   757,    59,   325,-32768,
-   246,   247,   249,-32768,   251,-32768,   757,   660,-32768,-32768,
--32768,   336,   256,   295,   660,   346,   350,-32768,   660,   660,
--32768,-32768,   372,   376,-32768
+   136,   138,   139,   140,   141,   144,   895,  1088,   566,   219,
+   145,   147,   148,   149,-32768,-32768,   137,   -48,   -88,   -17,
+-32768,    22,-32768,   152,   150,   936,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,   192,  1088,-32768,-32768,-32768,
+-32768,   155,-32768,   158,   617,    -5,-32768,     5,-32768,   172,
+   617,   153,  1050,  1050,  1050,  1050,  1050,  1050,  1050,  1050,
+   173,   174,   176,  1050,   617,   617,   177,-32768,   -20,-32768,
+  1088,  1088,  1088,  1088,  1088,  1088,-32768,-32768,   -62,   -11,
+-32768,   -79,-32768,  1088,  1088,  1088,  1088,-32768,-32768,-32768,
+-32768,-32768,   974,   224,-32768,-32768,   236,    23,   251,   252,
+   180,   617,   271,   617,  1050,-32768,   179,   617,-32768,   184,
+-32768,-32768,   185,   186,-32768,-32768,   617,   617,   617,-32768,
+   191,-32768,  1050,   258,   280,-32768,   137,   172,   256,   200,
+   201,   202,   203,  1088,-32768,-32768,-32768,   204,   205,   206,
+   207,-32768,-32768,-32768,   242,   208,-32768,   617,   617,  1050,
+   210,-32768,   210,-32768,   216,   617,   222,  1050,  1050,  1050,
+-32768,-32768,-32768,  1050,   617,-32768,-32768,-32768,   220,  1050,
+  1088,  1088,  1088,  1088,-32768,  1088,  1088,  1088,  1088,   294,
+-32768,   275,   225,   226,   216,   221,   259,-32768,-32768,  1050,
+   227,   617,-32768,-32768,-32768,   223,-32768,-32768,   228,   232,
+   234,   238,   239,   237,   240,   243,   244,-32768,-32768,   324,
+    41,   310,-32768,-32768,   245,-32768,-32768,  1088,-32768,  1088,
+  1088,-32768,-32768,-32768,-32768,   617,-32768,   715,    58,   328,
+-32768,   246,   247,   250,-32768,   248,-32768,   715,   617,-32768,
+-32768,-32768,   338,   260,   297,   617,   350,   351,-32768,   617,
+   617,-32768,-32768,   376,   377,-32768
 };
 
 static const short yypgoto[] = {-32768,
--32768,   297,   298,   299,   301,  -112,  -110,  -426,-32768,   344,
-   359,  -103,-32768,  -202,    54,-32768,  -243,-32768,   -38,-32768,
-   -29,-32768,   -55,   287,-32768,   -94,   216,  -229,   348,-32768,
--32768,-32768,-32768,-32768,   355,-32768,-32768,-32768,-32768,    10,
--32768,    69,-32768,-32768,   379,-32768,-32768,-32768,-32768,   397,
--32768,-32768,  -399,   -56,   169,  -104,-32768,   389,-32768,-32768,
--32768,-32768,-32768,    70,     1,-32768,-32768,    43,-32768,-32768
+-32768,   296,   298,   299,   300,  -113,  -111,  -439,-32768,   345,
+   362,   -92,-32768,  -203,    52,-32768,  -244,-32768,   -39,-32768,
+   -30,-32768,   -56,   281,-32768,   -95,   215,  -230,   341,-32768,
+-32768,-32768,-32768,-32768,   353,-32768,-32768,-32768,-32768,     9,
+-32768,    62,-32768,-32768,   375,-32768,-32768,-32768,-32768,   397,
+-32768,-32768,  -388,   -57,   168,  -105,-32768,   387,-32768,-32768,
+-32768,-32768,-32768,    61,    -2,-32768,-32768,    39,-32768,-32768
 };
 
 
-#define	YYLAST		1314
+#define	YYLAST		1278
 
 
-static const short yytable[] = {    76,
-   202,   178,   203,   188,   288,    92,   191,    81,    31,   341,
-   205,    21,   327,   363,    76,    34,   102,   319,   321,   343,
-   181,   373,   192,   467,   329,    93,    94,   106,   208,   375,
-   182,   212,   213,   364,   193,   214,   215,   216,   217,   218,
-   219,   477,    21,    15,   223,    16,   337,   224,   342,   102,
-   194,   195,   196,   197,   198,   199,   200,   201,   342,    25,
-    26,    27,    28,    24,    44,   162,   373,   475,   194,   195,
-   196,   197,   198,   199,   200,   201,   376,   483,   187,    42,
-   -58,   187,    31,   104,   373,     5,     6,     7,     8,   106,
-    82,    45,   386,   227,   373,    38,    39,    40,    35,   228,
-   374,   206,   207,   187,   209,   210,   187,   187,   156,   157,
-   187,   187,   187,   187,   187,   187,   220,   221,   222,   187,
-   255,   306,   407,   257,   258,   259,   328,   225,   226,    43,
-   279,   106,   230,   231,    47,   279,   279,   194,   195,   196,
-   197,   198,   199,   200,   201,   -24,   -24,   279,    49,   466,
-   -23,   -23,   279,   261,   -22,   -22,   -21,   -21,   232,   233,
-    51,    89,    86,   279,   279,   279,   284,   476,    87,    88,
-   -59,    97,   155,    98,    99,    76,   159,   105,   160,   189,
-  -120,   179,   180,   183,   -31,   304,   -28,   427,   349,   428,
-   351,   352,   353,   -27,    76,   305,   187,   -26,   359,   -25,
-   235,   -32,   265,   266,   236,     3,   285,   287,   290,   259,
-   291,     4,   292,   293,   294,   367,   368,   369,   370,   371,
-   372,     5,     6,     7,     8,   295,   307,   279,   377,   378,
-   379,   380,   296,   279,   297,   298,   299,   303,   308,     9,
-   322,   310,   311,   312,   313,   314,   315,   279,   279,   323,
-   324,   325,   335,   332,   326,   363,   385,   387,   333,   388,
-   338,   339,   348,   187,   350,   187,   187,   187,   354,   355,
-   330,   347,   391,   187,   344,   405,   356,   357,   414,   406,
-   389,   358,   362,   409,   279,   419,   279,   395,   397,   398,
-   279,   399,   432,   433,   434,   403,   447,   437,   448,   279,
-   279,   279,   261,   410,   411,   450,   412,   413,   415,   416,
-   417,   418,   421,   426,   187,   439,   440,   441,   442,   451,
-   443,   444,   445,   446,   452,   429,   431,   449,   453,   457,
-   279,   279,   404,   342,   455,   456,   458,   202,   279,   203,
-   459,   461,   460,   465,   469,   478,   462,   279,   463,   464,
-   470,   479,   480,   482,   481,   202,   485,   203,   486,   187,
-   281,   282,   471,   487,   472,   473,   489,   187,   187,   187,
-   490,   494,   283,   187,   279,   495,    84,   289,    46,   438,
-   146,   147,   148,   -34,   149,    15,   383,    16,   300,   301,
-   302,   185,   254,    96,     4,   -34,   -34,    91,    22,   187,
-   382,    48,    37,   435,   -34,   -34,   -34,   -34,   279,   408,
-   -34,    17,     0,   394,     0,     0,     0,     0,    18,     0,
-     0,   279,    19,     0,     0,     0,     0,     0,   279,    52,
-    53,     0,   279,   279,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,    15,     0,    16,     0,
-   237,     0,   340,     0,     0,     0,     0,     0,   346,     0,
-     0,     0,   238,   239,     0,     0,     0,     0,     0,     0,
-     0,     0,   360,   361,     0,     0,     0,     0,     0,     0,
+static const short yytable[] = {    77,
+   203,   179,   204,   189,   289,    93,   192,    82,    32,   342,
+    21,   468,   328,   364,    77,    35,   103,   320,   322,   344,
+   182,   228,   206,   330,   374,    24,   107,   229,   209,   478,
+   183,   213,   214,   365,   377,   215,   216,   217,   218,   219,
+   220,   374,    21,    15,   224,    16,   338,   375,   343,   103,
+   195,   196,   197,   198,   199,   200,   201,   202,   343,   225,
+    32,   329,    43,    45,   193,   163,   107,   195,   196,   197,
+   198,   199,   200,   201,   202,    44,   194,    48,   188,   476,
+    50,   188,    52,   105,     5,     6,     7,     8,   -59,   484,
+    46,    83,   374,    39,    40,    41,    87,   107,    88,    36,
+   376,   207,   208,   188,   210,   211,   188,   188,    94,    95,
+   188,   188,   188,   188,   188,   188,   221,   222,   223,   188,
+   256,   307,   408,   258,   259,   260,   374,   157,   158,    89,
+   280,   226,   227,    90,   387,   280,   280,   195,   196,   197,
+   198,   199,   200,   201,   202,   231,   232,   280,   -24,   -24,
+   467,   -60,   280,   262,    25,    26,    27,    28,    29,   -23,
+   -23,   -22,   -22,   280,   280,   280,   285,   477,   -21,   -21,
+    98,   233,   234,    99,   100,    77,   106,   156,   160,   161,
+  -121,   180,   181,   184,   190,   305,   -28,   428,   350,   429,
+   352,   353,   354,   -27,    77,   306,   188,   -26,   360,   -25,
+   266,   -31,   236,   -32,   237,     3,   267,   286,   288,   260,
+   291,     4,   292,   293,   294,   368,   369,   370,   371,   372,
+   373,     5,     6,     7,     8,   295,   296,   280,   378,   379,
+   380,   381,   308,   280,   297,   298,   299,   300,   304,     9,
+   309,   311,   323,   312,   313,   314,   315,   280,   280,   316,
+   324,   336,   325,   326,   327,   333,   334,   364,   339,   386,
+   348,   340,   349,   188,   351,   188,   188,   188,   355,   356,
+   331,   388,   389,   188,   392,   345,   357,   358,   415,   359,
+   363,   406,   396,   407,   280,   390,   280,   398,   399,   400,
+   280,   410,   433,   434,   435,   420,   404,   448,   449,   280,
+   280,   280,   262,   411,   412,   413,   414,   416,   417,   418,
+   419,   422,   343,   427,   188,   440,   441,   442,   443,   430,
+   444,   445,   446,   447,   453,   432,   438,   452,   450,   456,
+   280,   280,   405,   451,   457,   458,   454,   203,   280,   204,
+   459,   460,   461,   462,   466,   470,   463,   280,   479,   464,
+   465,   483,   480,   481,   471,   203,   482,   204,   486,   188,
+   282,   283,   472,   487,   473,   474,   488,   188,   188,   188,
+   490,   491,   284,   188,   280,   495,   496,   290,    85,   439,
+   147,    47,   148,   149,   150,   384,   186,    97,   301,   302,
+   303,   -34,   255,    15,   383,    16,    92,    49,    22,   188,
+    38,   436,     4,   -34,   -34,   395,   409,     0,   280,     0,
+    53,    54,   -34,   -34,   -34,   -34,     0,     0,   -34,    17,
+     0,   280,     0,     0,     0,     0,    18,    15,   280,    16,
+    19,   238,   280,   280,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,   239,   240,     0,     0,     0,     0,     0,
+     0,     0,   341,     0,     0,     0,     0,     0,   347,     0,
      0,     0,     0,     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,   390,
-     0,   392,     0,     0,   240,   396,   241,   242,   138,   139,
-     0,   243,   244,   245,   400,   401,   402,     0,     0,     0,
-     0,   246,     0,     0,   247,     0,   248,     0,     0,   249,
+     0,     0,   361,   362,     0,     0,     0,   118,   119,   120,
+   121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
+   131,     0,     0,     0,     0,     0,   241,     0,   242,   243,
+   139,   140,     0,   244,   245,   246,     0,     0,     0,   391,
+     0,   393,     0,   247,     0,   397,   248,     0,   249,     0,
+     0,   250,     0,     0,   401,   402,   403,     0,    53,    54,
+     0,   101,    56,    57,    58,    59,    60,    61,    62,    63,
+    64,    65,    66,    67,    68,    15,     0,    16,     0,     0,
+     0,     0,     0,     0,     0,   423,   424,     0,     0,     0,
+     0,     0,     0,   431,     0,     0,     0,     0,    69,     0,
+    53,    54,   437,   101,   164,   165,   166,   167,   168,   169,
+   170,   171,   172,   173,   174,    67,    68,    15,     0,    16,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,   455,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,   422,   423,     0,     0,     0,
-     0,     0,     0,   430,     0,     0,     0,     0,     0,     0,
-    52,    53,   436,   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,   454,
-     0,     0,     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,     0,     0,   474,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,   484,     0,    68,     0,
-     0,     0,     0,   488,     0,     0,     0,   491,   492,     0,
-     0,     0,   267,   268,    52,    53,   269,     0,     0,    69,
-     0,     0,    70,     0,     0,    71,     0,    72,   101,     0,
-     0,    15,     0,    16,     0,   270,   271,   272,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,   273,   274,     0,
-     0,     0,     0,     0,     0,     0,     0,    69,     0,     0,
-    70,     0,     0,    71,     0,    72,   320,   275,     0,     0,
+    69,     0,     0,     0,     0,     0,     0,     0,     0,   268,
+   269,    53,    54,   270,     0,     0,     0,     0,    70,     0,
+     0,    71,     0,   475,    72,     0,    73,   102,    15,     0,
+    16,     0,   271,   272,   273,     0,   485,     0,     0,     0,
+     0,     0,     0,   489,   274,   275,     0,   492,   493,     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,   244,   245,   267,
-   268,     0,     0,   269,     0,     0,     0,     0,     0,   276,
+    70,     0,     0,    71,   276,     0,    72,     0,    73,   321,
+     0,     0,     0,     0,     0,     0,     0,     0,   118,   119,
+   120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
+   130,   131,     0,     0,     0,     0,     0,   241,     0,   242,
+   243,   139,   140,     0,   244,   245,   246,   268,   269,     0,
+     0,   270,     0,     0,     0,     0,     0,   277,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,   270,   271,   272,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,   273,   274,     0,     0,     0,     0,
+   271,   272,   273,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,   274,   275,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,   275,     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,   244,   245,     0,     0,     0,     0,
-     0,     0,     0,     0,    52,    53,   276,   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,     0,   260,     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,
-   334,     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,   316,    71,     0,    72,   381,     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,    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,     0,    68,     0,
+     0,     0,   276,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,   118,   119,   120,   121,
+   122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
+     0,     0,     0,     0,     0,   241,     0,   242,   243,   139,
+   140,     0,   244,   245,   246,     0,     0,     0,     0,     0,
+     0,     0,     0,    53,    54,   277,   101,    56,    57,    58,
+    59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
+    15,     0,    16,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,   185,     0,     0,     0,     0,
+     0,    53,    54,    69,   101,    56,    57,    58,    59,    60,
+    61,    62,    63,    64,    65,    66,    67,    68,    15,     0,
+    16,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,   261,     0,     0,     0,     0,     0,    53,
+    54,    69,   101,   164,   165,   166,   167,   168,   169,   170,
+   171,   172,   173,   174,    67,    68,    15,     0,    16,     0,
+     0,     0,     0,    70,     0,     0,    71,     0,     0,    72,
+     0,    73,     0,     0,     0,     0,     0,     0,     0,    69,
+    53,    54,     0,   101,    56,    57,    58,    59,    60,    61,
+    62,    63,    64,    65,    66,    67,    68,    15,     0,    16,
+     0,    70,     0,     0,    71,     0,     0,    72,     0,    73,
+     0,     0,   335,     0,     0,     0,     0,     0,    53,    54,
+    69,   101,    56,    57,    58,    59,    60,    61,    62,    63,
+    64,    65,    66,    67,    68,    15,     0,    16,     0,    70,
+     0,     0,    71,     0,   317,    72,     0,    73,     0,     0,
+   382,     0,     0,     0,     0,     0,    53,    54,    69,    55,
+    56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+    66,    67,    68,    15,     0,    16,     0,     0,     0,     0,
+    70,     0,     0,    71,     0,     0,    72,     0,    73,     0,
+     0,     0,     0,     0,    53,    54,    69,   101,    56,    57,
+    58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
+    68,    15,     0,    16,     0,     0,     0,     0,    70,     0,
+     0,    71,     0,     0,    72,     0,    73,     0,     0,     0,
+     0,     0,    53,    54,    69,   101,   164,   165,   166,   167,
+   168,   169,   170,   171,   172,   173,   174,    67,    68,    15,
+     0,    16,     0,     0,     0,     0,    70,     0,     0,    71,
+     0,     0,    72,     0,    73,     0,     0,     0,     0,     0,
+    53,    54,    69,   191,    56,    57,    58,    59,    60,    61,
+    62,    63,    64,    65,    66,    67,    68,    15,     0,    16,
+     0,     0,     0,     0,    70,     0,     0,    71,     0,     0,
+    72,     0,    73,     0,     0,     0,     0,     0,     0,     0,
+    69,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     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,   145
+     0,     0,    70,     0,     0,    71,     0,     0,    72,     0,
+    73,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+   108,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,   109,     0,     0,     0,     0,     0,     0,     0,     0,
+    70,   110,   111,    71,     0,     0,    72,     0,    73,     0,
+     0,   112,   113,   114,   115,   116,   117,   118,   119,   120,
+   121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
+   131,   132,   133,   134,     0,     0,   135,   136,   137,   138,
+   139,   140,   141,   142,   143,   144,   145,   146
 };
 
-static const short yycheck[] = {    29,
-   113,    96,   113,   108,   207,    44,   111,    29,    23,    15,
-   114,     2,   256,    34,    44,    30,    72,   247,   248,    15,
-   103,   103,     9,   450,   111,    32,    33,   114,   133,   111,
-   113,   136,   137,    54,    21,   140,   141,   142,   143,   144,
-   145,   468,    33,    22,   149,    24,   276,   151,    54,   105,
-    10,    11,    12,    13,    14,    15,    16,    17,    54,    61,
-    62,    63,    64,    58,    20,    95,   103,   467,    10,    11,
-    12,    13,    14,    15,    16,    17,   113,   477,   108,   102,
-   105,   111,    23,    74,   103,    41,    42,    43,    44,   114,
-   112,    47,   111,   103,   103,    49,    50,    51,   113,   109,
-   109,   131,   132,   133,   134,   135,   136,   137,    52,    53,
-   140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
-   177,   226,   366,   179,   180,   181,   109,    88,    89,    58,
-   187,   114,    27,    28,   102,   192,   193,    10,    11,    12,
-    13,    14,    15,    16,    17,     3,     4,   204,    24,   109,
-     3,     4,   209,   183,     3,     4,     3,     4,     3,     4,
-     4,   107,   102,   220,   221,   222,   205,   109,   102,   102,
-   105,     4,    24,     4,     4,   205,     4,   105,    24,    56,
-     0,   108,   108,   105,     7,   224,     4,   390,   293,   392,
-   295,   296,   297,     4,   224,   225,   226,     4,   303,     4,
-     4,     7,   103,   106,     7,    25,   103,   103,   107,   265,
-   103,    31,    36,   103,   103,   310,   311,   312,   313,   314,
-   315,    41,    42,    43,    44,   103,    24,   284,   323,   324,
-   325,   326,   103,   290,   103,   103,   103,   103,   103,    59,
-    24,   105,   105,   105,   105,   105,   105,   304,   305,   105,
-   105,   105,    60,   103,   105,    34,    24,    21,   106,    21,
-   103,   103,   292,   293,   294,   295,   296,   297,   298,   299,
-   261,   107,     4,   303,   103,    24,   103,   103,   373,     4,
-   105,   103,   103,    36,   341,    54,   343,   103,   103,   103,
-   347,   103,   397,   398,   399,   105,     4,   106,    24,   356,
-   357,   358,   332,   103,   103,   107,   103,   103,   103,   103,
-   103,   103,   103,   103,   344,   410,   411,   412,   413,   106,
-   415,   416,   417,   418,   429,   103,   103,   103,   109,   103,
-   387,   388,   362,    54,   106,   106,   106,   450,   395,   450,
-   103,   106,   103,    21,    36,    21,   106,   404,   106,   106,
-   109,   106,   106,   103,   106,   468,    21,   468,   103,   389,
-   192,   193,   457,    69,   459,   460,    21,   397,   398,   399,
-    21,     0,   204,   403,   431,     0,    33,   209,    20,   409,
-    84,    84,    84,    20,    84,    22,   333,    24,   220,   221,
-   222,   105,   177,    46,    31,    32,    33,    43,     2,   429,
-   332,    23,    14,   403,    41,    42,    43,    44,   465,   367,
-    47,    48,    -1,   344,    -1,    -1,    -1,    -1,    55,    -1,
-    -1,   478,    59,    -1,    -1,    -1,    -1,    -1,   485,     5,
-     6,    -1,   489,   490,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    22,    -1,    24,    -1,
-    26,    -1,   284,    -1,    -1,    -1,    -1,    -1,   290,    -1,
-    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,   304,   305,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -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,   341,
-    -1,   343,    -1,    -1,    90,   347,    92,    93,    94,    95,
-    -1,    97,    98,    99,   356,   357,   358,    -1,    -1,    -1,
-    -1,   107,    -1,    -1,   110,    -1,   112,    -1,    -1,   115,
+static const short yycheck[] = {    30,
+   114,    97,   114,   109,   208,    45,   112,    29,    23,    15,
+     2,   451,   257,    34,    45,    30,    73,   248,   249,    15,
+   104,   104,   115,   112,   104,    58,   115,   110,   134,   469,
+   114,   137,   138,    54,   114,   141,   142,   143,   144,   145,
+   146,   104,    34,    22,   150,    24,   277,   110,    54,   106,
+    10,    11,    12,    13,    14,    15,    16,    17,    54,   152,
+    23,   110,   103,    20,     9,    96,   115,    10,    11,    12,
+    13,    14,    15,    16,    17,    58,    21,   103,   109,   468,
+    24,   112,     4,    75,    41,    42,    43,    44,   106,   478,
+    47,   113,   104,    49,    50,    51,   103,   115,   103,   114,
+   112,   132,   133,   134,   135,   136,   137,   138,    32,    33,
+   141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
+   178,   227,   367,   180,   181,   182,   104,    52,    53,   103,
+   188,    89,    90,   108,   112,   193,   194,    10,    11,    12,
+    13,    14,    15,    16,    17,    27,    28,   205,     3,     4,
+   110,   106,   210,   184,    61,    62,    63,    64,    65,     3,
+     4,     3,     4,   221,   222,   223,   206,   110,     3,     4,
+     4,     3,     4,     4,     4,   206,   106,    24,     4,    24,
+     0,   109,   109,   106,    56,   225,     4,   391,   294,   393,
+   296,   297,   298,     4,   225,   226,   227,     4,   304,     4,
+   104,     7,     4,     7,     7,    25,   107,   104,   104,   266,
+   108,    31,   104,    36,   104,   311,   312,   313,   314,   315,
+   316,    41,    42,    43,    44,   104,   104,   285,   324,   325,
+   326,   327,    24,   291,   104,   104,   104,   104,   104,    59,
+   104,   106,    24,   106,   106,   106,   106,   305,   306,   106,
+   106,    60,   106,   106,   106,   104,   107,    34,   104,    24,
+   108,   104,   293,   294,   295,   296,   297,   298,   299,   300,
+   262,    21,    21,   304,     4,   104,   104,   104,   374,   104,
+   104,    24,   104,     4,   342,   106,   344,   104,   104,   104,
+   348,    36,   398,   399,   400,    54,   106,     4,    24,   357,
+   358,   359,   333,   104,   104,   104,   104,   104,   104,   104,
+   104,   104,    54,   104,   345,   411,   412,   413,   414,   104,
+   416,   417,   418,   419,   430,   104,   107,   107,   104,   107,
+   388,   389,   363,   108,   107,   104,   110,   451,   396,   451,
+   107,   104,   104,   107,    21,    36,   107,   405,    21,   107,
+   107,   104,   107,   107,   110,   469,   107,   469,    21,   390,
+   193,   194,   458,   104,   460,   461,    70,   398,   399,   400,
+    21,    21,   205,   404,   432,     0,     0,   210,    34,   410,
+    85,    20,    85,    85,    85,   334,   106,    47,   221,   222,
+   223,    20,   178,    22,   333,    24,    44,    23,     2,   430,
+    14,   404,    31,    32,    33,   345,   368,    -1,   466,    -1,
+     5,     6,    41,    42,    43,    44,    -1,    -1,    47,    48,
+    -1,   479,    -1,    -1,    -1,    -1,    55,    22,   486,    24,
+    59,    26,   490,   491,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,   285,    -1,    -1,    -1,    -1,    -1,   291,    -1,
     -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,   387,   388,    -1,    -1,    -1,
-    -1,    -1,    -1,   395,    -1,    -1,    -1,    -1,    -1,    -1,
-     5,     6,   404,     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,   431,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,
-    45,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+    -1,    -1,   305,   306,    -1,    -1,    -1,    72,    73,    74,
+    75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+    85,    -1,    -1,    -1,    -1,    -1,    91,    -1,    93,    94,
+    95,    96,    -1,    98,    99,   100,    -1,    -1,    -1,   342,
+    -1,   344,    -1,   108,    -1,   348,   111,    -1,   113,    -1,
+    -1,   116,    -1,    -1,   357,   358,   359,    -1,     5,     6,
+    -1,     8,     9,    10,    11,    12,    13,    14,    15,    16,
     17,    18,    19,    20,    21,    22,    -1,    24,    -1,    -1,
-    -1,    -1,    -1,   465,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,   478,    -1,    45,    -1,
-    -1,    -1,    -1,   485,    -1,    -1,    -1,   489,   490,    -1,
-    -1,    -1,     3,     4,     5,     6,     7,    -1,    -1,   104,
-    -1,    -1,   107,    -1,    -1,   110,    -1,   112,   113,    -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,    -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,    98,    99,     3,
-     4,    -1,    -1,     7,    -1,    -1,    -1,    -1,    -1,   110,
+    -1,    -1,    -1,    -1,    -1,   388,   389,    -1,    -1,    -1,
+    -1,    -1,    -1,   396,    -1,    -1,    -1,    -1,    45,    -1,
+     5,     6,   405,     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,   432,
     -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    26,    27,    28,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,
+    45,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,
+     4,     5,     6,     7,    -1,    -1,    -1,    -1,   105,    -1,
+    -1,   108,    -1,   466,   111,    -1,   113,   114,    22,    -1,
+    24,    -1,    26,    27,    28,    -1,   479,    -1,    -1,    -1,
+    -1,    -1,    -1,   486,    38,    39,    -1,   490,   491,    -1,
     -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    58,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    71,    72,    73,
+   105,    -1,    -1,   108,    58,    -1,   111,    -1,   113,   114,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    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,    98,    99,    -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,    37,    -1,    -1,    -1,    -1,    -1,
-     5,     6,    45,     8,     9,    10,    11,    12,    13,    14,
+    84,    85,    -1,    -1,    -1,    -1,    -1,    91,    -1,    93,
+    94,    95,    96,    -1,    98,    99,   100,     3,     4,    -1,
+    -1,     7,    -1,    -1,    -1,    -1,    -1,   111,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    26,    27,    28,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    58,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    72,    73,    74,    75,
+    76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+    -1,    -1,    -1,    -1,    -1,    91,    -1,    93,    94,    95,
+    96,    -1,    98,    99,   100,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,     5,     6,   111,     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,    -1,    -1,   105,    -1,    -1,   108,    -1,    -1,   111,
+    -1,   113,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    45,
+     5,     6,    -1,     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,
+    -1,   105,    -1,    -1,   108,    -1,    -1,   111,    -1,   113,
+    -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,   104,    -1,    -1,   107,    -1,    -1,   110,    -1,   112,
+    17,    18,    19,    20,    21,    22,    -1,    24,    -1,   105,
+    -1,    -1,   108,    -1,   110,   111,    -1,   113,    -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,   104,
-    -1,    -1,   107,    -1,   109,   110,    -1,   112,    37,    -1,
+    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,    -1,
+   105,    -1,    -1,   108,    -1,    -1,   111,    -1,   113,    -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,
+    21,    22,    -1,    24,    -1,    -1,    -1,    -1,   105,    -1,
+    -1,   108,    -1,    -1,   111,    -1,   113,    -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,    24,    -1,    -1,    -1,    -1,   105,    -1,    -1,   108,
+    -1,    -1,   111,    -1,   113,    -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,   105,    -1,    -1,   108,    -1,    -1,
+   111,    -1,   113,    -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,    -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
+    -1,    -1,   105,    -1,    -1,   108,    -1,    -1,   111,    -1,
+   113,    -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,
+   105,    56,    57,   108,    -1,    -1,   111,    -1,   113,    -1,
+    -1,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+    75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+    85,    86,    87,    88,    -1,    -1,    91,    92,    93,    94,
+    95,    96,    97,    98,    99,   100,   101,   102
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
 #line 3 "/usr/share/bison.simple"
@@ -2250,7 +2243,7 @@
   switch (yyn) {
 
 case 2:
-#line 1011 "/Users/sabre/cvs/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!");
@@ -2258,7 +2251,7 @@
 ;
     break;}
 case 4:
-#line 1019 "/Users/sabre/cvs/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!");
@@ -2266,87 +2259,91 @@
 ;
     break;}
 case 33:
-#line 1042 "/Users/sabre/cvs/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/cvs/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/cvs/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/cvs/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/cvs/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/cvs/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/cvs/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/cvs/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/cvs/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/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.UIntVal = CallingConv::Fast; ;
+#line 1057 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.UIntVal = CallingConv::CSRet; ;
     break;}
 case 43:
-#line 1058 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.UIntVal = CallingConv::Cold; ;
+#line 1058 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.UIntVal = CallingConv::Fast; ;
     break;}
 case 44:
-#line 1059 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1059 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.UIntVal = CallingConv::Cold; ;
+    break;}
+case 45:
+#line 1060 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
                    if ((unsigned)yyvsp[0].UInt64Val != yyvsp[0].UInt64Val)
                      ThrowException("Calling conv too large!");
                    yyval.UIntVal = yyvsp[0].UInt64Val;
                  ;
     break;}
-case 45:
-#line 1067 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 46:
+#line 1068 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.UIntVal = 0; ;
     break;}
-case 46:
-#line 1068 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 47:
+#line 1069 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   yyval.UIntVal = yyvsp[0].UInt64Val;
   if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal))
     ThrowException("Alignment must be a power of two!");
 ;
     break;}
-case 47:
-#line 1073 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 48:
+#line 1074 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.UIntVal = 0; ;
     break;}
-case 48:
-#line 1074 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 49:
+#line 1075 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   yyval.UIntVal = yyvsp[0].UInt64Val;
   if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal))
     ThrowException("Alignment must be a power of two!");
 ;
     break;}
-case 49:
-#line 1081 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 50:
+#line 1082 "/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] == '\\')
@@ -2354,73 +2351,73 @@
   yyval.StrVal = yyvsp[0].StrVal;
 ;
     break;}
-case 50:
-#line 1088 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.StrVal = 0; ;
-    break;}
 case 51:
-#line 1089 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.StrVal = yyvsp[0].StrVal; ;
+#line 1089 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.StrVal = 0; ;
     break;}
 case 52:
-#line 1094 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{;
+#line 1090 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{ yyval.StrVal = yyvsp[0].StrVal; ;
     break;}
 case 53:
-#line 1095 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1095 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {;
     break;}
 case 54:
-#line 1096 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1096 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+{;
+    break;}
+case 55:
+#line 1097 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CurGV->setSection(yyvsp[0].StrVal);
     free(yyvsp[0].StrVal);
   ;
     break;}
-case 55:
-#line 1100 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 56:
+#line 1101 "/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!");
     CurGV->setAlignment(yyvsp[0].UInt64Val);
   ;
     break;}
-case 57:
-#line 1113 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 58:
+#line 1114 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.TypeVal = new PATypeHolder(yyvsp[0].PrimType); ;
     break;}
-case 59:
-#line 1114 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 60:
+#line 1115 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.TypeVal = new PATypeHolder(yyvsp[0].PrimType); ;
     break;}
-case 60:
-#line 1116 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 61:
+#line 1117 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!UpRefs.empty())
       ThrowException("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
     yyval.TypeVal = yyvsp[0].TypeVal;
   ;
     break;}
-case 74:
-#line 1127 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 75:
+#line 1128 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.TypeVal = new PATypeHolder(OpaqueType::get());
   ;
     break;}
-case 75:
-#line 1130 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 76:
+#line 1131 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.TypeVal = new PATypeHolder(yyvsp[0].PrimType);
   ;
     break;}
-case 76:
-#line 1133 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 77:
+#line 1134 "/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/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 78:
+#line 1140 "/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
@@ -2429,8 +2426,8 @@
     UR_OUT("New Upreference!\n");
   ;
     break;}
-case 78:
-#line 1146 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 79:
+#line 1147 "/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(),
@@ -2444,15 +2441,15 @@
     delete yyvsp[-3].TypeVal;      // Delete the return type handle
   ;
     break;}
-case 79:
-#line 1158 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 80:
+#line 1159 "/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/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 81:
+#line 1163 "/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)
@@ -2465,8 +2462,8 @@
      delete yyvsp[-1].TypeVal;
   ;
     break;}
-case 81:
-#line 1173 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 82:
+#line 1174 "/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(),
@@ -2477,52 +2474,52 @@
     delete yyvsp[-1].TypeList;
   ;
     break;}
-case 82:
-#line 1182 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 83:
+#line 1183 "/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/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 84:
+#line 1186 "/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/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 85:
+#line 1194 "/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/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 86:
+#line 1198 "/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/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 88:
+#line 1204 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     (yyval.TypeList=yyvsp[-2].TypeList)->push_back(Type::VoidTy);
   ;
     break;}
-case 88:
-#line 1206 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 89:
+#line 1207 "/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/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 90:
+#line 1210 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.TypeList = new std::list<PATypeHolder>();
   ;
     break;}
-case 90:
-#line 1219 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 91:
+#line 1220 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { // Nonempty unsized arr
     const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-3].TypeVal->get());
     if (ATy == 0)
@@ -2549,8 +2546,8 @@
     delete yyvsp[-3].TypeVal; delete yyvsp[-1].ConstVector;
   ;
     break;}
-case 91:
-#line 1244 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 92:
+#line 1245 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-2].TypeVal->get());
     if (ATy == 0)
@@ -2565,8 +2562,8 @@
     delete yyvsp[-2].TypeVal;
   ;
     break;}
-case 92:
-#line 1257 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 93:
+#line 1258 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-2].TypeVal->get());
     if (ATy == 0)
@@ -2597,8 +2594,8 @@
     delete yyvsp[-2].TypeVal;
   ;
     break;}
-case 93:
-#line 1286 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 94:
+#line 1287 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { // Nonempty unsized arr
     const PackedType *PTy = dyn_cast<PackedType>(yyvsp[-3].TypeVal->get());
     if (PTy == 0)
@@ -2625,8 +2622,8 @@
     delete yyvsp[-3].TypeVal; delete yyvsp[-1].ConstVector;
   ;
     break;}
-case 94:
-#line 1311 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 95:
+#line 1312 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const StructType *STy = dyn_cast<StructType>(yyvsp[-3].TypeVal->get());
     if (STy == 0)
@@ -2648,8 +2645,8 @@
     delete yyvsp[-3].TypeVal; delete yyvsp[-1].ConstVector;
   ;
     break;}
-case 95:
-#line 1331 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 96:
+#line 1332 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const StructType *STy = dyn_cast<StructType>(yyvsp[-2].TypeVal->get());
     if (STy == 0)
@@ -2663,8 +2660,8 @@
     delete yyvsp[-2].TypeVal;
   ;
     break;}
-case 96:
-#line 1343 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 97:
+#line 1344 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const PointerType *PTy = dyn_cast<PointerType>(yyvsp[-1].TypeVal->get());
     if (PTy == 0)
@@ -2675,15 +2672,15 @@
     delete yyvsp[-1].TypeVal;
   ;
     break;}
-case 97:
-#line 1352 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 98:
+#line 1353 "/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/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 99:
+#line 1357 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const PointerType *Ty = dyn_cast<PointerType>(yyvsp[-1].TypeVal->get());
     if (Ty == 0)
@@ -2744,8 +2741,8 @@
     delete yyvsp[-1].TypeVal;            // Free the type handle
   ;
     break;}
-case 99:
-#line 1415 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 100:
+#line 1416 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[-1].TypeVal->get() != yyvsp[0].ConstVal->getType())
       ThrowException("Mismatched types for constant expression!");
@@ -2753,8 +2750,8 @@
     delete yyvsp[-1].TypeVal;
   ;
     break;}
-case 100:
-#line 1421 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 101:
+#line 1422 "/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))
@@ -2763,44 +2760,44 @@
     delete yyvsp[-1].TypeVal;
   ;
     break;}
-case 101:
-#line 1429 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 102:
+#line 1430 "/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!");
     yyval.ConstVal = ConstantSInt::get(yyvsp[-1].PrimType, yyvsp[0].SInt64Val);
   ;
     break;}
-case 102:
-#line 1434 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 103:
+#line 1435 "/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!");
     yyval.ConstVal = ConstantUInt::get(yyvsp[-1].PrimType, yyvsp[0].UInt64Val);
   ;
     break;}
-case 103:
-#line 1439 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 104:
+#line 1440 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {                      // Boolean constants
     yyval.ConstVal = ConstantBool::True;
   ;
     break;}
-case 104:
-#line 1442 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 105:
+#line 1443 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {                     // Boolean constants
     yyval.ConstVal = ConstantBool::False;
   ;
     break;}
-case 105:
-#line 1445 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 106:
+#line 1446 "/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!!");
     yyval.ConstVal = ConstantFP::get(yyvsp[-1].PrimType, yyvsp[0].FPVal);
   ;
     break;}
-case 106:
-#line 1452 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 107:
+#line 1453 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!yyvsp[-3].ConstVal->getType()->isFirstClassType())
       ThrowException("cast constant expression from a non-primitive type: '" +
@@ -2812,8 +2809,8 @@
     delete yyvsp[-1].TypeVal;
   ;
     break;}
-case 107:
-#line 1462 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 108:
+#line 1463 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!isa<PointerType>(yyvsp[-2].ConstVal->getType()))
       ThrowException("GetElementPtr requires a pointer operand!");
@@ -2846,8 +2843,8 @@
     yyval.ConstVal = ConstantExpr::getGetElementPtr(yyvsp[-2].ConstVal, IdxVec);
   ;
     break;}
-case 108:
-#line 1493 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 109:
+#line 1494 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[-5].ConstVal->getType() != Type::BoolTy)
       ThrowException("Select condition must be of boolean type!");
@@ -2856,8 +2853,8 @@
     yyval.ConstVal = ConstantExpr::getSelect(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
   ;
     break;}
-case 109:
-#line 1500 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 110:
+#line 1501 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
       ThrowException("Binary operator types must match!");
@@ -2880,8 +2877,8 @@
     }
   ;
     break;}
-case 110:
-#line 1521 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 111:
+#line 1522 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
       ThrowException("Logical operator types must match!");
@@ -2893,16 +2890,16 @@
     yyval.ConstVal = ConstantExpr::get(yyvsp[-5].BinaryOpVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
   ;
     break;}
-case 111:
-#line 1531 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 112:
+#line 1532 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
       ThrowException("setcc operand types must match!");
     yyval.ConstVal = ConstantExpr::get(yyvsp[-5].BinaryOpVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
   ;
     break;}
-case 112:
-#line 1536 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 113:
+#line 1537 "/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!");
@@ -2911,85 +2908,85 @@
     yyval.ConstVal = ConstantExpr::get(yyvsp[-5].OtherOpVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
   ;
     break;}
-case 113:
-#line 1543 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 114:
+#line 1544 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!ExtractElementInst::isValidOperands(yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
       ThrowException("Invalid extractelement operands!");
     yyval.ConstVal = ConstantExpr::getExtractElement(yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
   ;
     break;}
-case 114:
-#line 1548 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 115:
+#line 1549 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!InsertElementInst::isValidOperands(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
       ThrowException("Invalid insertelement operands!");
     yyval.ConstVal = ConstantExpr::getInsertElement(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
   ;
     break;}
-case 115:
-#line 1553 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 116:
+#line 1554 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!ShuffleVectorInst::isValidOperands(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
       ThrowException("Invalid shufflevector operands!");
     yyval.ConstVal = ConstantExpr::getShuffleVector(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
   ;
     break;}
-case 116:
-#line 1561 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 117:
+#line 1562 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     (yyval.ConstVector = yyvsp[-2].ConstVector)->push_back(yyvsp[0].ConstVal);
   ;
     break;}
-case 117:
-#line 1564 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 118:
+#line 1565 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ConstVector = new std::vector<Constant*>();
     yyval.ConstVector->push_back(yyvsp[0].ConstVal);
   ;
     break;}
-case 118:
-#line 1571 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 119:
+#line 1572 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.BoolVal = false; ;
     break;}
-case 119:
-#line 1571 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 120:
+#line 1572 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.BoolVal = true; ;
     break;}
-case 120:
-#line 1581 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 121:
+#line 1582 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   yyval.ModuleVal = ParserResult = yyvsp[0].ModuleVal;
   CurModule.ModuleDone();
 ;
     break;}
-case 121:
-#line 1588 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 122:
+#line 1589 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ModuleVal = yyvsp[-1].ModuleVal;
     CurFun.FunctionDone();
   ;
     break;}
-case 122:
-#line 1592 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 123:
+#line 1593 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ModuleVal = yyvsp[-1].ModuleVal;
   ;
     break;}
-case 123:
-#line 1595 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 124:
+#line 1596 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ModuleVal = yyvsp[-3].ModuleVal;
   ;
     break;}
-case 124:
-#line 1598 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 125:
+#line 1599 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ModuleVal = yyvsp[-1].ModuleVal;
   ;
     break;}
-case 125:
-#line 1601 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 126:
+#line 1602 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ModuleVal = CurModule.CurrentModule;
     // Emit an error if there are any unresolved types left.
@@ -3002,8 +2999,8 @@
     }
   ;
     break;}
-case 126:
-#line 1614 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 127:
+#line 1615 "/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:
@@ -3025,60 +3022,60 @@
     delete yyvsp[0].TypeVal;
   ;
     break;}
-case 127:
-#line 1634 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 128:
+#line 1635 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {       // Function prototypes can be in const pool
   ;
     break;}
-case 128:
-#line 1636 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 129:
+#line 1637 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {  // Asm blocks can be in the const pool
   ;
     break;}
-case 129:
-#line 1638 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 130:
+#line 1639 "/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 130:
-#line 1641 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 131:
+#line 1642 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CurGV = 0;
   ;
     break;}
-case 131:
-#line 1644 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 132:
+#line 1645 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CurGV = ParseGlobalVariable(yyvsp[-3].StrVal, GlobalValue::ExternalLinkage,
                                              yyvsp[-1].BoolVal, *yyvsp[0].TypeVal, 0);
     delete yyvsp[0].TypeVal;
                                                    ;
     break;}
-case 132:
-#line 1648 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 133:
+#line 1649 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CurGV = 0;
   ;
     break;}
-case 133:
-#line 1651 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 134:
+#line 1652 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { 
   ;
     break;}
-case 134:
-#line 1653 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 135:
+#line 1654 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   ;
     break;}
-case 135:
-#line 1655 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 136:
+#line 1656 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { 
   ;
     break;}
-case 136:
-#line 1659 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 137:
+#line 1660 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   char *EndStr = UnEscapeLexed(yyvsp[0].StrVal, true);
@@ -3091,22 +3088,22 @@
     CurModule.CurrentModule->setModuleInlineAsm(AsmSoFar+"\n"+NewAsm);
 ;
     break;}
-case 137:
-#line 1671 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 138:
+#line 1672 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.Endianness = Module::BigEndian; ;
     break;}
-case 138:
-#line 1672 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 139:
+#line 1673 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.Endianness = Module::LittleEndian; ;
     break;}
-case 139:
-#line 1674 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 140:
+#line 1675 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CurModule.CurrentModule->setEndianness(yyvsp[0].Endianness);
   ;
     break;}
-case 140:
-#line 1677 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 141:
+#line 1678 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[0].UInt64Val == 32)
       CurModule.CurrentModule->setPointerSize(Module::Pointer32);
@@ -3116,89 +3113,89 @@
       ThrowException("Invalid pointer size: '" + utostr(yyvsp[0].UInt64Val) + "'!");
   ;
     break;}
-case 141:
-#line 1685 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 142:
+#line 1686 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CurModule.CurrentModule->setTargetTriple(yyvsp[0].StrVal);
     free(yyvsp[0].StrVal);
   ;
     break;}
-case 143:
-#line 1692 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 144:
+#line 1693 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
           CurModule.CurrentModule->addLibrary(yyvsp[0].StrVal);
           free(yyvsp[0].StrVal);
         ;
     break;}
-case 144:
-#line 1696 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 145:
+#line 1697 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
           CurModule.CurrentModule->addLibrary(yyvsp[0].StrVal);
           free(yyvsp[0].StrVal);
         ;
     break;}
-case 145:
-#line 1700 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 146:
+#line 1701 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
         ;
     break;}
-case 149:
-#line 1709 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 150:
+#line 1710 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.StrVal = 0; ;
     break;}
-case 150:
-#line 1711 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 151:
+#line 1712 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   if (*yyvsp[-1].TypeVal == Type::VoidTy)
     ThrowException("void typed arguments are invalid!");
   yyval.ArgVal = new std::pair<PATypeHolder*, char*>(yyvsp[-1].TypeVal, yyvsp[0].StrVal);
 ;
     break;}
-case 151:
-#line 1717 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 152:
+#line 1718 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ArgList = yyvsp[-2].ArgList;
     yyvsp[-2].ArgList->push_back(*yyvsp[0].ArgVal);
     delete yyvsp[0].ArgVal;
   ;
     break;}
-case 152:
-#line 1722 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 153:
+#line 1723 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ArgList = new std::vector<std::pair<PATypeHolder*,char*> >();
     yyval.ArgList->push_back(*yyvsp[0].ArgVal);
     delete yyvsp[0].ArgVal;
   ;
     break;}
-case 153:
-#line 1728 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 154:
+#line 1729 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ArgList = yyvsp[0].ArgList;
   ;
     break;}
-case 154:
-#line 1731 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 155:
+#line 1732 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ArgList = yyvsp[-2].ArgList;
     yyval.ArgList->push_back(std::pair<PATypeHolder*,
                             char*>(new PATypeHolder(Type::VoidTy), 0));
   ;
     break;}
-case 155:
-#line 1736 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 156:
+#line 1737 "/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 156:
-#line 1740 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 157:
+#line 1741 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ArgList = 0;
   ;
     break;}
-case 157:
-#line 1745 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 158:
+#line 1746 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   UnEscapeLexed(yyvsp[-5].StrVal);
   std::string FunctionName(yyvsp[-5].StrVal);
@@ -3284,8 +3281,8 @@
   }
 ;
     break;}
-case 160:
-#line 1832 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 161:
+#line 1833 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   yyval.FunctionVal = CurFun.CurrentFunction;
 
@@ -3294,85 +3291,85 @@
   yyval.FunctionVal->setLinkage(yyvsp[-2].Linkage);
 ;
     break;}
-case 163:
-#line 1842 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 164:
+#line 1843 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   yyval.FunctionVal = yyvsp[-1].FunctionVal;
 ;
     break;}
-case 164:
-#line 1846 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 165:
+#line 1847 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { CurFun.isDeclare = true; ;
     break;}
-case 165:
-#line 1846 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 166:
+#line 1847 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   yyval.FunctionVal = CurFun.CurrentFunction;
   CurFun.FunctionDone();
 ;
     break;}
-case 166:
-#line 1855 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 167:
+#line 1856 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BoolVal = false;
   ;
     break;}
-case 167:
-#line 1858 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 168:
+#line 1859 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BoolVal = true;
   ;
     break;}
-case 168:
-#line 1862 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 169:
+#line 1863 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {    // A reference to a direct constant
     yyval.ValIDVal = ValID::create(yyvsp[0].SInt64Val);
   ;
     break;}
-case 169:
-#line 1865 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 170:
+#line 1866 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValIDVal = ValID::create(yyvsp[0].UInt64Val);
   ;
     break;}
-case 170:
-#line 1868 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 171:
+#line 1869 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {                     // Perhaps it's an FP constant?
     yyval.ValIDVal = ValID::create(yyvsp[0].FPVal);
   ;
     break;}
-case 171:
-#line 1871 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 172:
+#line 1872 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValIDVal = ValID::create(ConstantBool::True);
   ;
     break;}
-case 172:
-#line 1874 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 173:
+#line 1875 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValIDVal = ValID::create(ConstantBool::False);
   ;
     break;}
-case 173:
-#line 1877 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 174:
+#line 1878 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValIDVal = ValID::createNull();
   ;
     break;}
-case 174:
-#line 1880 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 175:
+#line 1881 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValIDVal = ValID::createUndef();
   ;
     break;}
-case 175:
-#line 1883 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 176:
+#line 1884 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {     // A vector zero constant.
     yyval.ValIDVal = ValID::createZeroInit();
   ;
     break;}
-case 176:
-#line 1886 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 177:
+#line 1887 "/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(); 
@@ -3398,14 +3395,14 @@
     delete PTy; delete yyvsp[-1].ConstVector;
   ;
     break;}
-case 177:
-#line 1910 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 178:
+#line 1911 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValIDVal = ValID::create(yyvsp[0].ConstVal);
   ;
     break;}
-case 178:
-#line 1913 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 179:
+#line 1914 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     char *End = UnEscapeLexed(yyvsp[-2].StrVal, true);
     std::string AsmStr = std::string(yyvsp[-2].StrVal, End);
@@ -3416,38 +3413,38 @@
     free(yyvsp[0].StrVal);
   ;
     break;}
-case 179:
-#line 1926 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 180:
+#line 1927 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {  // Is it an integer reference...?
     yyval.ValIDVal = ValID::create(yyvsp[0].SIntVal);
   ;
     break;}
-case 180:
-#line 1929 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 181:
+#line 1930 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {                   // Is it a named reference...?
     yyval.ValIDVal = ValID::create(yyvsp[0].StrVal);
   ;
     break;}
-case 183:
-#line 1940 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 184:
+#line 1941 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValueVal = getVal(*yyvsp[-1].TypeVal, yyvsp[0].ValIDVal); delete yyvsp[-1].TypeVal;
   ;
     break;}
-case 184:
-#line 1944 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 185:
+#line 1945 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.FunctionVal = yyvsp[-1].FunctionVal;
   ;
     break;}
-case 185:
-#line 1947 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 186:
+#line 1948 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { // Do not allow functions with 0 basic blocks   
     yyval.FunctionVal = yyvsp[-1].FunctionVal;
   ;
     break;}
-case 186:
-#line 1955 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 187:
+#line 1956 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     setValueName(yyvsp[0].TermInstVal, yyvsp[-1].StrVal);
     InsertValue(yyvsp[0].TermInstVal);
@@ -3457,15 +3454,15 @@
     yyval.BasicBlockVal = yyvsp[-2].BasicBlockVal;
   ;
     break;}
-case 187:
-#line 1964 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 188:
+#line 1965 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyvsp[-1].BasicBlockVal->getInstList().push_back(yyvsp[0].InstVal);
     yyval.BasicBlockVal = yyvsp[-1].BasicBlockVal;
   ;
     break;}
-case 188:
-#line 1968 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 189:
+#line 1969 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BasicBlockVal = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++), true);
 
@@ -3477,8 +3474,8 @@
     BBL.splice(BBL.end(), BBL, yyval.BasicBlockVal);
   ;
     break;}
-case 189:
-#line 1978 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 190:
+#line 1979 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BasicBlockVal = CurBB = getBBVal(ValID::create(yyvsp[0].StrVal), true);
 
@@ -3490,32 +3487,32 @@
     BBL.splice(BBL.end(), BBL, yyval.BasicBlockVal);
   ;
     break;}
-case 190:
-#line 1989 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 191:
+#line 1990 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {              // Return with a result...
     yyval.TermInstVal = new ReturnInst(yyvsp[0].ValueVal);
   ;
     break;}
-case 191:
-#line 1992 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 192:
+#line 1993 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {                                       // Return with no result...
     yyval.TermInstVal = new ReturnInst();
   ;
     break;}
-case 192:
-#line 1995 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 193:
+#line 1996 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {                         // Unconditional Branch...
     yyval.TermInstVal = new BranchInst(getBBVal(yyvsp[0].ValIDVal));
   ;
     break;}
-case 193:
-#line 1998 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 194:
+#line 1999 "/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 194:
-#line 2001 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 195:
+#line 2002 "/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;
@@ -3531,15 +3528,15 @@
     delete yyvsp[-1].JumpTable;
   ;
     break;}
-case 195:
-#line 2015 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 196:
+#line 2016 "/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 196:
-#line 2020 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 197:
+#line 2021 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const PointerType *PFTy;
     const FunctionType *Ty;
@@ -3593,20 +3590,20 @@
     delete yyvsp[-7].ValueList;
   ;
     break;}
-case 197:
-#line 2072 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 198:
+#line 2073 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.TermInstVal = new UnwindInst();
   ;
     break;}
-case 198:
-#line 2075 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 199:
+#line 2076 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.TermInstVal = new UnreachableInst();
   ;
     break;}
-case 199:
-#line 2081 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 200:
+#line 2082 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.JumpTable = yyvsp[-5].JumpTable;
     Constant *V = cast<Constant>(getValNonImprovising(yyvsp[-4].PrimType, yyvsp[-3].ValIDVal));
@@ -3616,8 +3613,8 @@
     yyval.JumpTable->push_back(std::make_pair(V, getBBVal(yyvsp[0].ValIDVal)));
   ;
     break;}
-case 200:
-#line 2089 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 201:
+#line 2090 "/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));
@@ -3628,8 +3625,8 @@
     yyval.JumpTable->push_back(std::make_pair(V, getBBVal(yyvsp[0].ValIDVal)));
   ;
     break;}
-case 201:
-#line 2099 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 202:
+#line 2100 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   // Is this definition named?? if so, assign the name...
   setValueName(yyvsp[0].InstVal, yyvsp[-1].StrVal);
@@ -3637,54 +3634,54 @@
   yyval.InstVal = yyvsp[0].InstVal;
 ;
     break;}
-case 202:
-#line 2106 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 203:
+#line 2107 "/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)));
     delete yyvsp[-5].TypeVal;
   ;
     break;}
-case 203:
-#line 2111 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 204:
+#line 2112 "/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),
                                  getBBVal(yyvsp[-1].ValIDVal)));
   ;
     break;}
-case 204:
-#line 2118 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 205:
+#line 2119 "/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 205:
-#line 2122 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 206:
+#line 2123 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValueList = yyvsp[-2].ValueList;
     yyvsp[-2].ValueList->push_back(yyvsp[0].ValueVal);
   ;
     break;}
-case 207:
-#line 2128 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 208:
+#line 2129 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.ValueList = 0; ;
     break;}
-case 208:
-#line 2130 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 209:
+#line 2131 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BoolVal = true;
   ;
     break;}
-case 209:
-#line 2133 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 210:
+#line 2134 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BoolVal = false;
   ;
     break;}
-case 210:
-#line 2139 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 211:
+#line 2140 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!(*yyvsp[-3].TypeVal)->isInteger() && !(*yyvsp[-3].TypeVal)->isFloatingPoint() && 
         !isa<PackedType>((*yyvsp[-3].TypeVal).get()))
@@ -3698,8 +3695,8 @@
     delete yyvsp[-3].TypeVal;
   ;
     break;}
-case 211:
-#line 2151 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 212:
+#line 2152 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!(*yyvsp[-3].TypeVal)->isIntegral()) {
       if (!isa<PackedType>(yyvsp[-3].TypeVal->get()) ||
@@ -3712,8 +3709,8 @@
     delete yyvsp[-3].TypeVal;
   ;
     break;}
-case 212:
-#line 2162 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 213:
+#line 2163 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if(isa<PackedType>((*yyvsp[-3].TypeVal).get())) {
       ThrowException(
@@ -3725,8 +3722,8 @@
     delete yyvsp[-3].TypeVal;
   ;
     break;}
-case 213:
-#line 2172 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 214:
+#line 2173 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     std::cerr << "WARNING: Use of eliminated 'not' instruction:"
               << " Replacing with 'xor'.\n";
@@ -3740,8 +3737,8 @@
       ThrowException("Could not create a xor instruction!");
   ;
     break;}
-case 214:
-#line 2184 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 215:
+#line 2185 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[0].ValueVal->getType() != Type::UByteTy)
       ThrowException("Shift amount must be ubyte!");
@@ -3750,8 +3747,8 @@
     yyval.InstVal = new ShiftInst(yyvsp[-3].OtherOpVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
   ;
     break;}
-case 215:
-#line 2191 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 216:
+#line 2192 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!yyvsp[0].TypeVal->get()->isFirstClassType())
       ThrowException("cast instruction to a non-primitive type: '" +
@@ -3760,8 +3757,8 @@
     delete yyvsp[0].TypeVal;
   ;
     break;}
-case 216:
-#line 2198 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 217:
+#line 2199 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[-4].ValueVal->getType() != Type::BoolTy)
       ThrowException("select condition must be boolean!");
@@ -3770,16 +3767,16 @@
     yyval.InstVal = new SelectInst(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
   ;
     break;}
-case 217:
-#line 2205 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 218:
+#line 2206 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     NewVarArgs = true;
     yyval.InstVal = new VAArgInst(yyvsp[-2].ValueVal, *yyvsp[0].TypeVal);
     delete yyvsp[0].TypeVal;
   ;
     break;}
-case 218:
-#line 2210 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 219:
+#line 2211 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     ObsoleteVarArgs = true;
     const Type* ArgTy = yyvsp[-2].ValueVal->getType();
@@ -3800,8 +3797,8 @@
     delete yyvsp[0].TypeVal;
   ;
     break;}
-case 219:
-#line 2229 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 220:
+#line 2230 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     ObsoleteVarArgs = true;
     const Type* ArgTy = yyvsp[-2].ValueVal->getType();
@@ -3825,32 +3822,32 @@
     delete yyvsp[0].TypeVal;
   ;
     break;}
-case 220:
-#line 2251 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 221:
+#line 2252 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!ExtractElementInst::isValidOperands(yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
       ThrowException("Invalid extractelement operands!");
     yyval.InstVal = new ExtractElementInst(yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
   ;
     break;}
-case 221:
-#line 2256 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 222:
+#line 2257 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!InsertElementInst::isValidOperands(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
       ThrowException("Invalid insertelement operands!");
     yyval.InstVal = new InsertElementInst(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
   ;
     break;}
-case 222:
-#line 2261 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 223:
+#line 2262 "/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 223:
-#line 2266 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 224:
+#line 2267 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const Type *Ty = yyvsp[0].PHIList->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -3866,8 +3863,8 @@
     delete yyvsp[0].PHIList;  // Free the list...
   ;
     break;}
-case 224:
-#line 2280 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 225:
+#line 2281 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const PointerType *PFTy;
     const FunctionType *Ty;
@@ -3926,66 +3923,66 @@
     delete yyvsp[-1].ValueList;
   ;
     break;}
-case 225:
-#line 2337 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 226:
+#line 2338 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.InstVal = yyvsp[0].InstVal;
   ;
     break;}
-case 226:
-#line 2343 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 227:
+#line 2344 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { 
     yyval.ValueList = yyvsp[0].ValueList; 
   ;
     break;}
-case 227:
-#line 2345 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 228:
+#line 2346 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 { 
     yyval.ValueList = new std::vector<Value*>(); 
   ;
     break;}
-case 228:
-#line 2349 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 229:
+#line 2350 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BoolVal = true;
   ;
     break;}
-case 229:
-#line 2352 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 230:
+#line 2353 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BoolVal = false;
   ;
     break;}
-case 230:
-#line 2358 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 231:
+#line 2359 "/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 231:
-#line 2362 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 232:
+#line 2363 "/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 232:
-#line 2366 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 233:
+#line 2367 "/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 233:
-#line 2370 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 234:
+#line 2371 "/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 234:
-#line 2374 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 235:
+#line 2375 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!isa<PointerType>(yyvsp[0].ValueVal->getType()))
       ThrowException("Trying to free nonpointer type " + 
@@ -3993,8 +3990,8 @@
     yyval.InstVal = new FreeInst(yyvsp[0].ValueVal);
   ;
     break;}
-case 235:
-#line 2381 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 236:
+#line 2382 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!isa<PointerType>(yyvsp[-1].TypeVal->get()))
       ThrowException("Can't load from nonpointer type: " +
@@ -4006,8 +4003,8 @@
     delete yyvsp[-1].TypeVal;
   ;
     break;}
-case 236:
-#line 2391 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 237:
+#line 2392 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const PointerType *PT = dyn_cast<PointerType>(yyvsp[-1].TypeVal->get());
     if (!PT)
@@ -4022,8 +4019,8 @@
     delete yyvsp[-1].TypeVal;
   ;
     break;}
-case 237:
-#line 2404 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 238:
+#line 2405 "/Volumes/Projects/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!isa<PointerType>(yyvsp[-2].TypeVal->get()))
       ThrowException("getelementptr insn requires pointer operand!");
@@ -4268,7 +4265,7 @@
     }
   return 1;
 }
-#line 2427 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2428 "/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.2 llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.3
--- llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.2	Fri Apr  7 20:18:56 2006
+++ llvm/lib/AsmParser/llvmAsmParser.h.cvs	Fri May 19 16:28:53 2006
@@ -97,45 +97,46 @@
 #define	SIDEEFFECT	314
 #define	CC_TOK	315
 #define	CCC_TOK	316
-#define	FASTCC_TOK	317
-#define	COLDCC_TOK	318
-#define	RET	319
-#define	BR	320
-#define	SWITCH	321
-#define	INVOKE	322
-#define	UNWIND	323
-#define	UNREACHABLE	324
-#define	ADD	325
-#define	SUB	326
-#define	MUL	327
-#define	DIV	328
-#define	REM	329
-#define	AND	330
-#define	OR	331
-#define	XOR	332
-#define	SETLE	333
-#define	SETGE	334
-#define	SETLT	335
-#define	SETGT	336
-#define	SETEQ	337
-#define	SETNE	338
-#define	MALLOC	339
-#define	ALLOCA	340
-#define	FREE	341
-#define	LOAD	342
-#define	STORE	343
-#define	GETELEMENTPTR	344
-#define	PHI_TOK	345
-#define	CAST	346
-#define	SELECT	347
-#define	SHL	348
-#define	SHR	349
-#define	VAARG	350
-#define	EXTRACTELEMENT	351
-#define	INSERTELEMENT	352
-#define	SHUFFLEVECTOR	353
-#define	VAARG_old	354
-#define	VANEXT_old	355
+#define	CSRETCC_TOK	317
+#define	FASTCC_TOK	318
+#define	COLDCC_TOK	319
+#define	RET	320
+#define	BR	321
+#define	SWITCH	322
+#define	INVOKE	323
+#define	UNWIND	324
+#define	UNREACHABLE	325
+#define	ADD	326
+#define	SUB	327
+#define	MUL	328
+#define	DIV	329
+#define	REM	330
+#define	AND	331
+#define	OR	332
+#define	XOR	333
+#define	SETLE	334
+#define	SETGE	335
+#define	SETLT	336
+#define	SETGT	337
+#define	SETEQ	338
+#define	SETNE	339
+#define	MALLOC	340
+#define	ALLOCA	341
+#define	FREE	342
+#define	LOAD	343
+#define	STORE	344
+#define	GETELEMENTPTR	345
+#define	PHI_TOK	346
+#define	CAST	347
+#define	SELECT	348
+#define	SHL	349
+#define	SHR	350
+#define	VAARG	351
+#define	EXTRACTELEMENT	352
+#define	INSERTELEMENT	353
+#define	SHUFFLEVECTOR	354
+#define	VAARG_old	355
+#define	VANEXT_old	356
 
 
 extern YYSTYPE llvmAsmlval;


Index: llvm/lib/AsmParser/llvmAsmParser.y.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.5 llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.6
--- llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.5	Fri Apr  7 23:09:02 2006
+++ llvm/lib/AsmParser/llvmAsmParser.y.cvs	Fri May 19 16:28:53 2006
@@ -981,7 +981,7 @@
 %token TO DOTDOTDOT NULL_TOK UNDEF CONST INTERNAL LINKONCE WEAK  APPENDING
 %token OPAQUE NOT EXTERNAL TARGET TRIPLE ENDIAN POINTERSIZE LITTLE BIG ALIGN
 %token DEPLIBS CALL TAIL ASM_TOK MODULE SIDEEFFECT
-%token CC_TOK CCC_TOK FASTCC_TOK COLDCC_TOK
+%token CC_TOK CCC_TOK CSRETCC_TOK FASTCC_TOK COLDCC_TOK
 %type <UIntVal> OptCallingConv
 
 // Basic Block Terminating Operators
@@ -1054,6 +1054,7 @@
 
 OptCallingConv : /*empty*/      { $$ = CallingConv::C; } |
                  CCC_TOK        { $$ = CallingConv::C; } |
+                 CSRETCC_TOK    { $$ = CallingConv::CSRet; } |
                  FASTCC_TOK     { $$ = CallingConv::Fast; } |
                  COLDCC_TOK     { $$ = CallingConv::Cold; } |
                  CC_TOK EUINT64VAL {






More information about the llvm-commits mailing list