YQL-20567 upgrade PG up to 16.10 & fix instructions

init
commit_hash:81aba13295273281d19d2d332a48ff1c44977447

1 files changed, 93 insertions, 103 deletions

diff --git a/yql/essentials/parser/pg_wrapper/postgresql/src/backend/bootstrap/bootparse.c b/yql/essentials/parser/pg_wrapper/postgresql/src/backend/bootstrap/bootparse.c
index 728b9fd6e0c..1450011c9dd 100644
--- a/yql/essentials/parser/pg_wrapper/postgresql/src/backend/bootstrap/bootparse.c
+++ b/yql/essentials/parser/pg_wrapper/postgresql/src/backend/bootstrap/bootparse.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.7.5.  */
+/* A Bison parser, made by GNU Bison 3.8.2.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -46,10 +46,10 @@
    USER NAME SPACE" below.  */
 
 /* Identify Bison output, and Bison version.  */
-#define YYBISON 30705
+#define YYBISON 30802
 
 /* Bison version string.  */
-#define YYBISON_VERSION "3.7.5"
+#define YYBISON_VERSION "3.8.2"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -391,12 +391,18 @@ typedef int yy_state_fast_t;
 # define YY_USE(E) /* empty */
 #endif
 
-#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                            \
+#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__
+# if __GNUC__ * 100 + __GNUC_MINOR__ < 407
+#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
+    _Pragma ("GCC diagnostic push")                                     \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")
+# else
+#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
     _Pragma ("GCC diagnostic push")                                     \
     _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")              \
     _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# endif
 # define YY_IGNORE_MAYBE_UNINITIALIZED_END      \
     _Pragma ("GCC diagnostic pop")
 #else
@@ -613,7 +619,7 @@ static const yytype_int8 yytranslate[] =
 };
 
 #if YYDEBUG
-  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
+/* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_int16 yyrline[] =
 {
        0,   112,   112,   113,   117,   118,   122,   123,   124,   125,
@@ -659,17 +665,6 @@ yysymbol_name (yysymbol_kind_t yysymbol)
 }
 #endif
 
-#ifdef YYPRINT
-/* YYTOKNUM[NUM] -- (External) token number corresponding to the
-   (internal) symbol number NUM (which must be that of a token).  */
-static const yytype_int16 yytoknum[] =
-{
-       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282
-};
-#endif
-
 #define YYPACT_NINF (-53)
 
 #define yypact_value_is_default(Yyn) \
@@ -680,8 +675,8 @@ static const yytype_int16 yytoknum[] =
 #define yytable_value_is_error(Yyn) \
   0
 
-  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-     STATE-NUM.  */
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
       -4,   142,   142,   142,   -53,     2,   -14,    25,    -4,   -53,
@@ -697,9 +692,9 @@ static const yytype_int16 yypact[] =
      -53,   -53,    11,    -3,   -53,   -53,   -53,    18,   -53,   -53
 };
 
-  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
-     Performed when YYTABLE does not specify something else to do.  Zero
-     means the default is an error.  */
+/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+   Performed when YYTABLE does not specify something else to do.  Zero
+   means the default is an error.  */
 static const yytype_int8 yydefact[] =
 {
        3,     0,     0,     0,    19,     0,     0,     0,     2,     4,
@@ -715,7 +710,7 @@ static const yytype_int8 yydefact[] =
       21,    27,     0,     0,    36,    25,    22,     0,    38,    37
 };
 
-  /* YYPGOTO[NTERM-NUM].  */
+/* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
      -53,   -53,   -53,    38,   -53,   -53,   -53,   -53,   -53,   -53,
@@ -723,7 +718,7 @@ static const yytype_int8 yypgoto[] =
      -53,   -39,   -53,   -41,   -53,   -46,    -1
 };
 
-  /* YYDEFGOTO[NTERM-NUM].  */
+/* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int8 yydefgoto[] =
 {
        0,     7,     8,     9,    10,    11,    12,    81,    90,    13,
@@ -731,9 +726,9 @@ static const yytype_int8 yydefgoto[] =
       84,    85,   104,    48,    57,    58,    49
 };
 
-  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
-     positive, shift that token.  If negative, reduce the rule whose
-     number is the opposite.  If YYTABLE_NINF, syntax error.  */
+/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule whose
+   number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int8 yytable[] =
 {
       38,    39,    40,    53,    45,     1,     2,     3,     4,     5,
@@ -776,8 +771,8 @@ static const yytype_int8 yycheck[] =
       18,    19,    20,    21,    22,    23,    24,    25,    26,    27
 };
 
