diff --git a/tools/llvm-upgrade/UpgradeParser.cpp.cvs b/tools/llvm-upgrade/UpgradeParser.cpp.cvs
index bf15425..9d5a1da 100644
--- a/tools/llvm-upgrade/UpgradeParser.cpp.cvs
+++ b/tools/llvm-upgrade/UpgradeParser.cpp.cvs
@@ -2275,16 +2275,16 @@
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  4
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1762
+#define YYLAST   1630
 
 /* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS  166
 /* YYNNTS -- Number of nonterminals. */
-#define YYNNTS  80
+#define YYNNTS  81
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  309
+#define YYNRULES  310
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  605
+#define YYNSTATES  606
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -2366,15 +2366,16 @@
      528,   529,   537,   538,   546,   547,   555,   559,   564,   565,
      567,   569,   571,   575,   579,   583,   587,   591,   595,   597,
      598,   600,   602,   604,   605,   608,   612,   614,   616,   620,
-     622,   623,   632,   634,   636,   640,   642,   644,   647,   648,
-     650,   652,   653,   654,   660,   661,   663,   665,   667,   669,
-     671,   673,   675,   677,   679,   683,   685,   691,   693,   695,
-     697,   699,   702,   705,   708,   712,   715,   716,   718,   720,
-     722,   725,   728,   732,   742,   752,   761,   775,   777,   779,
-     786,   792,   795,   802,   810,   812,   816,   818,   819,   822,
-     824,   830,   836,   842,   849,   856,   859,   864,   869,   876,
-     881,   886,   891,   896,   903,   910,   913,   921,   923,   926,
-     927,   929,   930,   934,   941,   945,   952,   955,   960,   967
+     622,   623,   632,   634,   636,   637,   642,   644,   646,   649,
+     650,   652,   654,   655,   656,   662,   663,   665,   667,   669,
+     671,   673,   675,   677,   679,   681,   685,   687,   693,   695,
+     697,   699,   701,   704,   707,   710,   714,   717,   718,   720,
+     722,   724,   727,   730,   734,   744,   754,   763,   777,   779,
+     781,   788,   794,   797,   804,   812,   814,   818,   820,   821,
+     824,   826,   832,   838,   844,   851,   858,   861,   866,   871,
+     878,   883,   888,   893,   898,   905,   912,   915,   923,   925,
+     928,   929,   931,   932,   936,   943,   947,   954,   957,   962,
+     969
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -2405,7 +2406,7 @@
       -1,   191,    -1,     8,    -1,   193,    -1,     8,    -1,   193,
       -1,     9,    -1,    10,    -1,    11,    -1,    12,    -1,    13,
       -1,    14,    -1,    15,    -1,    16,    -1,    17,    -1,    18,
-      -1,    19,    -1,    21,    -1,   192,    -1,    48,    -1,   228,
+      -1,    19,    -1,    21,    -1,   192,    -1,    48,    -1,   229,
       -1,   154,     4,    -1,   190,   155,   195,   156,    -1,   157,
        4,   158,   193,   159,    -1,   160,     4,   158,   193,   161,
       -1,   162,   194,   163,    -1,   162,   163,    -1,   160,   162,
@@ -2416,10 +2417,10 @@
      191,   160,   198,   161,    -1,   191,   162,   198,   163,    -1,
      191,   162,   163,    -1,   191,   160,   162,   198,   163,   161,
       -1,   191,   160,   162,   163,   161,    -1,   191,    38,    -1,
-     191,    39,    -1,   191,   228,    -1,   191,   197,    -1,   191,
+     191,    39,    -1,   191,   229,    -1,   191,   197,    -1,   191,
       26,    -1,   176,   168,    -1,   177,     4,    -1,     9,    27,
       -1,     9,    28,    -1,   179,     7,    -1,   175,   155,   196,
-      36,   191,   156,    -1,   110,   155,   196,   243,   156,    -1,
+      36,   191,   156,    -1,   110,   155,   196,   244,   156,    -1,
      112,   155,   196,   153,   196,   153,   196,   156,    -1,   169,
      155,   196,   153,   196,   156,    -1,   170,   155,   196,   153,
      196,   156,    -1,   171,   155,   196,   153,   196,   156,    -1,
@@ -2429,9 +2430,9 @@
      115,   155,   196,   153,   196,   153,   196,   156,    -1,   116,
      155,   196,   153,   196,   153,   196,   156,    -1,   198,   153,
      196,    -1,   196,    -1,    32,    -1,    33,    -1,   201,    -1,
-     201,   221,    -1,   201,   223,    -1,   201,    62,    61,   207,
+     201,   222,    -1,   201,   224,    -1,   201,    62,    61,   207,
       -1,   201,    25,    -1,   202,    -1,   202,   180,    20,   189,
-      -1,   202,   223,    -1,   202,    62,    61,   207,    -1,    -1,
+      -1,   202,   224,    -1,   202,    62,    61,   207,    -1,    -1,
      202,   180,   181,   199,   196,   203,   187,    -1,    -1,   202,
      180,    50,   199,   191,   204,   187,    -1,    -1,   202,   180,
       45,   199,   191,   205,   187,    -1,    -1,   202,   180,    47,
@@ -2443,41 +2444,41 @@
       24,    -1,   212,    -1,    -1,   191,   213,    -1,   215,   153,
      214,    -1,   214,    -1,   215,    -1,   215,   153,    37,    -1,
       37,    -1,    -1,   182,   189,   212,   155,   216,   156,   186,
-     183,    -1,    29,    -1,   162,    -1,   181,   217,   218,    -1,
-      30,    -1,   163,    -1,   231,   220,    -1,    -1,    45,    -1,
-      47,    -1,    -1,    -1,    31,   224,   222,   225,   217,    -1,
-      -1,    63,    -1,     3,    -1,     4,    -1,     7,    -1,    27,
-      -1,    28,    -1,    38,    -1,    39,    -1,    26,    -1,   160,
-     198,   161,    -1,   197,    -1,    61,   226,    24,   153,    24,
-      -1,   167,    -1,   212,    -1,   228,    -1,   227,    -1,   191,
-     229,    -1,   231,   232,    -1,   219,   232,    -1,   233,   180,
-     235,    -1,   233,   237,    -1,    -1,    23,    -1,    77,    -1,
-      78,    -1,    72,   230,    -1,    72,     8,    -1,    73,    21,
-     229,    -1,    73,     9,   229,   153,    21,   229,   153,    21,
-     229,    -1,    74,   178,   229,   153,    21,   229,   157,   236,
-     159,    -1,    74,   178,   229,   153,    21,   229,   157,   159,
-      -1,    75,   182,   189,   229,   155,   240,   156,    36,    21,
-     229,   234,    21,   229,    -1,   234,    -1,    76,    -1,   236,
-     178,   227,   153,    21,   229,    -1,   178,   227,   153,    21,
-     229,    -1,   180,   242,    -1,   191,   157,   229,   153,   229,
-     159,    -1,   238,   153,   157,   229,   153,   229,   159,    -1,
-     230,    -1,   239,   153,   230,    -1,   239,    -1,    -1,    60,
-      59,    -1,    59,    -1,   169,   191,   229,   153,   229,    -1,
-     170,   191,   229,   153,   229,    -1,   171,   191,   229,   153,
-     229,    -1,   103,   172,   191,   229,   153,   229,    -1,   104,
-     173,   191,   229,   153,   229,    -1,    49,   230,    -1,   174,
-     230,   153,   230,    -1,   175,   230,    36,   191,    -1,   112,
-     230,   153,   230,   153,   230,    -1,   113,   230,   153,   191,
-      -1,   117,   230,   153,   191,    -1,   118,   230,   153,   191,
-      -1,   114,   230,   153,   230,    -1,   115,   230,   153,   230,
-     153,   230,    -1,   116,   230,   153,   230,   153,   230,    -1,
-     111,   238,    -1,   241,   182,   189,   229,   155,   240,   156,
-      -1,   245,    -1,   153,   239,    -1,    -1,    35,    -1,    -1,
-     105,   191,   184,    -1,   105,   191,   153,    15,   229,   184,
-      -1,   106,   191,   184,    -1,   106,   191,   153,    15,   229,
-     184,    -1,   107,   230,    -1,   244,   108,   191,   229,    -1,
-     244,   109,   230,   153,   191,   229,    -1,   110,   191,   229,
-     243,    -1
+     183,    -1,    29,    -1,   162,    -1,    -1,   181,   220,   217,
+     218,    -1,    30,    -1,   163,    -1,   232,   221,    -1,    -1,
+      45,    -1,    47,    -1,    -1,    -1,    31,   225,   223,   226,
+     217,    -1,    -1,    63,    -1,     3,    -1,     4,    -1,     7,
+      -1,    27,    -1,    28,    -1,    38,    -1,    39,    -1,    26,
+      -1,   160,   198,   161,    -1,   197,    -1,    61,   227,    24,
+     153,    24,    -1,   167,    -1,   212,    -1,   229,    -1,   228,
+      -1,   191,   230,    -1,   232,   233,    -1,   219,   233,    -1,
+     234,   180,   236,    -1,   234,   238,    -1,    -1,    23,    -1,
+      77,    -1,    78,    -1,    72,   231,    -1,    72,     8,    -1,
+      73,    21,   230,    -1,    73,     9,   230,   153,    21,   230,
+     153,    21,   230,    -1,    74,   178,   230,   153,    21,   230,
+     157,   237,   159,    -1,    74,   178,   230,   153,    21,   230,
+     157,   159,    -1,    75,   182,   189,   230,   155,   241,   156,
+      36,    21,   230,   235,    21,   230,    -1,   235,    -1,    76,
+      -1,   237,   178,   228,   153,    21,   230,    -1,   178,   228,
+     153,    21,   230,    -1,   180,   243,    -1,   191,   157,   230,
+     153,   230,   159,    -1,   239,   153,   157,   230,   153,   230,
+     159,    -1,   231,    -1,   240,   153,   231,    -1,   240,    -1,
+      -1,    60,    59,    -1,    59,    -1,   169,   191,   230,   153,
+     230,    -1,   170,   191,   230,   153,   230,    -1,   171,   191,
+     230,   153,   230,    -1,   103,   172,   191,   230,   153,   230,
+      -1,   104,   173,   191,   230,   153,   230,    -1,    49,   231,
+      -1,   174,   231,   153,   231,    -1,   175,   231,    36,   191,
+      -1,   112,   231,   153,   231,   153,   231,    -1,   113,   231,
+     153,   191,    -1,   117,   231,   153,   191,    -1,   118,   231,
+     153,   191,    -1,   114,   231,   153,   231,    -1,   115,   231,
+     153,   231,   153,   231,    -1,   116,   231,   153,   231,   153,
+     231,    -1,   111,   239,    -1,   242,   182,   189,   230,   155,
+     241,   156,    -1,   246,    -1,   153,   240,    -1,    -1,    35,
+      -1,    -1,   105,   191,   184,    -1,   105,   191,   153,    15,
+     230,   184,    -1,   106,   191,   184,    -1,   106,   191,   153,
+      15,   230,   184,    -1,   107,   231,    -1,   245,   108,   191,
+     230,    -1,   245,   109,   231,   153,   191,   230,    -1,   110,
+     191,   230,   244,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -2505,15 +2506,16 @@
     2675,  2675,  2683,  2683,  2691,  2691,  2700,  2702,  2704,  2709,
     2723,  2724,  2728,  2731,  2739,  2743,  2750,  2754,  2758,  2762,
     2770,  2770,  2774,  2775,  2779,  2787,  2792,  2800,  2801,  2808,
-    2815,  2819,  3004,  3004,  3008,  3018,  3018,  3022,  3027,  3028,
-    3029,  3033,  3034,  3033,  3046,  3047,  3052,  3053,  3054,  3055,
-    3059,  3063,  3064,  3065,  3066,  3087,  3091,  3105,  3106,  3111,
-    3111,  3119,  3129,  3132,  3141,  3152,  3157,  3166,  3177,  3177,
-    3180,  3184,  3188,  3193,  3203,  3221,  3230,  3295,  3299,  3306,
-    3318,  3333,  3363,  3373,  3383,  3387,  3394,  3395,  3399,  3402,
-    3408,  3427,  3445,  3461,  3475,  3489,  3500,  3518,  3527,  3536,
-    3543,  3564,  3588,  3594,  3600,  3606,  3622,  3706,  3714,  3715,
-    3719,  3720,  3724,  3730,  3737,  3743,  3750,  3757,  3770,  3796
+    2815,  2819,  3000,  3000,  3004,  3004,  3014,  3014,  3018,  3023,
+    3024,  3025,  3029,  3030,  3029,  3042,  3043,  3048,  3049,  3050,
+    3051,  3055,  3059,  3060,  3061,  3062,  3083,  3087,  3101,  3102,
+    3107,  3107,  3115,  3125,  3128,  3137,  3148,  3153,  3162,  3173,
+    3173,  3176,  3180,  3184,  3189,  3199,  3217,  3226,  3291,  3295,
+    3302,  3314,  3329,  3359,  3369,  3379,  3383,  3390,  3391,  3395,
+    3398,  3404,  3423,  3441,  3457,  3471,  3485,  3496,  3514,  3523,
+    3532,  3539,  3560,  3584,  3590,  3596,  3602,  3618,  3702,  3710,
+    3711,  3715,  3716,  3720,  3726,  3733,  3739,  3746,  3753,  3766,
+    3792
 };
 #endif
 
