Added -n and -s to regression test compilations

Author: hsutter

regression-tests/run-tests.bat

@@ -7,13 +7,13 @@ copy ..\*.cpp2 .
 set count=0
 for %%f in (mixed-*.cpp2) do (
     echo Starting cppfront.exe %%f
-    C:\GitHub\cppfront\x64\Debug\cppfront.exe %%f > %%f.output 2>&1
+    C:\GitHub\cppfront\x64\Debug\cppfront.exe -n -s %%f > %%f.output 2>&1
     del %%f
     set /a count+=1
 )
 for %%f in (pure2-*.cpp2) do (
     echo Starting cppfront.exe %%f -p
-    C:\GitHub\cppfront\x64\Debug\cppfront.exe %%f -p > %%f.output 2>&1
+    C:\GitHub\cppfront\x64\Debug\cppfront.exe -n -s -p %%f > %%f.output 2>&1
     del %%f
     set /a count+=1
 )

regression-tests/test-results/mixed-bounds-check.cpp

@@ -14,5 +14,5 @@
 [[nodiscard]] auto main() -> int{
     std::vector v { 1, 2, 3, 4, 5, -999 }; 
     CPP2_UFCS_0(pop_back, v);
-    std::cout << v[5] << "\n";
+    std::cout << cpp2::assert_in_bounds(v, 5) << "\n";
 }

regression-tests/test-results/mixed-captures-in-expressions-and-postconditions.cpp

@@ -20,7 +20,7 @@ auto insert_at(cpp2::in<int> where, cpp2::in<int> val) -> void;
                "hello", "2022" }; 
 
     std::string y { "\n" }; 
-    auto callback { [_0 = (&y)](auto const& x){std::cout << x << *_0;} }; 
+    auto callback { [_0 = (&y)](auto const& x){std::cout << x << *cpp2::assert_not_null(_0);} }; 
 
     std::ranges::for_each( vec, callback );
     y = "-ish\n";

regression-tests/test-results/mixed-function-expression-with-pointer-capture.cpp

@@ -22,7 +22,7 @@
 
     std::string y { "\n" }; 
     std::ranges::for_each( view, [_0 = (&y)](auto const& x){
-        std::cout << (*(_0)).c_str() << x << *_0;
+        std::cout << (*cpp2::assert_not_null((_0))).c_str() << x << *cpp2::assert_not_null(_0);
     } );
 
     auto callback { [](auto& x) { return x += "-ish"; } }; 

regression-tests/test-results/mixed-lifetime-safety-and-null-contracts.cpp

@@ -30,7 +30,7 @@ auto call_my_framework(cpp2::in<const char *> msg) -> void;
 
 auto try_pointer_stuff() -> void{
     int* p { null_from_cpp1() }; 
-    *p = 42;    // deliberate null dereference
+    *cpp2::assert_not_null(p) = 42;// deliberate null dereference
                 // to show -n
 }
 

regression-tests/test-results/mixed-lifetime-safety-pointer-init-4.cpp

@@ -29,7 +29,7 @@ auto print_and_decorate(auto const& thing) -> void;
         p.construct(&x);
     }
 
