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

Reid Spencer reid at x10sys.com
Fri Dec 29 12:30:57 PST 2006



Changes in directory llvm/lib/AsmParser:

Lexer.cpp.cvs updated: 1.19 -> 1.20
Lexer.l.cvs updated: 1.15 -> 1.16
llvmAsmParser.cpp.cvs updated: 1.38 -> 1.39
llvmAsmParser.h.cvs updated: 1.31 -> 1.32
llvmAsmParser.y.cvs updated: 1.39 -> 1.40
---
Log message:

Regenerate.


---
Diffs of the changes:  (+2393 -2369)

 Lexer.cpp.cvs         | 1420 +++++++++++++------------
 Lexer.l.cvs           |    1 
 llvmAsmParser.cpp.cvs | 2745 +++++++++++++++++++++++++-------------------------
 llvmAsmParser.h.cvs   |  442 ++++----
 llvmAsmParser.y.cvs   |  154 +-
 5 files changed, 2393 insertions(+), 2369 deletions(-)


Index: llvm/lib/AsmParser/Lexer.cpp.cvs
diff -u llvm/lib/AsmParser/Lexer.cpp.cvs:1.19 llvm/lib/AsmParser/Lexer.cpp.cvs:1.20
--- llvm/lib/AsmParser/Lexer.cpp.cvs:1.19	Sat Dec 23 00:05:40 2006
+++ llvm/lib/AsmParser/Lexer.cpp.cvs	Fri Dec 29 14:30:42 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.19 2006/12/23 06:05:40 reid Exp $
+ * $Header: /var/cvs/llvm/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.20 2006/12/29 20:30:42 reid Exp $
  */
 
 #define FLEX_SCANNER
@@ -317,37 +317,37 @@
 	*yy_cp = '\0'; \
 	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 141
-#define YY_END_OF_BUFFER 142
-static yyconst short int yy_acclist[219] =
+#define YY_NUM_RULES 142
+#define YY_END_OF_BUFFER 143
+static yyconst short int yy_acclist[220] =
     {   0,
-      142,  140,  141,  139,  140,  141,  139,  141,  140,  141,
-      140,  141,  140,  141,  140,  141,  140,  141,  140,  141,
-      132,  140,  141,  132,  140,  141,    1,  140,  141,  140,
-      141,  140,  141,  140,  141,  140,  141,  140,  141,  140,
-      141,  140,  141,  140,  141,  140,  141,  140,  141,  140,
-      141,  140,  141,  140,  141,  140,  141,  140,  141,  140,
-      141,  140,  141,  140,  141,  140,  141,  140,  141,  140,
-      141,  131,  129,  128,  128,  135,  133,  137,  132,    1,
-      114,   38,   74,   75,   70,   22,  131,  128,  128,  136,
-      137,   19,  137,  138,   60,   69,   36,   31,   39,    3,
-
-       51,   62,   84,   89,   87,   88,   86,   85,   90,   94,
-      113,   79,   77,  109,   78,   76,   61,   92,   83,   81,
-       82,   80,   93,   91,   71,  130,  137,  137,  111,   46,
-       95,   73,   65,  121,   68,   72,  122,   53,  110,   21,
-      134,   64,   98,   67,   23,    4,   58,   63,   52,   66,
-       45,   11,   97,  137,   33,    2,    5,   55,  100,   57,
-       47,   49,  123,   96,   48,   54,   20,  120,   42,   56,
-       27,   41,  104,  103,    7,  116,   30,  119,   35,   59,
-      108,  102,  115,   24,   25,  101,  117,   50,  112,  107,
-       40,    6,   26,   99,   34,    8,   16,    9,  105,   10,
+      143,  141,  142,  140,  141,  142,  140,  142,  141,  142,
+      141,  142,  141,  142,  141,  142,  141,  142,  141,  142,
+      133,  141,  142,  133,  141,  142,    1,  141,  142,  141,
+      142,  141,  142,  141,  142,  141,  142,  141,  142,  141,
+      142,  141,  142,  141,  142,  141,  142,  141,  142,  141,
+      142,  141,  142,  141,  142,  141,  142,  141,  142,  141,
+      142,  141,  142,  141,  142,  141,  142,  141,  142,  141,
+      142,  132,  130,  129,  129,  136,  134,  138,  133,    1,
+      115,   39,   75,   76,   71,   23,  132,  129,  129,  137,
+      138,   20,  138,  139,   61,   70,   37,   32,   40,    3,
+
+       52,   63,   85,   90,   88,   89,   87,   86,   91,   95,
+      114,   80,   78,  110,   79,   77,   62,   93,   84,   82,
+       83,   81,   94,   92,   72,  131,  138,  138,  112,   47,
+       96,   74,   66,  122,   69,   73,  123,   54,  111,   22,
+      135,   65,   99,   68,   24,    4,   59,   64,   53,   67,
+       46,   12,   98,  138,   34,    2,    5,   56,  101,   58,
+       48,   50,  124,   97,   49,   55,   21,  121,   43,    7,
+       57,   28,   42,  105,  104,    8,  117,   31,  120,   36,
+       60,  109,  103,  116,   25,   26,  102,  118,   51,  113,
+      108,   41,    6,   27,  100,   35,    9,   17,   10,  106,
 
-      106,   32,   12,   14,   13,   29,   37,   15,   28,  118,
-      124,  126,  127,   43,  125,   17,   44,   18
+       11,  107,   33,   13,   15,   14,   30,   38,   16,   29,
+      119,  125,  127,  128,   44,  126,   18,   45,   19
     } ;
 
-static yyconst short int yy_accept[570] =
+static yyconst short int yy_accept[574] =
     {   0,
         1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
        17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
@@ -366,51 +366,52 @@
        87,   87,   88,   89,   91,   92,   93,   94,   94,   95,
        96,   96,   96,   97,   97,   97,   98,   98,   99,   99,
        99,   99,  100,  100,  100,  100,  100,  100,  100,  100,
-      100,  101,  101,  101,  101,  101,  101,  101,  101,  101,
-      101,  101,  101,  101,  101,  101,  102,  102,  102,  102,
-      102,  102,  102,  102,  102,  102,  103,  103,  104,  105,
-      106,  107,  108,  109,  109,  110,  111,  111,  111,  112,
-
-      112,  112,  112,  112,  112,  112,  113,  114,  115,  115,
-      115,  115,  115,  116,  117,  117,  117,  118,  118,  118,
-      118,  118,  118,  118,  118,  118,  119,  120,  121,  121,
-      121,  122,  122,  123,  123,  124,  125,  125,  125,  125,
-      125,  125,  125,  125,  125,  125,  126,  126,  126,  127,
-      128,  128,  128,  128,  129,  129,  129,  129,  130,  130,
-      130,  131,  132,  132,  132,  132,  132,  132,  132,  132,
-      132,  132,  132,  132,  132,  132,  132,  133,  134,  134,
-      134,  134,  134,  135,  136,  136,  136,  137,  137,  137,
-      137,  137,  137,  137,  137,  137,  138,  139,  140,  140,
-
-      140,  141,  141,  141,  141,  142,  142,  143,  143,  143,
-      144,  144,  144,  144,  144,  145,  145,  145,  146,  146,
-      146,  147,  147,  148,  148,  149,  150,  150,  150,  150,
-      150,  150,  151,  151,  151,  152,  152,  153,  153,  153,
-      154,  155,  156,  156,  156,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  158,
-      158,  159,  160,  160,  160,  160,  160,  160,  160,  160,
-      160,  160,  160,  161,  161,  161,  161,  161,  161,  161,
-      161,  162,  162,  162,  163,  163,  163,  163,  164,  164,
-      164,  164,  165,  166,  166,  167,  168,  168,  168,  168,
-
-      168,  168,  168,  168,  168,  169,  169,  169,  170,  170,
-      170,  170,  170,  170,  170,  170,  171,  172,  172,  172,
-      173,  174,  175,  175,  175,  176,  176,  176,  176,  176,
-      177,  177,  178,  179,  180,  181,  181,  181,  181,  182,
-      182,  182,  183,  184,  185,  186,  187,  187,  188,  189,
-      190,  190,  190,  190,  190,  190,  191,  191,  192,  192,
-      193,  194,  194,  194,  194,  194,  194,  195,  195,  195,
-      195,  195,  195,  195,  195,  195,  196,  196,  196,  196,
-      196,  196,  196,  196,  196,  197,  197,  197,  197,  197,
-      198,  198,  198,  198,  198,  199,  200,  201,  201,  202,
-
-      202,  202,  202,  203,  203,  203,  203,  204,  204,  205,
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  207,  207,  207,  207,  207,  207,  207,
-      207,  208,  208,  208,  208,  208,  209,  209,  209,  209,
-      209,  210,  210,  211,  211,  211,  211,  211,  211,  211,
-      211,  211,  211,  211,  211,  211,  212,  212,  213,  214,
-      214,  215,  215,  216,  217,  218,  218,  219,  219
+      100,  100,  101,  101,  101,  101,  101,  101,  101,  101,
+      101,  101,  101,  101,  101,  101,  101,  102,  102,  102,
+      102,  102,  102,  102,  102,  102,  102,  103,  103,  104,
+      105,  106,  107,  108,  109,  109,  110,  111,  111,  111,
+
+      112,  112,  112,  112,  112,  112,  112,  113,  114,  115,
+      115,  115,  115,  115,  116,  117,  117,  117,  118,  118,
+      118,  118,  118,  118,  118,  118,  118,  119,  120,  121,
+      121,  121,  122,  122,  123,  123,  124,  125,  125,  125,
+      125,  125,  125,  125,  125,  125,  125,  126,  126,  126,
+      127,  128,  128,  128,  128,  129,  129,  129,  129,  130,
+      130,  130,  131,  132,  132,  132,  132,  132,  132,  132,
+      132,  132,  132,  132,  132,  132,  132,  132,  132,  133,
+      134,  134,  134,  134,  134,  135,  136,  136,  136,  137,
+      137,  137,  137,  137,  137,  137,  137,  137,  138,  139,
+
+      140,  140,  140,  141,  141,  141,  141,  142,  142,  143,
+      143,  143,  144,  144,  144,  144,  144,  145,  145,  145,
+      146,  146,  146,  147,  147,  148,  148,  149,  150,  150,
+      150,  150,  150,  150,  151,  151,  151,  152,  152,  153,
+      153,  153,  154,  155,  156,  156,  156,  157,  157,  157,
+      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
+      157,  157,  158,  158,  159,  160,  160,  160,  160,  160,
+      160,  160,  160,  160,  160,  160,  161,  161,  161,  161,
+      161,  161,  161,  161,  162,  162,  162,  163,  163,  163,
+      163,  164,  164,  164,  164,  165,  166,  166,  167,  168,
+
+      168,  168,  168,  168,  168,  168,  168,  168,  169,  169,
+      169,  170,  170,  170,  170,  170,  171,  171,  171,  171,
+      172,  173,  173,  173,  174,  175,  176,  176,  176,  177,
+      177,  177,  177,  177,  178,  178,  179,  180,  181,  182,
+      182,  182,  182,  183,  183,  183,  184,  185,  186,  187,
+      188,  188,  189,  190,  191,  191,  191,  191,  191,  191,
+      192,  192,  193,  193,  194,  195,  195,  195,  195,  195,
+      195,  196,  196,  196,  196,  196,  196,  196,  196,  196,
+      197,  197,  197,  197,  197,  197,  197,  197,  197,  198,
+      198,  198,  198,  198,  199,  199,  199,  199,  199,  200,
+
+      201,  202,  202,  203,  203,  203,  203,  204,  204,  204,
+      204,  205,  205,  206,  207,  207,  207,  207,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  208,  208,  208,
+      208,  208,  208,  208,  208,  209,  209,  209,  209,  209,
+      210,  210,  210,  210,  210,  211,  211,  212,  212,  212,
+      212,  212,  212,  212,  212,  212,  212,  212,  212,  212,
+      213,  213,  214,  215,  215,  216,  216,  217,  218,  219,
+      219,  220,  220
     } ;
 
 static yyconst int yy_ec[256] =
@@ -454,141 +455,141 @@
         3,    3,    3
     } ;
 
-static yyconst short int yy_base[574] =
+static yyconst short int yy_base[578] =
     {   0,
-        0,    0, 1226, 1227, 1227, 1227, 1221, 1210,   36,   40,
+        0,    0, 1234, 1235, 1235, 1235, 1229, 1218,   36,   40,
        44,   50,   56,   62,    0,   63,   66,   81,   89,   47,
       108,   91,   95,   92,   72,  109,  134,  119,  117,  160,
-      120,  191,  139,  121,  136,  150, 1219, 1227, 1208, 1227,
+      120,  191,  139,  121,  136,  150, 1227, 1235, 1216, 1235,
         0,  165,  180,  197,  219,   70,  224,  239,  244,    0,
-       68,  152,   93,  128,  158,  190,  245,   31, 1207,  188,
-      182,  211,   48,  207,  248,  210,  122,  124, 1206,  209,
-      257,  258,  185,  259,  260,  261,  262,  263,  264,  265,
-      266,  276,  273,  287,  286,  278,  294,  295, 1205,  297,
-      299,  300,  305,  306,  303,  313,  307,  311,  301,  316,
-
-       46,  317,  318,  325,  326,  329,  333,  327,  334,  330,
-      351,  342,  346, 1204,  358,  354,  337,  361,  360,  363,
-      362,  366,  369,  383,  364,  271,  381,  388,  231,  370,
-      397, 1203,    0,  402,  406, 1202,  429,  446,    0, 1201,
-      406,  412, 1200,  407,  410, 1199,  408, 1198,  413,  419,
-      422, 1197,  433,  414,  447,  448,  435,  449,  452,  451,
-      454,  459,  455,  458,  460,  180,  466,  462,  469,  475,
-      463,  470,  473,  478,  474,  485,  482,  486,  488,  496,
-      497,  498,  499,  501,  503, 1196,  506, 1195, 1194, 1193,
-     1192, 1191, 1190,  504, 1189, 1188,  511,  507, 1187,  535,
-
-      512,  514,  513,  517,  523, 1186, 1185, 1184,  529,  515,
-      547,  548, 1183, 1182,  549,  551, 1181,  552,  553,  558,
-      554,  561,  555,  557,  559, 1180, 1179, 1178,  560,  563,
-     1177,  562, 1176,  567, 1175, 1174,  577,  574,  582,  571,
-      585,  510,  588,  591,  592, 1173,  594,  595, 1227,  604,
-      623,  612,  627,  632,  597,  599,  633, 1172,  634,  635,
-     1171, 1170,  636,  615,  637,  639,  641,  642,  644,  645,
-      647,  648,  649,  652,  656,  659, 1169, 1168,  658,  663,
-      667,  664, 1167, 1166,  668,  669, 1165,  673,  672,  675,
-      676,  678,  680,  679,  684, 1164, 1163, 1162,  685,  687,
-
-     1161,  677,  690,  698,    0,  700, 1160,  704,  705, 1159,
-      706,  708,  710,  711, 1158,  714,  715, 1157,  724,  720,
-     1156,  725, 1155,  727, 1154, 1153,  728,  726,  730,  734,
-      731, 1152,  741,  742, 1151,  743, 1150,  745,  744, 1149,
-      753, 1148,  753,  746, 1147,  747,  761,  759,  765,  770,
-      756,  773,  771,  774,  776,  778,  780,  781, 1146,  782,
-     1145, 1144,  783,  786,  784,  791,  787,  792,  794,  798,
-      803,  804, 1143,  806,  805,  809,  810,  811,  812,  818,
-     1142,  807,  824, 1141,  826,  827,  829, 1140,  411,  828,
-      830, 1139, 1138,  833, 1137, 1136,  835,  832,  834,  838,
-
-      843,  845,  836,  844, 1135,  853,  846, 1134,  854,  855,
-      858,  863,  860,  865,  867, 1133, 1132,  870,  864, 1131,
-     1130, 1129,  873,  868, 1128,  879,  881,  889,  876, 1127,
-      891, 1126, 1125, 1124, 1123,  892,  878,  893, 1122,  896,
-      897, 1121, 1120, 1119, 1118, 1117,  900, 1116, 1115, 1114,
-      901,  902,  903,  904,  906, 1113,  908, 1112,  909, 1111,
-     1110,  914,  915,  918,  919,  920, 1109,  921,  922,  925,
-      926,  928,  933,  932,  937, 1108,  938,  943,  945,  946,
-      947,  951,  948,  953, 1107,  956,  959,  961,  957, 1106,
-      962,  968,  965,  967, 1105, 1104, 1103,  973, 1102,  969,
-
-      972,  975, 1101,  983,  987,  989, 1098,  974, 1088, 1086,
-      991,  994,  993,  995,  998,  999, 1001, 1004, 1005, 1006,
-     1007, 1010, 1085, 1009, 1013, 1012, 1017, 1021, 1024, 1018,
-     1084, 1025, 1032, 1035, 1036, 1083, 1037, 1019, 1026, 1038,
-     1082, 1043, 1077, 1044, 1045, 1049, 1048, 1053, 1054, 1056,
-     1057, 1060, 1063, 1058, 1066, 1076, 1064, 1073,  877, 1068,
-      760, 1071,  707,  604,  522, 1069,  368, 1227, 1104, 1106,
-      349, 1110,  151
+       68,  152,   93,  128,  158,  190,  245,   31, 1215,  188,
+      182,  211,   48,  207,  248,  210,  122,  124, 1214,  209,
+      257,  259,  185,  260,  261,  262,  263,  264,  265,  266,
+      269,  274,  273,  283,  277,  287,  293,  295, 1213,  297,
+      298,  299,  304,  305,  306,  307,  303,  317,  319,  309,
+
+       46,  320,  321,  324,  326,  323,  329,  333,  336,  325,
+      344,  346,  353, 1212,  354,  357,  355,  358,  360,  361,
+      362,  363,  382,  364,  365,  388,  389,  393,  231,  375,
+      394, 1211,    0,  413,  420, 1210,  434,  451,    0, 1209,
+      395,  369, 1208,  405,  399, 1207,  413, 1206,  428,  407,
+      424, 1205,  438,  436,  452,  454,  425,  442,  441,  453,
+      457,  460,  465,  467,  464,  469,  180,  470,  468,  472,
+      476,  471,  477,  478,  479,  482,  496,  481,  498,  500,
+      501,  502,  504,  506,  503,  484, 1204,  511, 1203, 1202,
+     1201, 1200, 1199, 1198,  509, 1197, 1196,  513,  512, 1195,
+
+      540,  517,  516,  521,  522,  528, 1194, 1193, 1192,  532,
+      523,  525,  552, 1191, 1190,  555,  554, 1189,  556,  557,
+      558,  559,  564,  565,  560,  561, 1188, 1187, 1186,  562,
+      566, 1185,  563, 1184,  567, 1183, 1182,  568,  582,  587,
+      588,  589,  590,  591,  593,  397, 1181,  592,  597, 1235,
+      615,  629,  603,  633,  638,  604,  608,  639, 1180,  640,
+      641, 1179, 1178,  609,  619,  643,  644,  645,  647,  648,
+      649,  651,  653,  655,  652,  658,  662,  665, 1177, 1176,
+      654,  669,  674,  670, 1175, 1174,  675,  678, 1173,  679,
+      680,  681,  682,  685,  689,  687,  691, 1172, 1171, 1170,
+
+      693,  695, 1169,  684,  686,  697,    0,  703, 1168,  707,
+      714, 1167,  713,  716,  718,  719, 1166,  722,  717, 1165,
+      723,  725, 1164,  728, 1163,  730, 1162, 1161,  733,  734,
+      737,  741,  738, 1160,  742,  744, 1159,  748, 1158,  750,
+      749, 1157,  755, 1156,  756,  758, 1155,  757,  767,  759,
+      768,  773,  769,  776,  777,  770,  780,  782,  781,  784,
+      786, 1154,  787, 1153, 1152,  792,  795,  796,  788,  800,
+      802,  803,  804,  806,  807, 1151,  810,  811,  812,  814,
+      822,  824,  817, 1150,  828,  809, 1149,  829,  835,  834,
+     1148,  605,  836,  838, 1147, 1146,  837, 1145, 1144,  841,
+
+      842,  839,  840,  852,  849,  843,  855, 1143,  857,  858,
+     1142,  860,  861,  863,  864, 1141,  867,  869,  874, 1140,
+     1139,  871,  878, 1138, 1137, 1136,  879,  880, 1135,  884,
+      885,  883,  882, 1134,  890, 1133, 1132, 1131, 1130,  895,
+      898,  900, 1129,  899,  902, 1128, 1127, 1126, 1125, 1124,
+      906, 1123, 1122, 1121,  904,  903,  913,  907,  909, 1120,
+      910, 1119,  911, 1118, 1117,  914,  922,  923,  924,  927,
+     1116,  928,  930,  931,  938,  934,  932,  940,  942, 1115,
+      944,  945,  951,  948,  950,  952,  958,  960, 1114,  961,
+      963,  964,  966, 1113,  967,  972,  968,  970, 1112, 1111,
+
+     1110,  977, 1109,  974,  988,  978, 1106,  992,  993,  994,
+     1097,  980, 1095, 1094,  996,  997, 1000, 1004, 1002,  976,
+     1008, 1010, 1011, 1012, 1013, 1014, 1093, 1016, 1020, 1021,
+     1022, 1025, 1029, 1024, 1091, 1032, 1027, 1031, 1035, 1090,
+     1039, 1037, 1043, 1044, 1089, 1049, 1088, 1051, 1052, 1055,
+     1053, 1054, 1058, 1057, 1062, 1064, 1065, 1063, 1073, 1085,
+     1069, 1084, 1082, 1074, 1079, 1078,  520,  427,  368, 1077,
+      328, 1235, 1112, 1114,  287, 1118,  151
     } ;
 
-static yyconst short int yy_def[574] =
+static yyconst short int yy_def[578] =
     {   0,
-      568,    1,  568,  568,  568,  568,  569,  570,  571,  568,
-      570,  570,  570,  570,  572,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  569,  568,  570,  568,
-      573,  573,  568,  568,  570,  570,  570,  570,  570,  572,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  568,  573,  573,  568,  570,  570,  570,   49,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,   49,
-
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  568,  568,
-      568,  568,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-
-      570,  570,  570,  570,  200,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      568,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  570,  570,  570,  570,  570,  570,    0,  568,  568,
-      568,  568,  568
+      572,    1,  572,  572,  572,  572,  573,  574,  575,  572,
+      574,  574,  574,  574,  576,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  573,  572,  574,  572,
+      577,  577,  572,  572,  574,  574,  574,  574,  574,  576,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  572,  577,  577,  572,  574,  574,  574,   49,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+
+       49,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  572,
+      572,  572,  572,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+
+      574,  574,  574,  574,  574,  574,  201,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  572,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
+      574,    0,  572,  572,  572,  572,  572
     } ;
 
-static yyconst short int yy_nxt[1271] =
+static yyconst short int yy_nxt[1279] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   14,   14,    4,   15,    8,    8,    8,   16,   17,
@@ -598,122 +599,122 @@
        44,   44,   44,   45,   45,   45,   45,   40,   46,   40,
        40,   40,  150,   40,   47,   48,   48,   48,   48,   40,
        47,   48,   48,   48,   48,   40,   40,   68,  136,   40,
-       69,   40,  155,   40,   51,   40,  200,   70,   56,  140,
+       69,   40,  155,   40,   51,   40,  201,   70,   56,  140,
        86,   52,   57,   53,   40,   54,   49,   58,   55,   60,
 
        59,   61,   40,   87,   40,   40,   40,   64,   40,   88,
        82,   65,   62,   77,  143,   79,   63,   66,   83,   78,
        67,   40,   40,   84,   80,   81,   71,   85,   72,   73,
        40,   89,   40,   40,   40,   40,   74,   40,  113,  100,
-       75,   40,   76,  128,   97,  161,   90,   40,  129,   40,
-       98,  114,   40,  133,  115,   99,   91,  126,   92,  160,
+       75,   40,   76,  128,   97,  162,   90,   40,  129,   40,
+       98,  114,   40,  133,  115,   99,   91,  126,   92,  161,
       144,  116,   93,   40,   94,   40,   95,  130,   96,  101,
       127,   40,  131,   40,  134,  134,  134,  134,  141,  102,
       142,  103,  104,  145,  105,  106,  107,  146,  108,   43,
        43,   43,   43,   40,  109,   40,  110,  111,   40,  112,
 
       101,   40,  152,   40,   40,  135,   44,   44,   44,   44,
-      117,  166,  118,  119,  147,  120,  151,  121,  278,  122,
+      117,  167,  118,  119,  147,  120,  151,  121,  280,  122,
        40,  123,   40,   40,   40,  124,  125,   47,   45,   45,
-       45,   45,   40,  137,  137,  137,  137,   40,  159,  153,
-      138,  154,  245,  156,   40,  162,  138,   47,   48,   48,
+       45,   45,   40,  137,  137,  137,  137,   40,  160,  153,
+      138,  154,  246,  156,   40,  163,  138,   47,   48,   48,
        48,   48,   40,  139,  139,  139,  139,   40,   40,  139,
       139,   40,  139,  139,  139,  139,  139,  139,  157,  148,
+       40,  158,   40,   40,   40,   40,   40,   40,   40,   40,
+      159,  149,   40,  169,  171,  164,   40,   40,  166,   41,
+       40,  168,  165,  179,  174,  173,   40,  170,  175,  172,
+
+       40,  182,  184,  180,  176,  177,   40,  178,   40,  181,
+       40,   40,   40,  183,  186,  185,   40,   40,   40,   40,
+       40,  190,   40,  187,  195,  188,  192,  194,  196,  197,
+       40,  189,   40,   40,   40,  191,   40,   40,   40,   40,
+      193,   40,   40,  198,  204,  200,   40,  203,  207,   40,
+      212,  209,  205,  199,  210,  214,  217,   40,  216,   40,
+      211,  202,  208,  218,  206,  213,   40,   40,   40,  215,
+       40,   40,  219,   40,   40,   40,   40,   40,   40,  220,
+      222,   40,   40,  228,  226,  232,  240,  221,   40,  224,
+      241,  223,  230,  227,  233,   40,  225,  229,  231,  234,
+
+      257,   40,   40,  235,  236,  242,   40,   40,   40,  247,
+       40,  245,   40,  237,  340,  243,  238,  244,   40,  256,
+       40,  239,  134,  134,  134,  134,   40,  258,  248,  251,
+      251,  251,  251,  259,  249,  262,  252,   40,   40,  260,
+       40,   40,  252,  137,  137,  137,  137,   40,  261,   40,
+      138,   40,  263,  268,   40,   40,  138,  253,  254,  264,
+      255,  255,  255,  255,   40,   40,   40,   40,  269,  270,
+       40,  265,  267,   40,  266,  271,  273,   40,   40,  272,
+       40,   40,   40,   40,   40,   40,  274,  275,  281,   40,
+       40,   40,   40,  287,   40,   40,  288,   40,  285,  276,
+
+      278,  279,  277,  283,  291,  286,  284,  290,  282,   40,
+      289,   40,  294,   40,   40,   40,   40,   40,  292,   40,
+      295,  302,   40,  298,   40,   40,   40,  296,  299,   40,
+       40,  301,  293,   40,   40,   40,   40,  297,   40,  303,
+      300,   40,  304,  305,  311,   40,  314,  315,  306,  307,
+      307,  307,  307,  308,  309,  307,  307,  310,  307,  307,
+      307,  307,  307,  307,  312,   40,  313,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-      158,  149,  168,  170,   40,  163,   40,  165,  241,   40,
-      167,   40,  164,  173,  172,  178,  169,  174,  171,   40,
+       40,   40,  321,  316,  317,  320,  323,  325,  318,  331,
+      332,  322,  319,  330,  324,   40,  326,  329,  328,  327,
 
