Cleanup <spanstream>

Author: H-G-Hristov

libcxx/include/spanstream

@@ -237,8 +237,8 @@ protected:
   }
 
 private:
-  ios_base::openmode __mode_; // exposition only
-  std::span<_CharT> __buf_;   // exposition only
+  ios_base::openmode __mode_;
+  std::span<_CharT> __buf_;
 };
 
 template <class _CharT, class _Traits>
@@ -316,7 +316,7 @@ public:
   }
 
 private:
-  basic_spanbuf<_CharT, _Traits> __sb_; // exposition only
+  basic_spanbuf<_CharT, _Traits> __sb_;
 };
 
 template <class _CharT, class _Traits>
@@ -379,7 +379,7 @@ public:
   _LIBCPP_HIDE_FROM_ABI void span(std::span<_CharT> __s) noexcept { rdbuf()->span(__s); }
 
 private:
-  basic_spanbuf<_CharT, _Traits> __sb_; // exposition only
+  basic_spanbuf<_CharT, _Traits> __sb_;
 };
 
 template <class _CharT, class _Traits>
@@ -440,7 +440,7 @@ public:
   _LIBCPP_HIDE_FROM_ABI void span(std::span<_CharT> __s) noexcept { rdbuf()->span(__s); }
 
 private:
-  basic_spanbuf<_CharT, _Traits> __sb_; // exposition only
+  basic_spanbuf<_CharT, _Traits> __sb_;
 };
 
 template <class _CharT, class _Traits>

libcxx/test/std/input.output/span.streams/ospanstream/inherited.stream.ops.pass.cpp

@@ -21,6 +21,9 @@
 #include <spanstream>
 #include <string>
 #include <string_view>
+#include <vector>
+
+#include <print>
 
 #include "constexpr_char_traits.h"
 #include "test_macros.h"
@@ -40,11 +43,11 @@ void test() {
   // Create a std::span test value
   CharT arr[arrSize]{};
   initialize_array_from_string_view(arr, sv);
-
-  std::span<CharT> sp{arr};
+  std::vector<CharT> vec(arr, arr + arrSize);
 
   // `std::span` + Mode: default (`out`)
   {
+    std::span<CharT> sp{arr};
     SpStream spSt(sp);
 
     assert(spSt);
@@ -59,13 +62,65 @@ void test() {
     assert(!spSt.bad());
     assert(!spSt.fail());
     assert(spSt.good());
+    assert(spSt.span().size() == 0);
+  }
+  {
+    std::span<CharT> sp{arr};
+    SpStream spSt(sp);
+
+    assert(spSt);
+    assert(!spSt.bad());
+    assert(!spSt.fail());
+    assert(spSt.good());
+    assert(spSt.span().size() == 0);
+
+    spSt << 10;
+
+    assert(spSt.span().size() == 2);
+
+    spSt.clear();
+
+    // assert(spSt);
+    // assert(!spSt.bad());
+    // assert(!spSt.fail());
+    // assert(spSt.good());
+    // assert(spSt.span().size() == 0);
+
+    spSt << SV("gh");
+    assert(spSt.span().size() == 4);
+    std::println(stderr, "{}", spSt.span()[0]);
+    std::println(stderr, "{}", arr[0]);
+    assert(spSt.span()[0] == '1');
+    assert(arr[0] == '1');
+    assert(spSt.span()[1] == '0');
+    assert(arr[1] == '0');
+    assert(spSt.span()[2] == 'g');
+    assert(arr[2] == 'g');
+
+    CharT output_buffer[30];
+    std::basic_ospanstream<CharT, TraitsT> os{std::span<CharT>{output_buffer}};
+
+    assert(os.good());
+    assert(!os.fail());
+    assert(!os.bad());
+    os << 10 << 20 << 30;
+    os << SV("GH");
+    assert(os.good());
+    assert(!os.fail());
+    assert(!os.bad());
+    std::println(stderr, "{}", os.span()[0]);
+    std::println(stderr, "{}", output_buffer[0]);
+    std::println(stderr, "{}", os.span().size());
+    std::println(stderr, "{}", os.span()[6]);
+    std::println(stderr, "{}", output_buffer[7]);
+    assert(false);
   }
 }
 
 int main(int, char**) {
   test<char>();
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
-  test<wchar_t>();
+  // test<wchar_t>();
 #endif
 
   return 0;