Skip to content

Commit 8ade56b

Browse files
committed
Update regression tests incl. to merge effects of parallel PRs
And bump build number
1 parent 92aa71e commit 8ade56b

12 files changed

+94
-23
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
const foo
2+
const foo
3+
const foo
4+
const foo
5+
foo
6+
foo
7+
Call B const: 0.000000
8+
Call B const: 0.000000
9+
Call A const: 0
10+
Call B const: 0.000000
11+
Call B const: 0.000000
12+
Call A const: 0
13+
Call B mut: 0.000000
14+
Call B mut: 0.000000
15+
Call A mut: 0
16+
Call A const: 0
17+
Call B const: 0.000000
18+
Call A const: 0
19+
Call A const: 0
20+
Call B const: 0.000000
21+
Call A const: 0
22+
Call A mut: 0
23+
Call B mut: 0.000000
24+
Call A mut: 0

regression-tests/test-results/clang-12/pure2-types-down-upcast.cpp.output

Whitespace-only changes.

regression-tests/test-results/gcc-10/pure2-bugfix-for-requires-clause-in-forward-declaration.cpp.output

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
pure2-bugfix-for-requires-clause-in-forward-declaration.cpp2:3:36: error: expected ‘;’ at end of member declaration
22
In file included from pure2-bugfix-for-requires-clause-in-forward-declaration.cpp:7:
3-
../../../include/cpp2util.h:1758:47: error: static assertion failed: GCC 11 or higher is required to support variables and type-scope functions that have a 'requires' clause. This includes a type-scope 'forward' parameter of non-wildcard type, such as 'func: (this, forward s: std::string)', which relies on being able to add a 'requires' clause - in that case, use 'forward s: _' instead if you need the result to compile with GCC 10.
4-
1758 | #define CPP2_REQUIRES_(...) static_assert(false, "GCC 11 or higher is required to support variables and type-scope functions that have a 'requires' clause. This includes a type-scope 'forward' parameter of non-wildcard type, such as 'func: (this, forward s: std::string)', which relies on being able to add a 'requires' clause - in that case, use 'forward s: _' instead if you need the result to compile with GCC 10.")
3+
../../../include/cpp2util.h:1770:47: error: static assertion failed: GCC 11 or higher is required to support variables and type-scope functions that have a 'requires' clause. This includes a type-scope 'forward' parameter of non-wildcard type, such as 'func: (this, forward s: std::string)', which relies on being able to add a 'requires' clause - in that case, use 'forward s: _' instead if you need the result to compile with GCC 10.
4+
1770 | #define CPP2_REQUIRES_(...) static_assert(false, "GCC 11 or higher is required to support variables and type-scope functions that have a 'requires' clause. This includes a type-scope 'forward' parameter of non-wildcard type, such as 'func: (this, forward s: std::string)', which relies on being able to add a 'requires' clause - in that case, use 'forward s: _' instead if you need the result to compile with GCC 10.")
55
| ^~~~~
66
pure2-bugfix-for-requires-clause-in-forward-declaration.cpp2:4:1: note: in expansion of macro ‘CPP2_REQUIRES_’
77
pure2-bugfix-for-requires-clause-in-forward-declaration.cpp2:3:46: error: expected ‘;’ at end of member declaration
88
In file included from pure2-bugfix-for-requires-clause-in-forward-declaration.cpp:7:
9-
../../../include/cpp2util.h:1758:47: error: static assertion failed: GCC 11 or higher is required to support variables and type-scope functions that have a 'requires' clause. This includes a type-scope 'forward' parameter of non-wildcard type, such as 'func: (this, forward s: std::string)', which relies on being able to add a 'requires' clause - in that case, use 'forward s: _' instead if you need the result to compile with GCC 10.
10-
1758 | #define CPP2_REQUIRES_(...) static_assert(false, "GCC 11 or higher is required to support variables and type-scope functions that have a 'requires' clause. This includes a type-scope 'forward' parameter of non-wildcard type, such as 'func: (this, forward s: std::string)', which relies on being able to add a 'requires' clause - in that case, use 'forward s: _' instead if you need the result to compile with GCC 10.")
9+
../../../include/cpp2util.h:1770:47: error: static assertion failed: GCC 11 or higher is required to support variables and type-scope functions that have a 'requires' clause. This includes a type-scope 'forward' parameter of non-wildcard type, such as 'func: (this, forward s: std::string)', which relies on being able to add a 'requires' clause - in that case, use 'forward s: _' instead if you need the result to compile with GCC 10.
10+
1770 | #define CPP2_REQUIRES_(...) static_assert(false, "GCC 11 or higher is required to support variables and type-scope functions that have a 'requires' clause. This includes a type-scope 'forward' parameter of non-wildcard type, such as 'func: (this, forward s: std::string)', which relies on being able to add a 'requires' clause - in that case, use 'forward s: _' instead if you need the result to compile with GCC 10.")
1111
| ^~~~~
1212
pure2-bugfix-for-requires-clause-in-forward-declaration.cpp2:4:1: note: in expansion of macro ‘CPP2_REQUIRES_’
1313
pure2-bugfix-for-requires-clause-in-forward-declaration.cpp2:3:3: error: no declaration matches ‘element::element(auto:80&&) requires is_same_v<typename std::remove_cv<typename std::remove_reference<decltype(element::__ct ::n)>::type>::type, std::__cxx11::string>’
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
In file included from pure2-requires-clauses.cpp:7:
2-
../../../include/cpp2util.h:1758:33: error: expected unqualified-id before ‘static_assert’
3-
1758 | #define CPP2_REQUIRES_(...) static_assert(false, "GCC 11 or higher is required to support variables and type-scope functions that have a 'requires' clause. This includes a type-scope 'forward' parameter of non-wildcard type, such as 'func: (this, forward s: std::string)', which relies on being able to add a 'requires' clause - in that case, use 'forward s: _' instead if you need the result to compile with GCC 10.")
2+
../../../include/cpp2util.h:1770:33: error: expected unqualified-id before ‘static_assert’
3+
1770 | #define CPP2_REQUIRES_(...) static_assert(false, "GCC 11 or higher is required to support variables and type-scope functions that have a 'requires' clause. This includes a type-scope 'forward' parameter of non-wildcard type, such as 'func: (this, forward s: std::string)', which relies on being able to add a 'requires' clause - in that case, use 'forward s: _' instead if you need the result to compile with GCC 10.")
44
| ^~~~~~~~~~~~~
55
pure2-requires-clauses.cpp2:19:1: note: in expansion of macro ‘CPP2_REQUIRES_’
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
const foo
2+
const foo
3+
const foo
4+
const foo
5+
foo
6+
foo
7+
Call B const: 0.000000
8+
Call B const: 0.000000
9+
Call A const: 0
10+
Call B const: 0.000000
11+
Call B const: 0.000000
12+
Call A const: 0
13+
Call B mut: 0.000000
14+
Call B mut: 0.000000
15+
Call A mut: 0
16+
Call A const: 0
17+
Call B const: 0.000000
18+
Call A const: 0
19+
Call A const: 0
20+
Call B const: 0.000000
21+
Call A const: 0
22+
Call A mut: 0
23+
Call B mut: 0.000000
24+
Call A mut: 0