-       40,  175,  176,  179,  177,  181,  184,   40,   40,  180,
-       40,  183,   40,   40,   40,  185,   40,  182,   40,   40,
-       40,  194,  189,  186,   40,  187,   40,  191,  193,   40,
-       40,   40,  188,  196,  195,  198,  190,  197,   40,   40,
-       40,  192,   40,   40,  202,  203,   40,   40,  206,  213,
-       40,   41,  199,  204,  211,   40,  215,  208,  201,   40,
-      209,  216,  207,  214,   40,  205,  210,   40,  218,  212,
-      217,   40,  219,   40,   40,   40,   40,   40,  224,   40,
-      220,   40,   40,   40,  221,  227,  223,  225,  231,  240,
-      234,  235,  229,  226,   40,  222,   40,  232,  230,  228,
-
-      236,   40,  233,  237,  246,  239,  244,  242,  238,  243,
-       40,  134,  134,  134,  134,  250,  250,  250,  250,   40,
-       40,   40,  251,   40,   40,   40,   40,   40,  251,  257,
-      255,  247,   40,  260,  259,   40,  443,  248,  137,  137,
-      137,  137,   40,  256,  258,  138,   40,  261,   40,  264,
-      262,  138,  252,  253,  263,  254,  254,  254,  254,   40,
-       40,   40,   40,  267,   40,   40,  266,   40,   40,  265,
-      271,   40,   40,   40,  269,   40,   40,  268,  270,   40,
-      272,  273,   40,   40,  279,  285,   40,   40,   40,  286,
-      275,   40,  277,  274,  276,   40,  289,  283,   40,   40,
-
-      281,   40,  280,  282,  284,  287,  288,  290,  293,   40,
-       40,   40,   40,  292,   40,  294,   40,   40,  296,   40,
-       40,  291,  297,   40,   40,   40,   40,   40,   40,  299,
-       40,  335,  295,  298,  301,   40,   40,  302,  312,  309,
-      300,  303,   40,  304,  305,  305,  305,  305,  306,  308,
-      305,  305,  307,  305,  305,  305,  305,  305,  305,  310,
-       40,   40,   40,  311,   40,   40,   40,   40,   40,  313,
-       40,   40,   40,   40,   40,   40,   40,  323,  315,  314,
-       40,  318,  319,  321,   40,  316,  320,   40,  317,  329,
-       40,  322,  328,  324,  327,   40,  326,  325,   40,  330,
-
-      331,   40,  333,  334,   40,   40,  336,   40,   40,  338,
-       40,  332,   40,  250,  250,  250,  250,   40,  337,  343,
-      251,  341,  341,  341,  341,  339,  251,  342,   40,  252,
-      252,  340,  341,  341,  341,  341,  254,  254,  254,  254,
-       40,  254,  254,  254,  254,   40,   40,   40,   40,   40,
-       40,  348,   40,  346,   40,   40,  347,   40,   40,  351,
-       40,   40,   40,  344,  345,   40,  356,  350,  352,   40,
-      358,   40,   40,  349,  354,  355,   40,   40,  359,  360,
-       40,   40,   40,  357,  353,   40,   40,  367,   40,   40,
-       40,   40,   40,   40,  361,  368,  366,   40,   40,  362,
-
-       40,  365,  363,   40,  364,  372,  369,  371,  373,  370,
-      374,   40,  375,   40,  378,  377,  376,   40,   40,   40,
-       40,   40,  381,   40,   40,  383,  379,   40,   40,  380,
-      382,  385,  386,   40,  387,  389,  388,   40,   40,   40,
-       40,   40,  384,   40,   40,  392,  390,   40,  391,  393,
-      395,  394,  397,  396,   40,   40,   40,   40,   40,   40,
-       40,  398,  341,  341,  341,  341,   40,  406,  402,   40,
-      404,  405,   40,   40,   40,  399,  400,  409,   40,  401,
-      403,  408,  407,   40,   40,  410,   40,   40,  411,   40,
-      412,   40,  413,   40,   40,   40,   40,   40,  416,   40,
-
-       40,  419,  420,  414,   40,   40,  415,   40,  417,  421,
-      418,   40,  422,  424,  423,  425,   40,   40,   40,   40,
-       40,  426,   40,   40,   40,   40,  430,  432,  428,  433,
-      427,   40,  434,  435,  436,  429,  431,   40,  438,   40,
-       40,   40,   40,   40,  437,   40,   40,   40,   40,   40,
-      441,   40,  445,  448,  440,  447,   40,   40,   40,   40,
-      439,  442,  450,  452,  444,  446,   40,   40,   40,  451,
-      449,   40,  453,   40,  454,  458,   40,   40,   40,  455,
-       40,   40,  456,   40,  457,  460,   40,  464,  465,   40,
-       40,   40,   40,  467,   40,  461,  462,  468,  463,  459,
-
-      466,  469,   40,  470,   40,   40,   40,  471,  475,   40,
-       40,  473,  472,   40,   40,   40,   40,   40,  477,   40,
-      478,   40,   40,  476,  482,  479,  474,   40,   40,  480,
-      483,   40,   40,   40,   40,   40,  484,  481,   40,   40,
-      486,   40,  491,  492,  485,   40,   40,  490,  487,  488,
-       40,   40,  493,  494,  495,  497,   40,  489,   40,   40,
-       40,   40,  496,  502,   40,  501,   40,  498,  503,   40,
-       40,  505,   40,  499,   40,   40,  500,  507,   40,  511,
-       40,   40,   40,  504,  506,   40,   40,   40,   40,  515,
-      512,  517,  518,  508,  519,  509,   40,  510,  513,  516,
-
-       40,  514,   40,  520,   40,  521,   40,   40,   40,  524,
-      523,   40,   40,  527,   40,  522,  525,   40,   40,   40,
-       40,  530,   40,   40,  533,   40,   40,  528,  535,  526,
-       40,   40,   40,  532,   40,  534,  536,   40,   40,   40,
-      531,  529,  537,  540,  538,   40,  541,  543,   40,   40,
-       40,   40,  549,  539,  542,  548,   40,   40,   40,  547,
-      544,   40,   40,  545,  546,  553,   40,   40,  550,   40,
-       40,   40,  552,   40,  551,  554,   40,   40,  555,   40,
-      560,   40,   40,  561,   40,  557,   40,  556,  565,   40,
-       40,  559,  558,  566,  564,   40,   40,   40,   40,   40,
-
-      562,   40,  563,  567,   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,  336,  333,  338,
+       40,  337,  343,  343,  343,  343,  334,   40,   40,  335,
+      339,   40,   40,  341,  251,  251,  251,  251,  345,  349,
+      447,  252,   40,  342,  344,  253,  253,  252,  343,  343,
+      343,  343,  255,  255,  255,  255,   40,  255,  255,  255,
+      255,   40,   40,   40,   40,  350,   40,   40,   40,  348,
+       40,   40,   40,  353,   40,   40,   40,   40,   40,  346,
+      347,   40,  352,  359,  355,   40,  361,  354,   40,  351,
+      357,  358,   40,   40,  362,  363,  360,   40,   40,  356,
+      364,   40,   40,   40,   40,   40,  370,   40,   40,   40,
+
+       40,  371,   40,  369,   40,  365,   40,  368,   40,  366,
+       40,  367,  375,  374,  372,  373,   40,  376,  377,  378,
+       40,  381,  382,  380,  379,  384,   40,   40,  383,   40,
+       40,   40,   40,  385,  386,   40,   40,  392,   40,  388,
+      389,   40,  390,   40,  391,  393,   40,   40,  395,  387,
+       40,   40,  396,  394,   40,   40,  397,   40,  398,  400,
+      399,   40,   40,   40,  343,  343,  343,  343,  401,   40,
+       40,   40,   40,  405,  408,  407,  402,  412,  403,  409,
+       40,   40,   40,   40,  404,  406,   40,  411,  413,   40,
+       40,  414,  410,   40,   40,   40,  417,   40,  416,   40,
+
+       40,   40,  418,  415,  420,   40,  423,  424,   40,   40,
+      428,  421,  419,   40,  422,   40,   40,   40,  425,   40,
+       40,  426,   40,   40,   40,   40,  427,   40,  429,  434,
+       40,  430,  437,  436,  432,   40,  438,   40,  433,  431,
+      435,   40,   40,  441,  439,  443,  440,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,  444,  445,  442,
+      449,  451,   40,  452,  454,   40,  446,  456,   40,  450,
+       40,   40,  448,   40,   40,  453,   40,   40,  455,  457,
+       40,  462,   40,  459,   40,  458,  464,   40,  468,  469,
+      461,   40,   40,   40,  460,   40,   40,   40,   40,  471,
+
+      466,  475,  465,   40,  463,  467,  473,  474,   40,  472,
+      477,   40,   40,   40,  470,   40,   40,   40,  476,   40,
+       40,  481,   40,   40,   40,  482,   40,   40,  479,  478,
+      480,  483,  484,  487,  486,   40,   40,   40,  485,  488,
+       40,   40,  490,   40,   40,   40,  489,   40,  491,  495,
+      496,   40,  494,   40,  501,   40,  492,   40,   40,  498,
+      497,   40,  493,   40,   40,   40,  499,  505,  500,  506,
+      507,   40,  509,   40,   40,  502,   40,   40,  503,   40,
+       40,   40,  504,   40,  511,   40,  508,   40,  515,   40,
+       40,   40,  519,   40,  510,  516,  521,  523,  512,  513,
+
+      514,   40,  517,  520,  518,   40,   40,   40,  522,   40,
+       40,  525,  524,   40,  528,   40,  527,   40,  533,  529,
+      526,   40,  531,   40,   40,   40,   40,   40,  534,   40,
+      537,  532,  539,   40,   40,   40,  530,   40,   40,  536,
+       40,  538,   40,  540,   40,   40,  535,  544,   40,  541,
+       40,  545,   40,  542,  547,  548,   40,   40,  543,  549,
+      546,  551,   40,  550,   40,   40,   40,   40,   40,  553,
+       40,   40,  557,  552,  554,   40,   40,   40,   40,  556,
+      555,  558,   40,  559,  564,  565,   40,   40,  560,  561,
+       40,   40,   40,  562,  569,   40,  563,   40,   40,  568,
+
+      570,   40,   40,   40,   40,  566,   40,   40,   40,  567,
+       40,  571,   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,
@@ -723,15 +724,16 @@
        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,  249,   40,   40,   40,
-       40,   40,  132,   40,   38,  568,    3,  568,  568,  568,
-      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
-      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
-      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
-      568,  568,  568,  568,  568,  568,  568,  568,  568,  568
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,  250,   40,   40,   40,   40,   40,
+      132,   40,   38,  572,    3,  572,  572,  572,  572,  572,
+      572,  572,  572,  572,  572,  572,  572,  572,  572,  572,
+      572,  572,  572,  572,  572,  572,  572,  572,  572,  572,
+      572,  572,  572,  572,  572,  572,  572,  572,  572,  572,
+      572,  572,  572,  572,  572,  572,  572,  572
     } ;
 
-static yyconst short int yy_chk[1271] =
+static yyconst short int yy_chk[1279] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -749,129 +751,130 @@
        19,   21,   26,   24,   23,   23,   21,   24,   21,   21,
        29,   26,   28,   31,   34,   67,   21,   68,   31,   29,
        21,   54,   21,   34,   28,   68,   26,   27,   35,   35,
-       28,   31,   33,  573,   31,   28,   27,   33,   27,   67,
+       28,   31,   33,  577,   31,   28,   27,   33,   27,   67,
        54,   31,   27,   36,   27,   52,   27,   35,   27,   30,
        33,   55,   36,   30,   42,   42,   42,   42,   52,   30,
        52,   30,   30,   55,   30,   30,   30,   55,   30,   43,
-       43,   43,   43,  166,   30,   61,   30,   30,   73,   30,
+       43,   43,   43,  167,   30,   61,   30,   30,   73,   30,
 
        32,   60,   61,   56,   32,   44,   44,   44,   44,   44,
-       32,   73,   32,   32,   56,   32,   60,   32,  166,   32,
+       32,   73,   32,   32,   56,   32,   60,   32,  167,   32,
        64,   32,   70,   66,   62,   32,   32,   45,   45,   45,
        45,   45,   45,   47,   47,   47,   47,   47,   66,   62,
        47,   62,  129,   64,  129,   70,   47,   48,   48,   48,
        48,   48,   48,   49,   49,   49,   49,   49,   57,   49,
        49,   65,   49,   49,   49,   49,   49,   49,   65,   57,
-       71,   72,   74,   75,   76,   77,   78,   79,   80,   81,
-       65,   57,   75,   76,  126,   71,   83,   72,  126,   82,
-       74,   86,   71,   79,   78,   82,   75,   80,   77,   85,
-
-       84,   81,   81,   83,   81,   84,   86,   87,   88,   83,
-       90,   85,   91,   92,   99,   87,   95,   84,   93,   94,
-       97,   95,   92,   88,   98,   90,   96,   93,   94,  100,
-      102,  103,   91,   97,   96,   99,   92,   98,  104,  105,
-      108,   93,  106,  110,  103,  104,  107,  109,  105,  108,
-      117,  571,  100,  104,  107,  112,  109,  106,  102,  113,
-      106,  110,  105,  108,  111,  104,  106,  116,  112,  107,
-      111,  115,  113,  119,  118,  121,  120,  125,  117,  122,
-      113,  567,  123,  130,  115,  120,  116,  118,  122,  125,
-      123,  123,  121,  119,  127,  115,  124,  122,  121,  120,
-
-      123,  128,  122,  123,  130,  124,  128,  127,  123,  127,
-      131,  134,  134,  134,  134,  135,  135,  135,  135,  141,
-      144,  147,  135,  145,  389,  142,  149,  154,  135,  144,
-      141,  131,  150,  149,  147,  151,  389,  131,  137,  137,
-      137,  137,  137,  142,  145,  137,  153,  150,  157,  154,
-      151,  137,  138,  138,  153,  138,  138,  138,  138,  138,
-      155,  156,  158,  157,  160,  159,  156,  161,  163,  155,
-      160,  164,  162,  165,  159,  168,  171,  158,  159,  167,
-      161,  162,  169,  172,  167,  171,  173,  175,  170,  172,
-      163,  174,  165,  162,  164,  177,  175,  170,  176,  178,
-
-      169,  179,  168,  169,  170,  173,  174,  176,  178,  180,
-      181,  182,  183,  177,  184,  179,  185,  194,  181,  187,
-      198,  176,  182,  242,  197,  201,  203,  202,  210,  184,
-      204,  242,  180,  183,  187,  565,  205,  194,  210,  204,
-      185,  197,  209,  198,  200,  200,  200,  200,  201,  203,
-      200,  200,  202,  200,  200,  200,  200,  200,  200,  205,
-      211,  212,  215,  209,  216,  218,  219,  221,  223,  211,
-      224,  220,  225,  229,  222,  232,  230,  223,  215,  212,
-      234,  219,  220,  222,  240,  216,  221,  238,  218,  234,
-      237,  222,  232,  224,  230,  239,  229,  225,  241,  237,
-
-      238,  243,  240,  241,  244,  245,  243,  247,  248,  245,
-      255,  239,  256,  250,  250,  250,  250,  564,  244,  256,
-      250,  252,  252,  252,  252,  247,  250,  255,  264,  251,
-      251,  248,  251,  251,  251,  251,  253,  253,  253,  253,
-      253,  254,  254,  254,  254,  254,  257,  259,  260,  263,
-      265,  264,  266,  260,  267,  268,  263,  269,  270,  267,
-      271,  272,  273,  257,  259,  274,  272,  266,  268,  275,
-      274,  279,  276,  265,  270,  271,  280,  282,  275,  276,
-      281,  285,  286,  273,  269,  289,  288,  286,  290,  291,
-      302,  292,  294,  293,  279,  288,  285,  295,  299,  280,
-
-      300,  282,  281,  303,  281,  292,  289,  291,  293,  290,
-      294,  304,  295,  306,  302,  300,  299,  308,  309,  311,
-      563,  312,  306,  313,  314,  309,  303,  316,  317,  304,
-      308,  312,  313,  320,  314,  317,  316,  319,  322,  328,
-      324,  327,  311,  329,  331,  322,  319,  330,  320,  324,
-      328,  327,  330,  329,  333,  334,  336,  339,  338,  344,
-      346,  331,  341,  341,  341,  341,  343,  344,  338,  351,
-      339,  343,  348,  561,  347,  333,  334,  348,  349,  336,
-      338,  347,  346,  350,  353,  349,  352,  354,  350,  355,
-      351,  356,  352,  357,  358,  360,  363,  365,  355,  364,
-
-      367,  358,  360,  353,  366,  368,  354,  369,  356,  363,
-      357,  370,  364,  366,  365,  367,  371,  372,  375,  374,
-      382,  368,  376,  377,  378,  379,  372,  375,  370,  376,
-      369,  380,  377,  378,  379,  371,  374,  383,  382,  385,
-      386,  390,  387,  391,  380,  398,  394,  399,  397,  403,
-      386,  400,  391,  398,  385,  397,  401,  404,  402,  407,
-      383,  387,  400,  402,  390,  394,  406,  409,  410,  401,
-      399,  411,  403,  413,  404,  410,  412,  419,  414,  406,
-      415,  424,  407,  418,  409,  412,  423,  418,  418,  429,
-      559,  437,  426,  423,  427,  413,  414,  424,  415,  411,
-
-      419,  426,  428,  427,  431,  436,  438,  428,  437,  440,
-      441,  431,  429,  447,  451,  452,  453,  454,  440,  455,
-      441,  457,  459,  438,  453,  447,  436,  462,  463,  451,
-      454,  464,  465,  466,  468,  469,  455,  452,  470,  471,
-      459,  472,  466,  468,  457,  474,  473,  465,  462,  463,
-      475,  477,  469,  470,  471,  473,  478,  464,  479,  480,
-      481,  483,  472,  479,  482,  478,  484,  474,  480,  486,
-      489,  482,  487,  475,  488,  491,  477,  484,  493,  489,
-      494,  492,  500,  481,  483,  501,  498,  508,  502,  494,
-      491,  500,  501,  486,  502,  487,  504,  488,  492,  498,
-
-      505,  493,  506,  504,  511,  505,  513,  512,  514,  511,
-      508,  515,  516,  514,  517,  506,  512,  518,  519,  520,
-      521,  517,  524,  522,  520,  526,  525,  515,  522,  513,
-      527,  530,  538,  519,  528,  521,  524,  529,  532,  539,
-      518,  516,  525,  528,  526,  533,  529,  532,  534,  535,
-      537,  540,  539,  527,  530,  538,  542,  544,  545,  537,
-      533,  547,  546,  534,  535,  545,  548,  549,  540,  550,
-      551,  554,  544,  552,  542,  546,  553,  557,  547,  555,
-      552,  560,  566,  553,  562,  549,  558,  548,  560,  556,
-      543,  551,  550,  562,  557,  541,  536,  531,  523,  510,
-
-      554,  509,  555,  566,  569,  569,  569,  569,  570,  570,
-      572,  507,  572,  572,  503,  499,  497,  496,  495,  490,
-      485,  476,  467,  461,  460,  458,  456,  450,  449,  448,
-      446,  445,  444,  443,  442,  439,  435,  434,  433,  432,
-      430,  425,  422,  421,  420,  417,  416,  408,  405,  396,
-      395,  393,  392,  388,  384,  381,  373,  362,  361,  359,
-      345,  342,  340,  337,  335,  332,  326,  325,  323,  321,
-      318,  315,  310,  307,  301,  298,  297,  296,  287,  284,
-      283,  278,  277,  262,  261,  258,  246,  236,  235,  233,
-      231,  228,  227,  226,  217,  214,  213,  208,  207,  206,
-
-      199,  196,  195,  193,  192,  191,  190,  189,  188,  186,
-      152,  148,  146,  143,  140,  136,  132,  114,   89,   69,
-       59,   39,   37,    8,    7,    3,  568,  568,  568,  568,
-      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
-      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
-      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
-      568,  568,  568,  568,  568,  568,  568,  568,  568,  568
+       71,   65,   72,   74,   75,   76,   77,   78,   79,   80,
+       65,   57,   81,   75,   76,   71,   83,   82,   72,  575,
+       85,   74,   71,   82,   79,   78,   84,   75,   80,   77,
+
+       86,   84,   85,   83,   81,   81,   87,   81,   88,   83,
+       90,   91,   92,   84,   87,   86,   97,   93,   94,   95,
+       96,   92,  100,   88,   95,   90,   93,   94,   96,   97,
+       98,   91,   99,  102,  103,   92,  106,  104,  110,  105,
+       93,  571,  107,   98,  104,  100,  108,  103,  105,  109,
+      107,  106,  104,   99,  106,  108,  110,  111,  109,  112,
+      106,  102,  105,  111,  104,  107,  113,  115,  117,  108,
+      116,  118,  112,  119,  120,  121,  122,  124,  125,  113,
+      115,  569,  142,  120,  118,  122,  124,  113,  130,  116,
+      125,  115,  121,  119,  122,  123,  117,  120,  121,  122,
+
+      142,  126,  127,  123,  123,  126,  128,  131,  141,  130,
+      246,  128,  145,  123,  246,  127,  123,  127,  144,  141,
+      150,  123,  134,  134,  134,  134,  147,  144,  131,  135,
+      135,  135,  135,  145,  131,  150,  135,  151,  157,  147,
+      568,  149,  135,  137,  137,  137,  137,  137,  149,  154,
+      137,  153,  151,  157,  159,  158,  137,  138,  138,  153,
+      138,  138,  138,  138,  138,  155,  160,  156,  158,  159,
+      161,  154,  156,  162,  155,  160,  161,  165,  163,  160,
+      164,  169,  166,  168,  172,  170,  162,  163,  168,  171,
+      173,  174,  175,  172,  178,  176,  173,  186,  171,  163,
+
+      165,  166,  164,  170,  176,  171,  170,  175,  169,  177,
+      174,  179,  178,  180,  181,  182,  185,  183,  177,  184,
+      179,  186,  195,  182,  188,  199,  198,  180,  183,  203,
+      202,  185,  177,  567,  204,  205,  211,  181,  212,  188,
+      184,  206,  195,  198,  205,  210,  211,  212,  199,  201,
+      201,  201,  201,  202,  203,  201,  201,  204,  201,  201,
+      201,  201,  201,  201,  206,  213,  210,  217,  216,  219,
+      220,  221,  222,  225,  226,  230,  233,  223,  224,  231,
+      235,  238,  221,  213,  216,  220,  223,  224,  217,  235,
+      238,  222,  219,  233,  223,  239,  225,  231,  230,  226,
+
+      240,  241,  242,  243,  244,  248,  245,  242,  239,  244,
+      249,  243,  253,  253,  253,  253,  240,  256,  392,  241,
+      245,  257,  264,  248,  251,  251,  251,  251,  257,  264,
+      392,  251,  265,  249,  256,  252,  252,  251,  252,  252,
+      252,  252,  254,  254,  254,  254,  254,  255,  255,  255,
+      255,  255,  258,  260,  261,  265,  266,  267,  268,  261,
+      269,  270,  271,  268,  272,  275,  273,  281,  274,  258,
+      260,  276,  267,  274,  270,  277,  276,  269,  278,  266,
+      272,  273,  282,  284,  277,  278,  275,  283,  287,  271,
+      281,  288,  290,  291,  292,  293,  288,  304,  294,  305,
+
+      296,  290,  295,  287,  297,  282,  301,  284,  302,  283,
+      306,  283,  294,  293,  291,  292,  308,  295,  296,  297,
+      310,  304,  305,  302,  301,  308,  313,  311,  306,  314,
+      319,  315,  316,  310,  311,  318,  321,  319,  322,  314,
+      315,  324,  316,  326,  318,  321,  329,  330,  324,  313,
+      331,  333,  326,  322,  332,  335,  329,  336,  330,  332,
+      331,  338,  341,  340,  343,  343,  343,  343,  333,  345,
+      348,  346,  350,  340,  345,  341,  335,  350,  336,  346,
+      349,  351,  353,  356,  338,  340,  352,  349,  351,  354,
+      355,  352,  348,  357,  359,  358,  355,  360,  354,  361,
+
+      363,  369,  356,  353,  358,  366,  361,  363,  367,  368,
+      369,  359,  357,  370,  360,  371,  372,  373,  366,  374,
+      375,  367,  386,  377,  378,  379,  368,  380,  370,  375,
+      383,  371,  379,  378,  373,  381,  380,  382,  374,  372,
+      377,  385,  388,  383,  381,  386,  382,  390,  389,  393,
+      397,  394,  402,  403,  400,  401,  406,  388,  389,  385,
+      394,  400,  405,  401,  403,  404,  390,  405,  407,  397,
+      409,  410,  393,  412,  413,  402,  414,  415,  404,  406,
+      417,  413,  418,  409,  422,  407,  415,  419,  422,  422,
+      412,  423,  427,  428,  410,  433,  432,  430,  431,  427,
+
+      418,  432,  417,  435,  414,  419,  430,  431,  440,  428,
+      435,  441,  444,  442,  423,  445,  456,  455,  433,  451,
+      458,  444,  459,  461,  463,  445,  457,  466,  441,  440,
+      442,  451,  455,  458,  457,  467,  468,  469,  456,  459,
+      470,  472,  463,  473,  474,  477,  461,  476,  466,  470,
+      472,  475,  469,  478,  477,  479,  467,  481,  482,  474,
+      473,  484,  468,  485,  483,  486,  475,  482,  476,  483,
+      484,  487,  486,  488,  490,  478,  491,  492,  479,  493,
+      495,  497,  481,  498,  488,  496,  485,  504,  493,  520,
+      502,  506,  498,  512,  487,  495,  504,  506,  490,  491,
+
+      492,  505,  496,  502,  497,  508,  509,  510,  505,  515,
+      516,  509,  508,  517,  515,  519,  512,  518,  520,  516,
+      510,  521,  518,  522,  523,  524,  525,  526,  521,  528,
+      524,  519,  526,  529,  530,  531,  517,  534,  532,  523,
+      537,  525,  533,  528,  538,  536,  522,  532,  539,  529,
+      542,  533,  541,  530,  536,  537,  543,  544,  531,  538,
+      534,  541,  546,  539,  548,  549,  551,  552,  550,  543,
+      554,  553,  549,  542,  544,  555,  558,  556,  557,  548,
+      546,  550,  561,  551,  556,  557,  559,  564,  552,  553,
+      570,  566,  565,  554,  564,  563,  555,  562,  560,  561,
+
+      566,  547,  545,  540,  535,  558,  527,  514,  513,  559,
+      511,  570,  573,  573,  573,  573,  574,  574,  576,  507,
+      576,  576,  503,  501,  500,  499,  494,  489,  480,  471,
+      465,  464,  462,  460,  454,  453,  452,  450,  449,  448,
+      447,  446,  443,  439,  438,  437,  436,  434,  429,  426,
+      425,  424,  421,  420,  416,  411,  408,  399,  398,  396,
+      395,  391,  387,  384,  376,  365,  364,  362,  347,  344,
+      342,  339,  337,  334,  328,  327,  325,  323,  320,  317,
+      312,  309,  303,  300,  299,  298,  289,  286,  285,  280,
+      279,  263,  262,  259,  247,  237,  236,  234,  232,  229,
+
+      228,  227,  218,  215,  214,  209,  208,  207,  200,  197,
+      196,  194,  193,  192,  191,  190,  189,  187,  152,  148,
+      146,  143,  140,  136,  132,  114,   89,   69,   59,   39,
+       37,    8,    7,    3,  572,  572,  572,  572,  572,  572,
+      572,  572,  572,  572,  572,  572,  572,  572,  572,  572,
+      572,  572,  572,  572,  572,  572,  572,  572,  572,  572,
+      572,  572,  572,  572,  572,  572,  572,  572,  572,  572,
+      572,  572,  572,  572,  572,  572,  572,  572
     } ;
 
 static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
@@ -888,7 +891,7 @@
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 1 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 #define INITIAL 0
 /*===-- Lexer.l - Scanner for llvm assembly files --------------*- C++ -*--===//
 //
@@ -903,7 +906,7 @@
 //
 //===----------------------------------------------------------------------===*/
 #define YY_NEVER_INTERACTIVE 1
-#line 28 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 28 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 #include "ParserInternals.h"
 #include "llvm/Module.h"
 #include <list>
@@ -1036,7 +1039,7 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 1040 "Lexer.cpp"
+#line 1043 "Lexer.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1187,10 +1190,10 @@
 	register char *yy_cp = NULL, *yy_bp = NULL;
 	register int yy_act;
 
-#line 186 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 186 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 
 
-#line 1194 "Lexer.cpp"
+#line 1197 "Lexer.cpp"
 
 	if ( yy_init )
 		{
@@ -1238,14 +1241,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 >= 569 )
+				if ( yy_current_state >= 573 )
 					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 != 568 );
+		while ( yy_current_state != 572 );
 
 yy_find_action:
 		yy_current_state = *--yy_state_ptr;
