containers: handle fixed format and separators the same way

akimd · akimd · commit e8943e8ecb02 · 2017-03-21T18:44:51.000+01:00
This screams for factoring.
diff --git a/src/elle/flat-set.hh b/src/elle/flat-set.hh
@@ -46,17 +46,15 @@ namespace boost
     std::ostream&
     operator <<(std::ostream& out, flat_set<Args...> const& s)
     {
-      out << "{";
-      bool first = true;
+      auto const format = is_fixed(out) ? "%s%f" : "%s%s";
+      out << '{';
+      auto* sep = "";
       for (auto const& e: s)
-        {
-          if (first)
-            first = false;
-          else
-            out << ", ";
-          elle::fprintf(out, "%s", e);
-        }
-      out << "}";
+      {
+        elle::fprintf(out, format, sep, e);
+        sep = ", ";
+      }
+      out << '}';
       return out;
     }
   }
diff --git a/src/map b/src/map
@@ -4,32 +4,31 @@
 #include_next <map>
 #include <vector>
 
+#include <elle/make-vector.hh>
 #include <elle/printf-fwd.hh>
 
 namespace std
 {
   template <typename... Args>
   std::ostream&
   operator <<(ostream& out,
-              map<Args...> const& map)
+              map<Args...> const& s)
   {
-    out << "{";
-    bool first = true;
-    for (auto const& elt: map)
+    auto const format = is_fixed(out) ? "%s%f: %f" : "%s%s: %s";
+    out << '{';
+      auto* sep = "";
+    for (auto const& e: s)
     {
-      if (first)
-        first = false;
-      else
-        out << ", ";
-      elle::fprintf(out, "%s: %s", elt.first, elt.second);
+      elle::fprintf(out, format, sep, e.first, e.second);
+      sep = ", ";
     }
-    out << "}";
+    out << '}';
     return out;
   }
 
   template <typename... Args, typename E>
   bool
-  contains(std::map<Args...> const& map, E const& e)
+  contains(map<Args...> const& map, E const& e)
   {
     return map.find(e) != map.end();
   }
@@ -42,10 +41,8 @@ namespace elle
   keys(std::map<K, Args...> const& m)
     -> std::vector<K>
   {
-    auto res = std::vector<K>{};
-    for (const auto& p: m)
-      res.emplace_back(p.first);
-    return res;
+    return make_vector(m,
+                       [](const auto& p) { return p.first; });
   }
 }
 
diff --git a/src/set b/src/set
@@ -15,21 +15,17 @@ namespace std
 
   template <typename... Args>
   ostream&
-  operator <<(ostream& out, set<Args...> const& v)
+  operator <<(ostream& out, set<Args...> const& s)
   {
-    elle::fprintf(out, "{");
-    bool first = true;
-    for (auto const& elt: v)
+    auto const format = is_fixed(out) ? "%s%f" : "%s%s";
+    out << '{';
+    auto* sep = "";
+    for (auto const& e: s)
     {
-      if (first)
-      {
-        first = false;
-        elle::fprintf(out, "%s", elt);
-      }
-      else
-        elle::fprintf(out, ", %s", elt);
+      elle::fprintf(out, format, sep, e);
+      sep = ", ";
     }
-    elle::fprintf(out, "}");
+    out << '}';
     return out;
   }
 }
diff --git a/src/unordered_map b/src/unordered_map
@@ -10,19 +10,17 @@ namespace std
   template <typename... Args>
   std::ostream&
   operator <<(ostream& out,
-              unordered_map<Args...> const& map)
+              unordered_map<Args...> const& s)
   {
-    out << "{";
-    bool first = true;
-    for (auto const& elt: map)
+    auto const format = is_fixed(out) ? "%s%f: %f" : "%s%s: %s";
+    out << '{';
+    auto* sep = "";
+    for (auto const& e: s)
     {
-      if (first)
-        first = false;
-      else
-        out << ", ";
-      elle::fprintf(out, "%s: %s", elt.first, elt.second);
+      elle::fprintf(out, format, sep, e.first, e.second);
+      sep = ", ";
     }
-    out << "}";
+    out << '}';
     return out;
   }
 
