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

Fix parsing of default value

Browse source 
It is now always unexposed, but works better.
This commit is contained in:
Jonathan Müller 2017-03-30 13:11:21 +02:00
commit 9a0ac36715
12 changed files with 99 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/libclang/variable_parser.cpp
View file

@ -12,29 +12,38 @@
using namespace cppast;
namespace
std::unique_ptr<cpp_expression> detail::parse_default_value(const detail::parse_context& context,
const CXCursor& cur, const char* name)
{
std::unique_ptr<cpp_expression> parse_default_value(const detail::parse_context& context,
const CXCursor& cur, bool uses_decltype)
{
std::unique_ptr<cpp_expression> expression;
detail::visit_children(cur, [&](const CXCursor& child) {
if (clang_isDeclaration(clang_getCursorKind(child)))
return;
else if (uses_decltype)
// skip first expression, belongs to the decltype
uses_decltype = false;
else
{
DEBUG_ASSERT(!expression && clang_isExpression(child.kind),
detail::parse_error_handler{}, cur,
"unexpected child cursor of variable");
detail::tokenizer tokenizer(context.tu, context.file, cur);
detail::token_stream stream(tokenizer, cur);
expression = detail::parse_expression(context, child);
}
});
return expression;
auto has_default = false;
auto got_name = *name == '\0';
for (auto paren_count = 0; !stream.done();)
{
if (detail::skip_if(stream, "("))
++paren_count;
else if (detail::skip_if(stream, ")"))
--paren_count;
else if (!got_name && detail::skip_if(stream, name))
got_name = true;
else if (paren_count == 0 && got_name && detail::skip_if(stream, "="))
{
// heuristic: we're outside of parens, the name was already encountered
// and we have an equal sign -> treat this as default value
// (yes this breaks for evil types)
has_default = true;
break;
}
else
stream.bump();
}
if (has_default)
return parse_raw_expression(context, stream, stream.end(),
parse_type(context, cur, clang_getCursorType(cur)));
else
return nullptr;
}
std::unique_ptr<cpp_entity> detail::parse_cpp_variable(const detail::parse_context& context,
@ -46,7 +55,6 @@ std::unique_ptr<cpp_entity> detail::parse_cpp_variable(const detail::parse_conte
auto type = parse_type(context, cur, clang_getCursorType(cur));
auto storage_class = get_storage_class(cur);
auto is_constexpr = false;
auto uses_decltype = false;
// just look for thread local or constexpr
// can't appear anywhere else, so good enough
@ -57,13 +65,11 @@ std::unique_ptr<cpp_entity> detail::parse_cpp_variable(const detail::parse_conte
cpp_storage_class_specifiers(storage_class | cpp_storage_class_thread_local);
else if (token.value() == "constexpr")
is_constexpr = true;
else if (token.value() == "decltype")
uses_decltype = true;
std::unique_ptr<cpp_variable> result;
if (clang_isCursorDefinition(cur))
{
auto default_value = parse_default_value(context, cur, uses_decltype);
auto default_value = parse_default_value(context, cur, name.c_str());
result =
cpp_variable::build(*context.idx, get_entity_id(cur), name.c_str(), std::move(type),
std::move(default_value), storage_class, is_constexpr);
@ -97,17 +103,7 @@ std::unique_ptr<cpp_entity> detail::parse_cpp_member_variable(const detail::pars
}
else
{
// parse_default_value() doesn't work here
tokenizer tokenizer(context.tu, context.file, cur);
token_stream stream(tokenizer, cur);
// look for the equal sign, default value starts there
while (!stream.done() && !skip_if(stream, "="))
stream.bump();
auto default_value =
parse_raw_expression(context, stream, stream.end(),
parse_type(context, cur, clang_getCursorType(cur)));
auto default_value = parse_default_value(context, cur, name.c_str());
result = cpp_member_variable::build(*context.idx, get_entity_id(cur), name.c_str(),
std::move(type), std::move(default_value), is_mutable);
}