Switched argv back to its usual standard meaning

The real default-const value is in the safe `args` themselves, and `argc` and `argv` should be their standard selves for compatibility. See #592 comment thread, thanks @vladimir-kraus !

Author: hsutter

include/cpp2util.h

@@ -1491,17 +1491,17 @@ inline auto to_string(std::tuple<Ts...> const& t) -> std::string
 //
 struct args_t : std::vector<std::string_view>
 {
-    args_t(int c, char** v) : vector{static_cast<size_t>(c)}, argc{c}, argv{v}, mutable_argv{v} {}
+    args_t(int c, char** v) : vector{static_cast<size_t>(c)}, argc{c}, argv{v} {}
 
-    int                argc         = 0;
-    char const* const* argv         = nullptr;
-    char**             mutable_argv = nullptr;
+    int                argc = 0;
+    char**             argv = nullptr;
 };
 
 inline auto make_args(int argc, char** argv) -> args_t
 {
-    auto ret = args_t{argc, argv};
-    std::ranges::copy( std::span(argv, argc), ret.data() );
+    auto ret  = args_t{argc, argv};
+    auto args = std::span(argv, static_cast<size_t>(argc));
+    std::copy( args.begin(), args.end(), ret.data());
     return ret;
 }
 

regression-tests/pure2-main-args.cpp2

@@ -2,5 +2,4 @@ main: (args) =
     std::cout
         << "args.argc            is (args.argc)$\n"
         << "args.argv[0]         is (args.argv[0])$\n"
-        << "args.mutable_argv[0] is (args.mutable_argv[0])$\n"
         ;

regression-tests/test-results/clang-12/pure2-main-args.cpp.execution

@@ -1,3 +1,2 @@
 args.argc            is 1
 args.argv[0]         is ./test.exe
-args.mutable_argv[0] is ./test.exe

regression-tests/test-results/gcc-13/pure2-main-args.cpp.execution

@@ -1,3 +1,2 @@
 args.argc            is 1
 args.argv[0]         is ./test.exe
-args.mutable_argv[0] is ./test.exe

regression-tests/test-results/gcc-13/run-tests-gcc-13.sh

@@ -10,7 +10,7 @@ for f in *.cpp
 do
     let count=count+1
     printf "[%s] Starting gcc 13 %s\n" "$count" "$f"
-    g++ -I../../../include -std=c++20 -pthread -Wunused-parameter -o test.exe $f > $f.output 2>&1
+    g++ -I../../../include -std=c++20 -pthread -Wold-style-cast -Wunused-parameter -o test.exe $f > $f.output 2>&1
     rm -f $f
     if test -f "test.exe"; then
         let exe_count=exe_count+1

regression-tests/test-results/msvc-2022/pure2-main-args.cpp.execution

@@ -1,3 +1,2 @@
 args.argc            is 1
 args.argv[0]         is test.exe
-args.mutable_argv[0] is test.exe

regression-tests/test-results/pure2-main-args.cpp

@@ -22,6 +22,5 @@ auto main(int const argc_, char** argv_) -> int {
 #line 2 "pure2-main-args.cpp2"
     std::cout 
         << "args.argc            is " + cpp2::to_string(args.argc) + "\n" 
-        << "args.argv[0]         is " + cpp2::to_string(cpp2::assert_in_bounds(args.argv, 0)) + "\n" 
-        << "args.mutable_argv[0] is " + cpp2::to_string(cpp2::assert_in_bounds(args.mutable_argv, 0)) + "\n"; }
+        << "args.argv[0]         is " + cpp2::to_string(cpp2::assert_in_bounds(args.argv, 0)) + "\n"; }
 

regression-tests/test-results/version

@@ -1,5 +1,5 @@
 
-cppfront compiler v0.2.1   Build 8814:1300
+cppfront compiler v0.2.1   Build 8815:1647
 Copyright(c) Herb Sutter   All rights reserved
 
 SPDX-License-Identifier: CC-BY-NC-ND-4.0

source/build.info

@@ -1 +1 @@
-"8814:1300"
+"8815:1647"