Partial fix for #14982 internalAstError for noexcept function with requires clause

Author: web-flow

lib/templatesimplifier.cpp

@@ -3831,7 +3831,7 @@ void TemplateSimplifier::simplifyTemplates(const std::time_t maxtime)
         // Remove concepts/requires
         // TODO concepts are not removed yet
         for (Token *tok = mTokenList.front(); tok; tok = tok->next()) {
-            if (!Token::Match(tok, ")|>|>> requires %name%|("))
+            if (!Token::Match(tok, ")|>|>>|const|final|noexcept|override requires %name%|("))
                 continue;
             const Token* end = skipRequires(tok->next());
             if (end)

test/testsimplifytemplate.cpp

@@ -314,6 +314,7 @@ class TestSimplifyTemplate : public TestFixture {
         TEST_CASE(requires3);
         TEST_CASE(requires4);
         TEST_CASE(requires5);
+        TEST_CASE(requires6);
 
         TEST_CASE(explicitBool1);
         TEST_CASE(explicitBool2);
@@ -6696,6 +6697,22 @@ class TestSimplifyTemplate : public TestFixture {
         ASSERT_EQUALS(expected, tok(code));
     }
 
+    void requires6() {
+        const char code[] = "template <int N>\n" // #14982
+                            "struct S {\n"
+                            "  static void f() noexcept\n"
+                            "    requires(N >= 5) {}\n"
+                            "  void g() const\n"
+                            "    requires(N >= 5) {}\n"
+                            "};";
+        const char expected[] = "template < int N > "
+                                "struct S { "
+                                "static void f ( ) noexcept { } "
+                                "void g ( ) const { } "
+                                "} ;";
+        ASSERT_EQUALS(expected, tok(code));
+    }
+
     void explicitBool1() {
         const char code[] = "class Fred { explicit(true) Fred(int); };";
         ASSERT_EQUALS("class Fred { explicit Fred ( int ) ; } ;", tok(code));