@@ -1283,651 +1286,656 @@
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 188 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 188 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 { /* Ignore comments for now */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 190 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 190 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 { return BEGINTOK; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 191 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 191 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 { return ENDTOK; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 192 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 192 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 { return TRUETOK;  }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 193 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 193 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 { return FALSETOK; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 194 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 194 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 { return DECLARE; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 195 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return GLOBAL; }
+#line 195 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return DEFINE; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 196 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return CONSTANT; }
+#line 196 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return GLOBAL; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 197 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return INTERNAL; }
+#line 197 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return CONSTANT; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 198 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return LINKONCE; }
+#line 198 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return INTERNAL; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 199 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return WEAK; }
+#line 199 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return LINKONCE; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 200 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return APPENDING; }
+#line 200 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return WEAK; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 201 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return DLLIMPORT; }
+#line 201 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return APPENDING; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 202 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return DLLEXPORT; }
+#line 202 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return DLLIMPORT; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 203 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return EXTERN_WEAK; }
+#line 203 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return DLLEXPORT; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 204 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return EXTERNAL; }
+#line 204 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return EXTERN_WEAK; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 205 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return IMPLEMENTATION; }
+#line 205 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return EXTERNAL; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 206 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return ZEROINITIALIZER; }
+#line 206 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return IMPLEMENTATION; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 207 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return DOTDOTDOT; }
+#line 207 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return ZEROINITIALIZER; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 208 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return UNDEF; }
+#line 208 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return DOTDOTDOT; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 209 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return NULL_TOK; }
+#line 209 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return UNDEF; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 210 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return TO; }
+#line 210 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return NULL_TOK; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 211 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return TAIL; }
+#line 211 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return TO; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 212 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return TARGET; }
+#line 212 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return TAIL; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 213 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return TRIPLE; }
+#line 213 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return TARGET; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 214 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return DEPLIBS; }
+#line 214 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return TRIPLE; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 215 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return ENDIAN; }
+#line 215 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return DEPLIBS; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 216 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return POINTERSIZE; }
+#line 216 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return ENDIAN; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 217 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return DATALAYOUT; }
+#line 217 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return POINTERSIZE; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 218 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return LITTLE; }
+#line 218 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return DATALAYOUT; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 219 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return BIG; }
+#line 219 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return LITTLE; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 220 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return VOLATILE; }
+#line 220 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return BIG; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 221 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return ALIGN;  }
+#line 221 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return VOLATILE; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 222 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return SECTION; }
+#line 222 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return ALIGN;  }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 223 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return MODULE; }
+#line 223 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return SECTION; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 224 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return ASM_TOK; }
+#line 224 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return MODULE; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 225 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return SIDEEFFECT; }
+#line 225 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return ASM_TOK; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 227 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return CC_TOK; }
+#line 226 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return SIDEEFFECT; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 228 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return CCC_TOK; }
+#line 228 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return CC_TOK; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 229 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return CSRETCC_TOK; }
+#line 229 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return CCC_TOK; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 230 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return FASTCC_TOK; }
+#line 230 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return CSRETCC_TOK; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 231 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return COLDCC_TOK; }
+#line 231 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return FASTCC_TOK; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 232 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return X86_STDCALLCC_TOK; }
+#line 232 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return COLDCC_TOK; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 233 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return X86_FASTCALLCC_TOK; }
+#line 233 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return X86_STDCALLCC_TOK; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 235 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::VoidTy,  VOID);  }
+#line 234 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return X86_FASTCALLCC_TOK; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 236 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::BoolTy,  BOOL);  }
+#line 236 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::VoidTy,  VOID);  }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 237 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::SByteTy, SBYTE); }
+#line 237 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::BoolTy,  BOOL);  }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 238 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::UByteTy, UBYTE); }
+#line 238 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::SByteTy, SBYTE); }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 239 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::ShortTy, SHORT); }
+#line 239 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::UByteTy, UBYTE); }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 240 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::UShortTy,USHORT);}
+#line 240 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::ShortTy, SHORT); }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 241 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::IntTy,   INT);   }
+#line 241 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::UShortTy,USHORT);}
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 242 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::UIntTy,  UINT);  }
+#line 242 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::IntTy,   INT);   }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 243 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::LongTy,  LONG);  }
+#line 243 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::UIntTy,  UINT);  }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 244 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::ULongTy, ULONG); }
+#line 244 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::LongTy,  LONG);  }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 245 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::FloatTy, FLOAT); }
+#line 245 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::ULongTy, ULONG); }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 246 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::DoubleTy,DOUBLE);}
+#line 246 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::FloatTy, FLOAT); }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 247 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::LabelTy, LABEL); }
+#line 247 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::DoubleTy,DOUBLE);}
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 248 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return TYPE;   }
+#line 248 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::LabelTy, LABEL); }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 249 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return OPAQUE; }
+#line 249 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return TYPE;   }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 251 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Add, ADD); }
+#line 250 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return OPAQUE; }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 252 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Sub, SUB); }
+#line 252 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Add, ADD); }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 253 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Mul, MUL); }
+#line 253 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Sub, SUB); }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 254 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, UDiv, UDIV); }
+#line 254 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Mul, MUL); }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 255 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SDiv, SDIV); }
+#line 255 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, UDiv, UDIV); }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 256 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, FDiv, FDIV); }
+#line 256 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SDiv, SDIV); }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 257 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, URem, UREM); }
+#line 257 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, FDiv, FDIV); }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 258 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SRem, SREM); }
+#line 258 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, URem, UREM); }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 259 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, FRem, FREM); }
+#line 259 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SRem, SREM); }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 260 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, And, AND); }
+#line 260 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, FRem, FREM); }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 261 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Or , OR ); }
+#line 261 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, And, AND); }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 262 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Xor, XOR); }
+#line 262 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Or , OR ); }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 263 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal,  ICmp,  ICMP); }
+#line 263 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Xor, XOR); }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 264 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal,  FCmp,  FCMP); }
+#line 264 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal,  ICmp,  ICMP); }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 265 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return EQ;  }
+#line 265 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal,  FCmp,  FCMP); }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 266 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return NE;  }
+#line 266 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return EQ;  }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 267 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return SLT; }
+#line 267 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return NE;  }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 268 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return SGT; }
+#line 268 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return SLT; }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 269 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return SLE; }
+#line 269 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return SGT; }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 270 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return SGE; }
+#line 270 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return SLE; }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 271 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return ULT; }
+#line 271 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return SGE; }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 272 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return UGT; }
+#line 272 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return ULT; }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 273 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return ULE; }
+#line 273 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return UGT; }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 274 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return UGE; }
+#line 274 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return ULE; }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 275 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return OEQ; }
+#line 275 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return UGE; }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 276 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return ONE; }
+#line 276 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return OEQ; }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 277 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return OLT; }
+#line 277 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return ONE; }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 278 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return OGT; }
+#line 278 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return OLT; }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 279 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return OLE; }
+#line 279 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return OGT; }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 280 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return OGE; }
+#line 280 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return OLE; }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 281 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return ORD; }
+#line 281 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return OGE; }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 282 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return UNO; }
+#line 282 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return ORD; }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 283 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return UEQ; }
+#line 283 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return UNO; }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 284 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ return UNE; }
+#line 284 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return UEQ; }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 286 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, PHI, PHI_TOK); }
+#line 285 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return UNE; }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 287 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Call, CALL); }
+#line 287 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, PHI, PHI_TOK); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 288 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, Trunc, TRUNC); }
+#line 288 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Call, CALL); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 289 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, ZExt, ZEXT); }
+#line 289 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, Trunc, TRUNC); }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 290 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, SExt, SEXT); }
+#line 290 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, ZExt, ZEXT); }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 291 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPTrunc, FPTRUNC); }
+#line 291 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, SExt, SEXT); }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 292 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPExt, FPEXT); }
+#line 292 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPTrunc, FPTRUNC); }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 293 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, UIToFP, UITOFP); }
+#line 293 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPExt, FPEXT); }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 294 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, SIToFP, SITOFP); }
+#line 294 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, UIToFP, UITOFP); }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 295 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPToUI, FPTOUI); }
+#line 295 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, SIToFP, SITOFP); }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 296 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPToSI, FPTOSI); }
+#line 296 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPToUI, FPTOUI); }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 297 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, IntToPtr, INTTOPTR); }
+#line 297 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPToSI, FPTOSI); }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 298 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, PtrToInt, PTRTOINT); }
+#line 298 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, IntToPtr, INTTOPTR); }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 299 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, BitCast, BITCAST); }
+#line 299 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, PtrToInt, PTRTOINT); }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 300 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Select, SELECT); }
+#line 300 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, BitCast, BITCAST); }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 301 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Shl, SHL); }
+#line 301 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Select, SELECT); }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 302 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, LShr, LSHR); }
+#line 302 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Shl, SHL); }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 303 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, AShr, ASHR); }
+#line 303 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, LShr, LSHR); }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 304 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, VAArg , VAARG); }
+#line 304 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, AShr, ASHR); }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 305 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Ret, RET); }
+#line 305 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, VAArg , VAARG); }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 306 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Br, BR); }
+#line 306 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Ret, RET); }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 307 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Switch, SWITCH); }
+#line 307 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Br, BR); }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 308 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Invoke, INVOKE); }
+#line 308 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Switch, SWITCH); }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 309 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unwind, UNWIND); }
+#line 309 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Invoke, INVOKE); }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 310 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
+#line 310 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 312 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Malloc, MALLOC); }
+#line 311 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 313 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
+#line 313 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Malloc, MALLOC); }
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 314 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Free, FREE); }
+#line 314 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 315 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Load, LOAD); }
+#line 315 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Free, FREE); }
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 316 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Store, STORE); }
+#line 316 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Load, LOAD); }
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 317 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
+#line 317 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Store, STORE); }
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 319 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
+#line 318 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 320 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
+#line 320 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 321 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
+#line 321 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 324 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 322 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
+	YY_BREAK
+case 129:
+YY_RULE_SETUP
+#line 325 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 {
                   UnEscapeLexed(yytext+1);
                   llvmAsmlval.StrVal = strdup(yytext+1);             // Skip %
                   return VAR_ID;
                 }
 	YY_BREAK
-case 129:
+case 130:
 YY_RULE_SETUP
-#line 329 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 330 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 {
                   yytext[strlen(yytext)-1] = 0;  // nuke colon
                   UnEscapeLexed(yytext);
@@ -1935,9 +1943,9 @@
                   return LABELSTR;
                 }
 	YY_BREAK
-case 130:
+case 131:
 YY_RULE_SETUP
-#line 335 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 336 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 {
                   yytext[strlen(yytext)-2] = 0;  // nuke colon, end quote
                   UnEscapeLexed(yytext+1);
@@ -1945,9 +1953,9 @@
                   return LABELSTR;
                 }
 	YY_BREAK
-case 131:
+case 132:
 YY_RULE_SETUP
-#line 342 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 343 "/proj/llvm/llvm-1/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
@@ -1958,14 +1966,14 @@
                    return STRINGCONSTANT;
                  }
 	YY_BREAK
-case 132:
+case 133:
 YY_RULE_SETUP
-#line 353 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 354 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 { llvmAsmlval.UInt64Val = atoull(yytext); return EUINT64VAL; }
 	YY_BREAK
-case 133:
+case 134:
 YY_RULE_SETUP
-#line 354 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 355 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   // +1:  we have bigger negative range
@@ -1975,17 +1983,17 @@
                   return ESINT64VAL;
                 }
 	YY_BREAK
-case 134:
+case 135:
 YY_RULE_SETUP
-#line 362 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 363 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 {
                    llvmAsmlval.UInt64Val = HexIntToVal(yytext+3);
                    return yytext[0] == 's' ? ESINT64VAL : EUINT64VAL;
                  }
 	YY_BREAK
-case 135:
+case 136:
 YY_RULE_SETUP
-#line 367 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 368 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   if ((unsigned)Val != Val)
@@ -1994,9 +2002,9 @@
                   return UINTVAL;
                 }
 	YY_BREAK
-case 136:
+case 137:
 YY_RULE_SETUP
-#line 374 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 375 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+2);
                   // +1:  we have bigger negative range
@@ -2006,18 +2014,18 @@
                   return SINTVAL;
                 }
 	YY_BREAK
-case 137:
+case 138:
 YY_RULE_SETUP
-#line 383 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 384 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = atof(yytext); return FPVAL; }
 	YY_BREAK
-case 138:
+case 139:
 YY_RULE_SETUP
-#line 384 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 385 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = HexToFP(yytext); return FPVAL; }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 386 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 387 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
@@ -2026,22 +2034,22 @@
                   return EOF;
                 }
 	YY_BREAK
-case 139:
+case 140:
 YY_RULE_SETUP
-#line 394 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 395 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 { /* Ignore whitespace */ }
 	YY_BREAK
-case 140:
+case 141:
 YY_RULE_SETUP
-#line 395 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 396 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 { return yytext[0]; }
 	YY_BREAK
-case 141:
+case 142:
 YY_RULE_SETUP
-#line 397 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 398 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2045 "Lexer.cpp"
+#line 2053 "Lexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2328,7 +2336,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 >= 569 )
+			if ( yy_current_state >= 573 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2358,11 +2366,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 >= 569 )
+		if ( yy_current_state >= 573 )
 			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 == 568);
+	yy_is_jam = (yy_current_state == 572);
 	if ( ! yy_is_jam )
 		*yy_state_ptr++ = yy_current_state;
 
@@ -2919,5 +2927,5 @@
 	return 0;
 	}
 #endif
-#line 397 "/proj/llvm/llvm-3/lib/AsmParser/Lexer.l"
+#line 398 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 


Index: llvm/lib/AsmParser/Lexer.l.cvs
diff -u llvm/lib/AsmParser/Lexer.l.cvs:1.15 llvm/lib/AsmParser/Lexer.l.cvs:1.16
--- llvm/lib/AsmParser/Lexer.l.cvs:1.15	Sat Dec 23 00:05:40 2006
+++ llvm/lib/AsmParser/Lexer.l.cvs	Fri Dec 29 14:30:42 2006
@@ -192,6 +192,7 @@
 true            { return TRUETOK;  }
 false           { return FALSETOK; }
 declare         { return DECLARE; }
+define          { return DEFINE; }
 global          { return GLOBAL; }
 constant        { return CONSTANT; }
 internal        { return INTERNAL; }


Index: llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.38 llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.39
--- llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.38	Sat Dec 23 00:05:40 2006
+++ llvm/lib/AsmParser/llvmAsmParser.cpp.cvs	Fri Dec 29 14:30:42 2006
@@ -81,8 +81,8 @@
      ULONG = 272,
      FLOAT = 273,
      DOUBLE = 274,
-     TYPE = 275,
-     LABEL = 276,
+     LABEL = 275,
+     TYPE = 276,
      VAR_ID = 277,
      LABELSTR = 278,
      STRINGCONSTANT = 279,
@@ -93,113 +93,114 @@
      BEGINTOK = 284,
      ENDTOK = 285,
      DECLARE = 286,
-     GLOBAL = 287,
-     CONSTANT = 288,
-     SECTION = 289,
-     VOLATILE = 290,
-     TO = 291,
-     DOTDOTDOT = 292,
-     NULL_TOK = 293,
-     UNDEF = 294,
-     CONST = 295,
-     INTERNAL = 296,
-     LINKONCE = 297,
-     WEAK = 298,
-     APPENDING = 299,
-     DLLIMPORT = 300,
-     DLLEXPORT = 301,
-     EXTERN_WEAK = 302,
-     OPAQUE = 303,
-     NOT = 304,
-     EXTERNAL = 305,
-     TARGET = 306,
-     TRIPLE = 307,
-     ENDIAN = 308,
-     POINTERSIZE = 309,
-     LITTLE = 310,
-     BIG = 311,
-     ALIGN = 312,
-     DEPLIBS = 313,
-     CALL = 314,
-     TAIL = 315,
-     ASM_TOK = 316,
-     MODULE = 317,
-     SIDEEFFECT = 318,
-     CC_TOK = 319,
-     CCC_TOK = 320,
-     CSRETCC_TOK = 321,
-     FASTCC_TOK = 322,
-     COLDCC_TOK = 323,
-     X86_STDCALLCC_TOK = 324,
-     X86_FASTCALLCC_TOK = 325,
-     DATALAYOUT = 326,
-     RET = 327,
-     BR = 328,
-     SWITCH = 329,
-     INVOKE = 330,
-     UNWIND = 331,
-     UNREACHABLE = 332,
-     ADD = 333,
-     SUB = 334,
-     MUL = 335,
-     UDIV = 336,
-     SDIV = 337,
-     FDIV = 338,
-     UREM = 339,
-     SREM = 340,
-     FREM = 341,
-     AND = 342,
-     OR = 343,
-     XOR = 344,
-     ICMP = 345,
-     FCMP = 346,
-     EQ = 347,
-     NE = 348,
-     SLT = 349,
-     SGT = 350,
-     SLE = 351,
-     SGE = 352,
-     ULT = 353,
-     UGT = 354,
-     ULE = 355,
-     UGE = 356,
-     OEQ = 357,
-     ONE = 358,
-     OLT = 359,
-     OGT = 360,
-     OLE = 361,
-     OGE = 362,
-     ORD = 363,
-     UNO = 364,
-     UEQ = 365,
-     UNE = 366,
-     MALLOC = 367,
-     ALLOCA = 368,
-     FREE = 369,
-     LOAD = 370,
-     STORE = 371,
-     GETELEMENTPTR = 372,
-     TRUNC = 373,
-     ZEXT = 374,
-     SEXT = 375,
-     FPTRUNC = 376,
-     FPEXT = 377,
-     BITCAST = 378,
-     UITOFP = 379,
-     SITOFP = 380,
-     FPTOUI = 381,
-     FPTOSI = 382,
-     INTTOPTR = 383,
-     PTRTOINT = 384,
-     PHI_TOK = 385,
-     SELECT = 386,
-     SHL = 387,
-     LSHR = 388,
-     ASHR = 389,
-     VAARG = 390,
-     EXTRACTELEMENT = 391,
-     INSERTELEMENT = 392,
-     SHUFFLEVECTOR = 393
+     DEFINE = 287,
+     GLOBAL = 288,
+     CONSTANT = 289,
+     SECTION = 290,
+     VOLATILE = 291,
+     TO = 292,
+     DOTDOTDOT = 293,
+     NULL_TOK = 294,
+     UNDEF = 295,
+     CONST = 296,
+     INTERNAL = 297,
+     LINKONCE = 298,
+     WEAK = 299,
+     APPENDING = 300,
+     DLLIMPORT = 301,
+     DLLEXPORT = 302,
+     EXTERN_WEAK = 303,
+     OPAQUE = 304,
+     NOT = 305,
+     EXTERNAL = 306,
+     TARGET = 307,
+     TRIPLE = 308,
+     ENDIAN = 309,
+     POINTERSIZE = 310,
+     LITTLE = 311,
+     BIG = 312,
+     ALIGN = 313,
+     DEPLIBS = 314,
+     CALL = 315,
+     TAIL = 316,
+     ASM_TOK = 317,
+     MODULE = 318,
+     SIDEEFFECT = 319,
+     CC_TOK = 320,
+     CCC_TOK = 321,
+     CSRETCC_TOK = 322,
+     FASTCC_TOK = 323,
+     COLDCC_TOK = 324,
+     X86_STDCALLCC_TOK = 325,
+     X86_FASTCALLCC_TOK = 326,
+     DATALAYOUT = 327,
+     RET = 328,
+     BR = 329,
+     SWITCH = 330,
+     INVOKE = 331,
+     UNWIND = 332,
+     UNREACHABLE = 333,
+     ADD = 334,
+     SUB = 335,
+     MUL = 336,
+     UDIV = 337,
+     SDIV = 338,
+     FDIV = 339,
+     UREM = 340,
+     SREM = 341,
+     FREM = 342,
+     AND = 343,
+     OR = 344,
+     XOR = 345,
+     ICMP = 346,
+     FCMP = 347,
+     EQ = 348,
+     NE = 349,
+     SLT = 350,
+     SGT = 351,
+     SLE = 352,
+     SGE = 353,
+     ULT = 354,
+     UGT = 355,
+     ULE = 356,
+     UGE = 357,
+     OEQ = 358,
+     ONE = 359,
+     OLT = 360,
+     OGT = 361,
+     OLE = 362,
+     OGE = 363,
+     ORD = 364,
+     UNO = 365,
+     UEQ = 366,
+     UNE = 367,
+     MALLOC = 368,
+     ALLOCA = 369,
+     FREE = 370,
+     LOAD = 371,
+     STORE = 372,
+     GETELEMENTPTR = 373,
+     TRUNC = 374,
+     ZEXT = 375,
+     SEXT = 376,
+     FPTRUNC = 377,
+     FPEXT = 378,
+     BITCAST = 379,
+     UITOFP = 380,
+     SITOFP = 381,
+     FPTOUI = 382,
+     FPTOSI = 383,
+     INTTOPTR = 384,
+     PTRTOINT = 385,
+     PHI_TOK = 386,
+     SELECT = 387,
+     SHL = 388,
+     LSHR = 389,
+     ASHR = 390,
+     VAARG = 391,
+     EXTRACTELEMENT = 392,
+     INSERTELEMENT = 393,
+     SHUFFLEVECTOR = 394
    };
 #endif
 /* Tokens.  */
@@ -220,8 +221,8 @@
 #define ULONG 272
 #define FLOAT 273
 #define DOUBLE 274
-#define TYPE 275
-#define LABEL 276
+#define LABEL 275
+#define TYPE 276
 #define VAR_ID 277
 #define LABELSTR 278
 #define STRINGCONSTANT 279
@@ -232,119 +233,120 @@
 #define BEGINTOK 284
 #define ENDTOK 285
 #define DECLARE 286
-#define GLOBAL 287
-#define CONSTANT 288
-#define SECTION 289
-#define VOLATILE 290
-#define TO 291
-#define DOTDOTDOT 292
-#define NULL_TOK 293
-#define UNDEF 294
-#define CONST 295
-#define INTERNAL 296
-#define LINKONCE 297
-#define WEAK 298
-#define APPENDING 299
-#define DLLIMPORT 300
-#define DLLEXPORT 301
-#define EXTERN_WEAK 302
-#define OPAQUE 303
-#define NOT 304
-#define EXTERNAL 305
-#define TARGET 306
-#define TRIPLE 307
-#define ENDIAN 308
-#define POINTERSIZE 309
-#define LITTLE 310
-#define BIG 311
-#define ALIGN 312
-#define DEPLIBS 313
-#define CALL 314
-#define TAIL 315
-#define ASM_TOK 316
-#define MODULE 317
-#define SIDEEFFECT 318
-#define CC_TOK 319
-#define CCC_TOK 320
-#define CSRETCC_TOK 321
-#define FASTCC_TOK 322
-#define COLDCC_TOK 323
-#define X86_STDCALLCC_TOK 324
-#define X86_FASTCALLCC_TOK 325
-#define DATALAYOUT 326
-#define RET 327
-#define BR 328
-#define SWITCH 329
-#define INVOKE 330
-#define UNWIND 331
-#define UNREACHABLE 332
-#define ADD 333
-#define SUB 334
-#define MUL 335
-#define UDIV 336
-#define SDIV 337
-#define FDIV 338
-#define UREM 339
-#define SREM 340
-#define FREM 341
-#define AND 342
-#define OR 343
-#define XOR 344
-#define ICMP 345
-#define FCMP 346
-#define EQ 347
-#define NE 348
-#define SLT 349
-#define SGT 350
-#define SLE 351
-#define SGE 352
-#define ULT 353
-#define UGT 354
-#define ULE 355
-#define UGE 356
-#define OEQ 357
-#define ONE 358
-#define OLT 359
-#define OGT 360
-#define OLE 361
-#define OGE 362
-#define ORD 363
-#define UNO 364
-#define UEQ 365
-#define UNE 366
-#define MALLOC 367
-#define ALLOCA 368
-#define FREE 369
-#define LOAD 370
-#define STORE 371
-#define GETELEMENTPTR 372
-#define TRUNC 373
-#define ZEXT 374
-#define SEXT 375
-#define FPTRUNC 376
-#define FPEXT 377
-#define BITCAST 378
-#define UITOFP 379
-#define SITOFP 380
-#define FPTOUI 381
-#define FPTOSI 382
-#define INTTOPTR 383
-#define PTRTOINT 384
-#define PHI_TOK 385
-#define SELECT 386
-#define SHL 387
-#define LSHR 388
-#define ASHR 389
-#define VAARG 390
-#define EXTRACTELEMENT 391
-#define INSERTELEMENT 392
-#define SHUFFLEVECTOR 393
+#define DEFINE 287
+#define GLOBAL 288
+#define CONSTANT 289
+#define SECTION 290
+#define VOLATILE 291
+#define TO 292
+#define DOTDOTDOT 293
+#define NULL_TOK 294
+#define UNDEF 295
+#define CONST 296
+#define INTERNAL 297
+#define LINKONCE 298
+#define WEAK 299
+#define APPENDING 300
+#define DLLIMPORT 301
+#define DLLEXPORT 302
+#define EXTERN_WEAK 303
+#define OPAQUE 304
+#define NOT 305
+#define EXTERNAL 306
+#define TARGET 307
+#define TRIPLE 308
+#define ENDIAN 309
+#define POINTERSIZE 310
+#define LITTLE 311
+#define BIG 312
+#define ALIGN 313
+#define DEPLIBS 314
+#define CALL 315
+#define TAIL 316
+#define ASM_TOK 317
+#define MODULE 318
+#define SIDEEFFECT 319
+#define CC_TOK 320
+#define CCC_TOK 321
+#define CSRETCC_TOK 322
+#define FASTCC_TOK 323
+#define COLDCC_TOK 324
+#define X86_STDCALLCC_TOK 325
+#define X86_FASTCALLCC_TOK 326
+#define DATALAYOUT 327
+#define RET 328
+#define BR 329
+#define SWITCH 330
+#define INVOKE 331
+#define UNWIND 332
+#define UNREACHABLE 333
+#define ADD 334
+#define SUB 335
+#define MUL 336
+#define UDIV 337
+#define SDIV 338
+#define FDIV 339
+#define UREM 340
+#define SREM 341
+#define FREM 342
+#define AND 343
+#define OR 344
+#define XOR 345
+#define ICMP 346
+#define FCMP 347
+#define EQ 348
+#define NE 349
+#define SLT 350
+#define SGT 351
+#define SLE 352
+#define SGE 353
+#define ULT 354
+#define UGT 355
+#define ULE 356
+#define UGE 357
+#define OEQ 358
+#define ONE 359
+#define OLT 360
+#define OGT 361
+#define OLE 362
+#define OGE 363
+#define ORD 364
+#define UNO 365
+#define UEQ 366
+#define UNE 367
+#define MALLOC 368
+#define ALLOCA 369
+#define FREE 370
+#define LOAD 371
+#define STORE 372
+#define GETELEMENTPTR 373
+#define TRUNC 374
+#define ZEXT 375
+#define SEXT 376
+#define FPTRUNC 377
+#define FPEXT 378
+#define BITCAST 379
+#define UITOFP 380
+#define SITOFP 381
+#define FPTOUI 382
+#define FPTOSI 383
+#define INTTOPTR 384
+#define PTRTOINT 385
+#define PHI_TOK 386
+#define SELECT 387
+#define SHL 388
+#define LSHR 389
+#define ASHR 390
+#define VAARG 391
+#define EXTRACTELEMENT 392
+#define INSERTELEMENT 393
+#define SHUFFLEVECTOR 394
 
 
 
 
 /* Copy the first part of user declarations.  */
-#line 14 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 14 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -1205,7 +1207,7 @@
 #endif
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 855 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 855 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
 typedef union YYSTYPE {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -1249,7 +1251,7 @@
   llvm::FCmpInst::Predicate         FPredicate;
 } YYSTYPE;
 /* Line 196 of yacc.c.  */
-#line 1253 "llvmAsmParser.tab.c"
+#line 1255 "llvmAsmParser.tab.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -1261,7 +1263,7 @@
 
 
 /* Line 219 of yacc.c.  */
-#line 1265 "llvmAsmParser.tab.c"
+#line 1267 "llvmAsmParser.tab.c"
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 # define YYSIZE_T __SIZE_TYPE__
@@ -1410,22 +1412,22 @@
 #endif
 
 /* YYFINAL -- State number of the termination state. */
-#define YYFINAL  4
+#define YYFINAL  37
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1390
+#define YYLAST   1478
 
 /* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS  153
+#define YYNTOKENS  154
 /* YYNNTS -- Number of nonterminals. */
-#define YYNNTS  76
+#define YYNNTS  78
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  291
+#define YYNRULES  293
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  567
+#define YYNSTATES  564
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   393
+#define YYMAXUTOK   394
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -1437,15 +1439,15 @@
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     142,   143,   151,     2,   140,     2,     2,     2,     2,     2,
+     143,   144,   152,     2,   141,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     147,   139,   148,     2,     2,     2,     2,     2,     2,     2,
+     148,   140,   149,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   144,   141,   146,     2,     2,     2,     2,     2,   152,
+       2,   145,   142,   147,     2,     2,     2,     2,     2,   153,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     145,     2,     2,   149,     2,   150,     2,     2,     2,     2,
+     146,     2,     2,   150,     2,   151,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -1472,7 +1474,7 @@
      105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
      115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
      125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138
+     135,   136,   137,   138,   139
 };
 
 #if YYDEBUG
@@ -1487,161 +1489,159 @@
       79,    81,    83,    85,    87,    89,    91,    93,    95,    97,
       99,   101,   103,   105,   107,   109,   111,   113,   115,   117,
      119,   121,   123,   125,   127,   129,   131,   133,   135,   137,
