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

Zhou Sheng zhousheng00 at gmail.com
Thu Jan 11 04:25:08 PST 2007



Changes in directory llvm/lib/AsmParser:

ParserInternals.h updated: 1.51 -> 1.52
llvmAsmParser.cpp.cvs updated: 1.47 -> 1.48
llvmAsmParser.h.cvs updated: 1.36 -> 1.37
llvmAsmParser.y updated: 1.302 -> 1.303
llvmAsmParser.y.cvs updated: 1.48 -> 1.49
---
Log message:

For PR1043: http://llvm.org/PR1043 :
Merge ConstantIntegral and ConstantBool into ConstantInt.
Remove ConstantIntegral and ConstantBool from LLVM.


---
Diffs of the changes:  (+1077 -921)

 ParserInternals.h     |    4 
 llvmAsmParser.cpp.cvs | 1920 ++++++++++++++++++++++++++------------------------
 llvmAsmParser.h.cvs   |    2 
 llvmAsmParser.y       |   10 
 llvmAsmParser.y.cvs   |   62 +
 5 files changed, 1077 insertions(+), 921 deletions(-)


Index: llvm/lib/AsmParser/ParserInternals.h
diff -u llvm/lib/AsmParser/ParserInternals.h:1.51 llvm/lib/AsmParser/ParserInternals.h:1.52
--- llvm/lib/AsmParser/ParserInternals.h:1.51	Sat Dec 30 23:40:51 2006
+++ llvm/lib/AsmParser/ParserInternals.h	Thu Jan 11 06:24:13 2007
@@ -172,8 +172,8 @@
     case ConstUIntVal  :
     case ConstSIntVal  : return std::string("%") + itostr(ConstPool64);
     case ConstantVal:
-      if (ConstantValue == ConstantBool::getTrue()) return "true";
-      if (ConstantValue == ConstantBool::getFalse()) return "false";
+      if (ConstantValue == ConstantInt::getTrue()) return "true";
+      if (ConstantValue == ConstantInt::getFalse()) return "false";
       return "<constant expression>";
     default:
       assert(0 && "Unknown value!");


Index: llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.47 llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.48
--- llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.47	Sat Jan  6 01:24:43 2007
+++ llvm/lib/AsmParser/llvmAsmParser.cpp.cvs	Thu Jan 11 06:24:13 2007
@@ -338,7 +338,7 @@
 
 
 /* Copy the first part of user declarations.  */
-#line 14 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 14 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -1220,7 +1220,7 @@
 #endif
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 876 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 876 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
 typedef union YYSTYPE {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -1430,16 +1430,16 @@
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  37
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1405
+#define YYLAST   1584
 
 /* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS  150
 /* YYNNTS -- Number of nonterminals. */
 #define YYNNTS  78
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  289
+#define YYNRULES  291
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  569
+#define YYNSTATES  576
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -1512,21 +1512,22 @@
      220,   222,   224,   226,   228,   230,   232,   234,   236,   239,
      241,   244,   250,   256,   262,   268,   272,   275,   281,   286,
      289,   291,   293,   295,   299,   301,   305,   307,   308,   310,
-     314,   319,   323,   327,   332,   337,   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,   497,   498,   504,   505,   512,   513,   520,
-     523,   527,   529,   531,   533,   537,   541,   545,   549,   553,
-     557,   559,   560,   562,   564,   566,   567,   573,   577,   579,
-     583,   585,   586,   596,   598,   600,   604,   606,   608,   611,
-     614,   615,   617,   619,   621,   623,   625,   627,   629,   631,
-     633,   637,   639,   645,   647,   649,   651,   653,   656,   659,
-     662,   666,   669,   670,   672,   675,   678,   682,   692,   702,
-     711,   726,   728,   730,   737,   743,   746,   753,   761,   765,
-     771,   772,   773,   777,   780,   782,   788,   794,   801,   808,
-     811,   816,   821,   828,   833,   838,   845,   852,   855,   864,
-     866,   868,   869,   873,   880,   884,   891,   894,   899,   906
+     314,   319,   323,   327,   332,   337,   341,   348,   354,   357,
+     360,   363,   366,   369,   372,   375,   378,   381,   384,   391,
+     397,   406,   413,   420,   428,   436,   443,   450,   459,   468,
+     472,   474,   476,   478,   480,   481,   483,   486,   487,   491,
+     492,   496,   500,   502,   506,   510,   511,   517,   518,   525,
+     526,   533,   536,   540,   542,   544,   546,   550,   554,   558,
+     562,   566,   570,   572,   573,   575,   577,   579,   580,   586,
+     590,   592,   596,   598,   599,   609,   611,   613,   617,   619,
+     621,   624,   627,   628,   630,   632,   634,   636,   638,   640,
+     642,   644,   646,   650,   652,   658,   660,   662,   664,   666,
+     669,   672,   675,   679,   682,   683,   685,   688,   691,   695,
+     705,   715,   724,   739,   741,   743,   750,   756,   759,   766,
+     774,   778,   784,   785,   786,   790,   793,   795,   801,   807,
+     814,   821,   824,   829,   834,   841,   846,   851,   858,   865,
+     868,   877,   879,   881,   882,   886,   893,   897,   904,   907,
+     912,   919
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -1566,64 +1567,65 @@
      182,   137,   177,    -1,   177,   142,   185,   144,    -1,   177,
      142,   144,    -1,   177,   149,    20,    -1,   177,   145,   185,
      146,    -1,   177,   147,   185,   148,    -1,   177,   147,   148,
-      -1,   177,    35,    -1,   177,    36,    -1,   177,   212,    -1,
-     177,   184,    -1,   177,    22,    -1,   158,     3,    -1,   158,
-       4,    -1,     9,    23,    -1,     9,    24,    -1,   159,     7,
-      -1,   154,   140,   183,    33,   177,   141,    -1,   113,   140,
-     183,   223,   141,    -1,   127,   140,   183,   137,   183,   137,
-     183,   141,    -1,   152,   140,   183,   137,   183,   141,    -1,
-     153,   140,   183,   137,   183,   141,    -1,    86,   156,   140,
-     183,   137,   183,   141,    -1,    87,   157,   140,   183,   137,
-     183,   141,    -1,   155,   140,   183,   137,   183,   141,    -1,
-     132,   140,   183,   137,   183,   141,    -1,   133,   140,   183,
-     137,   183,   137,   183,   141,    -1,   134,   140,   183,   137,
-     183,   137,   183,   141,    -1,   185,   137,   183,    -1,   183,
-      -1,    29,    -1,    30,    -1,   188,    -1,    -1,   189,    -1,
-     188,   189,    -1,    -1,    28,   190,   208,    -1,    -1,    27,
-     191,   209,    -1,    58,    57,   195,    -1,    21,    -1,   160,
-      17,   177,    -1,   160,    17,     8,    -1,    -1,   160,   186,
-     183,   192,   174,    -1,    -1,   160,   161,   186,   183,   193,
-     174,    -1,    -1,   160,   162,   186,   177,   194,   174,    -1,
-      47,   197,    -1,    54,   136,   198,    -1,    20,    -1,    52,
-      -1,    51,    -1,    49,   136,   196,    -1,    50,   136,     4,
-      -1,    48,   136,    20,    -1,    67,   136,    20,    -1,   142,
-     199,   144,    -1,   199,   137,    20,    -1,    20,    -1,    -1,
-      18,    -1,    20,    -1,   200,    -1,    -1,   202,   137,   177,
-     167,   201,    -1,   177,   167,   201,    -1,   202,    -1,   202,
-     137,    34,    -1,    34,    -1,    -1,   165,   179,   200,   140,
-     203,   141,   169,   173,   170,    -1,    25,    -1,   147,    -1,
-     164,   204,   205,    -1,    26,    -1,   148,    -1,   215,   207,
-      -1,   163,   204,    -1,    -1,    59,    -1,     3,    -1,     4,
-      -1,     7,    -1,    23,    -1,    24,    -1,    35,    -1,    36,
-      -1,    22,    -1,   145,   185,   146,    -1,   184,    -1,    57,
-     210,    20,   137,    20,    -1,   151,    -1,   200,    -1,   212,
-      -1,   211,    -1,   177,   213,    -1,   215,   216,    -1,   206,
-     216,    -1,   217,   160,   218,    -1,   217,   220,    -1,    -1,
-      19,    -1,    68,   214,    -1,    68,     8,    -1,    69,    16,
-     213,    -1,    69,     9,   213,   137,    16,   213,   137,    16,
-     213,    -1,    70,   158,   213,   137,    16,   213,   142,   219,
-     144,    -1,    70,   158,   213,   137,    16,   213,   142,   144,
-      -1,    71,   165,   179,   213,   140,   222,   141,   169,    33,
-      16,   213,    72,    16,   213,    -1,    72,    -1,    73,    -1,
-     219,   158,   211,   137,    16,   213,    -1,   158,   211,   137,
-      16,   213,    -1,   160,   225,    -1,   177,   142,   213,   137,
-     213,   144,    -1,   221,   137,   142,   213,   137,   213,   144,
-      -1,   177,   213,   167,    -1,   222,   137,   177,   213,   167,
-      -1,    -1,    -1,   223,   137,   214,    -1,    56,    55,    -1,
-      55,    -1,   152,   177,   213,   137,   213,    -1,   153,   177,
-     213,   137,   213,    -1,    86,   156,   177,   213,   137,   213,
-      -1,    87,   157,   177,   213,   137,   213,    -1,    45,   214,
-      -1,   155,   214,   137,   214,    -1,   154,   214,    33,   177,
-      -1,   127,   214,   137,   214,   137,   214,    -1,   131,   214,
-     137,   177,    -1,   132,   214,   137,   214,    -1,   133,   214,
-     137,   214,   137,   214,    -1,   134,   214,   137,   214,   137,
-     214,    -1,   126,   221,    -1,   224,   165,   179,   213,   140,
-     222,   141,   169,    -1,   227,    -1,    32,    -1,    -1,   108,
-     177,   171,    -1,   108,   177,   137,    12,   213,   171,    -1,
-     109,   177,   171,    -1,   109,   177,   137,    12,   213,   171,
-      -1,   110,   214,    -1,   226,   111,   177,   213,    -1,   226,
-     112,   214,   137,   177,   213,    -1,   113,   177,   213,   223,
-      -1
+      -1,   177,   145,   147,   185,   148,   146,    -1,   177,   145,
+     147,   148,   146,    -1,   177,    35,    -1,   177,    36,    -1,
+     177,   212,    -1,   177,   184,    -1,   177,    22,    -1,   158,
+       3,    -1,   158,     4,    -1,     9,    23,    -1,     9,    24,
+      -1,   159,     7,    -1,   154,   140,   183,    33,   177,   141,
+      -1,   113,   140,   183,   223,   141,    -1,   127,   140,   183,
+     137,   183,   137,   183,   141,    -1,   152,   140,   183,   137,
+     183,   141,    -1,   153,   140,   183,   137,   183,   141,    -1,
+      86,   156,   140,   183,   137,   183,   141,    -1,    87,   157,
+     140,   183,   137,   183,   141,    -1,   155,   140,   183,   137,
+     183,   141,    -1,   132,   140,   183,   137,   183,   141,    -1,
+     133,   140,   183,   137,   183,   137,   183,   141,    -1,   134,
+     140,   183,   137,   183,   137,   183,   141,    -1,   185,   137,
+     183,    -1,   183,    -1,    29,    -1,    30,    -1,   188,    -1,
+      -1,   189,    -1,   188,   189,    -1,    -1,    28,   190,   208,
+      -1,    -1,    27,   191,   209,    -1,    58,    57,   195,    -1,
+      21,    -1,   160,    17,   177,    -1,   160,    17,     8,    -1,
+      -1,   160,   186,   183,   192,   174,    -1,    -1,   160,   161,
+     186,   183,   193,   174,    -1,    -1,   160,   162,   186,   177,
+     194,   174,    -1,    47,   197,    -1,    54,   136,   198,    -1,
+      20,    -1,    52,    -1,    51,    -1,    49,   136,   196,    -1,
+      50,   136,     4,    -1,    48,   136,    20,    -1,    67,   136,
+      20,    -1,   142,   199,   144,    -1,   199,   137,    20,    -1,
+      20,    -1,    -1,    18,    -1,    20,    -1,   200,    -1,    -1,
+     202,   137,   177,   167,   201,    -1,   177,   167,   201,    -1,
+     202,    -1,   202,   137,    34,    -1,    34,    -1,    -1,   165,
+     179,   200,   140,   203,   141,   169,   173,   170,    -1,    25,
+      -1,   147,    -1,   164,   204,   205,    -1,    26,    -1,   148,
+      -1,   215,   207,    -1,   163,   204,    -1,    -1,    59,    -1,
+       3,    -1,     4,    -1,     7,    -1,    23,    -1,    24,    -1,
+      35,    -1,    36,    -1,    22,    -1,   145,   185,   146,    -1,
+     184,    -1,    57,   210,    20,   137,    20,    -1,   151,    -1,
+     200,    -1,   212,    -1,   211,    -1,   177,   213,    -1,   215,
+     216,    -1,   206,   216,    -1,   217,   160,   218,    -1,   217,
+     220,    -1,    -1,    19,    -1,    68,   214,    -1,    68,     8,
+      -1,    69,    16,   213,    -1,    69,     9,   213,   137,    16,
+     213,   137,    16,   213,    -1,    70,   158,   213,   137,    16,
+     213,   142,   219,   144,    -1,    70,   158,   213,   137,    16,
+     213,   142,   144,    -1,    71,   165,   179,   213,   140,   222,
+     141,   169,    33,    16,   213,    72,    16,   213,    -1,    72,
+      -1,    73,    -1,   219,   158,   211,   137,    16,   213,    -1,
+     158,   211,   137,    16,   213,    -1,   160,   225,    -1,   177,
+     142,   213,   137,   213,   144,    -1,   221,   137,   142,   213,
+     137,   213,   144,    -1,   177,   213,   167,    -1,   222,   137,
+     177,   213,   167,    -1,    -1,    -1,   223,   137,   214,    -1,
+      56,    55,    -1,    55,    -1,   152,   177,   213,   137,   213,
+      -1,   153,   177,   213,   137,   213,    -1,    86,   156,   177,
+     213,   137,   213,    -1,    87,   157,   177,   213,   137,   213,
+      -1,    45,   214,    -1,   155,   214,   137,   214,    -1,   154,
+     214,    33,   177,    -1,   127,   214,   137,   214,   137,   214,
+      -1,   131,   214,   137,   177,    -1,   132,   214,   137,   214,
+      -1,   133,   214,   137,   214,   137,   214,    -1,   134,   214,
+     137,   214,   137,   214,    -1,   126,   221,    -1,   224,   165,
+     179,   213,   140,   222,   141,   169,    -1,   227,    -1,    32,
+      -1,    -1,   108,   177,   171,    -1,   108,   177,   137,    12,
+     213,   171,    -1,   109,   177,   171,    -1,   109,   177,   137,
+      12,   213,   171,    -1,   110,   214,    -1,   226,   111,   177,
+     213,    -1,   226,   112,   214,   137,   177,   213,    -1,   113,
+     177,   213,   223,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -1643,21 +1645,22 @@
     1184,  1184,  1184,  1184,  1184,  1184,  1187,  1191,  1195,  1202,
     1207,  1215,  1233,  1251,  1256,  1268,  1278,  1282,  1292,  1299,
     1306,  1313,  1318,  1323,  1330,  1331,  1338,  1345,  1353,  1358,
-    1369,  1397,  1413,  1442,  1470,  1491,  1506,  1518,  1525,  1588,
-    1598,  1608,  1614,  1620,  1624,  1628,  1636,  1650,  1671,  1679,
-    1685,  1696,  1701,  1706,  1715,  1721,  1727,  1736,  1740,  1748,
-    1748,  1759,  1764,  1772,  1773,  1777,  1777,  1781,  1781,  1784,
-    1787,  1799,  1823,  1834,  1834,  1843,  1843,  1851,  1851,  1861,
-    1864,  1870,  1883,  1884,  1886,  1890,  1899,  1903,  1908,  1910,
-    1915,  1920,  1929,  1929,  1930,  1930,  1932,  1942,  1953,  1957,
-    1966,  1975,  1980,  2085,  2085,  2087,  2095,  2095,  2097,  2102,
-    2113,  2117,  2122,  2126,  2130,  2134,  2138,  2142,  2146,  2150,
-    2154,  2179,  2183,  2197,  2201,  2207,  2207,  2213,  2222,  2226,
-    2235,  2246,  2255,  2267,  2280,  2284,  2288,  2293,  2302,  2321,
-    2330,  2397,  2401,  2408,  2419,  2432,  2441,  2452,  2462,  2470,
-    2478,  2481,  2482,  2489,  2493,  2498,  2519,  2536,  2549,  2562,
-    2575,  2584,  2597,  2605,  2612,  2618,  2624,  2630,  2645,  2708,
-    2713,  2717,  2724,  2731,  2739,  2746,  2754,  2762,  2776,  2793
+    1369,  1397,  1413,  1442,  1470,  1495,  1514,  1539,  1558,  1570,
+    1577,  1640,  1650,  1660,  1666,  1672,  1676,  1680,  1688,  1702,
+    1723,  1731,  1737,  1748,  1753,  1758,  1767,  1773,  1779,  1788,
+    1792,  1800,  1800,  1811,  1816,  1824,  1825,  1829,  1829,  1833,
+    1833,  1836,  1839,  1851,  1875,  1886,  1886,  1895,  1895,  1903,
+    1903,  1913,  1916,  1922,  1935,  1936,  1938,  1942,  1951,  1955,
+    1960,  1962,  1967,  1972,  1981,  1981,  1982,  1982,  1984,  1994,
+    2005,  2009,  2018,  2027,  2032,  2137,  2137,  2139,  2147,  2147,
+    2149,  2154,  2165,  2169,  2174,  2178,  2182,  2186,  2190,  2194,
+    2198,  2202,  2206,  2231,  2235,  2249,  2253,  2259,  2259,  2265,
+    2274,  2278,  2287,  2298,  2307,  2319,  2332,  2336,  2340,  2345,
+    2354,  2373,  2382,  2449,  2453,  2460,  2471,  2484,  2493,  2504,
+    2514,  2522,  2530,  2533,  2534,  2541,  2545,  2550,  2571,  2588,
+    2601,  2614,  2627,  2636,  2649,  2657,  2664,  2670,  2676,  2682,
+    2697,  2760,  2765,  2769,  2776,  2783,  2791,  2798,  2806,  2814,
+    2828,  2845
 };
 #endif
 
