Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions include/rusty_iterators/file_iterator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,24 +44,25 @@ class FileIterator<FIterType::Buffered>
fileLines.push_back(std::move(nextLine));
}
is.close();
ptr = fileLines.begin();
};

auto next() -> std::optional<std::string>
{
[[unlikely]] if (ptr == fileLines.size())
[[unlikely]] if (ptr == fileLines.end())
{
return std::nullopt;
}
auto line = fileLines.at(ptr);
auto line = *ptr;
ptr += 1;
return std::move(line);
}

[[nodiscard]] auto sizeHint() const -> std::optional<size_t> { return fileLines.size(); }
[[nodiscard]] auto sizeHint() const -> std::optional<size_t> { return fileLines.end() - ptr; }

private:
size_t ptr = 0;
std::vector<std::string> fileLines{};
std::vector<std::string>::iterator ptr;
};

template <>
Expand Down