-     140,   141,   143,   145,   147,   149,   151,   153,   155,   156,
-     157,   159,   161,   163,   165,   167,   169,   172,   173,   176,
-     177,   181,   184,   185,   187,   188,   192,   194,   197,   199,
-     201,   203,   205,   207,   209,   211,   213,   215,   217,   219,
-     221,   223,   225,   227,   229,   231,   233,   235,   237,   239,
-     242,   247,   253,   259,   263,   266,   272,   277,   280,   282,
-     286,   288,   292,   294,   295,   300,   304,   308,   313,   318,
-     322,   325,   328,   331,   334,   337,   340,   343,   346,   349,
-     352,   355,   358,   365,   371,   380,   387,   394,   402,   410,
-     417,   424,   433,   442,   446,   448,   450,   452,   454,   457,
-     460,   465,   468,   470,   475,   478,   483,   484,   492,   493,
-     501,   502,   510,   511,   519,   523,   528,   529,   531,   533,
-     535,   539,   543,   547,   551,   555,   559,   561,   562,   564,
-     566,   568,   569,   572,   576,   578,   580,   584,   586,   587,
-     596,   598,   600,   604,   606,   608,   611,   612,   614,   616,
-     617,   622,   623,   625,   627,   629,   631,   633,   635,   637,
-     639,   641,   645,   647,   653,   655,   657,   659,   661,   664,
-     667,   670,   674,   677,   678,   680,   683,   686,   690,   700,
-     710,   719,   733,   735,   737,   744,   750,   753,   760,   768,
-     770,   774,   776,   777,   780,   782,   788,   794,   801,   808,
-     811,   816,   821,   828,   833,   838,   845,   852,   855,   863,
-     865,   868,   869,   871,   872,   876,   883,   887,   894,   897,
-     902,   909
+     140,   141,   143,   145,   147,   149,   151,   153,   155,   157,
+     158,   160,   162,   164,   166,   168,   170,   171,   172,   174,
+     176,   178,   180,   182,   184,   187,   188,   191,   192,   196,
+     199,   200,   202,   203,   207,   209,   212,   214,   216,   218,
+     220,   222,   224,   226,   228,   230,   232,   234,   236,   238,
+     240,   242,   244,   246,   248,   250,   252,   255,   260,   266,
+     272,   276,   279,   285,   290,   293,   295,   299,   301,   305,
+     307,   308,   313,   317,   321,   326,   331,   335,   338,   341,
+     344,   347,   350,   353,   356,   359,   362,   365,   368,   371,
+     378,   384,   393,   400,   407,   415,   423,   430,   437,   446,
+     455,   459,   461,   463,   465,   467,   468,   470,   473,   474,
+     478,   479,   483,   487,   489,   493,   494,   500,   501,   508,
+     509,   516,   519,   523,   525,   527,   529,   533,   537,   541,
+     545,   549,   553,   555,   556,   558,   560,   562,   563,   566,
+     570,   572,   574,   578,   580,   581,   590,   592,   594,   598,
+     600,   602,   605,   608,   609,   611,   613,   615,   617,   619,
+     621,   623,   625,   627,   631,   633,   639,   641,   643,   645,
+     647,   650,   653,   656,   660,   663,   664,   666,   669,   672,
+     676,   686,   696,   705,   719,   721,   723,   730,   736,   739,
+     746,   754,   756,   760,   762,   763,   766,   768,   774,   780,
+     787,   794,   797,   802,   807,   814,   819,   824,   831,   838,
+     841,   849,   851,   854,   855,   857,   858,   862,   869,   873,
+     880,   883,   888,   895
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
 static const short int yyrhs[] =
 {
-     185,     0,    -1,     5,    -1,     6,    -1,    78,    -1,    79,
-      -1,    80,    -1,    81,    -1,    82,    -1,    83,    -1,    84,
-      -1,    85,    -1,    86,    -1,    87,    -1,    88,    -1,    89,
-      -1,   118,    -1,   119,    -1,   120,    -1,   121,    -1,   122,
-      -1,   123,    -1,   124,    -1,   125,    -1,   126,    -1,   127,
-      -1,   128,    -1,   129,    -1,   132,    -1,   133,    -1,   134,
-      -1,    92,    -1,    93,    -1,    94,    -1,    95,    -1,    96,
-      -1,    97,    -1,    98,    -1,    99,    -1,   100,    -1,   101,
-      -1,   102,    -1,   103,    -1,   104,    -1,   105,    -1,   106,
-      -1,   107,    -1,   108,    -1,   109,    -1,   110,    -1,   111,
-      -1,    98,    -1,    99,    -1,   100,    -1,   101,    -1,    27,
+     189,     0,    -1,     5,    -1,     6,    -1,    79,    -1,    80,
+      -1,    81,    -1,    82,    -1,    83,    -1,    84,    -1,    85,
+      -1,    86,    -1,    87,    -1,    88,    -1,    89,    -1,    90,
+      -1,   119,    -1,   120,    -1,   121,    -1,   122,    -1,   123,
+      -1,   124,    -1,   125,    -1,   126,    -1,   127,    -1,   128,
+      -1,   129,    -1,   130,    -1,   133,    -1,   134,    -1,   135,
+      -1,    93,    -1,    94,    -1,    95,    -1,    96,    -1,    97,
+      -1,    98,    -1,    99,    -1,   100,    -1,   101,    -1,   102,
+      -1,   103,    -1,   104,    -1,   105,    -1,   106,    -1,   107,
+      -1,   108,    -1,   109,    -1,   110,    -1,   111,    -1,   112,
+      -1,    99,    -1,   100,    -1,   101,    -1,   102,    -1,    27,
       -1,    28,    -1,    16,    -1,    14,    -1,    12,    -1,    10,
-      -1,    17,    -1,    15,    -1,    13,    -1,    11,    -1,   161,
-      -1,   162,    -1,    18,    -1,    19,    -1,   197,   139,    -1,
-      -1,    41,    -1,    42,    -1,    43,    -1,    44,    -1,    45,
-      -1,    46,    -1,    47,    -1,    -1,    -1,    65,    -1,    66,
-      -1,    67,    -1,    68,    -1,    69,    -1,    70,    -1,    64,
-       4,    -1,    -1,    57,     4,    -1,    -1,   140,    57,     4,
-      -1,    34,    24,    -1,    -1,   170,    -1,    -1,   140,   173,
-     172,    -1,   170,    -1,    57,     4,    -1,   176,    -1,     8,
-      -1,   178,    -1,     8,    -1,   178,    -1,     9,    -1,    10,
-      -1,    11,    -1,    12,    -1,    13,    -1,    14,    -1,    15,
-      -1,    16,    -1,    17,    -1,    18,    -1,    19,    -1,    20,
-      -1,    21,    -1,    48,    -1,   177,    -1,   212,    -1,   141,
-       4,    -1,   175,   142,   180,   143,    -1,   144,     4,   145,
-     178,   146,    -1,   147,     4,   145,   178,   148,    -1,   149,
-     179,   150,    -1,   149,   150,    -1,   147,   149,   179,   150,
-     148,    -1,   147,   149,   150,   148,    -1,   178,   151,    -1,
-     178,    -1,   179,   140,   178,    -1,   179,    -1,   179,   140,
-      37,    -1,    37,    -1,    -1,   176,   144,   183,   146,    -1,
-     176,   144,   146,    -1,   176,   152,    24,    -1,   176,   147,
-     183,   148,    -1,   176,   149,   183,   150,    -1,   176,   149,
-     150,    -1,   176,    38,    -1,   176,    39,    -1,   176,   212,
-      -1,   176,   182,    -1,   176,    26,    -1,   161,     3,    -1,
-     161,     4,    -1,   162,     4,    -1,   162,     3,    -1,     9,
-      27,    -1,     9,    28,    -1,   164,     7,    -1,   157,   142,
-     181,    36,   176,   143,    -1,   117,   142,   181,   226,   143,
-      -1,   131,   142,   181,   140,   181,   140,   181,   143,    -1,
-     155,   142,   181,   140,   181,   143,    -1,   156,   142,   181,
-     140,   181,   143,    -1,    90,   159,   142,   181,   140,   181,
-     143,    -1,    91,   160,   142,   181,   140,   181,   143,    -1,
-     158,   142,   181,   140,   181,   143,    -1,   136,   142,   181,
-     140,   181,   143,    -1,   137,   142,   181,   140,   181,   140,
-     181,   143,    -1,   138,   142,   181,   140,   181,   140,   181,
-     143,    -1,   183,   140,   181,    -1,   181,    -1,    32,    -1,
-      33,    -1,   186,    -1,   186,   206,    -1,   186,   208,    -1,
-     186,    62,    61,   192,    -1,   186,    25,    -1,   187,    -1,
-     187,   165,    20,   174,    -1,   187,   208,    -1,   187,    62,
-      61,   192,    -1,    -1,   187,   165,   166,   184,   181,   188,
-     172,    -1,    -1,   187,   165,    50,   184,   176,   189,   172,
-      -1,    -1,   187,   165,    45,   184,   176,   190,   172,    -1,
-      -1,   187,   165,    47,   184,   176,   191,   172,    -1,   187,
-      51,   194,    -1,   187,    58,   139,   195,    -1,    -1,    24,
-      -1,    56,    -1,    55,    -1,    53,   139,   193,    -1,    54,
-     139,     4,    -1,    52,   139,    24,    -1,    71,   139,    24,
-      -1,   144,   196,   146,    -1,   196,   140,    24,    -1,    24,
-      -1,    -1,    22,    -1,    24,    -1,   197,    -1,    -1,   176,
-     198,    -1,   200,   140,   199,    -1,   199,    -1,   200,    -1,
-     200,   140,    37,    -1,    37,    -1,    -1,   167,   174,   197,
-     142,   201,   143,   171,   168,    -1,    29,    -1,   149,    -1,
-     166,   202,   203,    -1,    30,    -1,   150,    -1,   215,   205,
-      -1,    -1,    45,    -1,    47,    -1,    -1,    31,   209,   207,
-     202,    -1,    -1,    63,    -1,     3,    -1,     4,    -1,     7,
-      -1,    27,    -1,    28,    -1,    38,    -1,    39,    -1,    26,
-      -1,   147,   183,   148,    -1,   182,    -1,    61,   210,    24,
-     140,    24,    -1,   154,    -1,   197,    -1,   212,    -1,   211,
-      -1,   176,   213,    -1,   215,   216,    -1,   204,   216,    -1,
-     217,   165,   218,    -1,   217,   220,    -1,    -1,    23,    -1,
-      72,   214,    -1,    72,     8,    -1,    73,    21,   213,    -1,
-      73,     9,   213,   140,    21,   213,   140,    21,   213,    -1,
-      74,   163,   213,   140,    21,   213,   144,   219,   146,    -1,
-      74,   163,   213,   140,    21,   213,   144,   146,    -1,    75,
-     167,   174,   213,   142,   223,   143,    36,    21,   213,    76,
-      21,   213,    -1,    76,    -1,    77,    -1,   219,   163,   211,
-     140,    21,   213,    -1,   163,   211,   140,    21,   213,    -1,
-     165,   225,    -1,   176,   144,   213,   140,   213,   146,    -1,
-     221,   140,   144,   213,   140,   213,   146,    -1,   214,    -1,
-     222,   140,   214,    -1,   222,    -1,    -1,    60,    59,    -1,
-      59,    -1,   155,   176,   213,   140,   213,    -1,   156,   176,
-     213,   140,   213,    -1,    90,   159,   176,   213,   140,   213,
-      -1,    91,   160,   176,   213,   140,   213,    -1,    49,   214,
-      -1,   158,   214,   140,   214,    -1,   157,   214,    36,   176,
-      -1,   131,   214,   140,   214,   140,   214,    -1,   135,   214,
-     140,   176,    -1,   136,   214,   140,   214,    -1,   137,   214,
-     140,   214,   140,   214,    -1,   138,   214,   140,   214,   140,
-     214,    -1,   130,   221,    -1,   224,   167,   174,   213,   142,
-     223,   143,    -1,   228,    -1,   140,   222,    -1,    -1,    35,
-      -1,    -1,   112,   176,   169,    -1,   112,   176,   140,    15,
-     213,   169,    -1,   113,   176,   169,    -1,   113,   176,   140,
-      15,   213,   169,    -1,   114,   214,    -1,   227,   115,   176,
-     213,    -1,   227,   116,   214,   140,   176,   213,    -1,   117,
-     176,   213,   226,    -1
+      -1,    17,    -1,    15,    -1,    13,    -1,    11,    -1,   162,
+      -1,   163,    -1,    18,    -1,    19,    -1,   202,   140,    -1,
+      -1,    42,    -1,    44,    -1,    43,    -1,    45,    -1,    47,
+      -1,    46,    -1,    48,    -1,    51,    -1,    -1,    46,    -1,
+      48,    -1,    42,    -1,    43,    -1,    44,    -1,    47,    -1,
+      -1,    -1,    66,    -1,    67,    -1,    68,    -1,    69,    -1,
+      70,    -1,    71,    -1,    65,     4,    -1,    -1,    58,     4,
+      -1,    -1,   141,    58,     4,    -1,    35,    24,    -1,    -1,
+     174,    -1,    -1,   141,   177,   176,    -1,   174,    -1,    58,
+       4,    -1,   180,    -1,     8,    -1,   182,    -1,     8,    -1,
+     182,    -1,     9,    -1,    10,    -1,    11,    -1,    12,    -1,
+      13,    -1,    14,    -1,    15,    -1,    16,    -1,    17,    -1,
+      18,    -1,    19,    -1,    20,    -1,    49,    -1,   181,    -1,
+     215,    -1,   142,     4,    -1,   179,   143,   184,   144,    -1,
+     145,     4,   146,   182,   147,    -1,   148,     4,   146,   182,
+     149,    -1,   150,   183,   151,    -1,   150,   151,    -1,   148,
+     150,   183,   151,   149,    -1,   148,   150,   151,   149,    -1,
+     182,   152,    -1,   182,    -1,   183,   141,   182,    -1,   183,
+      -1,   183,   141,    38,    -1,    38,    -1,    -1,   180,   145,
+     187,   147,    -1,   180,   145,   147,    -1,   180,   153,    24,
+      -1,   180,   148,   187,   149,    -1,   180,   150,   187,   151,
+      -1,   180,   150,   151,    -1,   180,    39,    -1,   180,    40,
+      -1,   180,   215,    -1,   180,   186,    -1,   180,    26,    -1,
+     162,     3,    -1,   162,     4,    -1,   163,     4,    -1,   163,
+       3,    -1,     9,    27,    -1,     9,    28,    -1,   165,     7,
+      -1,   158,   143,   185,    37,   180,   144,    -1,   118,   143,
+     185,   229,   144,    -1,   132,   143,   185,   141,   185,   141,
+     185,   144,    -1,   156,   143,   185,   141,   185,   144,    -1,
+     157,   143,   185,   141,   185,   144,    -1,    91,   160,   143,
+     185,   141,   185,   144,    -1,    92,   161,   143,   185,   141,
+     185,   144,    -1,   159,   143,   185,   141,   185,   144,    -1,
+     137,   143,   185,   141,   185,   144,    -1,   138,   143,   185,
+     141,   185,   141,   185,   144,    -1,   139,   143,   185,   141,
+     185,   141,   185,   144,    -1,   187,   141,   185,    -1,   185,
+      -1,    33,    -1,    34,    -1,   190,    -1,    -1,   191,    -1,
+     190,   191,    -1,    -1,    32,   192,   211,    -1,    -1,    31,
+     193,   212,    -1,    63,    62,   197,    -1,    25,    -1,   166,
+      21,   178,    -1,    -1,   166,   188,   185,   194,   176,    -1,
+      -1,   166,   167,   188,   185,   195,   176,    -1,    -1,   166,
+     168,   188,   180,   196,   176,    -1,    52,   199,    -1,    59,
+     140,   200,    -1,    24,    -1,    57,    -1,    56,    -1,    54,
+     140,   198,    -1,    55,   140,     4,    -1,    53,   140,    24,
+      -1,    72,   140,    24,    -1,   145,   201,   147,    -1,   201,
+     141,    24,    -1,    24,    -1,    -1,    22,    -1,    24,    -1,
+     202,    -1,    -1,   180,   203,    -1,   205,   141,   204,    -1,
+     204,    -1,   205,    -1,   205,   141,    38,    -1,    38,    -1,
+      -1,   171,   178,   202,   143,   206,   144,   175,   172,    -1,
+      29,    -1,   150,    -1,   170,   207,   208,    -1,    30,    -1,
+     151,    -1,   218,   210,    -1,   169,   207,    -1,    -1,    64,
+      -1,     3,    -1,     4,    -1,     7,    -1,    27,    -1,    28,
+      -1,    39,    -1,    40,    -1,    26,    -1,   148,   187,   149,
+      -1,   186,    -1,    62,   213,    24,   141,    24,    -1,   155,
+      -1,   202,    -1,   215,    -1,   214,    -1,   180,   216,    -1,
+     218,   219,    -1,   209,   219,    -1,   220,   166,   221,    -1,
+     220,   223,    -1,    -1,    23,    -1,    73,   217,    -1,    73,
+       8,    -1,    74,    20,   216,    -1,    74,     9,   216,   141,
+      20,   216,   141,    20,   216,    -1,    75,   164,   216,   141,
+      20,   216,   145,   222,   147,    -1,    75,   164,   216,   141,
+      20,   216,   145,   147,    -1,    76,   171,   178,   216,   143,
+     226,   144,    37,    20,   216,    77,    20,   216,    -1,    77,
+      -1,    78,    -1,   222,   164,   214,   141,    20,   216,    -1,
+     164,   214,   141,    20,   216,    -1,   166,   228,    -1,   180,
+     145,   216,   141,   216,   147,    -1,   224,   141,   145,   216,
+     141,   216,   147,    -1,   217,    -1,   225,   141,   217,    -1,
+     225,    -1,    -1,    61,    60,    -1,    60,    -1,   156,   180,
+     216,   141,   216,    -1,   157,   180,   216,   141,   216,    -1,
+      91,   160,   180,   216,   141,   216,    -1,    92,   161,   180,
+     216,   141,   216,    -1,    50,   217,    -1,   159,   217,   141,
+     217,    -1,   158,   217,    37,   180,    -1,   132,   217,   141,
+     217,   141,   217,    -1,   136,   217,   141,   180,    -1,   137,
+     217,   141,   217,    -1,   138,   217,   141,   217,   141,   217,
+      -1,   139,   217,   141,   217,   141,   217,    -1,   131,   224,
+      -1,   227,   171,   178,   216,   143,   226,   144,    -1,   231,
+      -1,   141,   225,    -1,    -1,    36,    -1,    -1,   113,   180,
+     173,    -1,   113,   180,   141,    15,   216,   173,    -1,   114,
+     180,   173,    -1,   114,   180,   141,    15,   216,   173,    -1,
+     115,   217,    -1,   230,   116,   180,   216,    -1,   230,   117,
+     217,   141,   180,   216,    -1,   118,   180,   216,   229,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
-       0,   988,   988,   989,   999,   999,   999,   999,   999,   999,
-     999,   999,   999,  1000,  1000,  1000,  1001,  1001,  1001,  1001,
-    1001,  1001,  1002,  1002,  1002,  1002,  1002,  1002,  1003,  1003,
-    1003,  1005,  1005,  1006,  1006,  1007,  1007,  1008,  1008,  1009,
-    1009,  1013,  1013,  1014,  1014,  1015,  1015,  1016,  1016,  1017,
-    1017,  1018,  1018,  1019,  1019,  1020,  1021,  1026,  1026,  1026,
-    1026,  1027,  1027,  1027,  1027,  1028,  1028,  1029,  1029,  1032,
-    1036,  1041,  1042,  1043,  1044,  1045,  1046,  1047,  1048,  1050,
-    1051,  1052,  1053,  1054,  1055,  1056,  1057,  1066,  1067,  1073,
-    1074,  1082,  1090,  1091,  1096,  1097,  1098,  1103,  1117,  1117,
-    1118,  1118,  1120,  1130,  1130,  1130,  1130,  1130,  1130,  1130,
-    1131,  1131,  1131,  1131,  1131,  1131,  1132,  1136,  1140,  1148,
-    1156,  1169,  1174,  1186,  1196,  1200,  1210,  1214,  1225,  1230,
-    1236,  1237,  1241,  1245,  1256,  1282,  1296,  1326,  1352,  1373,
-    1386,  1396,  1401,  1462,  1469,  1477,  1483,  1489,  1495,  1501,
-    1505,  1509,  1517,  1529,  1550,  1558,  1564,  1575,  1580,  1585,
-    1594,  1600,  1606,  1615,  1619,  1627,  1627,  1637,  1645,  1650,
-    1654,  1658,  1662,  1677,  1699,  1702,  1705,  1705,  1713,  1713,
-    1721,  1721,  1729,  1729,  1738,  1741,  1744,  1748,  1761,  1762,
-    1764,  1768,  1777,  1781,  1786,  1788,  1793,  1798,  1807,  1807,
-    1808,  1808,  1810,  1817,  1823,  1830,  1834,  1840,  1845,  1850,
-    1945,  1945,  1947,  1955,  1955,  1957,  1962,  1963,  1964,  1966,
-    1966,  1976,  1980,  1985,  1989,  1993,  1997,  2001,  2005,  2009,
-    2013,  2017,  2042,  2046,  2060,  2064,  2070,  2070,  2076,  2081,
-    2085,  2094,  2105,  2114,  2126,  2139,  2143,  2147,  2152,  2161,
-    2180,  2189,  2245,  2249,  2256,  2267,  2280,  2289,  2298,  2308,
-    2312,  2319,  2319,  2321,  2325,  2330,  2349,  2364,  2375,  2386,
-    2399,  2408,  2419,  2427,  2432,  2438,  2444,  2450,  2465,  2524,
-    2531,  2534,  2539,  2543,  2550,  2555,  2561,  2566,  2572,  2580,
-    2592,  2607
+       0,   989,   989,   990,  1000,  1000,  1000,  1000,  1000,  1000,
+    1000,  1000,  1000,  1001,  1001,  1001,  1002,  1002,  1002,  1002,
+    1002,  1002,  1003,  1003,  1003,  1003,  1003,  1003,  1004,  1004,
+    1004,  1006,  1006,  1007,  1007,  1008,  1008,  1009,  1009,  1010,
+    1010,  1014,  1014,  1015,  1015,  1016,  1016,  1017,  1017,  1018,
+    1018,  1019,  1019,  1020,  1020,  1021,  1022,  1027,  1027,  1027,
+    1027,  1028,  1028,  1028,  1028,  1029,  1029,  1030,  1030,  1033,
+    1037,  1043,  1044,  1045,  1046,  1047,  1051,  1052,  1053,  1057,
+    1058,  1059,  1063,  1064,  1065,  1066,  1067,  1070,  1071,  1072,
+    1073,  1074,  1075,  1076,  1077,  1086,  1087,  1093,  1094,  1102,
+    1110,  1111,  1116,  1117,  1118,  1123,  1137,  1137,  1138,  1138,
+    1140,  1150,  1150,  1150,  1150,  1150,  1150,  1150,  1151,  1151,
+    1151,  1151,  1151,  1152,  1156,  1160,  1168,  1176,  1189,  1194,
+    1206,  1216,  1220,  1230,  1234,  1245,  1250,  1256,  1257,  1261,
+    1265,  1276,  1302,  1316,  1346,  1372,  1393,  1406,  1416,  1421,
+    1482,  1489,  1497,  1503,  1509,  1515,  1521,  1525,  1529,  1537,
+    1549,  1570,  1578,  1584,  1595,  1600,  1605,  1614,  1620,  1626,
+    1635,  1639,  1647,  1647,  1658,  1663,  1671,  1672,  1676,  1676,
+    1680,  1680,  1683,  1686,  1698,  1720,  1720,  1729,  1729,  1737,
+    1737,  1745,  1748,  1754,  1767,  1768,  1770,  1774,  1783,  1787,
+    1792,  1794,  1799,  1804,  1813,  1813,  1814,  1814,  1816,  1823,
+    1829,  1836,  1840,  1846,  1851,  1856,  1951,  1951,  1953,  1961,
+    1961,  1963,  1968,  1978,  1982,  1987,  1991,  1995,  1999,  2003,
+    2007,  2011,  2015,  2019,  2044,  2048,  2062,  2066,  2072,  2072,
+    2078,  2083,  2087,  2096,  2107,  2116,  2128,  2141,  2145,  2149,
+    2154,  2163,  2182,  2191,  2247,  2251,  2258,  2269,  2282,  2291,
+    2300,  2310,  2314,  2321,  2321,  2323,  2327,  2332,  2351,  2366,
+    2377,  2388,  2401,  2410,  2421,  2429,  2434,  2440,  2446,  2452,
+    2467,  2526,  2533,  2536,  2541,  2545,  2552,  2557,  2563,  2568,
+    2574,  2582,  2594,  2609
 };
 #endif
 
@@ -1652,10 +1652,10 @@
 {
   "$end", "error", "$undefined", "ESINT64VAL", "EUINT64VAL", "SINTVAL",
   "UINTVAL", "FPVAL", "VOID", "BOOL", "SBYTE", "UBYTE", "SHORT", "USHORT",
-  "INT", "UINT", "LONG", "ULONG", "FLOAT", "DOUBLE", "TYPE", "LABEL",
+  "INT", "UINT", "LONG", "ULONG", "FLOAT", "DOUBLE", "LABEL", "TYPE",
   "VAR_ID", "LABELSTR", "STRINGCONSTANT", "IMPLEMENTATION",
   "ZEROINITIALIZER", "TRUETOK", "FALSETOK", "BEGINTOK", "ENDTOK",
-  "DECLARE", "GLOBAL", "CONSTANT", "SECTION", "VOLATILE", "TO",
+  "DECLARE", "DEFINE", "GLOBAL", "CONSTANT", "SECTION", "VOLATILE", "TO",
   "DOTDOTDOT", "NULL_TOK", "UNDEF", "CONST", "INTERNAL", "LINKONCE",
   "WEAK", "APPENDING", "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "OPAQUE",
   "NOT", "EXTERNAL", "TARGET", "TRIPLE", "ENDIAN", "POINTERSIZE", "LITTLE",
@@ -1674,20 +1674,20 @@
   "'['", "'x'", "']'", "'<'", "'>'", "'{'", "'}'", "'*'", "'c'", "$accept",
   "INTVAL", "ArithmeticOps", "LogicalOps", "CastOps", "ShiftOps",
   "IPredicates", "FPredicates", "SIntType", "UIntType", "IntType",
-  "FPType", "OptAssign", "OptLinkage", "OptCallingConv", "OptAlign",
+  "FPType", "OptAssign", "GVInternalLinkage", "GVExternalLinkage",
+  "FnDeclareLinkage", "FunctionLinkage", "OptCallingConv", "OptAlign",
   "OptCAlign", "SectionString", "OptSection", "GlobalVarAttributes",
   "GlobalVarAttribute", "TypesV", "UpRTypesV", "Types", "PrimType",
   "UpRTypes", "TypeListI", "ArgTypeListI", "ConstVal", "ConstExpr",
-  "ConstVector", "GlobalType", "Module", "FunctionList", "ConstPool", "@1",
-  "@2", "@3", "@4", "AsmBlock", "BigOrLittle", "TargetDefinition",
-  "LibrariesDefinition", "LibList", "Name", "OptName", "ArgVal",
-  "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN", "FunctionHeader",
-  "END", "Function", "FnDeclareLinkage", "FunctionProto", "@5",
-  "OptSideEffect", "ConstValueRef", "SymbolicValueRef", "ValueRef",
-  "ResolvedVal", "BasicBlockList", "BasicBlock", "InstructionList",
-  "BBTerminatorInst", "JumpTable", "Inst", "PHIList", "ValueRefList",
-  "ValueRefListE", "OptTailCall", "InstVal", "IndexList", "OptVolatile",
-  "MemoryInst", 0
+  "ConstVector", "GlobalType", "Module", "DefinitionList", "Definition",
+  "@1", "@2", "@3", "@4", "@5", "AsmBlock", "BigOrLittle",
+  "TargetDefinition", "LibrariesDefinition", "LibList", "Name", "OptName",
+  "ArgVal", "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN",
+  "FunctionHeader", "END", "Function", "FunctionProto", "OptSideEffect",
+  "ConstValueRef", "SymbolicValueRef", "ValueRef", "ResolvedVal",
+  "BasicBlockList", "BasicBlock", "InstructionList", "BBTerminatorInst",
+  "JumpTable", "Inst", "PHIList", "ValueRefList", "ValueRefListE",
+  "OptTailCall", "InstVal", "IndexList", "OptVolatile", "MemoryInst", 0
 };
 #endif
 
@@ -1709,45 +1709,45 @@
      355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
      365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
      375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,   389,   390,   391,   392,   393,    61,