@@ -2556,7 +2558,7 @@
   "@2", "@3", "@4", "AsmBlock", "BigOrLittle", "TargetDefinition",
   "LibrariesDefinition", "LibList", "Name", "OptName", "ArgVal",
   "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN", "FunctionHeader",
-  "END", "Function", "FnDeclareLinkage", "FunctionProto", "@5", "@6",
+  "@5", "END", "Function", "FnDeclareLinkage", "FunctionProto", "@6", "@7",
   "OptSideEffect", "ConstValueRef", "SymbolicValueRef", "ValueRef",
   "ResolvedVal", "BasicBlockList", "BasicBlock", "InstructionList",
   "Unwind", "BBTerminatorInst", "JumpTable", "Inst", "PHIList",
@@ -2615,15 +2617,16 @@
      204,   202,   205,   202,   206,   202,   202,   202,   202,   207,
      208,   208,   209,   209,   209,   209,   210,   211,   211,   211,
      212,   212,   213,   213,   214,   215,   215,   216,   216,   216,
-     216,   217,   218,   218,   219,   220,   220,   221,   222,   222,
-     222,   224,   225,   223,   226,   226,   227,   227,   227,   227,
-     227,   227,   227,   227,   227,   227,   227,   228,   228,   229,
-     229,   230,   231,   231,   232,   233,   233,   233,   234,   234,
-     235,   235,   235,   235,   235,   235,   235,   235,   235,   236,
-     236,   237,   238,   238,   239,   239,   240,   240,   241,   241,
-     242,   242,   242,   242,   242,   242,   242,   242,   242,   242,
-     242,   242,   242,   242,   242,   242,   242,   242,   243,   243,
-     244,   244,   245,   245,   245,   245,   245,   245,   245,   245
+     216,   217,   218,   218,   220,   219,   221,   221,   222,   223,
+     223,   223,   225,   226,   224,   227,   227,   228,   228,   228,
+     228,   228,   228,   228,   228,   228,   228,   228,   229,   229,
+     230,   230,   231,   232,   232,   233,   234,   234,   234,   235,
+     235,   236,   236,   236,   236,   236,   236,   236,   236,   236,
+     237,   237,   238,   239,   239,   240,   240,   241,   241,   242,
+     242,   243,   243,   243,   243,   243,   243,   243,   243,   243,
+     243,   243,   243,   243,   243,   243,   243,   243,   243,   244,
+     244,   245,   245,   246,   246,   246,   246,   246,   246,   246,
+     246
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -2651,15 +2654,16 @@
        0,     7,     0,     7,     0,     7,     3,     4,     0,     1,
        1,     1,     3,     3,     3,     3,     3,     3,     1,     0,
        1,     1,     1,     0,     2,     3,     1,     1,     3,     1,
