Merge branch 'main' into feature/regular_expression_metafunction

Signed-off-by: Herb Sutter <[email protected]>
MaxSagebaum · Jul 21, 2024 · ae9fa61 · ae9fa61
2 parents de8348f + e45eae5
commit ae9fa61
Show file tree

Hide file tree

Showing 20 changed files with 187 additions and 61 deletions.
diff --git a/regression-tests/mixed-lifetime-safety-and-null-contracts.cpp2 b/regression-tests/mixed-lifetime-safety-and-null-contracts.cpp2
@@ -28,7 +28,7 @@ auto call_my_framework(const char* msg CPP2_SOURCE_LOCATION_PARAM) {
         std::cout
             << "from source location: "
             << loc
-            << "]\n";
+            << "\n";
     }
     exit(0);
 }
diff --git a/.../test-results/apple-clang-15-c++2b/mixed-lifetime-safety-and-null-contracts.cpp.execution b/.../test-results/apple-clang-15-c++2b/mixed-lifetime-safety-and-null-contracts.cpp.execution
@@ -1,2 +1,2 @@
 sending error to my framework... [dynamic null dereference attempt detected]
-from source location: ../../../include/cpp2util.h(673) decltype(auto) cpp2::impl::assert_not_null(auto &&, std::source_location) [arg:auto = int *&]]
+from source location: ../../../include/cpp2util.h(669) decltype(auto) cpp2::impl::assert_not_null(auto &&, std::source_location) [arg:auto = int *&]
diff --git a/...-tests/test-results/clang-15-c++20/mixed-lifetime-safety-and-null-contracts.cpp.execution b/...-tests/test-results/clang-15-c++20/mixed-lifetime-safety-and-null-contracts.cpp.execution
@@ -1,2 +1,2 @@
 sending error to my framework... [dynamic null dereference attempt detected]
-from source location: ../../../include/cpp2util.h(673) decltype(auto) cpp2::impl::assert_not_null(auto &&, std::source_location) [arg:auto = int *&]]
+from source location: ../../../include/cpp2util.h(669) decltype(auto) cpp2::impl::assert_not_null(auto &&, std::source_location) [arg:auto = int *&]
diff --git a/...-tests/test-results/clang-18-c++20/mixed-lifetime-safety-and-null-contracts.cpp.execution b/...-tests/test-results/clang-18-c++20/mixed-lifetime-safety-and-null-contracts.cpp.execution
@@ -1,2 +1,2 @@
 sending error to my framework... [dynamic null dereference attempt detected]
-from source location: mixed-lifetime-safety-and-null-contracts.cpp2(17) void try_pointer_stuff()]
+from source location: mixed-lifetime-safety-and-null-contracts.cpp2(17) void try_pointer_stuff()
diff --git a/...test-results/clang-18-c++23-libcpp/mixed-lifetime-safety-and-null-contracts.cpp.execution b/...test-results/clang-18-c++23-libcpp/mixed-lifetime-safety-and-null-contracts.cpp.execution
@@ -1,2 +1,2 @@
 sending error to my framework... [dynamic null dereference attempt detected]
-from source location: mixed-lifetime-safety-and-null-contracts.cpp2(17) void try_pointer_stuff()]
+from source location: mixed-lifetime-safety-and-null-contracts.cpp2(17) void try_pointer_stuff()
diff --git a/...on-tests/test-results/gcc-13-c++2b/mixed-lifetime-safety-and-null-contracts.cpp.execution b/...on-tests/test-results/gcc-13-c++2b/mixed-lifetime-safety-and-null-contracts.cpp.execution
@@ -1,2 +1,2 @@
 sending error to my framework... [dynamic null dereference attempt detected]
-from source location: mixed-lifetime-safety-and-null-contracts.cpp2(17) void try_pointer_stuff()]
+from source location: mixed-lifetime-safety-and-null-contracts.cpp2(17) void try_pointer_stuff()
diff --git a/...on-tests/test-results/gcc-14-c++2b/mixed-lifetime-safety-and-null-contracts.cpp.execution b/...on-tests/test-results/gcc-14-c++2b/mixed-lifetime-safety-and-null-contracts.cpp.execution
@@ -1,2 +1,2 @@
 sending error to my framework... [dynamic null dereference attempt detected]