diff --git a/src/unordered_set b/src/unordered_set
@@ -8,22 +8,17 @@ namespace std
 {
   template <typename... Args>
   ostream&
-  operator <<(ostream& out, unordered_set<Args...> const& v)
+  operator <<(ostream& out, unordered_set<Args...> const& s)
   {
-    elle::fprintf(out, "{");
-    bool first = true;
-    bool fixed = out.flags() & std::ios::fixed;
-    for (auto const& elt: v)
+    auto const format = is_fixed(out) ? "%s%f" : "%s%s";
+    out << '{';
+    auto* sep = "";
+    for (auto const& e: s)
     {
-      if (first)
-      {
-        first = false;
-        elle::fprintf(out, fixed ? "%f" : "%s", elt);
-      }
-      else
-        elle::fprintf(out, fixed ? ", %f" : ", %s", elt);
+      elle::fprintf(out, format, sep, e);
+      sep = ", ";
     }
-    elle::fprintf(out, "}");
+    out << '}';
     return out;
   }
 
diff --git a/src/utility b/src/utility
@@ -10,11 +10,9 @@ namespace std
   std::basic_ostream<charT, traits>&
   operator <<(std::basic_ostream<charT, traits>& o, std::pair<T1, T2> const& p)
   {
-    if (is_fixed(o))
-      elle::fprintf(o, "(%f, %f)", p.first, p.second);
-    else
-      elle::fprintf(o, "(%s, %s)", p.first, p.second);
-    return o;
+    return elle::fprintf(o,
+                         is_fixed(o) ? "(%f, %f)" : "(%s, %s)",
+                         p.first, p.second);
   }
 }
 
