Merge branch 'main' into fix-explicit-constructor

Author: LT2H

.github/workflows/build-cppfront.yaml

@@ -17,7 +17,7 @@ jobs:
       - name: Compiler name & version
         run: cl.exe
       - name: Build
-        run: cl.exe source/cppfront.cpp -std:c++latest -MD -EHsc -experimental:module -W4 -WX
+        run: cl.exe source/cppfront.cpp -std:c++latest -MD -EHsc -W4 -WX
   build-unix-like:
     strategy:
       fail-fast: false

.github/workflows/regression-tests.yml

@@ -25,19 +25,14 @@ jobs:
         cxx_std: [c++2b]
         stdlib: [libstdc++]
         include:
-          - os: ubuntu-20.04
-            shortosname: ubu-20
-            compiler: g++-10
-            cxx_std: c++20
-            stdlib: libstdc++
           - os: ubuntu-24.04
             shortosname: ubu-24
-            compiler: clang++-18
+            compiler: clang++-19
             cxx_std: c++20
             stdlib: libstdc++
           - os: ubuntu-24.04
             shortosname: ubu-24
-            compiler: clang++-18
+            compiler: clang++-19
             cxx_std: c++23
             stdlib: libc++-18-dev
           - os: ubuntu-22.04
@@ -50,11 +45,6 @@ jobs:
             compiler: clang++-15
             cxx_std: c++20
             stdlib: libc++-15-dev
-          - os: ubuntu-20.04
-            shortosname: ubu-20
-            compiler: clang++-12
-            cxx_std: c++20
-            stdlib: libstdc++
           - os: macos-14
             shortosname: mac-14
             compiler: clang++
@@ -84,12 +74,17 @@ jobs:
     - name: Checkout repo
       uses: actions/checkout@v4
 
-    - name: Prepare compilers
+    - name: Prepare compilers - macOS
       if: matrix.os == 'macos-13'
       run: |
         sudo xcode-select --switch /Applications/Xcode_14.3.1.app
         sudo ln -s "$(brew --prefix llvm@15)/bin/clang" /usr/local/bin/clang++-15
 
+    - name: Prepare compilers - Ubuntu 24.04
+      if: matrix.os == 'ubuntu-24.04'
+      run: |
+        sudo sudo apt-get install clang-19
+
     - name: Run regression tests - Linux and macOS version
       if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macos')
       run: |

docs/cpp2/generalized-copy-move-construction-assignment.png

@@ -148,18 +148,16 @@ As mentioned above:
 
 This graphic summarizes these generalizations. For convenience I've numbered the (A)ssignment and (M)ove defaults.
 
-![image](https://user-images.githubusercontent.com/1801526/226261443-03125a35-7890-4cc7-bf7d-f23b3a0bb0df.png)
+![image](generalized-copy-move-construction-assignment.png)
 
 In Cpp1 terms, they can be described as follows:
 
 - **(M)ove, M1, M2:** If you write a copy constructor or assignment operator, but not a corresponding move constructor or assignment operator, the latter is generated.
 
-- **(A)ssignment, A1, A2, A3:** If you write a copy or move or converting constructor, but not a corresponding copy or move or converting assignment operator, the latter is generated.
+- **(A)ssignment, A1, A3:** If you write a generalized constructor, but none of the three more-specific copy/move constructor/assignment functions, the latter three get generated. If you write a converting copy constructor, but no converting assignment operator for the same type and this is not a polymorphic type, the latter is generated.
 
 - **The arrows are transitive.** For example, if you write a copy constructor and nothing else, the move constructor, copy assignment operator, and move assignment operator are generated.
 
-- **M2 is preferred over A2.** Both M2 and A2 can generate a missing `#!cpp (inout this, move that)` function. If both options are available, Cpp2 prefers to use M2 (generate move assignment from copy assignment, which could itself have been generated from copy construction) rather than A2 (generate move assignment from move construction). This is because M2 is a better fit: Move assignment is more like copy assignment than like move construction, because assignments are designed structurally to set the value of an existing `#!cpp this` object.
-
 The most general `#!cpp operator=` with `that` is `#!cpp (out this, that)`. In Cpp1 terms, it generates all four combinations of { copy, move } x { constructor, assignment }. This is often sufficient, so you can write all these value-setting functions just once. If you do want to write a more specific version that does something else, though, you can always write it too.
 
 > Note: Generating `#!cpp inout this` (assignment) from `#!cpp out this` also generates **converting assignment** from converting construction, which is a new thing. Today in Cpp1, if you write a converting constructor from another type `X`, you may or may not write the corresponding assignment from `X`; in Cpp2 you will get that by default, and it sets the object to the same state as the converting constructor from `X` does.
@@ -218,7 +216,7 @@ mytype: type
         print();
     }
 
-    print: (this) = std::cout << "value is [(name)$] [(social_handle)$]\n";
+    print: (this) = { std::cout << "value is [(name)$] [(social_handle)$]\n"; }
 }
 
 //  The above definition of mytype allows all of the following...

docs/cpp2/types.md

@@ -82,7 +82,7 @@ template<typename CharT, typename matcher> class regular_expression;
 
 #line 1 "cpp2regex.h2"
 
-//  Copyright 2022-2024 Herb Sutter
+//  Copyright 2022-2025 Herb Sutter
 //  SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //  
 //  Part of the Cppfront Project, under the Apache License v2.0 with LLVM Exceptions.

include/cpp2regex.h

@@ -1,5 +1,5 @@
 
-//  Copyright 2022-2024 Herb Sutter
+//  Copyright 2022-2025 Herb Sutter
 //  SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //  
 //  Part of the Cppfront Project, under the Apache License v2.0 with LLVM Exceptions.

include/cpp2regex.h2

@@ -1,5 +1,5 @@
 
-//  Copyright 2022-2024 Herb Sutter
+//  Copyright 2022-2025 Herb Sutter
 //  SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //  
 //  Part of the Cppfront Project, under the Apache License v2.0 with LLVM Exceptions.
@@ -301,6 +301,12 @@
     #include <vector>
 #endif
 
+// Required for pure Cpp2 tests to pass on MSVC
+// #include <cstdlib> causes C2995 of math tempaltes
+#ifndef EXIT_FAILURE
+    #define EXIT_FAILURE 1
+#endif
+
 //  cpp2util.h uses signed integer types for indices and container sizes
 //  so disable clang signed-to-unsigned conversion warnings in this header.
 #ifdef __clang__
@@ -561,7 +567,7 @@ class contract_group {
         std::cerr << ": " << msg;
     }
     std::cerr << "\n";
-    std::terminate();
+    std::exit(EXIT_FAILURE);
 }
 
 auto inline cpp2_default = contract_group(
@@ -1328,7 +1334,7 @@ constexpr auto type_name() -> std::string_view {
         err += std::string{" and the message \""} + msg + "\"";
     }
     type_safety.report_violation( err.c_str() );
-    std::terminate();
+    std::exit(EXIT_FAILURE);
 #else
     throw CPP2_FORWARD(x);
 #endif

include/cpp2util.h

@@ -0,0 +1,2 @@
+#else
+#else

regression-tests/mixed-bugfix-for-double-pound-else-error.cpp2

@@ -0,0 +1,3 @@
+crash_10: (foo: i32) = {
+  assert( 10LL as i32 == foo$);
+}

regression-tests/pure2-bugfix-for-assert-capture-error.cpp2

@@ -0,0 +1,3 @@
+crash_10: (foo: i32) = {
+  assert( 10LL as i32 == foo$);
+}