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

Add support for forward declarations

Browse source
This commit is contained in:
Jonathan Müller 2017-03-11 15:36:51 +01:00
commit 210fcf2c36
12 changed files with 332 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

45
test/cpp_class.cpp
View file

@ -11,13 +11,16 @@ using namespace cppast;
TEST_CASE("cpp_class")
{
auto code = R"(
// forward declarations
struct a;
class b;
struct unresolved;
// basic
struct a {};
class b final {};
union c {};
struct ignore_me;
// members
struct d
{
@ -62,16 +65,42 @@ struct g
REQUIRE(!c.is_final());
REQUIRE(c.bases().begin() == c.bases().end());
REQUIRE(c.begin() == c.end());
auto definition = get_definition(idx, c);
REQUIRE(definition);
REQUIRE(definition.value().name() == c.name());
}
else if (c.name() == "b")
{
REQUIRE(c.class_kind() == cpp_class_kind::class_t);
REQUIRE(c.is_final());
REQUIRE(c.bases().begin() == c.bases().end());
REQUIRE(c.begin() == c.end());
if (c.is_definition())
REQUIRE(c.is_final());
else
REQUIRE(c.is_declaration());
auto definition = get_definition(idx, c);
REQUIRE(definition);
REQUIRE(definition.value().name() == "b");
}
else if (c.name() == "unresolved")
{
REQUIRE(c.is_declaration());
REQUIRE(!c.is_definition());
REQUIRE(c.class_kind() == cpp_class_kind::struct_t);
REQUIRE(!c.is_final());
REQUIRE(c.bases().begin() == c.bases().end());
REQUIRE(c.begin() == c.end());
auto definition = get_definition(idx, c);
REQUIRE(!definition);
}
else if (c.name() == "c")
{
REQUIRE(c.is_definition());
REQUIRE(!c.is_declaration());
REQUIRE(c.class_kind() == cpp_class_kind::union_t);
REQUIRE(!c.is_final());
REQUIRE(c.bases().begin() == c.bases().end());
@ -79,6 +108,8 @@ struct g
}
else if (c.name() == "d")
{
REQUIRE(c.is_definition());
REQUIRE(!c.is_declaration());
REQUIRE(c.class_kind() == cpp_class_kind::struct_t);
REQUIRE(!c.is_final());
REQUIRE(c.bases().begin() == c.bases().end());
@ -133,6 +164,8 @@ struct g
}
else if (c.name() == "e")
{
REQUIRE(c.is_definition());
REQUIRE(!c.is_declaration());
REQUIRE(c.class_kind() == cpp_class_kind::class_t);
REQUIRE(!c.is_final());
REQUIRE(c.begin() == c.end());
@ -166,6 +199,8 @@ struct g
}
else if (c.name() == "f")
{
REQUIRE(c.is_definition());
REQUIRE(!c.is_declaration());
REQUIRE(c.class_kind() == cpp_class_kind::struct_t);
REQUIRE(!c.is_final());
REQUIRE(c.begin() == c.end());
@ -200,6 +235,8 @@ struct g
}
else if (c.name() == "g")
{
REQUIRE(c.is_definition());
REQUIRE(!c.is_declaration());
REQUIRE(c.class_kind() == cpp_class_kind::struct_t);
REQUIRE(!c.is_final());
REQUIRE(c.begin() == c.end());
@ -226,5 +263,5 @@ struct g
else
REQUIRE(false);
});
REQUIRE(count == 8u);
REQUIRE(count == 11u);
}

77
test/cpp_enum.cpp
View file

@ -11,8 +11,6 @@ using namespace cppast;
TEST_CASE("cpp_enum")
{
auto code = R"(
enum ignore_me : int;
enum a
{
a_a,
@ -21,7 +19,7 @@ enum a
a_d = a_a + 2,
};
enum class ignore_me2;
enum class b; // forward declaration
enum class b : int
{
@ -30,6 +28,7 @@ enum class b : int
b_c
};
enum c : int;
)";
cpp_entity_index idx;
@ -37,6 +36,8 @@ enum class b : int
auto count = test_visit<cpp_enum>(*file, [&](const cpp_enum& e) {
if (e.name() == "a")
{
REQUIRE(e.is_definition());
REQUIRE(!e.is_declaration());
REQUIRE(!e.is_scoped());
REQUIRE(!e.underlying_type());
@ -79,34 +80,62 @@ enum class b : int
else if (e.name() == "b")
{
REQUIRE(e.is_scoped());
REQUIRE(e.underlying_type());
REQUIRE(equal_types(idx, e.underlying_type().value(), *cpp_builtin_type::build("int")));
auto no_vals = 0u;
for (auto& val : e)
if (e.is_definition())
{
REQUIRE(full_name(val) == "b::" + val.name());
if (val.name() == "b_a" || val.name() == "b_c")
REQUIRE(e.underlying_type());
REQUIRE(
equal_types(idx, e.underlying_type().value(), *cpp_builtin_type::build("int")));
auto no_vals = 0u;
for (auto& val : e)
{
++no_vals;
REQUIRE(!val.value());
REQUIRE(full_name(val) == "b::" + val.name());
if (val.name() == "b_a" || val.name() == "b_c")
{
++no_vals;
REQUIRE(!val.value());
}
else if (val.name() == "b_b")
{
++no_vals;
REQUIRE(val.value());
auto& expr = val.value().value();
REQUIRE(expr.kind() == cpp_expression_kind::literal);
REQUIRE(static_cast<const cpp_literal_expression&>(expr).value() == "42");
REQUIRE(equal_types(idx, expr.type(), *cpp_builtin_type::build("int")));
}
else
REQUIRE(false);
}
else if (val.name() == "b_b")
{
++no_vals;
REQUIRE(val.value());
auto& expr = val.value().value();
REQUIRE(expr.kind() == cpp_expression_kind::literal);
REQUIRE(static_cast<const cpp_literal_expression&>(expr).value() == "42");
REQUIRE(equal_types(idx, expr.type(), *cpp_builtin_type::build("int")));
}
else
REQUIRE(false);
REQUIRE(no_vals == 3u);
}
REQUIRE(no_vals == 3u);
else if (e.is_declaration())
{
REQUIRE(!e.underlying_type()); // no underlying type, implicit int
REQUIRE(count_children(e) == 0u);
auto definition = get_definition(idx, e);
REQUIRE(definition);
REQUIRE(definition.value().name() == "b");
REQUIRE(count_children(definition.value()) == 3u);
}
else
REQUIRE(false);
}
else if (e.name() == "c")
{
REQUIRE(e.is_declaration());
REQUIRE(!e.is_definition());
REQUIRE(!e.is_scoped());
REQUIRE(equal_types(idx, e.underlying_type().value(), *cpp_builtin_type::build("int")));
REQUIRE(count_children(e) == 0u);
auto definition = get_definition(idx, e);
REQUIRE(!definition);
}
else
REQUIRE(false);
});
REQUIRE(count == 2u);
REQUIRE(count == 4u);
}

