Minor tidying

Update comments, and move more sema checks to `sema.h` in preparation for more metatype functions in the summer that may want to take 'grammar-legal but sema-illegal' type grammar as input, and transform them to sema-legal actual type bodies

Author: hsutter

include/cpp2util.h

@@ -690,7 +690,8 @@ class out {
     #define CPP2_FORCE_INLINE_LAMBDA __attribute__((always_inline))
 
     #if defined(__clang_major__)
-        #if (__clang_major__ > 13 || (__clang_major__ == 13 && __clang_minor__ >= 2))
+        //  Also check __cplusplus, only to satisfy Clang -pedantic-errors
+        #if __cplusplus >= 202302L && (__clang_major__ > 13 || (__clang_major__ == 13 && __clang_minor__ >= 2))
             #define CPP2_LAMBDA_NO_DISCARD   [[nodiscard]]
         #else
             #define CPP2_LAMBDA_NO_DISCARD
@@ -1351,13 +1352,12 @@ constexpr auto as( X const& x ) -> decltype(auto)
 
 //-----------------------------------------------------------------------
 //
-//  A variation of GSL's final_action_success and finally to run only on success
-//  (based on a PR I contributed to Microsoft GSL)
+//  A variation of GSL's final_action_success / finally
 //
-//  final_action_success ensures something is run at the end of a scope
-//      if no exception is thrown
+//  finally ensures something is run at the end of a scope always
 //
-//  finally_success is a convenience function to make a final_action_success_success
+//  finally_success ensures something is run at the end of a scope
+//      if no exception is thrown
 //
 //-----------------------------------------------------------------------
 //
@@ -1391,10 +1391,6 @@ class finally_success
 };
 
 
-//
-//  Same, but clean up also on exceptional paths
-//
-
 template <class F>
 class finally
 {

regression-tests/pure2-ufcs-member-access-and-chaining.cpp2

@@ -18,7 +18,7 @@ main: () -> int = {
 
     _ = (j.i).ufcs();
 
-    _ = 42.no_return();
+    42.no_return();
 }
 
 no_return: (x: int) = { }

regression-tests/test-results/pure2-ufcs-member-access-and-chaining.cpp

@@ -58,7 +58,7 @@ extern int y;
 
     (void) CPP2_UFCS_0(ufcs, (std::move(j).i));
 
-    (void) CPP2_UFCS_0(no_return, 42);
+    CPP2_UFCS_0(no_return, 42);
 }
 
 auto no_return(cpp2::in<int> x) -> void{}

regression-tests/test-results/version

@@ -1,5 +1,5 @@
 
-cppfront compiler v0.2.1   Build 8611:0927
+cppfront compiler v0.2.1   Build 8613:1951
 Copyright(c) Herb Sutter   All rights reserved
 
 SPDX-License-Identifier: CC-BY-NC-ND-4.0

source/build.info

@@ -1 +1 @@
-"8611:0927"
+"8613:1951"

source/cppfront.cpp

@@ -3680,6 +3680,10 @@ class cppfront
     )
         -> void
     {
+        if (!sema.check(n)) {
+            return;
+        }
+
         auto emit_parameters =
             !n.emitted
             && n.parameters
@@ -4769,7 +4773,13 @@ class cppfront
     )
         -> void
     {
-        if (!sema.check(n)) {
+        //  Declarations are handled in multiple passes,
+        //  but we only want to do the sema checks once
+        if (
+            printer.get_phase() == printer.phase1_type_defs_func_decls
+            && !sema.check(n)
+            )
+        {
             return;
         }
 
@@ -4950,9 +4960,14 @@ class cppfront
 
             for (auto& stmt : compound_stmt->statements)
             {
+                if (!stmt->is_declaration()) {
+                    //  We will already have emitted an error for this in sema.check
+                    return;
+                }
                 auto& decl = std::get<statement_node::declaration>(stmt->statement);
                 assert(decl);
                 assert(decl->name());
+
                 auto emit_as_base =
                     decl->get_decl_if_type_scope_object_name_before_a_base_type(*decl->name());
 
@@ -5092,10 +5107,7 @@ class cppfront
             {
                 assert(stmt);
                 if (!stmt->is_declaration()) {
-                    errors.emplace_back(
-                        stmt->position(),
-                        "a user-defined type body must contain only declarations, not other code"
-                    );
+                    //  We will already have emitted an error for this in sema.check
                     return;
                 }