-       0,     8,     1,     1,     3,     1,     1,     2,     0,     1,
-       1,     0,     0,     5,     0,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     3,     1,     5,     1,     1,     1,
-       1,     2,     2,     2,     3,     2,     0,     1,     1,     1,
-       2,     2,     3,     9,     9,     8,    13,     1,     1,     6,
-       5,     2,     6,     7,     1,     3,     1,     0,     2,     1,
-       5,     5,     5,     6,     6,     2,     4,     4,     6,     4,
-       4,     4,     4,     6,     6,     2,     7,     1,     2,     0,
-       1,     0,     3,     6,     3,     6,     2,     4,     6,     4
+       0,     8,     1,     1,     0,     4,     1,     1,     2,     0,
+       1,     1,     0,     0,     5,     0,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     3,     1,     5,     1,     1,
+       1,     1,     2,     2,     2,     3,     2,     0,     1,     1,
+       1,     2,     2,     3,     9,     9,     8,    13,     1,     1,
+       6,     5,     2,     6,     7,     1,     3,     1,     0,     2,
+       1,     5,     5,     5,     6,     6,     2,     4,     4,     6,
+       4,     4,     4,     4,     6,     6,     2,     7,     1,     2,
+       0,     1,     0,     3,     6,     3,     6,     2,     4,     6,
+       4
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -2667,161 +2671,163 @@
    means the default is an error.  */
 static const unsigned short int yydefact[] =
 {
-     198,     0,    90,   184,     1,   183,   231,    83,    84,    85,
-      86,    87,    88,    89,     0,    91,   256,   180,   181,   256,
-     210,   211,     0,     0,     0,    90,     0,   186,   228,     0,
-       0,    92,    93,    94,    95,    96,    97,     0,     0,   257,
-     253,    82,   225,   226,   227,   252,     0,     0,     0,     0,
-     196,     0,     0,     0,     0,     0,     0,     0,    81,   229,
-     230,   232,   199,   182,    98,     2,     3,   111,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-     128,     0,     0,     0,     0,   247,     0,     0,   110,   127,
-     114,   248,   129,   222,   223,   224,   301,   255,     0,     0,
-       0,     0,   209,   197,   187,   185,   177,   178,     0,     0,
-       0,     0,    91,   130,     0,     0,     0,   113,   135,   139,
-       0,     0,   144,   138,   300,     0,   279,     0,     0,     0,
-       0,    91,   268,   258,   259,     6,     7,     8,     9,    10,
+     198,     0,    90,   184,     1,   183,   232,    83,    84,    85,
+      86,    87,    88,    89,     0,   224,   257,   180,   181,   257,
+     210,   211,     0,     0,     0,    90,     0,   186,   229,     0,
+      91,   258,   254,    82,   226,   227,   228,   253,     0,     0,
+       0,     0,   196,     0,     0,     0,     0,     0,     0,     0,
+      81,   230,   231,   233,   199,   182,     0,    92,    93,    94,
+      95,    96,    97,     0,     0,   302,   256,     0,     0,     0,
+       0,   209,   197,   187,     2,     3,   111,   115,   116,   117,
+     118,   119,   120,   121,   122,   123,   124,   125,   126,   128,
+       0,     0,     0,     0,   248,   185,     0,   110,   127,   114,
+     249,   129,   177,   178,     0,     0,     0,     0,    91,    98,
+       0,   222,   223,   225,   301,     0,   280,     0,     0,     0,
+       0,    91,   269,   259,   260,     6,     7,     8,     9,    10,
       11,    12,    13,    14,    15,    16,    17,    18,    19,    52,
       53,    54,    55,    20,    21,    22,    23,    24,    25,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,    68,    56,    57,    58,    59,    60,    61,
       62,    63,    64,    65,    66,    67,     0,     0,     0,     0,
-       0,   267,   254,    91,   271,     0,   297,   204,   201,   200,
-     202,   203,   205,   208,     0,   192,   194,   190,   115,   116,
+       0,   268,   255,    91,   272,     0,   298,   204,   201,   200,
+     202,   203,   205,   208,     0,   130,     0,     0,     0,   113,
+     135,   139,     0,   144,   138,   192,   194,   190,   115,   116,
      117,   118,   119,   120,   121,   122,   123,   124,   125,     0,
-       0,     0,     0,   188,   233,     0,     0,     0,     0,     0,
-     134,   220,   143,   141,     0,     0,   285,   278,   261,   260,
-       0,     0,    72,    76,    71,    75,    70,    74,    69,    73,
-      77,    78,     0,     0,    26,    27,    28,    29,    30,    31,
-      32,    33,    34,    35,     0,    50,    51,    46,    47,    48,
-      49,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,     0,   101,   101,   306,     0,     0,   295,     0,     0,
+       0,     0,     0,   188,   234,     0,     0,   286,   279,   262,
+     261,     0,     0,    72,    76,    71,    75,    70,    74,    69,
+      73,    77,    78,     0,     0,    26,    27,    28,    29,    30,
+      31,    32,    33,    34,    35,     0,    50,    51,    46,    47,
+      48,    49,    36,    37,    38,    39,    40,    41,    42,    43,
+      44,    45,     0,   101,   101,   307,     0,     0,   296,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   206,   106,   106,   106,   160,   161,
+       0,     0,     0,     0,     0,   206,     0,     0,     0,     0,
+       0,   134,   143,   141,     0,   106,   106,   106,   160,   161,
        4,     5,   158,   159,   162,   157,   153,   154,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   156,   155,   106,   112,   112,   137,
-       0,   140,   219,   213,   216,   217,     0,     0,   131,   236,
-     237,   238,   243,   239,   240,   241,   242,   234,     0,   245,
-     250,   249,   251,     0,   262,     0,     0,     0,     0,     0,
-     302,     0,   304,   299,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   156,   155,   106,   220,   237,   238,
+     239,   244,   240,   241,   242,   243,   235,     0,   246,   251,
+     250,   252,     0,   263,     0,     0,     0,     0,     0,   303,
+       0,   305,   300,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   207,     0,   193,   195,   191,     0,     0,     0,     0,
-       0,     0,     0,   146,   176,     0,     0,     0,   150,     0,
-     147,     0,     0,     0,     0,     0,   189,   132,   133,   136,
-     212,   214,     0,   104,   142,   235,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   309,     0,     0,
-       0,   289,   292,     0,     0,   290,   291,     0,     0,     0,
-     286,   287,     0,   307,     0,     0,     0,   108,   106,     0,
-       0,   299,     0,     0,     0,     0,     0,   145,   135,   114,
-       0,   148,   149,     0,     0,     0,     0,     0,   218,   215,
-     105,    99,     0,   244,     0,     0,   277,     0,     0,   101,
-     102,   101,   274,   298,     0,     0,     0,     0,     0,   280,
-     281,   282,   277,     0,   103,   109,   107,     0,     0,     0,
-       0,     0,     0,     0,   175,   152,     0,     0,     0,     0,
-       0,     0,     0,   221,     0,     0,     0,   276,     0,   283,
-     284,     0,   303,   305,     0,     0,     0,   288,   293,   294,
-       0,   308,     0,     0,   164,     0,     0,     0,     0,   151,
-       0,     0,     0,     0,     0,   100,   246,     0,     0,     0,
-     275,   272,     0,   296,     0,     0,     0,   172,     0,     0,
-     166,   167,   168,   171,   163,     0,   265,     0,     0,     0,
-     273,   169,   170,     0,     0,     0,   263,     0,   264,     0,
-       0,   165,   173,   174,     0,     0,     0,     0,     0,     0,
-     270,     0,     0,   269,   266
+     207,   112,   112,   137,     0,   140,     0,   131,     0,   193,
+     195,   191,     0,     0,     0,     0,     0,     0,     0,   146,
+     176,     0,     0,     0,   150,     0,   147,     0,     0,     0,
+       0,     0,   189,   219,   213,   216,   217,     0,   236,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     310,     0,     0,     0,   290,   293,     0,     0,   291,   292,
+       0,     0,     0,   287,   288,     0,   308,     0,   132,   133,
+     136,   142,     0,     0,   108,   106,     0,     0,   300,     0,
+       0,     0,     0,     0,   145,   135,   114,     0,   148,   149,
+       0,     0,     0,     0,     0,   212,   214,     0,   104,     0,
+     245,     0,     0,   278,     0,     0,   101,   102,   101,   275,
+     299,     0,     0,     0,     0,     0,   281,   282,   283,   278,
+       0,   103,   109,   107,     0,     0,     0,     0,     0,     0,
+       0,   175,   152,     0,     0,     0,     0,     0,     0,   218,
+     215,   105,    99,     0,     0,     0,   277,     0,   284,   285,
+       0,   304,   306,     0,     0,     0,   289,   294,   295,     0,
+     309,     0,     0,   164,     0,     0,     0,     0,   151,     0,
+       0,     0,     0,     0,     0,   221,   247,     0,     0,     0,
+     276,   273,     0,   297,     0,     0,     0,   172,     0,     0,
+     166,   167,   168,   171,   163,   100,     0,   266,     0,     0,
+       0,   274,   169,   170,     0,     0,     0,   264,     0,   265,
+       0,     0,   165,   173,   174,     0,     0,     0,     0,     0,
+       0,   271,     0,     0,   270,   267
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
 static const short int yydefgoto[] =
 {
-      -1,    85,   312,   329,   330,   331,   264,   281,   332,   333,
-     219,   220,   252,   221,    25,    15,    37,   523,   370,   457,
-     481,   393,   458,    86,    87,   222,    89,    90,   120,   234,
-     404,   359,   405,   108,     1,     2,     3,   336,   307,   305,
-     306,    63,   200,    50,   103,   204,    91,   421,   344,   345,
-     346,    38,    95,    16,    44,    17,    61,    18,    28,   112,
-     426,   360,    92,   362,   492,    19,    40,    41,   191,   192,
-     578,    97,   287,   527,   528,   193,   194,   437,   195,   196
+      -1,    94,   312,   329,   330,   331,   255,   272,   332,   333,
+     219,   220,   243,   221,    25,    15,    63,   555,   359,   454,
+     522,   389,   455,    95,    96,   222,    98,    99,   202,   304,
+     400,   348,   401,   104,     1,     2,     3,   336,   307,   305,
+     306,    55,   190,    42,    72,   194,   100,   476,   415,   416,
+     417,    64,   113,    16,    30,    36,    17,    53,    18,    28,
+     108,   419,   349,   101,   351,   489,    19,    32,    33,   181,
+     182,   579,    66,   278,   526,   527,   183,   184,   430,   185,
+     186
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -555
+#define YYPACT_NINF -542
 static const short int yypact[] =
 {
-    -555,   136,    58,   247,  -555,  -555,  -555,  -555,  -555,  -555,
-    -555,  -555,  -555,  -555,    96,   181,   141,  -555,  -555,    -9,
-    -555,  -555,    16,     7,   114,    65,    39,  -555,    50,   188,
-     210,  -555,  -555,  -555,  -555,  -555,  -555,  1357,   -19,  -555,
-    -555,   134,  -555,  -555,  -555,  -555,    68,    69,    70,    73,
-    -555,    60,   188,  1357,     4,     4,     4,     4,  -555,  -555,
-    -555,  -555,  -555,  -555,  -555,  -555,  -555,    63,  -555,  -555,
-    -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,
-    -555,   222,   224,     1,   171,  -555,   134,    84,  -555,  -555,
-    -103,  -555,  -555,  -555,  -555,  -555,  1611,  -555,   216,    66,
-     238,   219,   233,  -555,  -555,  -555,  -555,  -555,  1418,  1418,
-    1418,  1459,   181,  -555,   100,   101,   737,  -555,  -555,  -103,
-    -112,   105,   803,  -555,  -555,  1418,  -555,   202,  1479,    13,
-     221,   181,  -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,
-    -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,
-    -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,    77,
-     377,  1418,  1418,  1418,  1418,  1418,  1418,  1418,  1418,  1418,
-    1418,  1418,  1418,  -555,  -555,  -555,  -555,  -555,  -555,  -555,
-    -555,  -555,  -555,  -555,  -555,  -555,  1418,  1418,  1418,  1418,
-    1418,  -555,  -555,   181,  -555,    33,  -555,  -555,  -555,  -555,
-    -555,  -555,  -555,  -555,   -15,  -555,  -555,  -555,    36,   158,
-     262,   164,   264,   167,   266,   169,   268,   269,   270,   204,
-     271,   274,   579,  -555,  -555,  1418,  1418,   121,   -67,  1418,
-    -555,  1199,  -555,   120,   127,   920,  -555,  -555,    63,  -555,
-     920,   920,  -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,
-    -555,  -555,   920,  1357,  -555,  -555,  -555,  -555,  -555,  -555,
-    -555,  -555,  -555,  -555,  1418,  -555,  -555,  -555,  -555,  -555,
-    -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,
-    -555,  1418,   142,   143,  -555,   920,   147,   153,   154,   155,
-     157,   165,   166,   168,   170,   920,   920,   920,   173,   275,
-    1357,  1418,  1418,   293,  -555,   174,   174,   174,  -555,  -555,
-    -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,    77,   377,
-     175,   177,   180,   182,   183,  1240,  1520,   757,   296,   192,
-     193,   199,   203,   207,  -555,  -555,   174,   -45,   -71,  -555,
-     161,  -103,  -555,   134,  -555,   176,   209,  1260,  -555,  -555,
-    -555,  -555,  -555,  -555,  -555,  -555,  -555,   261,  1459,  -555,
-    -555,  -555,  -555,   206,  -555,   213,   920,   920,   920,    -2,
-    -555,     0,  -555,   215,   920,   179,  1418,  1418,  1418,  1418,
-    1418,  1418,  1418,   217,   218,   223,  1418,  1418,   920,   920,
-     226,  -555,   -17,  -555,  -555,  -555,   214,   220,  1459,  1459,
-    1459,  1459,  1459,  -555,  -555,   -13,   778,   -94,  -555,   -40,
-    -555,  1459,  1459,  1459,  1459,  1459,  -555,  -555,  -555,  -555,
-    -555,  -555,  1301,   346,  -555,  -555,   357,   -69,   361,   362,
-     229,   234,   235,   920,   382,   920,  1418,  -555,   236,   920,
-     237,  -555,  -555,   239,   240,  -555,  -555,   920,   920,   920,
-    -555,  -555,   241,  -555,  1418,   367,   390,  -555,   174,  1459,
-    1459,   215,   242,   245,   248,   249,  1459,  -555,   254,   -16,
-      -8,  -555,  -555,   250,   253,   263,   272,   364,  -555,  -555,
-    -555,   366,   273,  -555,   920,   920,  1418,   920,   920,   276,
-    -555,   276,  -555,   279,   920,   280,  1418,  1418,  1418,  -555,
-    -555,  -555,  1418,   920,  -555,  -555,  -555,   281,   282,   283,
-    1459,  1459,  1459,  1459,  -555,  -555,   284,  1459,  1459,  1459,
-    1459,  1418,   423,  -555,   416,   288,   285,   279,   290,  -555,
-    -555,   391,  -555,  -555,  1418,   294,   920,  -555,  -555,  -555,
-     291,  -555,  1459,  1459,  -555,   299,   298,   302,   303,  -555,
-     301,   306,   307,   308,   310,  -555,  -555,   437,    15,   432,
-    -555,  -555,   312,  -555,   316,   319,  1459,  -555,  1459,  1459,
-    -555,  -555,  -555,  -555,  -555,   920,  -555,  1046,    64,   460,
-    -555,  -555,  -555,   326,   329,   331,  -555,   335,  -555,  1046,
-     920,  -555,  -555,  -555,   468,   337,   132,   920,   470,   472,
-    -555,   920,   920,  -555,  -555
+    -542,    13,   162,   567,  -542,  -542,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,    83,  -542,    19,  -542,  -542,   -14,
+    -542,  -542,    50,   -87,    87,   233,    27,  -542,   123,   141,
+     175,  -542,  -542,    98,  -542,  -542,  -542,  -542,    33,    40,
+      66,    68,  -542,    14,   141,  1265,   156,   156,   156,   156,
+    -542,  -542,  -542,  -542,  -542,  -542,   221,  -542,  -542,  -542,
+    -542,  -542,  -542,  1265,   -19,  1479,  -542,   204,   135,   226,
+     227,   235,  -542,  -542,  -542,  -542,    81,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
+     256,   257,     4,    15,  -542,  -542,   108,  -542,  -542,    12,
+    -542,  -542,  -542,  -542,  1306,  1306,  1306,  1326,   175,  -542,
+      98,  -542,  -542,  -542,  -542,  1306,  -542,   205,  1367,   116,
+     479,   175,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,   355,
+     429,  1306,  1306,  1306,  1306,  1306,  1306,  1306,  1306,  1306,
+    1306,  1306,  1306,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  -542,  1306,  1306,  1306,  1306,
+    1306,  -542,  -542,   175,  -542,    86,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,   -13,  -542,   110,   111,    75,  -542,
+    -542,    12,   -81,  1046,  -542,  -542,  -542,  -542,   174,   208,
+     266,   210,   267,   212,   268,   230,   277,   275,   278,   246,
+     280,   279,   566,  -542,  -542,   136,   766,  -542,  -542,    81,
+    -542,   766,   766,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,   766,  1265,  -542,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  1306,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
+    -542,  -542,  1306,   137,   145,  -542,   766,   132,   146,   147,
+     148,   149,   151,   152,   158,   160,   766,   766,   766,   161,
+     281,  1265,  1306,  1306,   291,  -542,  1306,  1306,   155,   -27,
+    1306,  -542,  -542,   165,   163,   176,   176,   176,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,   355,   429,
+     172,   177,   178,   179,   182,  1087,  1387,   529,   311,   184,
+     185,   186,   188,   189,  -542,  -542,   176,  1107,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  -542,   282,  1326,  -542,  -542,
+    -542,  -542,   193,  -542,   194,   766,   766,   766,     7,  -542,
+      20,  -542,   195,   766,   192,  1306,  1306,  1306,  1306,  1306,
+    1306,  1306,   200,   201,   206,  1306,  1306,   766,   766,   207,
+    -542,   -59,  -149,  -542,   196,    12,  1148,  -542,    44,  -542,
+    -542,  -542,   203,   211,  1326,  1326,  1326,  1326,  1326,  -542,
+    -542,    -8,   741,   -82,  -542,    10,  -542,  1326,  1326,  1326,
+    1326,  1326,  -542,  -542,    98,  -542,   214,   209,  -542,   337,
+     -34,   342,   348,   215,   218,   219,   766,   371,   766,  1306,
+    -542,   223,   766,   224,  -542,  -542,   225,   234,  -542,  -542,
+     766,   766,   766,  -542,  -542,   228,  -542,  1306,  -542,  -542,
+    -542,  -542,   362,   375,  -542,   176,  1326,  1326,   195,   236,
+     237,   240,   243,  1326,  -542,   238,   -25,    11,  -542,  -542,
+     244,   245,   247,   250,   352,  -542,  -542,  1205,   370,   252,
+    -542,   766,   766,  1306,   766,   766,   258,  -542,   258,  -542,
+     259,   766,   264,  1306,  1306,  1306,  -542,  -542,  -542,  1306,
+     766,  -542,  -542,  -542,   270,   271,   263,  1326,  1326,  1326,
+    1326,  -542,  -542,   260,  1326,  1326,  1326,  1326,  1306,  -542,
+    -542,  -542,   368,   402,   274,   276,   259,   287,  -542,  -542,
+     374,  -542,  -542,  1306,   285,   766,  -542,  -542,  -542,   290,
+    -542,  1326,  1326,  -542,   283,   295,   284,   294,  -542,   296,
+     297,   299,   302,   303,   430,  -542,  -542,   414,    41,   425,
+    -542,  -542,   305,  -542,   306,   310,  1326,  -542,  1326,  1326,
+    -542,  -542,  -542,  -542,  -542,  -542,   766,  -542,   893,   144,
+     448,  -542,  -542,  -542,   314,   315,   316,  -542,   331,  -542,
+     893,   766,  -542,  -542,  -542,   464,   334,   180,   766,   481,
+     482,  -542,   766,   766,  -542,  -542
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -555,  -555,  -555,   398,   399,   400,   198,   200,   402,   403,
-    -128,  -127,  -525,  -555,   476,   493,  -111,  -555,  -276,    97,
-    -555,  -298,  -555,   -47,  -555,   -37,  -555,   -60,   -62,  -555,
-     -99,   300,  -308,    61,  -555,  -555,  -555,  -555,  -555,  -555,
-    -555,   469,  -555,  -555,  -555,  -555,     8,  -555,   102,  -555,
-    -555,   411,  -555,  -555,  -555,  -555,  -555,   523,  -555,  -555,
-    -555,  -554,   -11,   112,  -124,  -555,   508,  -555,   -68,  -555,
-    -555,  -555,  -555,    93,    28,  -555,  -555,    71,  -555,  -555
+    -542,  -542,  -542,   435,   439,   441,   191,   197,   442,   445,
+    -119,  -116,  -541,  -542,   478,   489,  -107,  -542,  -267,    37,
+    -542,  -238,  -542,   -60,  -542,   -45,  -542,   -74,   -51,  -542,
+    -101,   300,  -252,   134,  -542,  -542,  -542,  -542,  -542,  -542,
+    -542,   473,  -542,  -542,  -542,  -542,     8,  -542,    46,  -542,
+    -542,   410,  -542,  -542,  -542,  -542,  -542,  -542,   518,  -542,
+    -542,  -542,  -528,   142,   -90,  -113,  -542,   505,  -542,   -72,
+    -542,  -542,  -542,  -542,    97,    28,  -542,  -542,    70,  -542,
+    -542
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -2831,296 +2837,255 @@
 #define YYTABLE_NINF -180
 static const short int yytable[] =
 {
-      88,   236,   250,   251,   239,   115,   105,   372,   394,   395,
-      93,    26,   223,   433,    39,   435,    88,   455,   407,   409,
-     253,    42,   240,   587,   119,   242,   243,   244,   245,   246,
-     247,   248,   249,   577,   241,   595,   106,   107,   416,   284,
-     456,   229,   288,   289,   290,   291,   292,   293,   294,    26,
-     427,   230,  -112,   589,   228,   434,   119,   434,  -179,   466,
-     233,   123,   119,   308,   309,   298,   299,   471,    46,    47,
-      48,   205,   206,   207,   242,   243,   244,   245,   246,   247,
-     248,   249,   300,     5,   466,    53,   229,    49,   235,     6,
-     418,   235,   483,   123,   121,    59,   340,    60,   470,     7,
-       8,     9,    10,    11,    12,    13,     7,     8,     9,    10,
-      54,    12,    55,   466,   417,    56,   109,   110,   111,   123,
-      14,   198,   199,   472,   282,   283,   235,   285,   286,   235,
-     235,   235,   235,   235,   235,   235,     4,  -139,   303,  -112,
-     466,   301,   302,    94,   304,   466,   467,  -139,   123,   295,
-     296,   297,   235,   235,    43,   516,    20,    29,    21,    51,
-     506,   -72,   -72,   116,    39,   337,   338,   -71,   -71,   341,
-     -70,   -70,   -69,   -69,   576,    52,    65,    66,   390,   117,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,    58,    79,    20,   343,    21,   254,   255,   256,   257,
-     258,   259,   260,   261,   262,   263,   366,   310,   311,   133,
-     134,   335,    62,   532,    64,   533,    88,   102,  -113,    80,
-      98,    99,   100,   588,   361,   101,   113,   367,   114,   361,
-     361,   242,   243,   244,   245,   246,   247,   248,   249,   122,
-     197,   361,   201,   202,   368,    30,    31,    32,    33,    34,
-      35,    36,   440,   388,   442,   443,   444,   203,   225,   226,
-     231,   237,   450,    88,   389,   235,   -76,   -82,   -75,    20,
-     -74,    21,   -73,   347,   361,   313,   -79,   -80,     6,   -82,
-     -82,   314,   339,   348,   361,   361,   361,   341,   -82,   -82,
-     -82,   -82,   -82,   -82,   -82,   369,   371,   -82,    22,   461,
-     462,   463,   464,   465,   374,    23,   375,   376,   377,    24,
-     378,   387,   473,   474,   475,   476,   477,   391,   379,   380,
-     410,   381,   419,   382,   425,    81,   386,   392,    82,   422,
-     398,    83,   399,    84,   118,   400,   439,   401,   402,   235,
-     441,   235,   235,   235,   445,   446,   469,   411,   412,   235,
-     451,   420,   363,   364,   413,   361,   361,   361,   414,   428,
-     507,   508,   415,   361,   365,   423,   429,   514,   436,   459,
-     447,   448,   537,   538,   539,   460,   449,   361,   361,   454,
-     455,   482,   484,   485,   486,   343,   490,   487,   488,   494,
-     496,   504,   497,   498,   505,   510,   502,   373,   511,   235,
-     521,   512,   513,   517,   265,   266,   518,   383,   384,   385,
-     560,   545,   546,   547,   548,   515,   519,   503,   550,   551,
-     552,   553,   361,   522,   361,   520,   524,   555,   361,   531,
-     250,   251,   534,   536,   542,   543,   361,   361,   361,   544,
-     556,   557,   558,   564,   565,   549,   559,   563,   434,   235,
-     250,   251,   566,   561,   567,   568,   569,   570,   575,   235,
-     235,   235,   571,   572,   573,   235,   574,   583,   579,   584,
-     585,   580,   581,   361,   361,   582,   361,   361,   430,   431,
-     432,   590,   591,   361,   554,   592,   438,   593,   594,   597,
-     598,   601,   361,   602,   186,   187,   188,   235,   189,   190,
-     452,   453,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   396,    96,    57,   397,
-     480,   104,   334,   224,   479,   361,    27,    45,   599,   493,
-     540,     0,   509,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   489,     0,   491,     0,     0,
-       0,   495,     0,     0,     0,     0,     0,     0,     0,   499,
-     500,   501,     0,     0,   361,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   361,
-       0,     0,     0,     0,    65,    66,   361,     0,     0,     0,
-     361,   361,     0,     0,     0,     0,   525,   526,     0,   529,
-     530,    20,     0,    21,     0,   315,   535,     0,     0,     0,
-       0,     0,     0,     0,     0,   541,     0,   316,   317,     0,
+      97,   241,   227,   110,   242,   230,   223,   361,   197,    31,
+     111,    26,   449,     4,   244,   204,    34,   578,    97,   201,
+      74,    75,   426,   199,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,   428,    88,    20,   590,    21,
+     275,    26,    31,   279,   280,   281,   282,   283,   284,   285,
+     588,   233,   234,   235,   236,   237,   238,   239,   240,   205,
+     206,   207,   596,    89,   427,    43,   289,   290,   390,   391,
+     226,   463,   300,   226,   403,   405,   291,   427,   452,   468,
+      74,    75,   301,   199,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,   420,    88,    20,   412,    21,
+     448,   453,    38,    39,    40,   204,   273,   274,   226,   276,
+     277,   226,   226,   226,   226,   226,   226,   226,   225,   463,
+      20,    41,    21,    89,   201,   231,   300,   480,  -139,   201,
+    -112,   286,   287,   288,   226,   226,   384,   232,  -139,   204,
+     294,   352,   353,   112,    29,   463,   295,   299,    44,    35,
+     467,   464,   303,   354,   233,   234,   235,   236,   237,   238,
+     239,   240,  -179,   463,   463,    54,   198,  -112,    51,    90,
+      52,    71,    91,   469,   513,    92,   204,    93,   200,    50,
+     379,   105,   106,   107,   355,    67,   362,     5,   102,   103,
+     188,   189,    68,     6,   292,   293,   372,   373,   374,    97,
+     577,   308,   309,     7,     8,     9,    10,    11,    12,    13,
+     356,   -72,   -72,   -71,   -71,   -70,   -70,   503,    69,   531,
+      70,   532,   381,   382,    14,   109,   385,   357,   187,    90,
+     191,   377,    91,   -69,   -69,    92,  -113,    93,   298,    56,
+      57,    58,    59,    60,    61,    62,    97,   378,   226,   310,
+     311,   192,   433,    45,   435,   436,   437,   123,   124,   193,
+     195,   196,   443,   203,   228,   423,   424,   425,   296,   297,
+     -76,   -75,   -74,   431,     7,     8,     9,    10,    46,    12,
+      47,   -73,   -79,    48,   313,   -80,   314,   445,   446,   363,
+     358,   337,   414,   458,   459,   460,   461,   462,   360,   364,
+     365,   366,   367,   589,   368,   369,   470,   471,   472,   473,
+     474,   370,   385,   371,   375,   380,   383,   376,   386,   387,
+     226,   434,   226,   226,   226,   438,   439,   394,   466,   388,
+     226,   444,   395,   396,   397,   406,   486,   398,   488,   407,
+     408,   409,   492,   410,   411,   418,   421,   422,   429,   432,
+     496,   497,   498,   440,   441,   504,   505,   450,   456,   442,
+     447,   479,   511,   481,   335,   478,   457,   477,   350,   482,
+     483,   484,   485,   350,   350,   487,   491,   493,   494,   502,
+     536,   537,   538,   499,   226,   350,   501,   495,   518,   507,
+     508,   524,   525,   509,   528,   529,   510,   514,   515,   512,
+     516,   534,   500,   517,   452,   523,   544,   545,   546,   547,
+     540,   530,   533,   549,   550,   551,   552,   535,   350,   543,
+     560,   548,   475,   541,   542,   554,   556,   557,   350,   350,
+     350,   427,   414,   558,   575,   576,   566,   568,   226,   241,
+     564,   565,   242,   559,   561,   562,   563,   569,   226,   226,
+     226,   567,   570,   571,   226,   572,   256,   257,   573,   574,
+     241,   580,   582,   242,   581,   584,   583,   585,   586,   591,
+     592,   593,   594,   553,   245,   246,   247,   248,   249,   250,
+     251,   252,   253,   254,   595,   598,   587,   599,   226,   233,
+     234,   235,   236,   237,   238,   239,   240,   350,   350,   350,
+     176,   597,   602,   603,   177,   350,   178,   179,   601,   392,
+     180,    65,   604,   605,    49,   521,   393,    73,   224,   350,
+     350,    27,   334,   520,    37,   600,   490,   539,   506,     0,
+       0,     0,     0,     0,    74,    75,     0,   199,   208,   209,
+     210,   211,   212,   213,   214,   215,   216,   217,   218,     0,
+      88,    20,     0,    21,   258,   259,   260,   261,   262,   263,
+     264,   265,   266,   267,   268,   269,   270,   271,   350,     0,
+     350,    74,    75,     0,   350,     0,     0,    89,     0,     0,
+       0,     0,   350,   350,   350,     0,     0,   -82,    20,    20,
+      21,    21,   315,     0,     0,     0,     0,     0,     6,   -82,
+     -82,     0,     0,     0,   316,   317,     0,     0,   -82,   -82,
+     -82,   -82,   -82,   -82,   -82,     0,     0,   -82,    22,     0,
+       0,     0,     0,   350,   350,    23,   350,   350,     0,    24,
+       0,     0,     0,   350,     0,     0,     0,     0,     0,     0,
+       0,     0,   350,     0,     0,   125,   126,   127,   128,   129,
+     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,   148,   318,
+     319,     0,     0,     0,     0,     0,   320,   350,   321,     0,
+     322,   323,   324,    90,     0,     0,    91,     0,     0,    92,
+       0,    93,   404,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   163,   164,   165,   166,   167,
+     168,   169,   170,   171,   172,   173,   174,   175,   350,     0,
+       0,     0,     0,   325,     0,     0,   326,     0,   327,     0,
+       0,   328,     0,   350,     0,     0,     0,     0,     0,     0,
+     350,     0,     0,     0,   350,   350,    74,    75,     0,   199,
+     208,   209,   210,   211,   212,   213,   214,   215,   216,   217,
+     218,     0,    88,    20,     0,    21,     0,     0,     0,   338,
+     339,    74,    75,   340,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    20,    89,
+      21,     0,   341,   342,   343,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   344,   345,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   346,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   562,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   135,   136,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
-     157,   158,   318,   319,     0,     0,     0,   586,     0,   320,
-       0,   321,     0,   322,   323,   324,     0,     0,     0,     0,
-       0,     0,   596,     0,     0,     0,     0,     0,     0,   600,
-       0,     0,     0,   603,   604,     0,     0,     0,   173,   174,
-     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-     185,     0,     0,     0,     0,     0,   325,     0,     0,   326,
-       0,   327,    65,    66,   328,   117,    68,    69,    70,    71,
-      72,    73,    74,    75,    76,    77,    78,     0,    79,    20,
-       0,    21,    65,    66,     0,   117,   208,   209,   210,   211,
-     212,   213,   214,   215,   216,   217,   218,     0,    79,    20,
-       0,    21,     0,    65,    66,    80,   117,   208,   209,   210,
-     211,   212,   213,   214,   215,   216,   217,   218,     0,    79,
-      20,     0,    21,     0,     0,    80,     0,     0,    65,    66,
-       0,   117,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,     0,    79,    20,    80,    21,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     232,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    80,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    81,     0,     0,    82,     0,     0,    83,     0,    84,
-     227,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    81,     0,     0,    82,     0,     0,    83,     0,    84,
-     408,     0,     0,   349,   350,    65,    66,   351,     0,     0,
-       0,     0,    81,     0,     0,    82,     0,     0,    83,     0,
-      84,   468,    20,     0,    21,     0,   352,   353,   354,     0,
-       0,     0,     0,     0,     0,     0,     0,    81,   355,   356,
-      82,     0,     0,    83,     0,    84,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   357,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   135,
-     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
-     146,   147,   148,   149,   150,   151,   152,   153,   154,   155,
-     156,   157,   158,   318,   319,     0,     0,     0,     0,     0,
-     320,     0,   321,     0,   322,   323,   324,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   349,
-     350,     0,     0,   351,     0,     0,     0,     0,     0,   173,
-     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
-     184,   185,   352,   353,   354,     0,     0,     0,     0,     0,
-     358,     0,     0,     0,   355,   356,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   357,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   135,   136,   137,   138,   139,
-     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
-     150,   151,   152,   153,   154,   155,   156,   157,   158,   318,
+       0,     0,     0,     0,     0,   125,   126,   127,   128,   129,
+     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,   148,   318,
      319,     0,     0,     0,     0,     0,   320,     0,   321,     0,
      322,   323,   324,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    90,   338,   339,    91,     0,
+     340,    92,     0,    93,   465,   163,   164,   165,   166,   167,
+     168,   169,   170,   171,   172,   173,   174,   175,     0,   341,
+     342,   343,     0,     0,     0,     0,   347,     0,     0,     0,
+       0,   344,   345,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,   185,     0,     0,
-       0,     0,     0,     0,    65,    66,   358,   117,    68,    69,
-      70,    71,    72,    73,    74,    75,    76,    77,    78,     0,
-      79,    20,     0,    21,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   342,     0,     0,     0,
-       0,     0,     0,     0,     0,    65,    66,    80,   117,   208,
-     209,   210,   211,   212,   213,   214,   215,   216,   217,   218,
-       0,    79,    20,     0,    21,    65,    66,     0,   117,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-       0,    79,    20,     0,    21,     0,     0,     0,    80,     0,
-       0,     0,     0,     0,     0,     0,     0,   424,     0,     0,
-       0,     0,     0,     0,     0,     0,    65,    66,    80,   117,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,     0,    79,    20,     0,    21,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   478,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    80,
-       0,     0,     0,    81,     0,     0,    82,     0,     0,    83,
-       0,    84,    65,    66,     0,    67,    68,    69,    70,    71,
-      72,    73,    74,    75,    76,    77,    78,     0,    79,    20,
-       0,    21,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    81,     0,     0,    82,     0,   403,
-      83,     0,    84,     0,     0,    80,     0,     0,     0,     0,
-       0,     0,     0,     0,    81,     0,     0,    82,     0,     0,
-      83,     0,    84,    65,    66,     0,   117,    68,    69,    70,
-      71,    72,    73,    74,    75,    76,    77,    78,     0,    79,
+       0,     0,     0,     0,   346,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   125,   126,   127,   128,   129,   130,   131,   132,
+     133,   134,   135,   136,   137,   138,   139,   140,   141,   142,
+     143,   144,   145,   146,   147,   148,   318,   319,     0,     0,
+       0,     0,     0,   320,     0,   321,     0,   322,   323,   324,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   163,   164,   165,   166,   167,   168,   169,   170,
+     171,   172,   173,   174,   175,     0,     0,     0,     0,     0,
+       0,    74,    75,   347,   199,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,     0,    88,    20,     0,
+      21,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   302,     0,     0,     0,     0,     0,     0,
+       0,     0,    74,    75,    89,   199,   208,   209,   210,   211,
+     212,   213,   214,   215,   216,   217,   218,     0,    88,    20,
+       0,    21,    74,    75,     0,   199,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,    87,     0,    88,    20,
+       0,    21,     0,     0,     0,    89,     0,     0,     0,     0,
+       0,     0,     0,     0,   413,     0,     0,     0,     0,     0,
+       0,     0,     0,    74,    75,    89,   199,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,     0,    88,
       20,     0,    21,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    81,     0,     0,    82,     0,
-       0,    83,     0,    84,    65,    66,    80,   117,   208,   209,
-     210,   211,   212,   213,   214,   215,   216,   217,   218,     0,
-      79,    20,     0,    21,    65,    66,     0,   238,    68,    69,
-      70,    71,    72,    73,    74,    75,    76,    77,    78,     0,
-      79,    20,     0,    21,     0,     0,     0,    80,     0,     0,
-       0,    81,     0,     0,    82,     0,     0,    83,     0,    84,
-       0,     0,     0,     0,     0,    65,    66,    80,   117,   208,
-     209,   210,   211,   212,   213,   214,   215,   216,   217,   218,
-       0,    79,    20,     0,    21,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   451,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    89,     0,     0,     0,
+      90,     0,     0,    91,     0,     0,    92,     0,    93,     0,
+      74,    75,     0,   199,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,     0,    88,    20,     0,    21,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    80,     0,
-       0,     0,    81,     0,     0,    82,     0,     0,    83,     0,
-      84,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    90,   519,     0,    91,     0,   399,    92,     0,    93,
+       0,     0,     0,    89,     0,     0,     0,     0,     0,     0,
+       0,    90,     0,     0,    91,     0,     0,    92,     0,    93,
+      74,    75,     0,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,     0,    88,    20,     0,    21,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    90,     0,     0,    91,     0,     0,    92,     0,
+      93,    74,    75,    89,   199,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,     0,    88,    20,     0,
+      21,    74,    75,     0,   199,   208,   209,   210,   211,   212,
+     213,   214,   215,   216,   217,   218,     0,    88,    20,     0,
+      21,     0,     0,     0,    89,     0,     0,     0,     0,    90,
+       0,     0,    91,     0,     0,    92,     0,    93,     0,     0,
+       0,     0,    74,    75,    89,   229,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,    87,     0,    88,    20,
+       0,    21,    74,    75,     0,   199,   208,   209,   210,   211,
+     212,   213,   214,   215,   216,   217,   218,     0,    88,    20,
+       0,    21,     0,     0,     0,    89,     0,     0,     0,    90,
+       0,     0,    91,     0,     0,    92,     0,    93,     0,     0,
+       0,     0,     0,     0,     0,    89,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    81,     0,     0,    82,     0,     0,    83,
-       0,    84,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    81,     0,     0,    82,     0,     0,    83,
-       0,    84,     0,     0,     0,     0,   124,     0,     0,     0,
+      90,     0,     0,    91,     0,     0,    92,     0,    93,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     125,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     126,   127,     0,     0,    81,     0,     0,    82,     0,     0,
-      83,     0,   406,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
-     155,   156,   157,   158,   159,   160,   161,   162,   163,     0,
-       0,   164,   165,   166,   167,   168,   169,   170,   171,   172,
+      90,     0,     0,    91,     0,     0,    92,     0,    93,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,   185
+       0,     0,     0,     0,   114,     0,     0,     0,     0,     0,
+       0,    90,     0,     0,    91,     0,     0,    92,   115,    93,
+       0,     0,     0,     0,     0,     0,     0,     0,   116,   117,
+       0,    90,     0,     0,    91,     0,     0,    92,     0,   402,
+       0,   118,   119,   120,   121,   122,   123,   124,   125,   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,   153,     0,     0,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   163,   164,
+     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
+     175
 };
 
 static const short int yycheck[] =
 {
-      37,   125,   130,   130,   128,     4,    53,   283,   306,   307,
-      29,     3,   111,    15,    23,    15,    53,    34,   326,   327,
-     131,    30,     9,   577,    84,    10,    11,    12,    13,    14,
-      15,    16,    17,   558,    21,   589,    32,    33,   336,   163,
-      57,   153,   166,   167,   168,   169,   170,   171,   172,    41,
-     358,   163,   155,   578,   116,    57,   116,    57,     0,   153,
-     122,   164,   122,    27,    28,   189,   190,   161,    52,    53,
-      54,   108,   109,   110,    10,    11,    12,    13,    14,    15,
-      16,    17,   193,    25,   153,    20,   153,    71,   125,    31,
-     161,   128,   161,   164,    86,    45,   163,    47,   406,    41,
-      42,    43,    44,    45,    46,    47,    41,    42,    43,    44,
-      45,    46,    47,   153,   159,    50,    55,    56,    57,   164,
-      62,    55,    56,   163,   161,   162,   163,   164,   165,   166,
-     167,   168,   169,   170,   171,   172,     0,   153,   153,   155,
-     153,   108,   109,   162,   159,   153,   159,   163,   164,   186,
-     187,   188,   189,   190,   163,   163,    22,    61,    24,   152,
-     458,     3,     4,   162,    23,   225,   226,     3,     4,   229,
-       3,     4,     3,     4,   159,    61,     5,     6,   302,     8,
+      45,   120,   115,    63,   120,   118,   107,   274,     4,    23,
+      29,     3,   161,     0,   121,   164,    30,   558,    63,    93,
+       5,     6,    15,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    15,    21,    22,   579,    24,
+     153,    33,    23,   156,   157,   158,   159,   160,   161,   162,
+     578,    10,    11,    12,    13,    14,    15,    16,    17,   104,
+     105,   106,   590,    48,    57,   152,   179,   180,   306,   307,
+     115,   153,   153,   118,   326,   327,   183,    57,    34,   161,
+       5,     6,   163,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,   347,    21,    22,   336,    24,
+     159,    57,    52,    53,    54,   164,   151,   152,   153,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   110,   153,
+      22,    71,    24,    48,   198,     9,   153,   161,   153,   203,
+     155,   176,   177,   178,   179,   180,   163,    21,   163,   164,
+     153,   231,   232,   162,    61,   153,   159,   198,    61,   163,
+     402,   159,   203,   243,    10,    11,    12,    13,    14,    15,
+      16,    17,     0,   153,   153,    24,   162,   155,    45,   154,
+      47,   157,   157,   163,   163,   160,   164,   162,   163,   152,
+     293,    47,    48,    49,   244,   152,   276,    25,    32,    33,
+      55,    56,   152,    31,   108,   109,   286,   287,   288,   244,
+     159,    27,    28,    41,    42,    43,    44,    45,    46,    47,
+     255,     3,     4,     3,     4,     3,     4,   455,   152,   486,
+     152,   488,   296,   297,    62,     4,   300,   272,    24,   154,
+       4,   291,   157,     3,     4,   160,   155,   162,   163,    64,
+      65,    66,    67,    68,    69,    70,   291,   292,   293,     3,
+       4,    24,   365,    20,   367,   368,   369,    77,    78,    24,
+       4,     4,   375,   155,    59,   355,   356,   357,   158,   158,
+       4,     4,     4,   363,    41,    42,    43,    44,    45,    46,
+      47,     4,     7,    50,     4,     7,     7,   377,   378,   157,
+     153,   155,   337,   394,   395,   396,   397,   398,   153,   153,
+     153,   153,   153,   159,   153,   153,   407,   408,   409,   410,
+     411,   153,   386,   153,   153,    24,   161,    36,   153,   156,
+     365,   366,   367,   368,   369,   370,   371,   155,   402,   153,
+     375,   376,   155,   155,   155,    24,   426,   155,   428,   155,
+     155,   155,   432,   155,   155,    63,   153,   153,   153,   157,
+     440,   441,   442,   153,   153,   456,   457,   161,   155,   153,
+     153,    24,   463,    21,   222,   156,   155,   153,   226,    21,
+     155,   153,   153,   231,   232,     4,   153,   153,   153,     4,
+     493,   494,   495,   155,   429,   243,    24,   153,    36,   153,
+     153,   481,   482,   153,   484,   485,   153,   153,   153,   161,
+     153,   491,   447,   153,    34,   153,   507,   508,   509,   510,
+     500,   153,   153,   514,   515,   516,   517,   153,   276,   156,
+     533,   161,   414,   153,   153,    57,    24,   153,   286,   287,
+     288,    57,   477,   157,     4,    21,   153,   153,   483,   558,
+     541,   542,   558,   156,   159,   535,   156,   153,   493,   494,
+     495,   156,   156,   156,   499,   156,    27,    28,   156,   156,
+     579,    36,   156,   579,   159,   566,   156,   568,   569,    21,
+     156,   156,   156,   518,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   153,    21,   576,   153,   533,    10,
+      11,    12,    13,    14,    15,    16,    17,   355,   356,   357,
+      65,   591,    21,    21,    65,   363,    65,    65,   598,   318,
+      65,    33,   602,   603,    25,   478,   319,    44,   108,   377,
+     378,     3,   222,   477,    19,   597,   429,   499,   458,    -1,
+      -1,    -1,    -1,    -1,     5,     6,    -1,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    -1,
+      21,    22,    -1,    24,   125,   126,   127,   128,   129,   130,
+     131,   132,   133,   134,   135,   136,   137,   138,   426,    -1,
+     428,     5,     6,    -1,   432,    -1,    -1,    48,    -1,    -1,
+      -1,    -1,   440,   441,   442,    -1,    -1,    20,    22,    22,
+      24,    24,    26,    -1,    -1,    -1,    -1,    -1,    31,    32,
+      33,    -1,    -1,    -1,    38,    39,    -1,    -1,    41,    42,
+      43,    44,    45,    46,    47,    -1,    -1,    50,    51,    -1,
+      -1,    -1,    -1,   481,   482,    58,   484,   485,    -1,    62,
+      -1,    -1,    -1,   491,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   500,    -1,    -1,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,    -1,    -1,    -1,    -1,    -1,   110,   535,   112,    -1,
+     114,   115,   116,   154,    -1,    -1,   157,    -1,    -1,   160,
+      -1,   162,   163,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   139,   140,   141,   142,   143,
+     144,   145,   146,   147,   148,   149,   150,   151,   576,    -1,
+      -1,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -1,
+      -1,   165,    -1,   591,    -1,    -1,    -1,    -1,    -1,    -1,
+     598,    -1,    -1,    -1,   602,   603,     5,     6,    -1,     8,
        9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,   152,    21,    22,   231,    24,   119,   120,   121,   122,
-     123,   124,   125,   126,   127,   128,   253,     3,     4,    77,
-      78,   222,    24,   489,     4,   491,   253,   157,   155,    48,
-     152,   152,   152,   159,   235,   152,     4,   264,     4,   240,
-     241,    10,    11,    12,    13,    14,    15,    16,    17,   155,
-      24,   252,     4,    24,   281,    64,    65,    66,    67,    68,
-      69,    70,   376,   300,   378,   379,   380,    24,   158,   158,
-     155,    59,   386,   300,   301,   302,     4,    20,     4,    22,
-       4,    24,     4,   153,   285,     4,     7,     7,    31,    32,
-      33,     7,   161,   156,   295,   296,   297,   347,    41,    42,
-      43,    44,    45,    46,    47,   153,   153,    50,    51,   398,
-     399,   400,   401,   402,   157,    58,   153,   153,   153,    62,
-     153,    36,   411,   412,   413,   414,   415,    24,   153,   153,
-      24,   153,   161,   153,    63,   154,   153,   153,   157,   153,
-     155,   160,   155,   162,   163,   155,   157,   155,   155,   376,
-     377,   378,   379,   380,   381,   382,   406,   155,   155,   386,
-     387,   343,   240,   241,   155,   366,   367,   368,   155,   153,
-     459,   460,   155,   374,   252,   156,   153,   466,   153,   155,
-     153,   153,   496,   497,   498,   155,   153,   388,   389,   153,
-      34,    24,    21,    21,   155,   422,     4,   153,   153,   153,
-     153,    24,   153,   153,     4,   153,   155,   285,   153,   436,
-      36,   153,   153,   153,    27,    28,   153,   295,   296,   297,
-     534,   510,   511,   512,   513,   161,   153,   454,   517,   518,
-     519,   520,   433,    57,   435,   153,   153,     4,   439,   153,
-     558,   558,   153,   153,   153,   153,   447,   448,   449,   156,
-      24,   153,   157,   542,   543,   161,   156,   156,    57,   486,
-     578,   578,   153,   159,   156,   153,   153,   156,    21,   496,
-     497,   498,   156,   156,   156,   502,   156,   566,    36,   568,
-     569,   159,   156,   484,   485,   156,   487,   488,   366,   367,
-     368,    21,   156,   494,   521,   156,   374,   156,   153,    21,
-     153,    21,   503,    21,    96,    96,    96,   534,    96,    96,
-     388,   389,   125,   126,   127,   128,   129,   130,   131,   132,
-     133,   134,   135,   136,   137,   138,   318,    41,    25,   319,
-     423,    52,   222,   112,   422,   536,     3,    19,   596,   436,
-     502,    -1,   461,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   433,    -1,   435,    -1,    -1,
-      -1,   439,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   447,
-     448,   449,    -1,    -1,   575,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   590,
-      -1,    -1,    -1,    -1,     5,     6,   597,    -1,    -1,    -1,
-     601,   602,    -1,    -1,    -1,    -1,   484,   485,    -1,   487,
-     488,    22,    -1,    24,    -1,    26,   494,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   503,    -1,    38,    39,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   536,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,    -1,    -1,    -1,   575,    -1,   110,
-      -1,   112,    -1,   114,   115,   116,    -1,    -1,    -1,    -1,
-      -1,    -1,   590,    -1,    -1,    -1,    -1,    -1,    -1,   597,
-      -1,    -1,    -1,   601,   602,    -1,    -1,    -1,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,    -1,    -1,    -1,    -1,    -1,   157,    -1,    -1,   160,
-      -1,   162,     5,     6,   165,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    -1,    21,    22,
-      -1,    24,     5,     6,    -1,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    -1,    21,    22,
-      -1,    24,    -1,     5,     6,    48,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    -1,    21,
-      22,    -1,    24,    -1,    -1,    48,    -1,    -1,     5,     6,
-      -1,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    -1,    21,    22,    48,    24,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      37,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    48,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,
-     163,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,
-     163,    -1,    -1,     3,     4,     5,     6,     7,    -1,    -1,
-      -1,    -1,   154,    -1,    -1,   157,    -1,    -1,   160,    -1,
-     162,   163,    22,    -1,    24,    -1,    26,    27,    28,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   154,    38,    39,
-     157,    -1,    -1,   160,    -1,   162,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    61,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    79,
-      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
-      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
-     100,   101,   102,   103,   104,    -1,    -1,    -1,    -1,    -1,
-     110,    -1,   112,    -1,   114,   115,   116,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,
-       4,    -1,    -1,     7,    -1,    -1,    -1,    -1,    -1,   139,
-     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
-     150,   151,    26,    27,    28,    -1,    -1,    -1,    -1,    -1,
-     160,    -1,    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,
+      19,    -1,    21,    22,    -1,    24,    -1,    -1,    -1,     3,
+       4,     5,     6,     7,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    22,    48,
+      24,    -1,    26,    27,    28,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    61,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -3129,66 +3094,81 @@
       94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
      104,    -1,    -1,    -1,    -1,    -1,   110,    -1,   112,    -1,
      114,   115,   116,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   154,     3,     4,   157,    -1,
+       7,   160,    -1,   162,   163,   139,   140,   141,   142,   143,
+     144,   145,   146,   147,   148,   149,   150,   151,    -1,    26,
+      27,    28,    -1,    -1,    -1,    -1,   160,    -1,    -1,    -1,
+      -1,    38,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   139,   140,   141,   142,   143,
-     144,   145,   146,   147,   148,   149,   150,   151,    -1,    -1,
-      -1,    -1,    -1,    -1,     5,     6,   160,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    -1,
-      21,    22,    -1,    24,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    37,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     5,     6,    48,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      -1,    21,    22,    -1,    24,     5,     6,    -1,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      -1,    21,    22,    -1,    24,    -1,    -1,    -1,    48,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,     5,     6,    48,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    -1,    21,    22,    -1,    24,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    48,
-      -1,    -1,    -1,   154,    -1,    -1,   157,    -1,    -1,   160,
-      -1,   162,     5,     6,    -1,     8,     9,    10,    11,    12,
+      -1,    -1,    -1,    -1,    61,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,   104,    -1,    -1,
+      -1,    -1,    -1,   110,    -1,   112,    -1,   114,   115,   116,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   139,   140,   141,   142,   143,   144,   145,   146,
+     147,   148,   149,   150,   151,    -1,    -1,    -1,    -1,    -1,
+      -1,     5,     6,   160,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    -1,    21,    22,    -1,
+      24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     5,     6,    48,     8,     9,    10,    11,    12,
       13,    14,    15,    16,    17,    18,    19,    -1,    21,    22,
-      -1,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   154,    -1,    -1,   157,    -1,   159,
-     160,    -1,   162,    -1,    -1,    48,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   154,    -1,    -1,   157,    -1,    -1,
-     160,    -1,   162,     5,     6,    -1,     8,     9,    10,    11,
+      -1,    24,     5,     6,    -1,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    -1,    21,    22,
+      -1,    24,    -1,    -1,    -1,    48,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,     5,     6,    48,     8,     9,    10,    11,
       12,    13,    14,    15,    16,    17,    18,    19,    -1,    21,
       22,    -1,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   154,    -1,    -1,   157,    -1,
-      -1,   160,    -1,   162,     5,     6,    48,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    -1,
-      21,    22,    -1,    24,     5,     6,    -1,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    -1,
-      21,    22,    -1,    24,    -1,    -1,    -1,    48,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    48,    -1,    -1,    -1,
+     154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -1,
+       5,     6,    -1,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    -1,    21,    22,    -1,    24,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   154,    37,    -1,   157,    -1,   159,   160,    -1,   162,
+      -1,    -1,    -1,    48,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,   154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,
-      -1,    -1,    -1,    -1,    -1,     5,     6,    48,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      -1,    21,    22,    -1,    24,    -1,    -1,    -1,    -1,    -1,
+       5,     6,    -1,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    -1,    21,    22,    -1,    24,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    48,    -1,
       -1,    -1,   154,    -1,    -1,   157,    -1,    -1,   160,    -1,
-     162,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     162,     5,     6,    48,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    -1,    21,    22,    -1,
+      24,     5,     6,    -1,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    -1,    21,    22,    -1,
+      24,    -1,    -1,    -1,    48,    -1,    -1,    -1,    -1,   154,
+      -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -1,    -1,
+      -1,    -1,     5,     6,    48,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    -1,    21,    22,
+      -1,    24,     5,     6,    -1,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    -1,    21,    22,
+      -1,    24,    -1,    -1,    -1,    48,    -1,    -1,    -1,   154,
+      -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    48,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   154,    -1,    -1,   157,    -1,    -1,   160,
-      -1,   162,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   154,    -1,    -1,   157,    -1,    -1,   160,
-      -1,   162,    -1,    -1,    -1,    -1,    35,    -1,    -1,    -1,
+     154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      59,    60,    -1,    -1,   154,    -1,    -1,   157,    -1,    -1,
-     160,    -1,   162,    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,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,    -1,
-      -1,   110,   111,   112,   113,   114,   115,   116,   117,   118,
+     154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     139,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,   151
+      -1,    -1,    -1,    -1,    35,    -1,    -1,    -1,    -1,    -1,
+      -1,   154,    -1,    -1,   157,    -1,    -1,   160,    49,   162,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    59,    60,
+      -1,   154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,
+      -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,    99,   100,
+     101,   102,   103,   104,   105,   106,   107,    -1,    -1,   110,
+     111,   112,   113,   114,   115,   116,   117,   118,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   139,   140,
+     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
+     151
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -3196,66 +3176,66 @@
 static const unsigned char yystos[] =
 {
        0,   200,   201,   202,     0,    25,    31,    41,    42,    43,
-      44,    45,    46,    47,    62,   181,   219,   221,   223,   231,
-      22,    24,    51,    58,    62,   180,   212,   223,   224,    61,
-      64,    65,    66,    67,    68,    69,    70,   182,   217,    23,
-     232,   233,    30,   163,   220,   232,    52,    53,    54,    71,
-     209,   152,    61,    20,    45,    47,    50,   181,   152,    45,
-      47,   222,    24,   207,     4,     5,     6,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    21,
-      48,   154,   157,   160,   162,   167,   189,   190,   191,   192,
-     193,   212,   228,    29,   162,   218,   180,   237,   152,   152,
-     152,   152,   157,   210,   207,   189,    32,    33,   199,   199,
-     199,   199,   225,     4,     4,     4,   162,     8,   163,   193,
-     194,   212,   155,   164,    35,    49,    59,    60,    72,    73,
+      44,    45,    46,    47,    62,   181,   219,   222,   224,   232,
+      22,    24,    51,    58,    62,   180,   212,   224,   225,    61,
+     220,    23,   233,   234,    30,   163,   221,   233,    52,    53,
+      54,    71,   209,   152,    61,    20,    45,    47,    50,   181,
+     152,    45,    47,   223,    24,   207,    64,    65,    66,    67,
+      68,    69,    70,   182,   217,   180,   238,   152,   152,   152,
+     152,   157,   210,   207,     5,     6,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    21,    48,
+     154,   157,   160,   162,   167,   189,   190,   191,   192,   193,
+     212,   229,    32,    33,   199,   199,   199,   199,   226,     4,
+     189,    29,   162,   218,    35,    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,    99,   100,   101,   102,   103,
      104,   105,   106,   107,   110,   111,   112,   113,   114,   115,
      116,   117,   118,   139,   140,   141,   142,   143,   144,   145,
      146,   147,   148,   149,   150,   151,   169,   170,   171,   174,
-     175,   234,   235,   241,   242,   244,   245,    24,    55,    56,
-     208,     4,    24,    24,   211,   191,   191,   191,     9,    10,
+     175,   235,   236,   242,   243,   245,   246,    24,    55,    56,
+     208,     4,    24,    24,   211,     4,     4,     4,   162,     8,
+     163,   193,   194,   155,   164,   191,   191,   191,     9,    10,
       11,    12,    13,    14,    15,    16,    17,    18,    19,   176,
-     177,   179,   191,   196,   217,   158,   158,   163,   194,   153,
-     163,   155,    37,   194,   195,   191,   230,    59,     8,   230,
-       9,    21,    10,    11,    12,    13,    14,    15,    16,    17,
-     176,   177,   178,   182,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   172,    27,    28,   125,   126,   127,
-     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
-     138,   173,   191,   191,   230,   191,   191,   238,   230,   230,
-     230,   230,   230,   230,   230,   191,   191,   191,   230,   230,
-     182,   108,   109,   153,   159,   205,   206,   204,    27,    28,
+     177,   179,   191,   196,   217,   212,   191,   231,    59,     8,
+     231,     9,    21,    10,    11,    12,    13,    14,    15,    16,
+      17,   176,   177,   178,   182,   119,   120,   121,   122,   123,
+     124,   125,   126,   127,   128,   172,    27,    28,   125,   126,
+     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+     137,   138,   173,   191,   191,   231,   191,   191,   239,   231,
+     231,   231,   231,   231,   231,   231,   191,   191,   191,   231,
+     231,   182,   108,   109,   153,   159,   158,   158,   163,   194,
+     153,   163,    37,   194,   195,   205,   206,   204,    27,    28,
        3,     4,   168,     4,     7,    26,    38,    39,   103,   104,
      110,   112,   114,   115,   116,   157,   160,   162,   165,   169,
-     170,   171,   174,   175,   197,   228,   203,   193,   193,   161,
-     163,   193,    37,   191,   214,   215,   216,   153,   156,     3,
-       4,     7,    26,    27,    28,    38,    39,    61,   160,   197,
-     227,   228,   229,   229,   229,   229,   189,   191,   191,   153,
-     184,   153,   184,   229,   157,   153,   153,   153,   153,   153,
-     153,   153,   153,   229,   229,   229,   153,    36,   189,   191,
-     230,    24,   153,   187,   187,   187,   172,   173,   155,   155,
-     155,   155,   155,   159,   196,   198,   162,   198,   163,   198,
-      24,   155,   155,   155,   155,   155,   187,   159,   161,   161,
-     212,   213,   153,   156,    37,    63,   226,   198,   153,   153,
-     229,   229,   229,    15,    57,    15,   153,   243,   229,   157,
-     230,   191,   230,   230,   230,   191,   191,   153,   153,   153,
-     230,   191,   229,   229,   153,    34,    57,   185,   188,   155,
-     155,   196,   196,   196,   196,   196,   153,   159,   163,   193,
-     198,   161,   163,   196,   196,   196,   196,   196,    37,   214,
-     185,   186,    24,   161,    21,    21,   155,   153,   153,   229,
-       4,   229,   230,   239,   153,   229,   153,   153,   153,   229,
-     229,   229,   155,   191,    24,     4,   187,   196,   196,   243,
-     153,   153,   153,   153,   196,   161,   163,   153,   153,   153,
-     153,    36,    57,   183,   153,   229,   229,   239,   240,   229,
-     229,   153,   184,   184,   153,   229,   153,   230,   230,   230,
-     240,   229,   153,   153,   156,   196,   196,   196,   196,   161,
-     196,   196,   196,   196,   191,     4,    24,   153,   157,   156,
-     230,   159,   229,   156,   196,   196,   153,   156,   153,   153,
-     156,   156,   156,   156,   156,    21,   159,   178,   236,    36,
-     159,   156,   156,   196,   196,   196,   229,   227,   159,   178,
-      21,   156,   156,   156,   153,   227,   229,    21,   153,   234,
-     229,    21,    21,   229,   229
+     170,   171,   174,   175,   197,   229,   203,   155,     3,     4,
+       7,    26,    27,    28,    38,    39,    61,   160,   197,   228,
+     229,   230,   230,   230,   230,   189,   191,   191,   153,   184,
+     153,   184,   230,   157,   153,   153,   153,   153,   153,   153,
+     153,   153,   230,   230,   230,   153,    36,   189,   191,   231,
+      24,   193,   193,   161,   163,   193,   153,   156,   153,   187,
+     187,   187,   172,   173,   155,   155,   155,   155,   155,   159,
+     196,   198,   162,   198,   163,   198,    24,   155,   155,   155,
+     155,   155,   187,    37,   191,   214,   215,   216,    63,   227,
+     198,   153,   153,   230,   230,   230,    15,    57,    15,   153,
+     244,   230,   157,   231,   191,   231,   231,   231,   191,   191,
+     153,   153,   153,   231,   191,   230,   230,   153,   159,   161,
+     161,    37,    34,    57,   185,   188,   155,   155,   196,   196,
+     196,   196,   196,   153,   159,   163,   193,   198,   161,   163,
+     196,   196,   196,   196,   196,   212,   213,   153,   156,    24,
+     161,    21,    21,   155,   153,   153,   230,     4,   230,   231,
+     240,   153,   230,   153,   153,   153,   230,   230,   230,   155,
+     191,    24,     4,   187,   196,   196,   244,   153,   153,   153,
+     153,   196,   161,   163,   153,   153,   153,   153,    36,    37,
+     214,   185,   186,   153,   230,   230,   240,   241,   230,   230,
+     153,   184,   184,   153,   230,   153,   231,   231,   231,   241,
+     230,   153,   153,   156,   196,   196,   196,   196,   161,   196,
+     196,   196,   196,   191,    57,   183,    24,   153,   157,   156,
+     231,   159,   230,   156,   196,   196,   153,   156,   153,   153,
+     156,   156,   156,   156,   156,     4,    21,   159,   178,   237,
+      36,   159,   156,   156,   196,   196,   196,   230,   228,   159,
+     178,    21,   156,   156,   156,   153,   228,   230,    21,   153,
+     235,   230,    21,    21,   230,   230
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -5441,25 +5421,21 @@
           CurModule.RenameMap[Key] = Conflict->getName();
           Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
           InsertValue(Fn, CurModule.Values);
-        } else if (CurFun.Linkage == GlobalValue::InternalLinkage) {
-          // We can safely rename the function we're defining
-          std::string NewName = makeNameUnique(FunctionName);
-          Fn = new Function(FT, CurFun.Linkage, NewName, M);
-          InsertValue(Fn, CurModule.Values);
-          RenameMapKey Key = makeRenameMapKey(FunctionName, PFT, ID.S);
-          CurModule.RenameMap[Key] = NewName;
-        } else {
+        } else { 
           // We can't quietly rename either of these things, but we must
-          // rename one of them. Generate a warning about the renaming and
-          // elect to rename the thing we're now defining.
+          // rename one of them. Only if the function's linkage is internal can
+          // we forgo a warning message about the renamed function. 
           std::string NewName = makeNameUnique(FunctionName);
-          warning("Renaming function '" + FunctionName + "' as '" + NewName +
-                  "' may cause linkage errors");
+          if (CurFun.Linkage != GlobalValue::InternalLinkage) {
+            warning("Renaming function '" + FunctionName + "' as '" + NewName +
+                    "' may cause linkage errors");
+          }
+          // Elect to rename the thing we're now defining.
           Fn = new Function(FT, CurFun.Linkage, NewName, M);
           InsertValue(Fn, CurModule.Values);
           RenameMapKey Key = makeRenameMapKey(FunctionName, PFT, ID.S);
           CurModule.RenameMap[Key] = NewName;
-        }
+        } 
       } else {
         // There's no conflict, just define the function
         Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
@@ -5506,50 +5482,55 @@
     break;
 
   case 224:
-#line 3008 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3004 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    { CurFun.Linkage = (yyvsp[0].Linkage); ;}
+    break;
+
+  case 225:
+#line 3004 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.FunctionVal) = CurFun.CurrentFunction;
 
     // Make sure that we keep track of the linkage type even if there was a
     // previous "declare".
-    (yyval.FunctionVal)->setLinkage((yyvsp[-2].Linkage));
+    (yyval.FunctionVal)->setLinkage((yyvsp[-3].Linkage));
   ;}
     break;
 
-  case 227:
-#line 3022 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 228:
+#line 3018 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
   ;}
     break;
 
-  case 228:
-#line 3027 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 229:
+#line 3023 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
-  case 229:
-#line 3028 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 230:
+#line 3024 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
-  case 230:
-#line 3029 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 231:
+#line 3025 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
-  case 231:
-#line 3033 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 232:
+#line 3029 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
-  case 232:
-#line 3034 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 233:
+#line 3030 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { CurFun.Linkage = (yyvsp[0].Linkage); ;}
     break;
 
-  case 233:
-#line 3034 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 234:
+#line 3030 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.FunctionVal) = CurFun.CurrentFunction;
     CurFun.FunctionDone();
@@ -5557,64 +5538,64 @@
   ;}
     break;
 
