Added very basic support for constinit and consteval.

Added support for template deduction guides

cxxheaderparser/lexer.py

@@ -83,8 +83,11 @@ class PlyLexer:
         "char16_t",
         "char32_t",
         "class",
+        "concept",
         "const",
         "constexpr",
+        "consteval",
+        "constinit",
         "const_cast",
         "continue",
         "decltype",
@@ -121,6 +124,7 @@ class PlyLexer:
         "public",
         "register",
         "reinterpret_cast",
+        "requires",
         "return",
         "short",
         "signed",
@@ -186,6 +190,7 @@ class PlyLexer:
         "DBL_RBRACKET",
         "DBL_COLON",
         "DBL_AMP",
+        "DBL_PIPE",
         "ARROW",
         "SHIFT_LEFT",
     ] + list(keywords)
@@ -471,6 +476,7 @@ class PlyLexer:
     t_DBL_RBRACKET = r"\]\]"
     t_DBL_COLON = r"::"
     t_DBL_AMP = r"&&"
+    t_DBL_PIPE = r"\|\|"
     t_ARROW = r"->"
     t_SHIFT_LEFT = r"<<"
     # SHIFT_RIGHT introduces ambiguity

cxxheaderparser/parser.py

@@ -22,8 +22,10 @@ from .types import (
     AutoSpecifier,
     BaseClass,
     ClassDecl,
+    Concept,
     DecltypeSpecifier,
     DecoratedType,
+    DeductionGuide,
     EnumDecl,
     Enumerator,
     Field,
@@ -41,6 +43,7 @@ from .types import (
     Parameter,
     PQName,
     Pointer,
+    PointerToMember,
     Reference,
     TemplateArgument,
     TemplateDecl,
@@ -537,7 +540,7 @@ class CxxParser:
             self._finish_class_decl(old_state)
 
     #
-    # Template parsing
+    # Template and concept parsing
     #
 
     def _parse_template_type_parameter(
@@ -605,9 +608,13 @@ class CxxParser:
                         lex.return_token(ptok)
                         param = self._parse_template_type_parameter(tok, None)
                     else:
-                        param = self._parse_parameter(ptok, TemplateNonTypeParam, ">")
+                        param, _ = self._parse_parameter(
+                            ptok, TemplateNonTypeParam, False, ">"
+                        )
                 else:
-                    param = self._parse_parameter(tok, TemplateNonTypeParam, ">")
+                    param, _ = self._parse_parameter(
+                        tok, TemplateNonTypeParam, concept_ok=False, end=">"
+                    )
 
                 params.append(param)
 
@@ -640,6 +647,11 @@ class CxxParser:
             self._parse_using(tok, doxygen, template)
         elif tok.type == "friend":
             self._parse_friend_decl(tok, doxygen, template)
+        elif tok.type == "concept":
+            self._parse_concept(tok, doxygen, template)
+        elif tok.type == "requires":
+            template.raw_requires_pre = self._parse_requires(tok)
+            self._parse_declarations(self.lex.token(), doxygen, template)
         else:
             self._parse_declarations(tok, doxygen, template)
 
@@ -750,6 +762,117 @@ class CxxParser:
             self.state, TemplateInst(typename, extern, doxygen)
         )
 
+    def _parse_concept(
+        self,
+        tok: LexToken,
+        doxygen: typing.Optional[str],
+        template: TemplateDecl,
+    ) -> None:
+        name = self._next_token_must_be("NAME")
+        self._next_token_must_be("=")
+
+        # not trying to understand this for now
+        raw_constraint = self._create_value(self._consume_value_until([], ",", ";"))
+
+        state = self.state
+        if isinstance(state, ClassBlockState):
+            raise CxxParseError("concept cannot be defined in a class")
+
+        self.visitor.on_concept(
+            state,
+            Concept(
+                template=template,
+                name=name.value,
+                raw_constraint=raw_constraint,
+                doxygen=doxygen,
+            ),
+        )
+
+    # fmt: off
+    _expr_operators = {
+        "<", ">", "|", "%", "^", "!", "*", "-", "+", "&", "=",
+        "&&", "||", "<<"
+    }
+    # fmt: on
+
+    def _parse_requires(
+        self,
+        tok: LexToken,
+    ) -> Value:
+        tok = self.lex.token()
+
+        rawtoks: typing.List[LexToken] = []
+
+        # The easier case -- requires requires
+        if tok.type == "requires":
+            rawtoks.append(tok)
+            for tt in ("(", "{"):
+                tok = self._next_token_must_be(tt)
+                rawtoks.extend(self._consume_balanced_tokens(tok))
+            # .. and that's it?
+
+        # this is either a parenthesized expression or a primary clause
+        elif tok.type == "(":
+            rawtoks.extend(self._consume_balanced_tokens(tok))
+        else:
+            while True:
+                if tok.type == "(":
+                    rawtoks.extend(self._consume_balanced_tokens(tok))
+                else:
+                    tok = self._parse_requires_segment(tok, rawtoks)
+
+                # If this is not an operator of some kind, we don't know how
+                # to proceed so let the next parser figure it out
+                if tok.value not in self._expr_operators:
+                    break
+
+                rawtoks.append(tok)
+
+                # check once more for compound operator?
+                tok = self.lex.token()
+                if tok.value in self._expr_operators:
+                    rawtoks.append(tok)
+                    tok = self.lex.token()
+
+            self.lex.return_token(tok)
+
+        return self._create_value(rawtoks)
+
+    def _parse_requires_segment(
+        self, tok: LexToken, rawtoks: typing.List[LexToken]
+    ) -> LexToken:
+        # first token could be a name or ::
+        if tok.type == "DBL_COLON":
+            rawtoks.append(tok)
+            tok = self.lex.token()
+
+        while True:
+            # This token has to be a name or some other valid name-like thing
+            if tok.value == "decltype":
+                rawtoks.append(tok)
+                tok = self._next_token_must_be("(")
+                rawtoks.extend(self._consume_balanced_tokens(tok))
+            elif tok.type == "NAME":
+                rawtoks.append(tok)
+            else:
+                # not sure what I expected, but I didn't find it
+                raise self._parse_error(tok)
+
+            tok = self.lex.token()
+
+            # Maybe there's a specialization
+            if tok.value == "<":
+                rawtoks.extend(self._consume_balanced_tokens(tok))
+                tok = self.lex.token()
+
+            # Maybe we keep trying to parse this name
+            if tok.type == "DBL_COLON":
+                tok = self.lex.token()
+                continue
+
+            # Let the caller decide
+            return tok
+
     #
     # Attributes
     #
@@ -871,7 +994,9 @@ class CxxParser:
 
         self.visitor.on_using_namespace(state, names)
 
-    def _parse_using_declaration(self, tok: LexToken) -> None:
+    def _parse_using_declaration(
+        self, tok: LexToken, doxygen: typing.Optional[str]
+    ) -> None:
         """
         using_declaration: "using" ["typename"] ["::"] nested_name_specifier unqualified_id ";"
                          | "using" "::" unqualified_id ";"
@@ -883,12 +1008,15 @@ class CxxParser:
         typename, _ = self._parse_pqname(
             tok, fn_ok=True, compound_ok=True, fund_ok=True
         )
-        decl = UsingDecl(typename, self._current_access)
+        decl = UsingDecl(typename, self._current_access, doxygen)
 
         self.visitor.on_using_declaration(self.state, decl)
 
     def _parse_using_typealias(
-        self, id_tok: LexToken, template: typing.Optional[TemplateDecl]
+        self,
+        id_tok: LexToken,
+        template: typing.Optional[TemplateDecl],
+        doxygen: typing.Optional[str],
     ) -> None:
         """
         alias_declaration: "using" IDENTIFIER "=" type_id ";"
@@ -902,7 +1030,7 @@ class CxxParser:
 
         dtype = self._parse_cv_ptr(parsed_type)
 
-        alias = UsingAlias(id_tok.value, dtype, template, self._current_access)
+        alias = UsingAlias(id_tok.value, dtype, template, self._current_access, doxygen)
 
         self.visitor.on_using_alias(self.state, alias)
 
@@ -931,9 +1059,9 @@ class CxxParser:
                 raise CxxParseError(
                     "unexpected using-declaration when parsing alias-declaration", tok
                 )
-            self._parse_using_declaration(tok)
+            self._parse_using_declaration(tok, doxygen)
         else:
-            self._parse_using_typealias(tok, template)
+            self._parse_using_typealias(tok, template, doxygen)
 
         # All using things end with a semicolon
         self._next_token_must_be(";")
@@ -1471,6 +1599,7 @@ class CxxParser:
         fn_ok: bool = False,
         compound_ok: bool = False,
         fund_ok: bool = False,
+        ptr_to_member_ok: bool = False,
     ) -> typing.Tuple[PQName, typing.Optional[str]]:
         """
         Parses a possibly qualified function name or a type name, returns when
@@ -1598,7 +1727,12 @@ class CxxParser:
             if not self.lex.token_if("DBL_COLON"):
                 break
 
-            tok = self._next_token_must_be("NAME", "operator", "template", "decltype")
+            tok = self._next_token_must_be("NAME", "operator", "template", "decltype", "*")
+            
+            if tok.value == '*':
+                if not ptr_to_member_ok:
+                    raise self._parse_error(tok)
+                return name, 'PTR_TO_MEMBER'
 
         pqname = PQName(segments, classkey, has_typename)
 
@@ -1615,23 +1749,43 @@ class CxxParser:
     #
 
     def _parse_parameter(
-        self, tok: typing.Optional[LexToken], cls: typing.Type[PT], end: str = ")"
+        self,
-    ) -> PT:
+        tok: typing.Optional[LexToken],
+        cls: typing.Type[PT],
+        concept_ok: bool,
+        end: str = ")",
+    ) -> typing.Tuple[PT, typing.Optional[Type]]:
         """
         Parses a single parameter (excluding vararg parameters). Also used
         to parse template non-type parameters
+
+        Returns parameter type, abbreviated template type
         """
 
         param_name = None
         default = None
         param_pack = False
+        parsed_type: typing.Optional[Type]
+        at_type: typing.Optional[Type] = None
 
-        # required typename + decorators
+        if not tok:
-        parsed_type, mods = self._parse_type(tok)
+            tok = self.lex.token()
-        if parsed_type is None:
-            raise self._parse_error(None)
 
-        mods.validate(var_ok=False, meth_ok=False, msg="parsing parameter")
+        # placeholder type, skip typename
+        if tok.type == "auto":
+            at_type = parsed_type = Type(PQName([AutoSpecifier()]))
+        else:
+            # required typename + decorators
+            parsed_type, mods = self._parse_type(tok)
+            if parsed_type is None:
+                raise self._parse_error(None)
+
+            mods.validate(var_ok=False, meth_ok=False, msg="parsing parameter")
+
+            # Could be a concept
+            if concept_ok and self.lex.token_if("auto"):
+                at_type = Type(parsed_type.typename)
+                parsed_type.typename = PQName([AutoSpecifier()])
 
         dtype = self._parse_cv_ptr(parsed_type)
 
@@ -1645,10 +1799,31 @@ class CxxParser:
             toks = self._consume_balanced_tokens(tok)
             self.lex.return_tokens(toks[1:-1])
 
+
         # optional name
-        tok = self.lex.token_if("NAME", "final")
+        tok = self.lex.token_if("NAME", "final", "DBL_COLON")
         if tok:
-            param_name = tok.value
+            pqname, op = self._parse_pqname(tok, fn_ok=True, ptr_to_member_ok=True)
+            while op == 'PTR_TO_MEMBER':
+                dtype = PointerToMember(base_type=Type(typename=pqname), ptr_to=dtype, const=dtype.const, volatile=dtype.volatile)
+                # dtype = self._parse_cv_ptr(dtype)
+                tok = self.lex.token_if("NAME", "final", "DBL_COLON")
+                if tok:
+                    pqname, op = self._parse_pqname(tok, fn_ok=True, ptr_to_member_ok=True)
+                else:
+                    pqname = None
+                    op = None
+            if pqname:
+                if len(pqname.segments) != 1:
+                    raise self._parse_error(None)
+                param_name = pqname.segments[0].name
+
+        if self.lex.token_if("("):
+            if isinstance(dtype, PointerToMember):
+                params, vararg, at_params = self._parse_parameters(False)
+                dtype.ptr_to = FunctionType(return_type=dtype.ptr_to, parameters=params, vararg=vararg)
+            else:
+                assert(False) # TODO
 
         # optional array parameter
         tok = self.lex.token_if("[")
@@ -1659,23 +1834,32 @@ class CxxParser:
         if self.lex.token_if("="):
             default = self._create_value(self._consume_value_until([], ",", end))
 
+        # abbreviated template pack
+        if at_type and self.lex.token_if("ELLIPSIS"):
+            param_pack = True
+
         param = cls(type=dtype, name=param_name, default=default, param_pack=param_pack)
         self.debug_print("parameter: %s", param)
-        return param
+        return param, at_type
 
-    def _parse_parameters(self) -> typing.Tuple[typing.List[Parameter], bool]:
+    def _parse_parameters(
+        self, concept_ok: bool
+    ) -> typing.Tuple[typing.List[Parameter], bool, typing.List[TemplateParam]]:
         """
-        Consumes function parameters and returns them, and vararg if found
+        Consumes function parameters and returns them, and vararg if found, and
+        promotes abbreviated template parameters to actual template parameters
+        if concept_ok is True
         """
 
         # starting at a (
 
         # special case: zero parameters
         if self.lex.token_if(")"):
-            return [], False
+            return [], False, []
 
         params: typing.List[Parameter] = []
         vararg = False
+        at_params: typing.List[TemplateParam] = []
 
         while True:
             if self.lex.token_if("ELLIPSIS"):
@@ -1683,8 +1867,17 @@ class CxxParser:
                 self._next_token_must_be(")")
                 break
 
-            param = self._parse_parameter(None, Parameter)
+            param, at_type = self._parse_parameter(None, Parameter, concept_ok)
             params.append(param)
+            if at_type:
+                at_params.append(
+                    TemplateNonTypeParam(
+                        type=at_type,
+                        param_idx=len(params) - 1,
+                        param_pack=param.param_pack,
+                    )
+                )
+
             tok = self._next_token_must_be(",", ")")
             if tok.value == ")":
                 break
@@ -1699,15 +1892,14 @@ class CxxParser:
             ):
                 params = []
 
-        return params, vararg
+        return params, vararg, at_params
 
     _auto_return_typename = PQName([AutoSpecifier()])
 
     def _parse_trailing_return_type(
-        self, fn: typing.Union[Function, FunctionType]
+        self, return_type: typing.Optional[DecoratedType]
-    ) -> None:
+    ) -> DecoratedType:
         # entry is "->"
-        return_type = fn.return_type
         if not (
             isinstance(return_type, Type)
             and not return_type.const
@@ -1726,8 +1918,7 @@ class CxxParser:
 
         dtype = self._parse_cv_ptr(parsed_type)
 
-        fn.has_trailing_return = True
+        return dtype
-        fn.return_type = dtype
 
     def _parse_fn_end(self, fn: Function) -> None:
         """
@@ -1745,12 +1936,22 @@ class CxxParser:
             if otok:
                 toks = self._consume_balanced_tokens(otok)[1:-1]
             fn.noexcept = self._create_value(toks)
+        else:
+            rtok = self.lex.token_if("requires")
+            if rtok:
+                # requires on a function must always be accompanied by a template
+                if fn.template is None:
+                    raise self._parse_error(rtok)
+                fn.raw_requires = self._parse_requires(rtok)
+
+        if self.lex.token_if("ARROW"):
+            return_type = self._parse_trailing_return_type(fn.return_type)
+            fn.has_trailing_return = True
+            fn.return_type = return_type
 
         if self.lex.token_if("{"):
             self._discard_contents("{", "}")
             fn.has_body = True
-        elif self.lex.token_if("ARROW"):
-            self._parse_trailing_return_type(fn)
 
     def _parse_method_end(self, method: Method) -> None:
         """
@@ -1794,7 +1995,12 @@ class CxxParser:
             elif tok_value in ("&", "&&"):
                 method.ref_qualifier = tok_value
             elif tok_value == "->":
-                self._parse_trailing_return_type(method)
+                return_type = self._parse_trailing_return_type(method.return_type)
+                method.has_trailing_return = True
+                method.return_type = return_type
+                if self.lex.token_if("{"):
+                    self._discard_contents("{", "}")
+                    method.has_body = True
                 break
             elif tok_value == "throw":
                 tok = self._next_token_must_be("(")
@@ -1805,6 +2011,8 @@ class CxxParser:
                 if otok:
                     toks = self._consume_balanced_tokens(otok)[1:-1]
                 method.noexcept = self._create_value(toks)
+            elif tok_value == "requires":
+                method.raw_requires = self._parse_requires(tok)
             else:
                 self.lex.return_token(tok)
                 break
@@ -1823,6 +2031,7 @@ class CxxParser:
         is_friend: bool,
         is_typedef: bool,
         msvc_convention: typing.Optional[LexToken],
+        is_guide: bool = False,
     ) -> bool:
         """
         Assumes the caller has already consumed the return type and name, this consumes the
@@ -1846,7 +2055,16 @@ class CxxParser:
         state.location = location
         is_class_block = isinstance(state, ClassBlockState)
 
-        params, vararg = self._parse_parameters()
+        params, vararg, at_params = self._parse_parameters(True)
+
+        # Promote abbreviated template parameters
+        if at_params:
+            if template is None:
+                template = TemplateDecl(at_params)
+            elif isinstance(template, TemplateDecl):
+                template.params.extend(at_params)
+            else:
+                template[-1].params.extend(at_params)
 
         # A method outside of a class has multiple name segments
         multiple_name_segments = len(pqname.segments) > 1
@@ -1890,7 +2108,21 @@ class CxxParser:
                 self.visitor.on_method_impl(state, method)
 
             return method.has_body or method.has_trailing_return
-
+        elif is_guide:
+            assert isinstance(state, (ExternBlockState, NamespaceBlockState))
+            if not self.lex.token_if("ARROW"):
+                raise self._parse_error(None, expected="Trailing return type")
+            return_type = self._parse_trailing_return_type(
+                Type(PQName([AutoSpecifier()]))
+            )
+            guide = DeductionGuide(
+                return_type,
+                name=pqname,
+                parameters=params,
+                doxygen=doxygen,
+            )
+            self.visitor.on_deduction_guide(state, guide)
+            return False
         else:
             assert return_type is not None
             fn = Function(
@@ -1916,6 +2148,8 @@ class CxxParser:
 
                 if fn.constexpr:
                     raise CxxParseError("typedef function may not be constexpr")
+                if fn.consteval:
+                    raise CxxParseError("typedef function may not be consteval")
                 if fn.extern:
                     raise CxxParseError("typedef function may not be extern")
                 if fn.static:
@@ -2019,12 +2253,14 @@ class CxxParser:
                     toks = self._consume_balanced_tokens(gtok)
                     self.lex.return_tokens(toks[1:-1])
 
-                fn_params, vararg = self._parse_parameters()
+                fn_params, vararg, _ = self._parse_parameters(False)
 
                 assert not isinstance(dtype, FunctionType)
                 dtype = dtype_fn = FunctionType(dtype, fn_params, vararg)
                 if self.lex.token_if("ARROW"):
-                    self._parse_trailing_return_type(dtype_fn)
+                    return_type = self._parse_trailing_return_type(dtype_fn.return_type)
+                    dtype_fn.has_trailing_return = True
+                    dtype_fn.return_type = return_type
 
             else:
                 msvc_convention = None
@@ -2047,7 +2283,7 @@ class CxxParser:
                         assert not isinstance(dtype, FunctionType)
                         dtype = self._parse_array_type(aptok, dtype)
                     elif aptok.type == "(":
-                        fn_params, vararg = self._parse_parameters()
+                        fn_params, vararg, _ = self._parse_parameters(False)
                         # the type we already have is the return type of the function pointer
 
                         assert not isinstance(dtype, FunctionType)
@@ -2084,7 +2320,7 @@ class CxxParser:
         return dtype
 
     # Applies to variables and return values
-    _type_kwd_both = {"const", "constexpr", "extern", "inline", "static"}
+    _type_kwd_both = {"const", "consteval", "constexpr", "constinit", "extern", "inline", "static"}
 
     # Only found on methods
     _type_kwd_meth = {"explicit", "virtual"}
@@ -2205,6 +2441,7 @@ class CxxParser:
         destructor = False
         op = None
         msvc_convention = None
+        is_guide = False
 
         # If we have a leading (, that's either an obnoxious grouping
         # paren or it's a constructor
@@ -2255,15 +2492,32 @@ class CxxParser:
                 # grouping paren like "void (name(int x));"
                 toks = self._consume_balanced_tokens(tok)
 
-                # .. not sure what it's grouping, so put it back?
+                # check to see if the next token is an arrow, and thus a trailing return
-                self.lex.return_tokens(toks[1:-1])
+                if self.lex.token_peek_if("ARROW"):
+                    self.lex.return_tokens(toks)
+                    # the leading name of the class/ctor has been parsed as a type before the parens
+                    pqname = parsed_type.typename
+                    is_guide = True
+                else:
+                    # .. not sure what it's grouping, so put it back?
+                    self.lex.return_tokens(toks[1:-1])
 
         if dtype:
             msvc_convention = self.lex.token_if_val(*self._msvc_conventions)
 
             tok = self.lex.token_if_in_set(self._pqname_start_tokens)
             if tok:
-                pqname, op = self._parse_pqname(tok, fn_ok=True)
+                pqname, op = self._parse_pqname(tok, fn_ok=True, ptr_to_member_ok=True)
+                while op == 'PTR_TO_MEMBER':
+                    dtype = PointerToMember(base_type=Type(typename=pqname), ptr_to=dtype, const=dtype.const, volatile=dtype.volatile)
+                    # dtype = self._parse_cv_ptr(dtype)
+                    tok = self.lex.token_if_in_set(self._pqname_start_tokens)
+                    if tok:
+                        pqname, op = self._parse_pqname(tok, fn_ok=True, ptr_to_member_ok=True)
+                    else:
+                        pqname = None
+                        op = None
+                    
 
         # TODO: "type fn(x);" is ambiguous here. Because this is a header
         # parser, we assume it's a function, not a variable declaration
@@ -2274,20 +2528,25 @@ class CxxParser:
             if not pqname:
                 raise self._parse_error(None)
             
-            return self._parse_function(
+            if isinstance(dtype, PointerToMember):
-                mods,
+                params, vararg, at_params = self._parse_parameters(False)
-                dtype,
+                dtype.ptr_to = FunctionType(return_type=dtype.ptr_to, parameters=params, vararg=vararg)
-                pqname,
+            else:
-                op,
+                return self._parse_function(
-                template,
+                    mods,
-                doxygen,
+                    dtype,
-                location,
+                    pqname,
-                constructor,
+                    op,
-                destructor,
+                    template,
-                is_friend,
+                    doxygen,
-                is_typedef,
+                    location,
-                msvc_convention,
+                    constructor,
-            )
+                    destructor,
+                    is_friend,
+                    is_typedef,
+                    msvc_convention,
+                    is_guide,
+                )
         elif msvc_convention:
             raise self._parse_error(msvc_convention)
 

cxxheaderparser/simple.py

@@ -34,6 +34,8 @@ from dataclasses import dataclass, field
 
 from .types import (
     ClassDecl,
+    Concept,
+    DeductionGuide,
     EnumDecl,
     Field,
     ForwardDecl,
@@ -113,12 +115,18 @@ class NamespaceScope:
     using_alias: typing.List[UsingAlias] = field(default_factory=list)
     ns_alias: typing.List[NamespaceAlias] = field(default_factory=list)
 
+    #: Concepts
+    concepts: typing.List[Concept] = field(default_factory=list)
+
     #: Explicit template instantiations
     template_insts: typing.List[TemplateInst] = field(default_factory=list)
 
     #: Child namespaces
     namespaces: typing.Dict[str, "NamespaceScope"] = field(default_factory=dict)
 
+    #: Deduction guides
+    deduction_guides: typing.List[DeductionGuide] = field(default_factory=list)
+
 
 Block = typing.Union[ClassScope, NamespaceScope]
 
@@ -243,6 +251,9 @@ class SimpleCxxVisitor:
     def on_namespace_end(self, state: SNamespaceBlockState) -> None:
         pass
 
+    def on_concept(self, state: SNonClassBlockState, concept: Concept) -> None:
+        state.user_data.concepts.append(concept)
+
     def on_namespace_alias(
         self, state: SNonClassBlockState, alias: NamespaceAlias
     ) -> None:
@@ -310,6 +321,11 @@ class SimpleCxxVisitor:
     def on_class_end(self, state: SClassBlockState) -> None:
         pass
 
+    def on_deduction_guide(
+        self, state: SNonClassBlockState, guide: DeductionGuide
+    ) -> None:
+        state.user_data.deduction_guides.append(guide)
+
 
 def parse_string(
     content: str,

cxxheaderparser/types.py

@@ -306,7 +306,7 @@ class Array:
     """
 
     #: The type that this is an array of
-    array_of: typing.Union["Array", "Pointer", Type]
+    array_of: typing.Union["Array", "Pointer", "PointerToMember", Type]
 
     #: Size of the array
     #:
@@ -332,7 +332,7 @@ class Pointer:
     """
 
     #: Thing that this points to
-    ptr_to: typing.Union[Array, FunctionType, "Pointer", Type]
+    ptr_to: typing.Union[Array, FunctionType, "Pointer", "PointerToMember", Type]
 
     const: bool = False
     volatile: bool = False
@@ -356,6 +356,39 @@ class Pointer:
         else:
             return f"{ptr_to.format()}*{c}{v} {name}"
 
+@dataclass
+class PointerToMember:
+    """
+    Pointer to a class member. (``Class::* int``)
+    """
+
+    #: Thing that this points to
+    base_type: Type
+    ptr_to: typing.Union[Array, FunctionType, "Pointer", "PointerToMember", Type]
+
+    const: bool = False
+    volatile: bool = False
+
+    def format(self) -> str:
+        c = " const" if self.const else ""
+        v = " volatile" if self.volatile else ""
+        ptr_to = self.ptr_to
+        if isinstance(ptr_to, (Array, FunctionType)):
+            return ptr_to.format_decl(f"({self.base_type.format()}::*{c}{v})")
+        else:
+            return f"{ptr_to.format()} {self.base_type.format()}::*{c}{v}"
+
+    def format_decl(self, name: str):
+        """Format as a named declaration"""
+        c = " const" if self.const else ""
+        v = " volatile" if self.volatile else ""
+        ptr_to = self.ptr_to
+        if isinstance(ptr_to, (Array, FunctionType)):
+            return ptr_to.format_decl(f"({self.base_type.format()}::*{c}{v} {name})")
+        else:
+            return f"{ptr_to.format()} {self.base_type.format()}::*{c}{v} {name}"
+
+    
 
 @dataclass
 class Reference:
@@ -363,7 +396,7 @@ class Reference:
     A lvalue (``&``) reference
     """
 
-    ref_to: typing.Union[Array, FunctionType, Pointer, Type]
+    ref_to: typing.Union[Array, FunctionType, Pointer, PointerToMember, Type]
 
     def format(self) -> str:
         ref_to = self.ref_to
@@ -388,7 +421,7 @@ class MoveReference:
     An rvalue (``&&``) reference
     """
 
-    moveref_to: typing.Union[Array, FunctionType, Pointer, Type]
+    moveref_to: typing.Union[Array, FunctionType, Pointer, PointerToMember, Type]
 
     def format(self) -> str:
         return f"{self.moveref_to.format()}&&"
@@ -402,7 +435,7 @@ class MoveReference:
 #:
 #: .. note:: There can only be one of FunctionType or Type in a DecoratedType
 #:           chain
-DecoratedType = typing.Union[Array, Pointer, MoveReference, Reference, Type]
+DecoratedType = typing.Union[Array, Pointer, PointerToMember, MoveReference, Reference, Type]
 
 
 @dataclass
@@ -454,12 +487,19 @@ class TemplateNonTypeParam:
 
        template <auto T>
                  ~~~~~~
+
+       // abbreviated template parameters are converted to this and param_idx is set
+       void fn(C auto p)
+               ~~~~~~
     """
 
     type: DecoratedType
     name: typing.Optional[str] = None
     default: typing.Optional[Value] = None
 
+    #: If this was promoted, the parameter index that this corresponds with
+    param_idx: typing.Optional[int] = None
+
     #: Contains a ``...``
     param_pack: bool = False
 
@@ -513,6 +553,12 @@ class TemplateDecl:
 
     params: typing.List[TemplateParam] = field(default_factory=list)
 
+    # Currently don't interpret requires, if that changes in the future
+    # then this API will change.
+
+    #: template <typename T> requires ...
+    raw_requires_pre: typing.Optional[Value] = None
+
 
 #: If no template, this is None. This is a TemplateDecl if this there is a single
 #: declaration:
@@ -551,6 +597,31 @@ class TemplateInst:
     doxygen: typing.Optional[str] = None
 
 
+@dataclass
+class Concept:
+    """
+    Preliminary support for consuming headers that contain concepts, but
+    not trying to actually make sense of them at this time. If this is
+    something you care about, pull requests are welcomed!
+
+    .. code-block:: c++
+
+        template <class T>
+        concept Meowable = is_meowable<T>;
+
+        template<typename T>
+        concept Addable = requires (T x) { x + x; };
+    """
+
+    template: TemplateDecl
+    name: str
+
+    #: In the future this will be removed if we fully parse the expression
+    raw_constraint: Value
+
+    doxygen: typing.Optional[str] = None
+
+
 @dataclass
 class ForwardDecl:
     """
@@ -650,6 +721,7 @@ class Function:
     doxygen: typing.Optional[str] = None
 
     constexpr: bool = False
+    consteval: bool = False
     extern: typing.Union[bool, str] = False
     static: bool = False
     inline: bool = False
@@ -689,6 +761,13 @@ class Function:
     #: is the string "conversion" and the full Type is found in return_type
     operator: typing.Optional[str] = None
 
+    #: A requires constraint following the function declaration. If you need the
+    #: prior, look at TemplateDecl.raw_requires_pre. At the moment this is just
+    #: a raw value, if we interpret it in the future this will change.
+    #:
+    #: template <typename T> int main() requires ...
+    raw_requires: typing.Optional[Value] = None
+
 
 @dataclass
 class Method(Function):
@@ -779,6 +858,7 @@ class Variable:
     value: typing.Optional[Value] = None
 
     constexpr: bool = False
+    constinit: bool = False
     extern: typing.Union[bool, str] = False
     static: bool = False
     inline: bool = False
@@ -805,8 +885,10 @@ class Field:
     bits: typing.Optional[int] = None
 
     constexpr: bool = False
+    constinit: bool = False
     mutable: bool = False
     static: bool = False
+    inline: bool = False
 
     doxygen: typing.Optional[str] = None
 
@@ -824,6 +906,9 @@ class UsingDecl:
     #: If within a class, the access level for this decl
     access: typing.Optional[str] = None
 
+    #: Documentation if present
+    doxygen: typing.Optional[str] = None
+
 
 @dataclass
 class UsingAlias:
@@ -844,3 +929,24 @@ class UsingAlias:
 
     #: If within a class, the access level for this decl
     access: typing.Optional[str] = None
+
+    #: Documentation if present
+    doxygen: typing.Optional[str] = None
+
+
+@dataclass
+class DeductionGuide:
+    """
+    .. code-block:: c++
+
+    template <class T>
+    MyClass(T) -> MyClass(int);
+    """
+
+    #: Only constructors and destructors don't have a return type
+    result_type: typing.Optional[DecoratedType]
+
+    name: PQName
+    parameters: typing.List[Parameter]
+
+    doxygen: typing.Optional[str] = None

cxxheaderparser/visitor.py

@@ -8,6 +8,8 @@ else:
 
 
 from .types import (
+    Concept,
+    DeductionGuide,
     EnumDecl,
     Field,
     ForwardDecl,
@@ -89,6 +91,14 @@ class CxxVisitor(Protocol):
         Called when a ``namespace`` alias is encountered
         """
 
+    def on_concept(self, state: NonClassBlockState, concept: Concept) -> None:
+        """
+        .. code-block:: c++
+
+            template <class T>
+            concept Meowable = is_meowable<T>;
+        """
+
     def on_forward_decl(self, state: State, fdecl: ForwardDecl) -> None:
         """
         Called when a forward declaration is encountered
@@ -227,6 +237,13 @@ class CxxVisitor(Protocol):
         ``on_variable`` for each instance declared.
         """
 
+    def on_deduction_guide(
+        self, state: NonClassBlockState, guide: DeductionGuide
+    ) -> None:
+        """
+        Called when a deduction guide is encountered
+        """
+
 
 class NullVisitor:
     """
@@ -254,6 +271,9 @@ class NullVisitor:
     def on_namespace_end(self, state: NamespaceBlockState) -> None:
         return None
 
+    def on_concept(self, state: NonClassBlockState, concept: Concept) -> None:
+        return None
+
     def on_namespace_alias(
         self, state: NonClassBlockState, alias: NamespaceAlias
     ) -> None:
@@ -306,5 +326,10 @@ class NullVisitor:
     def on_class_end(self, state: ClassBlockState) -> None:
         return None
 
+    def on_deduction_guide(
+        self, state: NonClassBlockState, guide: DeductionGuide
+    ) -> None:
+        return None
+
 
 null_visitor = NullVisitor()

tests/test_abv_template.py

@@ -0,0 +1,353 @@
+# Note: testcases generated via `python -m cxxheaderparser.gentest`
+#
+# Tests various aspects of abbreviated function templates
+#
+
+from cxxheaderparser.simple import NamespaceScope, ParsedData, parse_string
+from cxxheaderparser.types import (
+    AutoSpecifier,
+    Function,
+    FundamentalSpecifier,
+    NameSpecifier,
+    PQName,
+    Parameter,
+    Pointer,
+    Reference,
+    TemplateDecl,
+    TemplateNonTypeParam,
+    Type,
+)
+
+
+def test_abv_template_f1() -> None:
+    content = """
+      void f1(auto);       // same as template<class T> void f1(T)
+      void f1p(auto p);
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            functions=[
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="void")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="f1")]),
+                    parameters=[
+                        Parameter(
+                            type=Type(typename=PQName(segments=[AutoSpecifier()]))
+                        )
+                    ],
+                    template=TemplateDecl(
+                        params=[
+                            TemplateNonTypeParam(
+                                type=Type(typename=PQName(segments=[AutoSpecifier()])),
+                                param_idx=0,
+                            )
+                        ]
+                    ),
+                ),
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="void")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="f1p")]),
+                    parameters=[
+                        Parameter(
+                            type=Type(typename=PQName(segments=[AutoSpecifier()])),
+                            name="p",
+                        )
+                    ],
+                    template=TemplateDecl(
+                        params=[
+                            TemplateNonTypeParam(
+                                type=Type(typename=PQName(segments=[AutoSpecifier()])),
+                                param_idx=0,
+                            )
+                        ]
+                    ),
+                ),
+            ]
+        )
+    )
+
+
+def test_abv_template_f2() -> None:
+    content = """
+      void f2(C1 auto);    // same as template<C1 T> void f2(T), if C1 is a concept
+      void f2p(C1 auto p);
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            functions=[
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="void")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="f2")]),
+                    parameters=[
+                        Parameter(
+                            type=Type(typename=PQName(segments=[AutoSpecifier()]))
+                        )
+                    ],
+                    template=TemplateDecl(
+                        params=[
+                            TemplateNonTypeParam(
+                                type=Type(
+                                    typename=PQName(segments=[NameSpecifier(name="C1")])
+                                ),
+                                param_idx=0,
+                            )
+                        ]
+                    ),
+                ),
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="void")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="f2p")]),
+                    parameters=[
+                        Parameter(
+                            type=Type(typename=PQName(segments=[AutoSpecifier()])),
+                            name="p",
+                        )
+                    ],
+                    template=TemplateDecl(
+                        params=[
+                            TemplateNonTypeParam(
+                                type=Type(
+                                    typename=PQName(segments=[NameSpecifier(name="C1")])
+                                ),
+                                param_idx=0,
+                            )
+                        ]
+                    ),
+                ),
+            ]
+        )
+    )
+
+
+def test_abv_template_f3() -> None:
+    content = """
+      void f3(C2 auto...);     // same as template<C2... Ts> void f3(Ts...), if C2 is a
+                               // concept
+      void f3p(C2 auto p...);
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            functions=[
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="void")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="f3")]),
+                    parameters=[
+                        Parameter(
+                            type=Type(typename=PQName(segments=[AutoSpecifier()])),
+                            param_pack=True,
+                        )
+                    ],
+                    template=TemplateDecl(
+                        params=[
+                            TemplateNonTypeParam(
+                                type=Type(
+                                    typename=PQName(segments=[NameSpecifier(name="C2")])
+                                ),
+                                param_idx=0,
+                                param_pack=True,
+                            )
+                        ]
+                    ),
+                ),
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="void")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="f3p")]),
+                    parameters=[
+                        Parameter(
+                            type=Type(typename=PQName(segments=[AutoSpecifier()])),
+                            name="p",
+                            param_pack=True,
+                        )
+                    ],
+                    template=TemplateDecl(
+                        params=[
+                            TemplateNonTypeParam(
+                                type=Type(
+                                    typename=PQName(segments=[NameSpecifier(name="C2")])
+                                ),
+                                param_idx=0,
+                                param_pack=True,
+                            )
+                        ]
+                    ),
+                ),
+            ]
+        )
+    )
+
+
+def test_abv_template_f4() -> None:
+    content = """
+      void f4(C2 auto, ...);   // same as template<C2 T> void f4(T...), if C2 is a concept
+      void f4p(C2 auto p,...);
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            functions=[
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="void")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="f4")]),
+                    parameters=[
+                        Parameter(
+                            type=Type(typename=PQName(segments=[AutoSpecifier()]))
+                        )
+                    ],
+                    vararg=True,
+                    template=TemplateDecl(
+                        params=[
+                            TemplateNonTypeParam(
+                                type=Type(
+                                    typename=PQName(segments=[NameSpecifier(name="C2")])
+                                ),
+                                param_idx=0,
+                            )
+                        ]
+                    ),
+                ),
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="void")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="f4p")]),
+                    parameters=[
+                        Parameter(
+                            type=Type(typename=PQName(segments=[AutoSpecifier()])),
+                            name="p",
+                        )
+                    ],
+                    vararg=True,
+                    template=TemplateDecl(
+                        params=[
+                            TemplateNonTypeParam(
+                                type=Type(
+                                    typename=PQName(segments=[NameSpecifier(name="C2")])
+                                ),
+                                param_idx=0,
+                            )
+                        ]
+                    ),
+                ),
+            ]
+        )
+    )
+
+
+def test_abv_template_f5() -> None:
+    content = """
+      void f5(const C3 auto *, C4 auto &);       // same as template<C3 T, C4 U> void f5(const T*, U&);
+      void f5p(const C3 auto * p1, C4 auto &p2);
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            functions=[
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="void")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="f5")]),
+                    parameters=[
+                        Parameter(
+                            type=Pointer(
+                                ptr_to=Type(
+                                    typename=PQName(
+                                        segments=[AutoSpecifier()],
+                                    ),
+                                    const=True,
+                                )
+                            )
+                        ),
+                        Parameter(
+                            type=Reference(
+                                ref_to=Type(typename=PQName(segments=[AutoSpecifier()]))
+                            )
+                        ),
+                    ],
+                    template=TemplateDecl(
+                        params=[
+                            TemplateNonTypeParam(
+                                type=Type(
+                                    typename=PQName(
+                                        segments=[NameSpecifier(name="C3")]
+                                    ),
+                                ),
+                                param_idx=0,
+                            ),
+                            TemplateNonTypeParam(
+                                type=Type(
+                                    typename=PQName(segments=[NameSpecifier(name="C4")])
+                                ),
+                                param_idx=1,
+                            ),
+                        ]
+                    ),
+                ),
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="void")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="f5p")]),
+                    parameters=[
+                        Parameter(
+                            type=Pointer(
+                                ptr_to=Type(
+                                    typename=PQName(
+                                        segments=[AutoSpecifier()],
+                                    ),
+                                    const=True,
+                                )
+                            ),
+                            name="p1",
+                        ),
+                        Parameter(
+                            type=Reference(
+                                ref_to=Type(typename=PQName(segments=[AutoSpecifier()]))
+                            ),
+                            name="p2",
+                        ),
+                    ],
+                    template=TemplateDecl(
+                        params=[
+                            TemplateNonTypeParam(
+                                type=Type(
+                                    typename=PQName(
+                                        segments=[NameSpecifier(name="C3")]
+                                    ),
+                                ),
+                                param_idx=0,
+                            ),
+                            TemplateNonTypeParam(
+                                type=Type(
+                                    typename=PQName(segments=[NameSpecifier(name="C4")])
+                                ),
+                                param_idx=1,
+                            ),
+                        ]
+                    ),
+                ),
+            ]
+        )
+    )

tests/test_class.py

@@ -3336,3 +3336,40 @@ def test_constructor_outside_class() -> None:
             ]
         )
     )
+
+
+def test_class_inline_static() -> None:
+    content = """
+      struct X {
+          inline static bool Foo = 1;
+      };
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            classes=[
+                ClassScope(
+                    class_decl=ClassDecl(
+                        typename=PQName(
+                            segments=[NameSpecifier(name="X")], classkey="struct"
+                        )
+                    ),
+                    fields=[
+                        Field(
+                            access="public",
+                            type=Type(
+                                typename=PQName(
+                                    segments=[FundamentalSpecifier(name="bool")]
+                                )
+                            ),
+                            name="Foo",
+                            value=Value(tokens=[Token(value="1")]),
+                            static=True,
+                            inline=True,
+                        )
+                    ],
+                )
+            ]
+        )
+    )

