Put back compareEqual

attah · Sep 23, 2024 · d30dddc · d30dddc
1 parent 74fe399
commit d30dddc
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 9 deletions.
diff --git a/bytestream.cpp b/bytestream.cpp
@@ -169,7 +169,7 @@ Bytestream Bytestream::peekBytestream(size_t len) const
   return other;
 }
 
-bool Bytestream::nextString(const std::string& s)
+bool Bytestream::nextString(const std::string& s, bool compareEqual)
 {
   size_t noOfNextBytes = s.length();
 
@@ -178,7 +178,8 @@ bool Bytestream::nextString(const std::string& s)
     return false;
   }
 
-  if(peekString(noOfNextBytes) == s)
+  bool res = peekString(noOfNextBytes) == s;
+  if(res == compareEqual)
   {
     _after(noOfNextBytes);
     return true;
@@ -188,7 +189,8 @@ bool Bytestream::nextString(const std::string& s)
     return false;
   }
 }
-bool Bytestream::nextBytestream(const Bytestream& other)
+
+bool Bytestream::nextBytestream(const Bytestream& other, bool compareEqual)
 {
   size_t noOfNextBytes = other.size();
 
@@ -198,11 +200,15 @@ bool Bytestream::nextBytestream(const Bytestream& other)
   }
 
   bool res = memcmp(&(_data[_pos]), other.raw(), noOfNextBytes) == 0;
-  if(res)
+  if(res == compareEqual)
   {
-    *this += noOfNextBytes;
+    _after(noOfNextBytes);
+    return true;
+  }
+  else
+  {
+    return false;
   }
-  return res;
 }
 
 void Bytestream::putString(const std::string& s)

diff --git a/bytestream.h b/bytestream.h
@@ -115,8 +115,8 @@ class Bytestream
     }
   }
 
-  bool nextString(const std::string& bts);
-  bool nextBytestream(const Bytestream& bts);
+  bool nextString(const std::string& bts, bool compareEqual=true);
+  bool nextBytestream(const Bytestream& bts, bool compareEqual=true);
 
   template<typename T, typename std::enable_if_t<std::is_arithmetic<T>::value, bool> = true>
   void put(T u)

diff --git a/tests/test.cpp b/tests/test.cpp
@@ -175,7 +175,25 @@ TEST(test_method)
   ASSERT(bts.nextBytestream(bts2));
   ASSERT_FALSE(bts.nextBytestream(bts2)); // already consumed
 
+  bts -= 10;
+  Bytestream bts3, bts4;
+  bts3 << "sooomeString";
+  bts4 << "someStrong";
+  // inverting the comparison result should not influence length mismatch
+  ASSERT_FALSE(bts.nextBytestream(bts3, false));
+  // ...only advance the read position if the bytestreams aren't equal
+  ASSERT(bts.nextBytestream(bts4, false));
+  ASSERT(bts.atEnd());
+  // inverting the comparison result should not influence length mismatch
+  ASSERT_FALSE(bts.nextBytestream(bts4, false));
+  bts -= 10;
+  // inverting the comparison result should not influence length mismatch
+  ASSERT_FALSE(bts.nextString("sooomeString", false));
+  // ...only advance the read position if the bytestreams aren't equal
+  ASSERT(bts.nextString("someStrong", false));
   ASSERT(bts.atEnd());
+  // inverting the comparison result should not influence length mismatch
+  ASSERT_FALSE(bts.nextString("someStrong", false));
 }
 
 #define HIBIT(sign, suffix) \
@@ -313,7 +331,7 @@ TEST(constructors)
   ASSERT(bts4 >>= "someString");
 }
 
-TEST(move_semanticcs)
+TEST(move_semantics)
 {
   Bytestream bts1("some contents");
   Bytestream bts2(std::move(bts1));