patrick
/
plasp
Archived
1
0
Fork 0
Code Issues 12 Releases 8 Activity

Added function to dermine stream location from arbitrary positions.

This commit is contained in:
Patrick Lühne 2017-06-24 18:58:28 +02:00
parent 4d59732263
commit 436933f73f
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/tokenize/include/tokenize/Stream.h
View File

@ -104,10 +104,10 @@ class Stream
return m_position; return m_position;
} }
Location location() const Location location(StreamPosition position) const
{ {
// Find current section // Find current section
auto section = std::upper_bound(m_sections.cbegin(), m_sections.cend(), m_position, auto section = std::upper_bound(m_sections.cbegin(), m_sections.cend(), position,
[&](const auto &lhs, const auto &rhs) [&](const auto &lhs, const auto &rhs)
{ {
return lhs < rhs.position; return lhs < rhs.position;
@ -118,20 +118,25 @@ class Stream
section--; section--;
// Find line (row) in the file // Find line (row) in the file
auto line = std::lower_bound(section->newlines.cbegin(), section->newlines.cend(), m_position); auto line = std::lower_bound(section->newlines.cbegin(), section->newlines.cend(), position);
if (line == section->newlines.cbegin()) if (line == section->newlines.cbegin())
{ {
const auto row = 1; const auto row = 1;
const auto column = static_cast<StreamPosition>(m_position - section->position + 1); const auto column = static_cast<StreamPosition>(position - section->position + 1);
return {m_position, section->name, section->name, row, row, column, column}; return {position, section->name, section->name, row, row, column, column};
} }
const auto row = static_cast<StreamPosition>(line - section->newlines.cbegin() + 1); const auto row = static_cast<StreamPosition>(line - section->newlines.cbegin() + 1);
const auto column = static_cast<StreamPosition>(m_position - *(line - 1)); const auto column = static_cast<StreamPosition>(position - *(line - 1));
return {m_position, section->name, section->name, row, row, column, column}; return {position, section->name, section->name, row, row, column, column};
}
Location location() const
{
return location(m_position);
} }
const std::vector<Section> &sections() const const std::vector<Section> &sections() const