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

Make querydb import more robust to usr changes

Browse Source
This commit is contained in:
Jacob Dufault 2017-05-08 18:21:21 -07:00
parent 5524abdaa7
commit 4efb4dbf25
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/query.cc
View File

@ -694,6 +694,13 @@ void QueryDatabase::ImportOrUpdate(const std::vector<QueryType::DefUpdate>& upda
auto it = usr_to_symbol.find(def.usr);
assert(it != usr_to_symbol.end());
if (it->second.kind != SymbolKind::Type) {
std::cerr << "!! Import/update got symbol kind " << (int)(it->second.kind) << ", expected SymbolKind::Type for usr " << def.usr << std::endl;
continue;
}
assert(it->second.idx >= 0 && it->second.idx < types.size());
optional<QueryType>& existing = types[it->second.idx];
if (!existing)
existing = QueryType(def.usr);
@ -716,6 +723,13 @@ void QueryDatabase::ImportOrUpdate(const std::vector<QueryFunc::DefUpdate>& upda
auto it = usr_to_symbol.find(def.usr);
assert(it != usr_to_symbol.end());
if (it->second.kind != SymbolKind::Func) {
std::cerr << "!! Import/update got symbol kind " << (int)(it->second.kind) << ", expected SymbolKind::Func for usr " << def.usr << std::endl;
continue;
}
assert(it->second.idx >= 0 && it->second.idx < funcs.size());
optional<QueryFunc>& existing = funcs[it->second.idx];
if (!existing)
existing = QueryFunc(def.usr);
@ -738,6 +752,13 @@ void QueryDatabase::ImportOrUpdate(const std::vector<QueryVar::DefUpdate>& updat
auto it = usr_to_symbol.find(def.usr);
assert(it != usr_to_symbol.end());
if (it->second.kind != SymbolKind::Var) {
std::cerr << "!! Import/update got symbol kind " << (int)(it->second.kind) << ", expected SymbolKind::Var for usr " << def.usr << std::endl;
continue;
}
assert(it->second.idx >= 0 && it->second.idx < vars.size());
optional<QueryVar>& existing = vars[it->second.idx];
if (!existing)
existing = QueryVar(def.usr);
@ -761,4 +782,4 @@ void QueryDatabase::UpdateDetailedNames(size_t* qualified_name_index, SymbolKind
else {
detailed_names[*qualified_name_index] = name;
}
}
}