39
test/cpp_variable.cpp
View file

@ -35,7 +35,18 @@ static struct {} l;
cpp_entity_index idx;
auto check_variable = [&](const cpp_variable& var, const cpp_type& type,
type_safe::optional_ref<const cpp_expression> default_value,
int storage_class, bool is_constexpr) {
int storage_class, bool is_constexpr, bool is_declaration) {
if (is_declaration)
{
REQUIRE(var.is_declaration());
REQUIRE(!var.is_definition());
}
else
{
REQUIRE(var.is_definition());
REQUIRE(!var.is_declaration());
}
REQUIRE(equal_types(idx, var.type(), type));
if (var.default_value())
{
@ -54,35 +65,35 @@ static struct {} l;
auto int_type = cpp_builtin_type::build("int");
auto count = test_visit<cpp_variable>(*file, [&](const cpp_variable& var) {
if (var.name() == "a")
check_variable(var, *int_type, nullptr, cpp_storage_class_none, false);
check_variable(var, *int_type, nullptr, cpp_storage_class_none, false, false);
else if (var.name() == "b")
check_variable(var, *cpp_builtin_type::build("unsigned long long"),
// unexposed due to implicit cast, I think
*cpp_unexposed_expression::build(cpp_builtin_type::build("int"), "42"),
cpp_storage_class_none, false);
cpp_storage_class_none, false, false);
else if (var.name() == "c")
check_variable(var, *cpp_builtin_type::build("float"),
*cpp_unexposed_expression::build(cpp_builtin_type::build("float"),
"3.f+0.14f"),
cpp_storage_class_none, false);
cpp_storage_class_none, false, false);
else if (var.name() == "d")
check_variable(var, *int_type, nullptr, cpp_storage_class_extern, false);
check_variable(var, *int_type, nullptr, cpp_storage_class_extern, false, true);
else if (var.name() == "e")
check_variable(var, *int_type, nullptr, cpp_storage_class_static, false);
check_variable(var, *int_type, nullptr, cpp_storage_class_static, false, false);
else if (var.name() == "f")
check_variable(var, *int_type, nullptr, cpp_storage_class_thread_local, false);
check_variable(var, *int_type, nullptr, cpp_storage_class_thread_local, false, false);
else if (var.name() == "g")
check_variable(var, *int_type, nullptr,
cpp_storage_class_static | cpp_storage_class_thread_local, false);
cpp_storage_class_static | cpp_storage_class_thread_local, false, false);
else if (var.name() == "h")
check_variable(var, *cpp_cv_qualified_type::build(cpp_builtin_type::build("int"),
cpp_cv_const),
*cpp_literal_expression::build(cpp_builtin_type::build("int"), "12"),
cpp_storage_class_none, true);
cpp_storage_class_none, true, false);
else if (var.name() == "i")
check_variable(var,
*cpp_user_defined_type::build(cpp_type_ref(cpp_entity_id(""), "foo")),
nullptr, cpp_storage_class_none, false);
nullptr, cpp_storage_class_none, false, false);
else if (var.name() == "j")
check_variable(var, *cpp_cv_qualified_type::build(cpp_user_defined_type::build(
cpp_type_ref(cpp_entity_id(""),
@ -92,7 +103,7 @@ static struct {} l;
cpp_type_ref(cpp_entity_id(""),
"bar")),
"bar()"),
cpp_storage_class_none, false);
cpp_storage_class_none, false, false);
else if (var.name() == "k")
check_variable(var,
*cpp_user_defined_type::build(cpp_type_ref(cpp_entity_id(""), "baz")),
@ -100,10 +111,10 @@ static struct {} l;
cpp_type_ref(cpp_entity_id(""),
"baz")),
"{}"),
cpp_storage_class_none, false);
cpp_storage_class_none, false, false);
else if (var.name() == "l")
check_variable(var, *cpp_user_defined_type::build(cpp_type_ref(cpp_entity_id(""), "")),
nullptr, cpp_storage_class_static, false);
nullptr, cpp_storage_class_static, false, false);
else
REQUIRE(false);
});
@ -123,6 +134,8 @@ struct test
auto file = parse({}, "static_cpp_variable.cpp", code);
auto count = test_visit<cpp_variable>(*file, [&](const cpp_variable& var) {
REQUIRE(var.is_declaration());
REQUIRE(!var.is_definition());
REQUIRE(!var.default_value());
REQUIRE(!var.is_constexpr());
REQUIRE(is_static(var.storage_class()));