Added support for requires() constraints on methods that are not dire…

…ctly templated
robotpy · Dec 1, 2023 · ad6ec5b · ad6ec5b
1 parent f1708bf
commit ad6ec5b
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 1 deletion.
diff --git a/cxxheaderparser/parser.py b/cxxheaderparser/parser.py
@@ -1980,7 +1980,7 @@ def _parse_method_end(self, method: Method) -> None:
             elif tok_value == "requires":
                 method_template = method.template
                 if method_template is None:
-                    raise self._parse_error(tok)
+                    method_template = TemplateDecl([])
                 elif isinstance(method_template, list):
                     method_template = method_template[0]
                 method_template.raw_requires_post = self._parse_requires(tok)

diff --git a/tests/test_concepts.py b/tests/test_concepts.py
@@ -6,6 +6,7 @@
     Concept,
     Function,
     FundamentalSpecifier,
+    Method,
     MoveReference,
     NameSpecifier,
     PQName,
@@ -809,3 +810,57 @@ def test_requires_paren() -> None:
             ]
         )
     )
+
+
+def test_non_template_requires() -> None:
+    content = """
+      template <class T>
+      struct Payload
+      {
+          constexpr Payload(T v)
+              requires(std::is_pod_v<T>)
+              : Value(v)
+          {
+          }
+      };
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            classes=[
+                ClassScope(
+                    class_decl=ClassDecl(
+                        typename=PQName(
+                            segments=[NameSpecifier(name="Payload")], classkey="struct"
+                        ),
+                        template=TemplateDecl(
+                            params=[TemplateTypeParam(
+                                typekey="class", name="T")]
+                        ),
+                    ),
+                    methods=[
+                        Method(
+                            return_type=None,
+                            name=PQName(
+                                segments=[NameSpecifier(name="Payload")]),
+                            parameters=[
+                                Parameter(
+                                    type=Type(
+                                        typename=PQName(
+                                            segments=[NameSpecifier(name="T")]
+                                        )
+                                    ),
+                                    name="v",
+                                )
+                            ],
+                            constexpr=True,
+                            has_body=True,
+                            access="public",
+                            constructor=True,
+                        )
+                    ],
+                )
+            ]
+        )
+    )