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

Reid Spencer reid at x10sys.com
Sun Dec 3 21:24:39 PST 2006



Changes in directory llvm/lib/AsmParser:

llvmAsmParser.cpp.cvs updated: 1.31 -> 1.32
llvmAsmParser.h.cvs updated: 1.25 -> 1.26
llvmAsmParser.y.cvs updated: 1.32 -> 1.33
---
Log message:

Regenerate.


---
Diffs of the changes:  (+669 -645)

 llvmAsmParser.cpp.cvs | 1298 +++++++++++++++++++++++++-------------------------
 llvmAsmParser.h.cvs   |    2 
 llvmAsmParser.y.cvs   |   14 
 3 files changed, 669 insertions(+), 645 deletions(-)


Index: llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.31 llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.32
--- llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.31	Sun Dec  3 10:20:14 2006
+++ llvm/lib/AsmParser/llvmAsmParser.cpp.cvs	Sun Dec  3 23:24:24 2006
@@ -360,7 +360,7 @@
 
 
 /* Copy the first part of user declarations.  */
-#line 14 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 14 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -1333,7 +1333,7 @@
 #endif
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 967 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 967 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
 typedef union YYSTYPE {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -1540,7 +1540,7 @@
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  4
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1433
+#define YYLAST   1556
 
 /* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS  161
@@ -1549,7 +1549,7 @@
 /* YYNRULES -- Number of rules. */
 #define YYNRULES  299
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  588
+#define YYNSTATES  586
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -1625,20 +1625,20 @@
      269,   275,   279,   282,   285,   287,   291,   293,   297,   299,
      300,   305,   309,   313,   318,   323,   327,   330,   333,   336,
      339,   342,   345,   348,   351,   354,   357,   364,   370,   379,
-     386,   393,   400,   409,   418,   425,   432,   441,   450,   454,
-     456,   458,   460,   462,   465,   468,   473,   476,   478,   483,
-     486,   491,   492,   500,   501,   509,   510,   518,   519,   527,
-     531,   536,   537,   539,   541,   543,   547,   551,   555,   559,
-     563,   567,   569,   570,   572,   574,   576,   577,   580,   584,
-     586,   588,   592,   594,   595,   604,   606,   608,   612,   614,
-     616,   619,   620,   622,   624,   625,   630,   631,   633,   635,
-     637,   639,   641,   643,   645,   647,   649,   653,   655,   661,
-     663,   665,   667,   669,   672,   675,   678,   682,   685,   686,
-     688,   691,   694,   698,   708,   718,   727,   741,   743,   745,
-     752,   758,   761,   768,   776,   778,   782,   784,   785,   788,
-     790,   796,   802,   808,   815,   822,   825,   830,   835,   842,
-     847,   852,   857,   862,   869,   876,   879,   887,   889,   892,
-     893,   895,   896,   900,   907,   911,   918,   921,   926,   933
+     386,   393,   400,   408,   416,   423,   430,   439,   448,   452,
+     454,   456,   458,   460,   463,   466,   471,   474,   476,   481,
+     484,   489,   490,   498,   499,   507,   508,   516,   517,   525,
+     529,   534,   535,   537,   539,   541,   545,   549,   553,   557,
+     561,   565,   567,   568,   570,   572,   574,   575,   578,   582,
+     584,   586,   590,   592,   593,   602,   604,   606,   610,   612,
+     614,   617,   618,   620,   622,   623,   628,   629,   631,   633,
+     635,   637,   639,   641,   643,   645,   647,   651,   653,   659,
+     661,   663,   665,   667,   670,   673,   676,   680,   683,   684,
+     686,   689,   692,   696,   706,   716,   725,   739,   741,   743,
+     750,   756,   759,   766,   774,   776,   780,   782,   783,   786,
+     788,   794,   800,   806,   813,   820,   823,   828,   833,   840,
+     845,   850,   855,   860,   867,   874,   877,   885,   887,   890,
+     891,   893,   894,   898,   905,   909,   916,   919,   924,   931
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -1684,60 +1684,60 @@
      137,   150,   191,   148,   191,   148,   191,   151,    -1,   164,
      150,   191,   148,   191,   151,    -1,   165,   150,   191,   148,
      191,   151,    -1,   166,   150,   191,   148,   191,   151,    -1,
-      96,   150,   169,   148,   191,   148,   191,   151,    -1,    97,
-     150,   170,   148,   191,   148,   191,   151,    -1,   168,   150,
-     191,   148,   191,   151,    -1,   142,   150,   191,   148,   191,
-     151,    -1,   143,   150,   191,   148,   191,   148,   191,   151,
-      -1,   144,   150,   191,   148,   191,   148,   191,   151,    -1,
-     193,   148,   191,    -1,   191,    -1,    32,    -1,    33,    -1,
-     196,    -1,   196,   216,    -1,   196,   218,    -1,   196,    62,
-      61,   202,    -1,   196,    25,    -1,   197,    -1,   197,   175,
-      20,   184,    -1,   197,   218,    -1,   197,    62,    61,   202,
-      -1,    -1,   197,   175,   176,   194,   191,   198,   182,    -1,
-      -1,   197,   175,    50,   194,   186,   199,   182,    -1,    -1,
-     197,   175,    45,   194,   186,   200,   182,    -1,    -1,   197,
-     175,    47,   194,   186,   201,   182,    -1,   197,    51,   204,
-      -1,   197,    58,   147,   205,    -1,    -1,    24,    -1,    56,
-      -1,    55,    -1,    53,   147,   203,    -1,    54,   147,     4,
-      -1,    52,   147,    24,    -1,    71,   147,    24,    -1,   152,
-     206,   154,    -1,   206,   148,    24,    -1,    24,    -1,    -1,
-      22,    -1,    24,    -1,   207,    -1,    -1,   186,   208,    -1,
-     210,   148,   209,    -1,   209,    -1,   210,    -1,   210,   148,
-      37,    -1,    37,    -1,    -1,   177,   184,   207,   150,   211,
-     151,   181,   178,    -1,    29,    -1,   157,    -1,   176,   212,
-     213,    -1,    30,    -1,   158,    -1,   225,   215,    -1,    -1,
-      45,    -1,    47,    -1,    -1,    31,   219,   217,   212,    -1,
-      -1,    63,    -1,     3,    -1,     4,    -1,     7,    -1,    27,
-      -1,    28,    -1,    38,    -1,    39,    -1,    26,    -1,   155,
-     193,   156,    -1,   192,    -1,    61,   220,    24,   148,    24,
-      -1,   162,    -1,   207,    -1,   222,    -1,   221,    -1,   186,
-     223,    -1,   225,   226,    -1,   214,   226,    -1,   227,   175,
-     228,    -1,   227,   230,    -1,    -1,    23,    -1,    72,   224,
-      -1,    72,     8,    -1,    73,    21,   223,    -1,    73,     9,
-     223,   148,    21,   223,   148,    21,   223,    -1,    74,   173,
-     223,   148,    21,   223,   152,   229,   154,    -1,    74,   173,
-     223,   148,    21,   223,   152,   154,    -1,    75,   177,   184,
-     223,   150,   233,   151,    36,    21,   223,    76,    21,   223,
-      -1,    76,    -1,    77,    -1,   229,   173,   221,   148,    21,
-     223,    -1,   173,   221,   148,    21,   223,    -1,   175,   235,
-      -1,   186,   152,   223,   148,   223,   154,    -1,   231,   148,
-     152,   223,   148,   223,   154,    -1,   224,    -1,   232,   148,
-     224,    -1,   232,    -1,    -1,    60,    59,    -1,    59,    -1,
-     164,   186,   223,   148,   223,    -1,   165,   186,   223,   148,
-     223,    -1,   166,   186,   223,   148,   223,    -1,    96,   169,
-     186,   223,   148,   223,    -1,    97,   170,   186,   223,   148,
-     223,    -1,    49,   224,    -1,   168,   224,   148,   224,    -1,
-     167,   224,    36,   186,    -1,   137,   224,   148,   224,   148,
-     224,    -1,   141,   224,   148,   186,    -1,   145,   224,   148,
-     186,    -1,   146,   224,   148,   186,    -1,   142,   224,   148,
-     224,    -1,   143,   224,   148,   224,   148,   224,    -1,   144,
-     224,   148,   224,   148,   224,    -1,   136,   231,    -1,   234,
-     177,   184,   223,   150,   233,   151,    -1,   238,    -1,   148,
-     232,    -1,    -1,    35,    -1,    -1,   118,   186,   179,    -1,
-     118,   186,   148,    15,   223,   179,    -1,   119,   186,   179,
-      -1,   119,   186,   148,    15,   223,   179,    -1,   120,   224,
-      -1,   237,   121,   186,   223,    -1,   237,   122,   224,   148,
-     186,   223,    -1,   123,   186,   223,   236,    -1
+      96,   169,   150,   191,   148,   191,   151,    -1,    97,   170,
+     150,   191,   148,   191,   151,    -1,   168,   150,   191,   148,
+     191,   151,    -1,   142,   150,   191,   148,   191,   151,    -1,
+     143,   150,   191,   148,   191,   148,   191,   151,    -1,   144,
+     150,   191,   148,   191,   148,   191,   151,    -1,   193,   148,
+     191,    -1,   191,    -1,    32,    -1,    33,    -1,   196,    -1,
+     196,   216,    -1,   196,   218,    -1,   196,    62,    61,   202,
+      -1,   196,    25,    -1,   197,    -1,   197,   175,    20,   184,
+      -1,   197,   218,    -1,   197,    62,    61,   202,    -1,    -1,
+     197,   175,   176,   194,   191,   198,   182,    -1,    -1,   197,
+     175,    50,   194,   186,   199,   182,    -1,    -1,   197,   175,
+      45,   194,   186,   200,   182,    -1,    -1,   197,   175,    47,
+     194,   186,   201,   182,    -1,   197,    51,   204,    -1,   197,
+      58,   147,   205,    -1,    -1,    24,    -1,    56,    -1,    55,
+      -1,    53,   147,   203,    -1,    54,   147,     4,    -1,    52,
+     147,    24,    -1,    71,   147,    24,    -1,   152,   206,   154,
+      -1,   206,   148,    24,    -1,    24,    -1,    -1,    22,    -1,
+      24,    -1,   207,    -1,    -1,   186,   208,    -1,   210,   148,
+     209,    -1,   209,    -1,   210,    -1,   210,   148,    37,    -1,
+      37,    -1,    -1,   177,   184,   207,   150,   211,   151,   181,
+     178,    -1,    29,    -1,   157,    -1,   176,   212,   213,    -1,
+      30,    -1,   158,    -1,   225,   215,    -1,    -1,    45,    -1,
+      47,    -1,    -1,    31,   219,   217,   212,    -1,    -1,    63,
+      -1,     3,    -1,     4,    -1,     7,    -1,    27,    -1,    28,
+      -1,    38,    -1,    39,    -1,    26,    -1,   155,   193,   156,
+      -1,   192,    -1,    61,   220,    24,   148,    24,    -1,   162,
+      -1,   207,    -1,   222,    -1,   221,    -1,   186,   223,    -1,
+     225,   226,    -1,   214,   226,    -1,   227,   175,   228,    -1,
+     227,   230,    -1,    -1,    23,    -1,    72,   224,    -1,    72,
+       8,    -1,    73,    21,   223,    -1,    73,     9,   223,   148,
+      21,   223,   148,    21,   223,    -1,    74,   173,   223,   148,
+      21,   223,   152,   229,   154,    -1,    74,   173,   223,   148,
+      21,   223,   152,   154,    -1,    75,   177,   184,   223,   150,
+     233,   151,    36,    21,   223,    76,    21,   223,    -1,    76,
+      -1,    77,    -1,   229,   173,   221,   148,    21,   223,    -1,
+     173,   221,   148,    21,   223,    -1,   175,   235,    -1,   186,
+     152,   223,   148,   223,   154,    -1,   231,   148,   152,   223,
+     148,   223,   154,    -1,   224,    -1,   232,   148,   224,    -1,
+     232,    -1,    -1,    60,    59,    -1,    59,    -1,   164,   186,
+     223,   148,   223,    -1,   165,   186,   223,   148,   223,    -1,
+     166,   186,   223,   148,   223,    -1,    96,   169,   186,   223,
+     148,   223,    -1,    97,   170,   186,   223,   148,   223,    -1,
+      49,   224,    -1,   168,   224,   148,   224,    -1,   167,   224,
+      36,   186,    -1,   137,   224,   148,   224,   148,   224,    -1,
+     141,   224,   148,   186,    -1,   145,   224,   148,   186,    -1,
+     146,   224,   148,   186,    -1,   142,   224,   148,   224,    -1,
+     143,   224,   148,   224,   148,   224,    -1,   144,   224,   148,
+     224,   148,   224,    -1,   136,   231,    -1,   234,   177,   184,
+     223,   150,   233,   151,    -1,   238,    -1,   148,   232,    -1,
+      -1,    35,    -1,    -1,   118,   186,   179,    -1,   118,   186,
+     148,    15,   223,   179,    -1,   119,   186,   179,    -1,   119,
+     186,   148,    15,   223,   179,    -1,   120,   224,    -1,   237,
+     121,   186,   223,    -1,   237,   122,   224,   148,   186,   223,
+      -1,   123,   186,   223,   236,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -1902,7 +1902,7 @@
        5,     3,     2,     2,     1,     3,     1,     3,     1,     0,
        4,     3,     3,     4,     4,     3,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     6,     5,     8,     6,
-       6,     6,     8,     8,     6,     6,     8,     8,     3,     1,
+       6,     6,     7,     7,     6,     6,     8,     8,     3,     1,
        1,     1,     1,     2,     2,     4,     2,     1,     4,     2,
        4,     0,     7,     0,     7,     0,     7,     0,     7,     3,
        4,     0,     1,     1,     1,     3,     3,     3,     3,     3,
@@ -1979,9 +1979,9 @@
        0,     0,     0,     0,     0,     0,    96,   238,     0,     0,
        0,   265,   262,     0,   286,     0,     0,     0,   165,     0,
        0,   159,   160,   161,   156,   164,     0,   255,     0,     0,
-       0,   263,     0,     0,     0,     0,     0,   253,     0,   254,
-       0,     0,   162,   163,   158,   166,   167,     0,     0,     0,
-       0,     0,     0,   260,     0,     0,   259,   256
+       0,   263,   162,   163,     0,     0,     0,   253,     0,   254,
+       0,     0,   158,   166,   167,     0,     0,     0,     0,     0,
+       0,   260,     0,     0,   259,   256
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
@@ -1999,81 +1999,81 @@
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -542
+#define YYPACT_NINF -536
 static const short int yypact[] =
 {
-    -542,    24,   136,   567,  -542,  -542,  -542,  -542,  -542,  -542,
-    -542,  -542,  -542,  -542,    -5,   144,    56,  -542,  -542,    -9,
-    -542,  -542,    61,   -53,    51,   426,   -16,  -542,    42,   139,
-     167,  -542,  -542,  -542,  -542,  -542,  -542,  1195,   -20,  -542,
-    -542,   162,  -542,  -542,  -542,  -542,    19,    28,    50,    57,
-    -542,    54,   139,  1195,   124,   124,   124,   124,  -542,  -542,
-    -542,   144,  -542,  -542,  -542,  -542,  -542,    66,  -542,  -542,
-    -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
-    -542,  -542,   220,   221,   222,    87,  -542,   162,    77,  -542,
-    -542,   -81,  -542,  -542,  -542,  -542,  -542,   425,  -542,   204,
-     132,   228,   209,   223,  -542,  -542,  -542,  -542,  -542,  1215,
-    1215,  1215,  1256,  -542,  -542,    81,    90,  -542,  -542,   -81,
-    -133,    96,  1000,  -542,  -542,  1215,  -542,   181,  1276,    -2,
-     377,   144,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
-    -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
-    -542,  -542,    23,   210,  1215,  1215,  1215,  1215,  -542,  -542,
-    -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
-    1215,  1215,  -542,  -542,  -542,  1215,  1215,  1215,  1215,  1215,
-    1215,  1215,  1215,  1215,  1215,  1215,  -542,   144,  -542,    69,
-    -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,   -68,  -542,
-    -542,  -542,   165,   192,   245,   196,   249,   198,   253,   216,
-     254,   255,   258,   219,   256,   261,   568,  -542,  1215,  1215,
-    1215,  -542,  1041,  -542,   121,   110,   710,  -542,  -542,    66,
-    -542,   710,   710,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
-    -542,  -542,  -542,   710,  1195,  -542,  -542,  -542,  -542,  -542,
-    -542,  -542,  -542,  -542,  -542,  1215,  -542,  -542,  -542,  -542,
-    -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
-    -542,  -542,  1215,   122,   126,  -542,   710,   120,   127,   129,
-     130,   131,   133,   135,   137,   140,   710,   710,   710,   244,
-     141,  1195,  1215,  1215,   260,  -542,   142,   142,   142,  -542,
-    -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,   148,
-     149,   150,   151,   152,   154,   160,   945,  1256,   661,   263,
-     161,   187,   190,   191,   193,  -542,  -542,   142,     5,     6,
-     -81,  -542,   162,  -542,   164,   194,  1098,  -542,  -542,  -542,
-    -542,  -542,  -542,  -542,  -542,  -542,   279,  1256,  -542,  -542,
-    -542,  -542,   201,  -542,   202,   710,   710,   710,     7,  -542,
-       8,  -542,   205,   710,   200,  1215,  1215,  1215,  1215,  1215,
-    1215,  1215,   206,   207,   208,  1215,  1215,   710,   710,   212,
-    -542,   -29,  -542,  -542,  -542,    23,   210,  1256,  1256,  1256,
-    1256,  1256,  -542,  -542,   -38,   -72,  -542,  -105,  -542,  1256,
-    1256,  1256,  1256,  1256,  -542,  -542,  -542,  -542,  -542,  1154,
-     310,  -542,  -542,   333,   -71,   337,   340,   217,   214,   225,
-     710,   364,   710,  1215,  -542,   226,   710,   229,  -542,  -542,
-     230,   233,  -542,  -542,   710,   710,   710,  -542,  -542,   232,
-    -542,  1215,   345,   366,  -542,   142,   235,   236,   205,   237,
-     247,   248,   264,  1256,  -542,  -542,  -542,   265,   266,   270,
-     335,   271,  -542,  -542,  -542,   319,   272,  -542,   710,   710,
-    1215,   710,   710,   273,  -542,   273,  -542,   274,   710,   276,
-    1215,  1215,  1215,  -542,  -542,  -542,  1215,   710,  -542,  -542,
-    -542,  1256,  1256,   257,  1256,  1256,  1256,  1256,  -542,  1256,
-    1256,  1256,  1215,  1256,   421,  -542,   402,   280,   275,   274,
-     278,  -542,  -542,   375,  -542,  -542,  1215,   281,   710,  -542,
-    -542,  -542,   283,  -542,   288,   291,  -542,   292,   290,   294,
-     299,   297,   303,   306,   307,   308,  -542,  -542,   429,    20,
-     427,  -542,  -542,   312,  -542,  1256,  1256,  1256,  -542,  1256,
-    1256,  -542,  -542,  -542,  -542,  -542,   710,  -542,   852,    35,
-     440,  -542,   311,   313,   324,   326,   327,  -542,   339,  -542,
-     852,   710,  -542,  -542,  -542,  -542,  -542,   460,   341,   407,
-     710,   467,   469,  -542,   710,   710,  -542,  -542
+    -536,    28,   149,   426,  -536,  -536,  -536,  -536,  -536,  -536,
+    -536,  -536,  -536,  -536,   -16,   158,    41,  -536,  -536,    -1,
+    -536,  -536,    14,   -67,    25,    80,   -31,  -536,    30,   130,
+     155,  -536,  -536,  -536,  -536,  -536,  -536,  1242,    -4,  -536,
+    -536,    65,  -536,  -536,  -536,  -536,    32,    36,    37,    39,
+    -536,    35,   130,  1242,    69,    69,    69,    69,  -536,  -536,
+    -536,   158,  -536,  -536,  -536,  -536,  -536,    38,  -536,  -536,
+    -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,
+    -536,  -536,   185,   193,   194,   659,  -536,    65,    50,  -536,
+    -536,  -113,  -536,  -536,  -536,  -536,  -536,  1410,  -536,   177,
+      59,   198,   179,   180,  -536,  -536,  -536,  -536,  -536,  1262,
+    1262,  1262,  1303,  -536,  -536,    52,    57,  -536,  -536,  -113,
+    -118,    62,  1047,  -536,  -536,  1262,  -536,   150,  1323,    15,
+     151,   158,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,
+    -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,
+    -536,  -536,   399,   210,  1262,  1262,  1262,  1262,  -536,  -536,
+    -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,
+    1262,  1262,  -536,  -536,  -536,  1262,  1262,  1262,  1262,  1262,
+    1262,  1262,  1262,  1262,  1262,  1262,  -536,   158,  -536,     7,
+    -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,   -85,  -536,
+    -536,  -536,   104,   152,   209,   167,   212,   172,   215,   174,
+     216,   207,   225,   178,   229,   227,   566,  -536,  1262,  1262,
+    1262,  -536,  1088,  -536,    91,    89,   757,  -536,  -536,    38,
+    -536,   757,   757,  -536,  -536,  -536,  -536,  -536,  -536,  -536,
+    -536,  -536,  -536,   757,  1242,  -536,  -536,  -536,  -536,  -536,
+    -536,  -536,  -536,  -536,  -536,  1262,  -536,  -536,  -536,  -536,
+    -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,
+    -536,  -536,  1262,    94,   100,  -536,   757,    97,   102,   103,
+     109,   110,   111,   112,   113,   114,   757,   757,   757,   232,
+     117,  1242,  1262,  1262,   245,  -536,   122,   122,   122,  -536,
+    -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,  -536,   399,
+     210,   121,   124,   125,   126,   127,   992,  1303,   719,   248,
+     128,   129,   131,   133,   134,  -536,  -536,   122,  -111,   -80,
+    -113,  -536,    65,  -536,   132,   135,  1145,  -536,  -536,  -536,
+    -536,  -536,  -536,  -536,  -536,  -536,   222,  1303,  -536,  -536,
+    -536,  -536,   139,  -536,   140,   757,   757,   757,     0,  -536,
+       2,  -536,   141,   757,   138,  1262,  1262,  1262,  1262,  1262,
+    1262,  1262,   153,   154,   156,  1262,  1262,   757,   757,   162,
+    -536,   -24,  -536,  -536,  -536,   148,   161,  1303,  1303,  1303,
+    1303,  1303,  -536,  -536,   -70,   -98,  -536,  -117,  -536,  1303,
+    1303,  1303,  1303,  1303,  -536,  -536,  -536,  -536,  -536,  1201,
+     265,  -536,  -536,   276,   -86,   291,   316,   190,   195,   196,
+     757,   337,   757,  1262,  -536,   197,   757,   201,  -536,  -536,
+     202,   206,  -536,  -536,   757,   757,   757,  -536,  -536,   192,
+    -536,  1262,   331,   356,  -536,   122,  1303,  1303,   141,   213,
+     214,   217,   219,  1303,  -536,  -536,  -536,   220,   221,   223,
+     327,   226,  -536,  -536,  -536,   307,   228,  -536,   757,   757,
+    1262,   757,   757,   231,  -536,   231,  -536,   233,   757,   234,
+    1262,  1262,  1262,  -536,  -536,  -536,  1262,   757,  -536,  -536,
+    -536,   235,   236,   224,  1303,  1303,  1303,  1303,  -536,  1303,
+    1303,  1303,  1262,  1303,   366,  -536,   361,   239,   237,   233,
+     240,  -536,  -536,   323,  -536,  -536,  1262,   241,   757,  -536,
+    -536,  -536,   242,  -536,  1303,  1303,  -536,   246,   247,   249,
+     251,   257,   259,   260,   262,   267,  -536,  -536,   367,    82,
+     354,  -536,  -536,   266,  -536,   268,   270,  1303,  -536,  1303,
+    1303,  -536,  -536,  -536,  -536,  -536,   757,  -536,   899,    93,
+     375,  -536,  -536,  -536,   271,   273,   274,  -536,   278,  -536,
+     899,   757,  -536,  -536,  -536,   406,   280,   353,   757,   414,
+     415,  -536,   757,   757,  -536,  -536
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -542,  -542,  -542,   394,   395,   396,   428,   430,   138,   147,
-    -129,  -128,  -484,  -542,   483,   501,  -121,  -542,  -270,   125,
-    -542,  -285,  -542,   -50,  -542,   -37,  -542,   -65,   408,  -542,
-     -94,   318,  -277,   113,  -542,  -542,  -542,  -542,  -542,  -542,
-    -542,   484,  -542,  -542,  -542,  -542,     3,  -542,   128,  -542,
-    -542,   478,  -542,  -542,  -542,  -542,  -542,   537,  -542,  -542,
-    -541,    60,  -205,  -117,  -542,   522,  -542,  -542,  -542,  -542,
-    -542,   119,    86,  -542,  -542,    98,  -542,  -542
+    -536,  -536,  -536,   342,   343,   344,   345,   350,   142,   144,
+    -127,  -125,  -525,  -536,   411,   435,  -122,  -536,  -267,    51,
+    -536,  -285,  -536,   -45,  -536,   -37,  -536,   -83,   340,  -536,
+     -94,   250,  -298,    56,  -536,  -536,  -536,  -536,  -536,  -536,
+    -536,   412,  -536,  -536,  -536,  -536,     3,  -536,    54,  -536,
+    -536,   413,  -536,  -536,  -536,  -536,  -536,   472,  -536,  -536,
+    -535,  -205,    60,  -124,  -536,   459,  -536,  -536,  -536,  -536,
+    -536,    58,    -3,  -536,  -536,    42,  -536,  -536
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -2083,298 +2083,322 @@
 #define YYTABLE_NINF -173
 static const short int yytable[] =
 {
-      89,   241,   242,   106,   361,   442,    26,   231,   227,    94,
-     244,   230,   383,   384,    39,   220,    89,   568,   217,   232,
-     119,    42,   420,   422,     4,   221,   352,   353,   443,   578,
-     233,   234,   235,   236,   237,   238,   239,   240,   354,   275,
-     395,   397,   404,   453,    26,   233,   234,   235,   236,   237,
-     238,   239,   240,   456,   279,   558,    29,   119,   280,   281,
-     282,   283,   284,   285,   421,   421,   291,   289,   290,  -108,
-     414,   362,   199,   200,   201,   570,   453,   453,   123,    39,
-     294,   372,   373,   374,   455,   467,   295,    59,   226,    60,
-     121,   226,    65,    66,    51,   117,    68,    69,    70,    71,
-      72,    73,    74,    75,    76,    77,    78,    79,    80,    20,
-     453,    21,    52,    46,    47,    48,   454,   273,   274,   226,
-     276,   245,   246,   247,   248,   249,   250,   251,   252,   253,
-     254,    58,    49,   277,   226,    81,  -172,    95,   226,   226,
-     226,   226,   226,   226,   286,   287,   288,   226,   226,    43,
-     417,   418,   419,   328,   329,   330,   107,   108,   425,   405,
-     490,     5,   406,    62,   123,   123,    99,     6,   110,   111,
-     112,    64,   439,   440,   557,   100,   379,     7,     8,     9,
-      10,    11,    12,    13,    20,   332,    21,   192,   193,   569,
-     292,   293,   299,   300,   355,   -68,   -68,   101,    14,   -67,
-     -67,   -66,   -66,   514,   102,   515,   103,    89,    30,    31,
-      32,    33,    34,    35,    36,   473,  -109,   475,   356,   -65,
-     -65,   479,   301,   302,   114,   115,   116,   122,   191,   483,
-     484,   485,   195,   196,   218,   357,    82,   256,   257,    83,
-     228,   377,    84,   219,    85,   118,   222,   197,   427,   -72,
-     429,   430,   431,   -71,    89,   378,   226,   -70,   -69,   438,
-     304,   337,   -75,   507,   508,   -76,   511,   512,   305,   336,
-     358,   330,   363,   517,   360,   364,   326,   365,   366,   367,
-     375,   368,   523,   369,   380,   370,   350,   398,   371,   376,
-     381,   350,   350,   448,   449,   450,   451,   452,   385,   386,
-     387,   388,   389,   350,   390,   457,   458,   459,   460,   461,
-     391,   399,   409,   543,   258,   259,   260,   261,   262,   263,
+      89,   227,   119,   241,   230,   242,    26,   361,   106,   244,
+     442,   326,   383,   384,   558,   420,    89,   422,   217,   395,
+     397,   350,    39,   568,   231,    94,   350,   350,     4,    42,
+     220,   453,   275,   443,   570,   576,   232,  -108,   350,   119,
+     221,   456,   404,   405,    26,    29,   123,   279,   123,   414,
+     453,   280,   281,   282,   283,   284,   285,   421,   455,   421,
+     289,   290,   453,   294,    39,   291,    46,    47,    48,   295,
+     467,   350,   199,   200,   201,    59,   406,    60,   453,   123,
+      51,   350,   350,   350,   454,    49,    52,    20,   226,    21,
+     121,   226,   233,   234,   235,   236,   237,   238,   239,   240,
+      53,   107,   108,   233,   234,   235,   236,   237,   238,   239,
+     240,   110,   111,   112,   192,   193,    58,   273,   274,   226,
+     276,     7,     8,     9,    10,    54,    12,    55,   292,   293,
+      56,   299,   300,   277,   226,   328,   329,   330,   226,   226,
+     226,   226,   226,   226,   286,   287,   288,   226,   226,  -172,
+     350,   350,   350,    95,    62,   -68,   -68,    43,   350,    64,
+     490,   233,   234,   235,   236,   237,   238,   239,   240,   379,
+     -67,   -67,   350,   350,     5,   -66,   -66,   -65,   -65,    99,
+       6,   301,   302,   100,   101,   332,   102,   103,  -109,   114,
+       7,     8,     9,    10,    11,    12,    13,   115,   116,   355,
+     122,   191,   195,   196,   197,   218,   514,    89,   515,   228,
+     219,    14,   222,   -72,   -75,   350,   -71,   350,   356,   -70,
+     -69,   350,    30,    31,    32,    33,    34,    35,    36,   350,
+     350,   350,   -76,   304,   305,   357,   557,   256,   257,   336,
+     337,   427,   358,   429,   430,   431,   377,   569,   360,   363,
+     364,   365,   438,   330,    89,   378,   226,   366,   367,   368,
+     369,   370,   371,   350,   350,   376,   350,   350,   375,   380,
+     381,   387,   398,   350,   388,   389,   390,   391,   399,   400,
+     409,   401,   350,   402,   403,   412,   410,   415,   416,   423,
+     426,   352,   353,   448,   449,   450,   451,   452,   446,   442,
+     466,   434,   435,   354,   436,   457,   458,   459,   460,   461,
+     441,   447,   468,   350,   258,   259,   260,   261,   262,   263,
      264,   265,   266,   267,   268,   269,   270,   271,   226,   428,
-     226,   226,   226,   432,   433,   407,   350,   400,   437,   226,
-     401,   402,   412,   403,   442,   410,   350,   350,   350,   415,
-     416,   567,   426,   423,   434,   435,   436,   466,   468,   498,
-     441,   469,   471,   519,   520,   521,   579,   470,   474,   488,
-     489,   502,   332,   472,   478,   583,   504,   480,   481,   586,
-     587,   482,   486,   491,   492,   494,   226,   233,   234,   235,
-     236,   237,   238,   239,   240,   495,   496,   524,   525,   541,
-     527,   528,   529,   530,   487,   531,   532,   533,   526,   535,
-     241,   242,   497,   499,   500,   350,   350,   350,   501,   503,
-     506,   513,   516,   350,   518,   536,   537,   539,   538,   540,
-     241,   242,   421,   226,   544,   542,   545,   350,   350,   546,
-     547,   548,   549,   226,   226,   226,    53,   550,   551,   226,
-     556,   562,   563,   564,   552,   565,   566,   553,   554,   555,
-     124,   571,   572,   560,   573,   534,   561,     7,     8,     9,
-      10,    54,    12,    55,   125,   574,    56,   575,   576,   226,
-     350,   580,   350,   582,   126,   127,   350,   577,   584,   581,
-     585,   181,   182,   183,   350,   350,   350,   128,   129,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,   152,   153,   446,    97,   184,    57,   185,   350,   350,
-     224,   350,   350,   447,   325,   464,   105,   463,   350,   113,
-      27,    45,   477,   154,   155,   156,   493,   350,   157,   158,
-     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
-     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     179,   180,   522,    65,    66,     0,     0,     0,   350,     0,
-       0,     0,     0,     0,     0,     0,     0,   -78,     0,    20,
-      20,    21,    21,     0,   306,     0,     0,     0,     6,   -78,
-     -78,     0,     0,     0,     0,     0,   307,   308,   -78,   -78,
-     -78,   -78,   -78,   -78,   -78,     0,   350,   -78,    22,     0,
-       0,     0,     0,     0,     0,    23,     0,     0,     0,    24,
-       0,   350,     0,     0,     0,     0,     0,     0,     0,     0,
-     350,     0,     0,     0,   350,   350,   134,   135,   136,   137,
-     138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
-     148,   149,   150,   151,   309,   310,    65,    66,     0,   117,
-     202,   203,   204,   205,   206,   207,   208,   209,   210,   211,
-     212,    79,    80,    20,     0,    21,     0,     0,     0,     0,
-       0,   311,   158,   159,   160,   161,   162,   163,   164,   165,
-     166,   167,   168,   169,     0,   312,   172,   173,   174,    81,
-     313,   314,   315,   338,   339,    65,    66,   340,     0,     0,
-     316,     0,     0,   317,     0,   318,     0,     0,   319,     0,
-       0,     0,    20,     0,    21,     0,   341,   342,   343,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   344,   345,
+     226,   226,   226,   432,   433,   407,   362,   469,   437,   226,
+     470,   474,   486,   471,   472,   478,   372,   373,   374,   480,
+     481,   350,   491,   492,   482,   488,   519,   520,   521,   498,
+     489,   494,   495,   502,   504,   496,   350,   497,   499,   500,
+     536,   501,   332,   350,   503,   526,   506,   350,   350,   513,
+     421,   516,   518,   524,   525,   537,   226,   538,   556,   539,
+     560,   540,   541,   544,   547,   542,   571,   549,   548,   550,
+     527,   528,   529,   530,   487,   531,   532,   533,   551,   535,
+     552,   553,   241,   554,   242,   417,   418,   419,   555,   562,
+     561,   563,   572,   425,   573,   574,   575,   578,   579,   580,
+     545,   546,   241,   226,   242,   582,   583,   439,   440,   181,
+     182,   183,   184,   226,   226,   226,   -78,   185,    20,   226,
+      21,   385,    97,   564,   386,   565,   566,     6,   -78,   -78,
+      57,   464,   224,   463,   105,   534,   325,   -78,   -78,   -78,
+     -78,   -78,   -78,   -78,   113,    27,   -78,    22,    45,   226,
+     473,   477,   475,   522,    23,     0,   479,     0,    24,     0,
+     493,     0,     0,     0,   483,   484,   485,   245,   246,   247,
+     248,   249,   250,   251,   252,   253,   254,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   507,   508,
+       0,   511,   512,     0,     0,     0,     0,     0,   517,     0,
+       0,     0,     0,     0,     0,     0,     0,   523,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   346,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   134,   135,
-     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
-     146,   147,   148,   149,   150,   151,   309,   310,     0,     0,
-      82,     0,     0,    83,     0,     0,    84,     0,    85,   396,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   311,   158,   159,   160,   161,   162,   163,
-     164,   165,   166,   167,   168,   169,     0,   312,   172,   173,
-     174,     0,   313,   314,   315,   338,   339,     0,     0,   340,
-       0,     0,     0,     0,     0,   347,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   341,   342,
-     343,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     344,   345,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    65,    66,     0,     0,     0,     0,     0,   543,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    20,     0,
+      21,     0,   306,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   307,   308,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   567,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   346,     0,     0,     0,     0,     0,     0,
+       0,   577,     0,     0,     0,     0,     0,     0,   581,     0,
+       0,     0,   584,   585,   134,   135,   136,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
+     150,   151,   309,   310,    65,    66,     0,   117,    68,    69,
+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+      80,    20,     0,    21,     0,     0,     0,     0,     0,   311,
+     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
+     168,   169,     0,   312,   172,   173,   174,    81,   313,   314,
+     315,     0,     0,     0,     0,     0,     0,     0,   316,     0,
+       0,   317,     0,   318,    65,    66,   319,   117,   202,   203,
+     204,   205,   206,   207,   208,   209,   210,   211,   212,    79,
+      80,    20,     0,    21,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     134,   135,   136,   137,   138,   139,   140,   141,   142,   143,
-     144,   145,   146,   147,   148,   149,   150,   151,   309,   310,
-      65,    66,     0,   117,   202,   203,   204,   205,   206,   207,
-     208,   209,   210,   211,   212,    79,    80,    20,     0,    21,
-       0,     0,     0,     0,     0,   311,   158,   159,   160,   161,
-     162,   163,   164,   165,   166,   167,   168,   169,     0,   312,
-     172,   173,   174,    81,   313,   314,   315,     0,     0,     0,
-       0,     0,     0,     0,     0,    65,    66,   347,   117,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    20,     0,    21,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   223,     0,     0,
-       0,     0,     0,     0,     0,     0,    65,    66,    81,   117,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    20,     0,    21,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   331,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    81,
-       0,     0,     0,     0,    82,     0,     0,    83,     0,   392,
-      84,     0,    85,    65,    66,     0,   117,    68,    69,    70,
+     338,   339,    65,    66,   340,     0,     0,    81,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    20,
+       0,    21,     0,   341,   342,   343,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   344,   345,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    82,     0,
+       0,    83,     0,     0,    84,     0,    85,   118,   346,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   134,   135,   136,   137,   138,
+     139,   140,   141,   142,   143,   144,   145,   146,   147,   148,
+     149,   150,   151,   309,   310,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    82,     0,
+       0,    83,     0,     0,    84,     0,    85,   396,     0,     0,
+     311,   158,   159,   160,   161,   162,   163,   164,   165,   166,
+     167,   168,   169,     0,   312,   172,   173,   174,     0,   313,
+     314,   315,   338,   339,     0,     0,   340,     0,     0,     0,
+       0,     0,   347,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   341,   342,   343,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   344,   345,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     346,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   134,   135,   136,
+     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
+     147,   148,   149,   150,   151,   309,   310,    65,    66,     0,
+     117,   202,   203,   204,   205,   206,   207,   208,   209,   210,
+     211,   212,    79,    80,    20,     0,    21,     0,     0,     0,
+       0,     0,   311,   158,   159,   160,   161,   162,   163,   164,
+     165,   166,   167,   168,   169,     0,   312,   172,   173,   174,
+      81,   313,   314,   315,     0,     0,     0,     0,     0,     0,
+       0,     0,    65,    66,   347,   117,    68,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,    80,    20,
+       0,    21,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   223,     0,     0,     0,     0,     0,
+       0,     0,     0,    65,    66,    81,   117,    68,    69,    70,
       71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
       20,     0,    21,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   411,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    81,     0,     0,    82,
-       0,     0,    83,     0,     0,    84,     0,    85,     0,    65,
-      66,     0,   117,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    20,     0,    21,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      82,   462,     0,    83,     0,     0,    84,     0,    85,     0,
-      65,    66,    81,    67,    68,    69,    70,    71,    72,    73,
-      74,    75,    76,    77,    78,    79,    80,    20,     0,    21,
+       0,     0,     0,     0,     0,   331,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    81,     0,     0,     0,
+       0,    82,     0,     0,    83,     0,   392,    84,     0,    85,
       65,    66,     0,   117,    68,    69,    70,    71,    72,    73,
       74,    75,    76,    77,    78,    79,    80,    20,     0,    21,
-       0,     0,     0,    81,     0,     0,     0,    82,     0,     0,
-      83,     0,     0,    84,     0,    85,     0,     0,     0,     0,
-       0,    65,    66,    81,   117,   202,   203,   204,   205,   206,
-     207,   208,   209,   210,   211,   212,    79,    80,    20,     0,
-      21,    65,    66,     0,   229,    68,    69,    70,    71,    72,
-      73,    74,    75,    76,    77,    78,    79,    80,    20,     0,
-      21,     0,     0,    82,    81,     0,    83,     0,     0,    84,
-       0,    85,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    81,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    82,     0,     0,    83,     0,     0,
-      84,     0,    85,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    82,     0,     0,    83,     0,     0,
-      84,     0,    85,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   411,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    81,     0,     0,    82,     0,     0,    83,
+       0,     0,    84,     0,    85,     0,    65,    66,     0,   117,
+      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
+      78,    79,    80,    20,     0,    21,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    82,   462,     0,
+      83,     0,     0,    84,     0,    85,     0,    65,    66,    81,
+      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,    80,    20,     0,    21,    65,    66,     0,
+     117,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,    80,    20,     0,    21,     0,     0,     0,
+      81,     0,     0,     0,    82,     0,     0,    83,     0,     0,
+      84,     0,    85,     0,     0,     0,     0,     0,    65,    66,
+      81,   117,   202,   203,   204,   205,   206,   207,   208,   209,
+     210,   211,   212,    79,    80,    20,     0,    21,    65,    66,
+       0,   229,    68,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,    80,    20,     0,    21,     0,     0,
+      82,    81,     0,    83,     0,     0,    84,     0,    85,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    81,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    82,     0,     0,    83,     0,     0,    84,     0,    85,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    82,     0,     0,    83,     0,     0,    84,     0,    85,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    82,     0,     0,    83,     0,
-       0,    84,     0,    85,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    82,     0,     0,    83,     0,
-       0,    84,     0,    85
+       0,     0,     0,     0,     0,   124,     0,     0,     0,     0,
+       0,     0,    82,     0,     0,    83,     0,     0,    84,   125,
+      85,     0,     0,     0,     0,     0,     0,     0,     0,   126,
+     127,     0,    82,     0,     0,    83,     0,     0,    84,     0,
+      85,     0,   128,   129,   130,   131,   132,   133,   134,   135,
+     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
+     146,   147,   148,   149,   150,   151,   152,   153,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   154,   155,
+     156,     0,     0,   157,   158,   159,   160,   161,   162,   163,
+     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
+     174,   175,   176,   177,   178,   179,   180
 };
 
 static const short int yycheck[] =
 {
-      37,   130,   130,    53,   274,    34,     3,     9,   125,    29,
-     131,   128,   297,   298,    23,   148,    53,   558,   112,    21,
-      85,    30,    15,    15,     0,   158,   231,   232,    57,   570,
-      10,    11,    12,    13,    14,    15,    16,    17,   243,   156,
-     317,   318,   327,   148,    41,    10,    11,    12,    13,    14,
-      15,    16,    17,   158,   171,   539,    61,   122,   175,   176,
-     177,   178,   179,   180,    57,    57,   187,   184,   185,   150,
-     347,   276,   109,   110,   111,   559,   148,   148,   159,    23,
-     148,   286,   287,   288,   156,   156,   154,    45,   125,    47,
-      87,   128,     5,     6,   147,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-     148,    24,    61,    52,    53,    54,   154,   154,   155,   156,
-     157,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   147,    71,   170,   171,    48,     0,   157,   175,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,   185,   158,
-     355,   356,   357,   218,   219,   220,    32,    33,   363,   154,
-     445,    25,   156,    24,   159,   159,   147,    31,    55,    56,
-      57,     4,   377,   378,   154,   147,   293,    41,    42,    43,
-      44,    45,    46,    47,    22,   222,    24,    55,    56,   154,
-     121,   122,    27,    28,   244,     3,     4,   147,    62,     3,
-       4,     3,     4,   473,   147,   475,   152,   244,    64,    65,
-      66,    67,    68,    69,    70,   420,   150,   422,   255,     3,
-       4,   426,     3,     4,     4,     4,     4,   150,    24,   434,
-     435,   436,     4,    24,   153,   272,   149,    27,    28,   152,
-      59,   291,   155,   153,   157,   158,   150,    24,   365,     4,
-     367,   368,   369,     4,   291,   292,   293,     4,     4,   376,
-       4,   151,     7,   468,   469,     7,   471,   472,     7,   148,
-     148,   336,   152,   478,   148,   148,   216,   148,   148,   148,
-      36,   148,   487,   148,    24,   148,   226,    24,   148,   148,
-     148,   231,   232,   387,   388,   389,   390,   391,   150,   150,
-     150,   150,   150,   243,   150,   399,   400,   401,   402,   403,
-     150,   150,   148,   518,   104,   105,   106,   107,   108,   109,
+      37,   125,    85,   130,   128,   130,     3,   274,    53,   131,
+      34,   216,   297,   298,   539,    15,    53,    15,   112,   317,
+     318,   226,    23,   558,     9,    29,   231,   232,     0,    30,
+     148,   148,   156,    57,   559,   570,    21,   150,   243,   122,
+     158,   158,   327,   154,    41,    61,   159,   171,   159,   347,
+     148,   175,   176,   177,   178,   179,   180,    57,   156,    57,
+     184,   185,   148,   148,    23,   187,    52,    53,    54,   154,
+     156,   276,   109,   110,   111,    45,   156,    47,   148,   159,
+     147,   286,   287,   288,   154,    71,    61,    22,   125,    24,
+      87,   128,    10,    11,    12,    13,    14,    15,    16,    17,
+      20,    32,    33,    10,    11,    12,    13,    14,    15,    16,
+      17,    55,    56,    57,    55,    56,   147,   154,   155,   156,
+     157,    41,    42,    43,    44,    45,    46,    47,   121,   122,
+      50,    27,    28,   170,   171,   218,   219,   220,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,   185,     0,
+     355,   356,   357,   157,    24,     3,     4,   158,   363,     4,
+     445,    10,    11,    12,    13,    14,    15,    16,    17,   293,
+       3,     4,   377,   378,    25,     3,     4,     3,     4,   147,
+      31,     3,     4,   147,   147,   222,   147,   152,   150,     4,
+      41,    42,    43,    44,    45,    46,    47,     4,     4,   244,
+     150,    24,     4,    24,    24,   153,   473,   244,   475,    59,
+     153,    62,   150,     4,     7,   420,     4,   422,   255,     4,
+       4,   426,    64,    65,    66,    67,    68,    69,    70,   434,
+     435,   436,     7,     4,     7,   272,   154,    27,    28,   148,
+     151,   365,   148,   367,   368,   369,   291,   154,   148,   152,
+     148,   148,   376,   336,   291,   292,   293,   148,   148,   148,
+     148,   148,   148,   468,   469,   148,   471,   472,    36,    24,
+     148,   150,    24,   478,   150,   150,   150,   150,   150,   150,
+     148,   150,   487,   150,   150,    63,   151,   148,   148,   148,
+     152,   231,   232,   387,   388,   389,   390,   391,   150,    34,
+      24,   148,   148,   243,   148,   399,   400,   401,   402,   403,
+     148,   150,    21,   518,   104,   105,   106,   107,   108,   109,
      110,   111,   112,   113,   114,   115,   116,   117,   365,   366,
-     367,   368,   369,   370,   371,   332,   276,   150,   375,   376,
-     150,   150,    63,   150,    34,   151,   286,   287,   288,   148,
-     148,   556,   152,   148,   148,   148,   148,    24,    21,   453,
-     148,    21,   148,   480,   481,   482,   571,   150,     4,    24,
-       4,    36,   409,   148,   148,   580,    57,   148,   148,   584,
-     585,   148,   150,   148,   148,   148,   423,    10,    11,    12,
-      13,    14,    15,    16,    17,   148,   148,   491,   492,   516,
+     367,   368,   369,   370,   371,   332,   276,    21,   375,   376,
+     150,     4,   150,   148,   148,   148,   286,   287,   288,   148,
+     148,   556,   446,   447,   148,    24,   480,   481,   482,   453,
+       4,   148,   148,    36,    57,   148,   571,   148,   148,   148,
+       4,   148,   409,   578,   148,   151,   148,   582,   583,   148,
+      57,   148,   148,   148,   148,    24,   423,   148,    21,   152,
+      36,   151,   516,   151,   148,   154,    21,   148,   151,   148,
      494,   495,   496,   497,   441,   499,   500,   501,   151,   503,
-     539,   539,   148,   148,   148,   355,   356,   357,   148,   148,
-     148,   148,   148,   363,   148,     4,    24,   152,   148,   151,
-     559,   559,    57,   470,   151,   154,   148,   377,   378,   148,
-     148,   151,   148,   480,   481,   482,    20,   148,   151,   486,
-      21,   545,   546,   547,   151,   549,   550,   151,   151,   151,
-      35,    21,   151,    36,   151,   502,   154,    41,    42,    43,
-      44,    45,    46,    47,    49,   151,    50,   151,   151,   516,
-     420,    21,   422,    76,    59,    60,   426,   148,    21,   148,
-      21,    97,    97,    97,   434,   435,   436,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,   385,    41,    97,    25,    97,   468,   469,
-     122,   471,   472,   386,   216,   410,    52,   409,   478,    61,
-       3,    19,   423,   118,   119,   120,   448,   487,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   486,     5,     6,    -1,    -1,    -1,   518,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    20,    -1,    22,
-      22,    24,    24,    -1,    26,    -1,    -1,    -1,    31,    32,
-      33,    -1,    -1,    -1,    -1,    -1,    38,    39,    41,    42,
-      43,    44,    45,    46,    47,    -1,   556,    50,    51,    -1,
-      -1,    -1,    -1,    -1,    -1,    58,    -1,    -1,    -1,    62,
-      -1,   571,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     580,    -1,    -1,    -1,   584,   585,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    94,    95,    96,    97,     5,     6,    -1,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,    -1,
-      -1,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-     132,   133,   134,   135,    -1,   137,   138,   139,   140,    48,
-     142,   143,   144,     3,     4,     5,     6,     7,    -1,    -1,
-     152,    -1,    -1,   155,    -1,   157,    -1,    -1,   160,    -1,
-      -1,    -1,    22,    -1,    24,    -1,    26,    27,    28,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    38,    39,
+     151,   151,   539,   151,   539,   355,   356,   357,   151,   151,
+     154,   151,   151,   363,   151,   151,   148,    21,   148,    76,
+     524,   525,   559,   470,   559,    21,    21,   377,   378,    97,
+      97,    97,    97,   480,   481,   482,    20,    97,    22,   486,
+      24,   309,    41,   547,   310,   549,   550,    31,    32,    33,
+      25,   410,   122,   409,    52,   502,   216,    41,    42,    43,
+      44,    45,    46,    47,    61,     3,    50,    51,    19,   516,
+     420,   423,   422,   486,    58,    -1,   426,    -1,    62,    -1,
+     448,    -1,    -1,    -1,   434,   435,   436,    98,    99,   100,
+     101,   102,   103,   104,   105,   106,   107,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   468,   469,
+      -1,   471,   472,    -1,    -1,    -1,    -1,    -1,   478,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   487,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    61,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
-      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
-      90,    91,    92,    93,    94,    95,    96,    97,    -1,    -1,
-     149,    -1,    -1,   152,    -1,    -1,   155,    -1,   157,   158,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   123,   124,   125,   126,   127,   128,   129,
-     130,   131,   132,   133,   134,   135,    -1,   137,   138,   139,
-     140,    -1,   142,   143,   144,     3,     4,    -1,    -1,     7,
-      -1,    -1,    -1,    -1,    -1,   155,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    26,    27,
-      28,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      38,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,     5,     6,    -1,    -1,    -1,    -1,    -1,   518,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    22,    -1,
+      24,    -1,    26,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   556,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    61,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   571,    -1,    -1,    -1,    -1,    -1,    -1,   578,    -1,
+      -1,    -1,   582,   583,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
+      94,    95,    96,    97,     5,     6,    -1,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    22,    -1,    24,    -1,    -1,    -1,    -1,    -1,   123,
+     124,   125,   126,   127,   128,   129,   130,   131,   132,   133,
+     134,   135,    -1,   137,   138,   139,   140,    48,   142,   143,
+     144,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   152,    -1,
+      -1,   155,    -1,   157,     5,     6,   160,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    22,    -1,    24,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
-       5,     6,    -1,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    -1,    24,
-      -1,    -1,    -1,    -1,    -1,   123,   124,   125,   126,   127,
-     128,   129,   130,   131,   132,   133,   134,   135,    -1,   137,
-     138,   139,   140,    48,   142,   143,   144,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     5,     6,   155,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    -1,    24,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,     5,     6,    48,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    48,
-      -1,    -1,    -1,    -1,   149,    -1,    -1,   152,    -1,   154,
-     155,    -1,   157,     5,     6,    -1,     8,     9,    10,    11,
+       3,     4,     5,     6,     7,    -1,    -1,    48,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    22,
+      -1,    24,    -1,    26,    27,    28,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    38,    39,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   149,    -1,
+      -1,   152,    -1,    -1,   155,    -1,   157,   158,    61,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
+      93,    94,    95,    96,    97,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   149,    -1,
+      -1,   152,    -1,    -1,   155,    -1,   157,   158,    -1,    -1,
+     123,   124,   125,   126,   127,   128,   129,   130,   131,   132,
+     133,   134,   135,    -1,   137,   138,   139,   140,    -1,   142,
+     143,   144,     3,     4,    -1,    -1,     7,    -1,    -1,    -1,
+      -1,    -1,   155,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    26,    27,    28,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    38,    39,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      61,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,    93,    94,    95,    96,    97,     5,     6,    -1,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,
+      -1,    -1,   123,   124,   125,   126,   127,   128,   129,   130,
+     131,   132,   133,   134,   135,    -1,   137,   138,   139,   140,
+      48,   142,   143,   144,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     5,     6,   155,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      -1,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,     5,     6,    48,     8,     9,    10,    11,
       12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
       22,    -1,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    48,    -1,    -1,   149,
-      -1,    -1,   152,    -1,    -1,   155,    -1,   157,    -1,     5,
-       6,    -1,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    -1,    24,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     149,    37,    -1,   152,    -1,    -1,   155,    -1,   157,    -1,
-       5,     6,    48,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    -1,    24,
+      -1,    -1,    -1,    -1,    -1,    -1,    48,    -1,    -1,    -1,
+      -1,   149,    -1,    -1,   152,    -1,   154,   155,    -1,   157,
        5,     6,    -1,     8,     9,    10,    11,    12,    13,    14,
       15,    16,    17,    18,    19,    20,    21,    22,    -1,    24,
-      -1,    -1,    -1,    48,    -1,    -1,    -1,   149,    -1,    -1,
-     152,    -1,    -1,   155,    -1,   157,    -1,    -1,    -1,    -1,
-      -1,     5,     6,    48,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    -1,
-      24,     5,     6,    -1,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    -1,
-      24,    -1,    -1,   149,    48,    -1,   152,    -1,    -1,   155,
-      -1,   157,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    48,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   149,    -1,    -1,   152,    -1,    -1,
-     155,    -1,   157,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   149,    -1,    -1,   152,    -1,    -1,
-     155,    -1,   157,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    48,    -1,    -1,   149,    -1,    -1,   152,
+      -1,    -1,   155,    -1,   157,    -1,     5,     6,    -1,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   149,    37,    -1,
+     152,    -1,    -1,   155,    -1,   157,    -1,     5,     6,    48,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    -1,    24,     5,     6,    -1,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,
+      48,    -1,    -1,    -1,   149,    -1,    -1,   152,    -1,    -1,
+     155,    -1,   157,    -1,    -1,    -1,    -1,    -1,     5,     6,
+      48,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    -1,    24,     5,     6,
+      -1,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    -1,    24,    -1,    -1,
+     149,    48,    -1,   152,    -1,    -1,   155,    -1,   157,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    48,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   149,    -1,    -1,   152,    -1,    -1,   155,    -1,   157,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   149,    -1,    -1,   152,    -1,    -1,   155,    -1,   157,
+      -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,    35,    -1,    -1,    -1,    -1,
+      -1,    -1,   149,    -1,    -1,   152,    -1,    -1,   155,    49,
+     157,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    59,
+      60,    -1,   149,    -1,    -1,   152,    -1,    -1,   155,    -1,
+     157,    -1,    72,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    95,    96,    97,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   149,    -1,    -1,   152,    -1,
-      -1,   155,    -1,   157,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   149,    -1,    -1,   152,    -1,
-      -1,   155,    -1,   157
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   118,   119,
+     120,    -1,    -1,   123,   124,   125,   126,   127,   128,   129,
+     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -2419,27 +2443,27 @@
      222,   223,   223,   223,   223,   184,   186,   186,   148,   179,
      148,   179,   223,   152,   148,   148,   148,   148,   148,   148,
      148,   148,   223,   223,   223,    36,   148,   184,   186,   224,
-      24,   148,   182,   182,   182,   150,   150,   150,   150,   150,
+      24,   148,   182,   182,   182,   169,   170,   150,   150,   150,
      150,   150,   154,   191,   193,   193,   158,   193,    24,   150,
      150,   150,   150,   150,   182,   154,   156,   207,   208,   148,
      151,    37,    63,   220,   193,   148,   148,   223,   223,   223,
       15,    57,    15,   148,   236,   223,   152,   224,   186,   224,
      224,   224,   186,   186,   148,   148,   148,   186,   224,   223,
-     223,   148,    34,    57,   180,   183,   169,   170,   191,   191,
+     223,   148,    34,    57,   180,   183,   150,   150,   191,   191,
      191,   191,   191,   148,   154,   156,   158,   191,   191,   191,
      191,   191,    37,   209,   180,   181,    24,   156,    21,    21,
      150,   148,   148,   223,     4,   223,   224,   232,   148,   223,
      148,   148,   148,   223,   223,   223,   150,   186,    24,     4,
-     182,   148,   148,   236,   148,   148,   148,   148,   191,   148,
+     182,   191,   191,   236,   148,   148,   148,   148,   191,   148,
      148,   148,    36,   148,    57,   178,   148,   223,   223,   232,
      233,   223,   223,   148,   179,   179,   148,   223,   148,   224,
-     224,   224,   233,   223,   191,   191,   151,   191,   191,   191,
+     224,   224,   233,   223,   148,   148,   151,   191,   191,   191,
      191,   191,   191,   191,   186,   191,     4,    24,   148,   152,
-     151,   224,   154,   223,   151,   148,   148,   148,   151,   148,
+     151,   224,   154,   223,   151,   191,   191,   148,   151,   148,
      148,   151,   151,   151,   151,   151,    21,   154,   173,   229,
-      36,   154,   191,   191,   191,   191,   191,   223,   221,   154,
-     173,    21,   151,   151,   151,   151,   151,   148,   221,   223,
-      21,   148,    76,   223,    21,    21,   223,   223
+      36,   154,   151,   151,   191,   191,   191,   223,   221,   154,
+     173,    21,   151,   151,   151,   148,   221,   223,    21,   148,
+      76,   223,    21,    21,   223,   223
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -3109,7 +3133,7 @@
   switch (yyn)
     {
         case 3:
-#line 1104 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1104 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   if ((yyvsp[0].UIntVal) > (uint32_t)INT32_MAX)     // Outside of my range!
     GEN_ERROR("Value too large for type!");
@@ -3119,7 +3143,7 @@
     break;
 
   case 5:
-#line 1113 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1113 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   if ((yyvsp[0].UInt64Val) > (uint64_t)INT64_MAX)     // Outside of my range!
     GEN_ERROR("Value too large for type!");
@@ -3129,137 +3153,137 @@
     break;
 
   case 39:
-#line 1130 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1130 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_EQ; ;}
     break;
 
   case 40:
-#line 1130 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1130 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_NE; ;}
     break;
 
   case 41:
-#line 1131 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1131 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLT; ;}
     break;
 
   case 42:
-#line 1131 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1131 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGT; ;}
     break;
 
   case 43:
-#line 1132 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1132 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLE; ;}
     break;
 
   case 44:
-#line 1132 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1132 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGE; ;}
     break;
 
   case 45:
-#line 1133 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1133 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULT; ;}
     break;
 
   case 46:
-#line 1133 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1133 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGT; ;}
     break;
 
   case 47:
-#line 1134 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1134 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULE; ;}
     break;
 
   case 48:
-#line 1134 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1134 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGE; ;}
     break;
 
   case 49:
-#line 1138 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1138 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OEQ; ;}
     break;
 
   case 50:
-#line 1138 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1138 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ONE; ;}
     break;
 
   case 51:
-#line 1139 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1139 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLT; ;}
     break;
 
   case 52:
-#line 1139 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1139 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGT; ;}
     break;
 
   case 53:
-#line 1140 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1140 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLE; ;}
     break;
 
   case 54:
-#line 1140 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1140 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGE; ;}
     break;
 
   case 55:
-#line 1141 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1141 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ORD; ;}
     break;
 
   case 56:
-#line 1141 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1141 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNO; ;}
     break;
 
   case 57:
-#line 1142 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1142 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UEQ; ;}
     break;
 
   case 58:
-#line 1142 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1142 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNE; ;}
     break;
 
   case 59:
-#line 1143 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1143 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULT; ;}
     break;
 
   case 60:
-#line 1143 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1143 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGT; ;}
     break;
 
   case 61:
-#line 1144 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1144 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULE; ;}
     break;
 
   case 62:
-#line 1144 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1144 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGE; ;}
     break;
 
   case 63:
-#line 1145 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1145 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_TRUE; ;}
     break;
 
   case 64:
-#line 1146 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1146 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_FALSE; ;}
     break;
 
   case 77:
-#line 1157 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1157 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = (yyvsp[-1].StrVal);
     CHECK_FOR_ERROR
@@ -3267,7 +3291,7 @@
     break;
 
   case 78:
-#line 1161 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1161 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3275,82 +3299,82 @@
     break;
 
   case 79:
-#line 1166 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1166 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 80:
-#line 1167 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1167 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 81:
-#line 1168 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1168 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 82:
-#line 1169 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1169 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
     break;
 
   case 83:
-#line 1170 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1170 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 84:
-#line 1171 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1171 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 85:
-#line 1172 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1172 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 86:
-#line 1173 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1173 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 87:
-#line 1175 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1175 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 88:
-#line 1176 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1176 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 89:
-#line 1177 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1177 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::CSRet; ;}
     break;
 
   case 90:
-#line 1178 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1178 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Fast; ;}
     break;
 
   case 91:
-#line 1179 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1179 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Cold; ;}
     break;
 
   case 92:
-#line 1180 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1180 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_StdCall; ;}
     break;
 
   case 93:
-#line 1181 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1181 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_FastCall; ;}
     break;
 
   case 94:
-#line 1182 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1182 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
                    if ((unsigned)(yyvsp[0].UInt64Val) != (yyvsp[0].UInt64Val))
                      GEN_ERROR("Calling conv too large!");
@@ -3360,12 +3384,12 @@
     break;
 
   case 95:
-#line 1191 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1191 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 96:
-#line 1192 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1192 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[0].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -3375,12 +3399,12 @@
     break;
 
   case 97:
-#line 1198 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1198 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 98:
-#line 1199 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1199 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[0].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -3390,7 +3414,7 @@
     break;
 
   case 99:
-#line 1207 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1207 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   for (unsigned i = 0, e = strlen((yyvsp[0].StrVal)); i != e; ++i)
     if ((yyvsp[0].StrVal)[i] == '"' || (yyvsp[0].StrVal)[i] == '\\')
@@ -3401,27 +3425,27 @@
     break;
 
   case 100:
-#line 1215 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1215 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 101:
-#line 1216 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1216 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = (yyvsp[0].StrVal); ;}
     break;
 
   case 102:
-#line 1221 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1221 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 103:
-#line 1222 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1222 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 104:
-#line 1223 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1223 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV->setSection((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -3430,7 +3454,7 @@
     break;
 
   case 105:
-#line 1228 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1228 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[0].UInt64Val)))
       GEN_ERROR("Alignment must be a power of two!");
@@ -3440,17 +3464,17 @@
     break;
 
   case 107:
-#line 1242 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1242 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType)); ;}
     break;
 
   case 109:
-#line 1243 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1243 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType)); ;}
     break;
 
   case 110:
-#line 1245 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1245 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -3460,7 +3484,7 @@
     break;
 
   case 124:
-#line 1257 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1257 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
@@ -3468,7 +3492,7 @@
     break;
 
   case 125:
-#line 1261 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1261 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType));
     CHECK_FOR_ERROR
@@ -3476,7 +3500,7 @@
     break;
 
   case 126:
-#line 1265 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1265 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {            // Named types are also simple types...
   const Type* tmp = getTypeVal((yyvsp[0].ValIDVal));
   CHECK_FOR_ERROR
@@ -3485,7 +3509,7 @@
     break;
 
   case 127:
-#line 1273 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1273 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                   // Type UpReference
     if ((yyvsp[0].UInt64Val) > (uint64_t)~0U) GEN_ERROR("Value out of range!");
     OpaqueType *OT = OpaqueType::get();        // Use temporary placeholder
@@ -3497,7 +3521,7 @@
     break;
 
   case 128:
-#line 1281 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1281 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {           // Function derived type?
     std::vector<const Type*> Params;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-1].TypeList)->begin(),
@@ -3514,7 +3538,7 @@
     break;
 
   case 129:
-#line 1294 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1294 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {          // Sized array type?
     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[-1].TypeVal), (unsigned)(yyvsp[-3].UInt64Val))));
     delete (yyvsp[-1].TypeVal);