-  case 234:
-#line 3046 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 235:
+#line 3042 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
-  case 235:
-#line 3047 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 236:
+#line 3043 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
-  case 236:
-#line 3052 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 237:
+#line 3048 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val)); ;}
     break;
 
-  case 237:
-#line 3053 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 238:
+#line 3049 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val)); ;}
     break;
 
-  case 238:
-#line 3054 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 239:
+#line 3050 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal)); ;}
     break;
 
-  case 239:
-#line 3055 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 240:
+#line 3051 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyval.ValIDVal) = ValID::create(ConstantInt::get(Type::Int1Ty, true));
     (yyval.ValIDVal).S.makeUnsigned();
   ;}
     break;
 
-  case 240:
-#line 3059 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 241:
+#line 3055 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyval.ValIDVal) = ValID::create(ConstantInt::get(Type::Int1Ty, false)); 
     (yyval.ValIDVal).S.makeUnsigned();
   ;}
     break;
 
-  case 241:
-#line 3063 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 242:
+#line 3059 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValIDVal) = ValID::createNull(); ;}
     break;
 
-  case 242:
-#line 3064 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 243:
+#line 3060 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValIDVal) = ValID::createUndef(); ;}
     break;
 
-  case 243:
-#line 3065 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 244:
+#line 3061 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValIDVal) = ValID::createZeroInit(); ;}
     break;
 