-  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-     symbol of state STATE-NUM.  */
+/* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of
+   state STATE-NUM.  */
 static const yytype_int8 yystos[] =
 {
        0,     9,    10,    11,    12,    13,    17,    29,    30,    31,
@@ -793,7 +788,7 @@ static const yytype_int8 yystos[] =
        7,    54,    43,    25,    50,    44,     7,    26,    27,    27
 };
 
-  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+/* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM.  */
 static const yytype_int8 yyr1[] =
 {
        0,    28,    29,    29,    30,    30,    31,    31,    31,    31,
@@ -805,7 +800,7 @@ static const yytype_int8 yyr1[] =
       54,    54,    54,    54,    54,    54
 };
 
-  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+/* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM.  */
 static const yytype_int8 yyr2[] =
 {
        0,     2,     1,     0,     1,     2,     1,     1,     1,     1,
@@ -826,6 +821,7 @@ enum { YYENOMEM = -2 };
 #define YYACCEPT        goto yyacceptlab
 #define YYABORT         goto yyabortlab
 #define YYERROR         goto yyerrorlab
+#define YYNOMEM         goto yyexhaustedlab
 
 
 #define YYRECOVERING()  (!!yyerrstatus)
@@ -866,10 +862,7 @@ do {                                            \
     YYFPRINTF Args;                             \
 } while (0)
 
-/* This macro is provided for backward compatibility. */
-# ifndef YY_LOCATION_PRINT
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
+
 
 
 # define YY_SYMBOL_PRINT(Title, Kind, Value, Location)                    \
@@ -896,10 +889,6 @@ yy_symbol_value_print (FILE *yyo,
   YY_USE (yyoutput);
   if (!yyvaluep)
     return;
-# ifdef YYPRINT
-  if (yykind < YYNTOKENS)
-    YYPRINT (yyo, yytoknum[yykind], *yyvaluep);
-# endif
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   YY_USE (yykind);
   YY_IGNORE_MAYBE_UNINITIALIZED_END
@@ -1084,6 +1073,7 @@ yyparse (void)
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yychar = YYEMPTY; /* Cause a token to be read.  */
+
   goto yysetstate;
 
 
@@ -1109,7 +1099,7 @@ yysetstate:
 
   if (yyss + yystacksize - 1 <= yyssp)
 #if !defined yyoverflow && !defined YYSTACK_RELOCATE
-    goto yyexhaustedlab;
+    YYNOMEM;
 #else
     {
       /* Get the current used size of the three stacks, in elements.  */
@@ -1137,7 +1127,7 @@ yysetstate:
 # else /* defined YYSTACK_RELOCATE */
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-        goto yyexhaustedlab;
+        YYNOMEM;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
         yystacksize = YYMAXDEPTH;
@@ -1148,7 +1138,7 @@ yysetstate:
           YY_CAST (union yyalloc *,
                    YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize))));
         if (! yyptr)
-          goto yyexhaustedlab;
+          YYNOMEM;
         YYSTACK_RELOCATE (yyss_alloc, yyss);
         YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
@@ -1170,6 +1160,7 @@ yysetstate:
     }
 #endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
 
+
   if (yystate == YYFINAL)
     YYACCEPT;
 
@@ -1288,7 +1279,7 @@ yyreduce:
 					boot_openrel((yyvsp[0].str));
 					do_end();
 				}
-#line 1292 "bootparse.c"
+#line 1283 "bootparse.c"
     break;
 
   case 15: /* Boot_CloseStmt: XCLOSE boot_ident  */
@@ -1298,7 +1289,7 @@ yyreduce:
 					closerel((yyvsp[0].str));
 					do_end();
 				}
-#line 1302 "bootparse.c"
+#line 1293 "bootparse.c"
     break;
 
   case 16: /* $@1: %empty  */
@@ -1312,7 +1303,7 @@ yyreduce:
 						 (yyvsp[-5].str),
 						 (yyvsp[-4].oidval));
 				}
-#line 1316 "bootparse.c"
+#line 1307 "bootparse.c"
     break;
 
   case 17: /* $@2: %empty  */
@@ -1320,7 +1311,7 @@ yyreduce:
                                 {
 					do_end();
 				}
-#line 1324 "bootparse.c"
+#line 1315 "bootparse.c"
     break;
 
   case 18: /* Boot_CreateStmt: XCREATE boot_ident oidspec optbootstrap optsharedrelation optrowtypeoid LPAREN $@1 boot_column_list $@2 RPAREN  */
@@ -1404,7 +1395,7 @@ yyreduce:
 					}
 					do_end();
 				}
