Merge branch 'main' into 1328-is-type-for-std--optional-can-return-unexpected-results

hsutter · web-flow · commit 6c3dc312270f · 2025-02-07T20:53:36.000Z
Signed-off-by: Herb Sutter &lt;herb.sutter@gmail.com&gt;
diff --git a/build_h2.bat b/build_h2.bat
@@ -1,6 +1,6 @@
 @echo off
 cd source
-cppfront reflect.h2 -verb
+cppfront reflect.h2 -verb %1
 cd ..\include
-cppfront cpp2regex.h2 -verb
+cppfront cpp2regex.h2 -verb %1
 cd..
diff --git a/regression-tests/test-results/mixed-bounds-check.cpp b/regression-tests/test-results/mixed-bounds-check.cpp
@@ -1,3 +1,5 @@
+#line 2 "mixed-bounds-check.cpp2"
+#include <vector>
 
 
 //=== Cpp2 type declarations ====================================================
@@ -12,8 +14,6 @@
 
 #line 1 "mixed-bounds-check.cpp2"
 
-#include <vector>
-
 #line 4 "mixed-bounds-check.cpp2"
 [[nodiscard]] auto main() -> int;
 
diff --git a/regression-tests/test-results/mixed-bugfix-for-literal-as-nttp.cpp b/regression-tests/test-results/mixed-bugfix-for-literal-as-nttp.cpp
@@ -1,3 +1,4 @@
+#include <chrono>
 
 
 //=== Cpp2 type declarations ====================================================
@@ -11,7 +12,8 @@
 //=== Cpp2 type definitions and function declarations ===========================
 
 #line 1 "mixed-bugfix-for-literal-as-nttp.cpp2"
-#include <chrono>
+
+#line 2 "mixed-bugfix-for-literal-as-nttp.cpp2"
 auto main() -> int;
 
 //=== Cpp2 function definitions =================================================
diff --git a/regression-tests/test-results/mixed-captures-in-expressions-and-postconditions.cpp b/regression-tests/test-results/mixed-captures-in-expressions-and-postconditions.cpp
@@ -1,3 +1,6 @@
+#line 2 "mixed-captures-in-expressions-and-postconditions.cpp2"
+#include <algorithm>
+#include <vector>
 
 
 //=== Cpp2 type declarations ====================================================
@@ -12,9 +15,6 @@
 
 #line 1 "mixed-captures-in-expressions-and-postconditions.cpp2"
 
-#include <algorithm>
-#include <vector>
-
 #line 5 "mixed-captures-in-expressions-and-postconditions.cpp2"
 [[nodiscard]] auto main() -> int;
 
diff --git a/regression-tests/test-results/mixed-fixed-type-aliases.cpp b/regression-tests/test-results/mixed-fixed-type-aliases.cpp
@@ -1,3 +1,6 @@
+#include <filesystem>
+#include <iostream>
+#include <typeinfo>
 
 
 //=== Cpp2 type declarations ====================================================
@@ -14,9 +17,7 @@ template<typename T> class mytype;
 //=== Cpp2 type definitions and function declarations ===========================
 
 #line 1 "mixed-fixed-type-aliases.cpp2"
