Merge branch 'main' of https://github.com/hsutter/cppfront

Author: hsutter

Diff for: regression-tests/test-results/apple-clang-14/pure2-assert-expected-not-null.cpp.output

@@ -4,16 +4,16 @@ pure2-assert-expected-not-null.cpp2:7:10: error: no member named 'expected' in n
 pure2-assert-expected-not-null.cpp2:7:22: error: expected '(' for function-style cast or type construction
     std::expected<int,bool> ex {4}; 
                   ~~~^
-pure2-assert-expected-not-null.cpp2:9:165: error: use of undeclared identifier 'ex'
-    return *cpp2::assert_not_null(std::move(up)) + *cpp2::assert_not_null(std::move(sp)) + *cpp2::assert_not_null(std::move(op)) + *cpp2::assert_not_null(std::move(ex)); 
-                                                                                                                                                                    ^
+pure2-assert-expected-not-null.cpp2:9:189: error: use of undeclared identifier 'ex'
+    return *cpp2::impl::assert_not_null(std::move(up)) + *cpp2::impl::assert_not_null(std::move(sp)) + *cpp2::impl::assert_not_null(std::move(op)) + *cpp2::impl::assert_not_null(std::move(ex)); 
+                                                                                                                                                                                            ^
 pure2-assert-expected-not-null.cpp2:14:10: error: no member named 'expected' in namespace 'std'
     std::expected<int,bool> ex {std::unexpected(false)}; 
     ~~~~~^
 pure2-assert-expected-not-null.cpp2:14:22: error: expected '(' for function-style cast or type construction
     std::expected<int,bool> ex {std::unexpected(false)}; 
                   ~~~^
-pure2-assert-expected-not-null.cpp2:15:45: error: use of undeclared identifier 'ex'
-    return *cpp2::assert_not_null(std::move(ex)); 
-                                            ^
+pure2-assert-expected-not-null.cpp2:15:51: error: use of undeclared identifier 'ex'
+    return *cpp2::impl::assert_not_null(std::move(ex)); 
+                                                  ^
 6 errors generated.

Diff for: regression-tests/test-results/apple-clang-14/pure2-trailing-commas.cpp.execution

@@ -8,9 +8,9 @@ pure2-assert-expected-not-null.cpp2:7:10: error: no member named 'expected' in n
 /usr/bin/../lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/exception:107:8: note: 'unexpected' declared here
   void unexpected() __attribute__ ((__noreturn__));
        ^
-pure2-assert-expected-not-null.cpp2:9:165: error: use of undeclared identifier 'ex'
-    return *cpp2::assert_not_null(std::move(up)) + *cpp2::assert_not_null(std::move(sp)) + *cpp2::assert_not_null(std::move(op)) + *cpp2::assert_not_null(std::move(ex)); 
-                                                                                                                                                                    ^
+pure2-assert-expected-not-null.cpp2:9:189: error: use of undeclared identifier 'ex'
+    return *cpp2::impl::assert_not_null(std::move(up)) + *cpp2::impl::assert_not_null(std::move(sp)) + *cpp2::impl::assert_not_null(std::move(op)) + *cpp2::impl::assert_not_null(std::move(ex)); 
+                                                                                                                                                                                            ^
 pure2-assert-expected-not-null.cpp2:14:22: error: expected '(' for function-style cast or type construction
     std::expected<int,bool> ex {std::unexpected(false)}; 
                   ~~~^
@@ -21,7 +21,7 @@ pure2-assert-expected-not-null.cpp2:14:10: error: no member named 'expected' in
 /usr/bin/../lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/exception:107:8: note: 'unexpected' declared here
   void unexpected() __attribute__ ((__noreturn__));
        ^
-pure2-assert-expected-not-null.cpp2:15:45: error: use of undeclared identifier 'ex'
-    return *cpp2::assert_not_null(std::move(ex)); 
-                                            ^
+pure2-assert-expected-not-null.cpp2:15:51: error: use of undeclared identifier 'ex'
+    return *cpp2::impl::assert_not_null(std::move(ex)); 
+                                                  ^
 6 errors generated.