@@ -3523,7 +3547,7 @@
     break;
 
   case 130:
-#line 1299 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1299 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {          // Packed array type?
      const llvm::Type* ElemTy = (yyvsp[-1].TypeVal)->get();
      if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val))
@@ -3539,7 +3563,7 @@
     break;
 
   case 131:
-#line 1311 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1311 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                        // Structure type?
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-1].TypeList)->begin(),
@@ -3553,7 +3577,7 @@
     break;
 
   case 132:
-#line 1321 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1321 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                                  // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
     CHECK_FOR_ERROR
@@ -3561,7 +3585,7 @@
     break;
 
   case 133:
-#line 1325 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1325 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                             // Pointer type?
     if (*(yyvsp[-1].TypeVal) == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
@@ -3572,7 +3596,7 @@
     break;
 
   case 134:
-#line 1336 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1336 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeHolder>();
     (yyval.TypeList)->push_back(*(yyvsp[0].TypeVal)); delete (yyvsp[0].TypeVal);
@@ -3581,7 +3605,7 @@
     break;
 
   case 135:
-#line 1341 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1341 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(*(yyvsp[0].TypeVal)); delete (yyvsp[0].TypeVal);
     CHECK_FOR_ERROR
@@ -3589,7 +3613,7 @@
     break;
 
   case 137:
-#line 1348 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1348 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(Type::VoidTy);
     CHECK_FOR_ERROR
@@ -3597,7 +3621,7 @@
     break;
 
   case 138:
-#line 1352 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1352 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList) = new std::list<PATypeHolder>())->push_back(Type::VoidTy);
     CHECK_FOR_ERROR
@@ -3605,7 +3629,7 @@
     break;
 
   case 139:
-#line 1356 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1356 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeHolder>();
     CHECK_FOR_ERROR
@@ -3613,7 +3637,7 @@
     break;
 
   case 140:
-#line 1367 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1367 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-3].TypeVal)->get());
     if (ATy == 0)
@@ -3643,7 +3667,7 @@
     break;
 
   case 141:
-#line 1393 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1393 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal)->get());
     if (ATy == 0)
@@ -3661,7 +3685,7 @@
     break;
 
   case 142:
-#line 1407 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1407 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal)->get());
     if (ATy == 0)
@@ -3695,7 +3719,7 @@
     break;
 
   case 143:
-#line 1437 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1437 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     const PackedType *PTy = dyn_cast<PackedType>((yyvsp[-3].TypeVal)->get());
     if (PTy == 0)
@@ -3725,7 +3749,7 @@
     break;
 
   case 144:
-#line 1463 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1463 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[-3].TypeVal)->get());
     if (STy == 0)
@@ -3750,7 +3774,7 @@
     break;
 
   case 145:
-#line 1484 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1484 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[-2].TypeVal)->get());
     if (STy == 0)
@@ -3767,7 +3791,7 @@
     break;
 
   case 146:
-#line 1497 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1497 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const PointerType *PTy = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
     if (PTy == 0)
@@ -3781,7 +3805,7 @@
     break;
 
   case 147:
-#line 1507 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1507 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVal) = UndefValue::get((yyvsp[-1].TypeVal)->get());
     delete (yyvsp[-1].TypeVal);
@@ -3790,7 +3814,7 @@
     break;
 
   case 148:
-#line 1512 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1512 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const PointerType *Ty = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
     if (Ty == 0)
@@ -3855,7 +3879,7 @@
     break;
 
   case 149:
-#line 1573 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1573 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-1].TypeVal)->get() != (yyvsp[0].ConstVal)->getType())
       GEN_ERROR("Mismatched types for constant expression!");
@@ -3866,7 +3890,7 @@
     break;
 
   case 150:
-#line 1580 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1580 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[-1].TypeVal)->get();
     if (isa<FunctionType>(Ty) || Ty == Type::LabelTy || isa<OpaqueType>(Ty))
@@ -3878,7 +3902,7 @@
     break;
 
   case 151:
-#line 1588 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1588 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].SInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type!");
@@ -3888,7 +3912,7 @@
     break;
 
   case 152:
-#line 1594 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1594 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {            // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].UInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type!");
@@ -3898,7 +3922,7 @@
     break;
 
   case 153:
-#line 1600 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1600 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                      // Boolean constants
     (yyval.ConstVal) = ConstantBool::getTrue();
     CHECK_FOR_ERROR
@@ -3906,7 +3930,7 @@
     break;
 
   case 154:
-#line 1604 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1604 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                     // Boolean constants
     (yyval.ConstVal) = ConstantBool::getFalse();
     CHECK_FOR_ERROR
@@ -3914,7 +3938,7 @@
     break;
 
   case 155:
-#line 1608 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1608 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                   // Float & Double constants
     if (!ConstantFP::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].FPVal)))
       GEN_ERROR("Floating point constant invalid for type!!");