@@ -1748,20 +1751,21 @@
      177,   177,   177,   177,   177,   177,   177,   177,   177,   178,
      179,   179,   180,   180,   181,   181,   181,   181,   182,   182,
      183,   183,   183,   183,   183,   183,   183,   183,   183,   183,
-     183,   183,   183,   183,   183,   183,   184,   184,   184,   184,
-     184,   184,   184,   184,   184,   184,   184,   185,   185,   186,
-     186,   187,   187,   188,   188,   190,   189,   191,   189,   189,
-     189,   189,   189,   192,   189,   193,   189,   194,   189,   189,
-     189,   195,   196,   196,   197,   197,   197,   197,   198,   199,
-     199,   199,   200,   200,   201,   201,   202,   202,   203,   203,
-     203,   203,   204,   205,   205,   206,   207,   207,   208,   209,
-     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,
-     222,   223,   223,   224,   224,   225,   225,   225,   225,   225,
+     183,   183,   183,   183,   183,   183,   183,   183,   184,   184,
+     184,   184,   184,   184,   184,   184,   184,   184,   184,   185,
+     185,   186,   186,   187,   187,   188,   188,   190,   189,   191,
+     189,   189,   189,   189,   189,   192,   189,   193,   189,   194,
+     189,   189,   189,   195,   196,   196,   197,   197,   197,   197,
+     198,   199,   199,   199,   200,   200,   201,   201,   202,   202,
+     203,   203,   203,   203,   204,   205,   205,   206,   207,   207,
+     208,   209,   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,   222,   223,   223,   224,   224,   225,   225,   225,
      225,   225,   225,   225,   225,   225,   225,   225,   225,   225,
-     226,   226,   227,   227,   227,   227,   227,   227,   227,   227
+     225,   225,   226,   226,   227,   227,   227,   227,   227,   227,
+     227,   227
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -1781,21 +1785,22 @@
        1,     1,     1,     1,     1,     1,     1,     1,     2,     1,
        2,     5,     5,     5,     5,     3,     2,     5,     4,     2,
        1,     1,     1,     3,     1,     3,     1,     0,     1,     3,