diff --git a/src/vector b/src/vector
@@ -9,21 +9,17 @@ namespace std
 {
   template <typename... Args>
   ostream&
-  operator <<(ostream& out, vector<Args...> const& v)
+  operator <<(ostream& out, vector<Args...> const& s)
   {
-    elle::fprintf(out, "[");
-    bool first = true;
-    for (auto const& elt: v)
+    auto const format = is_fixed(out) ? "%s%f" : "%s%s";
+    out << '[';
+    auto* sep = "";
+    for (auto const& e: s)
     {
-      if (first)
-      {
-        first = false;
-        elle::fprintf(out, is_fixed(out) ? "%f" : "%s", elt);
-      }
-      else
-        elle::fprintf(out, is_fixed(out) ? ", %f" : ", %s", elt);
+      elle::fprintf(out, format, sep, e);
+      sep = ", ";
     }
-    elle::fprintf(out, "]");
+    out << ']';
     return out;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,32 +4,31 @@`
`4`	`4`	`#include_next <map>`
`5`	`5`	`#include <vector>`
`6`	`6`
	`7`	`+#include <elle/make-vector.hh>`
`7`	`8`	`#include <elle/printf-fwd.hh>`
`8`	`9`
`9`	`10`	`namespace std`
`10`	`11`	`{`
`11`	`12`	`template <typename... Args>`
`12`	`13`	`std::ostream&`
`13`	`14`	`operator <<(ostream& out,`
`14`		`- map<Args...> const& map)`
	`15`	`+ map<Args...> const& s)`
`15`	`16`	`{`
`16`		`- out << "{";`
`17`		`- bool first = true;`
`18`		`- for (auto const& elt: map)`
	`17`	`+ auto const format = is_fixed(out) ? "%s%f: %f" : "%s%s: %s";`
	`18`	`+ out << '{';`
	`19`	`+ auto* sep = "";`
	`20`	`+ for (auto const& e: s)`
`19`	`21`	`{`
`20`		`- if (first)`
`21`		`- first = false;`
`22`		`- else`
`23`		`- out << ", ";`
`24`		`- elle::fprintf(out, "%s: %s", elt.first, elt.second);`
	`22`	`+ elle::fprintf(out, format, sep, e.first, e.second);`
	`23`	`+ sep = ", ";`
`25`	`24`	`}`
`26`		`- out << "}";`
	`25`	`+ out << '}';`
`27`	`26`	`return out;`
`28`	`27`	`}`
`29`	`28`
`30`	`29`	`template <typename... Args, typename E>`
`31`	`30`	`bool`
`32`		`- contains(std::map<Args...> const& map, E const& e)`
	`31`	`+ contains(map<Args...> const& map, E const& e)`
`33`	`32`	`{`
`34`	`33`	`return map.find(e) != map.end();`
`35`	`34`	`}`
`@@ -42,10 +41,8 @@ namespace elle`
`42`	`41`	`keys(std::map<K, Args...> const& m)`
`43`	`42`	`-> std::vector<K>`
`44`	`43`	`{`
`45`		`- auto res = std::vector<K>{};`
`46`		`- for (const auto& p: m)`
`47`		`- res.emplace_back(p.first);`
`48`		`- return res;`
	`44`	`+ return make_vector(m,`
	`45`	`+ [](const auto& p) { return p.first; });`
`49`	`46`	`}`
`50`	`47`	`}`
`51`	`48`
Original file line number	Diff line number	Diff line change
`@@ -15,21 +15,17 @@ namespace std`
`15`	`15`
`16`	`16`	`template <typename... Args>`
`17`	`17`	`ostream&`
`18`		`- operator <<(ostream& out, set<Args...> const& v)`
	`18`	`+ operator <<(ostream& out, set<Args...> const& s)`
`19`	`19`	`{`
`20`		`- elle::fprintf(out, "{");`
`21`		`- bool first = true;`
`22`		`- for (auto const& elt: v)`
	`20`	`+ auto const format = is_fixed(out) ? "%s%f" : "%s%s";`
	`21`	`+ out << '{';`
	`22`	`+ auto* sep = "";`
	`23`	`+ for (auto const& e: s)`
`23`	`24`	`{`
`24`		`- if (first)`
`25`		`- {`
`26`		`- first = false;`
`27`		`- elle::fprintf(out, "%s", elt);`
`28`		`- }`
`29`		`- else`
`30`		`- elle::fprintf(out, ", %s", elt);`
	`25`	`+ elle::fprintf(out, format, sep, e);`
	`26`	`+ sep = ", ";`
`31`	`27`	`}`
`32`		`- elle::fprintf(out, "}");`
	`28`	`+ out << '}';`
`33`	`29`	`return out;`
`34`	`30`	`}`
`35`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,9 @@ namespace std`
`10`	`10`	`std::basic_ostream<charT, traits>&`
`11`	`11`	`operator <<(std::basic_ostream<charT, traits>& o, std::pair<T1, T2> const& p)`
`12`	`12`	`{`
`13`		`- if (is_fixed(o))`
`14`		`- elle::fprintf(o, "(%f, %f)", p.first, p.second);`
`15`		`- else`
`16`		`- elle::fprintf(o, "(%s, %s)", p.first, p.second);`
`17`		`- return o;`
	`13`	`+ return elle::fprintf(o,`
	`14`	`+ is_fixed(o) ? "(%f, %f)" : "(%s, %s)",`
	`15`	`+ p.first, p.second);`
`18`	`16`	`}`
`19`	`17`	`}`
`20`	`18`
Original file line number	Diff line number	Diff line change
`@@ -9,21 +9,17 @@ namespace std`
`9`	`9`	`{`
`10`	`10`	`template <typename... Args>`
`11`	`11`	`ostream&`
`12`		`- operator <<(ostream& out, vector<Args...> const& v)`
	`12`	`+ operator <<(ostream& out, vector<Args...> const& s)`
`13`	`13`	`{`
`14`		`- elle::fprintf(out, "[");`
`15`		`- bool first = true;`
`16`		`- for (auto const& elt: v)`
	`14`	`+ auto const format = is_fixed(out) ? "%s%f" : "%s%s";`
	`15`	`+ out << '[';`
	`16`	`+ auto* sep = "";`
	`17`	`+ for (auto const& e: s)`
`17`	`18`	`{`
`18`		`- if (first)`
`19`		`- {`
`20`		`- first = false;`
`21`		`- elle::fprintf(out, is_fixed(out) ? "%f" : "%s", elt);`
`22`		`- }`
`23`		`- else`
`24`		`- elle::fprintf(out, is_fixed(out) ? ", %f" : ", %s", elt);`
	`19`	`+ elle::fprintf(out, format, sep, e);`
	`20`	`+ sep = ", ";`
`25`	`21`	`}`
`26`		`- elle::fprintf(out, "]");`
	`22`	`+ out << ']';`
`27`	`23`	`return out;`
`28`	`24`	`}`
`29`	`25`	`}`