-  case 244:
-#line 3066 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 245:
+#line 3062 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { // Nonempty unsized packed vector
     const Type *ETy = (*(yyvsp[-1].ConstVector))[0].C->getType();
     int NumElements = (yyvsp[-1].ConstVector)->size(); 
@@ -5638,16 +5619,16 @@
   ;}
     break;
 
-  case 245:
-#line 3087 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 246:
+#line 3083 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal).C);
     (yyval.ValIDVal).S.copy((yyvsp[0].ConstVal).S);
   ;}
     break;
 
-  case 246:
-#line 3091 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 247:
+#line 3087 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     char *End = UnEscapeLexed((yyvsp[-2].StrVal), true);
     std::string AsmStr = std::string((yyvsp[-2].StrVal), End);
@@ -5659,18 +5640,18 @@
   ;}
     break;
 
-  case 247:
-#line 3105 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 248:
+#line 3101 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {  (yyval.ValIDVal) = ValID::create((yyvsp[0].SIntVal)); (yyval.ValIDVal).S.makeSignless(); ;}
     break;
 
-  case 248:
-#line 3106 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 249:
+#line 3102 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {  (yyval.ValIDVal) = ValID::create((yyvsp[0].StrVal)); (yyval.ValIDVal).S.makeSignless(); ;}
     break;
 
