Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-01-19 12:05:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add asserts

Browse Source
This commit is contained in:
Jacob Dufault 2017-03-29 00:00:53 -07:00
parent aef8e9267f
commit 843a86a4a9
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/language_server_api.cc
View File

@ -122,7 +122,7 @@ void lsDocumentUri::SetPath(const std::string& path) {
raw_uri = path; raw_uri = path;
size_t index = raw_uri.find(":"); size_t index = raw_uri.find(":");
if (index != -1) { if (index == 1) { // widows drive letters must always be 1 char
raw_uri.replace(raw_uri.begin() + index, raw_uri.begin() + index + 1, "%3A"); raw_uri.replace(raw_uri.begin() + index, raw_uri.begin() + index + 1, "%3A");
} }

24
src/query.cc
View File

@ -32,30 +32,47 @@ std::vector<Out> Transform(const std::vector<In>& input, std::function<Out(In)>
result.push_back(op(in)); result.push_back(op(in));
return result; return result;
} }
// TODO: These functions are failing. Investigate why.
Usr MapIdToUsr(const IdCache& id_cache, const TypeId& id) { Usr MapIdToUsr(const IdCache& id_cache, const TypeId& id) {
assert(id_cache.type_id_to_usr.find(id) != id_cache.type_id_to_usr.end());
return id_cache.type_id_to_usr.find(id)->second; return id_cache.type_id_to_usr.find(id)->second;
} }
Usr MapIdToUsr(const IdCache& id_cache, const FuncId& id) { Usr MapIdToUsr(const IdCache& id_cache, const FuncId& id) {
assert(id_cache.func_id_to_usr.find(id) != id_cache.func_id_to_usr.end());
return id_cache.func_id_to_usr.find(id)->second; return id_cache.func_id_to_usr.find(id)->second;
} }
Usr MapIdToUsr(const IdCache& id_cache, const VarId& id) { Usr MapIdToUsr(const IdCache& id_cache, const VarId& id) {
assert(id_cache.var_id_to_usr.find(id) != id_cache.var_id_to_usr.end());
return id_cache.var_id_to_usr.find(id)->second; return id_cache.var_id_to_usr.find(id)->second;
} }
QueryableLocation MapIdToUsr(const IdCache& id_cache, const Location& id) { QueryableLocation MapIdToUsr(const IdCache& id_cache, const Location& id) {
assert(id_cache.file_id_to_file_path.find(id.file_id()) != id_cache.file_id_to_file_path.end());
return QueryableLocation(id_cache.file_id_to_file_path.find(id.file_id())->second, id.line, id.column, id.interesting); return QueryableLocation(id_cache.file_id_to_file_path.find(id.file_id())->second, id.line, id.column, id.interesting);
} }
std::vector<Usr> MapIdToUsr(const IdCache& id_cache, const std::vector<TypeId>& ids) { std::vector<Usr> MapIdToUsr(const IdCache& id_cache, const std::vector<TypeId>& ids) {
return Transform<TypeId, Usr>(ids, [&](TypeId id) { return id_cache.type_id_to_usr.find(id)->second; }); return Transform<TypeId, Usr>(ids, [&](TypeId id) {
assert(id_cache.type_id_to_usr.find(id) != id_cache.type_id_to_usr.end());
return id_cache.type_id_to_usr.find(id)->second;
});
} }
std::vector<Usr> MapIdToUsr(const IdCache& id_cache, const std::vector<FuncId>& ids) { std::vector<Usr> MapIdToUsr(const IdCache& id_cache, const std::vector<FuncId>& ids) {
return Transform<FuncId, Usr>(ids, [&](FuncId id) { return id_cache.func_id_to_usr.find(id)->second; }); return Transform<FuncId, Usr>(ids, [&](FuncId id) {
assert(id_cache.func_id_to_usr.find(id) != id_cache.func_id_to_usr.end());
return id_cache.func_id_to_usr.find(id)->second;
});
} }
std::vector<Usr> MapIdToUsr(const IdCache& id_cache, const std::vector<VarId>& ids) { std::vector<Usr> MapIdToUsr(const IdCache& id_cache, const std::vector<VarId>& ids) {
return Transform<VarId, Usr>(ids, [&](VarId id) { return id_cache.var_id_to_usr.find(id)->second; }); return Transform<VarId, Usr>(ids, [&](VarId id) {
assert(id_cache.var_id_to_usr.find(id) != id_cache.var_id_to_usr.end());
return id_cache.var_id_to_usr.find(id)->second;
});
} }
std::vector<UsrRef> MapIdToUsr(const IdCache& id_cache, const std::vector<FuncRef>& ids) { std::vector<UsrRef> MapIdToUsr(const IdCache& id_cache, const std::vector<FuncRef>& ids) {
return Transform<FuncRef, UsrRef>(ids, [&](FuncRef ref) { return Transform<FuncRef, UsrRef>(ids, [&](FuncRef ref) {
assert(id_cache.func_id_to_usr.find(ref.id) != id_cache.func_id_to_usr.end());
UsrRef result; UsrRef result;
result.loc = MapIdToUsr(id_cache, ref.loc); result.loc = MapIdToUsr(id_cache, ref.loc);
result.usr = id_cache.func_id_to_usr.find(ref.id)->second; result.usr = id_cache.func_id_to_usr.find(ref.id)->second;
@ -64,6 +81,7 @@ std::vector<UsrRef> MapIdToUsr(const IdCache& id_cache, const std::vector<FuncRe
} }
std::vector<QueryableLocation> MapIdToUsr(const IdCache& id_cache, const std::vector<Location>& ids) { std::vector<QueryableLocation> MapIdToUsr(const IdCache& id_cache, const std::vector<Location>& ids) {
return Transform<Location, QueryableLocation>(ids, [&](Location id) { return Transform<Location, QueryableLocation>(ids, [&](Location id) {
assert(id_cache.file_id_to_file_path.find(id.file_id()) != id_cache.file_id_to_file_path.end());
return QueryableLocation(id_cache.file_id_to_file_path.find(id.file_id())->second, id.line, id.column, id.interesting); return QueryableLocation(id_cache.file_id_to_file_path.find(id.file_id())->second, id.line, id.column, id.interesting);
}); });
} }