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

Remove caching from utf8_iterator

Browse Source
This commit is contained in:
Maxime Coste 2018-11-01 21:05:09 +11:00
parent 4cd7583bbc
commit 8a751e1b57
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/utf8_iterator.hh
View File

@ -38,7 +38,6 @@ public:
iterator& operator++() noexcept iterator& operator++() noexcept
{ {
utf8::to_next(m_it, m_end); utf8::to_next(m_it, m_end);
invalidate_value();
return *this; return *this;
} }
@ -52,7 +51,6 @@ public:
iterator& operator--() noexcept iterator& operator--() noexcept
{ {
utf8::to_previous(m_it, m_begin); utf8::to_previous(m_it, m_begin);
invalidate_value();
return *this; return *this;
} }
@ -127,7 +125,7 @@ public:
CodepointType operator*() const noexcept(noexcept_policy) CodepointType operator*() const noexcept(noexcept_policy)
{ {
return get_value(); return (CodepointType)utf8::codepoint<InvalidPolicy>(m_it, m_end);
} }
CodepointType read() noexcept(noexcept_policy) CodepointType read() noexcept(noexcept_policy)
@ -138,18 +136,9 @@ public:
const BaseIt& base() const noexcept(noexcept_policy) { return m_it; } const BaseIt& base() const noexcept(noexcept_policy) { return m_it; }
private: private:
void invalidate_value() noexcept { m_value = -1; }
CodepointType get_value() const noexcept(noexcept_policy)
{
if (m_value == (CodepointType)-1)
m_value = (CodepointType)utf8::codepoint<InvalidPolicy>(m_it, m_end);
return m_value;
}
BaseIt m_it; BaseIt m_it;
Sentinel m_begin; Sentinel m_begin;
Sentinel m_end; Sentinel m_end;
mutable CodepointType m_value = -1;
}; };
} }