tests/test_concepts.py

@@ -0,0 +1,878 @@
+from cxxheaderparser.simple import ClassScope, NamespaceScope, ParsedData, parse_string
+from cxxheaderparser.tokfmt import Token
+from cxxheaderparser.types import (
+    AutoSpecifier,
+    ClassDecl,
+    Concept,
+    Function,
+    FundamentalSpecifier,
+    Method,
+    MoveReference,
+    NameSpecifier,
+    PQName,
+    Parameter,
+    TemplateArgument,
+    TemplateDecl,
+    TemplateNonTypeParam,
+    TemplateSpecialization,
+    TemplateTypeParam,
+    Type,
+    Value,
+    Variable,
+)
+
+
+def test_concept_basic_constraint() -> None:
+    content = """
+      template <class T, class U>
+      concept Derived = std::is_base_of<U, T>::value;
+
+      template <Derived<Base> T> void f(T); // T is constrained by Derived<T, Base>
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            functions=[
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="void")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="f")]),
+                    parameters=[
+                        Parameter(
+                            type=Type(
+                                typename=PQName(segments=[NameSpecifier(name="T")])
+                            )
+                        )
+                    ],
+                    template=TemplateDecl(
+                        params=[
+                            TemplateNonTypeParam(
+                                type=Type(
+                                    typename=PQName(
+                                        segments=[
+                                            NameSpecifier(
+                                                name="Derived",
+                                                specialization=TemplateSpecialization(
+                                                    args=[
+                                                        TemplateArgument(
+                                                            arg=Type(
+                                                                typename=PQName(
+                                                                    segments=[
+                                                                        NameSpecifier(
+                                                                            name="Base"
+                                                                        )
+                                                                    ]
+                                                                )
+                                                            )
+                                                        )
+                                                    ]
+                                                ),
+                                            )
+                                        ]
+                                    )
+                                ),
+                                name="T",
+                            )
+                        ]
+                    ),
+                )
+            ],
+            concepts=[
+                Concept(
+                    template=TemplateDecl(
+                        params=[
+                            TemplateTypeParam(typekey="class", name="T"),
+                            TemplateTypeParam(typekey="class", name="U"),
+                        ]
+                    ),
+                    name="Derived",
+                    raw_constraint=Value(
+                        tokens=[
+                            Token(value="std"),
+                            Token(value="::"),
+                            Token(value="is_base_of"),
+                            Token(value="<"),
+                            Token(value="U"),
+                            Token(value=","),
+                            Token(value="T"),
+                            Token(value=">"),
+                            Token(value="::"),
+                            Token(value="value"),
+                        ]
+                    ),
+                )
+            ],
+        )
+    )
+
+
+def test_concept_basic_constraint2() -> None:
+    content = """
+      template <class T> constexpr bool is_meowable = true;
+
+      template <class T> constexpr bool is_cat = true;
+
+      template <class T>
+      concept Meowable = is_meowable<T>;
+
+      template <class T>
+      concept BadMeowableCat = is_meowable<T> && is_cat<T>;
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            variables=[
+                Variable(
+                    name=PQName(segments=[NameSpecifier(name="is_meowable")]),
+                    type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="bool")])
+                    ),
+                    value=Value(tokens=[Token(value="true")]),
+                    constexpr=True,
+                    template=TemplateDecl(
+                        params=[TemplateTypeParam(typekey="class", name="T")]
+                    ),
+                ),
+                Variable(
+                    name=PQName(segments=[NameSpecifier(name="is_cat")]),
+                    type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="bool")])
+                    ),
+                    value=Value(tokens=[Token(value="true")]),
+                    constexpr=True,
+                    template=TemplateDecl(
+                        params=[TemplateTypeParam(typekey="class", name="T")]
+                    ),
+                ),
+            ],
+            concepts=[
+                Concept(
+                    template=TemplateDecl(
+                        params=[TemplateTypeParam(typekey="class", name="T")]
+                    ),
+                    name="Meowable",
+                    raw_constraint=Value(
+                        tokens=[
+                            Token(value="is_meowable"),
+                            Token(value="<"),
+                            Token(value="T"),
+                            Token(value=">"),
+                        ]
+                    ),
+                ),
+                Concept(
+                    template=TemplateDecl(
+                        params=[TemplateTypeParam(typekey="class", name="T")]
+                    ),
+                    name="BadMeowableCat",
+                    raw_constraint=Value(
+                        tokens=[
+                            Token(value="is_meowable"),
+                            Token(value="<"),
+                            Token(value="T"),
+                            Token(value=">"),
+                            Token(value="&&"),
+                            Token(value="is_cat"),
+                            Token(value="<"),
+                            Token(value="T"),
+                            Token(value=">"),
+                        ]
+                    ),
+                ),
+            ],
+        )
+    )
+
+
+def test_concept_basic_requires() -> None:
+    content = """
+      template <typename T>
+      concept Hashable = requires(T a) {
+        { std::hash<T>{}(a) } -> std::convertible_to<std::size_t>;
+      };
+
+      template <Hashable T> void f(T) {}
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            functions=[
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="void")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="f")]),
+                    parameters=[
+                        Parameter(
+                            type=Type(
+                                typename=PQName(segments=[NameSpecifier(name="T")])
+                            )
+                        )
+                    ],
+                    has_body=True,
+                    template=TemplateDecl(
+                        params=[
+                            TemplateNonTypeParam(
+                                type=Type(
+                                    typename=PQName(
+                                        segments=[NameSpecifier(name="Hashable")]
+                                    )
+                                ),
+                                name="T",
+                            )
+                        ]
+                    ),
+                )
+            ],
+            concepts=[
+                Concept(
+                    template=TemplateDecl(
+                        params=[TemplateTypeParam(typekey="typename", name="T")]
+                    ),
+                    name="Hashable",
+                    raw_constraint=Value(
+                        tokens=[
+                            Token(value="requires"),
+                            Token(value="("),
+                            Token(value="T"),
+                            Token(value="a"),
+                            Token(value=")"),
+                            Token(value="{"),
+                            Token(value="{"),
+                            Token(value="std"),
+                            Token(value="::"),
+                            Token(value="hash"),
+                            Token(value="<"),
+                            Token(value="T"),
+                            Token(value=">"),
+                            Token(value="{"),
+                            Token(value="}"),
+                            Token(value="("),
+                            Token(value="a"),
+                            Token(value=")"),
+                            Token(value="}"),
+                            Token(value="->"),
+                            Token(value="std"),
+                            Token(value="::"),
+                            Token(value="convertible_to"),
+                            Token(value="<"),
+                            Token(value="std"),
+                            Token(value="::"),
+                            Token(value="size_t"),
+                            Token(value=">"),
+                            Token(value=";"),
+                            Token(value="}"),
+                        ]
+                    ),
+                )
+            ],
+        )
+    )
+
+
+def test_concept_nested_requirements() -> None:
+    content = """
+      template<class T>
+      concept Semiregular = DefaultConstructible<T> &&
+          CopyConstructible<T> && CopyAssignable<T> && Destructible<T> &&
+      requires(T a, std::size_t n)
+      {
+          requires Same<T*, decltype(&a)>; // nested: "Same<...> evaluates to true"
+          { a.~T() } noexcept; // compound: "a.~T()" is a valid expression that doesn't throw
+          requires Same<T*, decltype(new T)>; // nested: "Same<...> evaluates to true"
+          requires Same<T*, decltype(new T[n])>; // nested
+          { delete new T }; // compound
+          { delete new T[n] }; // compound
+      };
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            concepts=[
+                Concept(
+                    template=TemplateDecl(
+                        params=[TemplateTypeParam(typekey="class", name="T")]
+                    ),
+                    name="Semiregular",
+                    raw_constraint=Value(
+                        tokens=[
+                            Token(value="DefaultConstructible"),
+                            Token(value="<"),
+                            Token(value="T"),
+                            Token(value=">"),
+                            Token(value="&&"),
+                            Token(value="CopyConstructible"),
+                            Token(value="<"),
+                            Token(value="T"),
+                            Token(value=">"),
+                            Token(value="&&"),
+                            Token(value="CopyAssignable"),
+                            Token(value="<"),
+                            Token(value="T"),
+                            Token(value=">"),
+                            Token(value="&&"),
+                            Token(value="Destructible"),
+                            Token(value="<"),
+                            Token(value="T"),
+                            Token(value=">"),
+                            Token(value="&&"),
+                            Token(value="requires"),
+                            Token(value="("),
+                            Token(value="T"),
+                            Token(value="a"),
+                            Token(value=","),
+                            Token(value="std"),
+                            Token(value="::"),
+                            Token(value="size_t"),
+                            Token(value="n"),
+                            Token(value=")"),
+                            Token(value="{"),
+                            Token(value="requires"),
+                            Token(value="Same"),
+                            Token(value="<"),
+                            Token(value="T"),
+                            Token(value="*"),
+                            Token(value=","),
+                            Token(value="decltype"),
+                            Token(value="("),
+                            Token(value="&"),
+                            Token(value="a"),
+                            Token(value=")"),
+                            Token(value=">"),
+                            Token(value=";"),
+                            Token(value="{"),
+                            Token(value="a"),
+                            Token(value="."),
+                            Token(value="~T"),
+                            Token(value="("),
+                            Token(value=")"),
+                            Token(value="}"),
+                            Token(value="noexcept"),
+                            Token(value=";"),
+                            Token(value="requires"),
+                            Token(value="Same"),
+                            Token(value="<"),
+                            Token(value="T"),
+                            Token(value="*"),
+                            Token(value=","),
+                            Token(value="decltype"),
+                            Token(value="("),
+                            Token(value="new"),
+                            Token(value="T"),
+                            Token(value=")"),
+                            Token(value=">"),
+                            Token(value=";"),
+                            Token(value="requires"),
+                            Token(value="Same"),
+                            Token(value="<"),
+                            Token(value="T"),
+                            Token(value="*"),
+                            Token(value=","),
+                            Token(value="decltype"),
+                            Token(value="("),
+                            Token(value="new"),
+                            Token(value="T"),
+                            Token(value="["),
+                            Token(value="n"),
+                            Token(value="]"),
+                            Token(value=")"),
+                            Token(value=">"),
+                            Token(value=";"),
+                            Token(value="{"),
+                            Token(value="delete"),
+                            Token(value="new"),
+                            Token(value="T"),
+                            Token(value="}"),
+                            Token(value=";"),
+                            Token(value="{"),
+                            Token(value="delete"),
+                            Token(value="new"),
+                            Token(value="T"),
+                            Token(value="["),
+                            Token(value="n"),
+                            Token(value="]"),
+                            Token(value="}"),
+                            Token(value=";"),
+                            Token(value="}"),
+                        ]
+                    ),
+                )
+            ]
+        )
+    )
+
+
+def test_concept_requires_class() -> None:
+    content = """
+      // clang-format off
+      template <typename T>
+      concept Number = std::integral<T> || std::floating_point<T>;
+
+      template <typename T>
+      requires Number<T>
+      struct WrappedNumber {};
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            classes=[
+                ClassScope(
+                    class_decl=ClassDecl(
+                        typename=PQName(
+                            segments=[NameSpecifier(name="WrappedNumber")],
+                            classkey="struct",
+                        ),
+                        template=TemplateDecl(
+                            params=[TemplateTypeParam(typekey="typename", name="T")],
+                            raw_requires_pre=Value(
+                                tokens=[
+                                    Token(value="Number"),
+                                    Token(value="<"),
+                                    Token(value="T"),
+                                    Token(value=">"),
+                                ]
+                            ),
+                        ),
+                    )
+                )
+            ],
+            concepts=[
+                Concept(
+                    template=TemplateDecl(
+                        params=[TemplateTypeParam(typekey="typename", name="T")]
+                    ),
+                    name="Number",
+                    raw_constraint=Value(
+                        tokens=[
+                            Token(value="std"),
+                            Token(value="::"),
+                            Token(value="integral"),
+                            Token(value="<"),
+                            Token(value="T"),
+                            Token(value=">"),
+                            Token(value="||"),
+                            Token(value="std"),
+                            Token(value="::"),
+                            Token(value="floating_point"),
+                            Token(value="<"),
+                            Token(value="T"),
+                            Token(value=">"),
+                        ]
+                    ),
+                )
+            ],
+        )
+    )
+
+
+def test_requires_last_elem() -> None:
+    content = """
+      template<typename T>
+      void f(T&&) requires Eq<T>;  // can appear as the last element of a function declarator
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            functions=[
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="void")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="f")]),
+                    parameters=[
+                        Parameter(
+                            type=MoveReference(
+                                moveref_to=Type(
+                                    typename=PQName(segments=[NameSpecifier(name="T")])
+                                )
+                            )
+                        )
+                    ],
+                    template=TemplateDecl(
+                        params=[TemplateTypeParam(typekey="typename", name="T")]
+                    ),
+                    raw_requires=Value(
+                        tokens=[
+                            Token(value="Eq"),
+                            Token(value="<"),
+                            Token(value="T"),
+                            Token(value=">"),
+                        ]
+                    ),
+                )
+            ]
+        )
+    )
+
+
+def test_requires_first_elem1() -> None:
+    content = """
+      template<typename T> requires Addable<T> // or right after a template parameter list
+      T add(T a, T b) { return a + b; }
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            functions=[
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[NameSpecifier(name="T")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="add")]),
+                    parameters=[
+                        Parameter(
+                            type=Type(
+                                typename=PQName(segments=[NameSpecifier(name="T")])
+                            ),
+                            name="a",
+                        ),
+                        Parameter(
+                            type=Type(
+                                typename=PQName(segments=[NameSpecifier(name="T")])
+                            ),
+                            name="b",
+                        ),
+                    ],
+                    has_body=True,
+                    template=TemplateDecl(
+                        params=[TemplateTypeParam(typekey="typename", name="T")],
+                        raw_requires_pre=Value(
+                            tokens=[
+                                Token(value="Addable"),
+                                Token(value="<"),
+                                Token(value="T"),
+                                Token(value=">"),
+                            ]
+                        ),
+                    ),
+                )
+            ]
+        )
+    )
+
+
+def test_requires_first_elem2() -> None:
+    content = """
+      template<typename T> requires std::is_arithmetic_v<T>
+      T add(T a, T b) { return a + b; }
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            functions=[
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[NameSpecifier(name="T")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="add")]),
+                    parameters=[
+                        Parameter(
+                            type=Type(
+                                typename=PQName(segments=[NameSpecifier(name="T")])
+                            ),
+                            name="a",
+                        ),
+                        Parameter(
+                            type=Type(
+                                typename=PQName(segments=[NameSpecifier(name="T")])
+                            ),
+                            name="b",
+                        ),
+                    ],
+                    has_body=True,
+                    template=TemplateDecl(
+                        params=[TemplateTypeParam(typekey="typename", name="T")],
+                        raw_requires_pre=Value(
+                            tokens=[
+                                Token(value="std"),
+                                Token(value="is_arithmetic_v"),
+                                Token(value="<"),
+                                Token(value="T"),
+                                Token(value=">"),
+                            ]
+                        ),
+                    ),
+                )
+            ]
+        )
+    )
+
+
+def test_requires_compound() -> None:
+    content = """
+      template<typename T> requires Addable<T> || Subtractable<T>
+      T add(T a, T b) { return a + b; }
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            functions=[
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[NameSpecifier(name="T")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="add")]),
+                    parameters=[
+                        Parameter(
+                            type=Type(
+                                typename=PQName(segments=[NameSpecifier(name="T")])
+                            ),
+                            name="a",
+                        ),
+                        Parameter(
+                            type=Type(
+                                typename=PQName(segments=[NameSpecifier(name="T")])
+                            ),
+                            name="b",
+                        ),
+                    ],
+                    has_body=True,
+                    template=TemplateDecl(
+                        params=[TemplateTypeParam(typekey="typename", name="T")],
+                        raw_requires_pre=Value(
+                            tokens=[
+                                Token(value="Addable"),
+                                Token(value="<"),
+                                Token(value="T"),
+                                Token(value=">"),
+                                Token(value="||"),
+                                Token(value="Subtractable"),
+                                Token(value="<"),
+                                Token(value="T"),
+                                Token(value=">"),
+                            ]
+                        ),
+                    ),
+                )
+            ]
+        )
+    )
+
+
+def test_requires_ad_hoc() -> None:
+    content = """
+      template<typename T>
+          requires requires (T x) { x + x; } // ad-hoc constraint, note keyword used twice
+      T add(T a, T b) { return a + b; }
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            functions=[
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[NameSpecifier(name="T")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="add")]),
+                    parameters=[
+                        Parameter(
+                            type=Type(
+                                typename=PQName(segments=[NameSpecifier(name="T")])
+                            ),
+                            name="a",
+                        ),
+                        Parameter(
+                            type=Type(
+                                typename=PQName(segments=[NameSpecifier(name="T")])
+                            ),
+                            name="b",
+                        ),
+                    ],
+                    has_body=True,
+                    template=TemplateDecl(
+                        params=[TemplateTypeParam(typekey="typename", name="T")],
+                        raw_requires_pre=Value(
+                            tokens=[
+                                Token(value="requires"),
+                                Token(value="("),
+                                Token(value="T"),
+                                Token(value="x"),
+                                Token(value=")"),
+                                Token(value="{"),
+                                Token(value="x"),
+                                Token(value="+"),
+                                Token(value="x"),
+                                Token(value=";"),
+                                Token(value="}"),
+                            ]
+                        ),
+                    ),
+                )
+            ]
+        )
+    )
+
+
+def test_requires_both() -> None:
+    content = """
+      // clang-format off
+      template<typename T>
+      requires Addable<T>
+      auto f1(T a, T b) requires Subtractable<T>;
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            functions=[
+                Function(
+                    return_type=Type(typename=PQName(segments=[AutoSpecifier()])),
+                    name=PQName(segments=[NameSpecifier(name="f1")]),
+                    parameters=[
+                        Parameter(
+                            type=Type(
+                                typename=PQName(segments=[NameSpecifier(name="T")])
+                            ),
+                            name="a",
+                        ),
+                        Parameter(
+                            type=Type(
+                                typename=PQName(segments=[NameSpecifier(name="T")])
+                            ),
+                            name="b",
+                        ),
+                    ],
+                    template=TemplateDecl(
+                        params=[TemplateTypeParam(typekey="typename", name="T")],
+                        raw_requires_pre=Value(
+                            tokens=[
+                                Token(value="Addable"),
+                                Token(value="<"),
+                                Token(value="T"),
+                                Token(value=">"),
+                            ]
+                        ),
+                    ),
+                    raw_requires=Value(
+                        tokens=[
+                            Token(value="Subtractable"),
+                            Token(value="<"),
+                            Token(value="T"),
+                            Token(value=">"),
+                        ]
+                    ),
+                )
+            ]
+        )
+    )
+
+
+def test_requires_paren() -> None:
+    content = """
+      // clang-format off
+      template<class T>
+      void h(T) requires (is_purrable<T>());
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            functions=[
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="void")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="h")]),
+                    parameters=[
+                        Parameter(
+                            type=Type(
+                                typename=PQName(segments=[NameSpecifier(name="T")])
+                            )
+                        )
+                    ],
+                    template=TemplateDecl(
+                        params=[TemplateTypeParam(typekey="class", name="T")]
+                    ),
+                    raw_requires=Value(
+                        tokens=[
+                            Token(value="("),
+                            Token(value="is_purrable"),
+                            Token(value="<"),
+                            Token(value="T"),
+                            Token(value=">"),
+                            Token(value="("),
+                            Token(value=")"),
+                            Token(value=")"),
+                        ]
+                    ),
+                )
+            ]
+        )
+    )
+
+
+def test_non_template_requires() -> None:
+    content = """
+      // clang-format off
+
+      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,
+                            raw_requires=Value(
+                                tokens=[
+                                    Token(value="("),
+                                    Token(value="std"),
+                                    Token(value="::"),
+                                    Token(value="is_pod_v"),
+                                    Token(value="<"),
+                                    Token(value="T"),
+                                    Token(value=">"),
+                                    Token(value=")"),
+                                ]
+                            ),
+                            access="public",
+                            constructor=True,
+                        )
+                    ],
+                )
+            ]
+        )
+    )

tests/test_constinit_consteval.py

@@ -0,0 +1,104 @@
+def test_constinit_consteval() -> None:
+    content = """
+      struct S
+      {
+          static constinit int i = 5;
+
+          static consteval int func(int i) { return i*i; }
+      };
+
+      template<std::size_t numBits>
+      consteval auto getUintType()
+      {
+          if constexpr (numBits == 8) {
+              return std::uint8_t{};
+          }
+          else if constexpr (numBits == 16) {
+              return std::uint16_t{};
+          }
+          else if constexpr (numBits == 32) {
+              return std::uint32_t{};
+          }
+          else if constexpr (numBits == 64) {
+              return std::uint64_t{};
+          }
+      }
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            classes=[
+                ClassScope(
+                    class_decl=ClassDecl(
+                        typename=PQName(
+                            segments=[NameSpecifier(name="S")], classkey="struct"
+                        )
+                    ),
+                    fields=[
+                        Field(
+                            access="public",
+                            type=Type(
+                                typename=PQName(
+                                    segments=[FundamentalSpecifier(name="int")]
+                                )
+                            ),
+                            name="i",
+                            value=Value(tokens=[Token(value="5")]),
+                            constinit=True,
+                            static=True,
+                        )
+                    ],
+                    methods=[
+                        Method(
+                            return_type=Type(
+                                typename=PQName(
+                                    segments=[FundamentalSpecifier(name="int")]
+                                )
+                            ),
+                            name=PQName(segments=[NameSpecifier(name="func")]),
+                            parameters=[
+                                Parameter(
+                                    type=Type(
+                                        typename=PQName(
+                                            segments=[FundamentalSpecifier(name="int")]
+                                        )
+                                    ),
+                                    name="i",
+                                )
+                            ],
+                            consteval=True,
+                            static=True,
+                            has_body=True,
+                            access="public",
+                        )
+                    ],
+                )
+            ],
+            functions=[
+                Function(
+                    return_type=Type(typename=PQName(segments=[AutoSpecifier()])),
+                    name=PQName(segments=[NameSpecifier(name="getUintType")]),
+                    parameters=[],
+                    consteval=True,
+                    has_body=True,
+                    template=TemplateDecl(
+                        params=[
+                            TemplateNonTypeParam(
+                                type=Type(
+                                    typename=PQName(
+                                        segments=[
+                                            NameSpecifier(name="std"),
+                                            NameSpecifier(name="size_t"),
+                                        ]
+                                    )
+                                ),
+                                name="numBits",
+                            )
+                        ]
+                    ),
+                )
+            ],
+        )
+    )
+