@@ -3924,7 +3948,7 @@
     break;
 
   case 156:
-#line 1616 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1616 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     Constant *Val = (yyvsp[-3].ConstVal);
     const Type *Ty = (yyvsp[-1].TypeVal)->get();
@@ -3940,7 +3964,7 @@
     break;
 
   case 157:
-#line 1628 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1628 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[-2].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand!");
@@ -3976,7 +4000,7 @@
     break;
 
   case 158:
-#line 1660 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1660 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-5].ConstVal)->getType() != Type::BoolTy)
       GEN_ERROR("Select condition must be of boolean type!");
@@ -3988,7 +4012,7 @@
     break;
 
   case 159:
-#line 1668 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1668 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("Binary operator types must match!");
@@ -4016,7 +4040,7 @@
     break;
 
   case 160:
-#line 1692 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1692 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match!");
@@ -4031,7 +4055,7 @@
     break;
 
   case 161:
-#line 1703 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1703 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("setcc operand types must match!");
@@ -4041,7 +4065,7 @@
     break;
 
   case 162:
-#line 1709 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1709 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("icmp operand types must match!");
@@ -4050,7 +4074,7 @@
     break;
 
   case 163:
-#line 1714 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1714 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("fcmp operand types must match!");
@@ -4059,7 +4083,7 @@
     break;
 
   case 164:
-#line 1719 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1719 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-1].ConstVal)->getType() != Type::UByteTy)
       GEN_ERROR("Shift count for shift constant must be unsigned byte!");
@@ -4072,7 +4096,7 @@
     break;
 
   case 165:
-#line 1728 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1728 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid extractelement operands!");
@@ -4082,7 +4106,7 @@
     break;
 
   case 166:
-#line 1734 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1734 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid insertelement operands!");
@@ -4092,7 +4116,7 @@
     break;
 
   case 167:
-#line 1740 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1740 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid shufflevector operands!");
@@ -4102,7 +4126,7 @@
     break;
 
   case 168:
-#line 1749 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1749 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ConstVector) = (yyvsp[-2].ConstVector))->push_back((yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
@@ -4110,7 +4134,7 @@
     break;
 
   case 169:
-#line 1753 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1753 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVector) = new std::vector<Constant*>();
     (yyval.ConstVector)->push_back((yyvsp[0].ConstVal));
@@ -4119,17 +4143,17 @@
     break;
 
   case 170:
-#line 1761 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1761 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
   case 171:
-#line 1761 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1761 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
   case 172:
-#line 1771 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1771 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.ModuleVal) = ParserResult = (yyvsp[0].ModuleVal);
   CurModule.ModuleDone();
