fix: apply rebase correctly

Author: JohelEGP

regression-tests/test-results/pure2-bugfix-for-multi-token-type-prvalue.cpp

@@ -11,14 +11,14 @@
 //=== Cpp2 type definitions and function declarations ===========================
 
 #line 1 "pure2-bugfix-for-multi-token-type-prvalue.cpp2"
-auto main(int const argc_, char const* const* const argv_) -> int;
+auto main(int const argc_, char** argv_) -> int;
 
 
 //=== Cpp2 function definitions =================================================
 
 #line 1 "pure2-bugfix-for-multi-token-type-prvalue.cpp2"
-auto main(int const argc_, char const* const* const argv_) -> int{
+auto main(int const argc_, char** argv_) -> int{
                  auto args = cpp2::make_args(argc_, argv_); 
 #line 1 "pure2-bugfix-for-multi-token-type-prvalue.cpp2"
-(void) std::type_identity_t<int*>{&args.argc}; }
+static_cast<void>(std::type_identity_t<int*>{&args.argc}); }
 

regression-tests/test-results/pure2-function-type-id.cpp

@@ -25,7 +25,10 @@ template<cpp2::fn_t<cpp2::fn_t<void()>*()>* V> auto g() -> void;
 
 // In non-local function return type.
 [[nodiscard]] auto g1() -> cpp2::fn_t<void()>*;
-template<bool V> [[nodiscard]] auto g1() -> cpp2::fn_t<void()>*;
+template<bool V> [[nodiscard]] auto g1() -> cpp2::fn_t<void()>*
+CPP2_REQUIRES (V)
+#line 90 "pure2-function-type-id.cpp2"
+;
 [[nodiscard]] auto g2() -> cpp2::fn_t<cpp2::fn_t<void()>*()>*;
 
 // clang-format off
@@ -71,14 +74,14 @@ auto main() -> int{
   static_assert((std::is_const_v<decltype(f11)>)==std::is_const_v<decltype(i1)>);
   static_assert((std::is_const_v<decltype(f12)>)==std::is_const_v<decltype(i2)>);
   static_assert((std::is_const_v<decltype(f13)>)==std::is_const_v<decltype(i3)>);
-  (void) std::move(f10);
-  (void) std::move(f11);
-  (void) std::move(f12);
-  (void) std::move(f13);
-  (void) std::move(i0);
-  (void) std::move(i1);
-  (void) std::move(i2);
-  (void) std::move(i3);
+  static_cast<void>(std::move(f10));
+  static_cast<void>(std::move(f11));
+  static_cast<void>(std::move(f12));
+  static_cast<void>(std::move(f13));
+  static_cast<void>(std::move(i0));
+  static_cast<void>(std::move(i1));
+  static_cast<void>(std::move(i2));
+  static_cast<void>(std::move(i3));
 
   // Variables with various kinds of parameter.
   cpp2::fn_t<void(cpp2::in<cpp2::i32>)>* f5 {[](cpp2::in<cpp2::i32> x) -> void{}}; 
@@ -112,21 +115,21 @@ cpp2::in<cpp2::fn_t<void()>> f = *cpp2::assert_not_null(f0);
 
   // As local function parameter.
 #line 62 "pure2-function-type-id.cpp2"
-  (void) [](cpp2::in<cpp2::fn_t<void()>> f) -> void{};
-  (void) [](cpp2::fn_t<void()>* f) -> void{};
-  (void) [](cpp2::fn_t<cpp2::fn_t<void()>*()>* f) -> void{};
-  (void) [](cpp2::fn_t<cpp2::fn_t<cpp2::fn_t<void()>*()>*()>* f) -> void{};
+  static_cast<void>([](cpp2::in<cpp2::fn_t<void()>> f) -> void{});
+  static_cast<void>([](cpp2::fn_t<void()>* f) -> void{});
+  static_cast<void>([](cpp2::fn_t<cpp2::fn_t<void()>*()>* f) -> void{});
+  static_cast<void>([](cpp2::fn_t<cpp2::fn_t<cpp2::fn_t<void()>*()>*()>* f) -> void{});
 
   // In local function return type.
-  (void) [_0 = f0]() -> cpp2::fn_t<void()>& { return *cpp2::assert_not_null(_0);  };
-  (void) []() -> cpp2::fn_t<void()>* { return nullptr;  };
-  (void) []() -> cpp2::fn_t<cpp2::fn_t<void()>*()>* { return nullptr;  };
+  static_cast<void>([_0 = f0]() -> cpp2::fn_t<void()>& { return *cpp2::assert_not_null(_0);  });
+  static_cast<void>([]() -> cpp2::fn_t<void()>* { return nullptr;  });
+  static_cast<void>([]() -> cpp2::fn_t<cpp2::fn_t<void()>*()>* { return nullptr;  });
 
   // With `!throws`.
-  (void) std::type_identity_t<cpp2::fn_t<void(std::string_view, CPP2_MESSAGE_PARAM) noexcept>*>{cpp2::report_and_terminate};
+  static_cast<void>(std::type_identity_t<cpp2::fn_t<void(std::string_view, CPP2_MESSAGE_PARAM) noexcept>*>{cpp2::report_and_terminate});
 
   // As template argument.
-  (void) std::type_identity_t<cpp2::fn_t<void()>*>{std::move(f0)};
+  static_cast<void>(std::type_identity_t<cpp2::fn_t<void()>*>{std::move(f0)});
   static_assert(std::is_function_v<cpp2::fn_t<void()>>);
 }
 