-       4,     3,     3,     4,     4,     3,     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,     3,     0,     5,     0,     6,     0,     6,     2,
-       3,     1,     1,     1,     3,     3,     3,     3,     3,     3,
-       1,     0,     1,     1,     1,     0,     5,     3,     1,     3,
-       1,     0,     9,     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,
-      14,     1,     1,     6,     5,     2,     6,     7,     3,     5,
-       0,     0,     3,     2,     1,     5,     5,     6,     6,     2,
-       4,     4,     6,     4,     4,     6,     6,     2,     8,     1,
-       1,     0,     3,     6,     3,     6,     2,     4,     6,     4
+       4,     3,     3,     4,     4,     3,     6,     5,     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,     3,     0,     5,     0,     6,     0,
+       6,     2,     3,     1,     1,     1,     3,     3,     3,     3,
+       3,     3,     1,     0,     1,     1,     1,     0,     5,     3,
+       1,     3,     1,     0,     9,     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,    14,     1,     1,     6,     5,     2,     6,     7,
+       3,     5,     0,     0,     3,     2,     1,     5,     5,     6,
+       6,     2,     4,     4,     6,     4,     4,     6,     6,     2,
+       8,     1,     1,     0,     3,     6,     3,     6,     2,     4,
+       6,     4
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -1803,448 +1808,486 @@
    means the default is an error.  */
 static const unsigned short int yydefact[] =
 {
-      64,   202,   203,   180,   177,   175,     0,     0,     0,     0,
-       0,    64,   173,     0,    73,    76,     0,     0,     0,     0,
-     189,     0,     0,     0,   169,   170,    65,    67,    66,    68,
-      70,    69,    71,    72,     0,     0,     0,     1,   174,    63,
-      74,    75,    81,   178,    77,    78,    79,    80,    81,   242,
-     176,   242,     0,     0,     0,     0,   201,   190,   191,   179,
-       2,     3,   182,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,     0,     0,     0,     0,   233,   117,   181,   234,
+      64,   204,   205,   182,   179,   177,     0,     0,     0,     0,
+       0,    64,   175,     0,    73,    76,     0,     0,     0,     0,
+     191,     0,     0,     0,   171,   172,    65,    67,    66,    68,
+      70,    69,    71,    72,     0,     0,     0,     1,   176,    63,
+      74,    75,    81,   180,    77,    78,    79,    80,    81,   244,
+     178,   244,     0,     0,     0,     0,   203,   192,   193,   181,
+       2,     3,   184,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,     0,     0,     0,     0,   235,   117,   183,   236,
      119,     0,     0,     0,   108,   109,   110,   111,   112,   113,
-     114,     0,     0,     0,   183,     0,    82,    83,    84,    85,
-      86,    87,     0,   219,     0,   243,   239,    64,   216,   217,
-     218,   238,   196,   193,   192,   194,   195,   197,   200,     0,
+     114,     0,     0,     0,   185,     0,    82,    83,    84,    85,
+      86,    87,     0,   221,     0,   245,   241,    64,   218,   219,
+     220,   240,   198,   195,   194,   196,   197,   199,   202,     0,
      137,   120,     0,     0,     0,   126,   138,     0,   118,   137,
-     185,   187,   153,   154,   151,   152,   155,   150,   146,   147,
+     187,   189,   155,   156,   153,   154,   157,   152,   148,   149,
        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,   149,   148,   104,    88,   131,   130,     0,   213,
-     214,   215,   281,   241,     0,   198,   136,    91,   132,   134,
+       0,     0,   151,   150,   104,    88,   131,   130,     0,   215,
+     216,   217,   283,   243,     0,   200,   136,    91,   132,   134,
        0,     0,     0,     0,     0,     0,   125,     0,   104,   104,
       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,   141,   168,     0,     0,   145,     0,   142,
-       0,     0,     0,     0,     0,   184,     0,   280,     0,   264,
-       0,     0,     0,     0,    81,   251,   252,     0,     0,     0,
+       0,     0,     0,   141,   170,     0,     0,     0,   145,     0,
+     142,     0,     0,     0,     0,     0,   186,     0,   282,     0,
+     266,     0,     0,     0,     0,    81,   253,   254,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   240,    81,   255,     0,   279,   199,   129,
-       0,    95,     0,     0,   128,     0,   139,    95,   186,   188,
-       0,     0,   261,     0,     0,     0,     0,     0,   140,   143,
-     144,     0,     0,     0,     0,     0,     0,   106,   104,   211,
-       0,   269,   263,   245,   244,     0,     0,    60,    59,    58,
-      57,     0,     0,     0,     0,    99,    99,   286,     0,     0,
-     277,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    89,    90,    92,   135,   133,   122,   123,
-     124,   127,   121,     0,     0,     0,     0,     0,     0,     0,
-     167,     0,     0,     0,     0,   101,   107,   105,   210,    91,
-     208,     0,   222,   223,   224,   229,   225,   226,   227,   228,
-     220,     0,   231,   236,   235,   237,     0,   246,     0,     0,
-       0,     0,     0,   282,     0,   284,   261,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    93,    94,    96,     0,     0,     0,   157,     0,     0,
-       0,     0,     0,     0,     0,     0,   205,     0,    95,   221,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     289,     0,     0,     0,   273,   274,     0,     0,     0,     0,
-     271,   270,     0,   287,     0,     0,     0,   262,     0,   164,
-       0,     0,   159,   160,   156,   163,   204,   207,   209,    91,
-     102,     0,   230,     0,     0,   260,     0,     0,    99,   100,
-      99,     0,     0,     0,     0,     0,   265,   266,   260,     0,
-     161,   162,     0,     0,     0,   205,   103,    97,     0,     0,
-       0,     0,     0,   267,   268,     0,   283,   285,     0,     0,
-     272,   275,   276,     0,   288,   158,   165,   166,   206,     0,
-     212,   232,     0,     0,    91,     0,    95,   256,     0,    95,
-      98,     0,   249,     0,     0,   258,     0,     0,   257,   278,
-     247,     0,   248,     0,    91,     0,     0,     0,   259,     0,
-       0,     0,     0,   254,     0,     0,   253,     0,   250
+       0,     0,     0,     0,   242,    81,   257,     0,   281,   201,
+     129,     0,    95,     0,     0,   128,     0,   139,    95,   188,
+     190,     0,     0,   263,     0,     0,     0,     0,     0,   140,
+     126,   138,     0,   143,   144,     0,     0,     0,     0,     0,
+       0,   106,   104,   213,     0,   271,   265,   247,   246,     0,
+       0,    60,    59,    58,    57,     0,     0,     0,     0,    99,
+      99,   288,     0,     0,   279,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    89,    90,    92,
+     135,   133,   122,   123,   124,   127,   121,     0,     0,     0,
+       0,     0,     0,     0,   169,   147,     0,     0,     0,     0,
+       0,   101,   107,   105,   212,    91,   210,     0,   224,   225,
+     226,   231,   227,   228,   229,   230,   222,     0,   233,   238,
+     237,   239,     0,   248,     0,     0,     0,     0,     0,   284,
+       0,   286,   263,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    93,    94,    96,
+       0,     0,     0,   159,     0,     0,     0,     0,   146,     0,
+       0,     0,     0,   207,     0,    95,   223,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   291,     0,     0,
+       0,   275,   276,     0,     0,     0,     0,   273,   272,     0,
+     289,     0,     0,     0,   264,     0,   166,     0,     0,   161,
+     162,   158,   165,   206,   209,   211,    91,   102,     0,   232,
+       0,     0,   262,     0,     0,    99,   100,    99,     0,     0,
+       0,     0,     0,   267,   268,   262,     0,   163,   164,     0,
+       0,     0,   207,   103,    97,     0,     0,     0,     0,     0,
+     269,   270,     0,   285,   287,     0,     0,   274,   277,   278,
+       0,   290,   160,   167,   168,   208,     0,   214,   234,     0,
+       0,    91,     0,    95,   258,     0,    95,    98,     0,   251,
+       0,     0,   260,     0,     0,   259,   280,   249,     0,   250,
+       0,    91,     0,     0,     0,   261,     0,     0,     0,     0,
+     256,     0,     0,   255,     0,   252
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
 static const short int yydefgoto[] =
 {
       -1,    76,   178,   179,   180,   181,   220,   237,    91,    92,
-       9,    34,    35,    42,    48,   102,   355,   289,   423,   358,
-     530,   403,   317,   507,   255,   318,    77,    93,   198,   188,
-     199,   200,   127,   244,   392,   245,    36,    10,    11,    12,
+       9,    34,    35,    42,    48,   102,   359,   290,   429,   362,
+     537,   409,   321,   514,   256,   322,    77,    93,   198,   188,
+     199,   200,   127,   244,   398,   245,    36,    10,    11,    12,
       15,    14,   184,   208,   209,    59,   115,    20,    57,   119,
-      79,   477,   380,   381,   103,   191,    49,   110,    50,    43,
-     440,   393,    80,   395,   321,    51,   106,   107,   283,   544,
-     193,   340,   512,   365,   284,   285,   286,   287
+      79,   484,   386,   387,   103,   191,    49,   110,    50,    43,
+     447,   399,    80,   401,   325,    51,   106,   107,   284,   551,
+     193,   344,   519,   369,   285,   286,   287,   288
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -468
+#define YYPACT_NINF -457
 static const short int yypact[] =
 {
-     384,  -468,  -468,  -468,  -468,  -468,    23,   -99,    -3,    74,
-      78,   507,  -468,   -66,   129,   148,   -26,     0,    26,    31,
-    -468,     6,   156,  1114,  -468,  -468,  -468,  -468,  -468,  -468,
-    -468,  -468,  -468,  -468,    66,    66,  1130,  -468,  -468,  -468,
-    -468,  -468,   138,  -468,  -468,  -468,  -468,  -468,   138,   172,
-    -468,    20,   163,   104,   208,   196,   202,  -468,  -468,  -468,
-    -468,  -468,    90,  -468,  -468,  -468,  -468,  -468,  -468,  -468,
-    -468,  -468,   258,   262,     4,    18,  -468,  -468,   -89,  -468,
-    -468,  1130,  1167,    90,   216,   240,   257,   261,   266,   264,
-     277,   270,   278,   495,  -468,   283,  -468,  -468,  -468,  -468,
-    -468,  -468,  1183,  -468,   -14,  -468,  -468,   119,  -468,  -468,
-    -468,  -468,  -468,  -468,  -468,  -468,  -468,  -468,  -468,   -19,
-     749,  -468,   145,   147,   357,  -468,   -89,   -87,  -468,   749,
-    -468,   -89,  -468,  -468,  -468,  -468,  -468,  -468,  -468,  -468,
-    -468,  -468,  -468,  -468,  -468,  -468,  -468,  -468,  -468,  -468,
-    -468,  -468,   557,   804,   157,  -468,  -468,  -468,  -468,  -468,
-    -468,  -468,  -468,  -468,  -468,  -468,  -468,   158,  -468,  -468,
-    -468,   167,   168,   173,   853,  1130,   582,   282,   174,   175,
-     176,   177,  -468,  -468,   181,  -468,    90,   -89,   119,  -468,
-    -468,  -468,  1271,  -468,   292,  -468,  -468,   -89,  -468,   183,
-     180,  1167,  1167,   185,   -63,  1167,  -468,   182,   181,   181,
-    -468,  -468,  -468,  -468,  -468,  -468,  -468,  -468,  -468,  -468,
-     186,  -468,  -468,  -468,  -468,  -468,  -468,  -468,  -468,  -468,
-    -468,  -468,  -468,  -468,  -468,  -468,  -468,   192,  1130,  1130,
-    1130,  1130,  1130,  -468,  -468,   -13,   -44,  -468,   -43,  -468,
-    1130,  1130,  1130,  1130,    12,  -468,   193,  -468,  1167,  -468,
-     267,  1230,   126,   214,   138,  -468,  -468,   557,   804,  1167,
-    1167,  1167,  1167,  1167,  1167,  1167,  1167,  1167,  1167,  1167,
-    1167,  1167,  1167,  -468,   138,  -468,   164,  -468,  -468,   162,
-    1024,  -468,     5,    -8,  -468,   188,   -89,  -468,  -468,  -468,
-    1130,  1130,  -468,   198,   199,   201,   203,  1130,  -468,  -468,
-    -468,   204,   205,   306,   206,   324,   343,  -468,   181,  1070,
-     657,  -468,  -468,    90,  -468,   800,   800,  -468,  -468,  -468,
-    -468,   800,  1183,  1167,  1167,    56,    91,  -468,   657,    35,
-     211,   212,   215,   218,   219,   220,   657,   657,   318,   221,
-    1183,  1167,  1167,  -468,  -468,  -468,  -468,  -468,   -71,  -468,
-    -468,  -468,   -71,   222,   224,    51,  1130,  1130,  1130,  1130,
-    -468,  1130,  1130,  1167,  1130,  -468,  -468,  -468,  -468,   -89,
-     227,   233,  -468,  -468,  -468,  -468,  -468,  -468,  -468,  -468,
-     317,  1130,  -468,  -468,  -468,  -468,   241,  -468,   242,   800,
-     657,   657,    10,  -468,    13,  -468,  -468,   800,   238,  1167,
-    1167,  1167,  1167,  1167,   244,   246,  1167,  1167,   800,   657,
-     248,  -468,  -468,  -468,  1130,  1130,  1167,  -468,   254,   251,
-     259,   260,   268,   269,    96,   272,    38,  1087,  -468,  -468,
-     362,   -39,   379,   391,   275,   271,   279,   800,   419,   800,
-     289,   291,   800,   293,   -89,  -468,   295,   296,   800,   800,
-     -89,  -468,   294,  -468,  1167,   288,   298,  -468,  1130,  -468,
-    1130,  1130,  -468,  -468,  -468,  -468,  -468,  -468,  -468,   -89,
-      11,   299,  -468,   800,   800,  1167,   800,   800,   303,  -468,
-     303,   800,   307,  1167,  1167,  1167,  -468,  -468,  1167,   657,
-    -468,  -468,   302,   304,   308,    38,  -468,   382,   427,   313,
-     310,   657,    70,  -468,  -468,   400,  -468,  -468,   311,   800,
-    -468,  -468,  -468,    73,  -468,  -468,  -468,  -468,  -468,   450,
-    -468,  -468,   440,     3,  -468,  1167,  -468,  -468,   315,  -468,
-    -468,   800,  -468,   932,     8,   162,   657,   -16,  -468,   -71,
-    -468,   323,  -468,   932,  -468,   445,   447,   327,   162,   800,
-     800,   449,   394,  -468,   800,   451,  -468,   800,  -468
+      49,  -457,  -457,  -457,  -457,  -457,     8,  -107,    -9,   255,
+      61,   188,  -457,    -7,   113,   165,    33,    38,    51,    69,
+    -457,    17,    95,  1056,  -457,  -457,  -457,  -457,  -457,  -457,
+    -457,  -457,  -457,  -457,    91,    91,  1290,  -457,  -457,  -457,
+    -457,  -457,   130,  -457,  -457,  -457,  -457,  -457,   130,   116,
+    -457,    25,   192,    98,   265,   198,   201,  -457,  -457,  -457,
+    -457,  -457,   131,  -457,  -457,  -457,  -457,  -457,  -457,  -457,
+    -457,  -457,   270,   273,     5,   128,  -457,  -457,    73,  -457,
+    -457,  1290,  1310,   131,   217,   234,   259,   262,   276,   281,
+     292,   278,   297,   623,  -457,   279,  -457,  -457,  -457,  -457,
+    -457,  -457,  1327,  -457,    -2,  -457,  -457,   214,  -457,  -457,
+    -457,  -457,  -457,  -457,  -457,  -457,  -457,  -457,  -457,  -120,
+     809,  -457,   162,   163,   710,  -457,    73,   -84,  -457,   809,
+    -457,    73,  -457,  -457,  -457,  -457,  -457,  -457,  -457,  -457,
+    -457,  -457,  -457,  -457,  -457,  -457,  -457,  -457,  -457,  -457,
+    -457,  -457,   269,  1007,   167,  -457,  -457,  -457,  -457,  -457,
+    -457,  -457,  -457,  -457,  -457,  -457,  -457,   168,  -457,  -457,
+    -457,   169,   171,   172,    75,  1347,   768,   296,   177,   178,
+     179,   180,  -457,  -457,   184,  -457,   131,    73,   214,  -457,
+    -457,  -457,  1450,  -457,   302,  -457,  -457,    73,  -457,   189,
+     183,  1310,  1310,   181,   -83,  1310,  -457,   194,   184,   184,
+    -457,  -457,  -457,  -457,  -457,  -457,  -457,  -457,  -457,  -457,
+     185,  -457,  -457,  -457,  -457,  -457,  -457,  -457,  -457,  -457,
+    -457,  -457,  -457,  -457,  -457,  -457,  -457,   190,  1290,  1290,
+    1290,  1290,  1290,  -457,  -457,   -27,   784,   -32,  -457,   -77,
+    -457,  1290,  1290,  1290,  1290,   -21,  -457,   196,  -457,  1310,
+    -457,   282,  1370,   114,   216,   130,  -457,  -457,   269,  1007,
+    1310,  1310,  1310,  1310,  1310,  1310,  1310,  1310,  1310,  1310,
+    1310,  1310,  1310,  1310,  -457,   130,  -457,   175,  -457,  -457,
+     187,   952,  -457,    13,   -22,  -457,   193,    73,  -457,  -457,
+    -457,  1290,  1290,  -457,   203,   205,   206,   207,  1290,  -457,
+     199,   623,   -75,  -457,  -457,   209,   210,   305,   211,   331,
+     348,  -457,   184,  1227,   860,  -457,  -457,   131,  -457,  1003,
+    1003,  -457,  -457,  -457,  -457,  1003,  1327,  1310,  1310,    60,
+      93,  -457,   860,   -40,   218,   235,   236,   237,   238,   239,
+     860,   860,   320,   240,  1327,  1310,  1310,  -457,  -457,  -457,
+    -457,  -457,   -69,  -457,  -457,  -457,   -69,   241,   242,   -59,
+    1290,  1290,  1290,  1290,  -457,  -457,   208,  1290,  1290,  1310,
+    1290,  -457,  -457,  -457,  -457,    73,   247,   244,  -457,  -457,
+    -457,  -457,  -457,  -457,  -457,  -457,   327,  1290,  -457,  -457,
+    -457,  -457,   250,  -457,   251,  1003,   860,   860,     2,  -457,
+      19,  -457,  -457,  1003,   248,  1310,  1310,  1310,  1310,  1310,
+     252,   254,  1310,  1310,  1003,   860,   260,  -457,  -457,  -457,
+    1290,  1290,  1310,  -457,   261,   266,   264,   271,  -457,   272,
+     274,    45,   275,    10,  1273,  -457,  -457,   382,   -24,   387,
+     394,   277,   283,   285,  1003,   407,  1003,   288,   289,  1003,
+     290,    73,  -457,   291,   295,  1003,  1003,    73,  -457,   293,
+    -457,  1310,   294,   298,  -457,  1290,  -457,  1290,  1290,  -457,
+    -457,  -457,  -457,  -457,  -457,  -457,    73,    -4,   299,  -457,
+    1003,  1003,  1310,  1003,  1003,   301,  -457,   301,  1003,   303,
+    1310,  1310,  1310,  -457,  -457,  1310,   860,  -457,  -457,   300,
+     304,   306,    10,  -457,   361,   398,   309,   287,   860,    39,
+    -457,  -457,   366,  -457,  -457,   308,  1003,  -457,  -457,  -457,
+      40,  -457,  -457,  -457,  -457,  -457,   430,  -457,  -457,   426,
+      23,  -457,  1310,  -457,  -457,   310,  -457,  -457,  1003,  -457,
+    1135,    27,   187,   860,    12,  -457,   -69,  -457,   312,  -457,
+    1135,  -457,   427,   441,   322,   187,  1003,  1003,   444,   389,
+    -457,  1003,   446,  -457,  1003,  -457
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -468,  -468,   276,   281,   284,   287,   207,   213,  -261,  -468,
-     373,  -468,  -468,  -468,  -468,  -229,  -352,  -370,  -468,  -294,
-    -468,  -329,   -11,  -468,  -168,  -468,  -468,   -23,   194,  -275,
-    -468,   358,   364,    53,   396,  -171,   245,  -468,  -468,   480,
-    -468,  -468,  -468,  -468,  -468,  -468,  -468,  -468,  -468,  -468,
-       1,   -12,  -468,  -468,   444,  -468,  -468,  -468,  -468,  -468,
-    -468,  -467,    -1,  -278,  -194,  -468,   443,  -468,  -468,  -468,
-    -468,  -468,    16,    89,  -468,  -468,  -468,  -468
+    -457,  -457,   284,   311,   316,   318,   200,   197,  -262,  -457,
+     360,  -457,  -457,  -457,  -457,  -222,  -355,  -377,  -457,  -282,
+    -457,  -327,   -17,  -457,  -167,  -457,  -457,   -23,   182,  -286,
+    -457,   345,   351,   129,   -87,  -172,   256,  -457,  -457,   469,
+    -457,  -457,  -457,  -457,  -457,  -457,  -457,  -457,  -457,  -457,
+       1,   -31,  -457,  -457,   435,  -457,  -457,  -457,  -457,  -457,
+    -457,  -456,    -1,   121,  -257,  -457,   433,  -457,  -457,  -457,
+    -457,  -457,   -20,    74,  -457,  -457,  -457,  -457
 };
 
 /* 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 -173
+#define YYTABLE_NINF -175
 static const short int yytable[] =
 {
-      78,    13,   331,   362,   246,   248,   422,   405,   123,   436,
-     422,   189,    13,   327,   328,   329,   330,   555,   327,   328,
-     329,   330,   447,    60,    61,   449,    83,    63,    64,    65,
-      66,    67,    68,    69,    70,   332,     1,    21,     2,   105,
-     298,   299,   315,   315,   353,   354,   108,   396,   397,   128,
-     205,   129,   126,   398,    22,   350,     1,   399,     2,   131,
-     406,   206,    71,   448,   421,   316,   448,   324,   414,   415,
-      39,    16,    17,    18,   205,   418,   551,   337,    37,   187,
-     341,   342,   343,   344,   345,   295,   557,   348,   349,    94,
-      19,    23,   183,   307,   307,    24,    25,   197,   307,   353,
-     354,   126,   309,    24,    25,   310,   197,   482,    13,   505,
-      52,    26,    27,    28,    29,    30,    31,    32,   194,   421,
-      33,   444,   445,   446,   307,   195,   353,   354,   422,   451,
-     128,   308,   129,   190,   130,   325,    53,     1,   360,     2,
-     462,   463,   326,   128,   480,   129,   421,   542,    56,   359,
-     377,   124,   552,   353,   354,   113,   114,    72,   420,   516,
-      73,   517,    54,    74,   545,    75,   125,    55,   109,   488,
-      40,   490,    41,   128,   492,   129,    58,   407,   292,   293,
-     496,   497,   296,   112,   558,    44,    45,    46,   426,   256,
-      47,   105,   427,   402,   128,   422,   129,   422,    95,    96,
-      97,    98,    99,   100,   101,   509,   510,   535,   513,   514,
-     535,   536,   116,   518,   539,   453,   117,   455,   456,   457,
-     441,   524,   118,   461,   327,   328,   329,   330,   404,   128,
-     120,   129,   467,   534,   128,   320,   129,   474,   320,   132,
-     133,   538,   547,   -60,   -60,   549,   335,   336,   320,   338,
-     339,   320,   320,   320,   320,   320,   346,   347,   320,   320,
-     -59,   -59,   121,   550,   -58,   -58,   122,   197,   554,   -57,
-     -57,   -61,   543,   134,   135,   351,   352,   353,   354,    81,
-      82,   562,   563,   553,   -62,   136,   566,   185,   201,   568,
-     202,   302,   303,   304,   305,   306,   379,   238,   239,   520,
-     521,   522,   249,   311,   312,   313,   314,   240,   241,   187,
-     400,   401,   288,   242,   250,   251,   252,   253,   254,   394,
-     290,   291,   322,   297,   394,   394,   300,   187,   419,   320,
-     394,   294,   301,   319,   361,   366,   367,   394,   368,   373,
-     369,   371,   372,   374,   375,   394,   394,   376,   408,   409,
-     434,   416,   410,   363,   364,   411,   412,   413,   417,   424,
-     370,   425,    60,    61,   437,    83,    63,    64,    65,    66,
-      67,    68,    69,    70,   438,     1,   439,     2,   442,   443,
-     452,   458,   481,   459,  -172,   464,   320,   454,   320,   320,
-     320,   468,   469,   460,   320,   483,   470,   471,   394,   394,
-     394,    71,     1,   320,     2,     3,   394,   484,   486,   472,
-     473,     4,     5,   475,   479,   485,   487,   394,   394,   428,
-     429,   430,   431,   489,   432,   433,   426,   435,   491,   500,
-     493,     6,   494,   495,   498,   529,   508,   476,     7,   501,
-     515,   499,     8,   525,   519,   526,   394,   531,   394,   527,
-     532,   394,   533,   448,   540,   537,   541,   394,   394,   548,
-     556,   559,   511,   560,   561,   564,   565,   567,   279,   506,
-     320,   320,   320,   280,   333,   511,   281,   465,   466,   282,
-     192,   334,   394,   394,   357,   394,   394,   207,   204,   182,
-     394,    38,   104,   528,   111,   450,    72,     0,   394,    73,
-      60,    61,    74,     0,    75,   203,   476,  -171,     0,     0,
-     394,     0,   546,     1,   523,     2,     0,   137,   394,     0,
-       0,   502,     0,   503,   504,     1,     0,     2,     3,     0,
-     138,   139,     0,     0,     4,     5,     0,     0,     0,     0,
-     394,     0,     0,     0,     0,   394,     0,     0,     0,     0,
-       0,     0,     0,     0,     6,     0,     0,     0,   394,   394,
-       0,     7,     0,   394,     0,     8,   394,     0,     0,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,   152,   153,     0,     0,     0,     0,    60,    61,     0,
-      83,    84,    85,    86,    87,    88,    89,    90,    70,     0,
-       1,     0,     2,     0,     0,     0,     0,     0,   154,   155,
-     156,   157,   158,   159,   160,   161,   162,   163,   164,   165,
-     166,     0,   167,   168,   169,   170,    71,   171,   172,   173,
-       0,     0,     0,   128,     0,   129,     0,   174,     0,     0,
-     175,     0,   176,     0,   177,   210,   211,   212,   213,   214,
-     215,   216,   217,   218,   219,     0,     0,     0,     0,     0,
-     382,   383,    60,    61,   384,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     1,     0,     2,     0,   385,
-     386,   387,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   388,   389,     0,     0,     0,     0,     0,     0,
+      78,    13,   335,   247,   249,   328,   182,   428,   443,   123,
+     319,   428,    13,   411,   454,   341,   366,   194,   345,   346,
+     347,   348,   349,   189,   195,   352,   353,   319,     1,    21,
+       2,   456,   320,   331,   332,   333,   334,   331,   332,   333,
+     334,   299,   300,   336,   105,   562,   357,   358,    22,  -174,
+     405,   108,   126,   205,   205,   455,    16,    17,    18,   131,
+     308,    37,   308,   354,   206,   296,   427,     1,   424,     2,
+       3,   314,   455,   376,   312,    19,     4,     5,   432,   187,
+      60,    61,   433,    83,    84,    85,    86,    87,    88,    89,
+      90,    70,   183,     1,   558,     2,     6,   197,   128,   426,
+     129,   126,   413,     7,   564,   308,   197,     8,    13,   512,
+     308,   357,   358,   308,   313,    58,   128,   309,   129,    71,
+      24,    25,   489,   329,   364,   357,   358,   357,   358,    39,
+     330,   427,   428,    60,    61,   105,    83,    63,    64,    65,
+      66,    67,    68,    69,    70,   190,     1,   427,     2,   113,
+     114,   128,   124,   129,    40,   383,    41,   363,   460,    56,
+     462,   463,   464,   487,   552,    94,   468,   549,   523,    52,
+     524,   559,    71,   109,    53,   474,   542,   542,   293,   294,
+     543,   546,   297,   128,   565,   129,   481,    54,  -173,   257,
+      95,    96,    97,    98,    99,   100,   101,   408,   128,   428,
+     129,   428,    44,    45,    46,    55,     1,    47,     2,     3,
+     130,   128,   112,   129,    72,     4,     5,    73,   117,   243,
+      74,   118,    75,   311,   182,   448,   331,   332,   333,   334,
+     410,   128,     1,   129,     2,     6,   324,   -60,   -60,   324,
+     132,   133,     7,   527,   528,   529,     8,   339,   340,   324,
+     342,   343,   324,   324,   324,   324,   324,   350,   351,   324,
+     324,   554,   -59,   -59,   556,   -58,   -58,    72,   197,   116,
+      73,   120,    23,    74,   121,    75,   125,   122,   550,   -57,
+     -57,   134,   135,   185,    24,    25,   355,   356,   -61,   560,
+      81,    82,    26,    27,    28,    29,    30,    31,    32,   -62,
+     385,    33,   357,   358,   136,   201,   202,   238,   239,   240,
+     183,   241,   242,   187,   406,   407,   250,   251,   252,   253,
+     254,   255,   289,   400,   292,   301,   291,   295,   400,   400,
+     302,   187,   425,   324,   400,   298,   323,   326,   379,   365,
+     370,   400,   371,   372,   373,   375,   377,   378,   380,   400,
+     400,   381,   382,   422,   438,   414,   441,   210,   211,   212,
+     213,   214,   215,   216,   217,   218,   219,   303,   304,   305,
+     306,   307,   415,   416,   417,   418,   419,   423,   430,   431,
+     315,   316,   317,   318,   444,   445,   446,   449,   450,   465,
+     459,   466,   324,   461,   324,   324,   324,   471,   475,   467,
+     324,   477,   488,   490,   400,   400,   400,   476,   478,   324,
+     491,   496,   400,   479,   536,   480,   482,   492,   538,   455,
+     493,   486,   494,   400,   400,   432,   498,   500,   501,   540,
+     367,   368,   502,   505,   547,   507,   515,   374,   522,   508,
+     526,   532,   548,   566,   483,   533,   539,   534,   506,   563,
+     402,   403,   544,   400,   555,   400,   404,   567,   400,   568,
+     571,   572,   574,   412,   400,   400,   338,   192,   337,   518,
+     513,   420,   421,   361,   207,   204,   280,   324,   324,   324,
+      38,   535,   518,   104,   111,   530,   457,     0,     0,   400,
+     400,     0,   400,   400,     0,     0,     0,   400,     0,   434,
+     435,   436,   437,   281,     0,   400,   439,   440,   282,   442,
+     283,     0,     0,   483,     0,     0,     0,   400,     0,   553,
+       0,     0,     0,     0,     0,   400,   451,   452,   453,     0,
+       0,     0,     0,     0,   458,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   469,   470,   400,     0,     0,
+       0,     0,   400,     0,     0,     0,     0,     0,     0,   472,
+     473,     0,     0,     0,     0,   400,   400,     0,     0,     0,
+     400,     0,     0,   400,     0,   495,     0,   497,     0,     0,
+     499,     0,     0,     0,     0,     0,   503,   504,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   390,     0,     0,     0,     0,     0,
-       0,    72,     0,     0,    73,     0,     0,    74,     0,    75,
-     247,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,   151,   152,   153,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    60,    61,     0,    83,    63,    64,
-      65,    66,    67,    68,    69,    70,     0,     1,     0,     2,
-     154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
-     164,   165,   166,   196,   167,   168,   169,   170,     0,   171,
-     172,   173,     0,    71,     0,   128,     0,   129,     0,     0,
-       0,     0,   391,   382,   383,    60,    61,   384,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     1,     0,
-       2,     0,   385,   386,   387,     0,     0,   221,   222,     0,
-       0,     0,     0,     0,     0,   388,   389,     0,     0,     0,
+       0,     0,     0,     0,   509,     0,   510,   511,     0,     0,
+       0,   516,   517,     0,   520,   521,     0,     0,     0,   525,
+       0,     0,     0,     0,     0,     0,     0,   531,    60,    61,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   541,
+       0,     1,     0,     2,     0,   137,     0,   545,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   138,   139,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   557,
+       0,     0,     0,     0,   561,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   569,   570,     0,
+       0,     0,   573,     0,     0,   575,     0,   140,   141,   142,
+     143,   144,   145,   146,   147,   148,   149,   150,   151,   152,
+     153,     0,     0,     0,     0,    60,    61,     0,    83,    63,
+      64,    65,    66,    67,    68,    69,    70,     0,     1,     0,
+       2,     0,     0,     0,     0,     0,   154,   155,   156,   157,
+     158,   159,   160,   161,   162,   163,   164,   165,   166,     0,
+     167,   168,   169,   170,    71,   171,   172,   173,     0,     0,
+       0,   128,     0,   129,     0,   174,     0,     0,   175,     0,
+     176,     0,   177,    60,    61,     0,    83,    84,    85,    86,
+      87,    88,    89,    90,    70,     0,     1,     0,     2,    60,
+      61,     0,    83,    84,    85,    86,    87,    88,    89,    90,
+      70,     0,     1,     0,     2,     0,     0,     0,     0,     0,
+       0,     0,    71,     0,    60,    61,     0,    83,    63,    64,
+      65,    66,    67,    68,    69,    70,     0,     1,    71,     2,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   390,    60,    61,
-       0,    83,    84,    85,    86,    87,    88,    89,    90,    70,
-       0,     1,     0,     2,   140,   141,   142,   143,   144,   145,
+       0,     0,     0,   196,     0,     0,     0,     0,     0,    72,
+       0,     0,    73,    71,     0,    74,     0,    75,   203,     0,
+       0,     0,     0,   388,   389,    60,    61,   390,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     1,     0,
+       2,     0,   391,   392,   393,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   394,   395,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    72,     0,     0,
+      73,     0,     0,    74,     0,    75,   248,   396,     0,     0,
+       0,     0,     0,    72,     0,     0,    73,     0,     0,    74,
+       0,    75,   310,     0,   140,   141,   142,   143,   144,   145,
      146,   147,   148,   149,   150,   151,   152,   153,    72,     0,
-       0,    73,     0,     0,    74,     0,    75,    71,   223,   224,
-     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
-     235,   236,     0,   154,   155,   156,   157,   158,   159,   160,
-     161,   162,   163,   164,   165,   166,     0,   167,   168,   169,
-     170,     0,   171,   172,   173,   382,   383,     0,     0,   384,
-       0,     0,     0,     0,     0,   391,     0,     0,     0,     0,
-       0,     0,     0,     0,   385,   386,   387,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   388,   389,     0,
+       0,    73,     0,     0,    74,     0,    75,    60,    61,     0,
+      83,    63,    64,    65,    66,    67,    68,    69,    70,     0,
+       1,     0,     2,   154,   155,   156,   157,   158,   159,   160,
+     161,   162,   163,   164,   165,   166,   360,   167,   168,   169,
+     170,     0,   171,   172,   173,     0,    71,     0,   128,     0,
+     129,     0,     0,     0,     0,   397,   388,   389,    60,    61,
+     390,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     1,     0,     2,     0,   391,   392,   393,     0,     0,
+     221,   222,     0,     0,     0,     0,     0,     0,   394,   395,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     396,    60,    61,     0,    62,    63,    64,    65,    66,    67,
+      68,    69,    70,     0,     1,     0,     2,   140,   141,   142,
+     143,   144,   145,   146,   147,   148,   149,   150,   151,   152,
+     153,    72,     0,     0,    73,     0,     0,    74,     0,    75,
+      71,   223,   224,   225,   226,   227,   228,   229,   230,   231,
+     232,   233,   234,   235,   236,     0,   154,   155,   156,   157,
+     158,   159,   160,   161,   162,   163,   164,   165,   166,     0,
+     167,   168,   169,   170,     0,   171,   172,   173,   388,   389,
+       0,     0,   390,     0,     0,     0,     0,     0,   397,     0,
+       0,     0,     0,     0,     0,     0,     0,   391,   392,   393,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   390,
-       0,     0,    72,     0,     0,    73,     0,   243,    74,     0,
-      75,     0,     0,     0,     0,     0,   140,   141,   142,   143,
-     144,   145,   146,   147,   148,   149,   150,   151,   152,   153,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    60,
-      61,     0,    83,    63,    64,    65,    66,    67,    68,    69,
-      70,     0,     1,     0,     2,   154,   155,   156,   157,   158,
-     159,   160,   161,   162,   163,   164,   165,   166,   356,   167,
-     168,   169,   170,     0,   171,   172,   173,     0,    71,     0,
-       0,     0,     0,     0,     0,    60,    61,   391,    83,    63,
+     394,   395,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   396,     0,     0,    72,     0,     0,    73,     0,
+       0,    74,     0,    75,     0,     0,     0,     0,     0,   140,
+     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
+     151,   152,   153,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    60,    61,     0,    83,    63,    64,    65,    66,
+      67,    68,    69,    70,     0,     1,     0,     2,   154,   155,
+     156,   157,   158,   159,   160,   161,   162,   163,   164,   165,
+     166,   384,   167,   168,   169,   170,     0,   171,   172,   173,
+       0,    71,     0,     0,     0,     0,     0,     0,    60,    61,
+     397,    83,    63,    64,    65,    66,    67,    68,    69,    70,
+       0,     1,     0,     2,     0,    60,    61,     0,    83,    84,
+      85,    86,    87,    88,    89,    90,    70,   485,     1,     0,
+       2,     0,     0,     0,     0,    60,    61,    71,    83,    63,
       64,    65,    66,    67,    68,    69,    70,     0,     1,     0,
-       2,     0,    60,    61,     0,    83,    63,    64,    65,    66,
-      67,    68,    69,    70,   378,     1,     0,     2,     0,     0,
-       0,     0,     0,     0,    71,     0,     0,     0,     0,    60,
-      61,   478,    62,    63,    64,    65,    66,    67,    68,    69,
-      70,    71,     1,     0,     2,    60,    61,     0,    83,    84,
-      85,    86,    87,    88,    89,    90,    70,     0,     1,     0,
-       2,     0,     0,     0,     0,     0,     0,     0,    71,     0,
-       0,     0,     0,    72,     0,     0,    73,     0,     0,    74,
-       0,    75,    60,    61,    71,    83,    63,    64,    65,    66,
-      67,    68,    69,    70,     0,     1,     0,     2,    60,    61,
-       0,   186,    63,    64,    65,    66,    67,    68,    69,    70,
-       0,     1,     0,     2,     0,     0,     0,     0,     0,    72,
-       0,    71,    73,     0,     0,    74,     0,    75,     0,     0,
-       0,     0,     0,     0,     0,     0,    72,    71,     0,    73,
-       0,     0,    74,     0,    75,    60,    61,     0,   323,    63,
+       2,     0,    60,    61,    71,   186,    63,    64,    65,    66,
+      67,    68,    69,    70,     0,     1,     0,     2,     0,     0,
+       0,     0,    60,    61,    71,    83,    84,    85,    86,    87,
+      88,    89,    90,    70,     0,     1,    72,     2,     0,    73,
+       0,    71,    74,     0,    75,    60,    61,     0,   327,    63,
       64,    65,    66,    67,    68,    69,    70,     0,     1,     0,
-       2,     0,     0,    72,     0,     0,    73,     0,     0,    74,
-       0,    75,     0,     0,     0,     0,     0,     0,     0,    72,
-       0,     0,    73,     0,    71,    74,     0,    75,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       2,    71,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   257,     0,     0,    72,     0,     0,    73,
-       0,     0,    74,     0,    75,     0,   258,     0,     0,     0,
-       0,     0,    72,     0,     0,    73,   259,   260,    74,     0,
-      75,     0,     0,     0,     0,     0,     0,     0,     0,   261,
-     262,   263,   264,   265,   266,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,   151,   267,   268,     0,
+       0,     0,    72,     0,    71,    73,     0,     0,    74,     0,
+      75,     0,     0,     0,     0,     0,     0,     0,     0,    72,
+       0,     0,    73,     0,     0,    74,     0,    75,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,    72,
-       0,     0,    73,     0,     0,    74,     0,    75,     0,   269,
-     270,   271,     0,     0,   272,   155,   156,   157,   158,   159,
-     160,   161,   162,   163,   164,   165,   166,   273,   274,   168,
-     169,   170,   275,   276,   277,   278
+       0,     0,    73,     0,     0,    74,     0,    75,     0,     0,
+       0,     0,     0,     0,     0,     0,    72,     0,     0,    73,
+       0,     0,    74,     0,    75,     0,     0,     0,     0,     0,
+       0,     0,   258,     0,     0,     0,    72,     0,     0,    73,
+       0,     0,    74,     0,   246,   259,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   260,   261,     0,     0,    72,
+       0,     0,    73,     0,     0,    74,     0,    75,   262,   263,
+     264,   265,   266,   267,   140,   141,   142,   143,   144,   145,
+     146,   147,   148,   149,   150,   151,   268,   269,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   270,   271,
+     272,     0,     0,   273,   155,   156,   157,   158,   159,   160,
+     161,   162,   163,   164,   165,   166,   274,   275,   168,   169,
+     170,   276,   277,   278,   279
 };
 
 static const short int yycheck[] =
 {
-      23,     0,   263,   297,   175,   176,   358,   336,     4,   379,
-     362,    25,    11,    10,    11,    12,    13,    33,    10,    11,
-      12,    13,    12,     5,     6,    12,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,   264,    18,   136,    20,    19,
-     208,   209,    31,    31,   115,   116,    26,   325,   326,   138,
-     137,   140,    75,   331,    57,   284,    18,   332,    20,    82,
-     338,   148,    44,    53,   135,    53,    53,   261,   346,   347,
-     136,    48,    49,    50,   137,   350,   543,   271,     0,   102,
-     274,   275,   276,   277,   278,   148,   553,   281,   282,    36,
-      67,    17,    93,   137,   137,    29,    30,   120,   137,   115,
-     116,   124,   146,    29,    30,   148,   129,   146,   107,   479,
-     136,    37,    38,    39,    40,    41,    42,    43,   137,   135,
-      46,   399,   400,   401,   137,   144,   115,   116,   480,   407,
-     138,   144,   140,   147,    81,     9,   136,    18,   146,    20,
-     418,   419,    16,   138,   438,   140,   135,   144,   142,   144,
-     318,   147,   144,   115,   116,    51,    52,   139,   352,   488,
-     142,   490,   136,   145,   534,   147,   148,   136,   148,   447,
-      41,   449,    43,   138,   452,   140,    20,   142,   201,   202,
-     458,   459,   205,    20,   554,    37,    38,    39,   137,   188,
-      42,    19,   141,   137,   138,   547,   140,   549,    60,    61,
-      62,    63,    64,    65,    66,   483,   484,   137,   486,   487,
-     137,   141,     4,   491,   141,   409,    20,   411,   412,   413,
-     391,   499,    20,   417,    10,    11,    12,    13,   137,   138,
-     140,   140,   426,   511,   138,   258,   140,   141,   261,    23,
-      24,   519,   536,     3,     4,   539,   269,   270,   271,   272,
+      23,     0,   264,   175,   176,   262,    93,   362,   385,     4,
+      31,   366,    11,   340,    12,   272,   298,   137,   275,   276,
+     277,   278,   279,    25,   144,   282,   283,    31,    18,   136,
+      20,    12,    53,    10,    11,    12,    13,    10,    11,    12,
+      13,   208,   209,   265,    19,    33,   115,   116,    57,     0,
+     336,    26,    75,   137,   137,    53,    48,    49,    50,    82,
+     137,     0,   137,   285,   148,   148,   135,    18,   354,    20,
+      21,   148,    53,   148,   246,    67,    27,    28,   137,   102,
+       5,     6,   141,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    93,    18,   550,    20,    47,   120,   138,   356,
+     140,   124,   142,    54,   560,   137,   129,    58,   107,   486,
+     137,   115,   116,   137,   146,    20,   138,   144,   140,    44,
+      29,    30,   146,     9,   146,   115,   116,   115,   116,   136,
+      16,   135,   487,     5,     6,    19,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,   147,    18,   135,    20,    51,
+      52,   138,   147,   140,    41,   322,    43,   144,   415,   142,
+     417,   418,   419,   445,   541,    36,   423,   144,   495,   136,
+     497,   144,    44,   148,   136,   432,   137,   137,   201,   202,
+     141,   141,   205,   138,   561,   140,   141,   136,     0,   188,
+      60,    61,    62,    63,    64,    65,    66,   137,   138,   554,
+     140,   556,    37,    38,    39,   136,    18,    42,    20,    21,
+      81,   138,    20,   140,   139,    27,    28,   142,    20,   144,
+     145,    20,   147,   246,   311,   397,    10,    11,    12,    13,
+     137,   138,    18,   140,    20,    47,   259,     3,     4,   262,
+      23,    24,    54,   500,   501,   502,    58,   270,   271,   272,
      273,   274,   275,   276,   277,   278,   279,   280,   281,   282,
-       3,     4,     4,   541,     3,     4,     4,   290,   546,     3,
-       4,     7,   533,     3,     4,   111,   112,   115,   116,    34,
-      35,   559,   560,   544,     7,     7,   564,     4,   143,   567,
-     143,   238,   239,   240,   241,   242,   319,   140,   140,   493,
-     494,   495,    20,   250,   251,   252,   253,   140,   140,   332,
-     333,   334,    20,   140,   140,   140,   140,   140,   137,   320,
-     137,   141,    55,   141,   325,   326,   140,   350,   351,   352,
-     331,   146,   140,   140,   146,   137,   137,   338,   137,    33,
-     137,   137,   137,   137,    20,   346,   347,     4,   137,   137,
-     373,    33,   137,   300,   301,   137,   137,   137,   137,   137,
-     307,   137,     5,     6,   137,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,   141,    18,    59,    20,   137,   137,
-     142,   137,    20,   137,     0,   137,   409,   410,   411,   412,
-     413,   137,   141,   416,   417,    16,   137,   137,   399,   400,
-     401,    44,    18,   426,    20,    21,   407,    16,   137,   141,
-     141,    27,    28,   141,   437,   140,   137,   418,   419,   366,
-     367,   368,   369,     4,   371,   372,   137,   374,   137,   141,
-     137,    47,   137,   137,   140,    53,   137,   436,    54,   141,
-     137,   464,    58,   141,   137,   141,   447,    20,   449,   141,
-     137,   452,   142,    53,     4,   144,    16,   458,   459,   144,
-     137,    16,   485,    16,   137,    16,    72,    16,   192,   480,
-     493,   494,   495,   192,   267,   498,   192,   424,   425,   192,
-     107,   268,   483,   484,   290,   486,   487,   129,   124,    93,
-     491,    11,    48,   505,    51,   406,   139,    -1,   499,   142,
-       5,     6,   145,    -1,   147,   148,   505,     0,    -1,    -1,
-     511,    -1,   535,    18,   498,    20,    -1,    22,   519,    -1,
-      -1,   468,    -1,   470,   471,    18,    -1,    20,    21,    -1,
-      35,    36,    -1,    -1,    27,    28,    -1,    -1,    -1,    -1,
-     541,    -1,    -1,    -1,    -1,   546,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    47,    -1,    -1,    -1,   559,   560,
-      -1,    54,    -1,   564,    -1,    58,   567,    -1,    -1,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    -1,    -1,    -1,    -1,     5,     6,    -1,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    -1,
-      18,    -1,    20,    -1,    -1,    -1,    -1,    -1,   113,   114,
-     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,    -1,   127,   128,   129,   130,    44,   132,   133,   134,
-      -1,    -1,    -1,   138,    -1,   140,    -1,   142,    -1,    -1,
-     145,    -1,   147,    -1,   149,    88,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    -1,    -1,    -1,    -1,    -1,
-       3,     4,     5,     6,     7,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    18,    -1,    20,    -1,    22,
-      23,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    35,    36,    -1,    -1,    -1,    -1,    -1,    -1,
+     283,   543,     3,     4,   546,     3,     4,   139,   291,     4,
+     142,   140,    17,   145,     4,   147,   148,     4,   540,     3,
+       4,     3,     4,     4,    29,    30,   111,   112,     7,   551,
+      34,    35,    37,    38,    39,    40,    41,    42,    43,     7,
+     323,    46,   115,   116,     7,   143,   143,   140,   140,   140,
+     311,   140,   140,   336,   337,   338,    20,   140,   140,   140,
+     140,   137,    20,   324,   141,   140,   137,   146,   329,   330,
+     140,   354,   355,   356,   335,   141,   140,    55,    33,   146,
+     137,   342,   137,   137,   137,   146,   137,   137,   137,   350,
+     351,    20,     4,    33,   146,   137,   379,    88,    89,    90,
+      91,    92,    93,    94,    95,    96,    97,   238,   239,   240,
+     241,   242,   137,   137,   137,   137,   137,   137,   137,   137,
+     251,   252,   253,   254,   137,   141,    59,   137,   137,   137,
+     142,   137,   415,   416,   417,   418,   419,   137,   137,   422,
+     423,   137,    20,    16,   405,   406,   407,   141,   137,   432,
+      16,     4,   413,   141,    53,   141,   141,   140,    20,    53,
+     137,   444,   137,   424,   425,   137,   137,   137,   137,   142,
+     301,   302,   137,   140,     4,   141,   137,   308,   137,   141,
+     137,   141,    16,    16,   443,   141,   137,   141,   471,   137,
+     329,   330,   144,   454,   144,   456,   335,    16,   459,   137,
+      16,    72,    16,   342,   465,   466,   269,   107,   268,   492,
+     487,   350,   351,   291,   129,   124,   192,   500,   501,   502,
+      11,   512,   505,    48,    51,   505,   412,    -1,    -1,   490,
+     491,    -1,   493,   494,    -1,    -1,    -1,   498,    -1,   370,
+     371,   372,   373,   192,    -1,   506,   377,   378,   192,   380,
+     192,    -1,    -1,   512,    -1,    -1,    -1,   518,    -1,   542,
+      -1,    -1,    -1,    -1,    -1,   526,   405,   406,   407,    -1,
+      -1,    -1,    -1,    -1,   413,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   424,   425,   548,    -1,    -1,
+      -1,    -1,   553,    -1,    -1,    -1,    -1,    -1,    -1,   430,
+     431,    -1,    -1,    -1,    -1,   566,   567,    -1,    -1,    -1,
+     571,    -1,    -1,   574,    -1,   454,    -1,   456,    -1,    -1,
+     459,    -1,    -1,    -1,    -1,    -1,   465,   466,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   475,    -1,   477,   478,    -1,    -1,
+      -1,   490,   491,    -1,   493,   494,    -1,    -1,    -1,   498,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   506,     5,     6,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   518,
+      -1,    18,    -1,    20,    -1,    22,    -1,   526,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    35,    36,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   548,
+      -1,    -1,    -1,    -1,   553,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   566,   567,    -1,
+      -1,    -1,   571,    -1,    -1,   574,    -1,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    -1,    -1,    -1,    -1,     5,     6,    -1,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    -1,    18,    -1,
+      20,    -1,    -1,    -1,    -1,    -1,   113,   114,   115,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,    -1,
+     127,   128,   129,   130,    44,   132,   133,   134,    -1,    -1,
+      -1,   138,    -1,   140,    -1,   142,    -1,    -1,   145,    -1,
+     147,    -1,   149,     5,     6,    -1,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    -1,    18,    -1,    20,     5,
+       6,    -1,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    -1,    18,    -1,    20,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    44,    -1,     5,     6,    -1,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    -1,    18,    44,    20,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    57,    -1,    -1,    -1,    -1,    -1,
-      -1,   139,    -1,    -1,   142,    -1,    -1,   145,    -1,   147,
-     148,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    86,    87,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,     5,     6,    -1,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    -1,    18,    -1,    20,
-     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,   125,    34,   127,   128,   129,   130,    -1,   132,
-     133,   134,    -1,    44,    -1,   138,    -1,   140,    -1,    -1,
-      -1,    -1,   145,     3,     4,     5,     6,     7,    -1,    -1,
+      -1,    -1,    -1,    34,    -1,    -1,    -1,    -1,    -1,   139,
+      -1,    -1,   142,    44,    -1,   145,    -1,   147,   148,    -1,
+      -1,    -1,    -1,     3,     4,     5,     6,     7,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    18,    -1,
-      20,    -1,    22,    23,    24,    -1,    -1,    23,    24,    -1,
+      20,    -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    35,    36,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    57,     5,     6,
-      -1,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      -1,    18,    -1,    20,    74,    75,    76,    77,    78,    79,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   139,    -1,    -1,
+     142,    -1,    -1,   145,    -1,   147,   148,    57,    -1,    -1,
+      -1,    -1,    -1,   139,    -1,    -1,   142,    -1,    -1,   145,
+      -1,   147,   148,    -1,    74,    75,    76,    77,    78,    79,
       80,    81,    82,    83,    84,    85,    86,    87,   139,    -1,
-      -1,   142,    -1,    -1,   145,    -1,   147,    44,    94,    95,
-      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,    -1,   113,   114,   115,   116,   117,   118,   119,
-     120,   121,   122,   123,   124,   125,    -1,   127,   128,   129,
-     130,    -1,   132,   133,   134,     3,     4,    -1,    -1,     7,
-      -1,    -1,    -1,    -1,    -1,   145,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    22,    23,    24,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    35,    36,    -1,
+      -1,   142,    -1,    -1,   145,    -1,   147,     5,     6,    -1,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    -1,
+      18,    -1,    20,   113,   114,   115,   116,   117,   118,   119,
+     120,   121,   122,   123,   124,   125,    34,   127,   128,   129,
+     130,    -1,   132,   133,   134,    -1,    44,    -1,   138,    -1,
+     140,    -1,    -1,    -1,    -1,   145,     3,     4,     5,     6,
+       7,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    18,    -1,    20,    -1,    22,    23,    24,    -1,    -1,
+      23,    24,    -1,    -1,    -1,    -1,    -1,    -1,    35,    36,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    57,
-      -1,    -1,   139,    -1,    -1,   142,    -1,   144,   145,    -1,
-     147,    -1,    -1,    -1,    -1,    -1,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,
-       6,    -1,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    -1,    18,    -1,    20,   113,   114,   115,   116,   117,
-     118,   119,   120,   121,   122,   123,   124,   125,    34,   127,
-     128,   129,   130,    -1,   132,   133,   134,    -1,    44,    -1,
-      -1,    -1,    -1,    -1,    -1,     5,     6,   145,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    -1,    18,    -1,
-      20,    -1,     5,     6,    -1,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    34,    18,    -1,    20,    -1,    -1,
-      -1,    -1,    -1,    -1,    44,    -1,    -1,    -1,    -1,     5,
-       6,    34,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    44,    18,    -1,    20,     5,     6,    -1,     8,     9,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      57,     5,     6,    -1,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    -1,    18,    -1,    20,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,   139,    -1,    -1,   142,    -1,    -1,   145,    -1,   147,
+      44,    94,    95,    96,    97,    98,    99,   100,   101,   102,
+     103,   104,   105,   106,   107,    -1,   113,   114,   115,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,    -1,
+     127,   128,   129,   130,    -1,   132,   133,   134,     3,     4,
+      -1,    -1,     7,    -1,    -1,    -1,    -1,    -1,   145,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    22,    23,    24,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      35,    36,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    57,    -1,    -1,   139,    -1,    -1,   142,    -1,
+      -1,   145,    -1,   147,    -1,    -1,    -1,    -1,    -1,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     5,     6,    -1,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    -1,    18,    -1,    20,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,    34,   127,   128,   129,   130,    -1,   132,   133,   134,
+      -1,    44,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,
+     145,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      -1,    18,    -1,    20,    -1,     5,     6,    -1,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    34,    18,    -1,
+      20,    -1,    -1,    -1,    -1,     5,     6,    44,     8,     9,
       10,    11,    12,    13,    14,    15,    16,    -1,    18,    -1,
-      20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    44,    -1,
-      -1,    -1,    -1,   139,    -1,    -1,   142,    -1,    -1,   145,
-      -1,   147,     5,     6,    44,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    -1,    18,    -1,    20,     5,     6,
-      -1,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      -1,    18,    -1,    20,    -1,    -1,    -1,    -1,    -1,   139,
-      -1,    44,   142,    -1,    -1,   145,    -1,   147,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   139,    44,    -1,   142,
-      -1,    -1,   145,    -1,   147,     5,     6,    -1,     8,     9,
+      20,    -1,     5,     6,    44,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    -1,    18,    -1,    20,    -1,    -1,
+      -1,    -1,     5,     6,    44,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    -1,    18,   139,    20,    -1,   142,
+      -1,    44,   145,    -1,   147,     5,     6,    -1,     8,     9,
       10,    11,    12,    13,    14,    15,    16,    -1,    18,    -1,
-      20,    -1,    -1,   139,    -1,    -1,   142,    -1,    -1,   145,
-      -1,   147,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   139,
-      -1,    -1,   142,    -1,    44,   145,    -1,   147,    -1,    -1,
+      20,    44,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    32,    -1,    -1,   139,    -1,    -1,   142,
-      -1,    -1,   145,    -1,   147,    -1,    45,    -1,    -1,    -1,
-      -1,    -1,   139,    -1,    -1,   142,    55,    56,   145,    -1,
-     147,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    -1,
+      -1,    -1,   139,    -1,    44,   142,    -1,    -1,   145,    -1,
+     147,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   139,
+      -1,    -1,   142,    -1,    -1,   145,    -1,   147,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   139,
-      -1,    -1,   142,    -1,    -1,   145,    -1,   147,    -1,   108,
-     109,   110,    -1,    -1,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,   132,   133,   134
+      -1,    -1,   142,    -1,    -1,   145,    -1,   147,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   139,    -1,    -1,   142,
+      -1,    -1,   145,    -1,   147,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    32,    -1,    -1,    -1,   139,    -1,    -1,   142,
+      -1,    -1,   145,    -1,   147,    45,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    55,    56,    -1,    -1,   139,
+      -1,    -1,   142,    -1,    -1,   145,    -1,   147,    68,    69,
+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   108,   109,
+     110,    -1,    -1,   113,   114,   115,   116,   117,   118,   119,
+     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
+     130,   131,   132,   133,   134
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -2275,39 +2318,40 @@
       88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
      156,    23,    24,    94,    95,    96,    97,    98,    99,   100,
      101,   102,   103,   104,   105,   106,   107,   157,   140,   140,
-     140,   140,   140,   144,   183,   185,   185,   148,   185,    20,
-     140,   140,   140,   140,   137,   174,   200,    32,    45,    55,
-      56,    68,    69,    70,    71,    72,    73,    86,    87,   108,
-     109,   110,   113,   126,   127,   131,   132,   133,   134,   152,
-     153,   154,   155,   218,   224,   225,   226,   227,    20,   167,
-     137,   141,   177,   177,   146,   148,   177,   141,   174,   174,
-     140,   140,   183,   183,   183,   183,   183,   137,   144,   146,
-     148,   183,   183,   183,   183,    31,    53,   172,   175,   140,
-     177,   214,    55,     8,   214,     9,    16,    10,    11,    12,
-      13,   158,   165,   156,   157,   177,   177,   214,   177,   177,
-     221,   214,   214,   214,   214,   214,   177,   177,   214,   214,
-     165,   111,   112,   115,   116,   166,    34,   178,   169,   144,
-     146,   146,   169,   183,   183,   223,   137,   137,   137,   137,
-     183,   137,   137,    33,   137,    20,     4,   174,    34,   177,
-     202,   203,     3,     4,     7,    22,    23,    24,    35,    36,
-      57,   145,   184,   211,   212,   213,   213,   213,   213,   179,
-     177,   177,   137,   171,   137,   171,   213,   142,   137,   137,
-     137,   137,   137,   137,   213,   213,    33,   137,   179,   177,
-     214,   135,   166,   168,   137,   137,   137,   141,   183,   183,
-     183,   183,   183,   183,   177,   183,   167,   137,   141,    59,
-     210,   185,   137,   137,   213,   213,   213,    12,    53,    12,
-     223,   213,   142,   214,   177,   214,   214,   214,   137,   137,
-     177,   214,   213,   213,   137,   183,   183,   214,   137,   141,
-     137,   137,   141,   141,   141,   141,   200,   201,    34,   177,
-     169,    20,   146,    16,    16,   140,   137,   137,   213,     4,
-     213,   137,   213,   137,   137,   137,   213,   213,   140,   177,
-     141,   141,   183,   183,   183,   167,   172,   173,   137,   213,
-     213,   177,   222,   213,   213,   137,   171,   171,   213,   137,
-     214,   214,   214,   222,   213,   141,   141,   141,   201,    53,
-     170,    20,   137,   142,   213,   137,   141,   144,   213,   141,
-       4,    16,   144,   158,   219,   167,   177,   169,   144,   169,
-     213,   211,   144,   158,   213,    33,   137,   211,   167,    16,
-      16,   137,   213,   213,    16,    72,   213,    16,   213
+     140,   140,   140,   144,   183,   185,   147,   185,   148,   185,
+      20,   140,   140,   140,   140,   137,   174,   200,    32,    45,
+      55,    56,    68,    69,    70,    71,    72,    73,    86,    87,
+     108,   109,   110,   113,   126,   127,   131,   132,   133,   134,
+     152,   153,   154,   155,   218,   224,   225,   226,   227,    20,
+     167,   137,   141,   177,   177,   146,   148,   177,   141,   174,
+     174,   140,   140,   183,   183,   183,   183,   183,   137,   144,
+     148,   177,   185,   146,   148,   183,   183,   183,   183,    31,
+      53,   172,   175,   140,   177,   214,    55,     8,   214,     9,
+      16,    10,    11,    12,    13,   158,   165,   156,   157,   177,
+     177,   214,   177,   177,   221,   214,   214,   214,   214,   214,
+     177,   177,   214,   214,   165,   111,   112,   115,   116,   166,
+      34,   178,   169,   144,   146,   146,   169,   183,   183,   223,
+     137,   137,   137,   137,   183,   146,   148,   137,   137,    33,
+     137,    20,     4,   174,    34,   177,   202,   203,     3,     4,
+       7,    22,    23,    24,    35,    36,    57,   145,   184,   211,
+     212,   213,   213,   213,   213,   179,   177,   177,   137,   171,
+     137,   171,   213,   142,   137,   137,   137,   137,   137,   137,
+     213,   213,    33,   137,   179,   177,   214,   135,   166,   168,
+     137,   137,   137,   141,   183,   183,   183,   183,   146,   183,
+     183,   177,   183,   167,   137,   141,    59,   210,   185,   137,
+     137,   213,   213,   213,    12,    53,    12,   223,   213,   142,
+     214,   177,   214,   214,   214,   137,   137,   177,   214,   213,
+     213,   137,   183,   183,   214,   137,   141,   137,   137,   141,
+     141,   141,   141,   200,   201,    34,   177,   169,    20,   146,
+      16,    16,   140,   137,   137,   213,     4,   213,   137,   213,
+     137,   137,   137,   213,   213,   140,   177,   141,   141,   183,
+     183,   183,   167,   172,   173,   137,   213,   213,   177,   222,
+     213,   213,   137,   171,   171,   213,   137,   214,   214,   214,
+     222,   213,   141,   141,   141,   201,    53,   170,    20,   137,
+     142,   213,   137,   141,   144,   213,   141,     4,    16,   144,
+     158,   219,   167,   177,   169,   144,   169,   213,   211,   144,
+     158,   213,    33,   137,   211,   167,    16,    16,   137,   213,
+     213,    16,    72,   213,    16,   213
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -2730,7 +2774,7 @@
 #else
 int
 yyparse ()
-
+    ;
 #endif
 #endif
 {
@@ -2977,7 +3021,7 @@
   switch (yyn)
     {
         case 3:
-#line 1020 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1020 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   if ((yyvsp[0].UIntVal) > (uint32_t)INT32_MAX)     // Outside of my range!
     GEN_ERROR("Value too large for type!");
@@ -2987,137 +3031,137 @@
     break;
 
   case 31:
-#line 1036 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1036 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_EQ; ;}
     break;
 
   case 32:
-#line 1036 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1036 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_NE; ;}
     break;
 
   case 33:
-#line 1037 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1037 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLT; ;}
     break;
 
   case 34:
-#line 1037 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1037 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGT; ;}
     break;
 
   case 35:
-#line 1038 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1038 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLE; ;}
     break;
 
   case 36:
-#line 1038 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1038 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGE; ;}
     break;
 
   case 37:
-#line 1039 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1039 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULT; ;}
     break;
 
   case 38:
-#line 1039 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1039 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGT; ;}
     break;
 
   case 39:
-#line 1040 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1040 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULE; ;}
     break;
 
   case 40:
-#line 1040 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1040 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGE; ;}
     break;
 
   case 41:
-#line 1044 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1044 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OEQ; ;}
     break;
 
   case 42:
-#line 1044 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1044 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ONE; ;}
     break;
 
   case 43:
-#line 1045 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1045 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLT; ;}
     break;
 
   case 44:
-#line 1045 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1045 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGT; ;}
     break;
 
   case 45:
-#line 1046 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1046 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLE; ;}
     break;
 
   case 46:
-#line 1046 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1046 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGE; ;}
     break;
 
   case 47:
-#line 1047 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1047 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ORD; ;}
     break;
 
   case 48:
-#line 1047 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1047 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNO; ;}
     break;
 
   case 49:
-#line 1048 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1048 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UEQ; ;}
     break;
 
   case 50:
-#line 1048 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1048 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNE; ;}
     break;
 
   case 51:
-#line 1049 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1049 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULT; ;}
     break;
 
   case 52:
-#line 1049 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1049 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGT; ;}
     break;
 
   case 53:
-#line 1050 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1050 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULE; ;}
     break;
 
   case 54:
-#line 1050 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1050 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGE; ;}
     break;
 
   case 55:
-#line 1051 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1051 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_TRUE; ;}
     break;
 
   case 56:
-#line 1052 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1052 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_FALSE; ;}
     break;
 
   case 63:
-#line 1061 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1061 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = (yyvsp[-1].StrVal);
     CHECK_FOR_ERROR
@@ -3125,7 +3169,7 @@
     break;
 
   case 64:
-#line 1065 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1065 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3133,122 +3177,122 @@
     break;
 
   case 65:
-#line 1071 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1071 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 66:
-#line 1072 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1072 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 67:
-#line 1073 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1073 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 68:
-#line 1074 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1074 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
     break;
 
   case 69:
-#line 1075 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1075 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 70:
-#line 1079 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1079 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 71:
-#line 1080 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1080 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 72:
-#line 1081 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1081 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 73:
-#line 1085 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1085 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 74:
-#line 1086 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1086 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 75:
-#line 1087 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1087 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 76:
-#line 1091 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1091 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 77:
-#line 1092 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1092 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 78:
-#line 1093 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1093 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 79:
-#line 1094 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1094 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 80:
-#line 1095 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1095 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 81:
-#line 1098 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1098 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 82:
-#line 1099 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1099 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 83:
-#line 1100 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1100 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::CSRet; ;}
     break;
 
   case 84:
-#line 1101 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1101 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Fast; ;}
     break;
 
   case 85:
-#line 1102 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1102 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Cold; ;}
     break;
 
   case 86:
-#line 1103 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1103 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_StdCall; ;}
     break;
 
   case 87:
-#line 1104 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1104 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_FastCall; ;}
     break;
 
   case 88:
-#line 1105 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1105 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                    if ((unsigned)(yyvsp[0].UInt64Val) != (yyvsp[0].UInt64Val))
                      GEN_ERROR("Calling conv too large!");
@@ -3258,51 +3302,51 @@
     break;
 
   case 89:
-#line 1112 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1112 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = FunctionType::ZExtAttribute; ;}
     break;
 
   case 90:
-#line 1113 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1113 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = FunctionType::SExtAttribute; ;}
     break;
 
   case 91:
-#line 1116 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1116 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = FunctionType::NoAttributeSet; ;}
     break;
 
   case 92:
-#line 1117 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1117 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.ParamAttrs) = FunctionType::ParameterAttributes((yyvsp[-1].ParamAttrs) | (yyvsp[0].ParamAttrs));
               ;}
     break;
 
   case 93:
-#line 1122 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1122 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = FunctionType::NoReturnAttribute; ;}
     break;
 
   case 95:
-#line 1126 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1126 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = FunctionType::NoAttributeSet; ;}
     break;
 
   case 96:
-#line 1127 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1127 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.ParamAttrs) = FunctionType::ParameterAttributes((yyvsp[-1].ParamAttrs) | (yyvsp[0].ParamAttrs));
               ;}
     break;
 
   case 97:
-#line 1134 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1134 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 98:
-#line 1135 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1135 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[0].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -3312,12 +3356,12 @@
     break;
 
   case 99:
-#line 1141 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1141 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 100:
-#line 1142 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1142 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[0].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -3327,7 +3371,7 @@
     break;
 
   case 101:
-#line 1150 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1150 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   for (unsigned i = 0, e = strlen((yyvsp[0].StrVal)); i != e; ++i)
     if ((yyvsp[0].StrVal)[i] == '"' || (yyvsp[0].StrVal)[i] == '\\')
@@ -3338,27 +3382,27 @@
     break;
 
   case 102:
-#line 1158 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1158 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 103:
-#line 1159 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1159 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = (yyvsp[0].StrVal); ;}
     break;
 
   case 104:
-#line 1164 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1164 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 105:
-#line 1165 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1165 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 106:
-#line 1166 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1166 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV->setSection((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -3367,7 +3411,7 @@
     break;
 
   case 107:
-#line 1171 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1171 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[0].UInt64Val)))
       GEN_ERROR("Alignment must be a power of two!");
@@ -3377,7 +3421,7 @@
     break;
 
   case 116:
-#line 1187 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1187 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
@@ -3385,7 +3429,7 @@
     break;
 
   case 117:
-#line 1191 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1191 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType));
     CHECK_FOR_ERROR
@@ -3393,7 +3437,7 @@
     break;
 
   case 118:
-#line 1195 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1195 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                             // Pointer type?
     if (*(yyvsp[-1].TypeVal) == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
@@ -3404,7 +3448,7 @@
     break;
 
   case 119:
-#line 1202 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1202 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {            // Named types are also simple types...
     const Type* tmp = getTypeVal((yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
@@ -3413,7 +3457,7 @@
     break;
 
   case 120:
-#line 1207 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1207 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                   // Type UpReference
     if ((yyvsp[0].UInt64Val) > (uint64_t)~0U) GEN_ERROR("Value out of range!");
     OpaqueType *OT = OpaqueType::get();        // Use temporary placeholder
@@ -3425,7 +3469,7 @@
     break;
 
   case 121:
-#line 1215 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1215 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Params;
     std::vector<FunctionType::ParameterAttributes> Attrs;
@@ -3447,7 +3491,7 @@
     break;
 
   case 122:
-#line 1233 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1233 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Params;
     std::vector<FunctionType::ParameterAttributes> Attrs;
@@ -3468,7 +3512,7 @@
     break;
 
   case 123:
-#line 1251 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1251 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {          // Sized array type?
     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[-1].TypeVal), (unsigned)(yyvsp[-3].UInt64Val))));
     delete (yyvsp[-1].TypeVal);
@@ -3477,7 +3521,7 @@
     break;
 
   case 124:
-#line 1256 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1256 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {          // Packed array type?
      const llvm::Type* ElemTy = (yyvsp[-1].TypeVal)->get();
      if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val))
@@ -3493,7 +3537,7 @@
     break;
 
   case 125:
-#line 1268 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1268 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                        // Structure type?
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-1].TypeList)->begin(),
@@ -3507,7 +3551,7 @@
     break;
 
   case 126:
-#line 1278 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1278 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                                  // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
     CHECK_FOR_ERROR
@@ -3515,7 +3559,7 @@
     break;
 
   case 127:
-#line 1282 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1282 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-2].TypeList)->begin(),
@@ -3529,7 +3573,7 @@
     break;
 
   case 128:
-#line 1292 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1292 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                         // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
     CHECK_FOR_ERROR
@@ -3537,7 +3581,7 @@
     break;
 
   case 129:
-#line 1299 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1299 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { 
     (yyval.TypeWithAttrs).Ty = (yyvsp[-1].TypeVal); 
     (yyval.TypeWithAttrs).Attrs = (yyvsp[0].ParamAttrs); 
@@ -3545,7 +3589,7 @@
     break;
 
   case 130:
-#line 1306 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1306 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -3556,14 +3600,14 @@
     break;
 
   case 131:
-#line 1313 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1313 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(Type::VoidTy);
   ;}
     break;
 
   case 132:
-#line 1318 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1318 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     (yyval.TypeWithAttrsList)->push_back((yyvsp[0].TypeWithAttrs));
@@ -3572,7 +3616,7 @@
     break;
 
   case 133:
-#line 1323 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1323 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeWithAttrsList)=(yyvsp[-2].TypeWithAttrsList))->push_back((yyvsp[0].TypeWithAttrs));
     CHECK_FOR_ERROR
@@ -3580,7 +3624,7 @@
     break;
 
   case 135:
-#line 1331 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1331 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList)=(yyvsp[-2].TypeWithAttrsList);
     TypeWithAttrs TWA; TWA.Attrs = FunctionType::NoAttributeSet;
@@ -3591,7 +3635,7 @@
     break;
 
   case 136:
-#line 1338 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1338 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList;
     TypeWithAttrs TWA; TWA.Attrs = FunctionType::NoAttributeSet;
@@ -3602,7 +3646,7 @@
     break;
 
   case 137:
-#line 1345 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1345 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     CHECK_FOR_ERROR
@@ -3610,7 +3654,7 @@
     break;
 
   case 138:
-#line 1353 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1353 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeHolder>();
     (yyval.TypeList)->push_back(*(yyvsp[0].TypeVal)); delete (yyvsp[0].TypeVal);
@@ -3619,7 +3663,7 @@
     break;
 
   case 139:
-#line 1358 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1358 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(*(yyvsp[0].TypeVal)); delete (yyvsp[0].TypeVal);
     CHECK_FOR_ERROR
@@ -3627,7 +3671,7 @@
     break;
 
   case 140:
-#line 1369 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1369 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -3659,7 +3703,7 @@
     break;
 
   case 141:
-#line 1397 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1397 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -3679,7 +3723,7 @@
     break;
 
   case 142:
-#line 1413 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1413 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -3712,7 +3756,7 @@
     break;
 
   case 143:
-#line 1442 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1442 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -3744,7 +3788,7 @@
     break;
 
   case 144:
-#line 1470 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1470 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[-3].TypeVal)->get());
     if (STy == 0)
@@ -3762,6 +3806,10 @@
                        "' for element #" + utostr(i) +
                        " of structure initializer!");
 
+    // Check to ensure that Type is not packed
+    if (STy->isPacked())
+      GEN_ERROR("Unpacked Initializer to packed type '" + STy->getDescription() + "'");
+
     (yyval.ConstVal) = ConstantStruct::get(STy, *(yyvsp[-1].ConstVector));
     delete (yyvsp[-3].TypeVal); delete (yyvsp[-1].ConstVector);
     CHECK_FOR_ERROR
@@ -3769,7 +3817,7 @@
     break;
 
   case 145:
-#line 1491 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1495 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -3781,6 +3829,10 @@
     if (STy->getNumContainedTypes() != 0)
       GEN_ERROR("Illegal number of initializers for structure type!");
 
+    // Check to ensure that Type is not packed
+    if (STy->isPacked())
+      GEN_ERROR("Unpacked Initializer to packed type '" + STy->getDescription() + "'");
+
     (yyval.ConstVal) = ConstantStruct::get(STy, std::vector<Constant*>());
     delete (yyvsp[-2].TypeVal);
     CHECK_FOR_ERROR
@@ -3788,7 +3840,59 @@
     break;
 
   case 146:
-#line 1506 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 1514 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    const StructType *STy = dyn_cast<StructType>((yyvsp[-5].TypeVal)->get());
+    if (STy == 0)
+      GEN_ERROR("Cannot make struct constant with type: '" + 
+                     (*(yyvsp[-5].TypeVal))->getDescription() + "'!");
+
+    if ((yyvsp[-2].ConstVector)->size() != STy->getNumContainedTypes())
+      GEN_ERROR("Illegal number of initializers for structure type!");
+
+    // Check to ensure that constants are compatible with the type initializer!
+    for (unsigned i = 0, e = (yyvsp[-2].ConstVector)->size(); i != e; ++i)
+      if ((*(yyvsp[-2].ConstVector))[i]->getType() != STy->getElementType(i))
+        GEN_ERROR("Expected type '" +
+                       STy->getElementType(i)->getDescription() +
+                       "' for element #" + utostr(i) +
+                       " of structure initializer!");
+
+    // Check to ensure that Type is packed
+    if (!STy->isPacked())
+      GEN_ERROR("Packed Initializer to unpacked type '" + STy->getDescription() + "'");
+
+    (yyval.ConstVal) = ConstantStruct::get(STy, *(yyvsp[-2].ConstVector));
+    delete (yyvsp[-5].TypeVal); delete (yyvsp[-2].ConstVector);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 147:
+#line 1539 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    if (!UpRefs.empty())
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
+    const StructType *STy = dyn_cast<StructType>((yyvsp[-4].TypeVal)->get());
+    if (STy == 0)
+      GEN_ERROR("Cannot make struct constant with type: '" + 
+                     (*(yyvsp[-4].TypeVal))->getDescription() + "'!");
+
+    if (STy->getNumContainedTypes() != 0)
+      GEN_ERROR("Illegal number of initializers for structure type!");
+
+    // Check to ensure that Type is packed
+    if (!STy->isPacked())
+      GEN_ERROR("Packed Initializer to unpacked type '" + STy->getDescription() + "'");
+
+    (yyval.ConstVal) = ConstantStruct::get(STy, std::vector<Constant*>());
+    delete (yyvsp[-4].TypeVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 148:
+#line 1558 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -3803,8 +3907,8 @@
   ;}
     break;
 
-  case 147:
-#line 1518 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 149:
+#line 1570 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -3814,8 +3918,8 @@
   ;}
     break;
 
-  case 148:
-#line 1525 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 150:
+#line 1577 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -3881,8 +3985,8 @@
   ;}
     break;
 
-  case 149:
-#line 1588 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 151:
+#line 1640 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -3895,8 +3999,8 @@
   ;}
     break;
 
-  case 150:
-#line 1598 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 152:
+#line 1650 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -3909,8 +4013,8 @@
   ;}
     break;
 
-  case 151:
-#line 1608 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 153:
+#line 1660 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].SInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type!");
@@ -3919,8 +4023,8 @@
   ;}
     break;
 
-  case 152:
-#line 1614 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 154:
+#line 1666 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].UInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type!");
@@ -3929,24 +4033,24 @@
   ;}
     break;
 
-  case 153:
-#line 1620 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 155:
+#line 1672 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                      // Boolean constants
-    (yyval.ConstVal) = ConstantBool::getTrue();
+    (yyval.ConstVal) = ConstantInt::getTrue();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 154:
-#line 1624 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 156:
+#line 1676 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                     // Boolean constants
-    (yyval.ConstVal) = ConstantBool::getFalse();
+    (yyval.ConstVal) = ConstantInt::getFalse();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 155:
-#line 1628 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 157:
+#line 1680 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                   // Float & Double constants
     if (!ConstantFP::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].FPVal)))
       GEN_ERROR("Floating point constant invalid for type!!");
@@ -3955,8 +4059,8 @@
   ;}
     break;
 
-  case 156:
-#line 1636 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 158:
+#line 1688 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -3973,8 +4077,8 @@
   ;}
     break;
 
-  case 157:
-#line 1650 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 159:
+#line 1702 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[-2].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand!");
@@ -3998,8 +4102,8 @@
   ;}
     break;
 
-  case 158:
-#line 1671 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 160:
+#line 1723 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-5].ConstVal)->getType() != Type::BoolTy)
       GEN_ERROR("Select condition must be of boolean type!");
@@ -4010,8 +4114,8 @@
   ;}
     break;
 
-  case 159:
-#line 1679 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 161:
+#line 1731 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("Binary operator types must match!");
@@ -4020,8 +4124,8 @@
   ;}
     break;
 
-  case 160:
-#line 1685 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 162:
+#line 1737 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match!");
@@ -4035,8 +4139,8 @@
   ;}
     break;
 
-  case 161:
-#line 1696 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 163:
+#line 1748 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("icmp operand types must match!");
@@ -4044,8 +4148,8 @@
   ;}
     break;
 
-  case 162:
-#line 1701 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 164:
+#line 1753 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("fcmp operand types must match!");
@@ -4053,8 +4157,8 @@
   ;}
     break;
 
-  case 163:
-#line 1706 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 165:
+#line 1758 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-1].ConstVal)->getType() != Type::Int8Ty)
       GEN_ERROR("Shift count for shift constant must be i8 type!");
@@ -4066,8 +4170,8 @@
   ;}
     break;
 
-  case 164:
-#line 1715 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 166:
+#line 1767 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid extractelement operands!");
@@ -4076,8 +4180,8 @@
   ;}
     break;
 
-  case 165:
-#line 1721 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 167:
+#line 1773 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid insertelement operands!");
@@ -4086,8 +4190,8 @@
   ;}
     break;
 
-  case 166:
-#line 1727 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 168:
+#line 1779 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid shufflevector operands!");
@@ -4096,16 +4200,16 @@
   ;}
     break;
 
-  case 167:
-#line 1736 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 169:
+#line 1788 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ConstVector) = (yyvsp[-2].ConstVector))->push_back((yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 168:
-#line 1740 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 170:
+#line 1792 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVector) = new std::vector<Constant*>();
     (yyval.ConstVector)->push_back((yyvsp[0].ConstVal));
@@ -4113,18 +4217,18 @@
   ;}
     break;
 
-  case 169:
-#line 1748 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 171:
+#line 1800 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
-  case 170:
-#line 1748 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 172:
+#line 1800 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
-  case 171:
-#line 1759 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 173:
+#line 1811 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -4132,8 +4236,8 @@
   ;}
     break;
 
-  case 172:
-#line 1764 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 174:
+#line 1816 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -4141,40 +4245,40 @@
   ;}
     break;
 
-  case 175:
-#line 1777 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 177:
+#line 1829 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = false ;}
     break;
 
-  case 176:
-#line 1777 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 178:
+#line 1829 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 177:
-#line 1781 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 179:
+#line 1833 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
-  case 178:
-#line 1781 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 180:
+#line 1833 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 179:
-#line 1784 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 181:
+#line 1836 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 180:
-#line 1787 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 182:
+#line 1839 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Emit an error if there are any unresolved types left.
     if (!CurModule.LateResolveTypes.empty()) {
@@ -4189,8 +4293,8 @@
   ;}
     break;
 
-  case 181:
-#line 1799 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 183:
+#line 1851 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -4217,8 +4321,8 @@
   ;}
     break;
 
-  case 182:
-#line 1823 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 184:
+#line 1875 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ResolveTypeTo((yyvsp[-2].StrVal), (yyvsp[0].PrimType));
 
@@ -4232,8 +4336,8 @@
   ;}
     break;
 
-  case 183:
-#line 1834 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 185:
+#line 1886 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { /* "Externally Visible" Linkage */
     if ((yyvsp[0].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant!");
@@ -4243,15 +4347,15 @@
   ;}
     break;
 
-  case 184:
-#line 1840 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 186:
+#line 1892 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
-  case 185:
-#line 1843 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 187:
+#line 1895 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant!");
@@ -4260,15 +4364,15 @@
   ;}
     break;
 
-  case 186:
-#line 1848 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 188:
+#line 1900 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
-  case 187:
-#line 1851 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 189:
+#line 1903 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -4278,30 +4382,30 @@
   ;}
     break;
 
-  case 188:
-#line 1857 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 190:
+#line 1909 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 189:
-#line 1861 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 191:
+#line 1913 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { 
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 190:
-#line 1864 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 192:
+#line 1916 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 191:
-#line 1870 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 193:
+#line 1922 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   char *EndStr = UnEscapeLexed((yyvsp[0].StrVal), true);
@@ -4316,26 +4420,26 @@
 ;}
     break;
 
