Moved Reverter inside Cursor

src/http.cc

@@ -89,7 +89,7 @@ namespace Private {
 
     Parser::State
     Parser::RequestLineStep::apply(Cursor& cursor) {
-        Reverter reverter(cursor);
+        Cursor::Revert revert(cursor);
 
         auto tryMatch = [&](const char* const str) {
             const size_t len = std::strlen(str);
@@ -165,17 +165,17 @@ namespace Private {
 
         if (!cursor.advance(2)) return State::Again;
 
-        reverter.clear();
+        revert.ignore();
         return State::Next;
 
     }
 
     Parser::State
     Parser::HeadersStep::apply(Cursor& cursor) {
-        Reverter reverter(cursor);
+        Cursor::Revert revert(cursor);
 
         while (!cursor.eol()) {
-            Reverter headerReverter(cursor);
+            Cursor::Revert headerRevert(cursor);
 
             // Read the header name
             size_t start = cursor;
@@ -205,7 +205,7 @@ namespace Private {
             // CRLF
             if (!cursor.advance(2)) return State::Again;
 
-            headerReverter.clear();
+            headerRevert.ignore();
         }
 
         return Parser::State::Next;

src/http.h

@@ -138,6 +138,32 @@ namespace Private {
         };
 
         struct Cursor {
+
+            struct Revert {
+                Revert(Cursor& cursor)
+                    : cursor(cursor)
+                    , pos(cursor.value)
+                    , active(true)
+                { }
+
+                void revert() {
+                    cursor.value = pos;
+                }
+
+                void ignore() {
+                    active = false;
+                }
+
+                ~Revert() {
+                    if (active) cursor.value = pos;
+                }
+
+                Cursor& cursor;
+
+                size_t pos;
+                bool active;
+            };
+
             static constexpr int Eof = -1;
 
             Cursor(const Buffer &buffer, size_t initialPos = 0)
@@ -162,31 +188,6 @@ namespace Private {
             size_t value;
         };
 
-        struct Reverter {
-            Reverter(Cursor& cursor)
-                : cursor(cursor)
-                , pos(cursor.value)
-                , active(true)
-            { }
-
-            void revert() {
-                cursor.value = pos;
-            }
-
-            void clear() {
-                active = false;
-            }
-
-            ~Reverter() {
-                if (active) cursor.value = pos;
-            }
-
-            Cursor& cursor;
-
-            size_t pos;
-            bool active;
-        };
-
         enum class State { Again, Next, Done };
 
         struct Step {