feat(buffer.hpp): take_n, peek_n, after_n, after_n_m return std::null…

…opt when n is less than 0
Adamska1008 · Sep 15, 2024 · 4f6daca · 4f6daca
1 parent 411ff86
commit 4f6daca
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/src/buffer.cpp b/src/buffer.cpp
@@ -35,8 +35,12 @@ namespace myxml
 
     std::optional<std::string_view> buffer::peek_n(int n) const
     {
+        if (n < 0)
+        {
+            return std::nullopt;
+        }
         auto [ptr, len] = this->base();
-        if (_offset >= len)
+        if (_offset + n >= len)
         {
             return std::nullopt;
         }
@@ -45,6 +49,10 @@ namespace myxml
 
     std::optional<char> buffer::after_n(int n) const
     {
+        if (n < 0)
+        {
+            return std::nullopt;
+        }
         auto [ptr, len] = this->base();
         if (_offset + n > len)
         {
@@ -55,6 +63,10 @@ namespace myxml
 
     std::optional<std::string_view> buffer::after_n_m(int n, int m) const
     {
+        if (n < 0 || m < 0)
+        {
+            return std::nullopt;
+        }
         auto [ptr, len] = this->base();
         if (_offset + n + m > len)
         {
@@ -77,6 +89,10 @@ namespace myxml
 
     std::optional<std::string_view> buffer::take_n(int n)
     {
+        if (n < 0)
+        {
+            return std::nullopt;
+        }
         auto [ptr, len] = this->base();
         if (_offset + n > len)
         {

diff --git a/tests/buffer_test.cpp b/tests/buffer_test.cpp
@@ -1,6 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include "myxml/buffer.hpp"
 #include "myxml/xmlfile.hpp"
+#include <iostream>
 
 TEST_CASE("String Buffer", "[buffer]")
 {
@@ -12,12 +13,27 @@ TEST_CASE("String Buffer", "[buffer]")
         REQUIRE(sb.take_n(3) == "Hel");
         REQUIRE(sb.after_n(1) == 'o');
         REQUIRE(sb.after_n_m(1, 2) == "o,");
+        REQUIRE(sb.peek_n(11) == std::nullopt);
+        REQUIRE(sb.take_n(11) == std::nullopt);
         REQUIRE(sb.take_n(10) == "lo, world!");
         REQUIRE(sb.take() == std::nullopt);
         REQUIRE(sb.take_n(2) == std::nullopt);
+        REQUIRE(sb.peek() == std::nullopt);
+        REQUIRE(sb.peek_n(2) == std::nullopt);
     }
 
-    SECTION("Location", "[buffer]")
+    SECTION("Take test")
+    {
+        myxml::string_buffer sb = "Hello";
+        REQUIRE(sb.take() == 'H');
+        REQUIRE(sb.take() == 'e');
+        REQUIRE(sb.take() == 'l');
+        REQUIRE(sb.take() == 'l');
+        REQUIRE(sb.take() == 'o');
+        REQUIRE(sb.take() == std::nullopt);
+    }
+
+    SECTION("Location")
     {
         myxml::string_buffer sb = "Hello, world!\nLine2";