Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-29 11:01:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

misc cleanup

Browse Source
This commit is contained in:
Jacob Dufault 2017-02-26 23:32:10 -08:00
parent c1db1766c9
commit 7192db6e32
2 changed files with 47 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
indexer.cpp
View File

@ -103,6 +103,48 @@ void IndexedTypeDef::AddUsage(Location loc, bool insert_if_not_present) {
uses.push_back(loc); uses.push_back(loc);
} }
IdCache::IdCache() {
// Reserve id 0 for unfound.
file_path_to_file_id[""] = FileId(0);
file_id_to_file_path[FileId(0)] = "";
}
Location IdCache::Resolve(const CXSourceLocation& cx_loc, bool interesting) {
CXFile file;
unsigned int line, column, offset;
clang_getSpellingLocation(cx_loc, &file, &line, &column, &offset);
FileId file_id(-1);
if (file != nullptr) {
std::string path = clang::ToString(clang_getFileName(file));
auto it = file_path_to_file_id.find(path);
if (it != file_path_to_file_id.end()) {
file_id = it->second;
}
else {
file_id = FileId(file_path_to_file_id.size());
file_path_to_file_id[path] = file_id;
file_id_to_file_path[file_id] = path;
}
}
return Location(interesting, file_id, line, column);
}
Location IdCache::Resolve(const CXIdxLoc& cx_idx_loc, bool interesting) {
CXSourceLocation cx_loc = clang_indexLoc_getCXSourceLocation(cx_idx_loc);
return Resolve(cx_loc, interesting);
}
Location IdCache::Resolve(const CXCursor& cx_cursor, bool interesting) {
return Resolve(clang_getCursorLocation(cx_cursor), interesting);
}
Location IdCache::Resolve(const clang::Cursor& cursor, bool interesting) {
return Resolve(cursor.cx_cursor, interesting);
}
template<typename T> template<typename T>
bool Contains(const std::vector<T>& vec, const T& element) { bool Contains(const std::vector<T>& vec, const T& element) {

48
indexer.h
View File

@ -465,48 +465,11 @@ struct IdCache {
std::unordered_map<FuncId, std::string> func_id_to_usr; std::unordered_map<FuncId, std::string> func_id_to_usr;
std::unordered_map<VarId, std::string> var_id_to_usr; std::unordered_map<VarId, std::string> var_id_to_usr;
IdCache() { IdCache();
// Reserve id 0 for unfound. Location Resolve(const CXSourceLocation& cx_loc, bool interesting);
file_path_to_file_id[""] = FileId(0); Location Resolve(const CXIdxLoc& cx_idx_loc, bool interesting);
file_id_to_file_path[FileId(0)] = ""; Location Resolve(const CXCursor& cx_cursor, bool interesting);
} Location Resolve(const clang::Cursor& cursor, bool interesting);
Location Resolve(const CXSourceLocation& cx_loc, bool interesting) {
CXFile file;
unsigned int line, column, offset;
clang_getSpellingLocation(cx_loc, &file, &line, &column, &offset);
FileId file_id(-1);
if (file != nullptr) {
std::string path = clang::ToString(clang_getFileName(file));
auto it = file_path_to_file_id.find(path);
if (it != file_path_to_file_id.end()) {
file_id = it->second;
}
else {
file_id = FileId(file_path_to_file_id.size());
file_path_to_file_id[path] = file_id;
file_id_to_file_path[file_id] = path;
}
}
return Location(interesting, file_id, line, column);
}
Location Resolve(const CXIdxLoc& cx_idx_loc, bool interesting) {
CXSourceLocation cx_loc = clang_indexLoc_getCXSourceLocation(cx_idx_loc);
return Resolve(cx_loc, interesting);
}
Location Resolve(const CXCursor& cx_cursor, bool interesting) {
return Resolve(clang_getCursorLocation(cx_cursor), interesting);
}
Location Resolve(const clang::Cursor& cursor, bool interesting) {
return Resolve(cursor.cx_cursor, interesting);
}
}; };
struct IndexedFile { struct IndexedFile {
@ -526,7 +489,6 @@ struct IndexedFile {
TypeId ToTypeId(const CXCursor& usr); TypeId ToTypeId(const CXCursor& usr);
FuncId ToFuncId(const CXCursor& usr); FuncId ToFuncId(const CXCursor& usr);
VarId ToVarId(const CXCursor& usr); VarId ToVarId(const CXCursor& usr);
IndexedTypeDef* Resolve(TypeId id); IndexedTypeDef* Resolve(TypeId id);
IndexedFuncDef* Resolve(FuncId id); IndexedFuncDef* Resolve(FuncId id);
IndexedVarDef* Resolve(VarId id); IndexedVarDef* Resolve(VarId id);