-#include <filesystem>
-#include <iostream>
-#include <typeinfo>
+#line 4 "mixed-fixed-type-aliases.cpp2"
 
 namespace my {
     using u16 = float;
diff --git a/regression-tests/test-results/mixed-forwarding.cpp b/regression-tests/test-results/mixed-forwarding.cpp
@@ -1,3 +1,5 @@
+#include <iostream>
+#include <utility>
 
 
 //=== Cpp2 type declarations ====================================================
@@ -11,8 +13,7 @@
 //=== Cpp2 type definitions and function declarations ===========================
 
 #line 1 "mixed-forwarding.cpp2"
-#include <iostream>
-#include <utility>
+#line 3 "mixed-forwarding.cpp2"
 
 struct X {
     int i;
diff --git a/regression-tests/test-results/mixed-function-expression-and-std-for-each.cpp b/regression-tests/test-results/mixed-function-expression-and-std-for-each.cpp
@@ -1,3 +1,8 @@
+#include <vector>
+#include <string>
+#include <span>
+#include <algorithm>
+#include <iostream>
 
 
 //=== Cpp2 type declarations ====================================================
@@ -11,11 +16,6 @@
 //=== Cpp2 type definitions and function declarations ===========================
 
 #line 1 "mixed-function-expression-and-std-for-each.cpp2"
-#include <vector>
-#include <string>
-#include <span>
-#include <algorithm>
-#include <iostream>
 
 #line 7 "mixed-function-expression-and-std-for-each.cpp2"
 [[nodiscard]] auto main() -> int;
diff --git a/regression-tests/test-results/mixed-function-expression-and-std-ranges-for-each-with-capture.cpp b/regression-tests/test-results/mixed-function-expression-and-std-ranges-for-each-with-capture.cpp
@@ -1,3 +1,9 @@
+#include <vector>
+#include <ranges>
+#include <string>
+#include <span>
+#include <algorithm>
+#include <iostream>
 
 
 //=== Cpp2 type declarations ====================================================
@@ -11,12 +17,6 @@
 //=== Cpp2 type definitions and function declarations ===========================
 
 #line 1 "mixed-function-expression-and-std-ranges-for-each-with-capture.cpp2"
-#include <vector>
-#include <ranges>
-#include <string>
-#include <span>
-#include <algorithm>
-#include <iostream>
 
 #line 8 "mixed-function-expression-and-std-ranges-for-each-with-capture.cpp2"
 [[nodiscard]] auto main() -> int;
diff --git a/regression-tests/test-results/mixed-function-expression-and-std-ranges-for-each.cpp b/regression-tests/test-results/mixed-function-expression-and-std-ranges-for-each.cpp
@@ -1,3 +1,9 @@
+#include <vector>
+#include <ranges>
+#include <string>
+#include <span>
+#include <algorithm>
+#include <iostream>
 
 
 //=== Cpp2 type declarations ====================================================
@@ -11,12 +17,6 @@
 //=== Cpp2 type definitions and function declarations ===========================
 
 #line 1 "mixed-function-expression-and-std-ranges-for-each.cpp2"
-#include <vector>
-#include <ranges>
-#include <string>
-#include <span>
-#include <algorithm>
-#include <iostream>
 
 #line 8 "mixed-function-expression-and-std-ranges-for-each.cpp2"
 [[nodiscard]] auto main() -> int;
diff --git a/regression-tests/test-results/mixed-function-expression-with-pointer-capture.cpp b/regression-tests/test-results/mixed-function-expression-with-pointer-capture.cpp
@@ -1,3 +1,9 @@
+#include <vector>
+#include <ranges>
+#include <string>
+#include <span>
+#include <algorithm>
+#include <iostream>
 
 
 //=== Cpp2 type declarations ====================================================
@@ -11,12 +17,6 @@
 //=== Cpp2 type definitions and function declarations ===========================
 
 #line 1 "mixed-function-expression-with-pointer-capture.cpp2"
-#include <vector>
-#include <ranges>
-#include <string>
-#include <span>
-#include <algorithm>
-#include <iostream>
 
 #line 8 "mixed-function-expression-with-pointer-capture.cpp2"
 [[nodiscard]] auto main() -> int;
diff --git a/regression-tests/test-results/mixed-function-expression-with-repeated-capture.cpp b/regression-tests/test-results/mixed-function-expression-with-repeated-capture.cpp
@@ -1,3 +1,9 @@
+#include <vector>
+#include <ranges>
+#include <string>
+#include <span>
+#include <algorithm>
+#include <iostream>
 
 
 //=== Cpp2 type declarations ====================================================
@@ -11,12 +17,6 @@
 //=== Cpp2 type definitions and function declarations ===========================
 
 #line 1 "mixed-function-expression-with-repeated-capture.cpp2"
-#include <vector>
-#include <ranges>
-#include <string>
-#include <span>
-#include <algorithm>
-#include <iostream>
 
 #line 8 "mixed-function-expression-with-repeated-capture.cpp2"
 [[nodiscard]] auto main() -> int;
diff --git a/regression-tests/test-results/mixed-hello.cpp b/regression-tests/test-results/mixed-hello.cpp
@@ -1,3 +1,6 @@
+#line 2 "mixed-hello.cpp2"
+#include <iostream>
+#include <string>
 
 
 //=== Cpp2 type declarations ====================================================
@@ -12,9 +15,6 @@
 
 #line 1 "mixed-hello.cpp2"
 
-#include <iostream>
-#include <string>
-
 #line 5 "mixed-hello.cpp2"
 [[nodiscard]] auto name() -> std::string;
 
diff --git a/regression-tests/test-results/mixed-initialization-safety-3-contract-violation.cpp b/regression-tests/test-results/mixed-initialization-safety-3-contract-violation.cpp
@@ -1,3 +1,6 @@
+#include <random>
+#include <string>
+#include <vector>
 
 
 //=== Cpp2 type declarations ====================================================
@@ -11,9 +14,6 @@
 //=== Cpp2 type definitions and function declarations ===========================
 
 #line 1 "mixed-initialization-safety-3-contract-violation.cpp2"
-#include <random>
-#include <string>
-#include <vector>
 
 #line 5 "mixed-initialization-safety-3-contract-violation.cpp2"
 [[nodiscard]] auto main() -> int;
diff --git a/regression-tests/test-results/mixed-initialization-safety-3.cpp b/regression-tests/test-results/mixed-initialization-safety-3.cpp
@@ -1,3 +1,6 @@
+#include <random>
+#include <string>
+#include <vector>
 
 
 //=== Cpp2 type declarations ====================================================
@@ -11,9 +14,6 @@
 //=== Cpp2 type definitions and function declarations ===========================
 
 #line 1 "mixed-initialization-safety-3.cpp2"
-#include <random>
-#include <string>
-#include <vector>
 
 #line 5 "mixed-initialization-safety-3.cpp2"
 [[nodiscard]] auto main() -> int;
diff --git a/regression-tests/test-results/mixed-inspect-templates.cpp b/regression-tests/test-results/mixed-inspect-templates.cpp
@@ -1,3 +1,6 @@
+#include <vector>
+#include <array>
+#include <string>
 
 
 //=== Cpp2 type declarations ====================================================
@@ -11,9 +14,7 @@
 //=== Cpp2 type definitions and function declarations ===========================
 
 #line 1 "mixed-inspect-templates.cpp2"
-#include <vector>
-#include <array>
-#include <string>
+#line 4 "mixed-inspect-templates.cpp2"
 
 template <typename A, typename B>
 struct my_type {};
diff --git a/regression-tests/test-results/mixed-inspect-values-2.cpp b/regression-tests/test-results/mixed-inspect-values-2.cpp
@@ -1,3 +1,6 @@
+#line 2 "mixed-inspect-values-2.cpp2"
+#include <iostream>
+#include <vector>
 
 
 //=== Cpp2 type declarations ====================================================
@@ -12,8 +15,7 @@
 
 #line 1 "mixed-inspect-values-2.cpp2"
 
-#include <iostream>
-#include <vector>
+#line 4 "mixed-inspect-values-2.cpp2"
 
 constexpr auto less_than = [](int value) {
     return [=](auto x) { return x < value;};
diff --git a/regression-tests/test-results/mixed-lifetime-safety-and-null-contracts.cpp b/regression-tests/test-results/mixed-lifetime-safety-and-null-contracts.cpp
@@ -1,3 +1,7 @@
+#line 2 "mixed-lifetime-safety-and-null-contracts.cpp2"
+#include <iostream>
+#include <vector>
+#include <string>
 
 
 //=== Cpp2 type declarations ====================================================
@@ -12,10 +16,6 @@
 
 #line 1 "mixed-lifetime-safety-and-null-contracts.cpp2"
 
-#include <iostream>
-#include <vector>
-#include <string>
-
 #line 6 "mixed-lifetime-safety-and-null-contracts.cpp2"
 [[nodiscard]] auto main() -> int;
 #line 11 "mixed-lifetime-safety-and-null-contracts.cpp2"
diff --git a/regression-tests/test-results/mixed-lifetime-safety-pointer-init-4.cpp b/regression-tests/test-results/mixed-lifetime-safety-pointer-init-4.cpp
@@ -1,3 +1,6 @@
+#line 2 "mixed-lifetime-safety-pointer-init-4.cpp2"
+#include <iostream>
+#include <random>
 
 
 //=== Cpp2 type declarations ====================================================
@@ -12,9 +15,6 @@
 
 #line 1 "mixed-lifetime-safety-pointer-init-4.cpp2"
 
-#include <iostream>
-#include <random>
-
 #line 5 "mixed-lifetime-safety-pointer-init-4.cpp2"
 [[nodiscard]] auto main() -> int;
 
diff --git a/regression-tests/test-results/mixed-multiple-return-values.cpp b/regression-tests/test-results/mixed-multiple-return-values.cpp
@@ -1,3 +1,7 @@
+#line 2 "mixed-multiple-return-values.cpp2"
+#include <iostream>
+#include <random>
+#include <string>
 
 
 //=== Cpp2 type declarations ====================================================
@@ -12,9 +16,6 @@
 
 #line 1 "mixed-multiple-return-values.cpp2"
 
-#include <iostream>
-#include <random>
-#include <string>
 
 struct f_ret { int i; std::string s; };
 
diff --git a/regression-tests/test-results/mixed-out-destruction.cpp b/regression-tests/test-results/mixed-out-destruction.cpp
@@ -1,3 +1,4 @@
+#include <iostream>
 
 
 //=== Cpp2 type declarations ====================================================
@@ -11,7 +12,7 @@
 //=== Cpp2 type definitions and function declarations ===========================
 
 #line 1 "mixed-out-destruction.cpp2"
-#include <iostream>
+#line 2 "mixed-out-destruction.cpp2"
 
 struct X {
     inline static int Xnum = 0;
diff --git a/regression-tests/test-results/mixed-parameter-passing-generic-out.cpp b/regression-tests/test-results/mixed-parameter-passing-generic-out.cpp
@@ -1,3 +1,4 @@
+#include <iostream>
 
 
 //=== Cpp2 type declarations ====================================================
@@ -11,7 +12,7 @@
 //=== Cpp2 type definitions and function declarations ===========================
 
 #line 1 "mixed-parameter-passing-generic-out.cpp2"
-#include <iostream>
+#line 2 "mixed-parameter-passing-generic-out.cpp2"
 
 struct X {
     X(int) { }
diff --git a/regression-tests/test-results/mixed-parameter-passing-with-forward.cpp b/regression-tests/test-results/mixed-parameter-passing-with-forward.cpp
@@ -1,3 +1,7 @@
+#line 2 "mixed-parameter-passing-with-forward.cpp2"
+#include <string>
+#include <cstdlib>
+#include <ctime>
 
 
 //=== Cpp2 type declarations ====================================================
@@ -12,10 +16,6 @@
 
 #line 1 "mixed-parameter-passing-with-forward.cpp2"
 
-#include <string>
-#include <cstdlib>
-#include <ctime>
-
 #line 6 "mixed-parameter-passing-with-forward.cpp2"
 auto copy_from([[maybe_unused]] auto unnamed_param_1) -> void;
 
diff --git a/regression-tests/test-results/mixed-parameter-passing.cpp b/regression-tests/test-results/mixed-parameter-passing.cpp
diff --git a/regression-tests/test-results/mixed-postexpression-with-capture.cpp b/regression-tests/test-results/mixed-postexpression-with-capture.cpp
diff --git a/regression-tests/test-results/mixed-string-interpolation.cpp b/regression-tests/test-results/mixed-string-interpolation.cpp
diff --git a/regression-tests/test-results/mixed-test-parens.cpp b/regression-tests/test-results/mixed-test-parens.cpp
diff --git a/regression-tests/test-results/mixed-type-safety-1.cpp b/regression-tests/test-results/mixed-type-safety-1.cpp
diff --git a/regression-tests/test-results/mixed-ufcs-multiple-template-arguments.cpp b/regression-tests/test-results/mixed-ufcs-multiple-template-arguments.cpp
diff --git a/source/build.info b/source/build.info
diff --git a/source/common.h b/source/common.h
diff --git a/source/reflect.h b/source/reflect.h
diff --git a/source/reflect.h2 b/source/reflect.h2
diff --git a/source/to_cpp1.h b/source/to_cpp1.h