-#line 1408 "bootparse.c"
+#line 1399 "bootparse.c"
     break;
 
   case 19: /* $@3: %empty  */
@@ -1414,7 +1405,7 @@ yyreduce:
 					elog(DEBUG4, "inserting row");
 					num_columns_read = 0;
 				}
-#line 1418 "bootparse.c"
+#line 1409 "bootparse.c"
     break;
 
   case 20: /* Boot_InsertStmt: INSERT_TUPLE $@3 LPAREN boot_column_val_list RPAREN  */
@@ -1428,7 +1419,7 @@ yyreduce:
 					InsertOneTuple();
 					do_end();
 				}
-#line 1432 "bootparse.c"
+#line 1423 "bootparse.c"
     break;
 
   case 21: /* Boot_DeclareIndexStmt: XDECLARE INDEX boot_ident oidspec ON boot_ident USING boot_ident LPAREN boot_index_params RPAREN  */
@@ -1482,7 +1473,7 @@ yyreduce:
 								false);
 					do_end();
 				}
-#line 1486 "bootparse.c"
+#line 1477 "bootparse.c"
     break;
 
   case 22: /* Boot_DeclareUniqueIndexStmt: XDECLARE UNIQUE INDEX boot_ident oidspec ON boot_ident USING boot_ident LPAREN boot_index_params RPAREN  */
@@ -1536,7 +1527,7 @@ yyreduce:
 								false);
 					do_end();
 				}
-#line 1540 "bootparse.c"
+#line 1531 "bootparse.c"
     break;
 
   case 23: /* Boot_DeclareToastStmt: XDECLARE XTOAST oidspec oidspec ON boot_ident  */
@@ -1549,7 +1540,7 @@ yyreduce:
 					BootstrapToastTable((yyvsp[0].str), (yyvsp[-3].oidval), (yyvsp[-2].oidval));
 					do_end();
 				}
-#line 1553 "bootparse.c"
+#line 1544 "bootparse.c"
     break;
 
   case 24: /* Boot_BuildIndsStmt: XBUILD INDICES  */
@@ -1559,19 +1550,19 @@ yyreduce:
 					build_indices();
 					do_end();
 				}
-#line 1563 "bootparse.c"
+#line 1554 "bootparse.c"
     break;
 
   case 25: /* boot_index_params: boot_index_params COMMA boot_index_param  */
 #line 395 "bootparse.y"
                                                                 { (yyval.list) = lappend((yyvsp[-2].list), (yyvsp[0].ielem)); }
-#line 1569 "bootparse.c"
+#line 1560 "bootparse.c"
     break;
 
   case 26: /* boot_index_params: boot_index_param  */
 #line 396 "bootparse.y"
                                                                                         { (yyval.list) = list_make1((yyvsp[0].ielem)); }
-#line 1575 "bootparse.c"
+#line 1566 "bootparse.c"
     break;
 
   case 27: /* boot_index_param: boot_ident boot_ident  */
@@ -1588,43 +1579,43 @@ yyreduce:
 					n->nulls_ordering = SORTBY_NULLS_DEFAULT;
 					(yyval.ielem) = n;
 				}
-#line 1592 "bootparse.c"
+#line 1583 "bootparse.c"
     break;
 
   case 28: /* optbootstrap: XBOOTSTRAP  */
 #line 416 "bootparse.y"
                                         { (yyval.ival) = 1; }
-#line 1598 "bootparse.c"
+#line 1589 "bootparse.c"
     break;
 
   case 29: /* optbootstrap: %empty  */
 #line 417 "bootparse.y"
                                                 { (yyval.ival) = 0; }
-#line 1604 "bootparse.c"
+#line 1595 "bootparse.c"
     break;
 
   case 30: /* optsharedrelation: XSHARED_RELATION  */
 #line 421 "bootparse.y"
                                                 { (yyval.ival) = 1; }
-#line 1610 "bootparse.c"
+#line 1601 "bootparse.c"
     break;
 
   case 31: /* optsharedrelation: %empty  */
 #line 422 "bootparse.y"
                                                                 { (yyval.ival) = 0; }
-#line 1616 "bootparse.c"
+#line 1607 "bootparse.c"
     break;
 
   case 32: /* optrowtypeoid: XROWTYPE_OID oidspec  */
 #line 426 "bootparse.y"
                                                 { (yyval.oidval) = (yyvsp[0].oidval); }
-#line 1622 "bootparse.c"
+#line 1613 "bootparse.c"
     break;
 
   case 33: /* optrowtypeoid: %empty  */
 #line 427 "bootparse.y"
                                                                         { (yyval.oidval) = InvalidOid; }
