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

Generation

Browse Source
This commit is contained in:
Fangrui Song 2018-02-03 18:34:07 -08:00
parent 0a721ff247
commit 985dec101d
3 changed files with 70 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/query.cc
View File

@ -373,6 +373,46 @@ void RemoveRangeWithGen(std::vector<WithGen<T>>* dest, const std::vector<T>& to_
dest->end());
}
void UpdateGen(QueryDatabase* db, WithGen<QueryFuncId>& ref) {
ref.gen = db->funcs[ref.value.id].gen;
}
void UpdateGen(QueryDatabase* db, WithGen<QueryTypeId>& ref) {
ref.gen = db->types[ref.value.id].gen;
}
void UpdateGen(QueryDatabase* db, WithGen<QueryVarId>& ref) {
ref.gen = db->vars[ref.value.id].gen;
}
template <typename T>
void UpdateGen(QueryDatabase* db, Maybe<T>& ref) {
if (ref)
UpdateGen(db, *ref);
}
template <typename T>
void UpdateGen(QueryDatabase* db, std::vector<T>& ref) {
for (T& x : ref)
UpdateGen(db, x);
}
void UpdateGen(QueryDatabase* db, QueryFunc::Def& def) {
UpdateGen(db, def.declaring_type);
UpdateGen(db, def.base);
UpdateGen(db, def.locals);
}
void UpdateGen(QueryDatabase* db, QueryType::Def& def) {
UpdateGen(db, def.alias_of);
UpdateGen(db, def.parents);
UpdateGen(db, def.funcs);
UpdateGen(db, def.types);
UpdateGen(db, def.vars);
}
void UpdateGen(QueryDatabase* db, QueryVar::Def& def) {
UpdateGen(db, def.variable_type);
}
} // namespace
template <>
@ -769,6 +809,7 @@ void QueryDatabase::RemoveUsrs(SymbolKind usr_kind,
if (type.symbol_idx)
symbols[type.symbol_idx->id].kind = SymbolKind::Invalid;
type.gen++;
//type.def = QueryType::Def();
type.def = nullopt;
}
break;
@ -779,6 +820,7 @@ void QueryDatabase::RemoveUsrs(SymbolKind usr_kind,
if (func.symbol_idx)
symbols[func.symbol_idx->id].kind = SymbolKind::Invalid;
func.gen++;
//func.def = QueryFunc::Def();
func.def = nullopt;
}
break;
@ -789,6 +831,7 @@ void QueryDatabase::RemoveUsrs(SymbolKind usr_kind,
if (var.symbol_idx)
symbols[var.symbol_idx->id].kind = SymbolKind::Invalid;
var.gen++;
//var.def = QueryVar::Def();
var.def = nullopt;
}
break;
@ -820,6 +863,7 @@ void QueryDatabase::ApplyIndexUpdate(IndexUpdate* update) {
AddRangeWithGen(&def.def_var_name, merge_update.to_add, def.gen); \
RemoveRangeWithGen(&def.def_var_name, merge_update.to_remove); \
VerifyUnique(def.def_var_name); \
UpdateGen(this, def.def_var_name); \
}
for (const std::string& filename : update->files_removed)
@ -876,13 +920,13 @@ void QueryDatabase::ImportOrUpdate(
QueryType& existing = types[it->second.id];
// Keep the existing definition if it is higher quality.
if (existing.def && existing.def->definition_spelling &&
!def.value.definition_spelling)
continue;
existing.def = def.value;
UpdateSymbols(&existing.symbol_idx, SymbolKind::Type,
it->second.id);
if (!(existing.def && existing.def->definition_spelling &&
!def.value.definition_spelling)) {
existing.def = def.value;
UpdateSymbols(&existing.symbol_idx, SymbolKind::Type,
it->second.id);
}
UpdateGen(this, *existing.def);
}
}
@ -900,13 +944,13 @@ void QueryDatabase::ImportOrUpdate(
QueryFunc& existing = funcs[it->second.id];
// Keep the existing definition if it is higher quality.
if (existing.def && existing.def->definition_spelling &&
!def.value.definition_spelling)
continue;
existing.def = def.value;
UpdateSymbols(&existing.symbol_idx, SymbolKind::Func,
it->second.id);
if (!(existing.def && existing.def->definition_spelling &&
!def.value.definition_spelling)) {
existing.def = def.value;
UpdateSymbols(&existing.symbol_idx, SymbolKind::Func,
it->second.id);
}
UpdateGen(this, *existing.def);
}
}
@ -924,14 +968,14 @@ void QueryDatabase::ImportOrUpdate(
QueryVar& existing = vars[it->second.id];
// Keep the existing definition if it is higher quality.
if (existing.def && existing.def->definition_spelling &&
!def.value.definition_spelling)
continue;
existing.def = def.value;
if (!def.value.is_local())
UpdateSymbols(&existing.symbol_idx, SymbolKind::Var,
it->second.id);
if (!(existing.def && existing.def->definition_spelling &&
!def.value.definition_spelling)) {
existing.def = def.value;
if (!def.value.is_local())
UpdateSymbols(&existing.symbol_idx, SymbolKind::Var,
it->second.id);
}
UpdateGen(this, *existing.def);
}
}
@ -994,6 +1038,7 @@ std::string_view QueryDatabase::GetSymbolShortName(RawId symbol_idx) const {
return "";
}
TEST_SUITE("query") {
IndexUpdate GetDelta(IndexFile previous, IndexFile current) {
QueryDatabase db;

12
src/query.h
View File

@ -478,18 +478,6 @@ struct IdMap {
QueryFuncRef ToQuery(IndexFuncRef ref) const;
QueryLocation ToQuery(IndexFunc::Declaration decl) const;
template <typename I>
optional<typename IndexToQuery<I>::type> ToQuery(optional<I> id) const {
if (!id)
return nullopt;
return ToQuery(*id);
}
template <typename I>
optional<WithGen<typename IndexToQuery<I>::type>> ToQuery(optional<I> id, int) const {
if (!id)
return nullopt;
return ToQuery(*id, 0);
}
template <typename I>
Maybe<typename IndexToQuery<I>::type> ToQuery(Maybe<I> id) const {
if (!id)
return nullopt;

5
src/query_utils.h
View File

@ -77,7 +77,8 @@ template <typename Q>
void EachWithGen(std::vector<Q>& collection, WithGen<Id<Q>> x, std::function<void(Q&)> fn) {
Q& obj = collection[x.value.id];
// FIXME Deprecate optional<Def> def
if (obj.gen == x.gen && obj.def)
// if (obj.gen == x.gen && obj.def)
if (obj.def)
fn(obj);
}
@ -86,7 +87,7 @@ void EachWithGen(std::vector<Q>& collection, std::vector<WithGen<Id<Q>>>& ids, s
size_t j = 0;
for (WithGen<Id<Q>> x : ids) {
Q& obj = collection[x.value.id];
if (obj.gen == x.gen) {
if (1 /*obj.gen == x.gen*/) {
if (obj.def) // FIXME Deprecate optional<Def> def
fn(obj);
ids[j++] = x;