-from source location: mixed-lifetime-safety-and-null-contracts.cpp2(17) void try_pointer_stuff()]
+from source location: mixed-lifetime-safety-and-null-contracts.cpp2(17) void try_pointer_stuff()
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
@@ -36,7 +36,7 @@ auto call_my_framework(const char* msg CPP2_SOURCE_LOCATION_PARAM) {
         std::cout
             << "from source location: "
             << loc
-            << "]\n";
+            << "\n";
     }
     exit(0);
 }

diff --git a/...tests/test-results/msvc-2022-c++20/mixed-lifetime-safety-and-null-contracts.cpp.execution b/...tests/test-results/msvc-2022-c++20/mixed-lifetime-safety-and-null-contracts.cpp.execution
@@ -1,2 +1,2 @@
 sending error to my framework... [dynamic null dereference attempt detected]
-from source location: mixed-lifetime-safety-and-null-contracts.cpp2(17) void __cdecl try_pointer_stuff(void)]
+from source location: mixed-lifetime-safety-and-null-contracts.cpp2(17) void __cdecl try_pointer_stuff(void)
diff --git a/...s/test-results/msvc-2022-c++latest/mixed-lifetime-safety-and-null-contracts.cpp.execution b/...s/test-results/msvc-2022-c++latest/mixed-lifetime-safety-and-null-contracts.cpp.execution
@@ -1,2 +1,2 @@
 sending error to my framework... [dynamic null dereference attempt detected]
-from source location: mixed-lifetime-safety-and-null-contracts.cpp2(17) void __cdecl try_pointer_stuff(void)]
+from source location: mixed-lifetime-safety-and-null-contracts.cpp2(17) void __cdecl try_pointer_stuff(void)
diff --git a/regression-tests/test-results/pure2-return-tuple-no-identifier-error.cpp2.output b/regression-tests/test-results/pure2-return-tuple-no-identifier-error.cpp2.output
@@ -1,4 +1,4 @@
 pure2-return-tuple-no-identifier-error.cpp2...
 pure2-return-tuple-no-identifier-error.cpp2(1,11): error: expected identifier, not 'int'
-pure2-return-tuple-no-identifier-error.cpp2(1,16): error: expected identifier, not 'int'
+pure2-return-tuple-no-identifier-error.cpp2(1,14): error: missing function return after -> (at ',')
 
diff --git a/regression-tests/test-results/pure2-return-tuple-no-type-error.cpp2.output b/regression-tests/test-results/pure2-return-tuple-no-type-error.cpp2.output
@@ -1,4 +1,4 @@
 pure2-return-tuple-no-type-error.cpp2...
 pure2-return-tuple-no-type-error.cpp2(1,11): error: return parameter 'a' must have a type
-pure2-return-tuple-no-type-error.cpp2(1,14): error: return parameter 'b' must have a type
+pure2-return-tuple-no-type-error.cpp2(1,12): error: missing function return after -> (at ',')
 
diff --git a/regression-tests/test-results/version b/regression-tests/test-results/version
@@ -1,5 +1,5 @@
 
-cppfront compiler v0.7.1   Build 9714:0930
+cppfront compiler v0.7.1   Build 9718:1445
 Copyright(c) Herb Sutter   All rights reserved
 
 SPDX-License-Identifier: CC-BY-NC-ND-4.0

diff --git a/source/build.info b/source/build.info
@@ -1 +1 @@
-"9714:0930"
+"9718:1445"
diff --git a/source/common.h b/source/common.h
@@ -669,6 +669,18 @@ class cmdline_processor
     }
 
 public:
+    auto flags_starting_with(std::string_view s)
+        -> std::vector<std::string>
+    {
+        auto ret = std::vector<std::string>{};
+        for (auto const& f : flags) {
+            if (f.name.starts_with(s)) {
+                ret.push_back(f.name);
+            }
+        }
+        return ret;
+    }
+
     auto process_flags()
         -> void
     {

diff --git a/source/cppfront.cpp b/source/cppfront.cpp
@@ -61,6 +61,24 @@ auto main(
     int exit_status = EXIT_SUCCESS;
     for (auto const& arg : cmdline.arguments())
     {
+        if (
+            arg.text.starts_with("-")
+            || arg.text.starts_with("/")
+            )
+        {
+            auto ambiguous = cmdline.flags_starting_with(arg.text.substr(1));
+            if (ambiguous.empty()) {
+                std::cerr << arg.text << " - unknown compiler flag name (try " << arg.text.front() << "help)\n";
+            }
+            else {
+                std::cerr << arg.text << " - ambiguous compiler flag name, did you mean one of these?\n";
+                for (auto a : ambiguous) {
+                    std::cerr << "    " << arg.text.front() << a << "\n";
+                }
+            }
+            return EXIT_FAILURE;
+        }
+
         cpp2::timer t;
         t.start();
 

diff --git a/source/io.h b/source/io.h
@@ -461,20 +461,30 @@ class braces_tracker
     //  --- Preprocessor matching functions - #if/#else/#endif
 
     //  Entering an #if
-    auto found_pre_if() -> void {
-        assert(std::ssize(preprocessor) > 0);
+    auto found_pre_if(lineno_t) -> void {
         preprocessor.push_back({});
     }
 
     //  Encountered an #else
-    auto found_pre_else() -> void {
-        assert(std::ssize(preprocessor) > 1);
+    auto found_pre_else(lineno_t lineno) -> void {
+        if (std::ssize(preprocessor) < 2) {
+            errors.emplace_back(
+                lineno,
+                "#else does not match a prior #if"
+            );
+        }
+
         preprocessor.back().found_preprocessor_else();
     }
 
     //  Exiting an #endif
-    auto found_pre_endif() -> void {
-        assert(std::ssize(preprocessor) > 1);
+    auto found_pre_endif(lineno_t lineno) -> void {
+        if (std::ssize(preprocessor) < 2) {
+            errors.emplace_back(
+                lineno,
+                "#endif does not match a prior #if"
+            );
+        }
 
         //  If the #if/#else/#endif introduced the same net number of braces,
         //  then we will have recorded that number too many open braces, and
@@ -779,6 +789,7 @@ auto process_cpp2_line(
                                 " after the closing ; or } of a definition, the rest"
                                 " of the line cannot begin a /*...*/ comment")
                         );
+                        return false;
                     }
                 }
 
@@ -807,6 +818,7 @@ auto process_cpp2_line(
             source_position(lineno, unsafe_narrow<colno_t>(ssize(line))),
             std::string("line ended before character literal was terminated")
         );
+        return false;
     }
 
     return found_end;
@@ -896,11 +908,11 @@ class source
             {
                 switch (pre) {
                 break;case preprocessor_conditional::pre_if:
-                    braces.found_pre_if();
+                    braces.found_pre_if( cpp2::unsafe_narrow<lineno_t>(std::ssize(lines)) );
                 break;case preprocessor_conditional::pre_else:
-                    braces.found_pre_else();
+                    braces.found_pre_else( cpp2::unsafe_narrow<lineno_t>(std::ssize(lines)) );
                 break;case preprocessor_conditional::pre_endif:
-                    braces.found_pre_endif();
+                    braces.found_pre_endif( cpp2::unsafe_narrow<lineno_t>(std::ssize(lines)) );
                 break;default:
                     assert(false);
                 }

diff --git a/source/lex.h b/source/lex.h
@@ -751,6 +751,8 @@ auto lex_line(
                 "        short, ushort, int, uint, long, ulong, longlong, ulonglong, longdouble, _schar, _uchar\n"
                 "    - see also cpp2util.h > \"Convenience names for integer types\""
             );
+
+            return;
         }
 
         tokens.push_back(last_token);
@@ -1002,6 +1004,7 @@ auto lex_line(
                 "invalid universal character name - \\u without { must"
                 " be followed by 4 hexadecimal digits"
             );
+            return 0;
         }
 
         else if (
@@ -1022,15 +1025,16 @@ auto lex_line(
 
             if (peek(j + offset) == '}') {
                 ++j;
+                return j;
             }
             else {
                 errors.emplace_back(
                     source_position(lineno, i + offset),
                     "invalid universal character name - \\u{ must"
                     " be followed by hexadecimal digits and a closing }"
                 );
+                return 0;
             }
-            return j;
         }
 
         else if (
@@ -1052,7 +1056,9 @@ auto lex_line(
                 "invalid universal character name - \\U must"
                     " be followed by 8 hexadecimal digits"
             );
+            return 0;
         }
+
         return 0;
     };
 
@@ -1352,7 +1358,7 @@ auto lex_line(
                 }
                 else { store(1, lexeme::Less); }
 
-            //  Note: >> and >>= are not source tokens, they are synthesized from > > and > >= where legal
+            //  Note: >= and >> and >>= synthesized from > = and > > and > >= where legal
             //G     '>>=' '>>' '>=' '>'
             break;case '>':
                 //---------------------------------------------------------
@@ -1362,10 +1368,10 @@ auto lex_line(
                 //    if (peek2 == '=') { store(3, lexeme::RightShiftEq); }
                 //    else { store(2, lexeme::RightShift); }
                 //}
+                //else if (peek1 == '=') { store(2, lexeme::GreaterEq); }
                 //else
                 //---------------------------------------------------------
-                if (peek1 == '=') { store(2, lexeme::GreaterEq); }
-                else { store(1, lexeme::Greater); }
+                { store(1, lexeme::Greater); }
 
             //G     '++' '+=' '+'
             break;case '+':
@@ -1535,6 +1541,7 @@ auto lex_line(
                             "invalid new-line in raw string delimiter \"" + line.substr(i, 3)
                                 + "\" - stray 'R' in program \""
                         );
+                        return {};
                     }
                 } else {
                     store(1, lexeme::Dollar);
@@ -1579,6 +1586,7 @@ auto lex_line(
                             source_position(lineno, i),
                             "binary literal cannot be empty (0B must be followed by binary digits)"
                         );
+                        return {};
                     }
                 }
                 else if (peek1 == 'x' || peek1 == 'X') {
@@ -1592,6 +1600,7 @@ auto lex_line(
                             source_position(lineno, i),
                             "hexadecimal literal cannot be empty (0X must be followed by hexadecimal digits)"
                         );
+                        return {};
                     }
                 }
             }
