Cleanup

malachi-iot · Jun 17, 2024 · 5c51865 · 5c51865
1 parent 96e0d53
commit 5c51865
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 47 deletions.
diff --git a/src/estd/internal/ios_base.h b/src/estd/internal/ios_base.h
@@ -26,6 +26,10 @@ class ios_base
 #endif
     static CONSTEXPR fmtflags basefield = dec | hex;
 
+    // NOTE: "Has no effect on input"
+    // https://en.cppreference.com/w/cpp/io/manip/left
+    // But to optimize it into basic_ostream_base would almost definitely break
+    // compatibility
     static CONSTEXPR fmtflags left = 0x08;
     static CONSTEXPR fmtflags right = 0x10;
     static CONSTEXPR fmtflags adjustfield = left | right;
@@ -154,4 +158,59 @@ inline ios_base& nounitbuf(ios_base& s)
     return s;
 }
 
+
+namespace internal {
+
+class basic_ostream_base
+{
+protected:
+#if FEATURE_ESTD_OSTREAM_SETW
+    // NOTE: Deviates from spec - std wants this in ios_base as part of setf
+    // DEBT: Super clumsy, may want additional layer of wrappers for enum class
+    // NOTE: Due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=51242#c31 below,
+    // not using scoped enum at all in this case
+#if defined(FEATURE_CPP_ENUM_CLASS) && !(__GNUC__ < 10)
+    enum class positioning_type
+#else
+    struct positioning_type { enum values
+#endif
+    {
+        left = 0,
+        right,
+        internal
+    };
+#if defined(FEATURE_CPP_ENUM_CLASS) && !(__GNUC__ < 10)
+    using positioning = positioning_type;
+#else
+    };
+
+    typedef typename positioning_type::values positioning;
+#endif
+
+    struct ostream_internal
+    {
+        // DEBT: Width applies to istream *and* ostream
+        unsigned width : 4;
+
+        // NOTE: Hitting compiler warning bug
+        // https://stackoverflow.com/questions/36005063/gcc-suppress-warning-too-small-to-hold-all-values-of
+        // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=51242#c31
+        positioning alignment : 2;  // DEBT: Unused
+
+        // DEBT: Presumes ASCII, 7-bit.  Unicode and friends are out
+        char fillchar : 6;          // + 32 (from ' ' to '`' ASCII)
+        //bool showbase : 1;          // DEBT: Unused
+
+        ESTD_CPP_CONSTEXPR_RET ostream_internal() :
+            width(0), alignment(positioning_type::left),
+            fillchar(0) // equivalent to space ' '
+        {
+        }
+
+    }   ostream_;
+#endif
+};
+
+}
+
 }
diff --git a/src/estd/internal/ostream.h b/src/estd/internal/ostream.h
@@ -5,18 +5,19 @@
 namespace estd { namespace detail {
 
 // DEBT: is there a way to make TBase a little less confusing for consumers?
-template <ESTD_CPP_CONCEPT(concepts::v1::OutStreambuf) TStreambuf, class TBase>
+template <ESTD_CPP_CONCEPT(concepts::v1::OutStreambuf) Streambuf, class Base>
 class basic_ostream :
 #ifdef FEATURE_IOS_STREAMBUF_FULL
         virtual
 #endif
-        public TBase
+        public Base,
+        internal::basic_ostream_base
 {
-    typedef TBase base_type;
+    typedef Base base_type;
 
 public:
     typedef typename base_type::streambuf_type streambuf_type;
-    typedef typename TBase::char_type char_type;
+    typedef typename Base::char_type char_type;
     typedef typename streambuf_type::pos_type pos_type;
     typedef typename streambuf_type::off_type off_type;
 
@@ -83,48 +84,8 @@ class basic_ostream :
             base_type::setstate(ios_base::failbit);
     }
 
-#if FEATURE_ESTD_OSTREAM_SETW
-    // NOTE: Deviates from spec - std wants this in ios_base as part of setf
-    // DEBT: Super clumsy, may want additional layer of wrappers for enum class
-    // NOTE: Due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=51242#c31 below,
-    // not using scoped enum at all in this case
-#if defined(FEATURE_CPP_ENUM_CLASS) && !(__GNUC__ < 10)
-    enum class positioning_type
-#else
-    struct positioning_type { enum values
-#endif
-    {
-        left = 0,
-        right,
-        internal
-    };
-#if defined(FEATURE_CPP_ENUM_CLASS) && !(__GNUC__ < 10)
-    using positioning = positioning_type;
-#else
-    };
-
-    typedef typename positioning_type::values positioning;
-#endif
-
-    struct ostream_internal
-    {
-        // DEBT: Width applies to istream *and* ostream
-        unsigned width : 4;
-
-        // NOTE: Hitting compiler warning bug
-        // https://stackoverflow.com/questions/36005063/gcc-suppress-warning-too-small-to-hold-all-values-of
-        // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=51242#c31
-        positioning alignment : 2;  // DEBT: Unused
-        char fillchar : 6;          // + 32 (from ' ' to '`' ASCII)
-        bool showbase : 1;          // DEBT: Unused
-
-        ESTD_CPP_CONSTEXPR_RET ostream_internal() :
-            width(0), alignment(positioning_type::left),
-            fillchar(0) // equivalent to space ' '
-        {
-        }
 
-    }   ostream_;
+#if FEATURE_ESTD_OSTREAM_SETW
 
 public:
     char_type fill() const
@@ -177,9 +138,9 @@ class basic_ostream :
         }
     };
 
-    typedef typename TBase::traits_type traits_type;
+    typedef typename Base::traits_type traits_type;
 
-    typedef basic_ostream<TStreambuf, TBase> __ostream_type;
+    typedef basic_ostream<Streambuf, Base> __ostream_type;
 
     __ostream_type& flush()
     {