-  case 192:
-#line 1883 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 194:
+#line 1935 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Endianness) = Module::BigEndian; ;}
     break;
 
-  case 193:
-#line 1884 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 195:
+#line 1936 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Endianness) = Module::LittleEndian; ;}
     break;
 
-  case 194:
-#line 1886 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 196:
+#line 1938 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setEndianness((yyvsp[0].Endianness));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 195:
-#line 1890 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 197:
+#line 1942 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].UInt64Val) == 32)
       CurModule.CurrentModule->setPointerSize(Module::Pointer32);
@@ -4347,24 +4451,24 @@
   ;}
     break;
 
-  case 196:
-#line 1899 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 198:
+#line 1951 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setTargetTriple((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
   ;}
     break;
 
-  case 197:
-#line 1903 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 199:
+#line 1955 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setDataLayout((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
   ;}
     break;
 
-  case 199:
-#line 1910 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 201:
+#line 1962 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
           free((yyvsp[0].StrVal));
@@ -4372,8 +4476,8 @@
         ;}
     break;
 
-  case 200:
-#line 1915 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 202:
+#line 1967 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
           free((yyvsp[0].StrVal));
@@ -4381,20 +4485,20 @@
         ;}
     break;
 
-  case 201:
-#line 1920 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 203:
+#line 1972 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CHECK_FOR_ERROR
         ;}
     break;
 