-      44,    92,    40,    41,    91,   120,    93,    60,    62,   123,
-     125,    42,    99
+     385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
+      61,    44,    92,    40,    41,    91,   120,    93,    60,    62,
+     123,   125,    42,    99
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const unsigned char yyr1[] =
 {
-       0,   153,   154,   154,   155,   155,   155,   155,   155,   155,
-     155,   155,   155,   156,   156,   156,   157,   157,   157,   157,
-     157,   157,   157,   157,   157,   157,   157,   157,   158,   158,
-     158,   159,   159,   159,   159,   159,   159,   159,   159,   159,
+       0,   154,   155,   155,   156,   156,   156,   156,   156,   156,
+     156,   156,   156,   157,   157,   157,   158,   158,   158,   158,
+     158,   158,   158,   158,   158,   158,   158,   158,   159,   159,
      159,   160,   160,   160,   160,   160,   160,   160,   160,   160,
-     160,   160,   160,   160,   160,   160,   160,   161,   161,   161,
-     161,   162,   162,   162,   162,   163,   163,   164,   164,   165,
-     165,   166,   166,   166,   166,   166,   166,   166,   166,   167,
-     167,   167,   167,   167,   167,   167,   167,   168,   168,   169,
-     169,   170,   171,   171,   172,   172,   173,   173,   174,   174,
-     175,   175,   176,   177,   177,   177,   177,   177,   177,   177,
-     177,   177,   177,   177,   177,   177,   178,   178,   178,   178,
-     178,   178,   178,   178,   178,   178,   178,   178,   179,   179,
-     180,   180,   180,   180,   181,   181,   181,   181,   181,   181,
-     181,   181,   181,   181,   181,   181,   181,   181,   181,   181,
-     181,   181,   182,   182,   182,   182,   182,   182,   182,   182,
-     182,   182,   182,   183,   183,   184,   184,   185,   186,   186,
-     186,   186,   186,   187,   187,   187,   188,   187,   189,   187,
-     190,   187,   191,   187,   187,   187,   187,   192,   193,   193,
-     194,   194,   194,   194,   195,   196,   196,   196,   197,   197,
-     198,   198,   199,   200,   200,   201,   201,   201,   201,   202,
-     203,   203,   204,   205,   205,   206,   207,   207,   207,   209,
-     208,   210,   210,   211,   211,   211,   211,   211,   211,   211,
-     211,   211,   211,   211,   212,   212,   213,   213,   214,   215,
-     215,   216,   217,   217,   217,   218,   218,   218,   218,   218,
-     218,   218,   218,   218,   219,   219,   220,   221,   221,   222,
-     222,   223,   223,   224,   224,   225,   225,   225,   225,   225,
-     225,   225,   225,   225,   225,   225,   225,   225,   225,   225,
-     226,   226,   227,   227,   228,   228,   228,   228,   228,   228,
-     228,   228
+     160,   161,   161,   161,   161,   161,   161,   161,   161,   161,
+     161,   161,   161,   161,   161,   161,   161,   162,   162,   162,
+     162,   163,   163,   163,   163,   164,   164,   165,   165,   166,
+     166,   167,   167,   167,   167,   167,   168,   168,   168,   169,
+     169,   169,   170,   170,   170,   170,   170,   171,   171,   171,
+     171,   171,   171,   171,   171,   172,   172,   173,   173,   174,
+     175,   175,   176,   176,   177,   177,   178,   178,   179,   179,
+     180,   181,   181,   181,   181,   181,   181,   181,   181,   181,
+     181,   181,   181,   182,   182,   182,   182,   182,   182,   182,
+     182,   182,   182,   182,   182,   183,   183,   184,   184,   184,
+     184,   185,   185,   185,   185,   185,   185,   185,   185,   185,
+     185,   185,   185,   185,   185,   185,   185,   185,   185,   186,
+     186,   186,   186,   186,   186,   186,   186,   186,   186,   186,
+     187,   187,   188,   188,   189,   189,   190,   190,   192,   191,
+     193,   191,   191,   191,   191,   194,   191,   195,   191,   196,
+     191,   191,   191,   197,   198,   198,   199,   199,   199,   199,
+     200,   201,   201,   201,   202,   202,   203,   203,   204,   205,
+     205,   206,   206,   206,   206,   207,   208,   208,   209,   210,
+     210,   211,   212,   213,   213,   214,   214,   214,   214,   214,
+     214,   214,   214,   214,   214,   214,   215,   215,   216,   216,
+     217,   218,   218,   219,   220,   220,   220,   221,   221,   221,
+     221,   221,   221,   221,   221,   221,   222,   222,   223,   224,
+     224,   225,   225,   226,   226,   227,   227,   228,   228,   228,
+     228,   228,   228,   228,   228,   228,   228,   228,   228,   228,
+     228,   228,   229,   229,   230,   230,   231,   231,   231,   231,
+     231,   231,   231,   231
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -1760,29 +1760,29 @@
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     2,
-       0,     1,     1,     1,     1,     1,     1,     1,     0,     0,
-       1,     1,     1,     1,     1,     1,     2,     0,     2,     0,
-       3,     2,     0,     1,     0,     3,     1,     2,     1,     1,
+       0,     1,     1,     1,     1,     1,     1,     1,     1,     0,
+       1,     1,     1,     1,     1,     1,     0,     0,     1,     1,
+       1,     1,     1,     1,     2,     0,     2,     0,     3,     2,
+       0,     1,     0,     3,     1,     2,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     2,
-       4,     5,     5,     3,     2,     5,     4,     2,     1,     3,
-       1,     3,     1,     0,     4,     3,     3,     4,     4,     3,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     6,     5,     8,     6,     6,     7,     7,     6,
-       6,     8,     8,     3,     1,     1,     1,     1,     2,     2,
-       4,     2,     1,     4,     2,     4,     0,     7,     0,     7,
-       0,     7,     0,     7,     3,     4,     0,     1,     1,     1,
-       3,     3,     3,     3,     3,     3,     1,     0,     1,     1,
-       1,     0,     2,     3,     1,     1,     3,     1,     0,     8,
-       1,     1,     3,     1,     1,     2,     0,     1,     1,     0,
-       4,     0,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     3,     1,     5,     1,     1,     1,     1,     2,     2,
-       2,     3,     2,     0,     1,     2,     2,     3,     9,     9,
-       8,    13,     1,     1,     6,     5,     2,     6,     7,     1,
-       3,     1,     0,     2,     1,     5,     5,     6,     6,     2,
-       4,     4,     6,     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,     2,     4,     5,     5,
+       3,     2,     5,     4,     2,     1,     3,     1,     3,     1,
+       0,     4,     3,     3,     4,     4,     3,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     6,
+       5,     8,     6,     6,     7,     7,     6,     6,     8,     8,
+       3,     1,     1,     1,     1,     0,     1,     2,     0,     3,
+       0,     3,     3,     1,     3,     0,     5,     0,     6,     0,
+       6,     2,     3,     1,     1,     1,     3,     3,     3,     3,
+       3,     3,     1,     0,     1,     1,     1,     0,     2,     3,
+       1,     1,     3,     1,     0,     8,     1,     1,     3,     1,
+       1,     2,     2,     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,     6,
+       6,     2,     4,     4,     6,     4,     4,     6,     6,     2,
+       7,     1,     2,     0,     1,     0,     3,     6,     3,     6,
+       2,     4,     6,     4
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -1790,509 +1790,525 @@
    means the default is an error.  */
 static const unsigned short int yydefact[] =
 {
-     186,     0,    78,   172,     1,   171,   219,    71,    72,    73,
-      74,    75,    76,    77,     0,    79,   243,   168,   169,   243,
-     198,   199,     0,     0,     0,    78,     0,   174,   216,     0,
-       0,    80,    81,    82,    83,    84,    85,     0,     0,   244,
-     240,    70,   213,   214,   215,   239,     0,     0,     0,     0,
-     184,     0,     0,     0,     0,     0,     0,     0,    69,   217,
-     218,    79,   187,   170,    86,     2,     3,    99,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,     0,     0,     0,     0,   234,     0,     0,    98,
-     117,   102,   235,   118,   210,   211,   212,   283,   242,     0,
-       0,     0,     0,   197,   185,   175,   173,   165,   166,     0,
-       0,     0,     0,   220,   119,     0,     0,     0,   101,   124,
-     128,     0,     0,   133,   127,   282,     0,   264,     0,     0,
-       0,     0,    79,   252,   253,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,     0,     0,     0,
-       0,     0,     0,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,     0,     0,    28,    29,    30,
-       0,     0,     0,     0,     0,     0,     0,     0,   241,    79,
-     256,     0,   279,   192,   189,   188,   190,   191,   193,   196,
-       0,   180,   182,   178,   103,   104,   105,   106,   107,   108,
-     109,   110,   111,   112,   113,     0,     0,     0,     0,   176,
-       0,     0,     0,     0,     0,   123,   208,   132,   130,     0,
-       0,   269,   263,   246,   245,     0,     0,    60,    64,    59,
-      63,    58,    62,    57,    61,    65,    66,     0,     0,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    40,     0,
-      55,    56,    51,    52,    53,    54,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,     0,    89,    89,   288,
-       0,     0,   277,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   194,    94,    94,    94,
-     149,   150,   145,   146,   148,   147,   151,   144,   140,   141,
+      70,   204,   205,   183,   180,   178,     0,     0,     0,     0,
+       0,    70,   176,     0,    79,    86,     0,     0,     0,     0,
+     191,     0,     0,     0,   172,   173,    71,    73,    72,    74,
+      76,    75,    77,    78,     0,     0,     0,     1,   177,    69,
+      80,    81,    87,   181,    82,    83,    84,    85,    87,   245,
+     179,   245,     0,     0,     0,     0,   203,   192,   193,   182,
+       2,     3,   107,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,   121,   122,   123,     0,     0,     0,     0,
+     236,   184,     0,   106,   124,   110,   237,   125,     0,     0,
+     109,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,   121,     0,     0,     0,     0,   185,     0,    88,    89,
+      90,    91,    92,    93,     0,   222,     0,   246,   242,    70,
+     219,   220,   221,   241,   198,   195,   194,   196,   197,   199,
+     202,     0,   126,     0,     0,     0,   131,   135,     0,   140,
+     134,   187,   189,   156,   157,   152,   153,   155,   154,   158,
+     151,   147,   148,     4,     5,     6,     7,     8,     9,    10,
+      11,    12,    13,    14,    15,     0,     0,     0,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+       0,    28,    29,    30,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   150,   149,   102,    94,     0,
+     216,   217,   218,   285,   244,     0,   200,     0,     0,     0,
+       0,     0,   130,   139,   137,     0,   102,   102,    31,    32,
+      33,    34,    35,    36,    37,    38,    39,    40,     0,    55,
+      56,    51,    52,    53,    54,    41,    42,    43,    44,    45,
+      46,    47,    48,    49,    50,     0,     0,     0,     0,     0,
+       0,   142,   171,     0,     0,   146,     0,   143,     0,     0,
+       0,     0,     0,   186,     0,   284,     0,   266,     0,     0,
+       0,     0,    87,   254,   255,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   243,    87,   258,     0,   281,   201,   108,   108,   133,
+       0,   136,     0,   127,   188,   190,     0,     0,   283,     0,
+       0,     0,     0,     0,   141,   144,   145,     0,     0,     0,
+       0,     0,     0,   104,   102,   214,     0,   271,   265,   248,
+     247,     0,     0,    60,    64,    59,    63,    58,    62,    57,
+      61,    65,    66,     0,     0,     0,     0,    97,    97,   290,
+       0,     0,   279,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   128,   129,   132,   138,     0,
+       0,     0,     0,     0,     0,     0,     0,   170,     0,     0,
+       0,     0,    99,   105,   103,   213,   207,   210,   211,     0,
+     225,   226,   227,   232,   228,   229,   230,   231,   223,     0,
+     234,   239,   238,   240,     0,   249,     0,     0,     0,     0,
+       0,   286,     0,   288,   283,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   143,   142,    94,   100,   100,
-     126,     0,   129,   207,   201,   204,   205,     0,     0,   120,
-     223,   224,   225,   230,   226,   227,   228,   229,   221,     0,
-     232,   237,   236,   238,     0,   247,     0,     0,     0,     0,
-       0,   284,     0,   286,   281,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   195,
-       0,   181,   183,   179,     0,     0,     0,     0,     0,     0,
-       0,   135,   164,     0,     0,   139,     0,   136,     0,     0,
-       0,     0,   177,   121,   122,   125,   200,   202,     0,    92,
-     131,   222,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   291,     0,     0,     0,   273,   274,     0,
-       0,     0,     0,   271,   270,     0,   289,     0,     0,     0,
-      96,    94,     0,     0,   281,     0,     0,     0,     0,     0,
-     134,   137,   138,     0,     0,     0,     0,   206,   203,    93,
-      87,     0,   231,     0,     0,   262,     0,     0,    89,    90,
-      89,   259,   280,     0,     0,     0,     0,     0,   265,   266,
-     262,     0,    91,    97,    95,     0,     0,     0,     0,     0,
-       0,     0,   163,     0,     0,     0,     0,     0,   209,     0,
-       0,     0,   261,     0,   267,   268,     0,   285,   287,     0,
-       0,     0,   272,   275,   276,     0,   290,     0,     0,   153,
-       0,     0,     0,     0,     0,     0,     0,     0,    88,   233,
-       0,     0,     0,   260,   257,     0,   278,     0,     0,     0,
-     160,     0,     0,   155,   156,   152,   159,     0,   250,     0,
-       0,     0,   258,   157,   158,     0,     0,     0,   248,     0,
-     249,     0,     0,   154,   161,   162,     0,     0,     0,     0,
-       0,     0,   255,     0,     0,   254,   251
+       0,   261,   282,   160,     0,     0,     0,     0,     0,     0,
+       0,     0,   206,   208,     0,   100,   224,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   293,     0,     0,
+       0,   275,   276,     0,     0,     0,     0,   273,   272,     0,
+     291,     0,     0,     0,     0,     0,   167,     0,     0,   162,
+     163,   159,   166,   212,   209,   101,    95,     0,   233,     0,
+       0,   264,     0,     0,    97,    98,    97,     0,     0,     0,
+       0,     0,   267,   268,   264,     0,   164,   165,   262,     0,
+       0,     0,     0,   215,     0,     0,     0,   263,     0,   269,
+     270,     0,   287,   289,     0,     0,   274,   277,   278,     0,
+     292,   161,   168,   169,    96,   235,     0,     0,     0,   259,
+       0,   280,     0,   252,     0,     0,     0,   260,   250,     0,
+     251,     0,     0,     0,     0,     0,     0,     0,     0,   257,
+       0,     0,   256,   253
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
 static const short int yydefgoto[] =
 {
-      -1,    86,   311,   312,   313,   314,   249,   266,   205,   206,
-     237,   207,    25,    15,    37,   488,   351,   430,   450,   371,
-     431,    87,    88,   208,    90,    91,   121,   219,   382,   340,
-     383,   109,     1,     2,     3,   317,   289,   287,   288,    63,
-     186,    50,   104,   190,    92,   397,   325,   326,   327,    38,
-      96,    16,    44,    17,    61,    18,    28,   402,   341,    93,
-     343,   461,    19,    40,    41,   178,   540,    98,   272,   492,
-     493,   179,   180,   413,   181,   182
+      -1,    80,   191,   192,   193,   194,   228,   245,   102,   103,
+     343,   104,     9,    34,    35,    42,    48,   114,   513,   411,
+     323,   486,   263,   324,    81,    82,   105,    84,    85,   138,
+     215,   252,   400,   253,    36,    10,    11,    12,    15,    14,
+     197,   216,   217,    59,   127,    20,    57,   131,    86,   443,
+     387,   388,   389,   115,   202,    49,   122,    50,    43,   447,
+     401,    87,   403,   431,    51,   118,   119,   291,   545,   204,
+     352,   517,   518,   292,   293,   372,   294,   295
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -514
+#define YYPACT_NINF -420
 static const short int yypact[] =
 {
-    -514,    47,    80,   817,  -514,  -514,  -514,  -514,  -514,  -514,
-    -514,  -514,  -514,  -514,    -3,    79,    67,  -514,  -514,    -9,
-    -514,  -514,    33,   -46,    42,   139,   -29,  -514,    -2,    95,
-     126,  -514,  -514,  -514,  -514,  -514,  -514,  1112,   -18,  -514,
-    -514,    96,  -514,  -514,  -514,  -514,    -7,    29,    56,    61,
-    -514,    34,    95,  1112,    74,    74,    74,    74,  -514,  -514,
-    -514,    79,  -514,  -514,  -514,  -514,  -514,    45,  -514,  -514,
-    -514,  -514,  -514,  -514,  -514,  -514,  -514,  -514,  -514,  -514,
-    -514,  -514,   209,   211,     2,   538,  -514,    96,    77,  -514,
-    -514,  -118,  -514,  -514,  -514,  -514,  -514,  1252,  -514,   201,
-     102,   224,   206,   215,  -514,  -514,  -514,  -514,  -514,  1153,
-    1153,  1153,  1173,  -514,  -514,   112,   115,   598,  -514,  -514,
-    -118,  -111,    99,   643,  -514,  -514,  1153,  -514,   207,  1214,
-      14,   239,    79,  -514,  -514,  -514,  -514,  -514,  -514,  -514,
-    -514,  -514,  -514,  -514,  -514,  -514,  -514,   110,   190,  1153,
-    1153,  1153,  1153,  -514,  -514,  -514,  -514,  -514,  -514,  -514,
-    -514,  -514,  -514,  -514,  -514,  1153,  1153,  -514,  -514,  -514,
-    1153,  1153,  1153,  1153,  1153,  1153,  1153,  1153,  -514,    79,
-    -514,    48,  -514,  -514,  -514,  -514,  -514,  -514,  -514,  -514,
-     -94,  -514,  -514,  -514,   138,   171,   173,   187,   189,   195,
-     218,   220,   230,   258,   260,   232,   234,   267,   393,  -514,
-    1153,  1153,   129,   -99,  1153,  -514,   967,  -514,   140,   135,
-     691,  -514,  -514,    45,  -514,   691,   691,  -514,  -514,  -514,
-    -514,  -514,  -514,  -514,  -514,  -514,  -514,   691,  1112,  -514,
-    -514,  -514,  -514,  -514,  -514,  -514,  -514,  -514,  -514,  1153,
-    -514,  -514,  -514,  -514,  -514,  -514,  -514,  -514,  -514,  -514,
-    -514,  -514,  -514,  -514,  -514,  -514,  1153,   145,   146,  -514,
-     691,   158,   163,   164,   165,   167,   169,   170,   691,   691,
-     243,   172,  1112,  1153,  1153,   287,  -514,   174,   174,   174,
-    -514,  -514,  -514,  -514,  -514,  -514,  -514,  -514,  -514,  -514,
-     110,   190,   176,   177,   188,   191,   192,   914,  1173,   618,
-     289,   193,   194,   196,   197,  -514,  -514,   174,  -119,   -60,
-    -514,   181,  -118,  -514,    96,  -514,   175,   198,  1008,  -514,
-    -514,  -514,  -514,  -514,  -514,  -514,  -514,  -514,   274,  1173,
-    -514,  -514,  -514,  -514,   200,  -514,   203,   691,   691,   691,
-       0,  -514,    13,  -514,   204,   691,   202,  1153,  1153,  1153,
-    1153,  1153,   205,   212,  1153,  1153,   691,   691,   213,  -514,
-     -17,  -514,  -514,  -514,   214,   216,  1173,  1173,  1173,  1173,
-    1173,  -514,  -514,    15,   -32,  -514,   -69,  -514,  1173,  1173,
-    1173,  1173,  -514,  -514,  -514,  -514,  -514,  -514,  1059,   313,
-    -514,  -514,   327,   -31,   333,   334,   217,   222,   223,   691,
-     356,   691,  1153,  -514,   225,   691,   226,  -514,  -514,   227,
-     238,   691,   691,  -514,  -514,   228,  -514,  1153,   357,   376,
-    -514,   174,  1173,  1173,   204,   244,   248,   249,   254,  1173,
-    -514,  -514,  -514,   255,   256,   347,   257,  -514,  -514,  -514,
-     345,   263,  -514,   691,   691,  1153,   691,   691,   266,  -514,
-     266,  -514,   268,   691,   269,  1153,  1153,  1153,  -514,  -514,
-    1153,   691,  -514,  -514,  -514,   272,   273,   264,  1173,  1173,
-    1173,  1173,  -514,  1173,  1173,  1153,  1173,   410,  -514,   392,
-     280,   277,   268,   283,  -514,  -514,   366,  -514,  -514,  1153,
-     281,   691,  -514,  -514,  -514,   291,  -514,  1173,  1173,  -514,
-     295,   293,   297,   298,   296,   299,   300,   301,  -514,  -514,
-     419,    51,   405,  -514,  -514,   304,  -514,   302,   303,  1173,
-    -514,  1173,  1173,  -514,  -514,  -514,  -514,   691,  -514,   827,
-      85,   430,  -514,  -514,  -514,   309,   311,   312,  -514,   316,
-    -514,   827,   691,  -514,  -514,  -514,   436,   318,   385,   691,
-     442,   443,  -514,   691,   691,  -514,  -514
+      64,  -420,  -420,  -420,  -420,  -420,    45,   -80,    49,    59,
+     124,   118,  -420,   -14,   -33,   159,     8,    11,    32,    38,
+    -420,   -10,   121,  1149,  -420,  -420,  -420,  -420,  -420,  -420,
+    -420,  -420,  -420,  -420,   141,   141,  1195,  -420,  -420,  -420,
+    -420,  -420,   143,  -420,  -420,  -420,  -420,  -420,   143,   157,
+    -420,   -12,   191,   148,   179,   197,   201,  -420,  -420,  -420,
+    -420,  -420,    90,  -420,  -420,  -420,  -420,  -420,  -420,  -420,
+    -420,  -420,  -420,  -420,  -420,  -420,   227,   233,     4,    34,
+    -420,  -420,    99,  -420,  -420,   -62,  -420,  -420,  1195,  1240,
+    -420,   190,   216,   220,   232,   241,   247,   267,   269,   271,
+     246,   285,   275,   277,   287,   523,  -420,   278,  -420,  -420,
+    -420,  -420,  -420,  -420,  1149,  -420,   -19,  -420,  -420,    63,
+    -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,
+    -420,   -13,  -420,   149,   150,   574,  -420,   -62,   -84,   934,
+    -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,
+    -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,
+    -420,  -420,  -420,  -420,  -420,   231,    87,   154,  -420,  -420,
+    -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,
+     155,  -420,  -420,  -420,   156,   158,   160,   982,  1195,   669,
+     280,   162,   163,   165,   166,  -420,  -420,   169,  -420,    63,
+    -420,  -420,  -420,  1339,  -420,   288,  -420,  1240,  1240,   164,
+     -57,  1240,  -420,  -420,   170,   173,   169,   169,  -420,  -420,
+    -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,   171,  -420,
+    -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,
+    -420,  -420,  -420,  -420,  -420,   175,  1195,  1195,  1195,  1195,
+    1195,  -420,  -420,     5,   -86,  -420,   -32,  -420,  1195,  1195,
+    1195,  1195,    24,  -420,   176,  -420,  1240,  -420,   260,  1260,
+      88,   147,   143,  -420,  -420,   231,    87,  1240,  1240,  1240,
+    1240,  1240,  1240,  1240,  1240,  1240,  1240,  1240,  1240,  1240,
+    1240,  -420,   143,  -420,   168,  -420,  -420,    19,    -5,  -420,
+     185,   -62,  1002,  -420,  -420,  -420,  1195,  1195,   194,   195,
+     196,   202,   203,  1195,  -420,  -420,  -420,   204,   205,   301,
+     206,   318,   345,  -420,   169,  1047,   704,  -420,  -420,    90,
+    -420,   704,   704,  -420,  -420,  -420,  -420,  -420,  -420,  -420,
+    -420,  -420,  -420,   704,  1149,  1240,  1240,   209,   210,  -420,
+     704,   207,   219,   221,   222,   226,   228,   229,   704,   704,
+     331,   230,  1149,  1240,  1240,  -420,  -420,  -420,  -420,   234,
+     235,  1240,   236,  1195,  1195,  1195,  1195,  -420,  1195,  1195,
+    1240,  1195,  -420,  -420,  -420,  -420,    63,  -420,   237,   238,
+    -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,   309,  1195,
+    -420,  -420,  -420,  -420,   240,  -420,   244,   704,   704,   704,
+      20,  -420,    21,  -420,   194,   704,   243,  1240,  1240,  1240,
+    1240,  1240,   245,   248,  1240,  1240,   704,   704,   249,  1195,
+    1195,  -420,   250,  -420,   251,   255,   252,   259,   261,   262,
+     268,   270,  -420,  -420,  1093,   339,  -420,   353,   -28,   359,
+     383,   272,   263,   276,   704,   414,   704,  -420,   279,   704,
+     283,  -420,  -420,   284,   286,   704,   704,  -420,  -420,   289,
+    -420,  1240,   292,   293,  1240,  1195,  -420,  1195,  1195,  -420,
+    -420,  -420,  -420,  -420,  -420,  -420,   370,   290,  -420,   704,
+     704,  1240,   704,   704,   297,  -420,   297,   704,   298,  1240,
+    1240,  1240,  -420,  -420,  1240,   704,  -420,  -420,  -420,   296,
+     299,   300,   425,  -420,   406,   304,   307,   250,   312,  -420,
+    -420,   375,  -420,  -420,   294,   704,  -420,  -420,  -420,   315,
+    -420,  -420,  -420,  -420,  -420,  -420,   422,     9,   416,  -420,
+     313,  -420,   704,  -420,   841,    60,   441,  -420,  -420,   322,
+    -420,   841,   704,   444,   324,   389,   704,   447,   449,  -420,
+     704,   704,  -420,  -420
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -514,  -514,   368,   369,   370,   371,   185,   168,  -130,  -129,
-    -503,  -514,   429,   461,  -110,  -514,  -264,    88,  -514,  -281,
-    -514,   -50,  -514,   -37,  -514,   -41,    39,  -514,  -107,   282,
-    -289,    22,  -514,  -514,  -514,  -514,  -514,  -514,  -514,   437,
-    -514,  -514,  -514,  -514,     7,  -514,    90,  -514,  -514,   432,
-    -514,  -514,  -514,  -514,  -514,   493,  -514,  -514,  -513,  -195,
-      38,  -117,  -514,   478,  -514,  -514,  -514,  -514,  -514,    86,
-      30,  -514,  -514,    65,  -514,  -514
+    -420,  -420,   291,   295,   302,   303,   198,   199,  -269,  -268,
+    -415,  -420,   351,  -420,  -420,  -420,  -420,  -231,  -420,  -341,
+      26,  -420,  -188,  -420,  -110,  -420,   -23,  -420,   -70,    -6,
+    -420,   -20,   367,  -183,   256,  -420,  -420,   463,  -420,  -420,
+    -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,     1,  -420,
+      35,  -420,  -420,   432,  -420,  -420,  -420,  -420,  -420,  -420,
+    -419,   -43,    76,  -252,  -420,   435,  -420,  -420,  -420,  -420,
+    -420,   116,   -16,  -420,  -420,    75,  -420,  -420
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -168
+#define YYTABLE_NINF -176
 static const short int yytable[] =
 {
-      89,   235,   236,   106,   353,   209,   116,   372,   373,   221,
-      26,    94,   224,   316,    39,   409,    89,   428,   539,   384,
-     386,    42,   238,   225,  -100,   342,   549,   393,   411,   214,
-     342,   342,   124,   124,   269,   226,   392,   551,   557,   215,
-     429,   214,   342,    59,   120,    60,   285,     4,    26,   273,
-     403,   321,   286,   274,   275,   276,   277,   410,    29,   280,
-     281,   227,   228,   229,   230,   231,   232,   233,   234,   282,
-     410,   439,   191,   192,   193,   342,   120,   110,   111,   112,
-    -167,   442,   120,   342,   342,    46,    47,    48,   394,   220,
-      39,   124,   220,    51,   122,   227,   228,   229,   230,   231,
-     232,   233,   234,    52,    49,     5,   107,   108,   439,   439,
-      58,     6,   267,   268,   220,   270,   441,   452,    20,    62,
-      21,     7,     8,     9,    10,    11,    12,    13,   271,   220,
-      64,    95,    99,   220,   220,   220,   220,   278,   279,   220,
-     220,    43,    14,    30,    31,    32,    33,    34,    35,    36,
-     474,   117,   342,   342,   342,   439,   213,   184,   185,    53,
-     342,   440,   218,   283,   284,   290,   291,   368,   100,   318,
-     319,   342,   342,   322,   -60,   -60,   -64,   -64,   103,   324,
-       7,     8,     9,    10,    54,    12,    55,  -101,   347,    56,
-     -59,   -59,   -63,   -63,   497,   101,   498,   538,   -58,   -58,
-     102,    89,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   348,   114,   342,   115,   342,   250,   251,   123,
-     342,   -62,   -62,   -57,   -57,   183,   342,   342,   187,   349,
-     188,   550,   366,   -61,   -61,   292,   293,   294,   295,   189,
-     416,   216,   418,   419,   420,    89,   367,   220,   424,   227,
-     228,   229,   230,   231,   232,   233,   234,   210,   342,   342,
-     211,   342,   342,   344,   345,   -67,   222,   -68,   342,   434,
-     435,   436,   437,   438,   296,   346,   342,   320,   329,   364,
-     328,   443,   444,   445,   446,   350,   352,   322,   252,   253,
-     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
-     264,   265,   355,   356,   357,   358,   342,   359,   354,   360,
-     361,   369,   365,   387,   370,   398,   362,   363,   376,   377,
-     220,   417,   220,   220,   220,   475,   476,   423,   220,   395,
-     378,   396,   482,   379,   380,   388,   389,   401,   390,   391,
-     404,   399,   342,   405,   412,   421,   415,   428,   502,   503,
-     504,   451,   422,   427,   453,   454,   432,   342,   433,   455,
-     459,   324,   456,   457,   342,   463,   465,   466,   342,   342,
-     470,   510,   511,   512,   513,   220,   514,   515,   467,   517,
-     473,   472,   523,   485,   478,   406,   407,   408,   479,   480,
-     471,   235,   236,   414,   481,   483,   484,   486,    65,    66,
-     527,   528,   487,   489,   425,   426,   496,   509,   499,   501,
-     235,   236,   507,   508,   518,    20,   519,    21,   220,   297,
-     520,   521,   545,   410,   546,   547,   522,   524,   220,   220,
-     220,   298,   299,   220,   526,   529,   530,   531,   532,   533,
-     537,   541,   534,   535,   536,   543,   544,   458,   516,   460,
-     542,   552,   553,   464,   554,   555,   556,   559,   560,   468,
-     469,   561,   220,   563,   564,   174,   175,   176,   177,   375,
-      97,   135,   136,   137,   138,   139,   140,   141,   142,   143,
-     144,   145,   146,   300,   301,   374,    57,   449,   448,   105,
-     315,   490,   491,   113,   494,   495,    27,    45,   462,   477,
-     505,   500,     0,     0,     0,     0,     0,     0,     0,   506,
-     302,   153,   154,   155,   156,   157,   158,   159,   160,   161,
-     162,   163,   164,     0,   303,   167,   168,   169,     0,   304,
-     305,   306,     0,     0,     0,     0,     0,   307,     0,   525,
-     308,     0,   309,    65,    66,   310,   118,    68,    69,    70,
-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
-      20,     0,    21,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   548,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    81,     0,     0,     0,
-     558,     0,     0,     0,     0,     0,     0,   562,     0,     0,
-       0,   565,   566,    65,    66,     0,   118,    68,    69,    70,
-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
-      20,     0,    21,    65,    66,     0,   118,   194,   195,   196,
-     197,   198,   199,   200,   201,   202,   203,   204,    79,    80,
-      20,     0,    21,     0,     0,     0,    81,     0,    65,    66,
-       0,   118,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    20,    81,    21,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    82,
-     217,     0,    83,     0,     0,    84,     0,    85,   119,     0,
-       0,    81,     0,     0,   330,   331,    65,    66,   332,     0,
+      83,    13,   341,   342,   199,   254,   256,   413,   134,   137,
+     200,   117,    13,    40,   327,    41,   106,   330,   120,   333,
+     334,   335,   336,   337,   338,   339,   340,   349,   304,   305,
+     353,   354,   355,   356,   357,   454,   456,   360,   361,    60,
+      61,   344,    90,    63,    64,    65,    66,    67,    68,    69,
+      70,    71,    72,    73,    74,   313,     1,   211,     2,   321,
+      21,   362,   196,   315,  -175,   137,   142,   212,   141,   137,
+     333,   334,   335,   336,   337,   338,   339,   340,   455,   455,
+      23,  -108,   322,    75,   211,     1,     1,     2,     2,     3,
+     140,    83,    24,    25,   300,     4,     5,   331,    16,    17,
+      18,    26,    27,    28,    29,    30,    31,    32,   332,   313,
+      33,    22,   428,   313,   229,   230,     6,    19,  -174,   316,
+      13,   488,   544,     7,    37,   549,    39,     8,   205,   210,
+     551,   201,   554,   214,   206,    56,   384,   297,   298,   121,
+       1,   301,     2,     3,   366,    58,   313,   140,    52,     4,
+       5,    53,   314,   522,   135,   523,   543,   333,   334,   335,
+     336,   337,   338,   339,   340,   460,   365,   462,   463,   464,
+       6,   140,    54,   468,    24,    25,    76,     7,    55,    77,
+     117,     8,    78,   128,    79,   136,   231,   232,   233,   234,
+     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
+     264,    44,    45,    46,   125,   126,    47,   550,   107,   108,
+     109,   110,   111,   112,   113,   124,   448,   143,   144,   -60,
+     -60,   129,   508,   -64,   -64,   130,   308,   309,   310,   311,
+     312,   132,   301,  -109,   407,   -59,   -59,   133,   317,   318,
+     319,   320,   139,   326,   -63,   -63,   326,   526,   527,   528,
+     -58,   -58,   426,   -67,   347,   348,   326,   350,   351,   326,
+     326,   326,   326,   326,   358,   359,   326,   326,   341,   342,
+     -62,   -62,   -57,   -57,   -61,   -61,   341,   342,   145,   146,
+     147,   148,   198,   402,   363,   364,   369,   370,   402,   402,
+      88,    89,   -68,   377,   149,   207,   208,   246,   247,   248,
+     402,   249,   386,   250,   257,   258,   259,   402,   260,   261,
+     262,   302,   296,   299,   306,   402,   402,   303,   307,   325,
+     328,    83,   408,   409,   218,   219,   220,   221,   222,   223,
+     224,   225,   226,   227,   367,   371,   373,   374,   380,    83,
+     427,   326,   382,   375,   376,   378,   379,   381,   326,   383,
+     410,   412,   415,   434,   435,   436,   437,   440,   438,   439,
+     416,   441,   417,   418,   402,   402,   402,   419,   424,   420,
+     421,   425,   402,   446,   321,   429,   430,   487,   444,   489,
+     433,   449,   445,   402,   402,   450,   465,   442,   459,   466,
+     471,   474,   475,   477,   326,   461,   326,   326,   326,   476,
+     478,   467,   326,   490,   492,   479,   480,   404,   405,   472,
+     473,   402,   481,   402,   482,   491,   402,   493,   495,   406,
+     497,   386,   402,   402,   499,   500,   414,   501,   512,   534,
+     535,   514,   504,   455,   422,   423,   506,   507,   521,   525,
+     531,   539,   542,   532,   533,   536,   402,   402,   505,   402,
+     402,   326,   537,   546,   402,   509,   538,   510,   511,   541,
+     547,   552,   402,   553,   556,   557,   558,   560,   326,   561,
+     203,   485,   195,   345,    38,   346,   326,   326,   326,   484,
+     116,   326,   402,   451,   452,   453,   123,   432,   529,   457,
+       0,   458,     0,     0,   287,     0,     0,     0,   288,   402,
+       0,     0,   469,   470,     0,   289,   290,     0,     0,   402,
+       0,     0,     0,   402,     0,     0,     0,   402,   402,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    60,    61,
+     494,     0,   496,     0,     0,   498,     0,     0,     0,     0,
+       0,   502,   503,     0,     0,     1,     0,     2,     0,   150,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   151,   152,     0,   515,   516,     0,   519,   520,
+       0,     0,     0,   524,     0,     0,     0,     0,     0,    60,
+      61,   530,    90,    63,    64,    65,    66,    67,    68,    69,
+      70,    71,    72,    73,    74,     0,     1,     0,     2,     0,
+       0,   540,   153,   154,   155,   156,   157,   158,   159,   160,
+     161,   162,   163,   164,   165,   166,     0,     0,   548,     0,
+       0,     0,     0,    75,     0,     0,     0,     0,   555,     0,
+       0,     0,   559,     0,     0,     0,   562,   563,     0,     0,
+       0,   167,   168,   169,   170,   171,   172,   173,   174,   175,
+     176,   177,   178,   179,     0,   180,   181,   182,   183,     0,
+     184,   185,   186,     0,     0,     0,     0,     0,   187,     0,
+       0,   188,     0,   189,    60,    61,   190,    90,    91,    92,
+      93,    94,    95,    96,    97,    98,    99,   100,   101,    74,
+       0,     1,     0,     2,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   390,   391,    60,
+      61,   392,     0,     0,     0,     0,    76,     0,    75,    77,
+       0,     0,    78,     0,    79,   209,     1,     0,     2,     0,
+     393,   394,   395,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   396,   397,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   398,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   153,   154,   155,   156,   157,   158,   159,
+     160,   161,   162,   163,   164,   165,   166,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    20,     0,    21,     0,   333,   334,   335,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   336,
-     337,     0,     0,     0,     0,     0,     0,     0,     0,    82,
-       0,     0,    83,     0,     0,    84,     0,    85,   212,     0,
-       0,     0,   338,     0,     0,     0,     0,     0,     0,    82,
-       0,     0,    83,     0,     0,    84,     0,    85,   385,   135,
-     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
-     146,   300,   301,     0,    82,     0,     0,    83,     0,     0,
-      84,     0,    85,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   302,   153,
-     154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
-     164,     0,   303,   167,   168,   169,     0,   304,   305,   306,
-     330,   331,     0,     0,   332,     0,     0,   -70,   339,    20,
-       0,    21,     0,     0,     0,     0,     0,     0,     6,   -70,
-     -70,     0,     0,   333,   334,   335,     0,     0,   -70,   -70,
-     -70,   -70,   -70,   -70,   -70,   336,   337,   -70,    22,     0,
-       0,     0,     0,     0,     0,    23,     0,     0,     0,    24,
-       0,     0,     0,     0,     0,     0,     0,     0,   338,     0,
+       0,    76,     0,     0,    77,     0,     0,    78,     0,    79,
+     255,     0,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,     0,   180,   181,   182,   183,
+       0,   184,   185,   186,   390,   391,     0,     0,   392,     0,
+       0,     0,   399,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   393,   394,   395,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   135,   136,   137,   138,   139,
-     140,   141,   142,   143,   144,   145,   146,   300,   301,    65,
-      66,     0,   118,   194,   195,   196,   197,   198,   199,   200,
-     201,   202,   203,   204,    79,    80,    20,     0,    21,     0,
-       0,     0,     0,     0,   302,   153,   154,   155,   156,   157,
-     158,   159,   160,   161,   162,   163,   164,     0,   303,   167,
-     168,   169,    81,   304,   305,   306,     0,     0,     0,     0,
-       0,     0,    65,    66,   339,   118,    68,    69,    70,    71,
-      72,    73,    74,    75,    76,    77,    78,    79,    80,    20,
-       0,    21,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   323,     0,     0,     0,     0,     0,
-       0,     0,     0,    65,    66,    81,   118,    68,    69,    70,
-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
-      20,     0,    21,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   400,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    82,    81,     0,    83,     0,
-     381,    84,     0,    85,    65,    66,     0,   118,    68,    69,
-      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
-      80,    20,     0,    21,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   447,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    81,    82,     0,
-       0,    83,     0,     0,    84,     0,    85,    65,    66,     0,
-      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    20,     0,    21,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    82,
-       0,     0,    83,     0,     0,    84,     0,    85,    65,    66,
-      81,   118,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    20,     0,    21,    65,    66,
-       0,   118,   194,   195,   196,   197,   198,   199,   200,   201,
-     202,   203,   204,    79,    80,    20,     0,    21,     0,     0,
-      82,    81,     0,    83,     0,     0,    84,     0,    85,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    65,
-      66,    81,   223,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    20,     0,    21,     0,
+     396,   397,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    82,     0,     0,    83,     0,     0,    84,
-       0,    85,    81,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   398,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   125,     0,     0,
-       0,     0,     0,     0,    82,     0,     0,    83,     0,     0,
-      84,   126,    85,     0,     0,     0,     0,     0,     0,     0,
-       0,   127,   128,     0,    82,     0,     0,    83,     0,     0,
-      84,     0,    85,     0,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    82,     0,     0,    83,     0,
-       0,    84,     0,    85,   149,   150,   151,     0,     0,   152,
      153,   154,   155,   156,   157,   158,   159,   160,   161,   162,
-     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
-     173
+     163,   164,   165,   166,     0,     0,     0,     0,     0,    60,
+      61,     0,    90,    63,    64,    65,    66,    67,    68,    69,
+      70,    71,    72,    73,    74,     0,     1,     0,     2,   167,
+     168,   169,   170,   171,   172,   173,   174,   175,   176,   177,
+     178,   179,   213,   180,   181,   182,   183,     0,   184,   185,
+     186,     0,     0,    75,     0,     0,     0,    60,    61,   399,
+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
+     100,   101,    74,     0,     1,     0,     2,    60,    61,     0,
+      90,    63,    64,    65,    66,    67,    68,    69,    70,    71,
+      72,    73,    74,     0,     1,     0,     2,     0,     0,     0,
+       0,    75,     0,     0,     0,     0,     0,     0,     0,     0,
+     368,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    75,    60,    61,     0,    90,    63,    64,    65,    66,
+      67,    68,    69,    70,    71,    72,    73,    74,     0,     1,
+       0,     2,     0,     0,     0,     0,    76,     0,     0,    77,
+       0,     0,    78,     0,    79,   385,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    75,     0,    60,    61,
+       0,    90,    63,    64,    65,    66,    67,    68,    69,    70,
+      71,    72,    73,    74,     0,     1,     0,     2,     0,     0,
+       0,     0,     0,     0,    76,     0,     0,    77,     0,   251,
+      78,   483,    79,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    75,     0,    76,     0,     0,    77,     0,     0,
+      78,     0,    79,     0,    60,    61,     0,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+       0,     1,     0,     2,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    76,
+       0,     0,    77,     0,     0,    78,     0,    79,    75,     0,
+      60,    61,     0,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,    74,     0,     1,     0,     2,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    76,     0,     0,    77,     0,
+       0,    78,     0,    79,    75,    60,    61,     0,    90,    63,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,     0,     1,     0,     2,    60,    61,     0,   329,    63,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,     0,     1,     0,     2,     0,     0,     0,     0,    75,
+       0,    76,     0,     0,    77,     0,     0,    78,     0,    79,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    75,
+       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,    76,     0,     0,
+      77,     0,     0,    78,     0,    79,     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,     0,   265,     0,     0,     0,     0,
+       0,     0,    76,     0,     0,    77,     0,     0,    78,   266,
+      79,     0,     0,     0,     0,     0,     0,     0,     0,   267,
+     268,     0,    76,     0,     0,    77,     0,     0,    78,     0,
+      79,     0,   269,   270,   271,   272,   273,   274,   153,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
+     275,   276,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   277,   278,   279,     0,     0,   280,   168,   169,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+     281,   282,   181,   182,   183,   283,   284,   285,   286
 };
 
 static const short int yycheck[] =
 {
-      37,   131,   131,    53,   268,   112,     4,   288,   289,   126,
-       3,    29,   129,   208,    23,    15,    53,    34,   521,   308,
-     309,    30,   132,     9,   142,   220,   539,   146,    15,   140,
-     225,   226,   151,   151,   151,    21,   317,   540,   551,   150,
-      57,   140,   237,    45,    85,    47,   140,     0,    41,   166,
-     339,   150,   146,   170,   171,   172,   173,    57,    61,   176,
-     177,    10,    11,    12,    13,    14,    15,    16,    17,   179,
-      57,   140,   109,   110,   111,   270,   117,    55,    56,    57,
-       0,   150,   123,   278,   279,    52,    53,    54,   148,   126,
-      23,   151,   129,   139,    87,    10,    11,    12,    13,    14,
-      15,    16,    17,    61,    71,    25,    32,    33,   140,   140,
-     139,    31,   149,   150,   151,   152,   148,   148,    22,    24,
-      24,    41,    42,    43,    44,    45,    46,    47,   165,   166,
-       4,   149,   139,   170,   171,   172,   173,   174,   175,   176,
-     177,   150,    62,    64,    65,    66,    67,    68,    69,    70,
-     431,   149,   347,   348,   349,   140,   117,    55,    56,    20,
-     355,   146,   123,   115,   116,    27,    28,   284,   139,   210,
-     211,   366,   367,   214,     3,     4,     3,     4,   144,   216,
-      41,    42,    43,    44,    45,    46,    47,   142,   238,    50,
-       3,     4,     3,     4,   458,   139,   460,   146,     3,     4,
-     139,   238,    92,    93,    94,    95,    96,    97,    98,    99,
-     100,   101,   249,     4,   409,     4,   411,    27,    28,   142,
-     415,     3,     4,     3,     4,    24,   421,   422,     4,   266,
-      24,   146,   282,     3,     4,     3,     4,     3,     4,    24,
-     357,   142,   359,   360,   361,   282,   283,   284,   365,    10,
-      11,    12,    13,    14,    15,    16,    17,   145,   453,   454,
-     145,   456,   457,   225,   226,     7,    59,     7,   463,   376,
-     377,   378,   379,   380,     7,   237,   471,   148,   143,    36,
-     140,   388,   389,   390,   391,   140,   140,   328,    98,    99,
-     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
-     110,   111,   144,   140,   140,   140,   501,   140,   270,   140,
-     140,    24,   140,    24,   140,   140,   278,   279,   142,   142,
-     357,   358,   359,   360,   361,   432,   433,   364,   365,   148,
-     142,   324,   439,   142,   142,   142,   142,    63,   142,   142,
-     140,   143,   537,   140,   140,   140,   144,    34,   465,   466,
-     467,    24,   140,   140,    21,    21,   142,   552,   142,   142,
-       4,   398,   140,   140,   559,   140,   140,   140,   563,   564,
-     142,   478,   479,   480,   481,   412,   483,   484,   140,   486,
-       4,    24,   499,    36,   140,   347,   348,   349,   140,   140,
-     427,   521,   521,   355,   140,   140,   140,   140,     5,     6,
-     507,   508,    57,   140,   366,   367,   140,   143,   140,   140,
-     540,   540,   140,   140,     4,    22,    24,    24,   455,    26,
-     140,   144,   529,    57,   531,   532,   143,   146,   465,   466,
-     467,    38,    39,   470,   143,   140,   143,   140,   140,   143,
-      21,    36,   143,   143,   143,   143,   143,   409,   485,   411,
-     146,    21,   143,   415,   143,   143,   140,    21,   140,   421,
-     422,    76,   499,    21,    21,    97,    97,    97,    97,   301,
-      41,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    90,    91,   300,    25,   399,   398,    52,
-     208,   453,   454,    61,   456,   457,     3,    19,   412,   434,
-     470,   463,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   471,
-     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-     127,   128,   129,    -1,   131,   132,   133,   134,    -1,   136,
-     137,   138,    -1,    -1,    -1,    -1,    -1,   144,    -1,   501,
-     147,    -1,   149,     5,     6,   152,     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,   537,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    48,    -1,    -1,    -1,
-     552,    -1,    -1,    -1,    -1,    -1,    -1,   559,    -1,    -1,
-      -1,   563,   564,     5,     6,    -1,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    -1,    24,     5,     6,    -1,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    -1,    24,    -1,    -1,    -1,    48,    -1,     5,     6,
-      -1,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    48,    24,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   141,
-      37,    -1,   144,    -1,    -1,   147,    -1,   149,   150,    -1,
-      -1,    48,    -1,    -1,     3,     4,     5,     6,     7,    -1,
+      23,     0,   271,   271,   114,   188,   189,   348,     4,    79,
+      29,    23,    11,    46,   266,    48,    36,   269,    30,    10,
+      11,    12,    13,    14,    15,    16,    17,   279,   216,   217,
+     282,   283,   284,   285,   286,    15,    15,   289,   290,     5,
+       6,   272,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,   141,    22,   141,    24,    35,
+     140,   292,   105,   149,     0,   135,    89,   151,    88,   139,
+      10,    11,    12,    13,    14,    15,    16,    17,    58,    58,
+      21,   143,    58,    49,   141,    22,    22,    24,    24,    25,
+     152,   114,    33,    34,   151,    31,    32,     9,    53,    54,
+      55,    42,    43,    44,    45,    46,    47,    48,    20,   141,
+      51,    62,   364,   141,    27,    28,    52,    72,     0,   151,
+     119,   149,   537,    59,     0,   544,   140,    63,   141,   135,
+     545,   150,   551,   139,   147,   145,   324,   207,   208,   151,
+      22,   211,    24,    25,   149,    24,   141,   152,   140,    31,
+      32,   140,   147,   494,   150,   496,   147,    10,    11,    12,
+      13,    14,    15,    16,    17,   417,   147,   419,   420,   421,
+      52,   152,   140,   425,    33,    34,   142,    59,   140,   145,
+      23,    63,   148,     4,   150,   151,    99,   100,   101,   102,
+     103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
+     199,    42,    43,    44,    56,    57,    47,   147,    65,    66,
+      67,    68,    69,    70,    71,    24,   399,    27,    28,     3,
+       4,    24,   474,     3,     4,    24,   246,   247,   248,   249,
+     250,     4,   302,   143,   344,     3,     4,     4,   258,   259,
+     260,   261,   143,   266,     3,     4,   269,   499,   500,   501,
+       3,     4,   362,     7,   277,   278,   279,   280,   281,   282,
+     283,   284,   285,   286,   287,   288,   289,   290,   537,   537,
+       3,     4,     3,     4,     3,     4,   545,   545,     3,     4,
+       3,     4,     4,   326,   116,   117,   306,   307,   331,   332,
+      34,    35,     7,   313,     7,   146,   146,   143,   143,   143,
+     343,   143,   325,   143,    24,   143,   143,   350,   143,   143,
+     141,   141,    24,   149,   143,   358,   359,   144,   143,   143,
+      60,   344,   345,   346,    93,    94,    95,    96,    97,    98,
+      99,   100,   101,   102,   149,   141,   141,   141,    37,   362,
+     363,   364,    24,   141,   141,   141,   141,   141,   371,     4,
+     141,   141,   145,   373,   374,   375,   376,   380,   378,   379,
+     141,   381,   141,   141,   407,   408,   409,   141,    37,   141,
+     141,   141,   415,    64,    35,   141,   141,    24,   141,    20,
+     144,   141,   144,   426,   427,   141,   141,   386,   145,   141,
+     141,   141,   141,   141,   417,   418,   419,   420,   421,   144,
+     141,   424,   425,    20,   141,   144,   144,   331,   332,   429,
+     430,   454,   144,   456,   144,   143,   459,   141,     4,   343,
+     141,   444,   465,   466,   141,   141,   350,   141,    58,     4,
+      24,   141,   143,    58,   358,   359,   144,   144,   141,   141,
+     144,   147,    20,   144,   144,   141,   489,   490,   471,   492,
+     493,   474,   145,    37,   497,   475,   144,   477,   478,   144,
+     147,    20,   505,   141,    20,   141,    77,    20,   491,    20,
+     119,   445,   105,   275,    11,   276,   499,   500,   501,   444,
+      48,   504,   525,   407,   408,   409,    51,   371,   504,   414,
+      -1,   415,    -1,    -1,   203,    -1,    -1,    -1,   203,   542,
+      -1,    -1,   426,   427,    -1,   203,   203,    -1,    -1,   552,
+      -1,    -1,    -1,   556,    -1,    -1,    -1,   560,   561,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,
+     454,    -1,   456,    -1,    -1,   459,    -1,    -1,    -1,    -1,
+      -1,   465,   466,    -1,    -1,    22,    -1,    24,    -1,    26,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    22,    -1,    24,    -1,    26,    27,    28,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    38,
-      39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   141,
-      -1,    -1,   144,    -1,    -1,   147,    -1,   149,   150,    -1,
-      -1,    -1,    61,    -1,    -1,    -1,    -1,    -1,    -1,   141,
-      -1,    -1,   144,    -1,    -1,   147,    -1,   149,   150,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    -1,   141,    -1,    -1,   144,    -1,    -1,
-     147,    -1,   149,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   117,   118,
-     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
-     129,    -1,   131,   132,   133,   134,    -1,   136,   137,   138,
-       3,     4,    -1,    -1,     7,    -1,    -1,    20,   147,    22,
-      -1,    24,    -1,    -1,    -1,    -1,    -1,    -1,    31,    32,
-      33,    -1,    -1,    26,    27,    28,    -1,    -1,    41,    42,
-      43,    44,    45,    46,    47,    38,    39,    50,    51,    -1,
-      -1,    -1,    -1,    -1,    -1,    58,    -1,    -1,    -1,    62,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    61,    -1,
+      -1,    -1,    39,    40,    -1,   489,   490,    -1,   492,   493,
+      -1,    -1,    -1,   497,    -1,    -1,    -1,    -1,    -1,     5,
+       6,   505,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    -1,    22,    -1,    24,    -1,
+      -1,   525,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    -1,    -1,   542,    -1,
+      -1,    -1,    -1,    49,    -1,    -1,    -1,    -1,   552,    -1,
+      -1,    -1,   556,    -1,    -1,    -1,   560,   561,    -1,    -1,
+      -1,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,    -1,   132,   133,   134,   135,    -1,
+     137,   138,   139,    -1,    -1,    -1,    -1,    -1,   145,    -1,
+      -1,   148,    -1,   150,     5,     6,   153,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      -1,    22,    -1,    24,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,     5,
+       6,     7,    -1,    -1,    -1,    -1,   142,    -1,    49,   145,
+      -1,    -1,   148,    -1,   150,   151,    22,    -1,    24,    -1,
+      26,    27,    28,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    39,    40,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    62,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   142,    -1,    -1,   145,    -1,    -1,   148,    -1,   150,
+     151,    -1,   118,   119,   120,   121,   122,   123,   124,   125,
+     126,   127,   128,   129,   130,    -1,   132,   133,   134,   135,
+      -1,   137,   138,   139,     3,     4,    -1,    -1,     7,    -1,
+      -1,    -1,   148,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    26,    27,    28,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    78,    79,    80,    81,    82,
-      83,    84,    85,    86,    87,    88,    89,    90,    91,     5,
+      39,    40,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    62,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
+      89,    90,    91,    92,    -1,    -1,    -1,    -1,    -1,     5,
        6,    -1,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    -1,    24,    -1,
-      -1,    -1,    -1,    -1,   117,   118,   119,   120,   121,   122,
-     123,   124,   125,   126,   127,   128,   129,    -1,   131,   132,
-     133,   134,    48,   136,   137,   138,    -1,    -1,    -1,    -1,
-      -1,    -1,     5,     6,   147,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      -1,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,     5,     6,    48,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    -1,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   141,    48,    -1,   144,    -1,
-     146,   147,    -1,   149,     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,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    37,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    48,   141,    -1,
-      -1,   144,    -1,    -1,   147,    -1,   149,     5,     6,    -1,
+      16,    17,    18,    19,    20,    -1,    22,    -1,    24,   118,
+     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
+     129,   130,    38,   132,   133,   134,   135,    -1,   137,   138,
+     139,    -1,    -1,    49,    -1,    -1,    -1,     5,     6,   148,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    -1,    22,    -1,    24,     5,     6,    -1,
        8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   141,
-      -1,    -1,   144,    -1,    -1,   147,    -1,   149,     5,     6,
-      48,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    -1,    24,     5,     6,
+      18,    19,    20,    -1,    22,    -1,    24,    -1,    -1,    -1,
+      -1,    49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    49,     5,     6,    -1,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    -1,    22,
+      -1,    24,    -1,    -1,    -1,    -1,   142,    -1,    -1,   145,
+      -1,    -1,   148,    -1,   150,    38,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    49,    -1,     5,     6,
       -1,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    -1,    24,    -1,    -1,
-     141,    48,    -1,   144,    -1,    -1,   147,    -1,   149,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,
-       6,    48,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    -1,    24,    -1,
+      17,    18,    19,    20,    -1,    22,    -1,    24,    -1,    -1,
+      -1,    -1,    -1,    -1,   142,    -1,    -1,   145,    -1,   147,
+     148,    38,   150,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    49,    -1,   142,    -1,    -1,   145,    -1,    -1,
+     148,    -1,   150,    -1,     5,     6,    -1,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      -1,    22,    -1,    24,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   142,
+      -1,    -1,   145,    -1,    -1,   148,    -1,   150,    49,    -1,
+       5,     6,    -1,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    -1,    22,    -1,    24,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   141,    -1,    -1,   144,    -1,    -1,   147,
-      -1,   149,    48,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   142,    -1,    -1,   145,    -1,
+      -1,   148,    -1,   150,    49,     5,     6,    -1,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    -1,    22,    -1,    24,     5,     6,    -1,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    -1,    22,    -1,    24,    -1,    -1,    -1,    -1,    49,
+      -1,   142,    -1,    -1,   145,    -1,    -1,   148,    -1,   150,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    49,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    35,    -1,    -1,
-      -1,    -1,    -1,    -1,   141,    -1,    -1,   144,    -1,    -1,
-     147,    49,   149,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    59,    60,    -1,   141,    -1,    -1,   144,    -1,    -1,
-     147,    -1,   149,    -1,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,    90,    91,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   141,    -1,    -1,   144,    -1,
-      -1,   147,    -1,   149,   112,   113,   114,    -1,    -1,   117,
-     118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
-     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
-     138
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   142,    -1,    -1,
+     145,    -1,    -1,   148,    -1,   150,    -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,    36,    -1,    -1,    -1,    -1,
+      -1,    -1,   142,    -1,    -1,   145,    -1,    -1,   148,    50,
+     150,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    60,
+      61,    -1,   142,    -1,    -1,   145,    -1,    -1,   148,    -1,
+     150,    -1,    73,    74,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   113,   114,   115,    -1,    -1,   118,   119,   120,
+     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
+     131,   132,   133,   134,   135,   136,   137,   138,   139
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const unsigned char yystos[] =
 {
-       0,   185,   186,   187,     0,    25,    31,    41,    42,    43,
-      44,    45,    46,    47,    62,   166,   204,   206,   208,   215,
-      22,    24,    51,    58,    62,   165,   197,   208,   209,    61,
-      64,    65,    66,    67,    68,    69,    70,   167,   202,    23,
-     216,   217,    30,   150,   205,   216,    52,    53,    54,    71,
-     194,   139,    61,    20,    45,    47,    50,   166,   139,    45,
-      47,   207,    24,   192,     4,     5,     6,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    48,   141,   144,   147,   149,   154,   174,   175,   176,
-     177,   178,   197,   212,    29,   149,   203,   165,   220,   139,
-     139,   139,   139,   144,   195,   192,   174,    32,    33,   184,
-     184,   184,   184,   202,     4,     4,     4,   149,     8,   150,
-     178,   179,   197,   142,   151,    35,    49,    59,    60,    72,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    86,    87,    88,    89,    90,    91,   112,
-     113,   114,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138,   155,   156,   157,   158,   218,   224,
-     225,   227,   228,    24,    55,    56,   193,     4,    24,    24,
-     196,   176,   176,   176,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,   161,   162,   164,   176,   181,
-     145,   145,   150,   179,   140,   150,   142,    37,   179,   180,
-     176,   214,    59,     8,   214,     9,    21,    10,    11,    12,
-      13,    14,    15,    16,    17,   161,   162,   163,   167,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,   159,
-      27,    28,    98,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,   109,   110,   111,   160,   176,   176,   214,
-     176,   176,   221,   214,   214,   214,   214,   214,   176,   176,
-     214,   214,   167,   115,   116,   140,   146,   190,   191,   189,
-      27,    28,     3,     4,     3,     4,     7,    26,    38,    39,
-      90,    91,   117,   131,   136,   137,   138,   144,   147,   149,
-     152,   155,   156,   157,   158,   182,   212,   188,   178,   178,
-     148,   150,   178,    37,   176,   199,   200,   201,   140,   143,
-       3,     4,     7,    26,    27,    28,    38,    39,    61,   147,
-     182,   211,   212,   213,   213,   213,   213,   174,   176,   176,
-     140,   169,   140,   169,   213,   144,   140,   140,   140,   140,
-     140,   140,   213,   213,    36,   140,   174,   176,   214,    24,
-     140,   172,   172,   172,   159,   160,   142,   142,   142,   142,
-     142,   146,   181,   183,   183,   150,   183,    24,   142,   142,
-     142,   142,   172,   146,   148,   148,   197,   198,   140,   143,
-      37,    63,   210,   183,   140,   140,   213,   213,   213,    15,
-      57,    15,   140,   226,   213,   144,   214,   176,   214,   214,
-     214,   140,   140,   176,   214,   213,   213,   140,    34,    57,
-     170,   173,   142,   142,   181,   181,   181,   181,   181,   140,
-     146,   148,   150,   181,   181,   181,   181,    37,   199,   170,
-     171,    24,   148,    21,    21,   142,   140,   140,   213,     4,
-     213,   214,   222,   140,   213,   140,   140,   140,   213,   213,
-     142,   176,    24,     4,   172,   181,   181,   226,   140,   140,
-     140,   140,   181,   140,   140,    36,   140,    57,   168,   140,
-     213,   213,   222,   223,   213,   213,   140,   169,   169,   140,
-     213,   140,   214,   214,   214,   223,   213,   140,   140,   143,
-     181,   181,   181,   181,   181,   181,   176,   181,     4,    24,
-     140,   144,   143,   214,   146,   213,   143,   181,   181,   140,
-     143,   140,   140,   143,   143,   143,   143,    21,   146,   163,
-     219,    36,   146,   143,   143,   181,   181,   181,   213,   211,
-     146,   163,    21,   143,   143,   143,   140,   211,   213,    21,
-     140,    76,   213,    21,    21,   213,   213
+       0,    22,    24,    25,    31,    32,    52,    59,    63,   166,
+     189,   190,   191,   202,   193,   192,    53,    54,    55,    72,
+     199,   140,    62,    21,    33,    34,    42,    43,    44,    45,
+      46,    47,    48,    51,   167,   168,   188,     0,   191,   140,
+      46,    48,   169,   212,    42,    43,    44,    47,   170,   209,
+     211,   218,   140,   140,   140,   140,   145,   200,    24,   197,
+       5,     6,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    49,   142,   145,   148,   150,
+     155,   178,   179,   180,   181,   182,   202,   215,   188,   188,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,   162,   163,   165,   180,   185,    65,    66,    67,
+      68,    69,    70,    71,   171,   207,   207,    23,   219,   220,
+      30,   151,   210,   219,    24,    56,    57,   198,     4,    24,
+      24,   201,     4,     4,     4,   150,   151,   182,   183,   143,
+     152,   185,   180,    27,    28,     3,     4,     3,     4,     7,
+      26,    39,    40,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,   118,   119,   120,
+     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
+     132,   133,   134,   135,   137,   138,   139,   145,   148,   150,
+     153,   156,   157,   158,   159,   186,   215,   194,     4,   178,
+      29,   150,   208,   166,   223,   141,   147,   146,   146,   151,
+     183,   141,   151,    38,   183,   184,   195,   196,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   160,    27,
+      28,    99,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,   161,   143,   143,   143,   143,
+     143,   147,   185,   187,   187,   151,   187,    24,   143,   143,
+     143,   143,   141,   176,   202,    36,    50,    60,    61,    73,
+      74,    75,    76,    77,    78,    91,    92,   113,   114,   115,
+     118,   131,   132,   136,   137,   138,   139,   156,   157,   158,
+     159,   221,   227,   228,   230,   231,    24,   182,   182,   149,
+     151,   182,   141,   144,   176,   176,   143,   143,   185,   185,
+     185,   185,   185,   141,   147,   149,   151,   185,   185,   185,
+     185,    35,    58,   174,   177,   143,   180,   217,    60,     8,
+     217,     9,    20,    10,    11,    12,    13,    14,    15,    16,
+      17,   162,   163,   164,   171,   160,   161,   180,   180,   217,
+     180,   180,   224,   217,   217,   217,   217,   217,   180,   180,
+     217,   217,   171,   116,   117,   147,   149,   149,    38,   185,
+     185,   141,   229,   141,   141,   141,   141,   185,   141,   141,
+      37,   141,    24,     4,   176,    38,   180,   204,   205,   206,
+       3,     4,     7,    26,    27,    28,    39,    40,    62,   148,
+     186,   214,   215,   216,   216,   216,   216,   178,   180,   180,
+     141,   173,   141,   173,   216,   145,   141,   141,   141,   141,
+     141,   141,   216,   216,    37,   141,   178,   180,   217,   141,
+     141,   217,   225,   144,   185,   185,   185,   185,   185,   185,
+     180,   185,   202,   203,   141,   144,    64,   213,   187,   141,
+     141,   216,   216,   216,    15,    58,    15,   229,   216,   145,
+     217,   180,   217,   217,   217,   141,   141,   180,   217,   216,
+     216,   141,   185,   185,   141,   141,   144,   141,   141,   144,
+     144,   144,   144,    38,   204,   174,   175,    24,   149,    20,
+      20,   143,   141,   141,   216,     4,   216,   141,   216,   141,
+     141,   141,   216,   216,   143,   180,   144,   144,   217,   185,
+     185,   185,    58,   172,   141,   216,   216,   225,   226,   216,
+     216,   141,   173,   173,   216,   141,   217,   217,   217,   226,
+     216,   144,   144,   144,     4,    24,   141,   145,   144,   147,
+     216,   144,    20,   147,   164,   222,    37,   147,   216,   214,
+     147,   164,    20,   141,   214,   216,    20,   141,    77,   216,
+      20,    20,   216,   216
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -2962,7 +2978,7 @@
   switch (yyn)
     {
         case 3:
-#line 989 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 990 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   if ((yyvsp[0].UIntVal) > (uint32_t)INT32_MAX)     // Outside of my range!
     GEN_ERROR("Value too large for type!");
@@ -2972,137 +2988,137 @@
     break;
 
   case 31:
-#line 1005 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1006 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_EQ; ;}
     break;
 
   case 32:
-#line 1005 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1006 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_NE; ;}
     break;
 
   case 33:
-#line 1006 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1007 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLT; ;}
     break;
 
   case 34:
-#line 1006 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1007 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGT; ;}
     break;
 
   case 35:
-#line 1007 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1008 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLE; ;}
     break;
 
   case 36:
-#line 1007 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1008 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGE; ;}
     break;
 
   case 37:
-#line 1008 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1009 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULT; ;}
     break;
 
   case 38:
-#line 1008 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1009 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGT; ;}
     break;
 
   case 39:
-#line 1009 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1010 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULE; ;}
     break;
 
   case 40:
-#line 1009 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1010 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGE; ;}
     break;
 
   case 41:
-#line 1013 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1014 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OEQ; ;}
     break;
 
   case 42:
-#line 1013 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1014 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ONE; ;}
     break;
 
   case 43:
-#line 1014 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1015 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLT; ;}
     break;
 
   case 44:
-#line 1014 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1015 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGT; ;}
     break;
 
   case 45:
-#line 1015 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1016 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLE; ;}
     break;
 
   case 46:
-#line 1015 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1016 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGE; ;}
     break;
 
   case 47:
-#line 1016 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1017 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ORD; ;}
     break;
 
   case 48:
-#line 1016 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1017 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNO; ;}
     break;
 
   case 49:
-#line 1017 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1018 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UEQ; ;}
     break;
 
   case 50:
-#line 1017 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1018 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNE; ;}
     break;
 
   case 51:
-#line 1018 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1019 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULT; ;}
     break;
 
   case 52:
-#line 1018 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1019 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGT; ;}
     break;
 
   case 53:
-#line 1019 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1020 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULE; ;}
     break;
 
   case 54:
-#line 1019 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1020 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGE; ;}
     break;
 
   case 55:
-#line 1020 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1021 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_TRUE; ;}
     break;
 
   case 56:
-#line 1021 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1022 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_FALSE; ;}
     break;
 
   case 69:
-#line 1032 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1033 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = (yyvsp[-1].StrVal);
     CHECK_FOR_ERROR
@@ -3110,7 +3126,7 @@
     break;
 
   case 70:
-#line 1036 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1037 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3118,82 +3134,122 @@
     break;
 
   case 71:
-#line 1041 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1043 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 72:
-#line 1042 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
+#line 1044 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 73:
-#line 1043 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
+#line 1045 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 74:
-#line 1044 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1046 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
     break;
 
   case 75:
-#line 1045 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
+#line 1047 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 76:
-#line 1046 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
+#line 1051 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 77:
-#line 1047 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1052 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 78:
-#line 1048 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1053 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 79:
-#line 1050 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = CallingConv::C; ;}
+#line 1057 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { /*default*/ ;}
     break;
 
   case 80:
-#line 1051 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = CallingConv::C; ;}
+#line 1058 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { CurFun.Linkage = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 81:
-#line 1052 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = CallingConv::CSRet; ;}
+#line 1059 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { CurFun.Linkage = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 82:
-#line 1053 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = CallingConv::Fast; ;}
+#line 1063 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 83:
-#line 1054 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = CallingConv::Cold; ;}
+#line 1064 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 84:
-#line 1055 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = CallingConv::X86_StdCall; ;}
+#line 1065 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 85:
-#line 1056 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = CallingConv::X86_FastCall; ;}
+#line 1066 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 86:
-#line 1057 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1067 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
+    break;
+
+  case 87:
+#line 1070 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::C; ;}
+    break;
+
+  case 88:
+#line 1071 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::C; ;}
+    break;
+
+  case 89:
+#line 1072 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::CSRet; ;}
+    break;
+
+  case 90:
+#line 1073 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::Fast; ;}
+    break;
+
+  case 91:
+#line 1074 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::Cold; ;}
+    break;
+
+  case 92:
+#line 1075 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::X86_StdCall; ;}
+    break;
+
+  case 93:
+#line 1076 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::X86_FastCall; ;}
+    break;
+
+  case 94:
+#line 1077 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
                    if ((unsigned)(yyvsp[0].UInt64Val) != (yyvsp[0].UInt64Val))
                      GEN_ERROR("Calling conv too large!");
@@ -3202,13 +3258,13 @@
                  ;}
     break;
 
-  case 87:
-#line 1066 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 95:
+#line 1086 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
-  case 88:
-#line 1067 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 96:
+#line 1087 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[0].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -3217,13 +3273,13 @@
 ;}
     break;
 
-  case 89:
-#line 1073 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 97:
+#line 1093 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
-  case 90:
-#line 1074 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 98:
+#line 1094 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[0].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -3232,8 +3288,8 @@
 ;}
     break;
 
-  case 91:
-#line 1082 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 99:
+#line 1102 "/proj/llvm/llvm-1/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] == '\\')
@@ -3243,28 +3299,28 @@
 ;}
     break;
 
-  case 92:
-#line 1090 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 100:
+#line 1110 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
-  case 93:
-#line 1091 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 101:
+#line 1111 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = (yyvsp[0].StrVal); ;}
     break;
 
-  case 94:
-#line 1096 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 102:
+#line 1116 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
-  case 95:
-#line 1097 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 103:
+#line 1117 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
-  case 96:
-#line 1098 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 104:
+#line 1118 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV->setSection((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -3272,8 +3328,8 @@
   ;}
     break;
 
-  case 97:
-#line 1103 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 105:
+#line 1123 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[0].UInt64Val)))
       GEN_ERROR("Alignment must be a power of two!");
@@ -3282,18 +3338,18 @@
   ;}
     break;
 
-  case 99:
-#line 1117 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 107:
+#line 1137 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType)); ;}
     break;
 
-  case 101:
-#line 1118 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 109:
+#line 1138 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType)); ;}
     break;
 
-  case 102:
-#line 1120 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 110:
+#line 1140 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -3302,24 +3358,24 @@
   ;}
     break;
 