regression-tests/test-results/gcc-13/pure2-types-down-upcast.cpp.output

Whitespace-only changes.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
const foo
2+
const foo
3+
const foo
4+
const foo
5+
foo
6+
foo
7+
Call B const: 0.000000
8+
Call B const: 0.000000
9+
Call A const: 0
10+
Call B const: 0.000000
11+
Call B const: 0.000000
12+
Call A const: 0
13+
Call B mut: 0.000000
14+
Call B mut: 0.000000
15+
Call A mut: 0
16+
Call A const: 0
17+
Call B const: 0.000000
18+
Call A const: 0
19+
Call A const: 0
20+
Call B const: 0.000000
21+
Call A const: 0
22+
Call A mut: 0
23+
Call B mut: 0.000000
24+
Call A mut: 0
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pure2-types-down-upcast.cpp

regression-tests/test-results/pure2-types-down-upcast.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ class B;
2020
class A {
2121
public: int i {0};
2222

23-
public: virtual auto const_foo() const -> void;
24-
public: auto mut_foo() -> void;
23+
public: virtual auto const_foo() const& -> void;
24+
public: auto mut_foo() & -> void;
2525

2626
public: A() = default;
2727
public: A(A const&) = delete; /* No 'that' constructor, suppress copy */
@@ -67,8 +67,8 @@ auto test_down() -> void;
6767

6868

6969
#line 4 "pure2-types-down-upcast.cpp2"
70-
auto A::const_foo() const -> void{std::cout << "const foo \n"; }
71-
auto A::mut_foo() -> void{std::cout << "foo \n"; }
70+
auto A::const_foo() const& -> void{std::cout << "const foo \n"; }
71+
auto A::mut_foo() & -> void{std::cout << "foo \n"; }
7272

7373
#line 13 "pure2-types-down-upcast.cpp2"
7474
auto func_mut(A& a) -> void {std::cout << "Call A mut: " + cpp2::to_string(a.i) << std::endl;}
@@ -83,15 +83,15 @@ auto test_const_foo() -> void{
8383
CPP2_UFCS_0(const_foo, (*cpp2::assert_not_null(sC)));
8484
CPP2_UFCS_0(const_foo, (cpp2::as_<A>(s)));
8585
CPP2_UFCS_0(const_foo, (cpp2::as_<A>(*cpp2::assert_not_null(sC))));
86-
(void) std::move(s);
87-
(void) std::move(sC);
86+
static_cast<void>(std::move(s));
87+
static_cast<void>(std::move(sC));
8888
}
8989

9090
auto test_mut_foo() -> void{
9191
A s {};
9292
CPP2_UFCS_0(mut_foo, s);
9393
CPP2_UFCS_0(mut_foo, (cpp2::as_<A>(s)));
94-
(void) std::move(s);
94+
static_cast<void>(std::move(s));
9595
}
9696

9797
auto test_up() -> void{
@@ -109,8 +109,8 @@ auto test_up() -> void{
109109
func_mut(cpp2::as_<B>(b));
110110
func_mut(cpp2::as_<A>(b));
111111

112-
(void) std::move(b);
113-
(void) std::move(bC);
112+
static_cast<void>(std::move(b));
113+
static_cast<void>(std::move(bC));
114114
}
115115

116116
auto test_down() -> void{
@@ -129,10 +129,10 @@ auto test_down() -> void{
129129
func_mut(cpp2::as_<B>(*cpp2::assert_not_null(a)));
130130
func_mut(cpp2::as_<A>(*cpp2::assert_not_null(a)));
131131

132-
(void) std::move(b);
133-
(void) std::move(bC);
134-
(void) std::move(a);
135-
(void) std::move(aC);
132+
static_cast<void>(std::move(b));
133+
static_cast<void>(std::move(bC));
134+
static_cast<void>(std::move(a));
135+
static_cast<void>(std::move(aC));
136136
}
137137

138138
[[nodiscard]] auto main() -> int{

regression-tests/test-results/pure2-types-down-upcast.cpp2

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)