git: 30c91a3cee6d - main - byacc: Adjust expected test output to match our patches.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 22 Feb 2023 19:05:16 UTC
The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=30c91a3cee6d29106a1c5f13ae1d25321d8ab35f commit 30c91a3cee6d29106a1c5f13ae1d25321d8ab35f Author: Dag-Erling Smørgrav <des@FreeBSD.org> AuthorDate: 2023-02-22 19:04:06 +0000 Commit: Dag-Erling Smørgrav <des@FreeBSD.org> 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*/