-  case 116:
-#line 1132 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 123:
+#line 1152 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 117:
-#line 1136 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 124:
+#line 1156 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 118:
-#line 1140 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 125:
+#line 1160 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {            // Named types are also simple types...
   const Type* tmp = getTypeVal((yyvsp[0].ValIDVal));
   CHECK_FOR_ERROR
@@ -3327,8 +3383,8 @@
 ;}
     break;
 
-  case 119:
-#line 1148 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 126:
+#line 1168 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                   // Type UpReference
     if ((yyvsp[0].UInt64Val) > (uint64_t)~0U) GEN_ERROR("Value out of range!");
     OpaqueType *OT = OpaqueType::get();        // Use temporary placeholder
@@ -3339,8 +3395,8 @@
   ;}
     break;
 
-  case 120:
-#line 1156 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 127:
+#line 1176 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {           // Function derived type?
     std::vector<const Type*> Params;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-1].TypeList)->begin(),
@@ -3356,8 +3412,8 @@
   ;}
     break;
 
-  case 121:
-#line 1169 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 128:
+#line 1189 "/proj/llvm/llvm-1/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);
@@ -3365,8 +3421,8 @@
   ;}
     break;
 
-  case 122:
-#line 1174 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 129:
+#line 1194 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {          // Packed array type?
      const llvm::Type* ElemTy = (yyvsp[-1].TypeVal)->get();
      if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val))
