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

Change Pos::line from int16_t to uint16_t

Browse Source 
This allows representing line 0 ~ 65535.
This commit is contained in:
Fangrui Song 2019-02-23 19:17:26 +08:00
parent dd9d21083b
commit cafd2d4f77
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/clang_tu.cc
View File

@ -43,7 +43,7 @@ static Pos Decomposed2LineAndCol(const SourceManager &SM,
while (i < P.size() && (uint8_t)P[i] >= 128 && (uint8_t)P[i] < 192) while (i < P.size() && (uint8_t)P[i] >= 128 && (uint8_t)P[i] < 192)
i++; i++;
} }
return {(int16_t)std::min<int>(l, INT16_MAX), return {(uint16_t)std::min<int>(l, UINT16_MAX),
(int16_t)std::min<int>(c, INT16_MAX)}; (int16_t)std::min<int>(c, INT16_MAX)};
} }

4
src/indexer.cc
View File

@ -1151,8 +1151,8 @@ public:
}; };
} // namespace } // namespace
const int IndexFile::kMajorVersion = 19; const int IndexFile::kMajorVersion = 20;
const int IndexFile::kMinorVersion = 1; const int IndexFile::kMinorVersion = 0;
IndexFile::IndexFile(const std::string &path, const std::string &contents) IndexFile::IndexFile(const std::string &path, const std::string &contents)
: path(path), file_contents(contents) {} : path(path), file_contents(contents) {}

4
src/message_handler.cc
View File

@ -320,9 +320,9 @@ void EmitSemanticHighlight(DB *db, WorkingFile *wfile, QueryFile &file) {
// but we still want to keep the range for jumping to definition. // but we still want to keep the range for jumping to definition.
std::string_view concise_name = std::string_view concise_name =
detailed_name.substr(0, detailed_name.find('<')); detailed_name.substr(0, detailed_name.find('<'));
int16_t start_line = sym.range.start.line; uint16_t start_line = sym.range.start.line;
int16_t start_col = sym.range.start.column; int16_t start_col = sym.range.start.column;
if (start_line < 0 || start_line >= wfile->index_lines.size()) if (start_line >= wfile->index_lines.size())
continue; continue;
std::string_view line = wfile->index_lines[start_line]; std::string_view line = wfile->index_lines[start_line];
sym.range.end.line = start_line; sym.range.end.line = start_line;

2
src/messages/ccls_navigate.cc
View File

@ -38,7 +38,7 @@ void MessageHandler::ccls_navigate(JsonReader &reader, ReplyOnce &reply) {
if (auto line = if (auto line =
wf->GetIndexPosFromBufferPos(ls_pos.line, &ls_pos.character, false)) wf->GetIndexPosFromBufferPos(ls_pos.line, &ls_pos.character, false))
ls_pos.line = *line; ls_pos.line = *line;
Pos pos{(int16_t)ls_pos.line, (int16_t)ls_pos.character}; Pos pos{(uint16_t)ls_pos.line, (int16_t)ls_pos.character};
Maybe<Range> res; Maybe<Range> res;
switch (param.direction[0]) { switch (param.direction[0]) {

8
src/position.cc
View File

@ -16,7 +16,7 @@
namespace ccls { namespace ccls {
Pos Pos::FromString(const std::string &encoded) { Pos Pos::FromString(const std::string &encoded) {
char *p = const_cast<char *>(encoded.c_str()); char *p = const_cast<char *>(encoded.c_str());
int16_t line = int16_t(strtol(p, &p, 10)) - 1; uint16_t line = uint16_t(strtoul(p, &p, 10) - 1);
assert(*p == ':'); assert(*p == ':');
p++; p++;
int16_t column = int16_t(strtol(p, &p, 10)) - 1; int16_t column = int16_t(strtol(p, &p, 10)) - 1;
@ -32,14 +32,14 @@ std::string Pos::ToString() {
Range Range::FromString(const std::string &encoded) { Range Range::FromString(const std::string &encoded) {
Pos start, end; Pos start, end;
char *p = const_cast<char *>(encoded.c_str()); char *p = const_cast<char *>(encoded.c_str());
start.line = int16_t(strtol(p, &p, 10)) - 1; start.line = uint16_t(strtoul(p, &p, 10) - 1);
assert(*p == ':'); assert(*p == ':');
p++; p++;
start.column = int16_t(strtol(p, &p, 10)) - 1; start.column = int16_t(strtol(p, &p, 10)) - 1;
assert(*p == '-'); assert(*p == '-');
p++; p++;
end.line = int16_t(strtol(p, &p, 10)) - 1; end.line = uint16_t(strtoul(p, &p, 10) - 1);
assert(*p == ':'); assert(*p == ':');
p++; p++;
end.column = int16_t(strtol(p, nullptr, 10)) - 1; end.column = int16_t(strtol(p, nullptr, 10)) - 1;
@ -49,7 +49,7 @@ Range Range::FromString(const std::string &encoded) {
bool Range::Contains(int line, int column) const { bool Range::Contains(int line, int column) const {
if (line > INT16_MAX) if (line > INT16_MAX)
return false; return false;
Pos p{(int16_t)line, (int16_t)std::min<int>(column, INT16_MAX)}; Pos p{(uint16_t)line, (int16_t)std::min<int>(column, INT16_MAX)};
return !(p < start) && p < end; return !(p < start) && p < end;
} }

4
src/position.hh
View File

@ -10,12 +10,12 @@
namespace ccls { namespace ccls {
struct Pos { struct Pos {
int16_t line = -1; uint16_t line = 0;
int16_t column = -1; int16_t column = -1;
static Pos FromString(const std::string &encoded); static Pos FromString(const std::string &encoded);
bool Valid() const { return line >= 0; } bool Valid() const { return column >= 0; }
std::string ToString(); std::string ToString();
// Compare two Positions and check if they are equal. Ignores the value of // Compare two Positions and check if they are equal. Ignores the value of