-  case 205:
-#line 1930 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 207:
+#line 1982 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
-  case 206:
-#line 1932 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 208:
+#line 1984 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -4407,8 +4511,8 @@
   ;}
     break;
 
-  case 207:
-#line 1942 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 209:
+#line 1994 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -4421,16 +4525,16 @@
   ;}
     break;
 
-  case 208:
-#line 1953 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 210:
+#line 2005 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[0].ArgList);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 209:
-#line 1957 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 211:
+#line 2009 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[-2].ArgList);
     struct ArgListEntry E;
@@ -4442,8 +4546,8 @@
   ;}
     break;
 
-  case 210:
-#line 1966 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 212:
+#line 2018 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new ArgListType;
     struct ArgListEntry E;
@@ -4455,16 +4559,16 @@
   ;}
     break;
 
-  case 211:
-#line 1975 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 213:
+#line 2027 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 212:
-#line 1981 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 214:
+#line 2033 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   UnEscapeLexed((yyvsp[-6].StrVal));
   std::string FunctionName((yyvsp[-6].StrVal));
@@ -4570,8 +4674,8 @@
 ;}
     break;
 
-  case 215:
-#line 2087 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 217:
+#line 2139 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = CurFun.CurrentFunction;
 
@@ -4581,16 +4685,16 @@
 ;}
     break;
 