tests/test_doxygen.py

@@ -26,6 +26,7 @@ from cxxheaderparser.types import (
     Type,
     Typedef,
     UsingDecl,
+    UsingAlias,
     Value,
     Variable,
 )
@@ -436,3 +437,53 @@ def test_doxygen_attribute() -> None:
             ]
         )
     )
+
+
+def test_doxygen_using_decl() -> None:
+    content = """
+      // clang-format off
+
+      /// Comment
+      using ns::ClassName;
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            using=[
+                UsingDecl(
+                    typename=PQName(
+                        segments=[
+                            NameSpecifier(name="ns"),
+                            NameSpecifier(name="ClassName"),
+                        ]
+                    ),
+                    doxygen="/// Comment",
+                )
+            ]
+        )
+    )
+
+
+def test_doxygen_using_alias() -> None:
+    content = """
+      // clang-format off
+
+      /// Comment
+      using alias = sometype;
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            using_alias=[
+                UsingAlias(
+                    alias="alias",
+                    type=Type(
+                        typename=PQName(segments=[NameSpecifier(name="sometype")])
+                    ),
+                    doxygen="/// Comment",
+                )
+            ]
+        )
+    )

tests/test_fn.py

@@ -1194,3 +1194,67 @@ def test_auto_decltype_return() -> None:
             ]
         )
     )