-  case 251:
-#line 3119 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 252:
+#line 3115 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { 
     const Type *Ty = (yyvsp[-1].TypeVal).PAT->get();
     (yyvsp[0].ValIDVal).S.copy((yyvsp[-1].TypeVal).S);
@@ -5680,22 +5661,22 @@
   ;}
     break;
 
-  case 252:
-#line 3129 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 253:
+#line 3125 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
   ;}
     break;
 
-  case 253:
-#line 3132 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 254:
+#line 3128 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { // Do not allow functions with 0 basic blocks   
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
   ;}
     break;
 
-  case 254:
-#line 3141 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 255:
+#line 3137 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     ValueInfo VI; VI.V = (yyvsp[0].TermInstVal).TI; VI.S.copy((yyvsp[0].TermInstVal).S);
     setValueName(VI, (yyvsp[-1].StrVal));
@@ -5706,8 +5687,8 @@
   ;}
     break;
 
-  case 255:
-#line 3152 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 256:
+#line 3148 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if ((yyvsp[0].InstVal).I)
       (yyvsp[-1].BasicBlockVal)->getInstList().push_back((yyvsp[0].InstVal).I);
@@ -5715,8 +5696,8 @@
   ;}
     break;
 
-  case 256:
-#line 3157 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 257:
+#line 3153 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++),true);
     // Make sure to move the basic block to the correct location in the