-#line 1628 "bootparse.c"
+#line 1619 "bootparse.c"
     break;
 
   case 36: /* boot_column_def: boot_ident EQUALS boot_ident boot_column_nullness  */
@@ -1634,167 +1625,167 @@ yyreduce:
 						elog(FATAL, "too many columns");
 				   DefineAttr((yyvsp[-3].str), (yyvsp[-1].str), numattr-1, (yyvsp[0].ival));
 				}
-#line 1638 "bootparse.c"
+#line 1629 "bootparse.c"
     break;
 
   case 37: /* boot_column_nullness: XFORCE XNOT XNULL  */
 #line 445 "bootparse.y"
                                                 { (yyval.ival) = BOOTCOL_NULL_FORCE_NOT_NULL; }
-#line 1644 "bootparse.c"
+#line 1635 "bootparse.c"
     break;
 
   case 38: /* boot_column_nullness: XFORCE XNULL  */
 #line 446 "bootparse.y"
                                                 {  (yyval.ival) = BOOTCOL_NULL_FORCE_NULL; }
-#line 1650 "bootparse.c"
+#line 1641 "bootparse.c"
     break;
 
   case 39: /* boot_column_nullness: %empty  */
 #line 447 "bootparse.y"
                   { (yyval.ival) = BOOTCOL_NULL_AUTO; }
-#line 1656 "bootparse.c"
+#line 1647 "bootparse.c"
     break;
 
   case 40: /* oidspec: boot_ident  */
 #line 451 "bootparse.y"
                                                                                         { (yyval.oidval) = atooid((yyvsp[0].str)); }
-#line 1662 "bootparse.c"
+#line 1653 "bootparse.c"
     break;
 
   case 44: /* boot_column_val: boot_ident  */
 #line 462 "bootparse.y"
                         { InsertOneValue((yyvsp[0].str), num_columns_read++); }
-#line 1668 "bootparse.c"
+#line 1659 "bootparse.c"
     break;
 
   case 45: /* boot_column_val: NULLVAL  */
 #line 464 "bootparse.y"
                         { InsertOneNull(num_columns_read++); }
-#line 1674 "bootparse.c"
+#line 1665 "bootparse.c"
     break;
 
   case 46: /* boot_ident: ID  */
 #line 468 "bootparse.y"
                                         { (yyval.str) = (yyvsp[0].str); }
-#line 1680 "bootparse.c"
+#line 1671 "bootparse.c"
     break;
 
   case 47: /* boot_ident: OPEN  */
 #line 469 "bootparse.y"
                                         { (yyval.str) = pstrdup((yyvsp[0].kw)); }
-#line 1686 "bootparse.c"
+#line 1677 "bootparse.c"
     break;
 
   case 48: /* boot_ident: XCLOSE  */
 #line 470 "bootparse.y"
                                         { (yyval.str) = pstrdup((yyvsp[0].kw)); }
-#line 1692 "bootparse.c"
+#line 1683 "bootparse.c"
     break;
 
   case 49: /* boot_ident: XCREATE  */
 #line 471 "bootparse.y"
                                         { (yyval.str) = pstrdup((yyvsp[0].kw)); }
-#line 1698 "bootparse.c"
+#line 1689 "bootparse.c"
     break;
 
   case 50: /* boot_ident: INSERT_TUPLE  */
 #line 472 "bootparse.y"
                                 { (yyval.str) = pstrdup((yyvsp[0].kw)); }
-#line 1704 "bootparse.c"
+#line 1695 "bootparse.c"
     break;
 
   case 51: /* boot_ident: XDECLARE  */
 #line 473 "bootparse.y"
                                         { (yyval.str) = pstrdup((yyvsp[0].kw)); }
-#line 1710 "bootparse.c"
+#line 1701 "bootparse.c"
     break;
 
   case 52: /* boot_ident: INDEX  */
 #line 474 "bootparse.y"
                                         { (yyval.str) = pstrdup((yyvsp[0].kw)); }
-#line 1716 "bootparse.c"
+#line 1707 "bootparse.c"
     break;
 
   case 53: /* boot_ident: ON  */
 #line 475 "bootparse.y"
                                         { (yyval.str) = pstrdup((yyvsp[0].kw)); }
-#line 1722 "bootparse.c"
+#line 1713 "bootparse.c"
     break;
 
   case 54: /* boot_ident: USING  */
 #line 476 "bootparse.y"
                                         { (yyval.str) = pstrdup((yyvsp[0].kw)); }
