xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use an index for jump list current rather than an iterator

Browse Source
This commit is contained in:
Maxime Coste 2015-12-23 02:31:03 +00:00
parent 411e5a9486
commit aa92ca96c8
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/context.cc
View File

@ -85,27 +85,27 @@ void Context::print_status(DisplayLine status) const
void JumpList::push(SelectionList jump)
{
if (m_current != m_jumps.end())
m_jumps.erase(m_current+1, m_jumps.end());
if (m_current != m_jumps.size())
m_jumps.erase(m_jumps.begin()+m_current+1, m_jumps.end());
m_jumps.erase(std::remove(begin(m_jumps), end(m_jumps), jump),
end(m_jumps));
m_jumps.push_back(jump);
m_current = m_jumps.end();
m_current = m_jumps.size();
}
void JumpList::drop()
{
if (not m_jumps.empty())
m_jumps.pop_back();
m_current = m_jumps.end();
m_current = m_jumps.size();
}
const SelectionList& JumpList::forward()
{
if (m_current != m_jumps.end() and
m_current + 1 != m_jumps.end())
if (m_current != m_jumps.size() and
m_current + 1 != m_jumps.size())
{
SelectionList& res = *++m_current;
SelectionList& res = m_jumps[++m_current];
res.update();
return res;
}
@ -114,24 +114,23 @@ const SelectionList& JumpList::forward()
const SelectionList& JumpList::backward(const SelectionList& current)
{
if (m_current != m_jumps.end() and
*m_current != current)
if (m_current != m_jumps.size() and
m_jumps[m_current] != current)
{
push(current);
SelectionList& res = *--m_current;
SelectionList& res = m_jumps[--m_current];
res.update();
return res;
}
if (m_current != m_jumps.begin())
if (m_current != 0)
{
if (m_current == m_jumps.end())
if (m_current == m_jumps.size())
{
push(current);
--m_current;
if (m_current == m_jumps.begin())
if (--m_current == 0)
throw runtime_error("no previous jump");
}
SelectionList& res = *--m_current;
SelectionList& res = m_jumps[--m_current];
res.update();
return res;
}
@ -140,19 +139,19 @@ const SelectionList& JumpList::backward(const SelectionList& current)
void JumpList::forget_buffer(Buffer& buffer)
{
for (auto it = m_jumps.begin(); it != m_jumps.end();)
for (size_t i = 0; i < m_jumps.size();)
{
if (&it->buffer() == &buffer)
if (&m_jumps[i].buffer() == &buffer)
{
if (it < m_current)
if (i < m_current)
--m_current;
else if (it == m_current)
m_current = m_jumps.end()-1;
else if (i == m_current)
m_current = m_jumps.size()-1;
it = m_jumps.erase(it);
m_jumps.erase(m_jumps.begin() + i);
}
else
++it;
++i;
}
}

2
src/context.hh
View File

@ -61,7 +61,7 @@ struct JumpList
private:
using Contents = Vector<SelectionList, MemoryDomain::Selections>;
Contents m_jumps;
Contents::iterator m_current = m_jumps.begin();
size_t m_current = 0;
};
// A Context is used to access non singleton objects for various services