-  case 218:
-#line 2097 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 220:
+#line 2149 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
   CHECK_FOR_ERROR
 ;}
     break;
 
-  case 219:
-#line 2102 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 221:
+#line 2154 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.CurrentFunction->setLinkage((yyvsp[-1].Linkage));
     (yyval.FunctionVal) = CurFun.CurrentFunction;
@@ -4599,88 +4703,88 @@
   ;}
     break;
 
-  case 220:
-#line 2113 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 222:
+#line 2165 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 221:
-#line 2117 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 223:
+#line 2169 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 222:
-#line 2122 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 224:
+#line 2174 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {    // A reference to a direct constant
     (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 223:
-#line 2126 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 225:
+#line 2178 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 224:
-#line 2130 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 226:
+#line 2182 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                     // Perhaps it's an FP constant?
     (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 225:
-#line 2134 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 227:
+#line 2186 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.ValIDVal) = ValID::create(ConstantBool::getTrue());
+    (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 226:
-#line 2138 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 228:
+#line 2190 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.ValIDVal) = ValID::create(ConstantBool::getFalse());
+    (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 227:
-#line 2142 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 229:
+#line 2194 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createNull();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 228:
-#line 2146 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 230:
+#line 2198 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 229:
-#line 2150 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 231:
+#line 2202 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {     // A vector zero constant.
     (yyval.ValIDVal) = ValID::createZeroInit();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 230:
-#line 2154 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 232:
+#line 2206 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized packed vector
     const Type *ETy = (*(yyvsp[-1].ConstVector))[0]->getType();
     int NumElements = (yyvsp[-1].ConstVector)->size(); 
@@ -4708,16 +4812,16 @@
   ;}
     break;
 
-  case 231:
-#line 2179 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 233:
+#line 2231 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 232:
-#line 2183 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 234:
+#line 2235 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     char *End = UnEscapeLexed((yyvsp[-2].StrVal), true);
     std::string AsmStr = std::string((yyvsp[-2].StrVal), End);
@@ -4730,24 +4834,24 @@
   ;}
     break;
 
-  case 233:
-#line 2197 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 235:
+#line 2249 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {  // Is it an integer reference...?
     (yyval.ValIDVal) = ValID::create((yyvsp[0].SIntVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 234:
-#line 2201 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 236:
+#line 2253 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::create((yyvsp[0].StrVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 237:
-#line 2213 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 239:
+#line 2265 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -4757,24 +4861,24 @@
   ;}
     break;
 
-  case 238:
-#line 2222 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 240:
+#line 2274 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 239:
-#line 2226 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 241:
+#line 2278 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Do not allow functions with 0 basic blocks   
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 240:
-#line 2235 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 242:
+#line 2287 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     setValueName((yyvsp[0].TermInstVal), (yyvsp[-1].StrVal));
     CHECK_FOR_ERROR
@@ -4787,8 +4891,8 @@
   ;}
     break;
 
-  case 241:
-#line 2246 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 243:
+#line 2298 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (CastInst *CI1 = dyn_cast<CastInst>((yyvsp[0].InstVal)))
       if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
@@ -4800,8 +4904,8 @@
   ;}
     break;
 
-  case 242:
-#line 2255 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 244:
+#line 2307 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BasicBlockVal) = getBBVal(ValID::create((int)CurFun.NextBBNum++), true);
     CHECK_FOR_ERROR
@@ -4816,8 +4920,8 @@
   ;}
     break;
 
