From nobody Wed Feb 22 19:05:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PMQb03p3zz3tJsM; Wed, 22 Feb 2023 19:05:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PMQb03Rsdz4NX6; Wed, 22 Feb 2023 19:05:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677092716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H5pOydV94KaIWUl6STN4DzOap9hStZYFR8upLX+gYxw=; b=lM7nbqIUmtKpSWhEeHhplPgbEuCXjGRZBRszRtIvKjUhUXGq7wBwVvyLS9IPdr0eDWX30P W45kJWjgvNwpQYNQ+pCotbed7pltmEjoXLGbj2YV+KDgrjwlYW+9WIhCNCUKvYFQKa7k0F 3brhgVLUY/3o78s01eTzrJciAsqUGa1l1FbQAqgwvZIoVk8UEeM7pZYkzaNH1Ki69rG4HI gdn25V+gfprT41WQxb6byT1yZrpjwo1tRP2Xnm6egB74gz2tJnNtdWTCzxuLqSTKEmdtHd Ix6w3htlx5+HjuRHBLFUSAyfrxAyOEGh/gCaP/WwferxBiS+jONQf3E4HKsmig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677092716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H5pOydV94KaIWUl6STN4DzOap9hStZYFR8upLX+gYxw=; b=MW39fhG8w4fjR4oBdI4yMkMNwmYGr1epfuX41AAJAtJ7D1yMjRwlYx/Sbki95fGZwcoE5f lHNvrdPIlPOo3DVmByr8Vld5uv1ZBWy3b6io18e7XfVAPhwMAVXh5Tu88e/XDOjDzYzL9A tgmt3eWG+XcB77+0genWD7g74akVffId/6Oe6sW3lnLWejtzx8S/PjuchEv/+g0Xuakz8V vSb2PuiqEbX7kZzbtRze/IJ8pD2L+zIlEFcfWlZxUxQeBwa2xa8ZcujeuX3UhbSG5kKXWA OFExhdpTMIWm8sfBha0hl3VAPvD9CnIdFCiFZgjz+d1zWkk4p25CDc0rykyQQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677092716; a=rsa-sha256; cv=none; b=d+BnJt/jVQeUMaTZWP+4ZGvyEBBfopna1l7kPAbBlEgQ3wrUBWfuIra4pRT8kWJI+K/0Qa NCJJLNzcXxwPgKNlQkLfEg/aI0U6rIgEA0/NgWiiLA3qNHe7Sklf9Zkv3yBZRo60k/wQiv q3U8IsalFTZA+56qSKsv4X+sXmVVfonPhIV3HT2JV4fDExK7XLVwFQM/0Q2A3GY+mmJg5D oIEtrg853e2wWiGNdSHNReGQbNRnUHz/A1fw955bkpR9I6e9PBYD9kyHnXDlHydIszxa5n zQYcNkDvnSjmsw6o1YNo9TqAMFDrdlSoWDIKIjSQQ7MTdaQZbx6+JyAkvWZuMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PMQb02PFyz1Bjg; Wed, 22 Feb 2023 19:05:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31MJ5GJT015699; Wed, 22 Feb 2023 19:05:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31MJ5G4O015698; Wed, 22 Feb 2023 19:05:16 GMT (envelope-from git) Date: Wed, 22 Feb 2023 19:05:16 GMT Message-Id: <202302221905.31MJ5G4O015698@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 30c91a3cee6d - main - byacc: Adjust expected test output to match our patches. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 30c91a3cee6d29106a1c5f13ae1d25321d8ab35f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=30c91a3cee6d29106a1c5f13ae1d25321d8ab35f commit 30c91a3cee6d29106a1c5f13ae1d25321d8ab35f Author: Dag-Erling Smørgrav AuthorDate: 2023-02-22 19:04:06 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-02-22 19:05:02 +0000 byacc: Adjust expected test output to match our patches. Sponsored by: Klara, Inc. --- contrib/byacc/test/btyacc/btyacc_calc1.tab.c | 2 +- contrib/byacc/test/btyacc/btyacc_calc1.tab.h | 2 +- contrib/byacc/test/btyacc/btyacc_demo.tab.c | 2 +- contrib/byacc/test/btyacc/btyacc_demo.tab.h | 2 +- contrib/byacc/test/btyacc/btyacc_destroy1.tab.c | 2 +- contrib/byacc/test/btyacc/btyacc_destroy1.tab.h | 2 +- contrib/byacc/test/btyacc/btyacc_destroy2.tab.c | 2 +- contrib/byacc/test/btyacc/btyacc_destroy2.tab.h | 2 +- contrib/byacc/test/btyacc/btyacc_destroy3.tab.c | 2 +- contrib/byacc/test/btyacc/btyacc_destroy3.tab.h | 2 +- contrib/byacc/test/btyacc/calc1.tab.c | 2 +- contrib/byacc/test/btyacc/calc1.tab.h | 2 +- contrib/byacc/test/btyacc/err_inherit3.tab.c | 2 +- contrib/byacc/test/btyacc/err_inherit3.tab.h | 2 +- contrib/byacc/test/btyacc/err_inherit4.tab.c | 2 +- contrib/byacc/test/btyacc/err_inherit4.tab.h | 2 +- contrib/byacc/test/btyacc/expr.oxout.tab.c | 2 +- contrib/byacc/test/btyacc/expr.oxout.tab.h | 2 +- contrib/byacc/test/btyacc/inherit1.tab.c | 2 +- contrib/byacc/test/btyacc/inherit1.tab.h | 2 +- contrib/byacc/test/btyacc/inherit2.tab.c | 2 +- contrib/byacc/test/btyacc/inherit2.tab.h | 2 +- contrib/byacc/test/btyacc/ok_syntax1.tab.c | 2 +- contrib/byacc/test/btyacc/ok_syntax1.tab.h | 2 +- contrib/byacc/test/btyacc/varsyntax_calc1.tab.c | 2 +- contrib/byacc/test/btyacc/varsyntax_calc1.tab.h | 2 +- contrib/byacc/test/yacc/calc1.tab.c | 2 +- contrib/byacc/test/yacc/calc1.tab.h | 2 +- contrib/byacc/test/yacc/expr.oxout.tab.c | 2 +- contrib/byacc/test/yacc/expr.oxout.tab.h | 2 +- contrib/byacc/test/yacc/ok_syntax1.tab.c | 2 +- contrib/byacc/test/yacc/ok_syntax1.tab.h | 2 +- contrib/byacc/test/yacc/varsyntax_calc1.tab.c | 2 +- contrib/byacc/test/yacc/varsyntax_calc1.tab.h | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/contrib/byacc/test/btyacc/btyacc_calc1.tab.c b/contrib/byacc/test/btyacc/btyacc_calc1.tab.c index f2057aa37997..36765d09ec09 100644 --- a/contrib/byacc/test/btyacc/btyacc_calc1.tab.c +++ b/contrib/byacc/test/btyacc/btyacc_calc1.tab.c @@ -147,7 +147,7 @@ INTERVAL vreg[26]; #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 #line 29 "btyacc_calc1.y" -typedef union YYSTYPE +typedef union { int ival; double dval; diff --git a/contrib/byacc/test/btyacc/btyacc_calc1.tab.h b/contrib/byacc/test/btyacc/btyacc_calc1.tab.h index 114d213cd962..9cf4e75ba38a 100644 --- a/contrib/byacc/test/btyacc/btyacc_calc1.tab.h +++ b/contrib/byacc/test/btyacc/btyacc_calc1.tab.h @@ -11,7 +11,7 @@ #endif #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 -typedef union YYSTYPE +typedef union { int ival; double dval; diff --git a/contrib/byacc/test/btyacc/btyacc_demo.tab.c b/contrib/byacc/test/btyacc/btyacc_demo.tab.c index 04557cd2d356..73b7a1073127 100644 --- a/contrib/byacc/test/btyacc/btyacc_demo.tab.c +++ b/contrib/byacc/test/btyacc/btyacc_demo.tab.c @@ -152,7 +152,7 @@ typedef struct Decl { #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 #line 36 "btyacc_demo.y" -typedef union YYSTYPE { +typedef union { Scope *scope; Expr *expr; Expr_List *elist; diff --git a/contrib/byacc/test/btyacc/btyacc_demo.tab.h b/contrib/byacc/test/btyacc/btyacc_demo.tab.h index 082f5cdbfa96..5c2b96cf3310 100644 --- a/contrib/byacc/test/btyacc/btyacc_demo.tab.h +++ b/contrib/byacc/test/btyacc/btyacc_demo.tab.h @@ -20,7 +20,7 @@ #endif #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 -typedef union YYSTYPE { +typedef union { Scope *scope; Expr *expr; Expr_List *elist; diff --git a/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c b/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c index a95e13341eee..ce8d58593d88 100644 --- a/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c +++ b/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c @@ -148,7 +148,7 @@ extern symbol *mksymbol(type t, class c, name id); #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 #line 50 "btyacc_destroy1.y" -typedef union YYSTYPE +typedef union { class cval; type tval; diff --git a/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h b/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h index fd25e13b0019..21b0bc21fe86 100644 --- a/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h +++ b/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h @@ -12,7 +12,7 @@ #endif #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 -typedef union YYSTYPE +typedef union { class cval; type tval; diff --git a/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c b/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c index 1c7ac86fc24f..8f0dd0975fe2 100644 --- a/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c +++ b/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c @@ -148,7 +148,7 @@ extern symbol *mksymbol(type t, class c, name id); #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 #line 50 "btyacc_destroy2.y" -typedef union YYSTYPE +typedef union { class cval; type tval; diff --git a/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h b/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h index 5f59abdea129..6f8c2b029b4d 100644 --- a/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h +++ b/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h @@ -12,7 +12,7 @@ #endif #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 -typedef union YYSTYPE +typedef union { class cval; type tval; diff --git a/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c b/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c index c0f897891d4e..dc93094e6116 100644 --- a/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c +++ b/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c @@ -148,7 +148,7 @@ extern symbol *mksymbol(type t, class c, name id); #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 #line 53 "btyacc_destroy3.y" -typedef union YYSTYPE +typedef union { class cval; type tval; diff --git a/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h b/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h index 5a84568a6c04..1ef7d6b370f0 100644 --- a/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h +++ b/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h @@ -12,7 +12,7 @@ #endif #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 -typedef union YYSTYPE +typedef union { class cval; type tval; diff --git a/contrib/byacc/test/btyacc/calc1.tab.c b/contrib/byacc/test/btyacc/calc1.tab.c index 54d7014a4b27..cc40060143b9 100644 --- a/contrib/byacc/test/btyacc/calc1.tab.c +++ b/contrib/byacc/test/btyacc/calc1.tab.c @@ -150,7 +150,7 @@ INTERVAL vreg[26]; #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 #line 31 "calc1.y" -typedef union YYSTYPE +typedef union { int ival; double dval; diff --git a/contrib/byacc/test/btyacc/calc1.tab.h b/contrib/byacc/test/btyacc/calc1.tab.h index 0162b2107474..1802350b0d2a 100644 --- a/contrib/byacc/test/btyacc/calc1.tab.h +++ b/contrib/byacc/test/btyacc/calc1.tab.h @@ -11,7 +11,7 @@ #endif #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 -typedef union YYSTYPE +typedef union { int ival; double dval; diff --git a/contrib/byacc/test/btyacc/err_inherit3.tab.c b/contrib/byacc/test/btyacc/err_inherit3.tab.c index 072d23b59cbb..2a2bde418a5d 100644 --- a/contrib/byacc/test/btyacc/err_inherit3.tab.c +++ b/contrib/byacc/test/btyacc/err_inherit3.tab.c @@ -143,7 +143,7 @@ extern symbol *mksymbol(type t, class c, name id); #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 #line 39 "err_inherit3.y" -typedef union YYSTYPE +typedef union { class cval; type tval; diff --git a/contrib/byacc/test/btyacc/err_inherit3.tab.h b/contrib/byacc/test/btyacc/err_inherit3.tab.h index 1018167b685a..5fa781de315b 100644 --- a/contrib/byacc/test/btyacc/err_inherit3.tab.h +++ b/contrib/byacc/test/btyacc/err_inherit3.tab.h @@ -12,7 +12,7 @@ #endif #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 -typedef union YYSTYPE +typedef union { class cval; type tval; diff --git a/contrib/byacc/test/btyacc/err_inherit4.tab.c b/contrib/byacc/test/btyacc/err_inherit4.tab.c index 4d84c3abf220..71a460d6c606 100644 --- a/contrib/byacc/test/btyacc/err_inherit4.tab.c +++ b/contrib/byacc/test/btyacc/err_inherit4.tab.c @@ -151,7 +151,7 @@ extern symbol *mksymbol(type t, class c, name id); #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 #line 41 "err_inherit4.y" -typedef union YYSTYPE +typedef union { class cval; type tval; diff --git a/contrib/byacc/test/btyacc/err_inherit4.tab.h b/contrib/byacc/test/btyacc/err_inherit4.tab.h index b8c5c281761e..657f87f078fa 100644 --- a/contrib/byacc/test/btyacc/err_inherit4.tab.h +++ b/contrib/byacc/test/btyacc/err_inherit4.tab.h @@ -12,7 +12,7 @@ #endif #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 -typedef union YYSTYPE +typedef union { class cval; type tval; diff --git a/contrib/byacc/test/btyacc/expr.oxout.tab.c b/contrib/byacc/test/btyacc/expr.oxout.tab.c index f83485d97710..9c16860461f0 100644 --- a/contrib/byacc/test/btyacc/expr.oxout.tab.c +++ b/contrib/byacc/test/btyacc/expr.oxout.tab.c @@ -137,7 +137,7 @@ extern void yyerror(const char *); #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 #line 31 "expr.oxout.y" -typedef union YYSTYPE { +typedef union { struct yyyOxAttrbs { struct yyyStackItem *yyyOxStackItem; } yyyOxAttrbs; diff --git a/contrib/byacc/test/btyacc/expr.oxout.tab.h b/contrib/byacc/test/btyacc/expr.oxout.tab.h index cafc41cae56e..eb8596306bdc 100644 --- a/contrib/byacc/test/btyacc/expr.oxout.tab.h +++ b/contrib/byacc/test/btyacc/expr.oxout.tab.h @@ -9,7 +9,7 @@ #endif #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 -typedef union YYSTYPE { +typedef union { struct yyyOxAttrbs { struct yyyStackItem *yyyOxStackItem; } yyyOxAttrbs; diff --git a/contrib/byacc/test/btyacc/inherit1.tab.c b/contrib/byacc/test/btyacc/inherit1.tab.c index 60af07cb10f1..b8e7c5a7935b 100644 --- a/contrib/byacc/test/btyacc/inherit1.tab.c +++ b/contrib/byacc/test/btyacc/inherit1.tab.c @@ -145,7 +145,7 @@ extern void YYERROR_DECL(); #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 #line 32 "inherit1.y" -typedef union YYSTYPE +typedef union { class cval; type tval; diff --git a/contrib/byacc/test/btyacc/inherit1.tab.h b/contrib/byacc/test/btyacc/inherit1.tab.h index 41b0e2937d3d..3b8aa3d2a914 100644 --- a/contrib/byacc/test/btyacc/inherit1.tab.h +++ b/contrib/byacc/test/btyacc/inherit1.tab.h @@ -12,7 +12,7 @@ #endif #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 -typedef union YYSTYPE +typedef union { class cval; type tval; diff --git a/contrib/byacc/test/btyacc/inherit2.tab.c b/contrib/byacc/test/btyacc/inherit2.tab.c index 8fb8e39cf2bc..db6fd30b0a24 100644 --- a/contrib/byacc/test/btyacc/inherit2.tab.c +++ b/contrib/byacc/test/btyacc/inherit2.tab.c @@ -143,7 +143,7 @@ extern symbol *mksymbol(type t, class c, name id); #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 #line 39 "inherit2.y" -typedef union YYSTYPE +typedef union { class cval; type tval; diff --git a/contrib/byacc/test/btyacc/inherit2.tab.h b/contrib/byacc/test/btyacc/inherit2.tab.h index 333dab588b3a..efaf4555d6dd 100644 --- a/contrib/byacc/test/btyacc/inherit2.tab.h +++ b/contrib/byacc/test/btyacc/inherit2.tab.h @@ -12,7 +12,7 @@ #endif #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 -typedef union YYSTYPE +typedef union { class cval; type tval; diff --git a/contrib/byacc/test/btyacc/ok_syntax1.tab.c b/contrib/byacc/test/btyacc/ok_syntax1.tab.c index c7458178ddc2..6d94e6d2f5c8 100644 --- a/contrib/byacc/test/btyacc/ok_syntax1.tab.c +++ b/contrib/byacc/test/btyacc/ok_syntax1.tab.c @@ -137,7 +137,7 @@ static void YYERROR_DECL(); #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 #line 43 "ok_syntax1.y" -typedef union YYSTYPE +typedef union { char * cval; int ival; diff --git a/contrib/byacc/test/btyacc/ok_syntax1.tab.h b/contrib/byacc/test/btyacc/ok_syntax1.tab.h index 9f7028913ee2..44b8dc3e95d3 100644 --- a/contrib/byacc/test/btyacc/ok_syntax1.tab.h +++ b/contrib/byacc/test/btyacc/ok_syntax1.tab.h @@ -23,7 +23,7 @@ #endif #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 -typedef union YYSTYPE +typedef union { char * cval; int ival; diff --git a/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c b/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c index 381102f7207f..2d35aade2579 100644 --- a/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c +++ b/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c @@ -151,7 +151,7 @@ INTERVAL vreg[26]; #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 #line 32 "varsyntax_calc1.y" -typedef union YYSTYPE +typedef union { int ival; /* dreg & vreg array index values*/ double dval; /* floating point values*/ diff --git a/contrib/byacc/test/btyacc/varsyntax_calc1.tab.h b/contrib/byacc/test/btyacc/varsyntax_calc1.tab.h index 5c28ca8ef131..49e269cdb8a4 100644 --- a/contrib/byacc/test/btyacc/varsyntax_calc1.tab.h +++ b/contrib/byacc/test/btyacc/varsyntax_calc1.tab.h @@ -11,7 +11,7 @@ #endif #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 -typedef union YYSTYPE +typedef union { int ival; /* dreg & vreg array index values*/ double dval; /* floating point values*/ diff --git a/contrib/byacc/test/yacc/calc1.tab.c b/contrib/byacc/test/yacc/calc1.tab.c index b78999115ee5..c8c7b6cff9be 100644 --- a/contrib/byacc/test/yacc/calc1.tab.c +++ b/contrib/byacc/test/yacc/calc1.tab.c @@ -130,7 +130,7 @@ INTERVAL vreg[26]; #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 #line 31 "calc1.y" -typedef union YYSTYPE +typedef union { int ival; double dval; diff --git a/contrib/byacc/test/yacc/calc1.tab.h b/contrib/byacc/test/yacc/calc1.tab.h index dd493d013c26..c0633e37dfa8 100644 --- a/contrib/byacc/test/yacc/calc1.tab.h +++ b/contrib/byacc/test/yacc/calc1.tab.h @@ -8,7 +8,7 @@ #endif #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 -typedef union YYSTYPE +typedef union { int ival; double dval; diff --git a/contrib/byacc/test/yacc/expr.oxout.tab.c b/contrib/byacc/test/yacc/expr.oxout.tab.c index 1e2ad2cab7bd..56e3b59d6f44 100644 --- a/contrib/byacc/test/yacc/expr.oxout.tab.c +++ b/contrib/byacc/test/yacc/expr.oxout.tab.c @@ -117,7 +117,7 @@ extern void yyerror(const char *); #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 #line 31 "expr.oxout.y" -typedef union YYSTYPE { +typedef union { struct yyyOxAttrbs { struct yyyStackItem *yyyOxStackItem; } yyyOxAttrbs; diff --git a/contrib/byacc/test/yacc/expr.oxout.tab.h b/contrib/byacc/test/yacc/expr.oxout.tab.h index 03527bb036a4..1084ea4abf79 100644 --- a/contrib/byacc/test/yacc/expr.oxout.tab.h +++ b/contrib/byacc/test/yacc/expr.oxout.tab.h @@ -6,7 +6,7 @@ #endif #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 -typedef union YYSTYPE { +typedef union { struct yyyOxAttrbs { struct yyyStackItem *yyyOxStackItem; } yyyOxAttrbs; diff --git a/contrib/byacc/test/yacc/ok_syntax1.tab.c b/contrib/byacc/test/yacc/ok_syntax1.tab.c index 8714a0bbe73b..f035bed50053 100644 --- a/contrib/byacc/test/yacc/ok_syntax1.tab.c +++ b/contrib/byacc/test/yacc/ok_syntax1.tab.c @@ -117,7 +117,7 @@ static void YYERROR_DECL(); #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 #line 43 "ok_syntax1.y" -typedef union YYSTYPE +typedef union { char * cval; int ival; diff --git a/contrib/byacc/test/yacc/ok_syntax1.tab.h b/contrib/byacc/test/yacc/ok_syntax1.tab.h index ca92fd77dfc2..892b211c8a71 100644 --- a/contrib/byacc/test/yacc/ok_syntax1.tab.h +++ b/contrib/byacc/test/yacc/ok_syntax1.tab.h @@ -20,7 +20,7 @@ #endif #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 -typedef union YYSTYPE +typedef union { char * cval; int ival; diff --git a/contrib/byacc/test/yacc/varsyntax_calc1.tab.c b/contrib/byacc/test/yacc/varsyntax_calc1.tab.c index 6c7f2f8b12fe..5ac5c9c07b78 100644 --- a/contrib/byacc/test/yacc/varsyntax_calc1.tab.c +++ b/contrib/byacc/test/yacc/varsyntax_calc1.tab.c @@ -131,7 +131,7 @@ INTERVAL vreg[26]; #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 #line 32 "varsyntax_calc1.y" -typedef union YYSTYPE +typedef union { int ival; /* dreg & vreg array index values*/ double dval; /* floating point values*/ diff --git a/contrib/byacc/test/yacc/varsyntax_calc1.tab.h b/contrib/byacc/test/yacc/varsyntax_calc1.tab.h index 50369b226429..fd07f2cc3d41 100644 --- a/contrib/byacc/test/yacc/varsyntax_calc1.tab.h +++ b/contrib/byacc/test/yacc/varsyntax_calc1.tab.h @@ -8,7 +8,7 @@ #endif #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 -typedef union YYSTYPE +typedef union { int ival; /* dreg & vreg array index values*/ double dval; /* floating point values*/