diff --git a/llvm/tools/llvm-upgrade/UpgradeParser.cpp b/llvm/tools/llvm-upgrade/UpgradeParser.cpp
index a8c3375..305a3ae 100644
--- a/llvm/tools/llvm-upgrade/UpgradeParser.cpp
+++ b/llvm/tools/llvm-upgrade/UpgradeParser.cpp
@@ -595,7 +595,7 @@
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  4
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1193
+#define YYLAST   1150
 
 /* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS  126
@@ -680,8 +680,8 @@
      500,   502,   504,   508,   510,   512,   516,   517,   519,   521,
      525,   526,   528,   530,   532,   534,   536,   538,   540,   542,
      544,   548,   550,   556,   558,   560,   562,   564,   567,   570,
-     572,   576,   579,   580,   582,   585,   588,   592,   602,   612,
-     621,   635,   637,   639,   646,   652,   655,   662,   670,   672,
+     572,   575,   578,   579,   581,   584,   587,   591,   601,   611,
+     620,   635,   637,   639,   646,   652,   655,   662,   670,   672,
      676,   678,   679,   682,   684,   690,   696,   702,   705,   710,
      715,   722,   727,   732,   739,   746,   749,   757,   759,   762,
      763,   765,   766,   770,   777,   781,   788,   791,   796,   803
@@ -747,12 +747,12 @@
       11,    -1,    12,    -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,   137,   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,    75,   139,   146,   180,   115,   190,   116,    39,    25,
+     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,
      180,    -1,   137,   192,    -1,   148,   117,   180,   113,   180,
@@ -781,26 +781,26 @@
      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,   222,   223,   228,   229,   232,
-     233,   241,   247,   248,   251,   252,   261,   262,   275,   275,
-     276,   276,   277,   281,   281,   281,   281,   281,   281,   281,
-     282,   282,   282,   282,   282,   283,   283,   284,   290,   295,
-     301,   308,   315,   321,   325,   335,   338,   346,   347,   352,
-     355,   365,   371,   376,   382,   388,   394,   399,   405,   411,
-     417,   423,   429,   435,   441,   447,   453,   461,   468,   474,
-     479,   484,   489,   494,   499,   504,   509,   519,   524,   529,
-     529,   539,   544,   547,   552,   556,   560,   563,   568,   573,
-     578,   584,   590,   596,   602,   607,   612,   617,   619,   619,
-     622,   627,   634,   639,   646,   653,   658,   659,   667,   667,
-     668,   668,   670,   677,   681,   685,   688,   693,   696,   698,
-     718,   721,   725,   734,   735,   737,   745,   746,   747,   751,
-     764,   765,   768,   769,   770,   771,   772,   773,   774,   775,
-     776,   781,   782,   791,   791,   794,   794,   800,   807,   809,
-     816,   820,   825,   828,   834,   839,   844,   849,   856,   862,
-     868,   877,   882,   888,   893,   901,   908,   914,   922,   923,
-     931,   932,   936,   941,   944,   949,   954,   959,   964,   969,
-     976,   981,   986,   991,   996,  1001,  1006,  1015,  1020,  1024,
-    1028,  1029,  1032,  1039,  1046,  1053,  1060,  1065,  1072,  1079
+     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
 };
 #endif
 
@@ -919,8 +919,8 @@
        1,     1,     3,     1,     1,     3,     0,     1,     1,     3,
        0,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        3,     1,     5,     1,     1,     1,     1,     2,     2,     1,
-       3,     2,     0,     1,     2,     2,     3,     9,     9,     8,
-      13,     1,     1,     6,     5,     2,     6,     7,     1,     3,
+       2,     2,     0,     1,     2,     2,     3,     9,     9,     8,
+      14,     1,     1,     6,     5,     2,     6,     7,     1,     3,
        1,     0,     2,     1,     5,     5,     5,     2,     4,     4,
        6,     4,     4,     6,     6,     2,     7,     1,     2,     0,
        1,     0,     3,     6,     3,     6,     2,     4,     6,     4
@@ -940,130 +940,130 @@
       55,     2,     3,    69,    73,    74,    75,    76,    77,    78,
       79,    80,    81,    82,    83,    84,    85,     0,     0,     0,
        0,   193,     0,     0,    68,    86,    72,   194,    87,   170,
-     171,   172,   173,   174,   175,   198,   241,   201,     0,     0,
-       0,     0,   157,   145,   139,   137,   129,   130,     0,     0,
-       0,     0,    88,     0,     0,    71,    93,    95,     0,     0,
-     100,    94,   240,     0,   223,     0,     0,     0,     0,    56,
-     211,   212,     6,     7,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-       0,     0,     0,     0,     0,     0,    24,    25,    26,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   200,    56,
-     215,     0,   237,   152,   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,     0,   227,
-     222,   205,   204,     0,     0,    30,    34,    29,    33,    28,
-      32,    27,    31,    35,    36,     0,     0,    59,    59,   246,
-       0,     0,   235,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   154,     0,   142,
-     143,   141,   114,   115,     4,     5,   112,   113,   116,   107,
-     108,   111,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   110,   109,   140,    70,
-      70,    96,   167,   161,   164,   165,     0,     0,    89,   182,
-     183,   184,   185,   186,   187,   188,   189,   180,     0,   191,
-     196,   195,   197,     0,   206,     0,     0,     0,   242,     0,
-     244,   239,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   155,     0,     0,
-      66,    64,     0,     0,     0,     0,     0,     0,   102,   128,
-       0,     0,   106,     0,   103,     0,     0,     0,     0,    90,
-      91,   160,   162,     0,    62,    98,   181,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   249,     0,     0,     0,
-     231,   232,     0,     0,   229,     0,     0,     0,   228,     0,
-     247,     0,    61,    67,    65,   239,     0,     0,     0,     0,
-       0,     0,   101,   104,   105,     0,     0,     0,     0,   166,
-     163,    63,    57,     0,   190,     0,     0,   221,    59,    60,
-      59,   218,   238,     0,     0,     0,     0,     0,   224,   225,
-     226,   221,     0,     0,     0,     0,     0,     0,     0,   127,
-       0,     0,     0,     0,     0,   169,     0,     0,     0,   220,
-       0,     0,   243,   245,     0,     0,     0,   230,   233,   234,
-       0,   248,   118,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    58,   192,     0,     0,     0,   219,   216,     0,
-     236,     0,   124,     0,     0,   117,   120,   121,   122,   123,
-       0,   209,     0,     0,     0,   217,     0,     0,     0,   207,
-       0,   208,     0,     0,   119,   125,   126,     0,     0,     0,
-       0,     0,     0,   214,     0,     0,   213,   210
+     171,   172,   173,   174,   175,   198,     0,     0,     0,   211,
+     212,   241,   200,   201,     0,     0,     0,     0,   157,   145,
+     139,   137,   129,   130,     0,     0,     0,     0,    88,     0,
+       0,    71,    93,    95,     0,     0,   100,    94,   205,     0,
+     204,     0,     0,    30,    34,    29,    33,    28,    32,    27,
+      31,    35,    36,     0,   240,     0,   223,     0,    56,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,     0,     0,     0,
+       0,     0,     0,    24,    25,    26,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    56,   215,     0,   237,   152,
+     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,
+       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,
+       0,     0,     0,     0,   154,     0,   142,   143,   141,   114,
+     115,     4,     5,   112,   113,   116,   107,   108,   111,     0,
+       0,     0,     0,   110,   109,   140,    70,    70,    96,   167,
+     161,   164,   165,     0,     0,    89,   181,     0,     0,     0,
+       0,     0,     0,     0,   128,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   242,     0,   244,   239,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   155,     0,     0,    66,    64,   102,     0,
+       0,   106,     0,   103,    90,    91,   160,   162,     0,    62,
+      98,     0,   239,     0,     0,     0,     0,     0,     0,   190,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   249,     0,     0,     0,   231,   232,     0,     0,   229,
+       0,     0,     0,   228,     0,   247,     0,    61,    67,    65,
+     101,   104,   105,   166,   163,    63,    57,     0,     0,     0,
+       0,     0,     0,     0,   127,     0,     0,     0,     0,     0,
+       0,   221,    59,    60,    59,   218,   238,     0,     0,     0,
+       0,     0,   224,   225,   226,   221,     0,     0,   169,   192,
+     118,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   220,     0,     0,   243,   245,     0,     0,     0,
+     230,   233,   234,     0,   248,    58,     0,   124,     0,     0,
+     117,   120,   121,   122,   123,     0,   209,     0,     0,     0,
+     219,   216,     0,   236,     0,     0,     0,   207,     0,   208,
+       0,     0,   217,   119,   125,   126,     0,     0,     0,     0,
+       0,     0,   214,     0,     0,   213,     0,   210
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
 static const short int yydefgoto[] =
 {
-      -1,    81,   256,   272,   273,   274,   275,   195,   196,   225,
-     197,    24,    15,    38,   435,   308,   330,   402,   249,   331,
-      82,    83,   198,    85,    86,   118,   207,   339,   299,   340,
-     108,     1,     2,     3,    59,   176,    48,   103,   180,    87,
-     352,   284,   285,   286,    39,    91,    16,    94,    17,    29,
-      18,   357,   300,    88,   302,   411,    41,    42,    43,   168,
-     483,    97,   232,   439,   440,   169,   170,   366,   171,   172
+      -1,    81,   283,   240,   241,   242,   243,   211,   212,   143,
+     213,    24,    15,    38,   438,   324,   346,   406,   276,   347,
+      82,    83,   214,    85,    86,   124,   223,   314,   244,   315,
+     114,     1,     2,     3,    59,   192,    48,   109,   196,    87,
+     357,   301,   302,   303,    39,    91,    16,    94,    17,    29,
+      18,   307,   245,    88,   247,   425,    41,    42,    43,   102,
+     478,   103,   259,   452,   453,   185,   186,   381,   187,   188
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -403
+#define YYPACT_NINF -439
 static const short int yypact[] =
 {
-    -403,    26,   210,   114,  -403,  -403,   106,  -403,  -403,  -403,
-    -403,  -403,  -403,  -403,   -49,   201,    53,  -403,  -403,  -403,
-    -403,    15,    -5,    59,    31,    42,  -403,  -403,  -403,   201,
-     113,   167,  -403,  -403,  -403,  -403,  -403,  -403,   920,    11,
-    -403,     9,  -403,   140,    72,    74,    79,    85,  -403,    87,
-     113,   920,   104,   104,   104,   104,  -403,  -403,  -403,  -403,
-    -403,  -403,  -403,    94,  -403,  -403,  -403,  -403,  -403,  -403,
-    -403,  -403,  -403,  -403,  -403,  -403,  -403,   226,   227,   229,
-     408,  -403,   140,   120,  -403,  -403,   -59,  -403,  -403,  -403,
-    -403,  -403,  -403,  -403,  -403,  -403,  1082,  -403,   204,   119,
-     232,   213,   215,  -403,  -403,  -403,  -403,  -403,   974,   974,
-     974,  1002,  -403,   128,   131,  -403,  -403,   -59,   -72,   135,
-      78,  -403,  -403,   974,  -403,   192,  1030,    41,   196,   201,
-    -403,  -403,  -403,  -403,  -403,  -403,  -403,  -403,  -403,  -403,
-    -403,  -403,  -403,  -403,  -403,  -403,  -403,  -403,  -403,  -403,
-     974,   974,   974,   974,   974,   974,  -403,  -403,  -403,   974,
-     974,   974,   974,   974,   974,   974,   974,   974,  -403,   201,
-    -403,    81,  -403,  -403,  -403,  -403,  -403,  -403,  -403,  -403,
-      50,   147,   147,   147,   169,   179,   257,   186,   258,   190,
-     259,   216,   278,   277,   279,   219,   283,   281,   559,   147,
-     974,   974,   974,  -403,   446,  -403,   176,   175,   684,  -403,
-    -403,    94,  -403,   684,   684,  -403,  -403,  -403,  -403,  -403,
-    -403,  -403,  -403,  -403,  -403,   684,   920,   180,   181,  -403,
-     684,   182,   183,   184,   185,   191,   193,   194,   253,   684,
-     684,   684,   195,   920,   974,   974,   265,  -403,     2,  -403,
-    -403,  -403,  -403,  -403,  -403,  -403,  -403,  -403,  -403,  -403,
-    -403,  -403,   188,   197,   198,   199,   205,   206,   838,  1002,
-     588,   275,   211,   217,   218,   220,  -403,  -403,  -403,    28,
-     -64,   -59,  -403,   140,  -403,   221,   212,   864,  -403,  -403,
-    -403,  -403,  -403,  -403,  -403,  -403,  -403,   246,  1002,  -403,
-    -403,  -403,  -403,   223,  -403,   224,   684,     4,  -403,     5,
-    -403,   228,   684,   214,   974,   974,   974,   974,   974,   974,
-     231,   234,   235,   974,   684,   684,   236,  -403,   280,   307,
-    -403,   147,  1002,  1002,  1002,  1002,  1002,  1002,  -403,  -403,
-      54,    24,  -403,   -60,  -403,  1002,  1002,  1002,  1002,  -403,
-    -403,  -403,  -403,   892,   293,  -403,  -403,   312,    25,   320,
-     325,   237,   684,   347,   684,   974,  -403,   240,   684,   241,
-    -403,  -403,   242,   247,  -403,   684,   684,   684,  -403,   249,
-    -403,   974,  -403,  -403,  -403,   228,   248,   254,   255,   260,
-     323,  1002,  -403,  -403,  -403,   261,   262,   263,   267,  -403,
-    -403,  -403,   313,   268,  -403,   684,   684,   974,   269,  -403,
-     269,  -403,   271,   684,   272,   974,   974,   974,  -403,  -403,
-    -403,   974,   684,   256,  1002,  1002,  1002,  1002,   974,  -403,
-    1002,  1002,  1002,  1002,   367,  -403,   356,   274,   276,   271,
-     273,   331,  -403,  -403,   974,   282,   684,  -403,  -403,  -403,
-     284,  -403,  -403,   286,   288,   292,   294,   296,   299,   300,
-     304,   319,  -403,  -403,   369,     0,   358,  -403,  -403,   318,
-    -403,  1002,  -403,  1002,  1002,  -403,  -403,  -403,  -403,  -403,
-     684,  -403,   730,    12,   370,  -403,   326,   327,   328,  -403,
-     332,  -403,   730,   684,  -403,  -403,  -403,   416,   333,   372,
-     684,   424,   425,  -403,   684,   684,  -403,  -403
+    -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
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -403,  -403,  -403,   357,   359,   361,   362,  -127,  -126,  -378,
-    -403,   411,   449,  -120,  -403,  -223,   121,  -403,  -176,  -403,
-     -47,  -403,   -38,  -403,   -66,   363,  -403,  -108,   287,  -234,
-      56,  -403,  -403,  -403,   427,  -403,  -403,  -403,  -403,     7,
-    -403,   125,  -403,  -403,   450,  -403,  -403,  -403,  -403,  -403,
-     478,  -403,  -402,    34,   178,  -115,  -403,   441,  -403,  -403,
-    -403,  -403,  -403,   122,    67,  -403,  -403,   107,  -403,  -403
+    -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
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -1073,250 +1073,242 @@
 #define YYTABLE_NINF -132
 static const short int yytable[] =
 {
-      84,   223,   224,   199,   105,   310,   250,   251,   209,   226,
-      25,   212,    30,    84,   117,   215,   216,   217,   218,   219,
-     220,   221,   222,   278,   362,   364,     4,   215,   216,   217,
-     218,   219,   220,   221,   222,   341,   343,   229,    40,   328,
-     233,   202,    92,    89,   234,   235,   236,   237,   238,   243,
-      25,   203,   242,   391,   117,   213,   -70,   350,    51,   329,
-     121,   363,   363,   394,   358,   121,   214,    44,    45,    46,
-     181,   182,   183,     7,     8,     9,    52,    11,    53,    13,
-     490,    54,    40,    61,    62,   208,    47,   482,   208,   119,
-     498,   115,    64,    65,    66,    67,    68,    69,    70,    71,
-      72,    73,    74,    75,    76,   492,    19,    49,    20,   109,
-     110,   111,   227,   228,   208,   230,   231,   208,   205,   481,
-      50,   208,   208,   208,   208,   208,   239,   240,   241,   208,
-     326,   491,    93,    90,   279,   280,   281,   391,   391,   106,
-     107,   -40,    19,    58,    20,   393,   404,   349,     6,   -40,
-     -40,    27,   121,    28,    56,   384,   -40,   -40,   -40,   -40,
-     -40,   -40,   -40,   246,   -40,    21,   283,   391,    19,   247,
-      20,    60,    22,   392,   174,   175,    23,   252,   253,   306,
-     244,   245,   -30,   -30,    98,   442,    99,   443,    84,   -29,
-     -29,   100,    77,   -28,   -28,    78,   324,   101,    79,   369,
-      80,   371,   372,   373,   102,    84,   325,   208,   378,   -71,
-    -131,   215,   216,   217,   218,   219,   220,   221,   222,   -27,
-     -27,   281,   254,   255,   385,   386,   387,   388,   389,   390,
-     112,   113,   277,   114,   173,   120,   177,   395,   396,   397,
-     398,     5,   301,   178,     6,   179,   200,   301,   301,   201,
-     204,   210,     7,     8,     9,    10,    11,    12,    13,   301,
-     248,   -34,   -33,   -32,   301,    31,    32,    33,    34,    35,
-      36,    37,    14,   301,   301,   301,   208,   370,   208,   208,
-     208,   374,   -31,   429,   -37,   208,   -38,   257,   258,   287,
-     351,   288,   319,   307,   309,   327,   313,   314,   315,   312,
-     447,   448,   449,   332,   316,   344,   317,   318,   323,   356,
-     382,   383,   333,   334,   335,   283,   453,   454,   455,   456,
-     336,   337,   458,   459,   460,   461,   345,   208,   354,   467,
-     328,   368,   346,   347,   353,   348,   359,   360,   223,   224,
-     301,   365,   403,   422,   375,   405,   301,   376,   377,   381,
-     406,   409,   407,   413,   415,   416,   223,   224,   301,   301,
-     417,   424,   428,   486,   421,   487,   488,   425,   426,   208,
-     434,   462,   452,   427,   430,   431,   432,   208,   208,   208,
-     433,   436,   441,   208,   444,   446,   463,   464,   363,   466,
-     457,   303,   304,   465,   480,   493,   301,   484,   301,   471,
-     470,   468,   301,   305,   472,   473,   208,   474,   311,   301,
-     301,   301,   475,    61,    62,   476,   477,   320,   321,   322,
-     478,   115,    64,    65,    66,    67,    68,    69,    70,    71,
-      72,    73,    74,    75,    76,   479,    19,   485,    20,   301,
-     301,   500,   494,   495,   496,   497,   501,   301,   502,   504,
-     505,    61,    62,   164,    96,   165,   301,   166,   167,   115,
-      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
-      74,    75,    76,    55,    19,   401,    20,   104,   400,    57,
-     301,    26,    95,   206,   361,   276,   282,   412,   450,     0,
-     367,     0,   423,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   379,   380,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   301,     0,     0,     0,     0,     0,
-       0,     0,    77,     0,     0,    78,     0,   301,    79,     0,
-      80,   116,     0,     0,   301,     0,     0,     0,   301,   301,
-     408,     0,   410,     0,     0,     0,   414,     0,     0,     0,
-       0,     0,     0,   418,   419,   420,     0,     0,     0,     0,
-      77,     0,     0,    78,    61,    62,    79,     0,    80,   259,
-     260,   261,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   437,   438,     0,     0,    19,     0,    20,
-       0,   445,     0,    61,    62,     0,     0,     0,     0,     0,
-     451,   115,   184,   185,   186,   187,   188,   189,   190,   191,
-     192,   193,   194,    75,    76,     0,    19,     0,    20,     0,
-       0,     0,     0,     0,   469,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   132,   133,   134,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,     0,     0,     0,   489,     0,
-     262,     0,   263,   156,   157,   158,     0,   264,   265,   266,
-     267,   499,     0,     0,     0,     0,   268,     0,   503,   269,
-       0,   270,   506,   507,   271,     0,     0,   289,   290,    61,
-      62,   291,   292,   293,   294,   295,   296,     0,     0,     0,
-       0,     0,    77,     0,     0,    78,     0,     0,    79,     0,
-      80,   342,    19,     0,    20,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   289,   290,     0,     0,   291,   292,   293,
-     294,   295,   296,     0,     0,   297,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   132,   133,   134,   135,   136,   137,   138,   139,
-     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
-       0,     0,     0,     0,     0,   262,     0,   263,   156,   157,
-     158,   297,   264,   265,   266,   267,     0,     0,     0,     0,
-       0,     0,     0,     0,   298,     0,     0,     0,   132,   133,
-     134,   135,   136,   137,   138,   139,   140,   141,   142,   143,
-     144,   145,   146,   147,   148,   149,     0,     0,     0,     0,
-       0,   262,     0,   263,   156,   157,   158,     0,   264,   265,
-     266,   267,     0,    61,    62,     0,     0,     0,     0,     0,
-     298,   115,   184,   185,   186,   187,   188,   189,   190,   191,
-     192,   193,   194,    75,    76,     0,    19,     0,    20,    61,
-      62,     0,     0,     0,     0,     0,     0,   115,    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,   355,   115,    64,    65,    66,    67,
+      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,
+     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,
+     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,   399,    63,    64,    65,    66,    67,    68,    69,
+       0,     0,   221,   121,    64,    65,    66,    67,    68,    69,
       70,    71,    72,    73,    74,    75,    76,     0,    19,     0,
-      20,     0,    77,     0,     0,    78,     0,   338,    79,     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,    77,    61,
-      62,    78,     0,     0,    79,     0,    80,   115,    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,   115,   184,   185,   186,   187,
-     188,   189,   190,   191,   192,   193,   194,    75,    76,     0,
-      19,     0,    20,     0,    77,    61,    62,    78,     0,     0,
-      79,     0,    80,   211,    64,    65,    66,    67,    68,    69,
-      70,    71,    72,    73,    74,    75,    76,     0,    19,     0,
-      20,     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,     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,    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,    77,     0,     0,    78,
-     122,     0,    79,     0,    80,     0,     0,     0,     0,     0,
-       0,   123,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   124,   125,     0,    77,     0,     0,    78,     0,     0,
-      79,     0,    80,     0,   126,   127,   128,   129,   130,   131,
-     132,   133,   134,   135,   136,   137,   138,   139,   140,   141,
-     142,   143,   144,   145,   146,   147,   148,   149,   150,   151,
-     152,     0,     0,   153,   154,   155,   156,   157,   158,   159,
-     160,   161,   162,   163
+       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
 };
 
 static const short int yycheck[] =
 {
-      38,   128,   128,   111,    51,   228,   182,   183,   123,   129,
-       3,   126,    61,    51,    80,    15,    16,    17,    18,    19,
-      20,    21,    22,   199,    20,    20,     0,    15,    16,    17,
-      18,    19,    20,    21,    22,   269,   270,   152,    29,    37,
-     155,   113,    33,    32,   159,   160,   161,   162,   163,   169,
-      43,   123,   167,   113,   120,    14,   115,   121,    27,    57,
-     124,    57,    57,   123,   298,   124,    25,    52,    53,    54,
-     108,   109,   110,    42,    43,    44,    45,    46,    47,    48,
-     482,    50,    29,     5,     6,   123,    71,   465,   126,    82,
-     492,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,   483,    28,   112,    30,    53,
-      54,    55,   150,   151,   152,   153,   154,   155,    40,   119,
-      61,   159,   160,   161,   162,   163,   164,   165,   166,   167,
-     245,   119,   123,   122,   200,   201,   202,   113,   113,    35,
-      36,    27,    28,    30,    30,   121,   121,   119,    34,    35,
-      36,    45,   124,    47,   112,   331,    42,    43,    44,    45,
-      46,    47,    48,   113,    50,    51,   204,   113,    28,   119,
-      30,     4,    58,   119,    55,    56,    62,     8,     9,   226,
-      99,   100,     3,     4,   112,   408,   112,   410,   226,     3,
-       4,   112,   114,     3,     4,   117,   243,   112,   120,   314,
-     122,   316,   317,   318,   117,   243,   244,   245,   323,   115,
-       0,    15,    16,    17,    18,    19,    20,    21,    22,     3,
-       4,   287,     3,     4,   332,   333,   334,   335,   336,   337,
-       4,     4,   198,     4,    30,   115,     4,   345,   346,   347,
-     348,    31,   208,    30,    34,    30,   118,   213,   214,   118,
-     115,    59,    42,    43,    44,    45,    46,    47,    48,   225,
-     113,     4,     4,     4,   230,    64,    65,    66,    67,    68,
-      69,    70,    62,   239,   240,   241,   314,   315,   316,   317,
-     318,   319,     4,   391,     7,   323,     7,     4,     7,   113,
-     283,   116,    39,   113,   113,    30,   113,   113,   113,   117,
-     415,   416,   417,   115,   113,    30,   113,   113,   113,    63,
-      30,     4,   115,   115,   115,   353,   424,   425,   426,   427,
-     115,   115,   430,   431,   432,   433,   115,   365,   116,   444,
-      37,   117,   115,   115,   113,   115,   113,   113,   465,   465,
-     306,   113,    30,   381,   113,    25,   312,   113,   113,   113,
-      25,     4,   115,   113,   113,   113,   483,   483,   324,   325,
-     113,   113,    39,   471,   115,   473,   474,   113,   113,   407,
-      57,     4,   116,   113,   113,   113,   113,   415,   416,   417,
-     113,   113,   113,   421,   113,   113,    30,   113,    57,   116,
-     428,   213,   214,   117,    25,    25,   362,    39,   364,   113,
-     116,   119,   368,   225,   116,   113,   444,   113,   230,   375,
-     376,   377,   116,     5,     6,   116,   116,   239,   240,   241,
-     116,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,   116,    28,   119,    30,   405,
-     406,    25,   116,   116,   116,   113,   113,   413,    76,    25,
-      25,     5,     6,    96,    43,    96,   422,    96,    96,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    24,    28,   354,    30,    50,   353,    29,
-     446,     3,    41,   120,   306,   198,    40,   365,   421,    -1,
-     312,    -1,   385,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   324,   325,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   480,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   114,    -1,    -1,   117,    -1,   493,   120,    -1,
-     122,   123,    -1,    -1,   500,    -1,    -1,    -1,   504,   505,
-     362,    -1,   364,    -1,    -1,    -1,   368,    -1,    -1,    -1,
-      -1,    -1,    -1,   375,   376,   377,    -1,    -1,    -1,    -1,
-     114,    -1,    -1,   117,     5,     6,   120,    -1,   122,    10,
+      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,
+     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,   405,   406,    -1,    -1,    28,    -1,    30,
-      -1,   413,    -1,     5,     6,    -1,    -1,    -1,    -1,    -1,
-     422,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    -1,    28,    -1,    30,    -1,
-      -1,    -1,    -1,    -1,   446,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,    80,
+      -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,   480,    -1,
+      91,    92,    93,    94,    95,    -1,    -1,    -1,    -1,    -1,
      101,    -1,   103,   104,   105,   106,    -1,   108,   109,   110,
-     111,   493,    -1,    -1,    -1,    -1,   117,    -1,   500,   120,
-      -1,   122,   504,   505,   125,    -1,    -1,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    -1,    -1,    -1,
-      -1,    -1,   114,    -1,    -1,   117,    -1,    -1,   120,    -1,
-     122,   123,    28,    -1,    30,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,     3,     4,    -1,    -1,     7,     8,     9,
-      10,    11,    12,    -1,    -1,    61,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     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,
+      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,    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,     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,    -1,    -1,     5,     6,    -1,
-      -1,    -1,    -1,    -1,    40,    13,    14,    15,    16,    17,
+     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,   114,    -1,    -1,   117,    -1,   119,   120,    -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,   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,   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,    -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,    -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,   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,   114,    -1,    -1,   117,
-      38,    -1,   120,    -1,   122,    -1,    -1,    -1,    -1,    -1,
-      -1,    49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    59,    60,    -1,   114,    -1,    -1,   117,    -1,    -1,
-     120,    -1,   122,    -1,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
-      98,    -1,    -1,   101,   102,   103,   104,   105,   106,   107,
-     108,   109,   110,   111
+      -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
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1332,48 +1324,48 @@
        4,     5,     6,    13,    14,    15,    16,    17,    18,    19,
       20,    21,    22,    23,    24,    25,    26,   114,   117,   120,
      122,   127,   146,   147,   148,   149,   150,   165,   179,    32,
-     122,   171,    33,   123,   173,   183,   137,   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,    38,    49,    59,    60,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,   101,   102,   103,   104,   105,   106,   107,
-     108,   109,   110,   111,   129,   130,   131,   132,   185,   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,   148,   181,
-      59,    13,   181,    14,    25,    15,    16,    17,    18,    19,
-      20,    21,    22,   133,   134,   135,   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,   101,   103,   108,   109,   110,   111,   117,   120,
-     122,   125,   129,   130,   131,   132,   154,   179,   144,   150,
-     150,   150,    40,   148,   167,   168,   169,   113,   116,     3,
-       4,     7,     8,     9,    10,    11,    12,    61,   120,   154,
-     178,   179,   180,   180,   180,   180,   146,   113,   141,   113,
-     141,   180,   117,   113,   113,   113,   113,   113,   113,    39,
-     180,   180,   180,   113,   146,   148,   181,    30,    37,    57,
-     142,   145,   115,   115,   115,   115,   115,   115,   119,   153,
-     155,   155,   123,   155,    30,   115,   115,   115,   115,   119,
-     121,   165,   166,   113,   116,    40,    63,   177,   155,   113,
-     113,   180,    20,    57,    20,   113,   193,   180,   117,   181,
-     148,   181,   181,   181,   148,   113,   113,   113,   181,   180,
-     180,   113,    30,     4,   144,   153,   153,   153,   153,   153,
-     153,   113,   119,   121,   123,   153,   153,   153,   153,    40,
-     167,   142,   143,    30,   121,    25,    25,   115,   180,     4,
-     180,   181,   189,   113,   180,   113,   113,   113,   180,   180,
-     180,   115,   148,   193,   113,   113,   113,   113,    39,   153,
-     113,   113,   113,   113,    57,   140,   113,   180,   180,   189,
-     190,   113,   141,   141,   113,   180,   113,   181,   181,   181,
-     190,   180,   116,   153,   153,   153,   153,   148,   153,   153,
-     153,   153,     4,    30,   113,   117,   116,   181,   119,   180,
-     116,   113,   116,   113,   113,   116,   116,   116,   116,   116,
-      25,   119,   135,   186,    39,   119,   153,   153,   153,   180,
-     178,   119,   135,    25,   116,   116,   116,   113,   178,   180,
-      25,   113,    76,   180,    25,    25,   180,   180
+     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,
+      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,
+     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,
+     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,
+     113,   113,   146,   113,   141,   113,   141,   180,   117,   113,
+     113,   113,   113,   113,   113,    39,   180,   180,   180,   113,
+     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,
+     113,   193,   180,   117,   181,   148,   181,   181,   181,   148,
+     113,   113,   113,   181,   180,   180,   113,    30,     4,   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,
+     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,   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
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -2062,28 +2054,37 @@
     { (yyval.String) = new std::string(""); ;}
     break;
 
-  case 56:
+  case 55:
 #line 223 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+    { 
+    *(yyvsp[-1].String) += *(yyvsp[0].Const).cnst; 
+    (yyvsp[0].Const).destroy();
+    (yyval.String) = (yyvsp[-1].String); 
+    ;}
+    break;
+
+  case 56:
+#line 228 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(""); ;}
     break;
 
   case 57:
-#line 228 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 233 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 58:
-#line 229 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#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); ;}
     break;
 
   case 59:
-#line 232 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 237 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 60:
-#line 233 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 238 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyvsp[-1].String)->insert(0, ", "); 
     *(yyvsp[-1].String) += " " + *(yyvsp[0].Const).cnst;
@@ -2093,7 +2094,7 @@
     break;
 
   case 61:
-#line 241 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 246 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -2102,17 +2103,17 @@
     break;
 
   case 62:
-#line 247 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 252 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 64:
-#line 251 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 256 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 65:
-#line 252 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 257 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
       (yyvsp[-1].String)->insert(0, ", ");
       if (!(yyvsp[0].String)->empty())
@@ -2123,7 +2124,7 @@
     break;
 
   case 67:
-#line 262 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 267 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
       *(yyvsp[-1].String) += " " + *(yyvsp[0].Const).cnst;
       delete (yyvsp[0].Const).cnst;
@@ -2132,14 +2133,14 @@
     break;
 
   case 87:
-#line 284 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 289 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
            (yyval.Type).newTy = (yyvsp[0].String); (yyval.Type).oldTy = OpaqueTy;
          ;}
     break;
 
   case 88:
-#line 290 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 295 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                   // Type UpReference
     (yyvsp[0].Const).cnst->insert(0, "\\");
     (yyval.Type).newTy = (yyvsp[0].Const).cnst;
@@ -2148,7 +2149,7 @@
     break;
 
   case 89:
-#line 295 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 300 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {           // Function derived type?
     *(yyvsp[-3].Type).newTy += "( " + *(yyvsp[-1].String) + " )";
     delete (yyvsp[-1].String);
@@ -2158,7 +2159,7 @@
     break;
 
   case 90:
-#line 301 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 306 "/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 + " ]";
@@ -2169,7 +2170,7 @@
     break;
 
   case 91:
-#line 308 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 313 "/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 + " >";
@@ -2180,7 +2181,7 @@
     break;
 
   case 92:
-#line 315 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 320 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                        // Structure type?
     (yyvsp[-1].String)->insert(0, "{ ");
     *(yyvsp[-1].String) += " }";
@@ -2190,7 +2191,7 @@
     break;
 
   case 93:
-#line 321 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 326 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                                  // Empty structure type?
     (yyval.Type).newTy = new std::string("{ }");
     (yyval.Type).oldTy = StructTy;
@@ -2198,7 +2199,7 @@
     break;
 
   case 94:
-#line 325 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 330 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                             // Pointer type?
     *(yyvsp[-1].Type).newTy += '*';
     (yyvsp[-1].Type).oldTy = PointerTy;
@@ -2207,14 +2208,14 @@
     break;
 
   case 95:
-#line 335 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 340 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].Type).newTy;
   ;}
     break;
 
   case 96:
-#line 338 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 343 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].Type).newTy;
     delete (yyvsp[0].Type).newTy;
@@ -2223,7 +2224,7 @@
     break;
 
   case 98:
-#line 347 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 352 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", ...";
     delete (yyvsp[0].String);
@@ -2232,21 +2233,21 @@
     break;
 
   case 99:
-#line 352 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 357 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].String);
   ;}
     break;
 
   case 100:
-#line 355 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 360 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = new std::string();
   ;}
     break;
 
   case 101:
-#line 365 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 370 "/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);
@@ -2256,7 +2257,7 @@
     break;
 
   case 102:
-#line 371 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 376 "/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);
@@ -2265,7 +2266,7 @@
     break;
 
   case 103:
-#line 376 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 381 "/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);
@@ -2275,7 +2276,7 @@
     break;
 
   case 104:
-#line 382 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 387 "/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);
@@ -2285,7 +2286,7 @@
     break;
 
   case 105:
-#line 388 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 393 "/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);
@@ -2295,7 +2296,7 @@
     break;
 
   case 106:
-#line 394 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 399 "/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);
@@ -2304,7 +2305,7 @@
     break;
 
   case 107:
-#line 399 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 404 "/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);
@@ -2314,7 +2315,7 @@
     break;
 
   case 108:
-#line 405 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 410 "/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);
@@ -2324,7 +2325,7 @@
     break;
 
   case 109:
-#line 411 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 416 "/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);
@@ -2334,7 +2335,7 @@
     break;
 
   case 110:
-#line 417 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 422 "/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);
@@ -2344,7 +2345,7 @@
     break;
 
   case 111:
-#line 423 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 428 "/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);
@@ -2354,7 +2355,7 @@
     break;
 
   case 112:
-#line 429 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 434 "/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);
@@ -2364,7 +2365,7 @@
     break;
 
   case 113:
-#line 435 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 440 "/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);
@@ -2374,7 +2375,7 @@
     break;
 
   case 114:
-#line 441 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 446 "/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);
@@ -2384,7 +2385,7 @@
     break;
 
   case 115:
-#line 447 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 452 "/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);
@@ -2394,7 +2395,7 @@
     break;
 
   case 116:
-#line 453 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 458 "/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);
@@ -2404,7 +2405,7 @@
     break;
 
   case 117:
-#line 461 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 466 "/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));
@@ -2415,7 +2416,7 @@
     break;
 
   case 118:
-#line 468 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 473 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-4].String) += "(" + *(yyvsp[-2].Const).cnst + " " + *(yyvsp[-1].String) + ")";
     (yyval.String) = (yyvsp[-4].String);
@@ -2425,7 +2426,7 @@
     break;
 
   case 119:
-#line 474 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 479 "/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();
@@ -2434,15 +2435,6 @@
     break;
 
   case 120:
-#line 479 "/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();
-    (yyval.String) = (yyvsp[-5].String);
-  ;}
-    break;
-
-  case 121:
 #line 484 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
@@ -2451,7 +2443,7 @@
   ;}
     break;
 
-  case 122:
+  case 121:
 #line 489 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
@@ -2460,7 +2452,7 @@
   ;}
     break;
 
-  case 123:
+  case 122:
 #line 494 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
@@ -2469,7 +2461,7 @@
   ;}
     break;
 
-  case 124:
+  case 123:
 #line 499 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
@@ -2478,16 +2470,16 @@
   ;}
     break;
 
-  case 125:
+  case 124:
 #line 504 "/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();
-    (yyval.String) = (yyvsp[-7].String);
+    *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
+    (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
+    (yyval.String) = (yyvsp[-5].String);
   ;}
     break;
 
-  case 126:
+  case 125:
 #line 509 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
@@ -2496,8 +2488,17 @@
   ;}
     break;
 
+  case 126:
+#line 514 "/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();
+    (yyval.String) = (yyvsp[-7].String);
+  ;}
+    break;
+
   case 127:
-#line 519 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 524 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].Const).cnst;
     (yyvsp[0].Const).destroy();
@@ -2506,25 +2507,25 @@
     break;
 
   case 128:
-#line 524 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 529 "/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 539 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 544 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
 ;}
     break;
 
   case 132:
-#line 544 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 549 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = 0;
   ;}
     break;
 
   case 133:
-#line 547 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 552 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -2533,7 +2534,7 @@
     break;
 
   case 134:
-#line 552 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 557 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "module asm " << " " << *(yyvsp[0].String) << "\n";
     (yyval.String) = 0;
@@ -2541,7 +2542,7 @@
     break;
 
   case 135:
-#line 556 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 561 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "implementation\n";
     (yyval.String) = 0;
@@ -2549,7 +2550,7 @@
     break;
 
   case 137:
-#line 563 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 568 "/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();
@@ -2558,7 +2559,7 @@
     break;
 
   case 138:
-#line 568 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 573 "/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);
@@ -2567,7 +2568,7 @@
     break;
 
   case 139:
-#line 573 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 578 "/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); 
@@ -2576,7 +2577,7 @@
     break;
 
   case 140:
-#line 578 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 583 "/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";
@@ -2586,7 +2587,7 @@
     break;
 
   case 141:
-#line 584 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 589 "/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";
@@ -2596,7 +2597,7 @@
     break;
 
   case 142:
-#line 590 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 595 "/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";
@@ -2606,7 +2607,7 @@
     break;
 
   case 143:
-#line 596 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 601 "/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";
@@ -2616,7 +2617,7 @@
     break;
 
   case 144:
-#line 602 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 607 "/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);
@@ -2625,7 +2626,7 @@
     break;
 
   case 145:
-#line 607 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 612 "/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);
@@ -2634,14 +2635,14 @@
     break;
 
   case 146:
-#line 612 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 617 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyval.String) = 0;
   ;}
     break;
 
   case 150:
-#line 622 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 627 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -2650,7 +2651,7 @@
     break;
 
   case 151:
-#line 627 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 632 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " = " + *(yyvsp[0].Const).cnst;
     if (*(yyvsp[0].Const).cnst == "64")
@@ -2661,15 +2662,6 @@
     break;
 
   case 152:
-#line 634 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    {
-    *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
-    delete (yyvsp[0].String);
-    (yyval.String) = (yyvsp[-2].String);
-  ;}
-    break;
-
-  case 153:
 #line 639 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
@@ -2678,8 +2670,17 @@
   ;}
     break;
 
+  case 153:
+#line 644 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
+    delete (yyvsp[0].String);
+    (yyval.String) = (yyvsp[-2].String);
+  ;}
+    break;
+
   case 154:
-#line 646 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 651 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-1].String)->insert(0, "[ ");
     *(yyvsp[-1].String) += " ]";
@@ -2688,7 +2689,7 @@
     break;
 
   case 155:
-#line 653 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 658 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -2697,19 +2698,19 @@
     break;
 
   case 157:
-#line 659 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 664 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = new std::string();
   ;}
     break;
 
   case 161:
-#line 668 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 673 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 162:
-#line 670 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 675 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
   (yyval.String) = (yyvsp[-1].Type).newTy;
   if (!(yyvsp[0].String)->empty())
@@ -2719,7 +2720,7 @@
     break;
 
   case 163:
-#line 677 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 682 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -2727,21 +2728,21 @@
     break;
 
   case 164:
-#line 681 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 686 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].String);
   ;}
     break;
 
   case 165:
-#line 685 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 690 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].String);
   ;}
     break;
 
   case 166:
-#line 688 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 693 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", ...";
     (yyval.String) = (yyvsp[-2].String);
@@ -2750,19 +2751,19 @@
     break;
 
   case 167:
-#line 693 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 698 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = (yyvsp[0].String);
   ;}
     break;
 
   case 168:
-#line 696 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 701 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 169:
-#line 699 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 704 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-7].String)->empty()) {
       *(yyvsp[-7].String) += " ";
@@ -2784,21 +2785,21 @@
     break;
 
   case 170:
-#line 718 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 723 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = new std::string("begin");
   ;}
     break;
 
   case 171:
-#line 721 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 726 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyval.String) = new std::string ("{");
   ;}
     break;
 
   case 172:
-#line 725 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 730 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
   if (!(yyvsp[-2].String)->empty()) {
     *O << *(yyvsp[-2].String) << " ";
@@ -2810,17 +2811,17 @@
     break;
 
   case 173:
-#line 734 "/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("end"); ;}
     break;
 
   case 174:
-#line 735 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 740 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string("}"); ;}
     break;
 
   case 175:
-#line 737 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 742 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
   if ((yyvsp[-1].String))
     *O << *(yyvsp[-1].String);
@@ -2830,12 +2831,12 @@
     break;
 
   case 176:
-#line 745 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 750 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 179:
-#line 751 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 756 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     if (!(yyvsp[-1].String)->empty())
       *(yyvsp[-2].String) += " " + *(yyvsp[-1].String);
@@ -2847,52 +2848,52 @@
     break;
 
   case 180:
-#line 764 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 769 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 182:
-#line 768 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    { (yyval.String) = (yyvsp[0].Const).cnst; ;}
-    break;
-
-  case 183:
-#line 769 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    { (yyval.String) = (yyvsp[0].Const).cnst; ;}
-    break;
-
-  case 184:
-#line 770 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    { (yyval.String) = (yyvsp[0].Const).cnst; ;}
-    break;
-
-  case 185:
-#line 771 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    { (yyval.String) = (yyvsp[0].Const).cnst; ;}
-    break;
-
-  case 186:
-#line 772 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
-    { (yyval.String) = (yyvsp[0].Const).cnst; ;}
-    break;
-
-  case 187:
 #line 773 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = (yyvsp[0].Const).cnst; ;}
     break;
 
-  case 188:
+  case 183:
 #line 774 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = (yyvsp[0].Const).cnst; ;}
     break;
 
-  case 189:
+  case 184:
 #line 775 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = (yyvsp[0].Const).cnst; ;}
     break;
 
-  case 190:
+  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"
     { 
     (yyvsp[-1].String)->insert(0, "<");
     *(yyvsp[-1].String) += ">";
@@ -2901,7 +2902,7 @@
     break;
 
   case 192:
-#line 782 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 787 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-3].String)->empty()) {
       *(yyvsp[-4].String) += " " + *(yyvsp[-3].String);
@@ -2913,12 +2914,12 @@
     break;
 
   case 193:
-#line 791 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 796 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = (yyvsp[0].Const).cnst; ;}
     break;
 
   case 197:
-#line 800 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 805 "/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 + " ");
@@ -2928,26 +2929,26 @@
     break;
 
   case 198:
-#line 807 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 812 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
   ;}
     break;
 
   case 199:
-#line 809 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 814 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { // Do not allow functions with 0 basic blocks   
   ;}
     break;
 
   case 200:
-#line 816 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 821 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
-    *O << *(yyvsp[-1].String) ;
+    *O << *(yyvsp[0].String) ;
   ;}
     break;
 
   case 201:
-#line 820 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 825 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "    " << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -2956,14 +2957,14 @@
     break;
 
   case 202:
-#line 825 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 830 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.String) = 0;
   ;}
     break;
 
   case 203:
-#line 828 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 833 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -2972,7 +2973,7 @@
     break;
 
   case 204:
-#line 834 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 839 "/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();
@@ -2981,7 +2982,7 @@
     break;
 
   case 205:
-#line 839 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 844 "/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();
@@ -2990,7 +2991,7 @@
     break;
 
   case 206:
-#line 844 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 849 "/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);
@@ -2999,7 +3000,7 @@
     break;
 
   case 207:
-#line 849 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 854 "/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";
@@ -3010,7 +3011,7 @@
     break;
 
   case 208:
-#line 856 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 861 "/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";
@@ -3020,7 +3021,7 @@
     break;
 
   case 209:
-#line 862 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 867 "/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";
@@ -3030,19 +3031,23 @@
     break;
 
   case 210:
-#line 869 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 874 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
-    *O << "    " << *(yyvsp[-12].String) << " " << *(yyvsp[-11].String) << " " << *(yyvsp[-10].Type).newTy << " " << *(yyvsp[-9].String) << " ("
+    *O << "    ";
+    if (!(yyvsp[-13].String)->empty())
+      *O << *(yyvsp[-13].String);
+    *O << *(yyvsp[-12].String) << " " << *(yyvsp[-11].String) << " " << *(yyvsp[-10].Type).newTy << " " << *(yyvsp[-9].String) << " ("
        << *(yyvsp[-7].String) << ") " << *(yyvsp[-5].String) << " " << *(yyvsp[-4].Type).newTy << " " << *(yyvsp[-3].String) << " " 
        << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy << " " << *(yyvsp[0].String) << "\n";
-    delete (yyvsp[-12].String); delete (yyvsp[-11].String); (yyvsp[-10].Type).destroy(); delete (yyvsp[-9].String); delete (yyvsp[-7].String); delete (yyvsp[-5].String); 
-    (yyvsp[-4].Type).destroy(); delete (yyvsp[-3].String); delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String); 
+    delete (yyvsp[-13].String); delete (yyvsp[-12].String); delete (yyvsp[-11].String); (yyvsp[-10].Type).destroy(); delete (yyvsp[-9].String); delete (yyvsp[-7].String); 
+    delete (yyvsp[-5].String); (yyvsp[-4].Type).destroy(); delete (yyvsp[-3].String); delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); 
+    delete (yyvsp[0].String); 
     (yyval.String) = 0;
   ;}
     break;
 
   case 211:
-#line 877 "/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);
@@ -3051,7 +3056,7 @@
     break;
 
   case 212:
-#line 882 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 891 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *O << "    " << *(yyvsp[0].String) << "\n";
     delete (yyvsp[0].String);
@@ -3060,16 +3065,16 @@
     break;
 
   case 213:
-#line 888 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 897 "/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[-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);
     (yyval.String) = (yyvsp[-5].String);
   ;}
     break;
 
   case 214:
-#line 893 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 902 "/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);
@@ -3079,7 +3084,7 @@
     break;
 
   case 215:
-#line 901 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 910 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -3088,7 +3093,7 @@
     break;
 
   case 216:
-#line 908 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 917 "/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) + "]";
@@ -3098,7 +3103,7 @@
     break;
 
   case 217:
-#line 914 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 923 "/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);
@@ -3107,12 +3112,12 @@
     break;
 
   case 218:
-#line 922 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 931 "/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 923 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 932 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += ", " + *(yyvsp[0].Value).val;
     (yyvsp[0].Value).destroy();
@@ -3121,12 +3126,12 @@
     break;
 
   case 221:
-#line 932 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 941 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 222:
-#line 936 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 945 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -3135,7 +3140,7 @@
     break;
 
   case 224:
-#line 944 "/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);
@@ -3144,7 +3149,7 @@
     break;
 
   case 225:
-#line 949 "/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);
@@ -3153,7 +3158,7 @@
     break;
 
   case 226:
-#line 954 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 963 "/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);
@@ -3162,7 +3167,7 @@
     break;
 
   case 227:
-#line 959 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 968 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val;
     (yyvsp[0].Value).destroy();
@@ -3171,7 +3176,7 @@
     break;
 
   case 228:
-#line 964 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 973 "/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();
@@ -3180,7 +3185,7 @@
     break;
 
   case 229:
-#line 969 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 978 "/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);
@@ -3191,7 +3196,7 @@
     break;
 
   case 230:
-#line 976 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 985 "/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();
@@ -3200,7 +3205,7 @@
     break;
 
   case 231:
-#line 981 "/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].Type).newTy;
     (yyvsp[-2].Value).destroy(); (yyvsp[0].Type).destroy();
@@ -3209,7 +3214,7 @@
     break;
 
   case 232:
-#line 986 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 995 "/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();
@@ -3218,7 +3223,7 @@
     break;
 
   case 233:
-#line 991 "/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();
@@ -3227,7 +3232,7 @@
     break;
 
   case 234:
-#line 996 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1005 "/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();
@@ -3236,7 +3241,7 @@
     break;
 
   case 235:
-#line 1001 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1010 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
     delete (yyvsp[0].String);
@@ -3245,7 +3250,7 @@
     break;
 
   case 236:
-#line 1006 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1015 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-5].String)->empty())
       *(yyvsp[-6].String) += " " + *(yyvsp[-5].String);
@@ -3258,7 +3263,7 @@
     break;
 
   case 238:
-#line 1020 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1029 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyvsp[0].String)->insert(0, ", ");
     (yyval.String) = (yyvsp[0].String);
@@ -3266,17 +3271,17 @@
     break;
 
   case 239:
-#line 1024 "/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 241:
-#line 1029 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1038 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.String) = new std::string(); ;}
     break;
 
   case 242:
-#line 1032 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1041 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy;
     if (!(yyvsp[0].String)->empty())
@@ -3287,7 +3292,7 @@
     break;
 
   case 243:
-#line 1039 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1048 "/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())
@@ -3298,7 +3303,7 @@
     break;
 
   case 244:
-#line 1046 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1055 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy;
     if (!(yyvsp[0].String)->empty())
@@ -3309,7 +3314,7 @@
     break;
 
   case 245:
-#line 1053 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1062 "/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())
@@ -3320,7 +3325,7 @@
     break;
 
   case 246:
-#line 1060 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1069 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val;
     (yyvsp[0].Value).destroy();
@@ -3329,7 +3334,7 @@
     break;
 
   case 247:
-#line 1065 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1074 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-3].String)->empty())
       *(yyvsp[-3].String) += " ";
@@ -3340,7 +3345,7 @@
     break;
 
   case 248:
-#line 1072 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1081 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-5].String)->empty())
       *(yyvsp[-5].String) += " ";
@@ -3351,7 +3356,7 @@
     break;
 
   case 249:
-#line 1079 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1088 "/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);
@@ -3364,7 +3369,7 @@
     }
 
 /* Line 1126 of yacc.c.  */
-#line 3368 "UpgradeParser.tab.c"
+#line 3373 "UpgradeParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -3632,7 +3637,7 @@
 }
 
 
-#line 1085 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
+#line 1094 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
 
 
 int yyerror(const char *ErrorMsg) {