-  case 243:
-#line 2267 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 245:
+#line 2319 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BasicBlockVal) = getBBVal(ValID::create((yyvsp[0].StrVal)), true);
     CHECK_FOR_ERROR
@@ -4832,24 +4936,24 @@
   ;}
     break;
 
-  case 244:
-#line 2280 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 246:
+#line 2332 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {              // Return with a result...
     (yyval.TermInstVal) = new ReturnInst((yyvsp[0].ValueVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 245:
-#line 2284 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 247:
+#line 2336 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                                       // Return with no result...
     (yyval.TermInstVal) = new ReturnInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 246:
-#line 2288 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 248:
+#line 2340 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                         // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
@@ -4857,8 +4961,8 @@
   ;}
     break;
 
-  case 247:
-#line 2293 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 249:
+#line 2345 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {  
     BasicBlock* tmpBBA = getBBVal((yyvsp[-3].ValIDVal));
     CHECK_FOR_ERROR
@@ -4870,8 +4974,8 @@
   ;}
     break;
 
-  case 248:
-#line 2302 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 250:
+#line 2354 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-7].PrimType), (yyvsp[-6].ValIDVal));
     CHECK_FOR_ERROR
@@ -4893,8 +4997,8 @@
   ;}
     break;
 
-  case 249:
-#line 2321 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 251:
+#line 2373 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-6].PrimType), (yyvsp[-5].ValIDVal));
     CHECK_FOR_ERROR