-#line 1728 "bootparse.c"
+#line 1719 "bootparse.c"
     break;
 
   case 55: /* boot_ident: XBUILD  */
 #line 477 "bootparse.y"
                                         { (yyval.str) = pstrdup((yyvsp[0].kw)); }
-#line 1734 "bootparse.c"
+#line 1725 "bootparse.c"
     break;
 
   case 56: /* boot_ident: INDICES  */
 #line 478 "bootparse.y"
                                         { (yyval.str) = pstrdup((yyvsp[0].kw)); }
-#line 1740 "bootparse.c"
+#line 1731 "bootparse.c"
     break;
 
   case 57: /* boot_ident: UNIQUE  */
 #line 479 "bootparse.y"
                                         { (yyval.str) = pstrdup((yyvsp[0].kw)); }
-#line 1746 "bootparse.c"
+#line 1737 "bootparse.c"
     break;
 
   case 58: /* boot_ident: XTOAST  */
 #line 480 "bootparse.y"
                                         { (yyval.str) = pstrdup((yyvsp[0].kw)); }
-#line 1752 "bootparse.c"
+#line 1743 "bootparse.c"
     break;
 
   case 59: /* boot_ident: OBJ_ID  */
 #line 481 "bootparse.y"
                                         { (yyval.str) = pstrdup((yyvsp[0].kw)); }
-#line 1758 "bootparse.c"
+#line 1749 "bootparse.c"
     break;
 
   case 60: /* boot_ident: XBOOTSTRAP  */
 #line 482 "bootparse.y"
                                 { (yyval.str) = pstrdup((yyvsp[0].kw)); }
-#line 1764 "bootparse.c"
+#line 1755 "bootparse.c"
     break;
 
   case 61: /* boot_ident: XSHARED_RELATION  */
 #line 483 "bootparse.y"
                                         { (yyval.str) = pstrdup((yyvsp[0].kw)); }
-#line 1770 "bootparse.c"
+#line 1761 "bootparse.c"
     break;
 
   case 62: /* boot_ident: XROWTYPE_OID  */
 #line 484 "bootparse.y"
                                 { (yyval.str) = pstrdup((yyvsp[0].kw)); }
-#line 1776 "bootparse.c"
+#line 1767 "bootparse.c"
     break;
 
   case 63: /* boot_ident: XFORCE  */
 #line 485 "bootparse.y"
                                         { (yyval.str) = pstrdup((yyvsp[0].kw)); }
-#line 1782 "bootparse.c"
+#line 1773 "bootparse.c"
     break;
 
   case 64: /* boot_ident: XNOT  */
 #line 486 "bootparse.y"
                                         { (yyval.str) = pstrdup((yyvsp[0].kw)); }
-#line 1788 "bootparse.c"
+#line 1779 "bootparse.c"
     break;
 
   case 65: /* boot_ident: XNULL  */
 #line 487 "bootparse.y"
                                         { (yyval.str) = pstrdup((yyvsp[0].kw)); }
-#line 1794 "bootparse.c"
+#line 1785 "bootparse.c"
     break;
 
 
-#line 1798 "bootparse.c"
+#line 1789 "bootparse.c"
 
       default: break;
     }
@@ -1876,6 +1867,7 @@ yyerrorlab:
      label yyerrorlab therefore never appears in user code.  */
   if (0)
     YYERROR;
+  ++yynerrs;
 
   /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
@@ -1936,7 +1928,7 @@ yyerrlab1:
 `-------------------------------------*/
 yyacceptlab:
   yyresult = 0;
-  goto yyreturn;
+  goto yyreturnlab;
 
 
 /*-----------------------------------.
@@ -1944,24 +1936,22 @@ yyacceptlab:
 `-----------------------------------*/
 yyabortlab:
   yyresult = 1;
-  goto yyreturn;
+  goto yyreturnlab;
 
 
-#if !defined yyoverflow
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here.  |
-`-------------------------------------------------*/
+/*-----------------------------------------------------------.
+| yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here.  |
+`-----------------------------------------------------------*/
 yyexhaustedlab:
   yyerror (YY_("memory exhausted"));
   yyresult = 2;
-  goto yyreturn;
-#endif
+  goto yyreturnlab;
 
 
-/*-------------------------------------------------------.
-| yyreturn -- parsing is finished, clean up and return.  |
-`-------------------------------------------------------*/
-yyreturn:
+/*----------------------------------------------------------.
+| yyreturnlab -- parsing is finished, clean up and return.  |
+`----------------------------------------------------------*/
+yyreturnlab:
   if (yychar != YYEMPTY)
     {
       /* Make sure we have latest lookahead translation.  See comments at