From 508e83950fd8647b7eb4498c92155d7d0964acdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffan=20S=C3=B8lvsten?= <201505832@post.au.dk> Date: Wed, 27 Jul 2022 17:21:54 +0200 Subject: [PATCH] Use the new .peek_back() function in TPIE (WIP) --- src/adiar/file_stream.h | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/adiar/file_stream.h b/src/adiar/file_stream.h index 6b1f16e36..62677727a 100644 --- a/src/adiar/file_stream.h +++ b/src/adiar/file_stream.h @@ -32,8 +32,6 @@ namespace adiar } private: - bool _has_peeked = false; - T _peeked; bool _negate = false; typename tpie::file_stream _stream; @@ -100,8 +98,7 @@ namespace adiar //////////////////////////////////////////////////////////////////////////// bool can_pull() { - return _has_peeked - || (REVERSE ? _stream.can_read_back() : _stream.can_read()); + return REVERSE ? _stream.can_read_back() : _stream.can_read(); } //////////////////////////////////////////////////////////////////////////// @@ -109,11 +106,7 @@ namespace adiar //////////////////////////////////////////////////////////////////////////// const T pull() { - if (_has_peeked) { - _has_peeked = false; - return _peeked; - } - T t = REVERSE ? _stream.read_back() : _stream.read(); + const T t = REVERSE ? _stream.read_back() : _stream.read(); return _negate ? !t : t; } @@ -122,11 +115,8 @@ namespace adiar //////////////////////////////////////////////////////////////////////////// const T peek() { - if (!_has_peeked) { - _peeked = pull(); - _has_peeked = true; - } - return _peeked; + const T t = REVERSE ? _stream.peek_back() : _stream.peek(); + return _negate ? !t : t; } ////////////////////////////////////////////////////////////////////////////