@@ -3381,8 +3437,8 @@
   ;}
     break;
 
-  case 123:
-#line 1186 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 130:
+#line 1206 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                        // Structure type?
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-1].TypeList)->begin(),
@@ -3395,16 +3451,16 @@
   ;}
     break;
 
-  case 124:
-#line 1196 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 131:
+#line 1216 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                                  // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 125:
-#line 1200 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 132:
+#line 1220 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-2].TypeList)->begin(),
@@ -3417,16 +3473,16 @@
   ;}
     break;
 
-  case 126:
-#line 1210 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 133:
+#line 1230 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                         // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 127:
-#line 1214 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 134:
+#line 1234 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                             // Pointer type?
     if (*(yyvsp[-1].TypeVal) == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
@@ -3436,8 +3492,8 @@
   ;}
     break;
 
-  case 128:
-#line 1225 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 135:
+#line 1245 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeHolder>();
     (yyval.TypeList)->push_back(*(yyvsp[0].TypeVal)); delete (yyvsp[0].TypeVal);
@@ -3445,40 +3501,40 @@
   ;}
     break;
 
-  case 129:
-#line 1230 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 136:
+#line 1250 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(*(yyvsp[0].TypeVal)); delete (yyvsp[0].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 131:
-#line 1237 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 138:
+#line 1257 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(Type::VoidTy);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 132:
-#line 1241 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 139:
+#line 1261 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList) = new std::list<PATypeHolder>())->push_back(Type::VoidTy);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 133:
-#line 1245 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 140:
+#line 1265 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeHolder>();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 134:
-#line 1256 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 141:
+#line 1276 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-3].TypeVal)->get());
     if (ATy == 0)
@@ -3507,8 +3563,8 @@
   ;}
     break;
 
-  case 135:
-#line 1282 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 142:
+#line 1302 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal)->get());
     if (ATy == 0)
@@ -3525,8 +3581,8 @@
   ;}
     break;
 
-  case 136:
-#line 1296 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 143:
+#line 1316 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal)->get());
     if (ATy == 0)
@@ -3559,8 +3615,8 @@
   ;}
     break;
 
-  case 137:
-#line 1326 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 144:
+#line 1346 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     const PackedType *PTy = dyn_cast<PackedType>((yyvsp[-3].TypeVal)->get());
     if (PTy == 0)
@@ -3589,8 +3645,8 @@
   ;}
     break;
 
-  case 138:
-#line 1352 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 145:
+#line 1372 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[-3].TypeVal)->get());
     if (STy == 0)
@@ -3614,8 +3670,8 @@
   ;}
     break;
 
-  case 139:
-#line 1373 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 146:
+#line 1393 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[-2].TypeVal)->get());
     if (STy == 0)
@@ -3631,8 +3687,8 @@
   ;}
     break;
 
-  case 140:
-#line 1386 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 147:
+#line 1406 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const PointerType *PTy = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
     if (PTy == 0)
@@ -3645,8 +3701,8 @@
   ;}
     break;
 
-  case 141:
-#line 1396 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 148:
+#line 1416 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVal) = UndefValue::get((yyvsp[-1].TypeVal)->get());
     delete (yyvsp[-1].TypeVal);
@@ -3654,8 +3710,8 @@
   ;}
     break;
 
-  case 142:
-#line 1401 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 149:
+#line 1421 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const PointerType *Ty = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
     if (Ty == 0)
@@ -3719,8 +3775,8 @@
   ;}
     break;
 
-  case 143:
-#line 1462 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 150:
+#line 1482 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-1].TypeVal)->get() != (yyvsp[0].ConstVal)->getType())
       GEN_ERROR("Mismatched types for constant expression!");
@@ -3730,8 +3786,8 @@
   ;}
     break;
 
-  case 144:
-#line 1469 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 151:
+#line 1489 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[-1].TypeVal)->get();
     if (isa<FunctionType>(Ty) || Ty == Type::LabelTy || isa<OpaqueType>(Ty))
@@ -3742,8 +3798,8 @@
   ;}
     break;
 
-  case 145:
-#line 1477 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 152:
+#line 1497 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].SInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type!");
@@ -3752,8 +3808,8 @@
   ;}
     break;
 
-  case 146:
-#line 1483 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 153:
+#line 1503 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].UInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type!");
@@ -3762,8 +3818,8 @@
   ;}
     break;
 
-  case 147:
-#line 1489 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 154:
+#line 1509 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {            // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].UInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type!");
@@ -3772,8 +3828,8 @@
   ;}
     break;
 
-  case 148:
-#line 1495 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 155:
+#line 1515 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].SInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type!");
@@ -3782,24 +3838,24 @@
   ;}
     break;
 
-  case 149:
-#line 1501 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 156:
+#line 1521 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                      // Boolean constants
     (yyval.ConstVal) = ConstantBool::getTrue();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 150:
-#line 1505 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 157:
+#line 1525 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                     // Boolean constants
     (yyval.ConstVal) = ConstantBool::getFalse();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 151:
-#line 1509 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 158:
+#line 1529 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                   // Float & Double constants
     if (!ConstantFP::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].FPVal)))
       GEN_ERROR("Floating point constant invalid for type!!");
@@ -3808,8 +3864,8 @@
   ;}
     break;
 
-  case 152:
-#line 1517 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 159:
+#line 1537 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     Constant *Val = (yyvsp[-3].ConstVal);
     const Type *Ty = (yyvsp[-1].TypeVal)->get();
@@ -3824,8 +3880,8 @@
   ;}
     break;
 
-  case 153:
-#line 1529 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 160:
+#line 1549 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[-2].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand!");
@@ -3849,8 +3905,8 @@
   ;}
     break;
 
-  case 154:
-#line 1550 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 161:
+#line 1570 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-5].ConstVal)->getType() != Type::BoolTy)
       GEN_ERROR("Select condition must be of boolean type!");
@@ -3861,8 +3917,8 @@
   ;}
     break;
 
-  case 155:
-#line 1558 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 162:
+#line 1578 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("Binary operator types must match!");
@@ -3871,8 +3927,8 @@
   ;}
     break;
 
-  case 156:
-#line 1564 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 163:
+#line 1584 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match!");
@@ -3886,8 +3942,8 @@
   ;}
     break;
 
-  case 157:
-#line 1575 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 164:
+#line 1595 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("icmp operand types must match!");
@@ -3895,8 +3951,8 @@
   ;}
     break;
 
-  case 158:
-#line 1580 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 165:
+#line 1600 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("fcmp operand types must match!");
@@ -3904,8 +3960,8 @@
   ;}
     break;
 
-  case 159:
-#line 1585 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 166:
+#line 1605 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-1].ConstVal)->getType() != Type::UByteTy)
       GEN_ERROR("Shift count for shift constant must be unsigned byte!");
@@ -3917,8 +3973,8 @@
   ;}
     break;
 
-  case 160:
-#line 1594 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 167:
+#line 1614 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid extractelement operands!");
@@ -3927,8 +3983,8 @@
   ;}
     break;
 
-  case 161:
-#line 1600 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 168:
+#line 1620 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid insertelement operands!");
@@ -3937,8 +3993,8 @@
   ;}
     break;
 
-  case 162:
-#line 1606 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 169:
+#line 1626 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid shufflevector operands!");
@@ -3947,16 +4003,16 @@
   ;}
     break;
 
-  case 163:
-#line 1615 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 170:
+#line 1635 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ConstVector) = (yyvsp[-2].ConstVector))->push_back((yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 164:
-#line 1619 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 171:
+#line 1639 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVector) = new std::vector<Constant*>();
     (yyval.ConstVector)->push_back((yyvsp[0].ConstVal));
@@ -3964,62 +4020,69 @@
   ;}
     break;
 
-  case 165:
-#line 1627 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 172:
+#line 1647 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
-  case 166:
-#line 1627 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 173:
+#line 1647 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
-  case 167:
-#line 1637 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 174:
+#line 1658 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
-  (yyval.ModuleVal) = ParserResult = (yyvsp[0].ModuleVal);
-  CurModule.ModuleDone();
-  CHECK_FOR_ERROR;
-;}
+    (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
+    CurModule.ModuleDone();
+    CHECK_FOR_ERROR;
+  ;}
     break;
 
-  case 168:
-#line 1645 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 175:
+#line 1663 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.ModuleVal) = (yyvsp[-1].ModuleVal);
-    CurFun.FunctionDone();
-    CHECK_FOR_ERROR
+    (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
+    CurModule.ModuleDone();
+    CHECK_FOR_ERROR;
   ;}
     break;
 
-  case 169:
-#line 1650 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 178:
+#line 1676 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { CurFun.isDeclare = false ;}
+    break;
+
+  case 179:
+#line 1676 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.ModuleVal) = (yyvsp[-1].ModuleVal);
+    CurFun.FunctionDone();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 170:
-#line 1654 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 180:
+#line 1680 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { CurFun.isDeclare = true; ;}
+    break;
+
+  case 181:
+#line 1680 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.ModuleVal) = (yyvsp[-3].ModuleVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 171:
-#line 1658 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 182:
+#line 1683 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.ModuleVal) = (yyvsp[-1].ModuleVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 172:
-#line 1662 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 183:
+#line 1686 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.ModuleVal) = CurModule.CurrentModule;
     // Emit an error if there are any unresolved types left.
     if (!CurModule.LateResolveTypes.empty()) {
       const ValID &DID = CurModule.LateResolveTypes.begin()->first;
@@ -4033,8 +4096,8 @@
   ;}
     break;
 
-  case 173:
-#line 1677 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 184:
+#line 1698 "/proj/llvm/llvm-1/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:
@@ -4059,111 +4122,74 @@
   ;}
     break;
 
-  case 174:
-#line 1699 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
-    {       // Function prototypes can be in const pool
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 175:
-#line 1702 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
-    {  // Asm blocks can be in the const pool
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 176:
-#line 1705 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
-    {
+  case 185:
+#line 1720 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { /* "Externally Visible" Linkage */
     if ((yyvsp[0].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant!");
-    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), (yyvsp[-2].Linkage), (yyvsp[-1].BoolVal), (yyvsp[0].ConstVal)->getType(), (yyvsp[0].ConstVal));
-    CHECK_FOR_ERROR
-  ;}
-    break;
-
-  case 177:
-#line 1710 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
-    {
-    CurGV = 0;
-  ;}
-    break;
-
-  case 178:
-#line 1713 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
-    {
-    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalLinkage, (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0);
+    CurGV = ParseGlobalVariable((yyvsp[-2].StrVal), GlobalValue::ExternalLinkage, (yyvsp[-1].BoolVal), 
+                                (yyvsp[0].ConstVal)->getType(), (yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
-    delete (yyvsp[0].TypeVal);
   ;}
     break;
 
-  case 179:
-#line 1717 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 186:
+#line 1726 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
-    CHECK_FOR_ERROR
   ;}
     break;
 
-  case 180:
-#line 1721 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 187:
+#line 1729 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
-    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::DLLImportLinkage, (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0);
+    if ((yyvsp[0].ConstVal) == 0) 
+      GEN_ERROR("Global value initializer is not a constant!");
+    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), (yyvsp[-2].Linkage), (yyvsp[-1].BoolVal), (yyvsp[0].ConstVal)->getType(), (yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
-    delete (yyvsp[0].TypeVal);
   ;}
     break;
 
-  case 181:
-#line 1725 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 188:
+#line 1734 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
-    CHECK_FOR_ERROR
   ;}
     break;
 
-  case 182:
-#line 1729 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 189:
+#line 1737 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
-    CurGV = 
-      ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalWeakLinkage, (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0);
+    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), (yyvsp[-2].Linkage), (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0);
     CHECK_FOR_ERROR
     delete (yyvsp[0].TypeVal);
   ;}
     break;
 
-  case 183:
-#line 1734 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 190:
+#line 1741 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 184:
-#line 1738 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 191:
+#line 1745 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { 
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 185:
-#line 1741 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 192:
+#line 1748 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 186:
-#line 1744 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
-    { 
-  ;}
-    break;
-
-  case 187:
-#line 1748 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 193:
+#line 1754 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   char *EndStr = UnEscapeLexed((yyvsp[0].StrVal), true);
@@ -4178,26 +4204,26 @@
 ;}
     break;
 
-  case 188:
-#line 1761 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 194:
+#line 1767 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Endianness) = Module::BigEndian; ;}
     break;
 
-  case 189:
-#line 1762 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 195:
+#line 1768 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Endianness) = Module::LittleEndian; ;}
     break;
 
-  case 190:
-#line 1764 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 196:
+#line 1770 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setEndianness((yyvsp[0].Endianness));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 191:
-#line 1768 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 197:
+#line 1774 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].UInt64Val) == 32)
       CurModule.CurrentModule->setPointerSize(Module::Pointer32);
@@ -4209,24 +4235,24 @@
   ;}
     break;
 
-  case 192:
-#line 1777 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 198:
+#line 1783 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setTargetTriple((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
   ;}
     break;
 
-  case 193:
-#line 1781 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 199:
+#line 1787 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setDataLayout((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
   ;}
     break;
 
-  case 195:
-#line 1788 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 201:
+#line 1794 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
           free((yyvsp[0].StrVal));
@@ -4234,8 +4260,8 @@
         ;}
     break;
 
-  case 196:
-#line 1793 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 202:
+#line 1799 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
           free((yyvsp[0].StrVal));
@@ -4243,20 +4269,20 @@
         ;}
     break;
 
-  case 197:
-#line 1798 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 203:
+#line 1804 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
           CHECK_FOR_ERROR
         ;}
     break;
 
-  case 201:
-#line 1808 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 207:
+#line 1814 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
-  case 202:
-#line 1810 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 208:
+#line 1816 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   if (*(yyvsp[-1].TypeVal) == Type::VoidTy)
     GEN_ERROR("void typed arguments are invalid!");
@@ -4265,8 +4291,8 @@
 ;}
     break;
 
-  case 203:
-#line 1817 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 209:
+#line 1823 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[-2].ArgList);
     (yyvsp[-2].ArgList)->push_back(*(yyvsp[0].ArgVal));
@@ -4275,8 +4301,8 @@
   ;}
     break;
 
-  case 204:
-#line 1823 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 210:
+#line 1829 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new std::vector<std::pair<PATypeHolder*,char*> >();
     (yyval.ArgList)->push_back(*(yyvsp[0].ArgVal));
@@ -4285,16 +4311,16 @@
   ;}
     break;
 
-  case 205:
-#line 1830 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 211:
+#line 1836 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[0].ArgList);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 206:
-#line 1834 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 212:
+#line 1840 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[-2].ArgList);
     (yyval.ArgList)->push_back(std::pair<PATypeHolder*,
@@ -4303,8 +4329,8 @@
   ;}
     break;
 
-  case 207:
-#line 1840 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 213:
+#line 1846 "/proj/llvm/llvm-1/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));
@@ -4312,16 +4338,16 @@
   ;}
     break;
 
-  case 208:
-#line 1845 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 214:
+#line 1851 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 209:
-#line 1851 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 215:
+#line 1857 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   UnEscapeLexed((yyvsp[-5].StrVal));
   std::string FunctionName((yyvsp[-5].StrVal));
@@ -4417,8 +4443,8 @@
 ;}
     break;
 
-  case 212:
-#line 1947 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 218:
+#line 1953 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = CurFun.CurrentFunction;
 
@@ -4428,31 +4454,16 @@
 ;}
     break;
 
-  case 215:
-#line 1957 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 221:
+#line 1963 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
   CHECK_FOR_ERROR
 ;}
     break;
 
-  case 217:
-#line 1963 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
-    { CurFun.Linkage = GlobalValue::DLLImportLinkage; ;}
-    break;
-
-  case 218:
-#line 1964 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
-    { CurFun.Linkage = GlobalValue::ExternalWeakLinkage; ;}
-    break;
-
-  case 219:
-#line 1966 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
-    { CurFun.isDeclare = true; ;}
-    break;
-
-  case 220:
-#line 1966 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 222:
+#line 1968 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = CurFun.CurrentFunction;
     CurFun.FunctionDone();
@@ -4460,88 +4471,88 @@
   ;}
     break;
 
-  case 221:
-#line 1976 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 223:
+#line 1978 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 222:
-#line 1980 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 224:
+#line 1982 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 223:
-#line 1985 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 225:
+#line 1987 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {    // A reference to a direct constant
     (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 224:
-#line 1989 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 226:
+#line 1991 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 225:
-#line 1993 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 227:
+#line 1995 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                     // Perhaps it's an FP constant?
     (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 226:
-#line 1997 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 228:
+#line 1999 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantBool::getTrue());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 227:
-#line 2001 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 229:
+#line 2003 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantBool::getFalse());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 228:
-#line 2005 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 230:
+#line 2007 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createNull();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 229:
-#line 2009 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 231:
+#line 2011 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 230:
-#line 2013 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 232:
+#line 2015 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {     // A vector zero constant.
     (yyval.ValIDVal) = ValID::createZeroInit();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 231:
-#line 2017 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 233:
+#line 2019 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized packed vector
     const Type *ETy = (*(yyvsp[-1].ConstVector))[0]->getType();
     int NumElements = (yyvsp[-1].ConstVector)->size(); 
@@ -4569,16 +4580,16 @@
   ;}
     break;
 
-  case 232:
-#line 2042 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 234:
+#line 2044 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 233:
-#line 2046 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 235:
+#line 2048 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     char *End = UnEscapeLexed((yyvsp[-2].StrVal), true);
     std::string AsmStr = std::string((yyvsp[-2].StrVal), End);
@@ -4591,48 +4602,48 @@
   ;}
     break;
 
-  case 234:
-#line 2060 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 236:
+#line 2062 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {  // Is it an integer reference...?
     (yyval.ValIDVal) = ValID::create((yyvsp[0].SIntVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 235:
-#line 2064 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 237:
+#line 2066 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::create((yyvsp[0].StrVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 238:
-#line 2076 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 240:
+#line 2078 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueVal) = getVal(*(yyvsp[-1].TypeVal), (yyvsp[0].ValIDVal)); delete (yyvsp[-1].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 239:
-#line 2081 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 241:
+#line 2083 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 240:
-#line 2085 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 242:
+#line 2087 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { // Do not allow functions with 0 basic blocks   
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 241:
-#line 2094 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 243:
+#line 2096 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     setValueName((yyvsp[0].TermInstVal), (yyvsp[-1].StrVal));
     CHECK_FOR_ERROR
@@ -4645,8 +4656,8 @@
   ;}
     break;
 
-  case 242:
-#line 2105 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 244:
+#line 2107 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (CastInst *CI1 = dyn_cast<CastInst>((yyvsp[0].InstVal)))
       if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
@@ -4658,8 +4669,8 @@
   ;}
     break;
 
-  case 243:
-#line 2114 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 245:
+#line 2116 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BasicBlockVal) = getBBVal(ValID::create((int)CurFun.NextBBNum++), true);
     CHECK_FOR_ERROR
@@ -4674,8 +4685,8 @@
   ;}
     break;
 
-  case 244:
-#line 2126 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 246:
+#line 2128 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BasicBlockVal) = getBBVal(ValID::create((yyvsp[0].StrVal)), true);
     CHECK_FOR_ERROR
@@ -4690,24 +4701,24 @@
   ;}
     break;
 
-  case 245:
-#line 2139 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 247:
+#line 2141 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {              // Return with a result...
     (yyval.TermInstVal) = new ReturnInst((yyvsp[0].ValueVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 246:
-#line 2143 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 248:
+#line 2145 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                                       // Return with no result...
     (yyval.TermInstVal) = new ReturnInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 247:
-#line 2147 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 249:
+#line 2149 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                         // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
@@ -4715,8 +4726,8 @@
   ;}
     break;
 
-  case 248:
-#line 2152 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 250:
+#line 2154 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {  
     BasicBlock* tmpBBA = getBBVal((yyvsp[-3].ValIDVal));
     CHECK_FOR_ERROR
@@ -4728,8 +4739,8 @@
   ;}
     break;
 
-  case 249:
-#line 2161 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 251:
+#line 2163 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-7].PrimType), (yyvsp[-6].ValIDVal));
     CHECK_FOR_ERROR
@@ -4751,8 +4762,8 @@
   ;}
     break;
 
-  case 250:
-#line 2180 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 252:
+#line 2182 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-6].PrimType), (yyvsp[-5].ValIDVal));
     CHECK_FOR_ERROR
@@ -4764,8 +4775,8 @@
   ;}
     break;
 
-  case 251:
-#line 2190 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 253:
+#line 2192 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const PointerType *PFTy;
     const FunctionType *Ty;
@@ -4823,24 +4834,24 @@
   ;}
     break;
 
-  case 252:
-#line 2245 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 254:
+#line 2247 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 253:
-#line 2249 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 255:
+#line 2251 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 254:
-#line 2256 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 256:
+#line 2258 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = (yyvsp[-5].JumpTable);
     Constant *V = cast<Constant>(getValNonImprovising((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
@@ -4854,8 +4865,8 @@
   ;}
     break;
 
-  case 255:
-#line 2267 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 257:
+#line 2269 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
     Constant *V = cast<Constant>(getValNonImprovising((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
@@ -4870,8 +4881,8 @@
   ;}
     break;
 
-  case 256:
-#line 2280 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 258:
+#line 2282 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   // Is this definition named?? if so, assign the name...
   setValueName((yyvsp[0].InstVal), (yyvsp[-1].StrVal));
@@ -4882,8 +4893,8 @@
 ;}
     break;
 
-  case 257:
-#line 2289 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 259:
+#line 2291 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {    // Used for PHI nodes
     (yyval.PHIList) = new std::list<std::pair<Value*, BasicBlock*> >();
     Value* tmpVal = getVal(*(yyvsp[-5].TypeVal), (yyvsp[-3].ValIDVal));
@@ -4895,8 +4906,8 @@
   ;}
     break;
 
-  case 258:
-#line 2298 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 260:
+#line 2300 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.PHIList) = (yyvsp[-6].PHIList);
     Value* tmpVal = getVal((yyvsp[-6].PHIList)->front().first->getType(), (yyvsp[-3].ValIDVal));
@@ -4907,16 +4918,16 @@
   ;}
     break;
 
-  case 259:
-#line 2308 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 261:
+#line 2310 "/proj/llvm/llvm-1/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 260:
-#line 2312 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 262:
+#line 2314 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = (yyvsp[-2].ValueList);
     (yyvsp[-2].ValueList)->push_back((yyvsp[0].ValueVal));
@@ -4924,29 +4935,29 @@
   ;}
     break;
 
-  case 262:
-#line 2319 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 264:
+#line 2321 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueList) = 0; ;}
     break;
 
-  case 263:
-#line 2321 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 265:
+#line 2323 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 264:
-#line 2325 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 266:
+#line 2327 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 265:
-#line 2330 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 267:
+#line 2332 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!(*(yyvsp[-3].TypeVal))->isInteger() && !(*(yyvsp[-3].TypeVal))->isFloatingPoint() && 
         !isa<PackedType>((*(yyvsp[-3].TypeVal)).get()))
@@ -4968,8 +4979,8 @@
   ;}
     break;
 
-  case 266:
-#line 2349 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 268:
+#line 2351 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!(*(yyvsp[-3].TypeVal))->isIntegral()) {
       if (!isa<PackedType>((yyvsp[-3].TypeVal)->get()) ||
@@ -4987,8 +4998,8 @@
   ;}
     break;
 
-  case 267:
-#line 2364 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 269:
+#line 2366 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (isa<PackedType>((*(yyvsp[-3].TypeVal)).get()))
       GEN_ERROR("Packed types not supported by icmp instruction");
@@ -5002,8 +5013,8 @@
   ;}
     break;
 
-  case 268:
-#line 2375 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 270:
+#line 2377 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (isa<PackedType>((*(yyvsp[-3].TypeVal)).get()))
       GEN_ERROR("Packed types not supported by fcmp instruction");
@@ -5017,8 +5028,8 @@
   ;}
     break;
 
-  case 269:
-#line 2386 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 271:
+#line 2388 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     cerr << "WARNING: Use of eliminated 'not' instruction:"
          << " Replacing with 'xor'.\n";
