Encapsulate on parser state in structure.

So that parser users don't need to know what needs and needs not to be
saved/restored.

1 files changed, 14 insertions, 16 deletions

diff --git a/trace_parser.hpp b/trace_parser.hpp
index 962c323..d76ffb4 100644
--- a/trace_parser.hpp
+++ b/trace_parser.hpp
@@ -37,6 +37,14 @@
 
 namespace Trace {
 
+
+struct ParseBookmark
+{
+    File::Offset offset;
+    unsigned next_call_no;
+};
+
+
 class Parser
 {
 protected:
@@ -92,24 +100,14 @@ public:
         return file->supportsOffsets();
     }
 
-    File::Offset currentOffset()
-    {
-        return file->currentOffset();
-    }
-
-    void setCurrentOffset(const File::Offset &offset)
-    {
-        file->setCurrentOffset(offset);
+    void getBookmark(ParseBookmark &bookmark) {
+        bookmark.offset = file->currentOffset();
+        bookmark.next_call_no = next_call_no;
     }
 
-    unsigned currentCallNumber() const
-    {
-        return next_call_no;
-    }
-
-    void setCurrentCallNumber(unsigned num)
-    {
-        next_call_no = num;
+    void setBookmark(const ParseBookmark &bookmark) {
+        file->setCurrentOffset(bookmark.offset);
+        next_call_no = bookmark.next_call_no;
     }
 
     int percentRead()