Skip to content

Correctly mark has_typename. #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 15, 2025
Merged

Correctly mark has_typename. #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15542dd
Correctly mark has_typename. Fixes #123
kdkavanagh Jul 15, 2025
6fc9fa1
Add test for #123
virtuald Jul 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cxxheaderparser/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,8 +607,9 @@ def _parse_template_decl(self) -> TemplateDecl:
lex.return_token(ptok)
param = self._parse_template_type_parameter(tok, None)
else:
lex.return_token(ptok)
param, _ = self._parse_parameter(
ptok,
tok,
TemplateNonTypeParam,
concept_ok=False,
deduce_this_ok=False,
Expand Down
66 changes: 58 additions & 8 deletions tests/test_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,8 @@ def test_template_dependent_nontype_default() -> None:
segments=[
NameSpecifier(name="T"),
NameSpecifier(name="type"),
]
],
has_typename=True,
)
),
name="n",
Expand Down Expand Up @@ -1098,7 +1099,7 @@ class concat_iterator
void_t<decltype(((*std::declval<P>()).*std::declval<F>())(std::declval<T>()...))>>
: std::true_type {};

template <typename T...>
template <typename... T>
struct S : public T... {};
"""
data = parse_string(content, cleandoc=True)
Expand Down Expand Up @@ -1636,12 +1637,9 @@ class concat_iterator
],
template=TemplateDecl(
params=[
TemplateNonTypeParam(
type=Type(
typename=PQName(
segments=[NameSpecifier(name="T")]
)
),
TemplateTypeParam(
typekey="typename",
name="T",
param_pack=True,
)
]
Expand Down Expand Up @@ -2417,3 +2415,55 @@ def test_deduction_sizeof_pack() -> None:
]
)
)


def test_template_has_typename() -> None:
content = """
template<typename T::Q value>
void func(typename V::U arg) {}
"""
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="func")]),
parameters=[
Parameter(
type=Type(
typename=PQName(
segments=[
NameSpecifier(name="V"),
NameSpecifier(name="U"),
],
has_typename=True,
)
),
name="arg",
)
],
has_body=True,
template=TemplateDecl(
params=[
TemplateNonTypeParam(
type=Type(
typename=PQName(
segments=[
NameSpecifier(name="T"),
NameSpecifier(name="Q"),
],
has_typename=True,
)
),
name="value",
)
]
),
)
]
)
)