@@ -5728,8 +5709,8 @@
   ;}
     break;
 
-  case 257:
-#line 3166 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 258:
+#line 3162 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((yyvsp[0].StrVal)), true);
     // Make sure to move the basic block to the correct location in the
@@ -5741,24 +5722,24 @@
   ;}
     break;
 
-  case 260:
-#line 3180 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 261:
+#line 3176 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {              // Return with a result...
     (yyval.TermInstVal).TI = new ReturnInst((yyvsp[0].ValueVal).V);
     (yyval.TermInstVal).S.makeSignless();
   ;}
     break;
 
-  case 261:
-#line 3184 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 262:
+#line 3180 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {                                       // Return with no result...
     (yyval.TermInstVal).TI = new ReturnInst();
     (yyval.TermInstVal).S.makeSignless();
   ;}
     break;
 
-  case 262:
-#line 3188 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 263:
+#line 3184 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {                         // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
     (yyval.TermInstVal).TI = new BranchInst(tmpBB);
@@ -5766,8 +5747,8 @@
   ;}
     break;
 
-  case 263:
-#line 3193 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 264:
+#line 3189 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {  
     (yyvsp[-3].ValIDVal).S.makeSignless();
     (yyvsp[0].ValIDVal).S.makeSignless();
@@ -5780,8 +5761,8 @@
   ;}
     break;
 