@@ -4138,7 +4162,7 @@
     break;
 
   case 173:
-#line 1779 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1779 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = (yyvsp[-1].ModuleVal);
     CurFun.FunctionDone();
@@ -4147,7 +4171,7 @@
     break;
 
   case 174:
-#line 1784 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1784 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = (yyvsp[-1].ModuleVal);
     CHECK_FOR_ERROR
@@ -4155,7 +4179,7 @@
     break;
 
   case 175:
-#line 1788 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1788 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = (yyvsp[-3].ModuleVal);
     CHECK_FOR_ERROR
@@ -4163,7 +4187,7 @@
     break;
 
   case 176:
-#line 1792 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1792 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = (yyvsp[-1].ModuleVal);
     CHECK_FOR_ERROR
@@ -4171,7 +4195,7 @@
     break;
 
   case 177:
-#line 1796 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1796 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = CurModule.CurrentModule;
     // Emit an error if there are any unresolved types left.
@@ -4188,7 +4212,7 @@
     break;
 
   case 178:
-#line 1811 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1811 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     // Eagerly resolve types.  This is not an optimization, this is a
     // requirement that is due to the fact that we could have this:
@@ -4214,21 +4238,21 @@
     break;
 
   case 179:
-#line 1833 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1833 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {       // Function prototypes can be in const pool
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 180:
-#line 1836 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1836 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {  // Asm blocks can be in the const pool
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 181:
-#line 1839 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1839 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant!");
@@ -4238,14 +4262,14 @@
     break;
 
   case 182:
