Register declarations as well

Will be overriden by definitions.
This commit is contained in:
Jonathan Müller 2017-03-18 11:01:27 +01:00
commit cb9ad57e87
21 changed files with 98 additions and 43 deletions

View file

@ -107,5 +107,5 @@ std::unique_ptr<cpp_entity> detail::parse_cpp_class(const detail::parse_context&
if (clang_isCursorDefinition(cur))
return builder.finish(*context.idx, get_entity_id(cur));
else
return builder.finish_declaration(get_entity_id(cur));
return builder.finish_declaration(*context.idx, get_entity_id(cur));
}

View file

@ -34,8 +34,9 @@ namespace
void detail::print_cursor_info(const CXCursor& cur) noexcept
{
std::lock_guard<std::mutex> lock(mtx);
std::printf("[debug] cursor '%s' (%s)\n", get_display_name(cur).c_str(),
cxstring(clang_getCursorKindSpelling(cur.kind)).c_str());
std::printf("[debug] cursor '%s' (%s): %s\n", get_display_name(cur).c_str(),
cxstring(clang_getCursorKindSpelling(cur.kind)).c_str(),
cxstring(clang_getCursorUSR(cur)).c_str());
}
void detail::print_tokens(const CXTranslationUnit& tu, const CXFile& file,

View file

@ -85,5 +85,5 @@ std::unique_ptr<cpp_entity> detail::parse_cpp_enum(const detail::parse_context&
if (clang_isCursorDefinition(cur))
return builder.finish(*context.idx, get_entity_id(cur));
else
return builder.finish_declaration(get_entity_id(cur));
return builder.finish_declaration(*context.idx, get_entity_id(cur));
}

View file

@ -176,7 +176,7 @@ namespace
DEBUG_ASSERT(allow_virtual, detail::parse_error_handler{}, stream.cursor(),
"unexpected token");
if (result.virtual_keywords)
result.virtual_keywords.value() &= cpp_virtual_flags::pure;
result.virtual_keywords.value() |= cpp_virtual_flags::pure;
else
result.virtual_keywords = cpp_virtual_flags::pure;
}