trimtrimtrim

src/cx/alphatab.hh

@@ -1,12 +1,10 @@
 /**
  * \file alphatab.hh
- * Dynamic array.
  **/
 #ifndef AlphaTab_HH_
 #define AlphaTab_HH_
 #include <string>
 
-#include "synhax.hh"
 extern "C" {
 #include "table.h"
 }
@@ -17,6 +15,16 @@ namespace C {
   typedef TableT(char) AlphaTab;
 }
 
+inline
+  std::ostream&
+operator<<(ostream& out, const C::AlphaTab& a)
+{
+  size_t n = a.sz;
+  if (n > 0 && a.s[n-1] == '\0') {n -= 1;}
+  if (n > 0) {out.write(a.s, n);}
+  return out;
+}
+
 class AlphaTab
 {
 private:
@@ -114,15 +122,11 @@ public:
   bool empty() const {
     return (this->size() == 0);
   }
-
-  friend C::AlphaTab& operator<<(C::AlphaTab& a, const Cx::AlphaTab& b);
 };
 
 inline
 std::ostream& operator<<(ostream& out, const AlphaTab& a) {
-  if (a.size() > 0)
-    out.write(a.data(), a.size());
-  return out;
+  return (out << (std::string_view)a);
 }
 
 typedef AlphaTab String;