-    print_and_decorate( *p.value());
+    print_and_decorate( *cpp2::assert_not_null(p.value()));
 }
 
 auto print_and_decorate(auto const& thing) -> void { 

regression-tests/test-results/mixed-postfix-expression-custom-formatting.cpp

@@ -17,10 +17,10 @@ auto call(auto const& v, auto const& w, auto const& x, auto const& y, auto const
 
 [[nodiscard]] auto test(auto const& a) -> std::string{
     return call( a, 
-        ++*a.b(a.c), "hello", /* polite
+        ++*cpp2::assert_not_null(a.b(a.c)), "hello", /* polite
                           greeting
                           goes here */ " there", 
-        a.d.e( ++(*a.f).g(), // because f is foobar
+        a.d.e( ++(*cpp2::assert_not_null(a.f)).g(), // because f is foobar
               a.h.i(), 
               CPP2_UFCS(j, a, a.k, a.l))
         ); 

regression-tests/test-results/mixed-test-parens.cpp

@@ -17,7 +17,7 @@ constexpr int a = 1;
 
 [[nodiscard]] auto main() -> int{
     std::vector<int> v { 1, 2, 3 }; 
-    std::cout << (1 + 2) * (3 + v[0]);
+    std::cout << (1 + 2) * (3 + cpp2::assert_in_bounds(v, 0));
     f<(1 > 2)>(3, 4);
     f< a + a>(5, 6);
 }

regression-tests/test-results/mixed-type-safety-1.cpp

@@ -45,7 +45,7 @@ auto print(cpp2::in<std::string> msg, cpp2::in<bool> b) -> void
 
     auto c { cpp2_new<Circle>() }; // safe by construction
     Shape* s { CPP2_UFCS_0(get, c) }; // safe by Lifetime
-    print("\ns* is Shape?  ", cpp2::is<Shape>(*s));
-    print(  "s* is Circle? ", cpp2::is<Circle>(*s));
-    print(  "s* is Square? ", cpp2::is<Square>(*s));
+    print("\ns* is Shape?  ", cpp2::is<Shape>(*cpp2::assert_not_null(s)));
+    print(  "s* is Circle? ", cpp2::is<Circle>(*cpp2::assert_not_null(s)));
+    print(  "s* is Square? ", cpp2::is<Square>(*cpp2::assert_not_null(s)));
 }

regression-tests/test-results/pure2-bounds-safety-span.cpp

@@ -22,7 +22,7 @@ auto print_and_decorate(auto const& thing) -> void;
 
     auto i { 0 }; 
     for( ; i < CPP2_UFCS_0(ssize, s); ++i ) {
-        print_and_decorate( s[i] );
+        print_and_decorate( cpp2::assert_in_bounds(s, i));
     }
 }
 

regression-tests/test-results/pure2-intro-example-three-loops.cpp

@@ -30,13 +30,13 @@ auto decorate_and_print(auto& thing) -> void{
     std::span<std::string> view { words }; 
 
     auto i { cpp2_new<int>(0) }; 
-    for( ; *i < CPP2_UFCS_0(size, view); ++*i ) {
-        print( view[*i] );
+    for( ; *cpp2::assert_not_null(i) < CPP2_UFCS_0(size, view); ++*cpp2::assert_not_null(i) ) {
+        print( cpp2::assert_in_bounds(view, *cpp2::assert_not_null(i)));
     }
 
     do {
         std::cout << std::setw(4) << "**";
-    } while ( *i > 1 && [&]{ --*i ; return true; }() );
+    } while ( *cpp2::assert_not_null(i) > 1 && [&]{ --*cpp2::assert_not_null(i) ; return true; }() );
 
     std::cout << "\n";
     for ( auto&& cpp2_range = words;  auto& word : cpp2_range ) 

regression-tests/test-results/run-tests.bat

@@ -7,13 +7,13 @@ copy ..\*.cpp2 .
 set count=0
 for %%f in (mixed-*.cpp2) do (
     echo Starting cppfront.exe %%f
-    C:\GitHub\cppfront\x64\Debug\cppfront.exe %%f > %%f.output 2>&1
+    C:\GitHub\cppfront\x64\Debug\cppfront.exe -n -s %%f > %%f.output 2>&1
     del %%f
     set /a count+=1
 )
 for %%f in (pure2-*.cpp2) do (
     echo Starting cppfront.exe %%f -p
-    C:\GitHub\cppfront\x64\Debug\cppfront.exe %%f -p > %%f.output 2>&1
+    C:\GitHub\cppfront\x64\Debug\cppfront.exe -n -s -p %%f > %%f.output 2>&1
     del %%f
     set /a count+=1
 )