-#line 1844 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1844 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 183:
-#line 1847 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1847 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalLinkage, (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0);
     CHECK_FOR_ERROR
@@ -4254,7 +4278,7 @@
     break;
 
   case 184:
-#line 1851 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1851 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
@@ -4262,7 +4286,7 @@
     break;
 
   case 185:
-#line 1855 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1855 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::DLLImportLinkage, (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0);
     CHECK_FOR_ERROR
@@ -4271,7 +4295,7 @@
     break;
 
   case 186:
-#line 1859 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1859 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
@@ -4279,7 +4303,7 @@
     break;
 
   case 187:
-#line 1863 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1863 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 
       ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalWeakLinkage, (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0);
@@ -4289,7 +4313,7 @@
     break;
 
   case 188:
-#line 1868 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1868 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
@@ -4297,27 +4321,27 @@
     break;
 
   case 189:
-#line 1872 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1872 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { 
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 190:
-#line 1875 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1875 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 191:
-#line 1878 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1878 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { 
   ;}
     break;
 
   case 192:
-#line 1882 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1882 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   char *EndStr = UnEscapeLexed((yyvsp[0].StrVal), true);
@@ -4333,17 +4357,17 @@
     break;
 
   case 193:
-#line 1895 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1895 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Endianness) = Module::BigEndian; ;}
     break;
 
   case 194:
