diff --git a/llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs b/llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs
index 305a3ae..68a8423 100644
--- a/llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs
+++ b/llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs
@@ -64,30 +64,30 @@
    /* Put the tokens into the symbol table, so that GDB and other debuggers
       know about them.  */
    enum yytokentype {
-     ESINT64VAL = 258,
-     EUINT64VAL = 259,
-     SINTVAL = 260,
-     UINTVAL = 261,
-     FPVAL = 262,
-     TRUETOK = 263,
-     FALSETOK = 264,
-     NULL_TOK = 265,
-     UNDEF = 266,
-     ZEROINITIALIZER = 267,
-     VOID = 268,
-     BOOL = 269,
-     SBYTE = 270,
-     UBYTE = 271,
-     SHORT = 272,
-     USHORT = 273,
-     INT = 274,
-     UINT = 275,
-     LONG = 276,
-     ULONG = 277,
-     FLOAT = 278,
-     DOUBLE = 279,
-     LABEL = 280,
-     OPAQUE = 281,
+     VOID = 258,
+     BOOL = 259,
+     SBYTE = 260,
+     UBYTE = 261,
+     SHORT = 262,
+     USHORT = 263,
+     INT = 264,
+     UINT = 265,
+     LONG = 266,
+     ULONG = 267,
+     FLOAT = 268,
+     DOUBLE = 269,
+     LABEL = 270,
+     OPAQUE = 271,
+     ESINT64VAL = 272,
+     EUINT64VAL = 273,
+     SINTVAL = 274,
+     UINTVAL = 275,
+     FPVAL = 276,
+     NULL_TOK = 277,
+     UNDEF = 278,
+     ZEROINITIALIZER = 279,
+     TRUETOK = 280,
+     FALSETOK = 281,
      TYPE = 282,
      VAR_ID = 283,
      LABELSTR = 284,
@@ -176,30 +176,30 @@
    };
 #endif
 /* Tokens.  */
-#define ESINT64VAL 258
-#define EUINT64VAL 259
-#define SINTVAL 260
-#define UINTVAL 261
-#define FPVAL 262
-#define TRUETOK 263
-#define FALSETOK 264
-#define NULL_TOK 265
-#define UNDEF 266
-#define ZEROINITIALIZER 267
-#define VOID 268
-#define BOOL 269
-#define SBYTE 270
-#define UBYTE 271
-#define SHORT 272
-#define USHORT 273
-#define INT 274
-#define UINT 275
-#define LONG 276
-#define ULONG 277
-#define FLOAT 278
-#define DOUBLE 279
-#define LABEL 280
-#define OPAQUE 281
+#define VOID 258
+#define BOOL 259
+#define SBYTE 260
+#define UBYTE 261
+#define SHORT 262
+#define USHORT 263
+#define INT 264
+#define UINT 265
+#define LONG 266
+#define ULONG 267
+#define FLOAT 268
+#define DOUBLE 269
+#define LABEL 270
+#define OPAQUE 271
+#define ESINT64VAL 272
+#define EUINT64VAL 273
+#define SINTVAL 274
+#define UINTVAL 275
+#define FPVAL 276
+#define NULL_TOK 277
+#define UNDEF 278
+#define ZEROINITIALIZER 279
+#define TRUETOK 280
+#define FALSETOK 281
 #define TYPE 282
 #define VAR_ID 283
 #define LABELSTR 284
