diff options
author | Kenneth Heafield <github@kheafield.com> | 2014-01-02 01:19:06 +0400 |
---|---|---|
committer | Kenneth Heafield <github@kheafield.com> | 2014-01-02 01:19:06 +0400 |
commit | 732a1b074426352498fc99459ae8499d95690084 (patch) | |
tree | 56a06f19e341260128faf60743e84506943e9c07 /util/file_piece.hh | |
parent | 18aaf4750a11f7a903a143b83f51eb34323613ea (diff) |
KenLM 85c82bd, revamp Moses timer to have more precision
Diffstat (limited to 'util/file_piece.hh')
-rw-r--r-- | util/file_piece.hh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/util/file_piece.hh b/util/file_piece.hh index c07c60119..ed3dc5adf 100644 --- a/util/file_piece.hh +++ b/util/file_piece.hh @@ -12,6 +12,7 @@ #include <iosfwd> #include <string> +#include <assert.h> #include <stdint.h> namespace util { @@ -66,8 +67,14 @@ class FilePiece { // Skip spaces defined by isspace. void SkipSpaces(const bool *delim = kSpaces) { + assert(position_ <= position_end_); for (; ; ++position_) { - if (position_ == position_end_) Shift(); + if (position_ == position_end_) { + Shift(); + // And break out at end of file. + if (position_ == position_end_) return; + } + assert(position_ < position_end_); if (!delim[static_cast<unsigned char>(*position_)]) return; } } @@ -86,6 +93,7 @@ class FilePiece { template <class T> T ReadNumber(); StringPiece Consume(const char *to) { + assert(to >= position_); StringPiece ret(position_, to - position_); position_ = to; return ret; |