@@ -1658,6 +1667,7 @@ auto lex_line(
                                     source_position(lineno, i),
                                     "a floating point literal must have at least one digit after the decimal point (can be '.0')"
                                 );
+                                return {};
                             }
                             while (is_separator_or(is_digit,peek(j))) {
                                 ++j;
@@ -1725,6 +1735,7 @@ auto lex_line(
                                 "invalid new-line in raw string delimiter \"" + line.substr(i, j)
                                     + "\" - stray 'R' in program \""
                             );
+                            return {};
                         }
                     }
                     else {
@@ -1735,6 +1746,7 @@ auto lex_line(
                                 "string literal \"" + line.substr(i+1, j)
                                     + "\" is missing its closing \""
                             );
+                            return {};
                         }
 
                         //  At this point we have a string-literal, but it may contain
@@ -1782,6 +1794,7 @@ auto lex_line(
                                 "character literal '" + line.substr(i+1, j-1)
                                     + "' is missing its closing '"
                             );
+                            return {};
                         }
                         store(j+1, lexeme::CharacterLiteral);
                     }
@@ -1790,6 +1803,7 @@ auto lex_line(
                             source_position(lineno, i),
                             "character literal is empty"
                         );
+                        return {};
                     }
                 }
 
@@ -1815,18 +1829,21 @@ auto lex_line(
                             source_position(lineno, i),
                             "'const_cast' is not supported in Cpp2 - the current C++ best practice is to never cast away const, and that is const_cast's only effective use"
                         );
+                        return {};
                     }
                     if (tokens.back() == "static_cast") {
                         errors.emplace_back(
                             source_position(lineno, i),
                             "'static_cast<T>(val)' is not supported in Cpp2 - use 'val as T' for safe conversions instead, or if necessary cpp2::unsafe_narrow<T>(val) for a possibly-lossy narrowing conversion"
                         );
+                        return {};
                     }
                     if (tokens.back() == "dynamic_cast") {
                         errors.emplace_back(
                             source_position(lineno, i),
                             "'dynamic_cast<Derived*>(pBase)' is not supported in Cpp2 - use 'pBase as *Derived' for safe dynamic conversions instead"
                         );
+                        return {};
                     }
                 }
 
@@ -1853,12 +1870,14 @@ auto lex_line(
                                 source_position(lineno, i),
                                 "'NULL' is not supported in Cpp2 - for a local pointer variable, leave it uninitialized instead, and set it to a non-null value when you have one"
                             );
+                            return {};
                         }
                         if (tokens.back() == "delete") {
                             errors.emplace_back(
                                 source_position(lineno, i),
                                 "'delete' and owning raw pointers are not supported in Cpp2 - use unique.new<T> or shared.new<T> instead in that order (or, in the future, gc.new<T>, but that is not yet implemented)"
                             );
+                            return {};
                         }
                     }
                 }
@@ -1872,6 +1891,7 @@ auto lex_line(
                         false,
                         true    // a noisy fallback error message
                     );
+                    return {};
                 }
             }
         }