source/cppfront.cpp

@@ -975,15 +975,6 @@ class positional_printer
 };
 
 
-template <typename T>
-auto stack_value(T& var, std::type_identity_t<T> const& value)
-    -> auto
-{
-    return finally([&var, old = std::exchange(var, value)]() {
-        var = old;
-    });
-};
-
 //-----------------------------------------------------------------------
 //
 //  cppfront: a compiler instance
@@ -3762,7 +3753,7 @@ class cppfront
             printer.print_extra( "{");
             for (auto& param : n.parameters->parameters) {
                 printer.print_extra( "\n");
-                printer.print_extra( print_to_string(*param, false, false, true) );
+                printer.print_extra( print_to_string(*param, false, false, false) );
             }
         }
 
@@ -3849,7 +3840,6 @@ class cppfront
         parameter_declaration_node const& n,
         bool                              is_returns             = false,
         bool                              is_template_parameter  = false,
-        bool                              is_statement_parameter = false,
         bool                              in_function_type_id    = false
     )
         -> void
@@ -4017,7 +4007,11 @@ class cppfront
 
         //  First any prefix
 
-        if (identifier == "_") {
+        if (
+            identifier == "_"
+            && !in_function_type_id
+            )
+        {
             printer.print_cpp2( "[[maybe_unused]] ", n.position() );
             identifier = "param" + std::to_string(n.ordinal);
         }
@@ -4170,7 +4164,7 @@ class cppfront
             }
             prev_pos = x->position();
             assert(x);
-            emit(*x, is_returns, is_template_parameter, false, in_function_type_id);
+            emit(*x, is_returns, is_template_parameter, in_function_type_id);
             if (!x->declaration->has_name("this")) {
                 first = false;
             }

source/parse.h

@@ -3766,6 +3766,15 @@ struct translation_unit_node
 };
 
 
+template <typename T>
+auto stack_value(T& var, std::type_identity_t<T> const& value)
+    -> auto
+{
+    return finally([&var, old = std::exchange(var, value)]() {
+        var = old;
+    });
+};
+
 //-----------------------------------------------------------------------
 //
 //  parser: parses a section of Cpp2 code
@@ -5096,6 +5105,7 @@ class parser
             auto term = unqualified_id_node::term{};
 
             do {
+                auto stack = stack_value(start_pos, pos);
                 //  If it doesn't start with * or const (which can only be a type id),
                 //  try parsing it as an expression
                 if (auto e = [&]{
@@ -5121,14 +5131,11 @@ class parser
                     term.arg = std::move(e);
                 }
 
-                //  Else try parsing it as a type id
-                else if (auto i = type_id()) {
-                    term.arg = std::move(i);
-                }
-
                 else {
                     errors.clear();
                     pos = start_pos;
+
+                    //  Else try parsing it as a type id
                     if (auto i = type_id()) {
                         term.arg = std::move(i);
                     }