-#line 1896 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1896 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Endianness) = Module::LittleEndian; ;}
     break;
 
   case 195:
-#line 1898 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1898 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setEndianness((yyvsp[0].Endianness));
     CHECK_FOR_ERROR
@@ -4351,7 +4375,7 @@
     break;
 
   case 196:
-#line 1902 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1902 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].UInt64Val) == 32)
       CurModule.CurrentModule->setPointerSize(Module::Pointer32);
@@ -4364,7 +4388,7 @@
     break;
 
   case 197:
-#line 1911 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1911 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setTargetTriple((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -4372,7 +4396,7 @@
     break;
 
   case 198:
-#line 1915 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1915 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setDataLayout((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -4380,7 +4404,7 @@
     break;
 
   case 200:
-#line 1922 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1922 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
           free((yyvsp[0].StrVal));
@@ -4389,7 +4413,7 @@
     break;
 
   case 201:
-#line 1927 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1927 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
           free((yyvsp[0].StrVal));
@@ -4398,19 +4422,19 @@
     break;
 
   case 202:
-#line 1932 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1932 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
           CHECK_FOR_ERROR
         ;}
     break;
 
   case 206:
-#line 1942 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1942 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 207:
-#line 1944 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1944 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   if (*(yyvsp[-1].TypeVal) == Type::VoidTy)
     GEN_ERROR("void typed arguments are invalid!");
@@ -4420,7 +4444,7 @@
     break;
 
   case 208:
-#line 1951 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1951 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[-2].ArgList);
     (yyvsp[-2].ArgList)->push_back(*(yyvsp[0].ArgVal));
@@ -4430,7 +4454,7 @@
     break;
 
   case 209:
-#line 1957 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1957 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new std::vector<std::pair<PATypeHolder*,char*> >();
     (yyval.ArgList)->push_back(*(yyvsp[0].ArgVal));
@@ -4440,7 +4464,7 @@
     break;
 
   case 210:
-#line 1964 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1964 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[0].ArgList);
     CHECK_FOR_ERROR
@@ -4448,7 +4472,7 @@
     break;
 
   case 211:
-#line 1968 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1968 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[-2].ArgList);
     (yyval.ArgList)->push_back(std::pair<PATypeHolder*,
@@ -4458,7 +4482,7 @@
     break;
 
   case 212:
-#line 1974 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1974 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new std::vector<std::pair<PATypeHolder*,char*> >();
     (yyval.ArgList)->push_back(std::make_pair(new PATypeHolder(Type::VoidTy), (char*)0));
@@ -4467,7 +4491,7 @@
     break;
 
   case 213:
-#line 1979 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1979 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
@@ -4475,7 +4499,7 @@
     break;
 
   case 214:
-#line 1985 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 1985 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   UnEscapeLexed((yyvsp[-5].StrVal));
   std::string FunctionName((yyvsp[-5].StrVal));
@@ -4572,7 +4596,7 @@
     break;
 
   case 217:
-#line 2081 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2081 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = CurFun.CurrentFunction;
 
@@ -4583,7 +4607,7 @@
     break;
 
   case 220:
-#line 2091 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2091 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
   CHECK_FOR_ERROR
@@ -4591,22 +4615,22 @@
     break;
 
   case 222:
-#line 2097 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2097 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { CurFun.Linkage = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 223:
-#line 2098 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2098 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { CurFun.Linkage = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 224:
-#line 2100 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2100 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
   case 225:
-#line 2100 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2100 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = CurFun.CurrentFunction;
     CurFun.FunctionDone();
@@ -4615,7 +4639,7 @@
     break;
 
   case 226:
-#line 2110 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2110 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -4623,7 +4647,7 @@
     break;
 
   case 227:
-#line 2114 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2114 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -4631,7 +4655,7 @@
     break;
 
   case 228:
-#line 2119 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2119 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {    // A reference to a direct constant
     (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val));
     CHECK_FOR_ERROR
@@ -4639,7 +4663,7 @@
     break;
 
   case 229:
-#line 2123 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2123 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val));
     CHECK_FOR_ERROR
@@ -4647,7 +4671,7 @@
     break;
 
   case 230:
-#line 2127 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2127 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                     // Perhaps it's an FP constant?
     (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal));
     CHECK_FOR_ERROR
@@ -4655,7 +4679,7 @@
     break;
 
   case 231:
-#line 2131 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2131 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantBool::getTrue());
     CHECK_FOR_ERROR
@@ -4663,7 +4687,7 @@
     break;
 
   case 232:
-#line 2135 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2135 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantBool::getFalse());
     CHECK_FOR_ERROR
@@ -4671,7 +4695,7 @@
     break;
 
   case 233:
-#line 2139 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2139 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createNull();
     CHECK_FOR_ERROR
@@ -4679,7 +4703,7 @@
     break;
 
   case 234:
-#line 2143 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2143 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
@@ -4687,7 +4711,7 @@
     break;
 
   case 235:
-#line 2147 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2147 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {     // A vector zero constant.
     (yyval.ValIDVal) = ValID::createZeroInit();
     CHECK_FOR_ERROR
@@ -4695,7 +4719,7 @@
     break;
 
   case 236:
-#line 2151 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2151 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized packed vector
     const Type *ETy = (*(yyvsp[-1].ConstVector))[0]->getType();
     int NumElements = (yyvsp[-1].ConstVector)->size(); 
@@ -4724,7 +4748,7 @@
     break;
 
   case 237:
-#line 2176 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2176 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
@@ -4732,7 +4756,7 @@
     break;
 
   case 238:
-#line 2180 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2180 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     char *End = UnEscapeLexed((yyvsp[-2].StrVal), true);
     std::string AsmStr = std::string((yyvsp[-2].StrVal), End);
@@ -4746,7 +4770,7 @@
     break;
 
   case 239:
-#line 2194 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2194 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {  // Is it an integer reference...?
     (yyval.ValIDVal) = ValID::create((yyvsp[0].SIntVal));
     CHECK_FOR_ERROR
@@ -4754,7 +4778,7 @@
     break;
 
   case 240:
-#line 2198 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2198 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::create((yyvsp[0].StrVal));
     CHECK_FOR_ERROR
@@ -4762,7 +4786,7 @@
     break;
 
   case 243:
-#line 2210 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2210 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueVal) = getVal(*(yyvsp[-1].TypeVal), (yyvsp[0].ValIDVal)); delete (yyvsp[-1].TypeVal);
     CHECK_FOR_ERROR
@@ -4770,7 +4794,7 @@
     break;
 
   case 244:
-#line 2215 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2215 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
     CHECK_FOR_ERROR
@@ -4778,7 +4802,7 @@
     break;
 
   case 245:
-#line 2219 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2219 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { // Do not allow functions with 0 basic blocks   
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
     CHECK_FOR_ERROR
@@ -4786,7 +4810,7 @@
     break;
 
   case 246:
-#line 2228 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2228 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     setValueName((yyvsp[0].TermInstVal), (yyvsp[-1].StrVal));
     CHECK_FOR_ERROR
@@ -4800,7 +4824,7 @@
     break;
 
   case 247:
-#line 2239 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2239 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (CastInst *CI1 = dyn_cast<CastInst>((yyvsp[0].InstVal)))
       if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
@@ -4813,7 +4837,7 @@
     break;
 
   case 248:
-#line 2248 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2248 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++), true);
     CHECK_FOR_ERROR
@@ -4829,7 +4853,7 @@
     break;
 
   case 249:
-#line 2260 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2260 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((yyvsp[0].StrVal)), true);
     CHECK_FOR_ERROR
@@ -4845,7 +4869,7 @@
     break;
 
   case 250:
-#line 2273 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2273 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {              // Return with a result...
     (yyval.TermInstVal) = new ReturnInst((yyvsp[0].ValueVal));
     CHECK_FOR_ERROR
@@ -4853,7 +4877,7 @@
     break;
 
   case 251:
-#line 2277 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2277 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                                       // Return with no result...
     (yyval.TermInstVal) = new ReturnInst();
     CHECK_FOR_ERROR
@@ -4861,7 +4885,7 @@
     break;
 
   case 252:
-#line 2281 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2281 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                         // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
@@ -4870,7 +4894,7 @@
     break;
 
   case 253:
-#line 2286 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2286 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {  
     BasicBlock* tmpBBA = getBBVal((yyvsp[-3].ValIDVal));
     CHECK_FOR_ERROR
