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

Fix virtual inheritance parsing (#137)

Browse source
This commit is contained in:
Bartek Kryza 2022-04-17 19:14:08 +02:00 • committed by GitHub
commit 19cbc378f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libclang/class_parser.cpp
View file

@ -98,11 +98,22 @@ void add_base_class(cpp_class::builder& builder, const detail::parse_context& co
detail::cxtoken_stream stream(tokenizer, cur); detail::cxtoken_stream stream(tokenizer, cur);
// [<attribute>] [virtual] [<access>] <name> // [<attribute>] [virtual] [<access>] <name>
// or
// [<attribute>] [<access>] [virtual] <name>
// can't use spelling to get the name // can't use spelling to get the name
auto attributes = detail::parse_attributes(stream); auto attributes = detail::parse_attributes(stream);
if (is_virtual) if (is_virtual)
detail::skip(stream, "virtual"); {
detail::skip_if(stream, to_string(access)); if (detail::skip_if(stream, "virtual"))
detail::skip_if(stream, to_string(access));
else
{
detail::skip_if(stream, to_string(access));
detail::skip(stream, "virtual");
}
}
else
detail::skip_if(stream, to_string(access));
auto name = detail::to_string(stream, stream.end()).as_string(); auto name = detail::to_string(stream, stream.end()).as_string();

11
test/cpp_class.cpp
View file

@ -84,6 +84,13 @@ struct f
: public ns::base, virtual protected e : public ns::base, virtual protected e
{}; {};
/// struct f2
/// :ns::base,virtual protected e{
/// };
struct f2
: public ns::base, protected virtual e
{};
using namespace ns; using namespace ns;
/// struct g /// struct g
@ -234,7 +241,7 @@ struct g
} }
REQUIRE(no_bases == 2u); REQUIRE(no_bases == 2u);
} }
else if (c.name() == "f") else if (c.name() == "f" || c.name() == "f2")
{ {
REQUIRE(c.is_definition()); REQUIRE(c.is_definition());
REQUIRE(!c.is_declaration()); REQUIRE(!c.is_declaration());
@ -298,5 +305,5 @@ struct g
else else
REQUIRE(false); REQUIRE(false);
}); });
REQUIRE(count == 12u); REQUIRE(count == 13u);
} }