+
+
+def test_fn_trailing_return_with_body() -> None:
+    content = """
+      auto test() -> void
+      {
+      }
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            functions=[
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="void")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="test")]),
+                    parameters=[],
+                    has_body=True,
+                    has_trailing_return=True,
+                )
+            ]
+        )
+    )
+
+
+def test_method_trailing_return_with_body() -> None:
+    content = """
+      struct X {
+          auto test() -> void
+          {
+          }
+      };
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            classes=[
+                ClassScope(
+                    class_decl=ClassDecl(
+                        typename=PQName(
+                            segments=[NameSpecifier(name="X")], classkey="struct"
+                        )
+                    ),
+                    methods=[
+                        Method(
+                            return_type=Type(
+                                typename=PQName(
+                                    segments=[FundamentalSpecifier(name="void")]
+                                )
+                            ),
+                            name=PQName(segments=[NameSpecifier(name="test")]),
+                            parameters=[],
+                            has_body=True,
+                            has_trailing_return=True,
+                            access="public",
+                        )
+                    ],
+                )
+            ]
+        )
+    )

tests/test_pointer_to_member.py

@@ -0,0 +1,188 @@
+def test_pointer_to_member() -> None:
+    content = """
+      class Class
+      {
+
+      };
+
+      int Class::* intPtr;
+      int (Class::* intReturnFuncPtr)();
+      void (Class::* intParamFuncPtr)(int);
+      void (Class::* varargFuncPtr)(...);
+
+      template<typename... TArgs>
+      int takesFunc(void (*func)(TArgs...));
+
+      template<typename TObject, typename... TArgs>
+      int takesMemberFunc(TObject& object, void (TObject::* func)(TArgs...));
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            classes=[
+                ClassScope(
+                    class_decl=ClassDecl(
+                        typename=PQName(
+                            segments=[NameSpecifier(name="Class")], classkey="class"
+                        )
+                    )
+                )
+            ],
+            functions=[
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="int")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="takesFunc")]),
+                    parameters=[
+                        Parameter(
+                            type=Pointer(
+                                ptr_to=FunctionType(
+                                    return_type=Type(
+                                        typename=PQName(
+                                            segments=[FundamentalSpecifier(name="void")]
+                                        )
+                                    ),
+                                    parameters=[
+                                        Parameter(
+                                            type=Type(
+                                                typename=PQName(
+                                                    segments=[
+                                                        NameSpecifier(name="TArgs")
+                                                    ]
+                                                )
+                                            ),
+                                            param_pack=True,
+                                        )
+                                    ],
+                                )
+                            ),
+                            name="func",
+                        )
+                    ],
+                    template=TemplateDecl(
+                        params=[
+                            TemplateTypeParam(
+                                typekey="typename", name="TArgs", param_pack=True
+                            )
+                        ]
+                    ),
+                ),
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="int")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="takesMemberFunc")]),
+                    parameters=[
+                        Parameter(
+                            type=Reference(
+                                ref_to=Type(
+                                    typename=PQName(
+                                        segments=[NameSpecifier(name="TObject")]
+                                    )
+                                )
+                            ),
+                            name="object",
+                        ),
+                        Parameter(
+                            type=PointerToMember(
+                                base_type=Type(typename=NameSpecifier(name="TObject")),
+                                ptr_to=FunctionType(
+                                    return_type=Type(
+                                        typename=PQName(
+                                            segments=[FundamentalSpecifier(name="void")]
+                                        )
+                                    ),
+                                    parameters=[
+                                        Parameter(
+                                            type=Type(
+                                                typename=PQName(
+                                                    segments=[
+                                                        NameSpecifier(name="TArgs")
+                                                    ]
+                                                )
+                                            ),
+                                            param_pack=True,
+                                        )
+                                    ],
+                                ),
+                            ),
+                            name="func",
+                        ),
+                    ],
+                    template=TemplateDecl(
+                        params=[
+                            TemplateTypeParam(typekey="typename", name="TObject"),
+                            TemplateTypeParam(
+                                typekey="typename", name="TArgs", param_pack=True
+                            ),
+                        ]
+                    ),
+                ),
+            ],
+            variables=[
+                Variable(
+                    name=PQName(segments=[NameSpecifier(name="intPtr")]),
+                    type=PointerToMember(
+                        base_type=Type(typename=NameSpecifier(name="Class")),
+                        ptr_to=Type(
+                            typename=PQName(segments=[FundamentalSpecifier(name="int")])
+                        ),
+                    ),
+                ),
+                Variable(
+                    name=PQName(segments=[NameSpecifier(name="intReturnFuncPtr")]),
+                    type=PointerToMember(
+                        base_type=Type(typename=NameSpecifier(name="Class")),
+                        ptr_to=FunctionType(
+                            return_type=Type(
+                                typename=PQName(
+                                    segments=[FundamentalSpecifier(name="int")]
+                                )
+                            ),
+                            parameters=[],
+                        ),
+                    ),
+                ),
+                Variable(
+                    name=PQName(segments=[NameSpecifier(name="intParamFuncPtr")]),
+                    type=PointerToMember(
+                        base_type=Type(typename=NameSpecifier(name="Class")),
+                        ptr_to=FunctionType(
+                            return_type=Type(
+                                typename=PQName(
+                                    segments=[FundamentalSpecifier(name="void")]
+                                )
+                            ),
+                            parameters=[
+                                Parameter(
+                                    type=Type(
+                                        typename=PQName(
+                                            segments=[FundamentalSpecifier(name="int")]
+                                        )
+                                    )
+                                )
+                            ],
+                        ),
+                    ),
+                ),
+                Variable(
+                    name=PQName(segments=[NameSpecifier(name="varargFuncPtr")]),
+                    type=PointerToMember(
+                        base_type=Type(typename=NameSpecifier(name="Class")),
+                        ptr_to=FunctionType(
+                            return_type=Type(
+                                typename=PQName(
+                                    segments=[FundamentalSpecifier(name="void")]
+                                )
+                            ),
+                            parameters=[],
+                            vararg=True,
+                        ),
+                    ),
+                ),
+            ],
+        )
+    )
+

tests/test_template.py

@@ -5,6 +5,7 @@ from cxxheaderparser.types import (
     BaseClass,
     ClassDecl,
     DecltypeSpecifier,
+    DeductionGuide,
     Field,
     ForwardDecl,
     Function,
@@ -2163,3 +2164,86 @@ def test_member_class_template_specialization() -> None:
             ]
         )
     )
+
+
+def test_template_deduction_guide() -> None:
+    content = """
+      template <class CharT, class Traits = std::char_traits<CharT>>
+      Error(std::basic_string_view<CharT, Traits>) -> Error<std::string>;
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            deduction_guides=[
+                DeductionGuide(
+                    result_type=Type(
+                        typename=PQName(
+                            segments=[
+                                NameSpecifier(
+                                    name="Error",
+                                    specialization=TemplateSpecialization(
+                                        args=[
+                                            TemplateArgument(
+                                                arg=Type(
+                                                    typename=PQName(
+                                                        segments=[
+                                                            NameSpecifier(name="std"),
+                                                            NameSpecifier(
+                                                                name="string"
+                                                            ),
+                                                        ]
+                                                    )
+                                                )
+                                            )
+                                        ]
+                                    ),
+                                )
+                            ]
+                        )
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="Error")]),
+                    parameters=[
+                        Parameter(
+                            type=Type(
+                                typename=PQName(
+                                    segments=[
+                                        NameSpecifier(name="std"),
+                                        NameSpecifier(
+                                            name="basic_string_view",
+                                            specialization=TemplateSpecialization(
+                                                args=[
+                                                    TemplateArgument(
+                                                        arg=Type(
+                                                            typename=PQName(
+                                                                segments=[
+                                                                    NameSpecifier(
+                                                                        name="CharT"
+                                                                    )
+                                                                ]
+                                                            )
+                                                        )
+                                                    ),
+                                                    TemplateArgument(
+                                                        arg=Type(
+                                                            typename=PQName(
+                                                                segments=[
+                                                                    NameSpecifier(
+                                                                        name="Traits"
+                                                                    )
+                                                                ]
+                                                            )
+                                                        )
+                                                    ),
+                                                ]
+                                            ),
+                                        ),
+                                    ]
+                                )
+                            )
+                        )
+                    ],
+                )
+            ]
+        )
+    )