-  case 264:
-#line 3203 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 265:
+#line 3199 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-6].ValIDVal).S.copy((yyvsp[-7].PrimType).S);
     Value* tmpVal = getVal((yyvsp[-7].PrimType).T, (yyvsp[-6].ValIDVal));
@@ -5802,8 +5783,8 @@
   ;}
     break;
 
-  case 265:
-#line 3221 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 266:
+#line 3217 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-5].ValIDVal).S.copy((yyvsp[-6].PrimType).S);
     Value* tmpVal = getVal((yyvsp[-6].PrimType).T, (yyvsp[-5].ValIDVal));
@@ -5815,8 +5796,8 @@
   ;}
     break;
 
-  case 266:
-#line 3231 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 267:
+#line 3227 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const PointerType *PFTy;
     const FunctionType *Ty;
@@ -5883,24 +5864,24 @@
   ;}
     break;
 
-  case 267:
-#line 3295 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 268:
+#line 3291 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.TermInstVal).TI = new UnwindInst();
     (yyval.TermInstVal).S.makeSignless();
   ;}
     break;
 
-  case 268:
-#line 3299 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 269:
+#line 3295 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.TermInstVal).TI = new UnreachableInst();
     (yyval.TermInstVal).S.makeSignless();
   ;}
     break;
 
-  case 269:
-#line 3306 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 270:
+#line 3302 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.JumpTable) = (yyvsp[-5].JumpTable);
     (yyvsp[-3].ValIDVal).S.copy((yyvsp[-4].PrimType).S);
@@ -5915,8 +5896,8 @@
   ;}
     break;
 
-  case 270:
-#line 3318 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 271:
+#line 3314 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
     (yyvsp[-3].ValIDVal).S.copy((yyvsp[-4].PrimType).S);
@@ -5931,8 +5912,8 @@
   ;}
     break;
 
-  case 271:
-#line 3333 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 272:
+#line 3329 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     bool omit = false;
     if ((yyvsp[-1].StrVal))
@@ -5964,8 +5945,8 @@
   ;}
     break;
 
-  case 272:
-#line 3363 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 273:
+#line 3359 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {    // Used for PHI nodes
     (yyval.PHIList).P = new std::list<std::pair<Value*, BasicBlock*> >();
     (yyval.PHIList).S.copy((yyvsp[-5].TypeVal).S);
@@ -5978,8 +5959,8 @@
   ;}
     break;
 
-  case 273:
-#line 3373 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 274:
+#line 3369 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.PHIList) = (yyvsp[-6].PHIList);
     (yyvsp[-3].ValIDVal).S.copy((yyvsp[-6].PHIList).S);
@@ -5990,43 +5971,43 @@
   ;}
     break;
 
-  case 274:
-#line 3383 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 275:
+#line 3379 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {    // Used for call statements, and memory insts...
     (yyval.ValueList) = new std::vector<ValueInfo>();
     (yyval.ValueList)->push_back((yyvsp[0].ValueVal));
   ;}
     break;
 
-  case 275:
-#line 3387 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 276:
+#line 3383 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.ValueList) = (yyvsp[-2].ValueList);
     (yyvsp[-2].ValueList)->push_back((yyvsp[0].ValueVal));
   ;}
     break;
 
-  case 277:
-#line 3395 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 278:
+#line 3391 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValueList) = 0; ;}
     break;
 
-  case 278:
-#line 3399 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 279:
+#line 3395 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.BoolVal) = true;
   ;}
     break;
 
-  case 279:
-#line 3402 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 280:
+#line 3398 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.BoolVal) = false;
   ;}
     break;
 
-  case 280:
-#line 3408 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 281:
+#line 3404 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
     (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
@@ -6048,8 +6029,8 @@
   ;}
     break;
 
-  case 281:
-#line 3427 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 282:
+#line 3423 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
     (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
@@ -6070,8 +6051,8 @@
   ;}
     break;
 
-  case 282:
-#line 3445 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 283:
+#line 3441 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
     (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
@@ -6090,8 +6071,8 @@
   ;}
     break;
 
-  case 283:
-#line 3461 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 284:
+#line 3457 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
     (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
@@ -6108,8 +6089,8 @@
   ;}
     break;
 
-  case 284:
-#line 3475 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 285:
+#line 3471 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
     (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
@@ -6126,8 +6107,8 @@
   ;}
     break;
 
-  case 285:
-#line 3489 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 286:
+#line 3485 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     warning("Use of obsolete 'not' instruction: Replacing with 'xor");
     const Type *Ty = (yyvsp[0].ValueVal).V->getType();
@@ -6141,8 +6122,8 @@
   ;}
     break;
 
-  case 286:
-#line 3500 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 287:
+#line 3496 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[0].ValueVal).V->getType()->isInteger() ||
         cast<IntegerType>((yyvsp[0].ValueVal).V->getType())->getBitWidth() != 8)
@@ -6163,8 +6144,8 @@
   ;}
     break;
 
-  case 287:
-#line 3518 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 288:
+#line 3514 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *DstTy = (yyvsp[0].TypeVal).PAT->get();
     if (!DstTy->isFirstClassType())
@@ -6176,8 +6157,8 @@
   ;}
     break;
 
-  case 288:
-#line 3527 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 289:
+#line 3523 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-4].ValueVal).V->getType()->isInteger() ||
         cast<IntegerType>((yyvsp[-4].ValueVal).V->getType())->getBitWidth() != 1)
@@ -6189,8 +6170,8 @@
   ;}
     break;
 
-  case 289:
-#line 3536 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 290:
+#line 3532 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[0].TypeVal).PAT->get();
     NewVarArgs = true;
@@ -6200,8 +6181,8 @@
   ;}
     break;
 
-  case 290:
-#line 3543 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 291:
+#line 3539 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type* ArgTy = (yyvsp[-2].ValueVal).V->getType();
     const Type* DstTy = (yyvsp[0].TypeVal).PAT->get();
@@ -6225,8 +6206,8 @@
   ;}
     break;
 
-  case 291:
-#line 3564 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 292:
+#line 3560 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type* ArgTy = (yyvsp[-2].ValueVal).V->getType();
     const Type* DstTy = (yyvsp[0].TypeVal).PAT->get();
@@ -6253,8 +6234,8 @@
   ;}
     break;
 
-  case 292:
-#line 3588 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 293:
+#line 3584 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V))
       error("Invalid extractelement operands");
@@ -6263,8 +6244,8 @@
   ;}
     break;
 
-  case 293:
-#line 3594 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 294:
+#line 3590 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[-4].ValueVal).V, (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V))
       error("Invalid insertelement operands");
@@ -6273,8 +6254,8 @@
   ;}
     break;
 
-  case 294:
-#line 3600 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 295:
+#line 3596 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[-4].ValueVal).V, (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V))
       error("Invalid shufflevector operands");
@@ -6283,8 +6264,8 @@
   ;}
     break;
 
-  case 295:
-#line 3606 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 296:
+#line 3602 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[0].PHIList).P->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -6303,8 +6284,8 @@
   ;}
     break;
 
-  case 296:
-#line 3622 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 297:
+#line 3618 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     // Handle the short call syntax
     const PointerType *PFTy;
@@ -6391,35 +6372,35 @@
   ;}
     break;
 
-  case 297:
-#line 3706 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 298:
+#line 3702 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.InstVal) = (yyvsp[0].InstVal);
   ;}
     break;
 
-  case 298:
-#line 3714 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 299:
+#line 3710 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValueList) = (yyvsp[0].ValueList); ;}
     break;
 
-  case 299:
-#line 3715 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 300:
+#line 3711 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValueList) = new std::vector<ValueInfo>(); ;}
     break;
 
-  case 300:
-#line 3719 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 301:
+#line 3715 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
-  case 301:
-#line 3720 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 302:
+#line 3716 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
-  case 302:
-#line 3724 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 303:
+#line 3720 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[-1].TypeVal).PAT->get();
     (yyval.InstVal).S.makeComposite((yyvsp[-1].TypeVal).S);
@@ -6428,8 +6409,8 @@
   ;}
     break;
 
-  case 303:
-#line 3730 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 304:
+#line 3726 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[-4].TypeVal).PAT->get();
     (yyvsp[-1].ValIDVal).S.makeUnsigned();
@@ -6439,8 +6420,8 @@
   ;}
     break;
 
-  case 304:
-#line 3737 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 305:
+#line 3733 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[-1].TypeVal).PAT->get();
     (yyval.InstVal).S.makeComposite((yyvsp[-1].TypeVal).S);
@@ -6449,8 +6430,8 @@
   ;}
     break;
 
-  case 305:
-#line 3743 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 306:
+#line 3739 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[-4].TypeVal).PAT->get();
     (yyvsp[-1].ValIDVal).S.makeUnsigned();
@@ -6460,8 +6441,8 @@
   ;}
     break;
 
-  case 306:
-#line 3750 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 307:
+#line 3746 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *PTy = (yyvsp[0].ValueVal).V->getType();
     if (!isa<PointerType>(PTy))
@@ -6471,8 +6452,8 @@
   ;}
     break;
 
-  case 307:
-#line 3757 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 308:
+#line 3753 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type* Ty = (yyvsp[-1].TypeVal).PAT->get();
     (yyvsp[0].ValIDVal).S.copy((yyvsp[-1].TypeVal).S);
@@ -6488,8 +6469,8 @@
   ;}
     break;
 
-  case 308:
-#line 3770 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 309:
+#line 3766 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[0].ValIDVal).S.copy((yyvsp[-1].TypeVal).S);
     const PointerType *PTy = dyn_cast<PointerType>((yyvsp[-1].TypeVal).PAT->get());
@@ -6518,8 +6499,8 @@
   ;}
     break;
 
-  case 309:
-#line 3796 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 310:
+#line 3792 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-1].ValIDVal).S.copy((yyvsp[-2].TypeVal).S);
     const Type* Ty = (yyvsp[-2].TypeVal).PAT->get();
@@ -6543,7 +6524,7 @@
     }
 
 /* Line 1126 of yacc.c.  */
-#line 6547 "UpgradeParser.tab.c"
+#line 6528 "UpgradeParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -6811,7 +6792,7 @@
 }
 
 
-#line 3814 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3810 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
 
 
 int yyerror(const char *ErrorMsg) {
diff --git a/tools/llvm-upgrade/UpgradeParser.y.cvs b/tools/llvm-upgrade/UpgradeParser.y.cvs
index 9dabc23..ab06bb4 100644
--- a/tools/llvm-upgrade/UpgradeParser.y.cvs
+++ b/tools/llvm-upgrade/UpgradeParser.y.cvs
@@ -2936,25 +2936,21 @@
           CurModule.RenameMap[Key] = Conflict->getName();
           Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
           InsertValue(Fn, CurModule.Values);
-        } else if (CurFun.Linkage == GlobalValue::InternalLinkage) {
-          // We can safely rename the function we're defining
-          std::string NewName = makeNameUnique(FunctionName);
-          Fn = new Function(FT, CurFun.Linkage, NewName, M);
-          InsertValue(Fn, CurModule.Values);
-          RenameMapKey Key = makeRenameMapKey(FunctionName, PFT, ID.S);
-          CurModule.RenameMap[Key] = NewName;
-        } else {
+        } else { 
           // We can't quietly rename either of these things, but we must
-          // rename one of them. Generate a warning about the renaming and
-          // elect to rename the thing we're now defining.
+          // rename one of them. Only if the function's linkage is internal can
+          // we forgo a warning message about the renamed function. 
           std::string NewName = makeNameUnique(FunctionName);
-          warning("Renaming function '" + FunctionName + "' as '" + NewName +
-                  "' may cause linkage errors");
+          if (CurFun.Linkage != GlobalValue::InternalLinkage) {
+            warning("Renaming function '" + FunctionName + "' as '" + NewName +
+                    "' may cause linkage errors");
+          }
+          // Elect to rename the thing we're now defining.
           Fn = new Function(FT, CurFun.Linkage, NewName, M);
           InsertValue(Fn, CurModule.Values);
           RenameMapKey Key = makeRenameMapKey(FunctionName, PFT, ID.S);
           CurModule.RenameMap[Key] = NewName;
-        }
+        } 
       } else {
         // There's no conflict, just define the function
         Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
@@ -3005,7 +3001,7 @@
   ;
 
 FunctionHeader 
-  : OptLinkage FunctionHeaderH BEGIN {
+  : OptLinkage { CurFun.Linkage = $1; } FunctionHeaderH BEGIN {
     $$ = CurFun.CurrentFunction;
 
     // Make sure that we keep track of the linkage type even if there was a