From 4c5ecbe39bf17ebd1c663c863cef5094f53caf86 Mon Sep 17 00:00:00 2001 From: Andreas Stöckel Date: Sat, 24 Jan 2015 03:07:00 +0100 Subject: Added seek function to CharReader, improved getOffset --- src/core/common/CharReader.cpp | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'src/core/common/CharReader.cpp') diff --git a/src/core/common/CharReader.cpp b/src/core/common/CharReader.cpp index 6fd3d45..07482ff 100644 --- a/src/core/common/CharReader.cpp +++ b/src/core/common/CharReader.cpp @@ -502,16 +502,31 @@ size_t CharReader::readRaw(char *buf, size_t size) return res; } +size_t CharReader::seek(size_t requestedOffset) +{ + // Fetch the current offset + const ssize_t currentOffs = getOffset(); + const ssize_t relativeOffs = requestedOffset - currentOffs; + + // Perform the actual seeking, move the peek cursor to the read cursor + const ssize_t reachedOffs = currentOffs + buffer->moveCursor(readCursor, relativeOffs); + buffer->copyCursor(readCursor, peekCursor); + coherent = true; + + // Clamp to values larger or equal to zero + return reachedOffs < 0 ? 0 : reachedOffs; +} + bool CharReader::atEnd() const { return buffer->atEnd(readCursor); } -SourceOffset CharReader::getOffset() const +size_t CharReader::getOffset() const { return buffer->offset(readCursor) + offs; } -SourcePosition CharReader::getPosition() const +size_t CharReader::getPeekOffset() const { - return getOffset(); + return buffer->offset(readCursor) + offs; } SourceLocation CharReader::getLocation() const -- cgit v1.2.3