@@ -4883,7 +4907,7 @@
     break;
 
   case 254:
-#line 2295 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2295 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-7].PrimType), (yyvsp[-6].ValIDVal));
     CHECK_FOR_ERROR
@@ -4906,7 +4930,7 @@
     break;
 
   case 255:
-#line 2314 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2314 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-6].PrimType), (yyvsp[-5].ValIDVal));
     CHECK_FOR_ERROR
@@ -4919,7 +4943,7 @@
     break;
 
   case 256:
-#line 2324 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2324 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const PointerType *PFTy;
     const FunctionType *Ty;
@@ -4978,7 +5002,7 @@
     break;
 
   case 257:
-#line 2379 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2379 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
@@ -4986,7 +5010,7 @@
     break;
 
   case 258:
-#line 2383 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2383 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
@@ -4994,7 +5018,7 @@
     break;
 
   case 259:
-#line 2390 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2390 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = (yyvsp[-5].JumpTable);
     Constant *V = cast<Constant>(getValNonImprovising((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
@@ -5009,7 +5033,7 @@
     break;
 
   case 260:
-#line 2401 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2401 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
     Constant *V = cast<Constant>(getValNonImprovising((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
@@ -5025,7 +5049,7 @@
     break;
 
   case 261:
-#line 2414 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2414 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   // Is this definition named?? if so, assign the name...
   setValueName((yyvsp[0].InstVal), (yyvsp[-1].StrVal));
@@ -5037,7 +5061,7 @@
     break;
 
   case 262:
-#line 2423 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2423 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {    // Used for PHI nodes
     (yyval.PHIList) = new std::list<std::pair<Value*, BasicBlock*> >();
     Value* tmpVal = getVal(*(yyvsp[-5].TypeVal), (yyvsp[-3].ValIDVal));
@@ -5050,7 +5074,7 @@
     break;
 
   case 263:
-#line 2432 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2432 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.PHIList) = (yyvsp[-6].PHIList);
     Value* tmpVal = getVal((yyvsp[-6].PHIList)->front().first->getType(), (yyvsp[-3].ValIDVal));
@@ -5062,7 +5086,7 @@
     break;
 
   case 264:
-#line 2442 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2442 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {    // Used for call statements, and memory insts...
     (yyval.ValueList) = new std::vector<Value*>();
     (yyval.ValueList)->push_back((yyvsp[0].ValueVal));
@@ -5070,7 +5094,7 @@
     break;
 
   case 265:
-#line 2446 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2446 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = (yyvsp[-2].ValueList);
     (yyvsp[-2].ValueList)->push_back((yyvsp[0].ValueVal));
@@ -5079,12 +5103,12 @@
     break;
 
   case 267:
-#line 2453 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2453 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueList) = 0; ;}
     break;
 
   case 268:
-#line 2455 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2455 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -5092,7 +5116,7 @@
     break;
 
   case 269:
-#line 2459 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2459 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -5100,7 +5124,7 @@
     break;
 
   case 270:
-#line 2464 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2464 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!(*(yyvsp[-3].TypeVal))->isInteger() && !(*(yyvsp[-3].TypeVal))->isFloatingPoint() && 
         !isa<PackedType>((*(yyvsp[-3].TypeVal)).get()))
@@ -5123,7 +5147,7 @@
     break;
 
   case 271:
-#line 2483 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2483 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!(*(yyvsp[-3].TypeVal))->isIntegral()) {
       if (!isa<PackedType>((yyvsp[-3].TypeVal)->get()) ||
@@ -5142,7 +5166,7 @@
     break;
 
   case 272:
-#line 2498 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2498 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if(isa<PackedType>((*(yyvsp[-3].TypeVal)).get())) {
       GEN_ERROR(
@@ -5160,7 +5184,7 @@
     break;
 
   case 273:
-#line 2512 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2512 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (isa<PackedType>((*(yyvsp[-3].TypeVal)).get()))
       GEN_ERROR("Packed types not supported by icmp instruction");
@@ -5175,7 +5199,7 @@
     break;
 
   case 274:
-#line 2523 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2523 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (isa<PackedType>((*(yyvsp[-3].TypeVal)).get()))
       GEN_ERROR("Packed types not supported by fcmp instruction");
@@ -5190,7 +5214,7 @@
     break;
 
   case 275:
-#line 2534 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2534 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     llvm_cerr << "WARNING: Use of eliminated 'not' instruction:"
               << " Replacing with 'xor'.\n";
@@ -5207,7 +5231,7 @@
     break;
 
   case 276:
-#line 2547 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2547 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].ValueVal)->getType() != Type::UByteTy)
       GEN_ERROR("Shift amount must be ubyte!");
@@ -5220,7 +5244,7 @@
     break;
 
   case 277:
-#line 2556 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2556 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     Value* Val = (yyvsp[-2].ValueVal);
     const Type* Ty = (yyvsp[0].TypeVal)->get();
@@ -5235,7 +5259,7 @@
     break;
 
   case 278:
-#line 2567 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2567 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-4].ValueVal)->getType() != Type::BoolTy)
       GEN_ERROR("select condition must be boolean!");
@@ -5247,7 +5271,7 @@
     break;
 
   case 279:
-#line 2575 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2575 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     NewVarArgs = true;
     (yyval.InstVal) = new VAArgInst((yyvsp[-2].ValueVal), *(yyvsp[0].TypeVal));
@@ -5257,7 +5281,7 @@
     break;
 
   case 280:
-#line 2581 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2581 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ObsoleteVarArgs = true;
     const Type* ArgTy = (yyvsp[-2].ValueVal)->getType();
@@ -5281,7 +5305,7 @@
     break;
 
   case 281:
-#line 2601 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2601 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ObsoleteVarArgs = true;
     const Type* ArgTy = (yyvsp[-2].ValueVal)->getType();
@@ -5308,7 +5332,7 @@
     break;
 
   case 282:
-#line 2624 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2624 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid extractelement operands!");
@@ -5318,7 +5342,7 @@
     break;
 
   case 283:
-#line 2630 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2630 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid insertelement operands!");
@@ -5328,7 +5352,7 @@
     break;
 
   case 284:
-#line 2636 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2636 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid shufflevector operands!");
@@ -5338,7 +5362,7 @@
     break;
 
   case 285:
-#line 2642 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2642 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[0].PHIList)->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -5357,7 +5381,7 @@
     break;
 
   case 286:
-#line 2657 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2657 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const PointerType *PFTy = 0;
     const FunctionType *Ty = 0;
@@ -5420,7 +5444,7 @@
     break;
 
   case 287:
-#line 2716 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2716 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = (yyvsp[0].InstVal);
     CHECK_FOR_ERROR
@@ -5428,7 +5452,7 @@
     break;
 
   case 288:
-#line 2723 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2723 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { 
     (yyval.ValueList) = (yyvsp[0].ValueList); 
     CHECK_FOR_ERROR
@@ -5436,7 +5460,7 @@
     break;
 
   case 289:
-#line 2726 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2726 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { 
     (yyval.ValueList) = new std::vector<Value*>(); 
     CHECK_FOR_ERROR
@@ -5444,7 +5468,7 @@
     break;
 
   case 290:
-#line 2731 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2731 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -5452,7 +5476,7 @@
     break;
 
   case 291:
-#line 2735 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2735 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -5460,7 +5484,7 @@
     break;
 
   case 292:
-#line 2742 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2742 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = new MallocInst(*(yyvsp[-1].TypeVal), 0, (yyvsp[0].UIntVal));
     delete (yyvsp[-1].TypeVal);
@@ -5469,7 +5493,7 @@
     break;
 
   case 293:
-#line 2747 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2747 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-2].PrimType), (yyvsp[-1].ValIDVal));
     CHECK_FOR_ERROR
@@ -5479,7 +5503,7 @@
     break;
 
   case 294:
-#line 2753 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2753 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = new AllocaInst(*(yyvsp[-1].TypeVal), 0, (yyvsp[0].UIntVal));
     delete (yyvsp[-1].TypeVal);
@@ -5488,7 +5512,7 @@
     break;
 
   case 295:
-#line 2758 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2758 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-2].PrimType), (yyvsp[-1].ValIDVal));
     CHECK_FOR_ERROR
@@ -5498,7 +5522,7 @@
     break;
 
   case 296:
-#line 2764 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2764 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[0].ValueVal)->getType()))
       GEN_ERROR("Trying to free nonpointer type " + 
@@ -5509,7 +5533,7 @@
     break;
 
   case 297:
-#line 2772 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2772 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[-1].TypeVal)->get()))
       GEN_ERROR("Can't load from nonpointer type: " +
@@ -5525,7 +5549,7 @@
     break;
 
   case 298:
-#line 2784 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2784 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const PointerType *PT = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
     if (!PT)
@@ -5544,7 +5568,7 @@
     break;
 
   case 299:
-#line 2799 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2799 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[-2].TypeVal)->get()))
       GEN_ERROR("getelementptr insn requires pointer operand!");
@@ -5576,7 +5600,7 @@
     }
 
 /* Line 1126 of yacc.c.  */
-#line 5580 "llvmAsmParser.tab.c"
+#line 5604 "llvmAsmParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -5844,7 +5868,7 @@
 }
 
 
-#line 2825 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 2825 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
 
 
 void llvm::GenerateError(const std::string &message, int LineNo) {


Index: llvm/lib/AsmParser/llvmAsmParser.h.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.25 llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.26
--- llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.25	Sun Dec  3 10:20:14 2006
+++ llvm/lib/AsmParser/llvmAsmParser.h.cvs	Sun Dec  3 23:24:24 2006
@@ -325,7 +325,7 @@
 
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 967 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y"
+#line 967 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
 typedef union YYSTYPE {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;


Index: llvm/lib/AsmParser/llvmAsmParser.y.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.32 llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.33
--- llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.32	Sun Dec  3 10:20:14 2006
+++ llvm/lib/AsmParser/llvmAsmParser.y.cvs	Sun Dec  3 23:24:24 2006
@@ -1127,7 +1127,7 @@
                UITOFP | SITOFP | FPTOUI | FPTOSI | INTTOPTR | PTRTOINT;
 ShiftOps     : SHL | LSHR | ASHR;
 IPredicates  
-  : EQ   { $$ = ICmpInst::ICMP_EQ; } | NE   { $$ = ICmpInst::ICMP_NE; }
+  : EQ   { $$ = ICmpInst::ICMP_EQ; }  | NE   { $$ = ICmpInst::ICMP_NE; }
   | SLT  { $$ = ICmpInst::ICMP_SLT; } | SGT  { $$ = ICmpInst::ICMP_SGT; }
   | SLE  { $$ = ICmpInst::ICMP_SLE; } | SGE  { $$ = ICmpInst::ICMP_SGE; }
   | ULT  { $$ = ICmpInst::ICMP_ULT; } | UGT  { $$ = ICmpInst::ICMP_UGT; }
@@ -1706,15 +1706,15 @@
     $$ = ConstantExpr::get($1, $3, $5);
     CHECK_FOR_ERROR
   }
-  | ICMP '(' IPredicates ',' ConstVal ',' ConstVal ')' {
-    if ($5->getType() != $7->getType())
+  | ICMP IPredicates '(' ConstVal ',' ConstVal ')' {
+    if ($4->getType() != $6->getType())
       GEN_ERROR("icmp operand types must match!");
-    $$ = ConstantExpr::getICmp($3, $5, $7);
+    $$ = ConstantExpr::getICmp($2, $4, $6);
   }
-  | FCMP '(' FPredicates ',' ConstVal ',' ConstVal ')' {
-    if ($5->getType() != $7->getType())
+  | FCMP FPredicates '(' ConstVal ',' ConstVal ')' {
+    if ($4->getType() != $6->getType())
       GEN_ERROR("fcmp operand types must match!");
-    $$ = ConstantExpr::getFCmp($3, $5, $7);
+    $$ = ConstantExpr::getFCmp($2, $4, $6);
   }
   | ShiftOps '(' ConstVal ',' ConstVal ')' {
     if ($5->getType() != Type::UByteTy)






More information about the llvm-commits mailing list