zalox
/
jucipp
mirror of https://gitlab.com/cppit/jucipp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Get correct cursor parent when finding debug value from expression

pipelines/235045657
eidheim 5 years ago
parent
41bead3e50
commit
92b76420d2
1 changed files with 10 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      src/source_clang.cpp

15
src/source_clang.cpp
Unescape View File

@ -628,21 +628,24 @@ void Source::ClangViewParse::show_type_tooltips(const Gdk::Rectangle &rectangle)
*start == '%' || *start == '&' || *start == '|' || *start == '^' || *start == '%' || *start == '&' || *start == '|' || *start == '^' ||
*end == '('))) { *end == '('))) {
struct VisitorData { struct VisitorData {
std::pair<clangmm::Offset, clangmm::Offset> cursor_offsets; std::pair<clangmm::Offset, clangmm::Offset> offsets;
clangmm::Cursor parent; std::string spelling;
clangmm::Cursor parent; // Output
}; };
VisitorData visitor_data{cursor.get_source_range().get_offsets(), {}}; VisitorData visitor_data{cursor.get_source_range().get_offsets(), cursor.get_spelling(), {}};
auto start_cursor = cursor; auto start_cursor = cursor;
for(auto parent = cursor.get_semantic_parent(); parent.get_kind() != clangmm::Cursor::Kind::TranslationUnit && for(auto parent = cursor.get_semantic_parent(); parent.get_kind() != clangmm::Cursor::Kind::TranslationUnit &&
parent.get_kind() != clangmm::Cursor::Kind::ClassDecl; parent = parent.get_semantic_parent()) parent.get_kind() != clangmm::Cursor::Kind::ClassDecl; parent = parent.get_semantic_parent())
start_cursor = parent; start_cursor = parent;
clang_visitChildren(start_cursor.cx_cursor, [](CXCursor cx_cursor, CXCursor cx_parent, CXClientData data_) { clang_visitChildren(start_cursor.cx_cursor, [](CXCursor cx_cursor, CXCursor cx_parent, CXClientData data_) {
auto data = static_cast<VisitorData *>(data_); auto data = static_cast<VisitorData *>(data_);
auto offsets = clangmm::Cursor(cx_cursor).get_source_range().get_offsets(); if(clangmm::Cursor(cx_cursor).get_source_range().get_offsets() == data->offsets) {
if(offsets == data->cursor_offsets) { auto parent = clangmm::Cursor(cx_parent);
data->parent = clangmm::Cursor(cx_parent); if(parent.get_spelling() == data->spelling) {
data->parent = parent;
return CXChildVisit_Break; return CXChildVisit_Break;
} }
}
return CXChildVisit_Recurse; return CXChildVisit_Recurse;
}, &visitor_data); }, &visitor_data);
if(visitor_data.parent) if(visitor_data.parent)

Write Preview
Loading…
Cancel
Save