@@ -595,7 +595,7 @@
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  4
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1150
+#define YYLAST   1142
 
 /* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS  126
@@ -690,34 +690,34 @@
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
 static const short int yyrhs[] =
 {
-     157,     0,    -1,     5,    -1,     6,    -1,     3,    -1,     4,
+     157,     0,    -1,    19,    -1,    20,    -1,    17,    -1,    18,
       -1,    78,    -1,    79,    -1,    80,    -1,    81,    -1,    82,
       -1,    83,    -1,    84,    -1,    85,    -1,    86,    -1,    87,
       -1,    88,    -1,    89,    -1,    90,    -1,    91,    -1,    92,
       -1,    93,    -1,    94,    -1,    95,    -1,   104,    -1,   105,
-      -1,   106,    -1,    21,    -1,    19,    -1,    17,    -1,    15,
-      -1,    22,    -1,    20,    -1,    18,    -1,    16,    -1,   133,
-      -1,   134,    -1,    23,    -1,    24,    -1,   165,   112,    -1,
+      -1,   106,    -1,    11,    -1,     9,    -1,     7,    -1,     5,
+      -1,    12,    -1,    10,    -1,     8,    -1,     6,    -1,   133,
+      -1,   134,    -1,    13,    -1,    14,    -1,   165,   112,    -1,
       -1,    42,    -1,    43,    -1,    44,    -1,    48,    -1,    45,
       -1,    46,    -1,    47,    -1,    -1,    65,    -1,    66,    -1,
-      67,    -1,    68,    -1,    69,    -1,    70,    -1,    64,     4,
-      -1,    -1,    -1,    57,     4,    -1,    -1,   113,    57,     4,
+      67,    -1,    68,    -1,    69,    -1,    70,    -1,    64,    18,
+      -1,    -1,    -1,    57,    18,    -1,    -1,   113,    57,    18,
       -1,    37,    30,    -1,    -1,   142,    -1,    -1,   113,   145,
-     144,    -1,   142,    -1,    57,     4,    -1,   148,    -1,    13,
-      -1,   150,    -1,    13,    -1,   150,    -1,    14,    -1,    15,
-      -1,    16,    -1,    17,    -1,    18,    -1,    19,    -1,    20,
-      -1,    21,    -1,    22,    -1,    23,    -1,    24,    -1,    25,
-      -1,    26,    -1,   149,    -1,   179,    -1,   114,     4,    -1,
-     147,   115,   152,   116,    -1,   117,     4,   118,   150,   119,
-      -1,   120,     4,   118,   150,   121,    -1,   122,   151,   123,
+     144,    -1,   142,    -1,    57,    18,    -1,   148,    -1,     3,
+      -1,   150,    -1,     3,    -1,   150,    -1,     4,    -1,     5,
+      -1,     6,    -1,     7,    -1,     8,    -1,     9,    -1,    10,
+      -1,    11,    -1,    12,    -1,    13,    -1,    14,    -1,    15,
+      -1,    16,    -1,   149,    -1,   179,    -1,   114,    18,    -1,
+     147,   115,   152,   116,    -1,   117,    18,   118,   150,   119,
+      -1,   120,    18,   118,   150,   121,    -1,   122,   151,   123,
       -1,   122,   123,    -1,   150,   124,    -1,   150,    -1,   151,
      113,   150,    -1,   151,    -1,   151,   113,    40,    -1,    40,
       -1,    -1,   148,   117,   155,   119,    -1,   148,   117,   119,
       -1,   148,   125,    30,    -1,   148,   120,   155,   121,    -1,
      148,   122,   155,   123,    -1,   148,   122,   123,    -1,   148,
-      10,    -1,   148,    11,    -1,   148,   179,    -1,   148,   154,
-      -1,   148,    12,    -1,   133,   128,    -1,   134,     4,    -1,
-      14,     8,    -1,    14,     9,    -1,   136,     7,    -1,   111,
+      22,    -1,   148,    23,    -1,   148,   179,    -1,   148,   154,
+      -1,   148,    24,    -1,   133,   128,    -1,   134,    18,    -1,
+       4,    25,    -1,     4,    26,    -1,   136,    21,    -1,   111,
      115,   153,    39,   148,   116,    -1,   101,   115,   153,   193,
      116,    -1,   103,   115,   153,   113,   153,   113,   153,   116,
       -1,   129,   115,   153,   113,   153,   116,    -1,   130,   115,
@@ -734,7 +734,7 @@
      137,    45,   156,   148,   144,    -1,   159,   137,    47,   156,
      148,   144,    -1,   159,    51,   162,    -1,   159,    58,   112,
      163,    -1,    -1,    30,    -1,    56,    -1,    55,    -1,    53,
-     112,   161,    -1,    54,   112,     4,    -1,    52,   112,    30,
+     112,   161,    -1,    54,   112,    18,    -1,    52,   112,    30,
       -1,    71,   112,    30,    -1,   117,   164,   119,    -1,   164,
      113,    30,    -1,    30,    -1,    -1,    28,    -1,    30,    -1,
      165,    -1,    -1,   148,   166,    -1,   168,   113,   167,    -1,
@@ -742,19 +742,19 @@
       -1,   139,   146,   165,   115,   169,   116,   143,   140,    -1,
       32,    -1,   122,    -1,   138,   170,   171,    -1,    33,    -1,
      123,    -1,   172,   182,   173,    -1,    -1,    45,    -1,    47,
-      -1,    34,   175,   170,    -1,    -1,    63,    -1,     3,    -1,
-       4,    -1,     7,    -1,     8,    -1,     9,    -1,    10,    -1,
-      11,    -1,    12,    -1,   120,   155,   121,    -1,   154,    -1,
+      -1,    34,   175,   170,    -1,    -1,    63,    -1,    17,    -1,
+      18,    -1,    21,    -1,    25,    -1,    26,    -1,    22,    -1,
+      23,    -1,    24,    -1,   120,   155,   121,    -1,   154,    -1,
       61,   177,    30,   113,    30,    -1,   127,    -1,   165,    -1,
      179,    -1,   178,    -1,   148,   180,    -1,   182,   183,    -1,
      183,    -1,   184,   185,    -1,   184,   187,    -1,    -1,    29,
-      -1,    72,   181,    -1,    72,    13,    -1,    73,    25,   180,
-      -1,    73,    14,   180,   113,    25,   180,   113,    25,   180,
-      -1,    74,   135,   180,   113,    25,   180,   117,   186,   119,
-      -1,    74,   135,   180,   113,    25,   180,   117,   119,    -1,
-     137,    75,   139,   146,   180,   115,   190,   116,    39,    25,
-     180,    76,    25,   180,    -1,    76,    -1,    77,    -1,   186,
-     135,   178,   113,    25,   180,    -1,   135,   178,   113,    25,
+      -1,    72,   181,    -1,    72,     3,    -1,    73,    15,   180,
+      -1,    73,     4,   180,   113,    15,   180,   113,    15,   180,
+      -1,    74,   135,   180,   113,    15,   180,   117,   186,   119,
+      -1,    74,   135,   180,   113,    15,   180,   117,   119,    -1,
+     137,    75,   139,   146,   180,   115,   190,   116,    39,    15,
+     180,    76,    15,   180,    -1,    76,    -1,    77,    -1,   186,
+     135,   178,   113,    15,   180,    -1,   135,   178,   113,    15,
      180,    -1,   137,   192,    -1,   148,   117,   180,   113,   180,
      119,    -1,   188,   113,   117,   180,   113,   180,   119,    -1,
      181,    -1,   189,   113,   181,    -1,   189,    -1,    -1,    60,
@@ -767,8 +767,8 @@
      181,   113,   181,   113,   181,    -1,   102,   188,    -1,   191,
      139,   146,   180,   115,   190,   116,    -1,   195,    -1,   113,
      189,    -1,    -1,    38,    -1,    -1,    96,   148,   141,    -1,
-      96,   148,   113,    20,   180,   141,    -1,    97,   148,   141,
-      -1,    97,   148,   113,    20,   180,   141,    -1,    98,   181,
+      96,   148,   113,    10,   180,   141,    -1,    97,   148,   141,
+      -1,    97,   148,   113,    10,   180,   141,    -1,    98,   181,
       -1,   194,    99,   148,   180,    -1,   194,   100,   181,   113,
      148,   180,    -1,   101,   148,   180,   193,    -1
 };
@@ -776,31 +776,31 @@
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
-       0,   189,   189,   189,   190,   190,   194,   194,   194,   194,
-     194,   194,   194,   194,   194,   195,   195,   195,   196,   196,
-     196,   196,   196,   196,   197,   197,   197,   201,   201,   201,
-     201,   202,   202,   202,   202,   203,   203,   204,   204,   207,
-     211,   216,   216,   216,   216,   216,   216,   217,   218,   221,
-     221,   221,   221,   221,   222,   223,   228,   233,   234,   237,
-     238,   246,   252,   253,   256,   257,   266,   267,   280,   280,
-     281,   281,   282,   286,   286,   286,   286,   286,   286,   286,
-     287,   287,   287,   287,   287,   288,   288,   289,   295,   300,
-     306,   313,   320,   326,   330,   340,   343,   351,   352,   357,
-     360,   370,   376,   381,   387,   393,   399,   404,   410,   416,
-     422,   428,   434,   440,   446,   452,   458,   466,   473,   479,
-     484,   489,   494,   499,   504,   509,   514,   524,   529,   534,
-     534,   544,   549,   552,   557,   561,   565,   568,   573,   578,
-     583,   589,   595,   601,   607,   612,   617,   622,   624,   624,
-     627,   632,   639,   644,   651,   658,   663,   664,   672,   672,
-     673,   673,   675,   682,   686,   690,   693,   698,   701,   703,
-     723,   726,   730,   739,   740,   742,   750,   751,   752,   756,
-     769,   770,   773,   774,   775,   776,   777,   778,   779,   780,
-     781,   786,   787,   796,   796,   799,   799,   805,   812,   814,
-     821,   825,   830,   833,   839,   844,   849,   854,   861,   867,
-     873,   886,   891,   897,   902,   910,   917,   923,   931,   932,
-     940,   941,   945,   950,   953,   958,   963,   968,   973,   978,
-     985,   990,   995,  1000,  1005,  1010,  1015,  1024,  1029,  1033,
-    1037,  1038,  1041,  1048,  1055,  1062,  1069,  1074,  1081,  1088
+       0,   188,   188,   188,   189,   189,   193,   193,   193,   193,
+     193,   193,   193,   193,   193,   194,   194,   194,   195,   195,
+     195,   195,   195,   195,   196,   196,   196,   200,   200,   200,
+     200,   201,   201,   201,   201,   202,   202,   203,   203,   206,
+     210,   215,   215,   215,   215,   215,   215,   216,   217,   220,
+     220,   220,   220,   220,   221,   222,   227,   232,   233,   236,
+     237,   245,   251,   252,   255,   256,   265,   266,   279,   279,
+     280,   280,   281,   285,   285,   285,   285,   285,   285,   285,
+     286,   286,   286,   286,   286,   287,   287,   288,   294,   299,
+     305,   312,   319,   325,   329,   339,   342,   350,   351,   356,
+     359,   369,   375,   380,   386,   392,   398,   403,   409,   415,
+     421,   427,   433,   439,   445,   451,   457,   465,   472,   478,
+     483,   488,   493,   498,   503,   508,   513,   523,   528,   533,
+     533,   543,   548,   551,   556,   560,   564,   567,   572,   577,
+     582,   588,   594,   600,   606,   611,   616,   621,   623,   623,
+     626,   631,   638,   643,   650,   657,   662,   663,   671,   671,
+     672,   672,   674,   681,   685,   689,   692,   697,   700,   702,
+     722,   725,   729,   738,   739,   741,   749,   750,   751,   755,
+     768,   769,   772,   772,   772,   772,   772,   772,   772,   773,
+     774,   779,   780,   789,   789,   792,   792,   798,   805,   808,
+     816,   820,   825,   828,   834,   839,   844,   849,   856,   862,
+     868,   881,   886,   892,   897,   905,   912,   918,   926,   927,
+     935,   936,   940,   945,   948,   953,   958,   963,   968,   973,
+     980,   985,   990,   995,  1000,  1005,  1010,  1019,  1024,  1028,
+    1032,  1033,  1036,  1043,  1050,  1057,  1064,  1069,  1076,  1083
 };
 #endif
 
@@ -809,10 +809,10 @@
    First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {
-  "$end", "error", "$undefined", "ESINT64VAL", "EUINT64VAL", "SINTVAL",
-  "UINTVAL", "FPVAL", "TRUETOK", "FALSETOK", "NULL_TOK", "UNDEF",
-  "ZEROINITIALIZER", "VOID", "BOOL", "SBYTE", "UBYTE", "SHORT", "USHORT",
-  "INT", "UINT", "LONG", "ULONG", "FLOAT", "DOUBLE", "LABEL", "OPAQUE",
+  "$end", "error", "$undefined", "VOID", "BOOL", "SBYTE", "UBYTE",
+  "SHORT", "USHORT", "INT", "UINT", "LONG", "ULONG", "FLOAT", "DOUBLE",
+  "LABEL", "OPAQUE", "ESINT64VAL", "EUINT64VAL", "SINTVAL", "UINTVAL",
+  "FPVAL", "NULL_TOK", "UNDEF", "ZEROINITIALIZER", "TRUETOK", "FALSETOK",
   "TYPE", "VAR_ID", "LABELSTR", "STRINGCONSTANT", "IMPLEMENTATION",
   "BEGINTOK", "ENDTOK", "DECLARE", "GLOBAL", "CONSTANT", "SECTION",
   "VOLATILE", "TO", "DOTDOTDOT", "CONST", "INTERNAL", "LINKONCE", "WEAK",
@@ -937,8 +937,8 @@
        0,     0,    49,    50,    51,    52,    53,    54,     0,     0,
      203,   202,   199,    40,     0,     0,     0,     0,   144,     0,
        0,     0,     0,     0,     0,     0,    39,   179,   147,   134,
-      55,     2,     3,    69,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,     0,     0,     0,
+      55,    69,    73,    74,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,     2,     3,     0,     0,     0,
        0,   193,     0,     0,    68,    86,    72,   194,    87,   170,
      171,   172,   173,   174,   175,   198,     0,     0,     0,   211,
      212,   241,   200,   201,     0,     0,     0,     0,   157,   145,
@@ -953,8 +953,8 @@
      149,   148,   150,   151,   153,   156,     0,    64,    64,    64,
       73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
       83,     0,     0,     0,     0,    64,     0,     0,     0,    92,
-     168,    99,    97,     0,   182,   183,   184,   185,   186,   187,
-     188,   189,   180,     0,     0,     0,     0,     0,     0,     0,
+     168,    99,    97,     0,   182,   183,   184,   187,   188,   189,
+     185,   186,   180,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,   191,   196,   195,   197,     0,   206,
        0,   227,   222,     0,    59,    59,   246,     0,     0,   235,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -998,72 +998,72 @@
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -439
+#define YYPACT_NINF -442
 static const short int yypact[] =
 {
-    -439,    63,    22,   577,  -439,  -439,     2,  -439,  -439,  -439,
-    -439,  -439,  -439,  -439,    37,   188,    72,  -439,  -439,  -439,
-    -439,    21,    -8,    45,   150,     9,  -439,  -439,  -439,   188,
-      94,   132,  -439,  -439,  -439,  -439,  -439,  -439,   883,   -27,
-    -439,   -23,  -439,    14,    41,    50,    56,    57,  -439,    53,
-      94,   883,    74,    74,    74,    74,  -439,  -439,  -439,  -439,
-    -439,  -439,  -439,    59,  -439,  -439,  -439,  -439,  -439,  -439,
-    -439,  -439,  -439,  -439,  -439,  -439,  -439,   168,   171,   174,
-     457,  -439,    66,    65,  -439,  -439,   -53,  -439,  -439,  -439,
-    -439,  -439,  -439,  -439,  -439,  -439,   935,    34,   224,  -439,
-    -439,  1039,  -439,  -439,   151,    64,   184,   159,   160,  -439,
-    -439,  -439,  -439,  -439,   965,   965,   965,   993,  -439,    81,
-      83,  -439,  -439,   -53,   -72,    87,   742,  -439,    59,   588,
-    -439,   588,   588,  -439,  -439,  -439,  -439,  -439,  -439,  -439,
-    -439,  -439,  -439,   588,  -439,   965,  -439,   158,   188,  -439,
-    -439,  -439,  -439,  -439,  -439,  -439,  -439,  -439,  -439,  -439,
-    -439,  -439,  -439,  -439,  -439,  -439,  -439,   965,   965,   965,
-     965,   965,   965,  -439,  -439,  -439,   965,   965,   965,   965,
-     965,   965,   965,   965,   965,   188,  -439,    23,  -439,  -439,
-    -439,  -439,  -439,  -439,  -439,  -439,   -34,    97,    97,    97,
-     119,   147,   212,   152,   214,   155,   216,   157,   217,   215,
-     220,   163,   219,   221,   429,    97,   965,   965,   965,  -439,
-     770,  -439,   111,   113,  -439,  -439,  -439,  -439,  -439,  -439,
-    -439,  -439,   167,   116,   121,   133,   134,   135,   144,   993,
-     149,   153,   154,   162,  -439,  -439,  -439,  -439,   165,  -439,
-     169,  -439,  -439,   883,   170,   172,  -439,   588,   130,   173,
-     177,   178,   185,   186,   189,   226,   588,   588,   588,   190,
-     883,   965,   965,   236,  -439,    -7,  -439,  -439,  -439,  -439,
-    -439,  -439,  -439,  -439,  -439,  -439,  -439,  -439,  -439,   798,
-     993,   542,   237,  -439,  -439,  -439,   -22,   -16,   -53,  -439,
-      66,  -439,   195,   193,   825,  -439,  -439,   240,   993,   993,
-     993,   993,   993,   993,  -439,   -41,   993,   993,   993,   993,
-     248,   250,   588,     3,  -439,     4,  -439,   201,   588,   164,
-     965,   965,   965,   965,   965,   965,   202,   204,   205,   965,
-     588,   588,   206,  -439,   254,   317,  -439,    97,  -439,   -20,
-     -32,  -439,   -68,  -439,  -439,  -439,  -439,  -439,   855,   286,
-    -439,   213,   201,   218,   223,   225,   230,   288,   993,  -439,
-     231,   232,   234,   235,   588,   588,   210,   588,   324,   588,
-     965,  -439,   238,   588,   239,  -439,  -439,   244,   246,  -439,
-     588,   588,   588,  -439,   245,  -439,   965,  -439,  -439,  -439,
-    -439,  -439,  -439,  -439,  -439,  -439,   272,   300,   233,   993,
-     993,   993,   993,   965,  -439,   993,   993,   993,   993,   249,
-     253,   965,   252,  -439,   252,  -439,   261,   588,   263,   965,
-     965,   965,  -439,  -439,  -439,   965,   588,   328,  -439,  -439,
-    -439,   265,   251,   266,   267,   271,   273,   274,   278,   282,
-     325,    -1,   261,   283,   296,  -439,  -439,   965,   247,   588,
-    -439,  -439,  -439,   285,  -439,  -439,   993,  -439,   993,   993,
-    -439,  -439,  -439,  -439,  -439,   588,  -439,   634,    16,   349,
-    -439,  -439,   287,  -439,   289,   291,   292,  -439,   297,  -439,
-     634,   377,  -439,  -439,  -439,  -439,   379,   298,   588,   588,
-     384,   336,  -439,   588,   388,  -439,   588,  -439
+    -442,    61,   222,   381,  -442,  -442,   106,  -442,  -442,  -442,
+    -442,  -442,  -442,  -442,   -25,   283,    43,  -442,  -442,  -442,
+    -442,    10,   -14,    40,   197,     4,  -442,  -442,  -442,   283,
+      79,   101,  -442,  -442,  -442,  -442,  -442,  -442,   685,   -10,
+    -442,    -2,  -442,    41,    15,    38,    48,    50,  -442,    53,
+      79,   685,    44,    44,    44,    44,  -442,  -442,  -442,  -442,
+    -442,    57,  -442,  -442,  -442,  -442,  -442,  -442,  -442,  -442,
+    -442,  -442,  -442,  -442,  -442,  -442,  -442,   172,   174,   175,
+     468,  -442,   131,    81,  -442,  -442,   -85,  -442,  -442,  -442,
+    -442,  -442,  -442,  -442,  -442,  -442,   714,    20,   320,  -442,
+    -442,  1031,  -442,  -442,   165,   100,   180,   169,   186,  -442,
+    -442,  -442,  -442,  -442,   743,   743,   743,   773,  -442,    83,
+      92,  -442,  -442,   -85,   -57,   102,    80,  -442,    57,   927,
+    -442,   927,   927,  -442,  -442,  -442,  -442,  -442,  -442,  -442,
+    -442,  -442,  -442,   927,  -442,   743,  -442,   159,   283,  -442,
+    -442,  -442,  -442,  -442,  -442,  -442,  -442,  -442,  -442,  -442,
+    -442,  -442,  -442,  -442,  -442,  -442,  -442,   743,   743,   743,
+     743,   743,   743,  -442,  -442,  -442,   743,   743,   743,   743,
+     743,   743,   743,   743,   743,   283,  -442,    36,  -442,  -442,
+    -442,  -442,  -442,  -442,  -442,  -442,   -81,   107,   107,   107,
+     141,   151,   203,   157,   205,   160,   209,   163,   210,   208,
+     215,   171,   212,   225,   818,   107,   743,   743,   743,  -442,
+     526,  -442,   118,   132,  -442,  -442,  -442,  -442,  -442,  -442,
+    -442,  -442,   187,   134,   137,   139,   140,   142,   143,   773,
+     144,   158,   162,   166,  -442,  -442,  -442,  -442,   170,  -442,
+     173,  -442,  -442,   685,   177,   178,  -442,   927,   161,   185,
+     189,   190,   195,   196,   201,   236,   927,   927,   927,   202,
+     685,   743,   743,   252,  -442,    -3,  -442,  -442,  -442,  -442,
+    -442,  -442,  -442,  -442,  -442,  -442,  -442,  -442,  -442,   564,
+     773,   498,   255,  -442,  -442,  -442,   -22,   -51,   -85,  -442,
+     131,  -442,   204,   183,   594,  -442,  -442,   288,   773,   773,
+     773,   773,   773,   773,  -442,   -80,   773,   773,   773,   773,
+     304,   306,   927,    -5,  -442,    -4,  -442,   223,   927,   206,
+     743,   743,   743,   743,   743,   743,   230,   231,   232,   743,
+     927,   927,   244,  -442,   308,   341,  -442,   107,  -442,   -45,
+     -54,  -442,   -48,  -442,  -442,  -442,  -442,  -442,   647,   323,
+    -442,   249,   223,   253,   254,   257,   261,   326,   773,  -442,
+     263,   265,   266,   267,   927,   927,   272,   927,   370,   927,
+     743,  -442,   276,   927,   277,  -442,  -442,   281,   285,  -442,
+     927,   927,   927,  -442,   284,  -442,   743,  -442,  -442,  -442,
+    -442,  -442,  -442,  -442,  -442,  -442,   344,   372,   289,   773,
+     773,   773,   773,   743,  -442,   773,   773,   773,   773,   291,
+     290,   743,   293,  -442,   293,  -442,   297,   927,   299,   743,
+     743,   743,  -442,  -442,  -442,   743,   927,   395,  -442,  -442,
+    -442,   301,   302,   307,   309,   317,   318,   319,   324,   325,
+     427,     9,   297,   328,   388,  -442,  -442,   743,   327,   927,
+    -442,  -442,  -442,   331,  -442,  -442,   773,  -442,   773,   773,
+    -442,  -442,  -442,  -442,  -442,   927,  -442,   973,    39,   409,
+    -442,  -442,   330,  -442,   334,   335,   336,  -442,   342,  -442,
+     973,   439,  -442,  -442,  -442,  -442,   441,   345,   927,   927,
+     442,   383,  -442,   927,   445,  -442,   927,  -442
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -439,  -439,  -439,   313,   314,   315,   316,   -97,   -96,  -424,
-    -439,   375,   396,  -102,  -439,  -251,    67,  -439,  -190,  -439,
-     -44,  -439,   -38,  -439,   -69,   299,  -439,  -105,   208,  -177,
-      62,  -439,  -439,  -439,   373,  -439,  -439,  -439,  -439,     0,
-    -439,    69,  -439,  -439,   395,  -439,  -439,  -439,  -439,  -439,
-     425,  -439,  -438,  -103,    -6,     7,  -439,   390,  -439,  -439,
-    -439,  -439,  -439,    49,    -3,  -439,  -439,    71,  -439,  -439
+    -442,  -442,  -442,   360,   361,   362,   364,   -97,   -96,  -441,
+    -442,   423,   443,  -125,  -442,  -251,   109,  -442,  -190,  -442,
+     -44,  -442,   -38,  -442,   -69,   359,  -442,  -105,   256,  -185,
+      69,  -442,  -442,  -442,   436,  -442,  -442,  -442,  -442,     0,
+    -442,   133,  -442,  -442,   460,  -442,  -442,  -442,  -442,  -442,
+     487,  -442,  -435,  -103,    -6,     7,  -442,   453,  -442,  -442,
+    -442,  -442,  -442,   115,    64,  -442,  -442,   153,  -442,  -442
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -1073,242 +1073,240 @@
 #define YYTABLE_NINF -132
 static const short int yytable[] =
 {
-      84,   141,   142,    25,   326,    89,    40,   111,   277,   278,
-      92,   123,   215,    84,   133,   134,   135,   136,   137,   138,
-     139,   140,  -131,   377,   379,   295,   246,   477,   246,   246,
-     344,   133,   134,   135,   136,   137,   138,   139,   140,   488,
-     246,   218,    19,    25,    20,   368,   253,    27,   131,    28,
-     345,   219,   497,     5,   490,   402,     6,   123,   129,   132,
-     378,   378,   -70,     4,     7,     8,     9,    10,    11,    12,
-      13,   127,   368,    44,    45,    46,   197,   198,   199,   273,
-     369,   368,   125,   270,    14,   274,    96,    97,    98,   401,
-      99,   100,    47,   368,    19,    90,    20,   354,    30,   400,
-      93,    40,   127,   130,    49,   355,    50,   129,   127,   112,
-     113,   294,   349,   350,   352,   115,   116,   117,   476,   190,
-     191,    56,   271,   272,    58,   248,   249,   279,   280,   254,
-     255,   129,   257,   258,   129,   489,    60,   250,   129,   129,
+      84,   141,   142,    25,   326,   377,   379,   111,   277,   278,
+     477,   123,   215,    84,   133,   134,   135,   136,   137,   138,
+     139,   140,    89,   253,   131,   295,   246,    40,   246,   246,
+     -70,    92,   273,   368,   344,   132,    30,   490,   274,   127,
+     246,   369,   488,    25,   133,   134,   135,   136,   137,   138,
+     139,   140,   378,   378,   345,   497,   218,   123,   129,   368,
+     270,     4,    44,    45,    46,   368,   219,   401,   368,    19,
+     355,    20,    40,   127,   400,   402,   197,   198,   199,   112,
+     113,    47,   125,   121,    62,    63,    64,    65,    66,    67,
+      68,    69,    70,    71,    72,    73,    74,   354,    49,    75,
+      76,    50,   127,   130,   349,   350,   352,   129,    19,    58,
+      20,   294,    90,    96,    97,    98,    56,    99,   100,    60,
+     221,    93,   115,   116,   117,   248,   249,   104,   476,   254,
+     255,   129,   257,   258,   129,   271,   272,   250,   129,   129,
      129,   129,   129,   266,   267,   268,   129,   296,   297,   298,
-     -30,   -30,   251,   104,   246,   -29,   -29,   399,   -28,   -28,
-     -27,   -27,   105,   246,   246,   246,   281,   282,   106,   107,
-     108,   455,   118,   456,   -71,   119,   256,    51,   120,   260,
-     126,   189,   300,   261,   262,   263,   264,   265,   193,   194,
-     195,   269,     7,     8,     9,    52,    11,    53,    13,   216,
-      54,   217,   220,   362,   363,   364,   365,   366,   367,   322,
-     275,   370,   371,   372,   373,    84,   -34,   252,   -33,   246,
-     -32,   -31,   -37,   284,   304,   246,   340,   -38,   285,   305,
-     306,   308,    84,   341,   129,   298,   309,   246,   246,   133,
-     134,   135,   136,   137,   138,   139,   140,   328,   310,   311,
-     312,   327,    31,    32,    33,    34,    35,    36,    37,   313,
-     336,   337,   338,   414,   316,   335,   343,   353,   317,   318,
-     361,   246,   246,   374,   246,   375,   246,   319,   320,   342,
-     246,   383,   321,   323,   397,   325,   329,   246,   246,   246,
-     330,   331,   129,   385,   129,   129,   129,   389,   332,   333,
-     356,   129,   334,   339,   441,   442,   443,   444,   358,   359,
-     446,   447,   448,   449,   380,   390,   376,   391,   392,   396,
-     300,   398,   382,   344,   246,   421,   407,   413,   423,   437,
-     439,   409,   465,   246,   394,   395,   410,   384,   411,   386,
-     387,   388,   129,   412,   415,   416,   393,   417,   418,   440,
-     475,   427,   429,   378,   141,   142,   246,   430,   436,   431,
-     435,   484,   450,   485,   486,   454,   481,   467,   419,   420,
-     451,   422,   246,   424,   457,   445,   459,   428,   466,   468,
-     469,   141,   142,   129,   432,   433,   434,   470,   491,   471,
-     472,   129,   129,   129,   473,   246,   246,   129,   474,   479,
-     246,   483,   498,   246,   499,   493,   492,   494,   495,   503,
-     496,   500,   504,   506,   181,   182,   183,   184,   101,   129,
-      55,   458,   293,   110,    57,   222,   405,   404,    26,   426,
-     464,    95,   463,   408,    61,    62,   460,   461,   462,   286,
-     287,   288,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   482,     0,     0,     0,    19,     0,    20,
-       0,     0,    61,    62,   480,     0,     0,     0,     0,   487,
-     121,    64,    65,    66,    67,    68,    69,    70,    71,    72,
-      73,    74,    75,    76,     0,    19,     0,    20,     0,     0,
-       0,     0,   501,   502,     0,     0,     0,   505,     0,     0,
-     507,     0,     0,     0,     0,     0,     0,   149,   150,   151,
-     152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
-     162,   163,   164,   165,   166,     0,     0,     0,     0,     0,
-     233,     0,   234,   173,   174,   175,     0,   235,   236,   237,
-     238,     0,     0,     0,     0,     0,   289,    61,    62,   290,
-       0,   291,     0,     0,   292,   121,   200,   201,   202,   203,
-     204,   205,   206,   207,   208,   209,   210,    75,    76,     0,
-      19,    77,    20,     0,    78,     0,     0,    79,     0,    80,
-     122,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   224,   225,    61,    62,   226,   227,   228,   229,   230,
-     231,     0,     0,     0,   -40,    19,     0,    20,     0,     0,
-       0,     6,   -40,   -40,     0,     0,    19,     0,    20,   -40,
-     -40,   -40,   -40,   -40,   -40,   -40,     0,   -40,    21,     0,
-       0,     0,     0,     0,     0,    22,     0,   224,   225,    23,
-       0,   226,   227,   228,   229,   230,   231,     0,     0,   232,
-       0,     0,     0,     0,     0,     0,    77,     0,     0,    78,
-       0,     0,    79,     0,    80,   351,   149,   150,   151,   152,
+     105,    27,   251,    28,   246,   190,   191,   399,   489,    19,
+     106,    20,   107,   246,   246,   246,   279,   280,   -30,   -30,
+     108,   455,   -71,   456,   -29,   -29,   256,   -28,   -28,   260,
+     -27,   -27,   300,   261,   262,   263,   264,   265,   281,   282,
+     118,   269,   119,   120,    77,   189,   126,    78,   193,   194,
+      79,   216,    80,   362,   363,   364,   365,   366,   367,   322,
+     217,   370,   371,   372,   373,    84,   195,   220,   252,   246,
+     275,   -34,  -131,   -33,    51,   246,   340,   -32,   -31,   -37,
+     284,   304,    84,   341,   129,   298,   -38,   246,   246,     7,
+       8,     9,    52,    11,    53,    13,   285,    54,   305,   308,
+     306,   327,   309,     5,   310,   311,     6,   312,   313,   316,
+     336,   337,   338,   414,     7,     8,     9,    10,    11,    12,
+      13,   246,   246,   317,   246,   335,   246,   318,   328,   342,
+     246,   319,   343,   320,    14,   353,   321,   246,   246,   246,
+     323,   325,   129,   385,   129,   129,   129,   389,   329,   359,
+     356,   129,   330,   331,   441,   442,   443,   444,   332,   333,
+     446,   447,   448,   449,   334,   339,   376,   358,   361,   374,
+     300,   375,   382,   383,   246,   133,   134,   135,   136,   137,
+     138,   139,   140,   246,   394,   395,   380,   384,   397,   386,
+     387,   388,   129,   390,   391,   392,   393,    31,    32,    33,
+      34,    35,    36,    37,   141,   142,   246,   396,   436,   398,
+     344,   484,   407,   485,   486,   413,   409,   410,   419,   420,
+     411,   422,   246,   424,   412,   445,   415,   428,   416,   417,
+     418,   141,   142,   129,   432,   433,   434,   421,   423,   427,
+     429,   129,   129,   129,   430,   246,   246,   129,   431,   435,
+     246,   437,   439,   246,   450,   440,   454,   451,   -40,    19,
+     457,    20,   459,   465,   466,     6,   -40,   -40,   467,   129,
+     468,   458,   469,   -40,   -40,   -40,   -40,   -40,   -40,   -40,
+     464,   -40,    21,   470,   471,   472,   460,   461,   462,    22,
+     473,   474,   475,    23,   479,   378,   481,   483,   491,   492,
+     493,   494,   495,   482,   498,   496,   499,   503,   500,   504,
+     506,   181,   182,   183,   480,   184,   101,    55,   405,   487,
+     293,   121,    62,    63,    64,    65,    66,    67,    68,    69,
+      70,    71,    72,    73,    74,   222,   110,    75,    76,    57,
+      26,   404,   501,   502,    95,   426,    19,   505,    20,   463,
+     507,   121,   200,   201,   202,   203,   204,   205,   206,   207,
+     208,   209,   210,    73,    74,   408,     0,    75,    76,     0,
+       0,     0,     0,     0,     0,     0,    19,     0,    20,   121,
+      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
+      72,    73,    74,     0,     0,    75,    76,     0,     0,     0,
+       0,     0,     0,     0,    19,     0,    20,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   299,   121,   200,   201,
+     202,   203,   204,   205,   206,   207,   208,   209,   210,    73,
+      74,     0,    77,    75,    76,    78,     0,     0,    79,     0,
+      80,   122,    19,     0,    20,     0,     0,   121,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,     0,    77,    75,    76,    78,     0,     0,    79,     0,
+      80,   351,    19,     0,    20,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   360,     0,     0,     0,     0,     0,
+      77,     0,     0,    78,     0,     0,    79,     0,    80,     0,
+     121,    62,    63,    64,    65,    66,    67,    68,    69,    70,
+      71,    72,    73,    74,     0,     0,    75,    76,     0,     0,
+       0,     0,     0,     0,     0,    19,     0,    20,    77,     0,
+       0,    78,     0,   348,    79,     0,    80,   403,    61,    62,
+      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
+      73,    74,     0,     0,    75,    76,     0,     0,    77,     0,
+       0,    78,     0,    19,    79,    20,    80,   128,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,     0,     0,    75,    76,     0,     0,     0,     0,     0,
+       0,     0,    19,     0,    20,     0,   121,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+       0,    77,    75,    76,    78,     0,     0,    79,     0,    80,
+       0,    19,     0,    20,     0,     0,   121,   200,   201,   202,
+     203,   204,   205,   206,   207,   208,   209,   210,    73,    74,
+       0,     0,    75,    76,     0,     0,     0,     0,     0,    77,
+       0,    19,    78,    20,     0,    79,     0,    80,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    77,     0,
+       0,    78,     0,     0,    79,     0,    80,    75,    76,     0,
+     286,   287,   288,     0,     0,     0,    19,     0,    20,     0,
+       0,     0,     0,     0,     0,     0,     0,    77,     0,     0,
+      78,     0,     0,    79,     0,    80,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    77,     0,     0,
+      78,     0,     0,    79,     0,    80,   149,   150,   151,   152,
      153,   154,   155,   156,   157,   158,   159,   160,   161,   162,
      163,   164,   165,   166,     0,     0,     0,     0,     0,   233,
-       0,   234,   173,   174,   175,   232,   235,   236,   237,   238,
-       0,     0,     0,     0,     0,     0,     0,     0,   239,     0,
-       0,     0,   149,   150,   151,   152,   153,   154,   155,   156,
-     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
-       0,     0,     0,     0,     0,   233,     0,   234,   173,   174,
-     175,     0,   235,   236,   237,   238,     0,    61,    62,     0,
-       0,     0,     0,     0,   239,   121,    64,    65,    66,    67,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,     0,
-      19,     0,    20,     0,     0,    61,    62,     0,     0,     0,
-       0,     0,   221,   121,    64,    65,    66,    67,    68,    69,
-      70,    71,    72,    73,    74,    75,    76,     0,    19,     0,
-      20,     0,     0,    61,    62,     0,     0,     0,     0,     0,
-     299,   121,   200,   201,   202,   203,   204,   205,   206,   207,
-     208,   209,   210,    75,    76,     0,    19,     0,    20,     0,
-      61,    62,     0,     0,     0,     0,     0,     0,   121,    64,
-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,     0,    19,     0,    20,    77,     0,     0,    78,
-      61,    62,    79,     0,    80,   360,     0,     0,   121,    64,
-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,     0,    19,    77,    20,     0,    78,    61,    62,
-      79,     0,    80,     0,     0,   403,    63,    64,    65,    66,
-      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-       0,    19,    77,    20,     0,    78,     0,   348,    79,     0,
-      80,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    77,
-      61,    62,    78,     0,     0,    79,     0,    80,   128,    64,
-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,     0,    19,     0,    20,     0,     0,     0,    77,
-      61,    62,    78,     0,     0,    79,     0,    80,   121,    64,
-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,     0,    19,     0,    20,     0,    77,    61,    62,
-      78,     0,     0,    79,     0,    80,   121,   200,   201,   202,
-     203,   204,   205,   206,   207,   208,   209,   210,    75,    76,
-       0,    19,     0,    20,     0,     0,     0,     0,     0,     0,
+       0,   234,   173,   174,   175,     0,   235,   236,   237,   238,
+       0,     0,     0,     0,     0,   289,     0,     0,   290,     0,
+     291,     0,     0,   292,   224,   225,    75,    76,   226,   227,
+     228,   229,   230,   231,     0,    19,     0,    20,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    77,
-       0,     0,    78,     0,     0,    79,     0,    80,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   144,     0,    77,
-       0,     0,    78,     0,     0,    79,     0,    80,   145,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   146,   147,
-       0,     0,     0,     0,     0,     0,     0,    77,     0,     0,
-      78,     0,     0,    79,   148,    80,     0,   149,   150,   151,
-     152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
-     162,   163,   164,   165,   166,   167,   168,   169,     0,     0,
-     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
-     180
+       0,     0,     0,     0,     0,     0,     0,     0,   232,     0,
+     224,   225,     0,     0,   226,   227,   228,   229,   230,   231,
+       0,     0,     0,     0,     0,   149,   150,   151,   152,   153,
+     154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
+     164,   165,   166,     0,     0,     0,     0,     0,   233,     0,
+     234,   173,   174,   175,   232,   235,   236,   237,   238,     0,
+       0,     0,     0,     0,     0,     0,     0,   239,     0,     0,
+       0,   149,   150,   151,   152,   153,   154,   155,   156,   157,
+     158,   159,   160,   161,   162,   163,   164,   165,   166,   144,
+       0,     0,     0,     0,   233,     0,   234,   173,   174,   175,
+     145,   235,   236,   237,   238,     0,     0,     0,     0,     0,
+     146,   147,     0,   239,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   148,     0,     0,   149,
+     150,   151,   152,   153,   154,   155,   156,   157,   158,   159,
+     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
+       0,     0,   170,   171,   172,   173,   174,   175,   176,   177,
+     178,   179,   180
 };
 
 static const short int yycheck[] =
 {
-      38,    98,    98,     3,   255,    32,    29,    51,   198,   199,
-      33,    80,   117,    51,    15,    16,    17,    18,    19,    20,
-      21,    22,     0,    20,    20,   215,   129,   451,   131,   132,
-      37,    15,    16,    17,    18,    19,    20,    21,    22,   477,
-     143,   113,    28,    43,    30,   113,   148,    45,    14,    47,
-      57,   123,   490,    31,   478,   123,    34,   126,    96,    25,
-      57,    57,   115,     0,    42,    43,    44,    45,    46,    47,
-      48,   124,   113,    52,    53,    54,   114,   115,   116,   113,
-     121,   113,    82,   185,    62,   119,    72,    73,    74,   121,
-      76,    77,    71,   113,    28,   122,    30,   119,    61,   119,
-     123,    29,   124,    96,   112,   121,    61,   145,   124,    35,
-      36,   214,   289,   290,   291,    53,    54,    55,   119,    55,
-      56,   112,    99,   100,    30,   131,   132,     8,     9,   167,
-     168,   169,   170,   171,   172,   119,     4,   143,   176,   177,
+      38,    98,    98,     3,   255,    10,    10,    51,   198,   199,
+     451,    80,   117,    51,     5,     6,     7,     8,     9,    10,
+      11,    12,    32,   148,     4,   215,   129,    29,   131,   132,
+     115,    33,   113,   113,    37,    15,    61,   478,   119,   124,
+     143,   121,   477,    43,     5,     6,     7,     8,     9,    10,
+      11,    12,    57,    57,    57,   490,   113,   126,    96,   113,
+     185,     0,    52,    53,    54,   113,   123,   121,   113,    28,
+     121,    30,    29,   124,   119,   123,   114,   115,   116,    35,
+      36,    71,    82,     3,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,   119,   112,    19,
+      20,    61,   124,    96,   289,   290,   291,   145,    28,    30,
+      30,   214,   122,    72,    73,    74,   112,    76,    77,    18,
+      40,   123,    53,    54,    55,   131,   132,   112,   119,   167,
+     168,   169,   170,   171,   172,    99,   100,   143,   176,   177,
      178,   179,   180,   181,   182,   183,   184,   216,   217,   218,
-       3,     4,   145,   112,   257,     3,     4,   347,     3,     4,
-       3,     4,   112,   266,   267,   268,     3,     4,   112,   112,
-     117,   422,     4,   424,   115,     4,   169,    27,     4,   172,
-     115,    30,   220,   176,   177,   178,   179,   180,     4,    30,
-      30,   184,    42,    43,    44,    45,    46,    47,    48,   118,
-      50,   118,   115,   308,   309,   310,   311,   312,   313,   253,
-     113,   316,   317,   318,   319,   253,     4,    59,     4,   322,
-       4,     4,     7,     4,   113,   328,   270,     7,     7,   116,
-      63,   115,   270,   271,   272,   304,   115,   340,   341,    15,
-      16,    17,    18,    19,    20,    21,    22,   117,   115,   115,
-     115,   257,    64,    65,    66,    67,    68,    69,    70,   115,
-     266,   267,   268,   368,   115,    39,    30,    30,   115,   115,
-      30,   374,   375,    25,   377,    25,   379,   115,   113,   272,
-     383,   117,   113,   113,    30,   113,   113,   390,   391,   392,
-     113,   113,   330,   331,   332,   333,   334,   335,   113,   113,
-     300,   339,   113,   113,   409,   410,   411,   412,   113,   116,
-     415,   416,   417,   418,   113,   113,   322,   113,   113,   113,
-     358,     4,   328,    37,   427,   115,   113,    39,     4,    57,
-      30,   113,     4,   436,   340,   341,   113,   330,   113,   332,
-     333,   334,   380,   113,   113,   113,   339,   113,   113,   116,
-      25,   113,   113,    57,   451,   451,   459,   113,   396,   113,
-     115,   466,   113,   468,   469,   113,   119,   116,   374,   375,
-     117,   377,   475,   379,   113,   413,   113,   383,   113,   113,
-     113,   478,   478,   421,   390,   391,   392,   116,    39,   116,
-     116,   429,   430,   431,   116,   498,   499,   435,   116,   116,
-     503,   116,    25,   506,    25,   116,   119,   116,   116,    25,
-     113,   113,    76,    25,   101,   101,   101,   101,    43,   457,
-      24,   427,   214,    50,    29,   126,   359,   358,     3,   380,
-     436,    41,   435,   362,     5,     6,   429,   430,   431,    10,
-      11,    12,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   459,    -1,    -1,    -1,    28,    -1,    30,
-      -1,    -1,     5,     6,   457,    -1,    -1,    -1,    -1,   475,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    -1,    28,    -1,    30,    -1,    -1,
-      -1,    -1,   498,   499,    -1,    -1,    -1,   503,    -1,    -1,
-     506,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    -1,    -1,    -1,    -1,    -1,
-     101,    -1,   103,   104,   105,   106,    -1,   108,   109,   110,
-     111,    -1,    -1,    -1,    -1,    -1,   117,     5,     6,   120,
-      -1,   122,    -1,    -1,   125,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    26,    -1,
-      28,   114,    30,    -1,   117,    -1,    -1,   120,    -1,   122,
-     123,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    -1,    -1,    -1,    27,    28,    -1,    30,    -1,    -1,
-      -1,    34,    35,    36,    -1,    -1,    28,    -1,    30,    42,
-      43,    44,    45,    46,    47,    48,    -1,    50,    51,    -1,
-      -1,    -1,    -1,    -1,    -1,    58,    -1,     3,     4,    62,
-      -1,     7,     8,     9,    10,    11,    12,    -1,    -1,    61,
-      -1,    -1,    -1,    -1,    -1,    -1,   114,    -1,    -1,   117,
-      -1,    -1,   120,    -1,   122,   123,    78,    79,    80,    81,
+     112,    45,   145,    47,   257,    55,    56,   347,   119,    28,
+     112,    30,   112,   266,   267,   268,    25,    26,    17,    18,
+     117,   422,   115,   424,    17,    18,   169,    17,    18,   172,
+      17,    18,   220,   176,   177,   178,   179,   180,    17,    18,
+      18,   184,    18,    18,   114,    30,   115,   117,    18,    30,
+     120,   118,   122,   308,   309,   310,   311,   312,   313,   253,
+     118,   316,   317,   318,   319,   253,    30,   115,    59,   322,
+     113,    18,     0,    18,    27,   328,   270,    18,    18,    21,
+      18,   113,   270,   271,   272,   304,    21,   340,   341,    42,
+      43,    44,    45,    46,    47,    48,    21,    50,   116,   115,
+      63,   257,   115,    31,   115,   115,    34,   115,   115,   115,
+     266,   267,   268,   368,    42,    43,    44,    45,    46,    47,
+      48,   374,   375,   115,   377,    39,   379,   115,   117,   272,
+     383,   115,    30,   113,    62,    30,   113,   390,   391,   392,
+     113,   113,   330,   331,   332,   333,   334,   335,   113,   116,
+     300,   339,   113,   113,   409,   410,   411,   412,   113,   113,
+     415,   416,   417,   418,   113,   113,   322,   113,    30,    15,
+     358,    15,   328,   117,   427,     5,     6,     7,     8,     9,
+      10,    11,    12,   436,   340,   341,   113,   330,    30,   332,
+     333,   334,   380,   113,   113,   113,   339,    64,    65,    66,
+      67,    68,    69,    70,   451,   451,   459,   113,   396,    18,
+      37,   466,   113,   468,   469,    39,   113,   113,   374,   375,
+     113,   377,   475,   379,   113,   413,   113,   383,   113,   113,
+     113,   478,   478,   421,   390,   391,   392,   115,    18,   113,
+     113,   429,   430,   431,   113,   498,   499,   435,   113,   115,
+     503,    57,    30,   506,   113,   116,   113,   117,    27,    28,
+     113,    30,   113,    18,   113,    34,    35,    36,   116,   457,
+     113,   427,   113,    42,    43,    44,    45,    46,    47,    48,
+     436,    50,    51,   116,   116,   116,   429,   430,   431,    58,
+     116,   116,    15,    62,   116,    57,   119,   116,    39,   119,
+     116,   116,   116,   459,    15,   113,    15,    15,   113,    76,
+      15,   101,   101,   101,   457,   101,    43,    24,   359,   475,
+     214,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,   126,    50,    19,    20,    29,
+       3,   358,   498,   499,    41,   380,    28,   503,    30,   435,
+     506,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,   362,    -1,    19,    20,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    28,    -1,    30,     3,
+       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    -1,    -1,    19,    20,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    28,    -1,    30,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    40,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    -1,   114,    19,    20,   117,    -1,    -1,   120,    -1,
+     122,   123,    28,    -1,    30,    -1,    -1,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    -1,   114,    19,    20,   117,    -1,    -1,   120,    -1,
+     122,   123,    28,    -1,    30,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
+     114,    -1,    -1,   117,    -1,    -1,   120,    -1,   122,    -1,
+       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    -1,    -1,    19,    20,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    28,    -1,    30,   114,    -1,
+      -1,   117,    -1,   119,   120,    -1,   122,    40,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    -1,    -1,    19,    20,    -1,    -1,   114,    -1,
+      -1,   117,    -1,    28,   120,    30,   122,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    -1,    -1,    19,    20,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    28,    -1,    30,    -1,     3,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      -1,   114,    19,    20,   117,    -1,    -1,   120,    -1,   122,
+      -1,    28,    -1,    30,    -1,    -1,     3,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      -1,    -1,    19,    20,    -1,    -1,    -1,    -1,    -1,   114,
+      -1,    28,   117,    30,    -1,   120,    -1,   122,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   114,    -1,
+      -1,   117,    -1,    -1,   120,    -1,   122,    19,    20,    -1,
+      22,    23,    24,    -1,    -1,    -1,    28,    -1,    30,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   114,    -1,    -1,
+     117,    -1,    -1,   120,    -1,   122,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   114,    -1,    -1,
+     117,    -1,    -1,   120,    -1,   122,    78,    79,    80,    81,
       82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
       92,    93,    94,    95,    -1,    -1,    -1,    -1,    -1,   101,
-      -1,   103,   104,   105,   106,    61,   108,   109,   110,   111,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   120,    -1,
-      -1,    -1,    78,    79,    80,    81,    82,    83,    84,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
-      -1,    -1,    -1,    -1,    -1,   101,    -1,   103,   104,   105,
-     106,    -1,   108,   109,   110,   111,    -1,     5,     6,    -1,
-      -1,    -1,    -1,    -1,   120,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    26,    -1,
-      28,    -1,    30,    -1,    -1,     5,     6,    -1,    -1,    -1,
-      -1,    -1,    40,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    -1,    28,    -1,
-      30,    -1,    -1,     5,     6,    -1,    -1,    -1,    -1,    -1,
-      40,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    -1,    28,    -1,    30,    -1,
-       5,     6,    -1,    -1,    -1,    -1,    -1,    -1,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    -1,    28,    -1,    30,   114,    -1,    -1,   117,
-       5,     6,   120,    -1,   122,    40,    -1,    -1,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    -1,    28,   114,    30,    -1,   117,     5,     6,
-     120,    -1,   122,    -1,    -1,    40,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      -1,    28,   114,    30,    -1,   117,    -1,   119,   120,    -1,
-     122,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   114,
-       5,     6,   117,    -1,    -1,   120,    -1,   122,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    -1,    28,    -1,    30,    -1,    -1,    -1,   114,
-       5,     6,   117,    -1,    -1,   120,    -1,   122,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    -1,    28,    -1,    30,    -1,   114,     5,     6,
-     117,    -1,    -1,   120,    -1,   122,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      -1,    28,    -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   103,   104,   105,   106,    -1,   108,   109,   110,   111,
+      -1,    -1,    -1,    -1,    -1,   117,    -1,    -1,   120,    -1,
+     122,    -1,    -1,   125,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,    26,    -1,    28,    -1,    30,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   114,
-      -1,    -1,   117,    -1,    -1,   120,    -1,   122,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    38,    -1,   114,
-      -1,    -1,   117,    -1,    -1,   120,    -1,   122,    49,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    59,    60,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   114,    -1,    -1,
-     117,    -1,    -1,   120,    75,   122,    -1,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    -1,    -1,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    61,    -1,
+      17,    18,    -1,    -1,    21,    22,    23,    24,    25,    26,
+      -1,    -1,    -1,    -1,    -1,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
+      93,    94,    95,    -1,    -1,    -1,    -1,    -1,   101,    -1,
+     103,   104,   105,   106,    61,   108,   109,   110,   111,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   120,    -1,    -1,
+      -1,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,    38,
+      -1,    -1,    -1,    -1,   101,    -1,   103,   104,   105,   106,
+      49,   108,   109,   110,   111,    -1,    -1,    -1,    -1,    -1,
+      59,    60,    -1,   120,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    75,    -1,    -1,    78,
+      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
+      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
+      -1,    -1,   101,   102,   103,   104,   105,   106,   107,   108,
+     109,   110,   111
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1321,29 +1319,29 @@
       61,    64,    65,    66,    67,    68,    69,    70,   139,   170,
       29,   182,   183,   184,    52,    53,    54,    71,   162,   112,
       61,    27,    45,    47,    50,   138,   112,   170,    30,   160,
-       4,     5,     6,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,   114,   117,   120,
+      18,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    19,    20,   114,   117,   120,
      122,   127,   146,   147,   148,   149,   150,   165,   179,    32,
      122,   171,    33,   123,   173,   183,    72,    73,    74,    76,
       77,   137,   185,   187,   112,   112,   112,   112,   117,   163,
-     160,   146,    35,    36,   156,   156,   156,   156,     4,     4,
-       4,    13,   123,   150,   151,   165,   115,   124,    13,   148,
-     181,    14,    25,    15,    16,    17,    18,    19,    20,    21,
-      22,   133,   134,   135,    38,    49,    59,    60,    75,    78,
+     160,   146,    35,    36,   156,   156,   156,   156,    18,    18,
+      18,     3,   123,   150,   151,   165,   115,   124,     3,   148,
+     181,     4,    15,     5,     6,     7,     8,     9,    10,    11,
+      12,   133,   134,   135,    38,    49,    59,    60,    75,    78,
       79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
       89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
      101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
      111,   129,   130,   131,   132,   191,   192,   194,   195,    30,
-      55,    56,   161,     4,    30,    30,   164,   148,   148,   148,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,   133,   134,   136,   148,   153,   118,   118,   113,   123,
-     115,    40,   151,   152,     3,     4,     7,     8,     9,    10,
-      11,    12,    61,   101,   103,   108,   109,   110,   111,   120,
+      55,    56,   161,    18,    30,    30,   164,   148,   148,   148,
+       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+      14,   133,   134,   136,   148,   153,   118,   118,   113,   123,
+     115,    40,   151,   152,    17,    18,    21,    22,    23,    24,
+      25,    26,    61,   101,   103,   108,   109,   110,   111,   120,
      129,   130,   131,   132,   154,   178,   179,   180,   180,   180,
      180,   181,    59,   139,   148,   148,   181,   148,   148,   188,
      181,   181,   181,   181,   181,   181,   148,   148,   148,   181,
-     139,    99,   100,   113,   119,   113,   144,   144,   144,     8,
-       9,     3,     4,   128,     4,     7,    10,    11,    12,   117,
+     139,    99,   100,   113,   119,   113,   144,   144,   144,    25,
+      26,    17,    18,   128,    18,    21,    22,    23,    24,   117,
      120,   122,   125,   154,   179,   144,   150,   150,   150,    40,
      148,   167,   168,   169,   113,   116,    63,   177,   115,   115,
      115,   115,   115,   115,   153,   155,   115,   115,   115,   115,
@@ -1352,20 +1350,20 @@
      146,   148,   181,    30,    37,    57,   142,   145,   119,   155,
      155,   123,   155,    30,   119,   121,   165,   166,   113,   116,
       40,    30,   153,   153,   153,   153,   153,   153,   113,   121,
-     153,   153,   153,   153,    25,    25,   180,    20,    57,    20,
+     153,   153,   153,   153,    15,    15,   180,    10,    57,    10,
      113,   193,   180,   117,   181,   148,   181,   181,   181,   148,
-     113,   113,   113,   181,   180,   180,   113,    30,     4,   144,
+     113,   113,   113,   181,   180,   180,   113,    30,    18,   144,
      119,   121,   123,    40,   167,   142,   143,   113,   193,   113,
      113,   113,   113,    39,   153,   113,   113,   113,   113,   180,
-     180,   115,   180,     4,   180,   181,   189,   113,   180,   113,
+     180,   115,   180,    18,   180,   181,   189,   113,   180,   113,
      113,   113,   180,   180,   180,   115,   148,    57,   140,    30,
      116,   153,   153,   153,   153,   148,   153,   153,   153,   153,
      113,   117,   189,   190,   113,   141,   141,   113,   180,   113,
-     181,   181,   181,   190,   180,     4,   113,   116,   113,   113,
-     116,   116,   116,   116,   116,    25,   119,   135,   186,   116,
+     181,   181,   181,   190,   180,    18,   113,   116,   113,   113,
+     116,   116,   116,   116,   116,    15,   119,   135,   186,   116,
      181,   119,   180,   116,   153,   153,   153,   180,   178,   119,
-     135,    39,   119,   116,   116,   116,   113,   178,    25,    25,
-     113,   180,   180,    25,    76,   180,    25,   180
+     135,    39,   119,   116,   116,   116,   113,   178,    15,    15,
+     113,   180,   180,    15,    76,   180,    15,   180
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -2035,7 +2033,7 @@
   switch (yyn)
     {
         case 39:
-#line 207 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 206 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " = ";
     (yyval.String) = (yyvsp[-1].String);
@@ -2043,58 +2041,58 @@
     break;
 
   case 40:
-#line 211 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 210 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = new std::string(""); 
   ;}
     break;
 
   case 48:
-#line 218 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 217 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(""); ;}
     break;
 
   case 55:
-#line 223 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 222 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
-    *(yyvsp[-1].String) += *(yyvsp[0].Const).cnst; 
-    (yyvsp[0].Const).destroy();
+    *(yyvsp[-1].String) += *(yyvsp[0].String); 
+    delete (yyvsp[0].String);
     (yyval.String) = (yyvsp[-1].String); 
     ;}
     break;
 
   case 56:
-#line 228 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 227 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(""); ;}
     break;
 
   case 57:
-#line 233 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 232 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 58:
-#line 234 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    { *(yyvsp[-1].String) += " " + *(yyvsp[0].Const).cnst; delete (yyvsp[0].Const).cnst; (yyval.String) = (yyvsp[-1].String); ;}
+#line 233 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+    { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); (yyval.String) = (yyvsp[-1].String); ;}
     break;
 
   case 59:
-#line 237 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 236 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 60:
-#line 238 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 237 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyvsp[-1].String)->insert(0, ", "); 
-    *(yyvsp[-1].String) += " " + *(yyvsp[0].Const).cnst;
-    delete (yyvsp[0].Const).cnst;
+    *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
+    delete (yyvsp[0].String);
     (yyval.String) = (yyvsp[-1].String);
   ;}
     break;
 
   case 61:
-#line 246 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 245 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -2103,17 +2101,17 @@
     break;
 
   case 62:
-#line 252 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 251 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 64:
-#line 256 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 255 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 65:
-#line 257 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 256 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
       (yyvsp[-1].String)->insert(0, ", ");
       if (!(yyvsp[0].String)->empty())
@@ -2124,32 +2122,32 @@
     break;
 
   case 67:
-#line 267 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 266 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
-      *(yyvsp[-1].String) += " " + *(yyvsp[0].Const).cnst;
-      delete (yyvsp[0].Const).cnst;
+      *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
+      delete (yyvsp[0].String);
       (yyval.String) = (yyvsp[-1].String);
     ;}
     break;
 
   case 87:
-#line 289 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 288 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
            (yyval.Type).newTy = (yyvsp[0].String); (yyval.Type).oldTy = OpaqueTy;
          ;}
     break;
 
   case 88:
-#line 295 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 294 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                   // Type UpReference
-    (yyvsp[0].Const).cnst->insert(0, "\\");
-    (yyval.Type).newTy = (yyvsp[0].Const).cnst;
+    (yyvsp[0].String)->insert(0, "\\");
+    (yyval.Type).newTy = (yyvsp[0].String);
     (yyval.Type).oldTy = OpaqueTy;
   ;}
     break;
 
   case 89:
-#line 300 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 299 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {           // Function derived type?
     *(yyvsp[-3].Type).newTy += "( " + *(yyvsp[-1].String) + " )";
     delete (yyvsp[-1].String);
@@ -2159,29 +2157,29 @@
     break;
 
   case 90:
-#line 306 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 305 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {          // Sized array type?
-    (yyvsp[-3].Const).cnst->insert(0,"[ ");
-    *(yyvsp[-3].Const).cnst += " x " + *(yyvsp[-1].Type).newTy + " ]";
+    (yyvsp[-3].String)->insert(0,"[ ");
+    *(yyvsp[-3].String) += " x " + *(yyvsp[-1].Type).newTy + " ]";
     delete (yyvsp[-1].Type).newTy;
-    (yyval.Type).newTy = (yyvsp[-3].Const).cnst;
+    (yyval.Type).newTy = (yyvsp[-3].String);
     (yyval.Type).oldTy = ArrayTy;
   ;}
     break;
 
   case 91:
-#line 313 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 312 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {          // Packed array type?
-    (yyvsp[-3].Const).cnst->insert(0,"< ");
-    *(yyvsp[-3].Const).cnst += " x " + *(yyvsp[-1].Type).newTy + " >";
+    (yyvsp[-3].String)->insert(0,"< ");
+    *(yyvsp[-3].String) += " x " + *(yyvsp[-1].Type).newTy + " >";
     delete (yyvsp[-1].Type).newTy;
-    (yyval.Type).newTy = (yyvsp[-3].Const).cnst;
+    (yyval.Type).newTy = (yyvsp[-3].String);
     (yyval.Type).oldTy = PackedTy;
   ;}
     break;
 
   case 92:
-#line 320 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 319 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                        // Structure type?
     (yyvsp[-1].String)->insert(0, "{ ");
     *(yyvsp[-1].String) += " }";
@@ -2191,7 +2189,7 @@
     break;
 
   case 93:
-#line 326 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 325 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                                  // Empty structure type?
     (yyval.Type).newTy = new std::string("{ }");
     (yyval.Type).oldTy = StructTy;
@@ -2199,7 +2197,7 @@
     break;
 
   case 94:
-#line 330 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 329 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                             // Pointer type?
     *(yyvsp[-1].Type).newTy += '*';
     (yyvsp[-1].Type).oldTy = PointerTy;
@@ -2208,14 +2206,14 @@
     break;
 
   case 95:
-#line 340 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 339 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].Type).newTy;
   ;}
     break;
 
   case 96:
-#line 343 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 342 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].Type).newTy;
     delete (yyvsp[0].Type).newTy;
@@ -2224,7 +2222,7 @@
     break;
 
   case 98:
-#line 352 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 351 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", ...";
     delete (yyvsp[0].String);
@@ -2233,21 +2231,21 @@
     break;
 
   case 99:
-#line 357 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 356 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].String);
   ;}
     break;
 
   case 100:
-#line 360 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 359 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = new std::string();
   ;}
     break;
 
   case 101:
-#line 370 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 369 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { // Nonempty unsized arr
     (yyval.Const).type = (yyvsp[-3].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy);
@@ -2257,7 +2255,7 @@
     break;
 
   case 102:
-#line 376 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 375 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-2].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy);
@@ -2266,7 +2264,7 @@
     break;
 
   case 103:
-#line 381 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 380 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-2].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy);
@@ -2276,7 +2274,7 @@
     break;
 
   case 104:
-#line 387 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 386 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { // Nonempty unsized arr
     (yyval.Const).type = (yyvsp[-3].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy);
@@ -2286,7 +2284,7 @@
     break;
 
   case 105:
-#line 393 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 392 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-3].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy);
@@ -2296,7 +2294,7 @@
     break;
 
   case 106:
-#line 399 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 398 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-2].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy);
@@ -2305,27 +2303,27 @@
     break;
 
   case 107:
-#line 404 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 403 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
-    *(yyval.Const).cnst +=  " " + *(yyvsp[0].Const).cnst;
-    (yyvsp[0].Const).destroy();
+    *(yyval.Const).cnst +=  " " + *(yyvsp[0].String);
+    delete (yyvsp[0].String);
   ;}
     break;
 
   case 108:
-#line 410 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 409 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
-    *(yyval.Const).cnst += " " + *(yyvsp[0].Const).cnst;
-    (yyvsp[0].Const).destroy();
+    *(yyval.Const).cnst += " " + *(yyvsp[0].String);
+    delete (yyvsp[0].String);
   ;}
     break;
 
   case 109:
-#line 416 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 415 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
@@ -2335,7 +2333,7 @@
     break;
 
   case 110:
-#line 422 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 421 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
@@ -2345,67 +2343,67 @@
     break;
 
   case 111:
-#line 428 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 427 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
-    *(yyval.Const).cnst += " " + *(yyvsp[0].Const).cnst;
-    (yyvsp[0].Const).destroy();
+    *(yyval.Const).cnst += " " + *(yyvsp[0].String);
+    delete (yyvsp[0].String);
   ;}
     break;
 
   case 112:
-#line 434 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 433 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {      // integral constants
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
-    *(yyval.Const).cnst += " " + *(yyvsp[0].Const).cnst;
-    (yyvsp[0].Const).destroy();
+    *(yyval.Const).cnst += " " + *(yyvsp[0].String);
+    delete (yyvsp[0].String);
   ;}
     break;
 
   case 113:
-#line 440 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 439 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {            // integral constants
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
-    *(yyval.Const).cnst += " " + *(yyvsp[0].Const).cnst;
-    (yyvsp[0].Const).destroy();
+    *(yyval.Const).cnst += " " + *(yyvsp[0].String);
+    delete (yyvsp[0].String);
   ;}
     break;
 
   case 114:
-#line 446 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 445 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                      // Boolean constants
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
-    *(yyval.Const).cnst += " " + *(yyvsp[0].Const).cnst;
-    (yyvsp[0].Const).destroy();
+    *(yyval.Const).cnst += " " + *(yyvsp[0].String);
+    delete (yyvsp[0].String);
   ;}
     break;
 
   case 115:
-#line 452 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 451 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                     // Boolean constants
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
-    *(yyval.Const).cnst += " " + *(yyvsp[0].Const).cnst;
-    (yyvsp[0].Const).destroy();
+    *(yyval.Const).cnst += " " + *(yyvsp[0].String);
+    delete (yyvsp[0].String);
   ;}
     break;
 
   case 116:
-#line 458 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 457 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                   // Float & Double constants
     (yyval.Const).type = (yyvsp[-1].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
-    *(yyval.Const).cnst += " " + *(yyvsp[0].Const).cnst;
-    (yyvsp[0].Const).destroy();
+    *(yyval.Const).cnst += " " + *(yyvsp[0].String);
+    delete (yyvsp[0].String);
   ;}
     break;
 
   case 117:
-#line 466 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 465 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     // We must infer the cast opcode from the types of the operands. 
     const char *opcode = getCastOpcode((yyvsp[-3].Const).type, (yyvsp[-1].Type));
@@ -2416,7 +2414,7 @@
     break;
 
   case 118:
-#line 473 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 472 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-4].String) += "(" + *(yyvsp[-2].Const).cnst + " " + *(yyvsp[-1].String) + ")";
     (yyval.String) = (yyvsp[-4].String);
@@ -2426,7 +2424,7 @@
     break;
 
   case 119:
-#line 479 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 478 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
     (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
@@ -2435,7 +2433,7 @@
     break;
 
   case 120:
-#line 484 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 483 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
     (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
@@ -2444,7 +2442,7 @@
     break;
 
   case 121:
-#line 489 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 488 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
     (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
@@ -2453,7 +2451,7 @@
     break;
 
   case 122:
-#line 494 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 493 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
     (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
@@ -2462,7 +2460,7 @@
     break;
 
   case 123:
-#line 499 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 498 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
     (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
@@ -2471,7 +2469,7 @@
     break;
 
   case 124:
-#line 504 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 503 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
     (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
@@ -2480,7 +2478,7 @@
     break;
 
   case 125:
-#line 509 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 508 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
     (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
@@ -2489,7 +2487,7 @@
     break;
 
   case 126:
-#line 514 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 513 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
     (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
@@ -2498,7 +2496,7 @@
     break;
 
   case 127:
-#line 524 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 523 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].Const).cnst;
     (yyvsp[0].Const).destroy();
@@ -2507,25 +2505,25 @@
     break;
 
   case 128:
-#line 529 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 528 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(*(yyvsp[0].Const).cnst); (yyvsp[0].Const).destroy(); ;}
     break;
 
   case 131:
-#line 544 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 543 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
 ;}
     break;
 
   case 132:
-#line 549 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 548 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = 0;
   ;}
     break;
 
   case 133:
-#line 552 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 551 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -2534,7 +2532,7 @@
     break;
 
   case 134:
-#line 557 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 556 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "module asm " << " " << *(yyvsp[0].String) << "\n";
     (yyval.String) = 0;
@@ -2542,7 +2540,7 @@
     break;
 
   case 135:
-#line 561 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 560 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "implementation\n";
     (yyval.String) = 0;
@@ -2550,7 +2548,7 @@
     break;
 
   case 137:
-#line 568 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 567 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[-2].String) << " " << *(yyvsp[-1].String) << " " << *(yyvsp[0].Type).newTy << "\n";
     // delete $2; delete $3; $4.destroy();
@@ -2559,7 +2557,7 @@
     break;
 
   case 138:
-#line 573 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 572 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {       // Function prototypes can be in const pool
     *O << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -2568,7 +2566,7 @@
     break;
 
   case 139:
-#line 578 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 577 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {  // Asm blocks can be in the const pool
     *O << *(yyvsp[-2].String) << " " << *(yyvsp[-1].String) << " " << *(yyvsp[0].String) << "\n";
     delete (yyvsp[-2].String); delete (yyvsp[-1].String); delete (yyvsp[0].String); 
@@ -2577,7 +2575,7 @@
     break;
 
   case 140:
-#line 583 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 582 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[-4].String) << " " << *(yyvsp[-3].String) << " " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Const).cnst << " " 
        << *(yyvsp[0].String) << "\n";
@@ -2587,7 +2585,7 @@
     break;
 
   case 141:
-#line 589 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 588 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[-4].String) << " " << *(yyvsp[-3].String) << " " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy 
        << " " << *(yyvsp[0].String) << "\n";
@@ -2597,7 +2595,7 @@
     break;
 
   case 142:
-#line 595 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 594 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[-4].String) << " " << *(yyvsp[-3].String) << " " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy 
        << " " << *(yyvsp[0].String) << "\n";
@@ -2607,7 +2605,7 @@
     break;
 
   case 143:
-#line 601 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 600 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[-4].String) << " " << *(yyvsp[-3].String) << " " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy 
        << " " << *(yyvsp[0].String) << "\n";
@@ -2617,7 +2615,7 @@
     break;
 
   case 144:
-#line 607 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 606 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     *O << *(yyvsp[-1].String) << " " << *(yyvsp[0].String) << "\n";
     delete (yyvsp[-1].String); delete (yyvsp[0].String);
@@ -2626,7 +2624,7 @@
     break;
 
   case 145:
-#line 612 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 611 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[-2].String) << " = " << *(yyvsp[0].String) << "\n";
     delete (yyvsp[-2].String); delete (yyvsp[0].String);
@@ -2635,14 +2633,14 @@
     break;
 
   case 146:
-#line 617 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 616 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyval.String) = 0;
   ;}
     break;
 
   case 150:
-#line 627 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 626 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -2651,18 +2649,18 @@
     break;
 
   case 151:
-#line 632 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 631 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
-    *(yyvsp[-2].String) += " = " + *(yyvsp[0].Const).cnst;
-    if (*(yyvsp[0].Const).cnst == "64")
+    *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
+    if (*(yyvsp[0].String) == "64")
       SizeOfPointer = 64;
-    (yyvsp[0].Const).destroy();
+    delete (yyvsp[0].String);
     (yyval.String) = (yyvsp[-2].String);
   ;}
     break;
 
   case 152:
-#line 639 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 638 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -2671,7 +2669,7 @@
     break;
 
   case 153:
-#line 644 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 643 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -2680,7 +2678,7 @@
     break;
 
   case 154:
-#line 651 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 650 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-1].String)->insert(0, "[ ");
     *(yyvsp[-1].String) += " ]";
@@ -2689,7 +2687,7 @@
     break;
 
   case 155:
-#line 658 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 657 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -2698,19 +2696,19 @@
     break;
 
   case 157:
-#line 664 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 663 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = new std::string();
   ;}
     break;
 
   case 161:
-#line 673 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 672 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 162:
-#line 675 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 674 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
   (yyval.String) = (yyvsp[-1].Type).newTy;
   if (!(yyvsp[0].String)->empty())
@@ -2720,7 +2718,7 @@
     break;
 
   case 163:
-#line 682 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 681 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -2728,21 +2726,21 @@
     break;
 
   case 164:
-#line 686 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 685 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].String);
   ;}
     break;
 
   case 165:
-#line 690 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 689 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].String);
   ;}
     break;
 
   case 166:
-#line 693 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 692 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", ...";
     (yyval.String) = (yyvsp[-2].String);
@@ -2751,19 +2749,19 @@
     break;
 
   case 167:
-#line 698 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 697 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].String);
   ;}
     break;
 
   case 168:
-#line 701 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 700 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 169:
-#line 704 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 703 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-7].String)->empty()) {
       *(yyvsp[-7].String) += " ";
@@ -2785,21 +2783,21 @@
     break;
 
   case 170:
-#line 723 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 722 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = new std::string("begin");
   ;}
     break;
 
   case 171:
-#line 726 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 725 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyval.String) = new std::string ("{");
   ;}
     break;
 
   case 172:
-#line 730 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 729 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
   if (!(yyvsp[-2].String)->empty()) {
     *O << *(yyvsp[-2].String) << " ";
@@ -2811,17 +2809,17 @@
     break;
 
   case 173:
-#line 739 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 738 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string("end"); ;}
     break;
 
   case 174:
-#line 740 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 739 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string("}"); ;}
     break;
 
   case 175:
-#line 742 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 741 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
   if ((yyvsp[-1].String))
     *O << *(yyvsp[-1].String);
@@ -2831,12 +2829,12 @@
     break;
 
   case 176:
-#line 750 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 749 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 179:
-#line 756 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 755 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     if (!(yyvsp[-1].String)->empty())
       *(yyvsp[-2].String) += " " + *(yyvsp[-1].String);
@@ -2848,52 +2846,12 @@
     break;
 
   case 180:
-#line 769 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 768 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
-  case 182:
-#line 773 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    { (yyval.String) = (yyvsp[0].Const).cnst; ;}
-    break;
-
-  case 183:
-#line 774 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    { (yyval.String) = (yyvsp[0].Const).cnst; ;}
-    break;
-
-  case 184:
-#line 775 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    { (yyval.String) = (yyvsp[0].Const).cnst; ;}
-    break;
-
-  case 185:
-#line 776 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    { (yyval.String) = (yyvsp[0].Const).cnst; ;}
-    break;
-
-  case 186:
-#line 777 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    { (yyval.String) = (yyvsp[0].Const).cnst; ;}
-    break;
-
-  case 187:
-#line 778 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    { (yyval.String) = (yyvsp[0].Const).cnst; ;}
-    break;
-
-  case 188:
-#line 779 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    { (yyval.String) = (yyvsp[0].Const).cnst; ;}
-    break;
-
-  case 189:
-#line 780 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    { (yyval.String) = (yyvsp[0].Const).cnst; ;}
-    break;
-
   case 190:
-#line 781 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 774 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyvsp[-1].String)->insert(0, "<");
     *(yyvsp[-1].String) += ">";
@@ -2902,7 +2860,7 @@
     break;
 
   case 192:
-#line 787 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 780 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-3].String)->empty()) {
       *(yyvsp[-4].String) += " " + *(yyvsp[-3].String);
@@ -2913,13 +2871,8 @@
   ;}
     break;
 
-  case 193:
-#line 796 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    { (yyval.String) = (yyvsp[0].Const).cnst; ;}
-    break;
-
   case 197:
-#line 805 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 798 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.Value).type = (yyvsp[-1].Type);
     (yyval.Value).val = new std::string(*(yyvsp[-1].Type).newTy + " ");
@@ -2929,26 +2882,28 @@
     break;
 
   case 198:
-#line 812 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 805 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
+    (yyval.String) = 0;
   ;}
     break;
 
   case 199:
-#line 814 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 808 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { // Do not allow functions with 0 basic blocks   
+    (yyval.String) = 0;
   ;}
     break;
 
   case 200:
-#line 821 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 816 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
-    *O << *(yyvsp[0].String) ;
+    (yyval.String) = 0;
   ;}
     break;
 
   case 201:
-#line 825 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 820 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "    " << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -2957,14 +2912,14 @@
     break;
 
   case 202:
-#line 830 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 825 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = 0;
   ;}
     break;
 
   case 203:
-#line 833 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 828 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -2973,7 +2928,7 @@
     break;
 
   case 204:
-#line 839 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 834 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {              // Return with a result...
     *O << "    " << *(yyvsp[-1].String) << " " << *(yyvsp[0].Value).val << "\n";
     delete (yyvsp[-1].String); (yyvsp[0].Value).destroy();
@@ -2982,7 +2937,7 @@
     break;
 
   case 205:
-#line 844 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 839 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                                       // Return with no result...
     *O << "    " << *(yyvsp[-1].String) << " " << *(yyvsp[0].Type).newTy << "\n";
     delete (yyvsp[-1].String); (yyvsp[0].Type).destroy();
@@ -2991,7 +2946,7 @@
     break;
 
   case 206:
-#line 849 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 844 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                         // Unconditional Branch...
     *O << "    " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy << " " << *(yyvsp[0].String) << "\n";
     delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
@@ -3000,7 +2955,7 @@
     break;
 
   case 207:
-#line 854 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 849 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {  
     *O << "    " << *(yyvsp[-8].String) << " " << *(yyvsp[-7].Type).newTy << " " << *(yyvsp[-6].String) << ", " 
        << *(yyvsp[-4].Type).newTy << " " << *(yyvsp[-3].String) << ", " << *(yyvsp[-1].Type).newTy << " " << *(yyvsp[0].String) << "\n";
@@ -3011,7 +2966,7 @@
     break;
 
   case 208:
-#line 861 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 856 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "    " << *(yyvsp[-8].String) << " " << *(yyvsp[-7].Type).newTy << " " << *(yyvsp[-6].String) << ", " << *(yyvsp[-4].Type).newTy 
        << " " << *(yyvsp[-3].String) << " [" << *(yyvsp[-1].String) << " ]\n";
@@ -3021,7 +2976,7 @@
     break;
 
   case 209:
-#line 867 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 862 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "    " << *(yyvsp[-7].String) << " " << *(yyvsp[-6].Type).newTy << " " << *(yyvsp[-5].String) << ", " 
        << *(yyvsp[-3].Type).newTy << " " << *(yyvsp[-2].String) << "[]\n";
@@ -3031,7 +2986,7 @@
     break;
 
   case 210:
-#line 874 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 869 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "    ";
     if (!(yyvsp[-13].String)->empty())
@@ -3047,7 +3002,7 @@
     break;
 
   case 211:
-#line 886 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 881 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "    " << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -3056,7 +3011,7 @@
     break;
 
   case 212:
-#line 891 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 886 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "    " << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -3065,7 +3020,7 @@
     break;
 
   case 213:
-#line 897 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 892 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + " " + *(yyvsp[-3].String) + ", " + *(yyvsp[-1].Type).newTy + " " + *(yyvsp[0].String);
     (yyvsp[-4].Type).destroy(); delete (yyvsp[-3].String); (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
@@ -3074,7 +3029,7 @@
     break;
 
   case 214:
-#line 902 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 897 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-3].String)->insert(0, *(yyvsp[-4].Type).newTy + " " );
     *(yyvsp[-3].String) += ", " + *(yyvsp[-1].Type).newTy + " " + *(yyvsp[0].String);
@@ -3084,7 +3039,7 @@
     break;
 
   case 215:
-#line 910 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 905 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -3093,7 +3048,7 @@
     break;
 
   case 216:
-#line 917 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 912 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {    // Used for PHI nodes
     (yyvsp[-3].String)->insert(0, *(yyvsp[-5].Type).newTy + "[");
     *(yyvsp[-3].String) += "," + *(yyvsp[-1].String) + "]";
@@ -3103,7 +3058,7 @@
     break;
 
   case 217:
-#line 923 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 918 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-6].String) += ", [" + *(yyvsp[-3].String) + "," + *(yyvsp[-1].String) + "]";
     delete (yyvsp[-3].String); delete (yyvsp[-1].String);
@@ -3112,12 +3067,12 @@
     break;
 
   case 218:
-#line 931 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 926 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(*(yyvsp[0].Value).val); (yyvsp[0].Value).destroy(); ;}
     break;
 
   case 219:
-#line 932 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 927 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].Value).val;
     (yyvsp[0].Value).destroy();
@@ -3126,12 +3081,12 @@
     break;
 
   case 221:
-#line 941 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 936 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 222:
-#line 945 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 940 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -3140,7 +3095,7 @@
     break;
 
   case 224:
-#line 953 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 948 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-4].String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].String) + ", " + *(yyvsp[0].String);
     (yyvsp[-3].Type).destroy(); delete (yyvsp[-2].String); delete (yyvsp[0].String);
@@ -3149,7 +3104,7 @@
     break;
 
   case 225:
-#line 958 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 953 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-4].String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].String) + ", " + *(yyvsp[0].String);
     (yyvsp[-3].Type).destroy(); delete (yyvsp[-2].String); delete (yyvsp[0].String);
@@ -3158,7 +3113,7 @@
     break;
 
   case 226:
-#line 963 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 958 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-4].String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].String) + ", " + *(yyvsp[0].String);
     (yyvsp[-3].Type).destroy(); delete (yyvsp[-2].String); delete (yyvsp[0].String);
@@ -3167,7 +3122,7 @@
     break;
 
   case 227:
-#line 968 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 963 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val;
     (yyvsp[0].Value).destroy();
@@ -3176,7 +3131,7 @@
     break;
 
   case 228:
-#line 973 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 968 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
     (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
@@ -3185,7 +3140,7 @@
     break;
 
   case 229:
-#line 978 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 973 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     const char *opcode = getCastOpcode((yyvsp[-2].Value).type, (yyvsp[0].Type));
     (yyval.String) = new std::string(opcode);
@@ -3196,7 +3151,7 @@
     break;
 
   case 230:
-#line 985 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 980 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
     (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
@@ -3205,7 +3160,7 @@
     break;
 
   case 231:
-#line 990 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 985 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Type).newTy;
     (yyvsp[-2].Value).destroy(); (yyvsp[0].Type).destroy();
@@ -3214,7 +3169,7 @@
     break;
 
   case 232:
-#line 995 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 990 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
     (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
@@ -3223,7 +3178,7 @@
     break;
 
   case 233:
-#line 1000 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 995 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
     (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
@@ -3232,7 +3187,7 @@
     break;
 
   case 234:
-#line 1005 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1000 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
     (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
@@ -3241,7 +3196,7 @@
     break;
 
   case 235:
-#line 1010 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1005 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -3250,7 +3205,7 @@
     break;
 
   case 236:
-#line 1015 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1010 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-5].String)->empty())
       *(yyvsp[-6].String) += " " + *(yyvsp[-5].String);
@@ -3263,7 +3218,7 @@
     break;
 
   case 238:
-#line 1029 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1024 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyvsp[0].String)->insert(0, ", ");
     (yyval.String) = (yyvsp[0].String);
@@ -3271,17 +3226,17 @@
     break;
 
   case 239:
-#line 1033 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1028 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {  (yyval.String) = new std::string(); ;}
     break;
 
   case 241:
-#line 1038 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1033 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 242:
-#line 1041 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1036 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy;
     if (!(yyvsp[0].String)->empty())
@@ -3292,7 +3247,7 @@
     break;
 
   case 243:
-#line 1048 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1043 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + ", " + *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].String);
     if (!(yyvsp[0].String)->empty())
@@ -3303,7 +3258,7 @@
     break;
 
   case 244:
-#line 1055 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1050 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy;
     if (!(yyvsp[0].String)->empty())
@@ -3314,7 +3269,7 @@
     break;
 
   case 245:
-#line 1062 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1057 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + ", " + *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].String);
     if (!(yyvsp[0].String)->empty())
@@ -3325,7 +3280,7 @@
     break;
 
   case 246:
-#line 1069 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1064 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val;
     (yyvsp[0].Value).destroy();
@@ -3334,7 +3289,7 @@
     break;
 
   case 247:
-#line 1074 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1069 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-3].String)->empty())
       *(yyvsp[-3].String) += " ";
@@ -3345,7 +3300,7 @@
     break;
 
   case 248:
-#line 1081 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1076 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-5].String)->empty())
       *(yyvsp[-5].String) += " ";
@@ -3356,7 +3311,7 @@
     break;
 
   case 249:
-#line 1088 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1083 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-3].String) += *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].String) + " " + *(yyvsp[0].String);
     (yyvsp[-2].Type).destroy(); delete (yyvsp[-1].String); delete (yyvsp[0].String);
@@ -3369,7 +3324,7 @@
     }
 
 /* Line 1126 of yacc.c.  */
-#line 3373 "UpgradeParser.tab.c"
+#line 3328 "UpgradeParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -3637,7 +3592,7 @@
 }
 
 
-#line 1094 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1089 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
 
 
 int yyerror(const char *ErrorMsg) {