jyapayne/cppast
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix parsing of explicit template instantiation

Browse source 
Fixes #82.
This commit is contained in:
Jonathan Müller 2019-11-18 17:10:22 +01:00
commit 000febb999
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libclang/class_parser.cpp
View file

@ -19,8 +19,11 @@ cpp_class_kind parse_class_kind(detail::cxtoken_stream& stream)
kind = clang_getCursorKind(stream.cursor()); kind = clang_getCursorKind(stream.cursor());
if (detail::skip_if(stream, "template")) if (detail::skip_if(stream, "template"))
{
// skip template parameters // skip template parameters
detail::skip_brackets(stream); if (!stream.done() && *stream.cur() == "<")
detail::skip_brackets(stream);
}
detail::skip_if(stream, "friend"); detail::skip_if(stream, "friend");

7
test/cpp_class_template.cpp
View file

@ -98,6 +98,11 @@ struct b<0, T> {};
/// template<> /// template<>
/// class a<int>; /// class a<int>;
extern template class a<int>; extern template class a<int>;
// non-extern template as well
/// template<>
/// class a<int>;
template class a<int>;
)"; )";
cpp_entity_index idx; cpp_entity_index idx;
@ -269,5 +274,5 @@ extern template class a<int>;
else else
REQUIRE(false); REQUIRE(false);
}); });
REQUIRE(count == 5u); REQUIRE(count == 6u);
} }