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

Style

Browse Source
This commit is contained in:
Fangrui Song 2018-01-14 13:43:04 -08:00
parent 0bad74eb4f
commit ed96b807dd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/working_files.cc
View File

@ -149,13 +149,13 @@ void WorkingFile::OnBufferContentUpdated() {
// to align other identical lines (but not unique). // to align other identical lines (but not unique).
void WorkingFile::ComputeLineMapping() { void WorkingFile::ComputeLineMapping() {
std::unordered_map<uint64_t, int> hash_to_unique; std::unordered_map<uint64_t, int> hash_to_unique;
std::vector<uint64_t> index_hashes(index_lines.size()), std::vector<uint64_t> index_hashes(index_lines.size());
buffer_hashes(buffer_lines.size()); std::vector<uint64_t> buffer_hashes(buffer_lines.size());
index_to_buffer.resize(index_lines.size()); index_to_buffer.resize(index_lines.size());
buffer_to_index.resize(buffer_lines.size()); buffer_to_index.resize(buffer_lines.size());
hash_to_unique.reserve(std::max(index_to_buffer.size(), buffer_to_index.size())); hash_to_unique.reserve(std::max(index_to_buffer.size(), buffer_to_index.size()));
// For index line i, set from_index[i] to -1 if line i is duplicated. // For index line i, set index_to_buffer[i] to -1 if line i is duplicated.
int i = 0; int i = 0;
for (auto& line : index_lines) { for (auto& line : index_lines) {
std::string trimmed = Trim(line); std::string trimmed = Trim(line);
@ -172,7 +172,7 @@ void WorkingFile::ComputeLineMapping() {
index_hashes[i++] = h; index_hashes[i++] = h;
} }
// For buffer line i, set from_buffer[i] to -1 if line i is duplicated. // For buffer line i, set buffer_to_index[i] to -1 if line i is duplicated.
i = 0; i = 0;
hash_to_unique.clear(); hash_to_unique.clear();
for (auto& line : buffer_lines) { for (auto& line : buffer_lines) {
@ -218,7 +218,7 @@ void WorkingFile::ComputeLineMapping() {
index_to_buffer[i - 1] = j - 1; index_to_buffer[i - 1] = j - 1;
} }
// |buffer_to_index| is a reverse mapping of |index_to_buffer|. // |buffer_to_index| is a inverse mapping of |index_to_buffer|.
std::fill(buffer_to_index.begin(), buffer_to_index.end(), -1); std::fill(buffer_to_index.begin(), buffer_to_index.end(), -1);
for (i = 0; i < (int)index_hashes.size(); i++) for (i = 0; i < (int)index_hashes.size(); i++)
if (index_to_buffer[i] >= 0) if (index_to_buffer[i] >= 0)