@@ -5034,8 +5045,8 @@
   ;}
     break;
 
-  case 270:
-#line 2399 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 272:
+#line 2401 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].ValueVal)->getType() != Type::UByteTy)
       GEN_ERROR("Shift amount must be ubyte!");
@@ -5047,8 +5058,8 @@
   ;}
     break;
 
-  case 271:
-#line 2408 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 273:
+#line 2410 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     Value* Val = (yyvsp[-2].ValueVal);
     const Type* Ty = (yyvsp[0].TypeVal)->get();
@@ -5062,8 +5073,8 @@
   ;}
     break;
 
-  case 272:
-#line 2419 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 274:
+#line 2421 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-4].ValueVal)->getType() != Type::BoolTy)
       GEN_ERROR("select condition must be boolean!");
@@ -5074,8 +5085,8 @@
   ;}
     break;
 
-  case 273:
-#line 2427 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 275:
+#line 2429 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = new VAArgInst((yyvsp[-2].ValueVal), *(yyvsp[0].TypeVal));
     delete (yyvsp[0].TypeVal);
@@ -5083,8 +5094,8 @@
   ;}
     break;
 
-  case 274:
-#line 2432 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 276:
+#line 2434 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid extractelement operands!");
@@ -5093,8 +5104,8 @@
   ;}
     break;
 
-  case 275:
-#line 2438 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 277:
+#line 2440 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid insertelement operands!");
@@ -5103,8 +5114,8 @@
   ;}
     break;
 
-  case 276:
-#line 2444 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 278:
+#line 2446 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid shufflevector operands!");
@@ -5113,8 +5124,8 @@
   ;}
     break;
 
-  case 277:
-#line 2450 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 279:
+#line 2452 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[0].PHIList)->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -5132,8 +5143,8 @@
   ;}
     break;
 
-  case 278:
-#line 2465 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 280:
+#line 2467 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const PointerType *PFTy = 0;
     const FunctionType *Ty = 0;
@@ -5195,48 +5206,48 @@
   ;}
     break;
 
-  case 279:
-#line 2524 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 281:
+#line 2526 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = (yyvsp[0].InstVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 280:
-#line 2531 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 282:
+#line 2533 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { 
     (yyval.ValueList) = (yyvsp[0].ValueList); 
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 281:
-#line 2534 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 283:
+#line 2536 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { 
     (yyval.ValueList) = new std::vector<Value*>(); 
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 282:
-#line 2539 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 284:
+#line 2541 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 283:
-#line 2543 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 285:
+#line 2545 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 284:
-#line 2550 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 286:
+#line 2552 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = new MallocInst(*(yyvsp[-1].TypeVal), 0, (yyvsp[0].UIntVal));
     delete (yyvsp[-1].TypeVal);
@@ -5244,8 +5255,8 @@
   ;}
     break;
 
-  case 285:
-#line 2555 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 287:
+#line 2557 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-2].PrimType), (yyvsp[-1].ValIDVal));
     CHECK_FOR_ERROR
@@ -5254,8 +5265,8 @@
   ;}
     break;
 
-  case 286:
-#line 2561 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 288:
+#line 2563 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = new AllocaInst(*(yyvsp[-1].TypeVal), 0, (yyvsp[0].UIntVal));
     delete (yyvsp[-1].TypeVal);
@@ -5263,8 +5274,8 @@
   ;}
     break;
 
-  case 287:
-#line 2566 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 289:
+#line 2568 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-2].PrimType), (yyvsp[-1].ValIDVal));
     CHECK_FOR_ERROR
@@ -5273,8 +5284,8 @@
   ;}
     break;
 
-  case 288:
-#line 2572 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 290:
+#line 2574 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[0].ValueVal)->getType()))
       GEN_ERROR("Trying to free nonpointer type " + 
@@ -5284,8 +5295,8 @@
   ;}
     break;
 
-  case 289:
-#line 2580 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 291:
+#line 2582 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[-1].TypeVal)->get()))
       GEN_ERROR("Can't load from nonpointer type: " +
@@ -5300,8 +5311,8 @@
   ;}
     break;
 
-  case 290:
-#line 2592 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 292:
+#line 2594 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const PointerType *PT = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
     if (!PT)
@@ -5319,8 +5330,8 @@
   ;}
     break;
 
-  case 291:
-#line 2607 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 293:
+#line 2609 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[-2].TypeVal)->get()))
       GEN_ERROR("getelementptr insn requires pointer operand!");
@@ -5341,7 +5352,7 @@
     }
 
 /* Line 1126 of yacc.c.  */
-#line 5345 "llvmAsmParser.tab.c"
+#line 5356 "llvmAsmParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -5609,7 +5620,7 @@
 }
 
 
-#line 2622 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 2624 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
 
 
 void llvm::GenerateError(const std::string &message, int LineNo) {


Index: llvm/lib/AsmParser/llvmAsmParser.h.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.31 llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.32
--- llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.31	Sat Dec 23 00:05:40 2006
+++ llvm/lib/AsmParser/llvmAsmParser.h.cvs	Fri Dec 29 14:30:42 2006
@@ -46,8 +46,8 @@
      ULONG = 272,
      FLOAT = 273,
      DOUBLE = 274,
-     TYPE = 275,
-     LABEL = 276,
+     LABEL = 275,
+     TYPE = 276,
      VAR_ID = 277,
      LABELSTR = 278,
      STRINGCONSTANT = 279,
@@ -58,113 +58,114 @@
      BEGINTOK = 284,
      ENDTOK = 285,
      DECLARE = 286,
-     GLOBAL = 287,
-     CONSTANT = 288,
-     SECTION = 289,
-     VOLATILE = 290,
-     TO = 291,
-     DOTDOTDOT = 292,
-     NULL_TOK = 293,
-     UNDEF = 294,
-     CONST = 295,
-     INTERNAL = 296,
-     LINKONCE = 297,
-     WEAK = 298,
-     APPENDING = 299,
-     DLLIMPORT = 300,
-     DLLEXPORT = 301,
-     EXTERN_WEAK = 302,
-     OPAQUE = 303,
-     NOT = 304,
-     EXTERNAL = 305,
-     TARGET = 306,
-     TRIPLE = 307,
-     ENDIAN = 308,
-     POINTERSIZE = 309,
-     LITTLE = 310,
-     BIG = 311,
-     ALIGN = 312,
-     DEPLIBS = 313,
-     CALL = 314,
-     TAIL = 315,
-     ASM_TOK = 316,
-     MODULE = 317,
-     SIDEEFFECT = 318,
-     CC_TOK = 319,
-     CCC_TOK = 320,
-     CSRETCC_TOK = 321,
-     FASTCC_TOK = 322,
-     COLDCC_TOK = 323,
-     X86_STDCALLCC_TOK = 324,
-     X86_FASTCALLCC_TOK = 325,
-     DATALAYOUT = 326,
-     RET = 327,
-     BR = 328,
-     SWITCH = 329,
-     INVOKE = 330,
-     UNWIND = 331,
-     UNREACHABLE = 332,
-     ADD = 333,
-     SUB = 334,
-     MUL = 335,
-     UDIV = 336,
-     SDIV = 337,
-     FDIV = 338,
-     UREM = 339,
-     SREM = 340,
-     FREM = 341,
-     AND = 342,
-     OR = 343,
-     XOR = 344,
-     ICMP = 345,
-     FCMP = 346,
-     EQ = 347,
-     NE = 348,
-     SLT = 349,
-     SGT = 350,
-     SLE = 351,
-     SGE = 352,
-     ULT = 353,
-     UGT = 354,
-     ULE = 355,
-     UGE = 356,
-     OEQ = 357,
-     ONE = 358,
-     OLT = 359,
-     OGT = 360,
-     OLE = 361,
-     OGE = 362,
-     ORD = 363,
-     UNO = 364,
-     UEQ = 365,
-     UNE = 366,
-     MALLOC = 367,
-     ALLOCA = 368,
-     FREE = 369,
-     LOAD = 370,
-     STORE = 371,
-     GETELEMENTPTR = 372,
-     TRUNC = 373,
-     ZEXT = 374,
-     SEXT = 375,
-     FPTRUNC = 376,
-     FPEXT = 377,
-     BITCAST = 378,
-     UITOFP = 379,
-     SITOFP = 380,
-     FPTOUI = 381,
-     FPTOSI = 382,
-     INTTOPTR = 383,
-     PTRTOINT = 384,
-     PHI_TOK = 385,
-     SELECT = 386,
-     SHL = 387,
-     LSHR = 388,
-     ASHR = 389,
-     VAARG = 390,
-     EXTRACTELEMENT = 391,
-     INSERTELEMENT = 392,
-     SHUFFLEVECTOR = 393
+     DEFINE = 287,
+     GLOBAL = 288,
+     CONSTANT = 289,
+     SECTION = 290,
+     VOLATILE = 291,
+     TO = 292,
+     DOTDOTDOT = 293,
+     NULL_TOK = 294,
+     UNDEF = 295,
+     CONST = 296,
+     INTERNAL = 297,
+     LINKONCE = 298,
+     WEAK = 299,
+     APPENDING = 300,
+     DLLIMPORT = 301,
+     DLLEXPORT = 302,
+     EXTERN_WEAK = 303,
+     OPAQUE = 304,
+     NOT = 305,
+     EXTERNAL = 306,
+     TARGET = 307,
+     TRIPLE = 308,
+     ENDIAN = 309,
+     POINTERSIZE = 310,
+     LITTLE = 311,
+     BIG = 312,
+     ALIGN = 313,
+     DEPLIBS = 314,
+     CALL = 315,
+     TAIL = 316,
+     ASM_TOK = 317,
+     MODULE = 318,
+     SIDEEFFECT = 319,
+     CC_TOK = 320,
+     CCC_TOK = 321,
+     CSRETCC_TOK = 322,
+     FASTCC_TOK = 323,
+     COLDCC_TOK = 324,
+     X86_STDCALLCC_TOK = 325,
+     X86_FASTCALLCC_TOK = 326,
+     DATALAYOUT = 327,
+     RET = 328,
+     BR = 329,
+     SWITCH = 330,
+     INVOKE = 331,
+     UNWIND = 332,
+     UNREACHABLE = 333,
+     ADD = 334,
+     SUB = 335,
+     MUL = 336,
+     UDIV = 337,
+     SDIV = 338,
+     FDIV = 339,
+     UREM = 340,
+     SREM = 341,
+     FREM = 342,
+     AND = 343,
+     OR = 344,
+     XOR = 345,
+     ICMP = 346,
+     FCMP = 347,
+     EQ = 348,
+     NE = 349,
+     SLT = 350,
+     SGT = 351,
+     SLE = 352,
+     SGE = 353,
+     ULT = 354,
+     UGT = 355,
+     ULE = 356,
+     UGE = 357,
+     OEQ = 358,
+     ONE = 359,
+     OLT = 360,
+     OGT = 361,
+     OLE = 362,
+     OGE = 363,
+     ORD = 364,
+     UNO = 365,
+     UEQ = 366,
+     UNE = 367,
+     MALLOC = 368,
+     ALLOCA = 369,
+     FREE = 370,
+     LOAD = 371,
+     STORE = 372,
+     GETELEMENTPTR = 373,
+     TRUNC = 374,
+     ZEXT = 375,
+     SEXT = 376,
+     FPTRUNC = 377,
+     FPEXT = 378,
+     BITCAST = 379,
+     UITOFP = 380,
+     SITOFP = 381,
+     FPTOUI = 382,
+     FPTOSI = 383,
+     INTTOPTR = 384,
+     PTRTOINT = 385,
+     PHI_TOK = 386,
+     SELECT = 387,
+     SHL = 388,
+     LSHR = 389,
+     ASHR = 390,
+     VAARG = 391,
+     EXTRACTELEMENT = 392,
+     INSERTELEMENT = 393,
+     SHUFFLEVECTOR = 394
    };
 #endif
 /* Tokens.  */
@@ -185,8 +186,8 @@
 #define ULONG 272
 #define FLOAT 273
 #define DOUBLE 274
-#define TYPE 275
-#define LABEL 276
+#define LABEL 275
+#define TYPE 276
 #define VAR_ID 277
 #define LABELSTR 278
 #define STRINGCONSTANT 279
@@ -197,119 +198,120 @@
 #define BEGINTOK 284
 #define ENDTOK 285
 #define DECLARE 286
-#define GLOBAL 287
-#define CONSTANT 288
-#define SECTION 289
-#define VOLATILE 290
-#define TO 291
-#define DOTDOTDOT 292
-#define NULL_TOK 293
-#define UNDEF 294
-#define CONST 295
-#define INTERNAL 296
-#define LINKONCE 297
-#define WEAK 298
-#define APPENDING 299
-#define DLLIMPORT 300
-#define DLLEXPORT 301
-#define EXTERN_WEAK 302
-#define OPAQUE 303
-#define NOT 304
-#define EXTERNAL 305
-#define TARGET 306
-#define TRIPLE 307
-#define ENDIAN 308
-#define POINTERSIZE 309
-#define LITTLE 310
-#define BIG 311
-#define ALIGN 312
-#define DEPLIBS 313
-#define CALL 314
-#define TAIL 315
-#define ASM_TOK 316
-#define MODULE 317
-#define SIDEEFFECT 318
-#define CC_TOK 319
-#define CCC_TOK 320
-#define CSRETCC_TOK 321
-#define FASTCC_TOK 322
-#define COLDCC_TOK 323
-#define X86_STDCALLCC_TOK 324
-#define X86_FASTCALLCC_TOK 325
-#define DATALAYOUT 326
-#define RET 327
-#define BR 328
-#define SWITCH 329
-#define INVOKE 330
-#define UNWIND 331
-#define UNREACHABLE 332
-#define ADD 333
-#define SUB 334
-#define MUL 335
-#define UDIV 336
-#define SDIV 337
-#define FDIV 338
-#define UREM 339
-#define SREM 340
-#define FREM 341
-#define AND 342
-#define OR 343
-#define XOR 344
-#define ICMP 345
-#define FCMP 346
-#define EQ 347
-#define NE 348
-#define SLT 349
-#define SGT 350
-#define SLE 351
-#define SGE 352
-#define ULT 353
-#define UGT 354
-#define ULE 355
-#define UGE 356
-#define OEQ 357
-#define ONE 358
-#define OLT 359
-#define OGT 360
-#define OLE 361
-#define OGE 362
-#define ORD 363
-#define UNO 364
-#define UEQ 365
-#define UNE 366
-#define MALLOC 367
-#define ALLOCA 368
-#define FREE 369
-#define LOAD 370
-#define STORE 371
-#define GETELEMENTPTR 372
-#define TRUNC 373
-#define ZEXT 374
-#define SEXT 375
-#define FPTRUNC 376
-#define FPEXT 377
-#define BITCAST 378
-#define UITOFP 379
-#define SITOFP 380
-#define FPTOUI 381
-#define FPTOSI 382
-#define INTTOPTR 383
-#define PTRTOINT 384
-#define PHI_TOK 385
-#define SELECT 386
-#define SHL 387
-#define LSHR 388
-#define ASHR 389
-#define VAARG 390
-#define EXTRACTELEMENT 391
-#define INSERTELEMENT 392
-#define SHUFFLEVECTOR 393
+#define DEFINE 287
+#define GLOBAL 288
+#define CONSTANT 289
+#define SECTION 290
+#define VOLATILE 291
+#define TO 292
+#define DOTDOTDOT 293
+#define NULL_TOK 294
+#define UNDEF 295
+#define CONST 296
+#define INTERNAL 297
+#define LINKONCE 298
+#define WEAK 299
+#define APPENDING 300
+#define DLLIMPORT 301
+#define DLLEXPORT 302
+#define EXTERN_WEAK 303
+#define OPAQUE 304
+#define NOT 305
+#define EXTERNAL 306
+#define TARGET 307
+#define TRIPLE 308
+#define ENDIAN 309
+#define POINTERSIZE 310
+#define LITTLE 311
+#define BIG 312
+#define ALIGN 313
+#define DEPLIBS 314
+#define CALL 315
+#define TAIL 316
+#define ASM_TOK 317
+#define MODULE 318
+#define SIDEEFFECT 319
+#define CC_TOK 320
+#define CCC_TOK 321
+#define CSRETCC_TOK 322
+#define FASTCC_TOK 323
+#define COLDCC_TOK 324
+#define X86_STDCALLCC_TOK 325
+#define X86_FASTCALLCC_TOK 326
+#define DATALAYOUT 327
+#define RET 328
+#define BR 329
+#define SWITCH 330
+#define INVOKE 331
+#define UNWIND 332
+#define UNREACHABLE 333
+#define ADD 334
+#define SUB 335
+#define MUL 336
+#define UDIV 337
+#define SDIV 338
+#define FDIV 339
+#define UREM 340
+#define SREM 341
+#define FREM 342
+#define AND 343
+#define OR 344
+#define XOR 345
+#define ICMP 346
+#define FCMP 347
+#define EQ 348
+#define NE 349
+#define SLT 350
+#define SGT 351
+#define SLE 352
+#define SGE 353
+#define ULT 354
+#define UGT 355
+#define ULE 356
+#define UGE 357
+#define OEQ 358
+#define ONE 359
+#define OLT 360
+#define OGT 361
+#define OLE 362
+#define OGE 363
+#define ORD 364
+#define UNO 365
+#define UEQ 366
+#define UNE 367
+#define MALLOC 368
+#define ALLOCA 369
+#define FREE 370
+#define LOAD 371
+#define STORE 372
+#define GETELEMENTPTR 373
+#define TRUNC 374
+#define ZEXT 375
+#define SEXT 376
+#define FPTRUNC 377
+#define FPEXT 378
+#define BITCAST 379
+#define UITOFP 380
+#define SITOFP 381
+#define FPTOUI 382
+#define FPTOSI 383
+#define INTTOPTR 384
+#define PTRTOINT 385
+#define PHI_TOK 386
+#define SELECT 387
+#define SHL 388
+#define LSHR 389
+#define ASHR 390
+#define VAARG 391
+#define EXTRACTELEMENT 392
+#define INSERTELEMENT 393
+#define SHUFFLEVECTOR 394
 
 
 
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 855 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 855 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
 typedef union YYSTYPE {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -353,7 +355,7 @@
   llvm::FCmpInst::Predicate         FPredicate;
 } YYSTYPE;
 /* Line 1447 of yacc.c.  */
-#line 357 "llvmAsmParser.tab.h"
+#line 359 "llvmAsmParser.tab.h"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1


Index: llvm/lib/AsmParser/llvmAsmParser.y.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.39 llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.40
--- llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.39	Sat Dec 23 00:05:40 2006
+++ llvm/lib/AsmParser/llvmAsmParser.y.cvs	Fri Dec 29 14:30:42 2006
@@ -895,7 +895,7 @@
   llvm::FCmpInst::Predicate         FPredicate;
 }
 
-%type <ModuleVal>     Module FunctionList
+%type <ModuleVal>     Module
 %type <FunctionVal>   Function FunctionProto FunctionHeader BasicBlockList
 %type <BasicBlockVal> BasicBlock InstructionList
 %type <TermInstVal>   BBTerminatorInst
@@ -913,7 +913,7 @@
 %type <BoolVal>       OptVolatile                 // 'volatile' or not
 %type <BoolVal>       OptTailCall                 // TAIL CALL or plain CALL.
 %type <BoolVal>       OptSideEffect               // 'sideeffect' or not.
-%type <Linkage>       OptLinkage
+%type <Linkage>       FunctionLinkage GVInternalLinkage GVExternalLinkage
 %type <Endianness>    BigOrLittle
 
 // ValueRef - Unresolved reference to a definition or BB
@@ -936,7 +936,8 @@
 %type  <TypeVal> Types TypesV UpRTypes UpRTypesV
 %type  <PrimType> SIntType UIntType IntType FPType PrimType   // Classifications
 %token <PrimType> VOID BOOL SBYTE UBYTE SHORT USHORT INT UINT LONG ULONG
-%token <PrimType> FLOAT DOUBLE TYPE LABEL
+%token <PrimType> FLOAT DOUBLE LABEL
+%token TYPE
 
 %token <StrVal> VAR_ID LABELSTR STRINGCONSTANT
 %type  <StrVal> Name OptName OptAssign
@@ -944,7 +945,7 @@
 %type <StrVal> OptSection SectionString
 
 %token IMPLEMENTATION ZEROINITIALIZER TRUETOK FALSETOK BEGINTOK ENDTOK
-%token DECLARE GLOBAL CONSTANT SECTION VOLATILE
+%token DECLARE DEFINE GLOBAL CONSTANT SECTION VOLATILE
 %token TO DOTDOTDOT NULL_TOK UNDEF CONST INTERNAL LINKONCE WEAK APPENDING
 %token DLLIMPORT DLLEXPORT EXTERN_WEAK
 %token OPAQUE NOT EXTERNAL TARGET TRIPLE ENDIAN POINTERSIZE LITTLE BIG ALIGN
@@ -1038,14 +1039,33 @@
     CHECK_FOR_ERROR
   };
 
-OptLinkage : INTERNAL    { $$ = GlobalValue::InternalLinkage; } |
-             LINKONCE    { $$ = GlobalValue::LinkOnceLinkage; } |
-             WEAK        { $$ = GlobalValue::WeakLinkage; } |
-             APPENDING   { $$ = GlobalValue::AppendingLinkage; } |
-             DLLIMPORT   { $$ = GlobalValue::DLLImportLinkage; } |
-             DLLEXPORT   { $$ = GlobalValue::DLLExportLinkage; } |
-             EXTERN_WEAK { $$ = GlobalValue::ExternalWeakLinkage; } |
-             /*empty*/   { $$ = GlobalValue::ExternalLinkage; };
+GVInternalLinkage 
+  : INTERNAL    { $$ = GlobalValue::InternalLinkage; } 
+  | WEAK        { $$ = GlobalValue::WeakLinkage; } 
+  | LINKONCE    { $$ = GlobalValue::LinkOnceLinkage; }
+  | APPENDING   { $$ = GlobalValue::AppendingLinkage; }
+  | DLLEXPORT   { $$ = GlobalValue::DLLExportLinkage; } 
+  ;
+
+GVExternalLinkage
+  : DLLIMPORT   { $$ = GlobalValue::DLLImportLinkage; }
+  | EXTERN_WEAK { $$ = GlobalValue::ExternalWeakLinkage; }
+  | EXTERNAL    { $$ = GlobalValue::ExternalLinkage; }
+  ;
+
+FnDeclareLinkage
+  : /*empty*/   { /*default*/ }
+  | DLLIMPORT   { CurFun.Linkage = GlobalValue::DLLImportLinkage; } 
+  | EXTERN_WEAK { CurFun.Linkage = GlobalValue::ExternalWeakLinkage; }
+  ;
+  
+FunctionLinkage 
+  : INTERNAL    { $$ = GlobalValue::InternalLinkage; }
+  | LINKONCE    { $$ = GlobalValue::LinkOnceLinkage; }
+  | WEAK        { $$ = GlobalValue::WeakLinkage; }
+  | DLLEXPORT   { $$ = GlobalValue::DLLExportLinkage; } 
+  | /*empty*/   { $$ = GlobalValue::ExternalLinkage; }
+  ; 
 
 OptCallingConv : /*empty*/          { $$ = CallingConv::C; } |
                  CCC_TOK            { $$ = CallingConv::C; } |
@@ -1128,7 +1148,7 @@
 // Derived types are added later...
 //
 PrimType : BOOL | SBYTE | UBYTE | SHORT  | USHORT | INT   | UINT ;
-PrimType : LONG | ULONG | FLOAT | DOUBLE | TYPE   | LABEL;
+PrimType : LONG | ULONG | FLOAT | DOUBLE | LABEL ;
 UpRTypes : OPAQUE {
     $$ = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
@@ -1634,33 +1654,36 @@
 // Module rule: Capture the result of parsing the whole file into a result
 // variable...
 //
-Module : FunctionList {
-  $$ = ParserResult = $1;
-  CurModule.ModuleDone();
-  CHECK_FOR_ERROR;
-};
+Module 
+  : DefinitionList {
+    $$ = ParserResult = CurModule.CurrentModule;
+    CurModule.ModuleDone();
+    CHECK_FOR_ERROR;
+  }
+  | /*empty*/ {
+    $$ = ParserResult = CurModule.CurrentModule;
+    CurModule.ModuleDone();
+    CHECK_FOR_ERROR;
+  }
+  ;
 
-// FunctionList - A list of functions, preceeded by a constant pool.
-//
-FunctionList : FunctionList Function {
-    $$ = $1;
+DefinitionList
+  : Definition
+  | DefinitionList Definition
+  ;
+
+Definition 
+  : DEFINE { CurFun.isDeclare = false } Function {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
-  } 
-  | FunctionList FunctionProto {
-    $$ = $1;
+  }
+  | DECLARE { CurFun.isDeclare = true; } FunctionProto {
     CHECK_FOR_ERROR
   }
-  | FunctionList MODULE ASM_TOK AsmBlock {
-    $$ = $1;
+  | MODULE ASM_TOK AsmBlock {
     CHECK_FOR_ERROR
   }  
-  | FunctionList IMPLEMENTATION {
-    $$ = $1;
-    CHECK_FOR_ERROR
-  }
-  | ConstPool {
-    $$ = CurModule.CurrentModule;
+  | IMPLEMENTATION {
     // Emit an error if there are any unresolved types left.
     if (!CurModule.LateResolveTypes.empty()) {
       const ValID &DID = CurModule.LateResolveTypes.begin()->first;
@@ -1671,10 +1694,8 @@
       }
     }
     CHECK_FOR_ERROR
-  };
-
-// ConstPool - Constants with optional names assigned to them.
-ConstPool : ConstPool OptAssign TYPE TypesV {
+  }
+  | OptAssign TYPE TypesV {
     // Eagerly resolve types.  This is not an optimization, this is a
     // requirement that is due to the fact that we could have this:
     //
@@ -1684,65 +1705,50 @@
     // If types are not resolved eagerly, then the two types will not be
     // determined to be the same type!
     //
-    ResolveTypeTo($2, *$4);
+    ResolveTypeTo($1, *$3);
 
-    if (!setTypeName(*$4, $2) && !$2) {
+    if (!setTypeName(*$3, $1) && !$1) {
       CHECK_FOR_ERROR
       // If this is a named type that is not a redefinition, add it to the slot
       // table.
-      CurModule.Types.push_back(*$4);
+      CurModule.Types.push_back(*$3);
     }
 
-    delete $4;
-    CHECK_FOR_ERROR
-  }
-  | ConstPool FunctionProto {       // Function prototypes can be in const pool
-    CHECK_FOR_ERROR
-  }
-  | ConstPool MODULE ASM_TOK AsmBlock {  // Asm blocks can be in the const pool
+    delete $3;
     CHECK_FOR_ERROR
   }
-  | ConstPool OptAssign OptLinkage GlobalType ConstVal {
-    if ($5 == 0) 
+  | OptAssign GlobalType ConstVal { /* "Externally Visible" Linkage */
+    if ($3 == 0) 
       GEN_ERROR("Global value initializer is not a constant!");
-    CurGV = ParseGlobalVariable($2, $3, $4, $5->getType(), $5);
+    CurGV = ParseGlobalVariable($1, GlobalValue::ExternalLinkage, $2, 
+                                $3->getType(), $3);
     CHECK_FOR_ERROR
   } GlobalVarAttributes {
     CurGV = 0;
   }
-  | ConstPool OptAssign EXTERNAL GlobalType Types {
-    CurGV = ParseGlobalVariable($2, GlobalValue::ExternalLinkage, $4, *$5, 0);
-    CHECK_FOR_ERROR
-    delete $5;
-  } GlobalVarAttributes {
-    CurGV = 0;
-    CHECK_FOR_ERROR
-  }
-  | ConstPool OptAssign DLLIMPORT GlobalType Types {
-    CurGV = ParseGlobalVariable($2, GlobalValue::DLLImportLinkage, $4, *$5, 0);
+  | OptAssign GVInternalLinkage GlobalType ConstVal {
+    if ($4 == 0) 
+      GEN_ERROR("Global value initializer is not a constant!");
+    CurGV = ParseGlobalVariable($1, $2, $3, $4->getType(), $4);
     CHECK_FOR_ERROR
-    delete $5;
   } GlobalVarAttributes {
     CurGV = 0;
-    CHECK_FOR_ERROR
   }
-  | ConstPool OptAssign EXTERN_WEAK GlobalType Types {
-    CurGV = 
-      ParseGlobalVariable($2, GlobalValue::ExternalWeakLinkage, $4, *$5, 0);
+  | OptAssign GVExternalLinkage GlobalType Types {
+    CurGV = ParseGlobalVariable($1, $2, $3, *$4, 0);
     CHECK_FOR_ERROR
-    delete $5;
+    delete $4;
   } GlobalVarAttributes {
     CurGV = 0;
     CHECK_FOR_ERROR
   }
-  | ConstPool TARGET TargetDefinition { 
+  | TARGET TargetDefinition { 
     CHECK_FOR_ERROR
   }
-  | ConstPool DEPLIBS '=' LibrariesDefinition {
+  | DEPLIBS '=' LibrariesDefinition {
     CHECK_FOR_ERROR
   }
-  | /* empty: end of list */ { 
-  };
+  ;
 
 
 AsmBlock : STRINGCONSTANT {
@@ -1944,7 +1950,7 @@
 
 BEGIN : BEGINTOK | '{';                // Allow BEGIN or '{' to start a function
 
-FunctionHeader : OptLinkage FunctionHeaderH BEGIN {
+FunctionHeader : FunctionLinkage FunctionHeaderH BEGIN {
   $$ = CurFun.CurrentFunction;
 
   // Make sure that we keep track of the linkage type even if there was a
@@ -1959,11 +1965,7 @@
   CHECK_FOR_ERROR
 };
 
-FnDeclareLinkage: /*default*/ |
-                  DLLIMPORT   { CurFun.Linkage = GlobalValue::DLLImportLinkage; } |
-                  EXTERN_WEAK { CurFun.Linkage = GlobalValue::ExternalWeakLinkage; };
-  
-FunctionProto : DECLARE { CurFun.isDeclare = true; } FnDeclareLinkage FunctionHeaderH {
+FunctionProto : FnDeclareLinkage FunctionHeaderH {
     $$ = CurFun.CurrentFunction;
     CurFun.FunctionDone();
     CHECK_FOR_ERROR






More information about the llvm-commits mailing list