@@ -4906,8 +5010,8 @@
   ;}
     break;
 
-  case 250:
-#line 2331 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 252:
+#line 2383 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -4976,24 +5080,24 @@
   ;}
     break;
 
-  case 251:
-#line 2397 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 253:
+#line 2449 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 252:
-#line 2401 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 254:
+#line 2453 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 253:
-#line 2408 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 255:
+#line 2460 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = (yyvsp[-5].JumpTable);
     Constant *V = cast<Constant>(getValNonImprovising((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
@@ -5007,8 +5111,8 @@
   ;}
     break;
 
-  case 254:
-#line 2419 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 256:
+#line 2471 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
     Constant *V = cast<Constant>(getValNonImprovising((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
@@ -5023,8 +5127,8 @@
   ;}
     break;
 
-  case 255:
-#line 2432 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 257:
+#line 2484 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   // Is this definition named?? if so, assign the name...
   setValueName((yyvsp[0].InstVal), (yyvsp[-1].StrVal));
@@ -5035,8 +5139,8 @@
 ;}
     break;
 
-  case 256:
-#line 2441 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 258:
+#line 2493 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {    // Used for PHI nodes
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-5].TypeVal))->getDescription());
@@ -5050,8 +5154,8 @@
   ;}
     break;
 
-  case 257:
-#line 2452 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 259:
+#line 2504 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.PHIList) = (yyvsp[-6].PHIList);
     Value* tmpVal = getVal((yyvsp[-6].PHIList)->front().first->getType(), (yyvsp[-3].ValIDVal));
@@ -5062,8 +5166,8 @@
   ;}
     break;
 
-  case 258:
-#line 2462 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 260:
+#line 2514 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {    
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -5074,8 +5178,8 @@
   ;}
     break;
 
-  case 259:
-#line 2470 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 261:
+#line 2522 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -5086,18 +5190,18 @@
   ;}
     break;
 
-  case 260:
-#line 2478 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 262:
+#line 2530 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueRefList) = new ValueRefList(); ;}
     break;
 
-  case 261:
-#line 2481 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 263:
+#line 2533 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueList) = new std::vector<Value*>(); ;}
     break;
 
-  case 262:
-#line 2482 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 264:
+#line 2534 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = (yyvsp[-2].ValueList);
     (yyval.ValueList)->push_back((yyvsp[0].ValueVal));
@@ -5105,24 +5209,24 @@
   ;}
     break;
 
-  case 263:
-#line 2489 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 265:
+#line 2541 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 264:
-#line 2493 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 266:
+#line 2545 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 265:
-#line 2498 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 267:
+#line 2550 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -5146,8 +5250,8 @@
   ;}
     break;
 
-  case 266:
-#line 2519 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 268:
+#line 2571 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -5167,8 +5271,8 @@
   ;}
     break;
 
-  case 267:
-#line 2536 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 269:
+#line 2588 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -5184,8 +5288,8 @@
   ;}
     break;
 
-  case 268:
-#line 2549 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 270:
+#line 2601 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -5201,13 +5305,13 @@
   ;}
     break;
 
-  case 269:
-#line 2562 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 271:
+#line 2614 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     cerr << "WARNING: Use of eliminated 'not' instruction:"
          << " Replacing with 'xor'.\n";
 
-    Value *Ones = ConstantIntegral::getAllOnesValue((yyvsp[0].ValueVal)->getType());
+    Value *Ones = ConstantInt::getAllOnesValue((yyvsp[0].ValueVal)->getType());
     if (Ones == 0)
       GEN_ERROR("Expected integral type for not instruction!");
 
@@ -5218,8 +5322,8 @@
   ;}
     break;
 
-  case 270:
-#line 2575 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 272:
+#line 2627 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].ValueVal)->getType() != Type::Int8Ty)
       GEN_ERROR("Shift amount must be i8 type!");
@@ -5231,8 +5335,8 @@
   ;}
     break;
 
-  case 271:
-#line 2584 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 273:
+#line 2636 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -5248,8 +5352,8 @@
   ;}
     break;
 
-  case 272:
-#line 2597 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 274:
+#line 2649 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-4].ValueVal)->getType() != Type::BoolTy)
       GEN_ERROR("select condition must be boolean!");
@@ -5260,8 +5364,8 @@
   ;}
     break;
 
-  case 273:
-#line 2605 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 275:
+#line 2657 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -5271,8 +5375,8 @@
   ;}
     break;
 
-  case 274:
-#line 2612 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 276:
+#line 2664 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid extractelement operands!");
@@ -5281,8 +5385,8 @@
   ;}
     break;
 
-  case 275:
-#line 2618 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 277:
+#line 2670 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid insertelement operands!");
@@ -5291,8 +5395,8 @@
   ;}
     break;
 
-  case 276:
-#line 2624 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 278:
+#line 2676 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid shufflevector operands!");
@@ -5301,8 +5405,8 @@
   ;}
     break;
 
-  case 277:
-#line 2630 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 279:
+#line 2682 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[0].PHIList)->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -5320,8 +5424,8 @@
   ;}
     break;
 
-  case 278:
-#line 2646 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 280:
+#line 2698 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -5386,32 +5490,32 @@
   ;}
     break;
 
-  case 279:
-#line 2708 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 281:
+#line 2760 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = (yyvsp[0].InstVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 280:
-#line 2713 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 282:
+#line 2765 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 281:
-#line 2717 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 283:
+#line 2769 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 282:
-#line 2724 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 284:
+#line 2776 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -5421,8 +5525,8 @@
   ;}
     break;
 
-  case 283:
-#line 2731 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 285:
+#line 2783 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
@@ -5433,8 +5537,8 @@
   ;}
     break;
 
-  case 284:
-#line 2739 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 286:
+#line 2791 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -5444,8 +5548,8 @@
   ;}
     break;
 
-  case 285:
-#line 2746 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 287:
+#line 2798 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
@@ -5456,8 +5560,8 @@
   ;}
     break;
 
-  case 286:
-#line 2754 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 288:
+#line 2806 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[0].ValueVal)->getType()))
       GEN_ERROR("Trying to free nonpointer type " + 
@@ -5467,8 +5571,8 @@
   ;}
     break;
 
-  case 287:
-#line 2762 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 289:
+#line 2814 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -5485,8 +5589,8 @@
   ;}
     break;
 
-  case 288:
-#line 2776 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 290:
+#line 2828 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -5506,8 +5610,8 @@
   ;}
     break;
 
-  case 289:
-#line 2793 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+  case 291:
+#line 2845 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -5530,7 +5634,7 @@
     }
 
 /* Line 1126 of yacc.c.  */
-#line 5534 "llvmAsmParser.tab.c"
+#line 5638 "llvmAsmParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -5798,7 +5902,7 @@
 }
 
 
-#line 2810 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 2862 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
 
 
 // common code from the two 'RunVMAsmParser' functions


Index: llvm/lib/AsmParser/llvmAsmParser.h.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.36 llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.37
--- llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.36	Fri Jan  5 15:51:07 2007
+++ llvm/lib/AsmParser/llvmAsmParser.h.cvs	Thu Jan 11 06:24:13 2007
@@ -303,7 +303,7 @@
 
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 876 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
+#line 876 "/developer/zsth/llvm-gcc-dev/HEAD/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
 typedef union YYSTYPE {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;


Index: llvm/lib/AsmParser/llvmAsmParser.y
diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.302 llvm/lib/AsmParser/llvmAsmParser.y:1.303
--- llvm/lib/AsmParser/llvmAsmParser.y:1.302	Mon Jan  8 12:16:47 2007
+++ llvm/lib/AsmParser/llvmAsmParser.y	Thu Jan 11 06:24:13 2007
@@ -1670,11 +1670,11 @@
     CHECK_FOR_ERROR
   }
   | BOOL TRUETOK {                      // Boolean constants
-    $$ = ConstantBool::getTrue();
+    $$ = ConstantInt::getTrue();
     CHECK_FOR_ERROR
   }
   | BOOL FALSETOK {                     // Boolean constants
-    $$ = ConstantBool::getFalse();
+    $$ = ConstantInt::getFalse();
     CHECK_FOR_ERROR
   }
   | FPType FPVAL {                   // Float & Double constants
@@ -2184,11 +2184,11 @@
     CHECK_FOR_ERROR
   }
   | TRUETOK {
-    $$ = ValID::create(ConstantBool::getTrue());
+    $$ = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
   } 
   | FALSETOK {
-    $$ = ValID::create(ConstantBool::getFalse());
+    $$ = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
   }
   | NULL_TOK {
@@ -2615,7 +2615,7 @@
     cerr << "WARNING: Use of eliminated 'not' instruction:"
          << " Replacing with 'xor'.\n";
 
-    Value *Ones = ConstantIntegral::getAllOnesValue($2->getType());
+    Value *Ones = ConstantInt::getAllOnesValue($2->getType());
     if (Ones == 0)
       GEN_ERROR("Expected integral type for not instruction!");
 


Index: llvm/lib/AsmParser/llvmAsmParser.y.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.48 llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.49
--- llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.48	Sat Jan  6 01:24:43 2007
+++ llvm/lib/AsmParser/llvmAsmParser.y.cvs	Thu Jan 11 06:24:13 2007
@@ -1484,6 +1484,10 @@
                        "' for element #" + utostr(i) +
                        " of structure initializer!");
 
+    // Check to ensure that Type is not packed
+    if (STy->isPacked())
+      GEN_ERROR("Unpacked Initializer to packed type '" + STy->getDescription() + "'");
+
     $$ = ConstantStruct::get(STy, *$3);
     delete $1; delete $3;
     CHECK_FOR_ERROR
@@ -1499,6 +1503,54 @@
     if (STy->getNumContainedTypes() != 0)
       GEN_ERROR("Illegal number of initializers for structure type!");
 
+    // Check to ensure that Type is not packed
+    if (STy->isPacked())
+      GEN_ERROR("Unpacked Initializer to packed type '" + STy->getDescription() + "'");
+
+    $$ = ConstantStruct::get(STy, std::vector<Constant*>());
+    delete $1;
+    CHECK_FOR_ERROR
+  }
+  | Types '<' '{' ConstVector '}' '>' {
+    const StructType *STy = dyn_cast<StructType>($1->get());
+    if (STy == 0)
+      GEN_ERROR("Cannot make struct constant with type: '" + 
+                     (*$1)->getDescription() + "'!");
+
+    if ($4->size() != STy->getNumContainedTypes())
+      GEN_ERROR("Illegal number of initializers for structure type!");
+
+    // Check to ensure that constants are compatible with the type initializer!
+    for (unsigned i = 0, e = $4->size(); i != e; ++i)
+      if ((*$4)[i]->getType() != STy->getElementType(i))
+        GEN_ERROR("Expected type '" +
+                       STy->getElementType(i)->getDescription() +
+                       "' for element #" + utostr(i) +
+                       " of structure initializer!");
+
+    // Check to ensure that Type is packed
+    if (!STy->isPacked())
+      GEN_ERROR("Packed Initializer to unpacked type '" + STy->getDescription() + "'");
+
+    $$ = ConstantStruct::get(STy, *$4);
+    delete $1; delete $4;
+    CHECK_FOR_ERROR
+  }
+  | Types '<' '{' '}' '>' {
+    if (!UpRefs.empty())
+      GEN_ERROR("Invalid upreference in type: " + (*$1)->getDescription());
+    const StructType *STy = dyn_cast<StructType>($1->get());
+    if (STy == 0)
+      GEN_ERROR("Cannot make struct constant with type: '" + 
+                     (*$1)->getDescription() + "'!");
+
+    if (STy->getNumContainedTypes() != 0)
+      GEN_ERROR("Illegal number of initializers for structure type!");
+
+    // Check to ensure that Type is packed
+    if (!STy->isPacked())
+      GEN_ERROR("Packed Initializer to unpacked type '" + STy->getDescription() + "'");
+
     $$ = ConstantStruct::get(STy, std::vector<Constant*>());
     delete $1;
     CHECK_FOR_ERROR
@@ -1618,11 +1670,11 @@
     CHECK_FOR_ERROR
   }
   | BOOL TRUETOK {                      // Boolean constants
-    $$ = ConstantBool::getTrue();
+    $$ = ConstantInt::getTrue();
     CHECK_FOR_ERROR
   }
   | BOOL FALSETOK {                     // Boolean constants
-    $$ = ConstantBool::getFalse();
+    $$ = ConstantInt::getFalse();
     CHECK_FOR_ERROR
   }
   | FPType FPVAL {                   // Float & Double constants
@@ -2132,11 +2184,11 @@
     CHECK_FOR_ERROR
   }
   | TRUETOK {
-    $$ = ValID::create(ConstantBool::getTrue());
+    $$ = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
   } 
   | FALSETOK {
-    $$ = ValID::create(ConstantBool::getFalse());
+    $$ = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
   }
   | NULL_TOK {
@@ -2563,7 +2615,7 @@
     cerr << "WARNING: Use of eliminated 'not' instruction:"
          << " Replacing with 'xor'.\n";
 
-    Value *Ones = ConstantIntegral::getAllOnesValue($2->getType());
+    Value *Ones = ConstantInt::getAllOnesValue($2->getType());
     if (Ones == 0)
       GEN_ERROR("Expected integral type for not instruction!");
 






More information about the llvm-commits mailing list