zhangyiss/toml11
1
0
Fork 0
mirror of https://github.com/ToruNiina/toml11.git synced 2025-09-18 02:08:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: check and convert value manually

Browse Source 
I totally have no idea when std::count returns a negative value, but the
result type of `std::count` is a differnce_type. So when it is added
with size_t value, implicit sign conversion happens. This changes check
this kind of (almost trivial but required) checking.
This commit is contained in:
ToruNiina
2019-06-20 22:27:16 +09:00
parent f689d26294
commit 8208bbf236
1 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
toml/region.hpp
View File

@@ -70,6 +70,7 @@ template<typename Container>
struct location final : public region_base struct location final : public region_base
{ {
using const_iterator = typename Container::const_iterator; using const_iterator = typename Container::const_iterator;
using difference_type = typename const_iterator::difference_type;
using source_ptr = std::shared_ptr<const Container>; using source_ptr = std::shared_ptr<const Container>;
static_assert(std::is_same<char, typename Container::value_type>::value,""); static_assert(std::is_same<char, typename Container::value_type>::value,"");
@@ -103,15 +104,17 @@ struct location final : public region_base
// to the location changes the point to look. So an overload of `iter()` // to the location changes the point to look. So an overload of `iter()`
// which returns mutable reference is removed and `advance()`, `retrace()` // which returns mutable reference is removed and `advance()`, `retrace()`
// and `reset()` is added. // and `reset()` is added.
void advance(std::size_t n = 1) noexcept void advance(difference_type n = 1) noexcept
{ {
this->line_number_ += std::count(this->iter_, this->iter_ + n, '\n'); this->line_number_ += static_cast<std::size_t>(
std::count(this->iter_, std::next(this->iter_, n), '\n'));
this->iter_ += n; this->iter_ += n;
return; return;
} }
void retrace(std::size_t n = 1) noexcept void retrace(difference_type n = 1) noexcept
{ {
this->line_number_ -= std::count(this->iter_ - n, this->iter_, '\n'); this->line_number_ -= static_cast<std::size_t>(
std::count(std::prev(this->iter_, n), this->iter_, '\n'));
this->iter_ -= n; this->iter_ -= n;
return; return;
} }
@@ -121,11 +124,13 @@ struct location final : public region_base
// iterators and returns a negative value if `first > last`. // iterators and returns a negative value if `first > last`.
if(0 <= std::distance(rollback, this->iter_)) // rollback < iter if(0 <= std::distance(rollback, this->iter_)) // rollback < iter
{ {
this->line_number_ -= std::count(rollback, this->iter_, '\n'); this->line_number_ -= static_cast<std::size_t>(
std::count(rollback, this->iter_, '\n'));
} }
else // iter < rollback [[unlikely]] else // iter < rollback [[unlikely]]
{ {
this->line_number_ += std::count(this->iter_, rollback, '\n'); this->line_number_ += static_cast<std::size_t>(
std::count(this->iter_, rollback, '\n'));
} }
this->iter_ = rollback; this->iter_ = rollback;
return; return;
@@ -162,11 +167,15 @@ struct location final : public region_base
} }
std::size_t before() const noexcept override std::size_t before() const noexcept override
{ {
return std::distance(this->line_begin(), this->iter()); const auto sz = std::distance(this->line_begin(), this->iter());
assert(sz >= 0);
return static_cast<std::size_t>(sz);
} }
std::size_t after() const noexcept override std::size_t after() const noexcept override
{ {
return std::distance(this->iter(), this->line_end()); const auto sz = std::distance(this->iter(), this->line_end());
assert(sz >= 0);
return static_cast<std::size_t>(sz);
} }
source_ptr const& source() const& noexcept {return source_;} source_ptr const& source() const& noexcept {return source_;}
@@ -250,15 +259,21 @@ struct region final : public region_base
std::size_t size() const noexcept override std::size_t size() const noexcept override
{ {
return std::distance(first_, last_); const auto sz = std::distance(first_, last_);
assert(sz >= 0);
return static_cast<std::size_t>(sz);
} }
std::size_t before() const noexcept override std::size_t before() const noexcept override
{ {
return std::distance(this->line_begin(), this->first()); const auto sz = std::distance(this->line_begin(), this->first());
assert(sz >= 0);
return static_cast<std::size_t>(sz);
} }
std::size_t after() const noexcept override std::size_t after() const noexcept override
{ {
return std::distance(this->last(), this->line_end()); const auto sz = std::distance(this->last(), this->line_end());
assert(sz >= 0);
return static_cast<std::size_t>(sz);
} }
bool contain_newline() const noexcept bool contain_newline() const noexcept