Feature/76 string view

include/tabulate/table.hpp

@@ -35,17 +35,21 @@ SOFTWARE.
 #include <tabulate/table_internal.hpp>
 
 #if __cplusplus >= 201703L
+#include <string_view>
 #include <variant>
 using std::get_if;
 using std::holds_alternative;
 using std::variant;
 using std::visit;
+using std::string_view;
 #else
+#include <tabulate/string_view_lite.hpp>
 #include <tabulate/variant_lite.hpp>
 using nonstd::get_if;
 using nonstd::holds_alternative;
 using nonstd::variant;
 using nonstd::visit;
+using nonstd::string_view;
 #endif
 
 #include <utility>
@@ -56,7 +60,9 @@ class Table {
 public:
   Table() : table_(TableInternal::create()) {}
 
-  Table &add_row(const std::vector<variant<std::string, const char *, Table>> &cells) {
+  using Row_t = std::vector<variant<std::string, const char *, string_view, Table>>;
+
+  Table &add_row(const Row_t &cells) {
 
     if (rows_ == 0) {
       // This is the first row added
@@ -79,6 +85,8 @@ class Table {
         cell_strings[i] = *get_if<std::string>(&cell);
       } else if (holds_alternative<const char *>(cell)) {
         cell_strings[i] = *get_if<const char *>(&cell);
+      }  else if (holds_alternative<string_view>(cell)) {
+        cell_strings[i] = std::string{*get_if<string_view>(&cell)};
       } else {
         auto table = *get_if<Table>(&cell);
         std::stringstream stream;

samples/CMakeLists.txt

@@ -51,3 +51,6 @@ target_link_libraries(asciidoc_export PRIVATE tabulate::tabulate)
 
 add_executable(refresh_table refresh_table.cpp) 
 target_link_libraries(refresh_table PRIVATE tabulate::tabulate pthread)
+
+add_executable(string_view_in_row string_view_in_row.cpp) 
+target_link_libraries(string_view_in_row PRIVATE tabulate::tabulate pthread)

samples/asciidoc_export.cpp

@@ -1,14 +1,6 @@
 #include <tabulate/asciidoc_exporter.hpp>
 using namespace tabulate;
-
-#if __cplusplus >= 201703L
-#include <variant>
-using std::variant;
-#else
-#include <tabulate/variant_lite.hpp>
-using nonstd::variant;
-#endif
-using Row_t = std::vector<variant<std::string, const char *, Table>>;
+using Row_t = Table::Row_t;
 
 int main() {
   Table movies;

samples/class_diagram.cpp

@@ -1,14 +1,6 @@
 #include <tabulate/table.hpp>
 using namespace tabulate;
-
-#if __cplusplus >= 201703L
-#include <variant>
-using std::variant;
-#else
-#include <tabulate/variant_lite.hpp>
-using nonstd::variant;
-#endif
-using Row_t = std::vector<variant<std::string, const char *, Table>>;
+using Row_t = Table::Row_t;
 
 int main() {
   Table class_diagram;

samples/colors.cpp

@@ -1,14 +1,6 @@
 #include <tabulate/table.hpp>
 using namespace tabulate;
-
-#if __cplusplus >= 201703L
-#include <variant>
-using std::variant;
-#else
-#include <tabulate/variant_lite.hpp>
-using nonstd::variant;
-#endif
-using Row_t = std::vector<variant<std::string, const char *, Table>>;
+using Row_t = Table::Row_t;
 
 int main() {
   Table colors;

samples/employees.cpp

@@ -1,14 +1,6 @@
 #include <tabulate/table.hpp>
 using namespace tabulate;
-
-#if __cplusplus >= 201703L
-#include <variant>
-using std::variant;
-#else
-#include <tabulate/variant_lite.hpp>
-using nonstd::variant;
-#endif
-using Row_t = std::vector<variant<std::string, const char *, Table>>;
+using Row_t = Table::Row_t;
 
 int main() {
   Table employees;

samples/font_styles.cpp

@@ -1,14 +1,6 @@
 #include <tabulate/table.hpp>
 using namespace tabulate;
-
-#if __cplusplus >= 201703L
-#include <variant>
-using std::variant;
-#else
-#include <tabulate/variant_lite.hpp>
-using nonstd::variant;
-#endif
-using Row_t = std::vector<variant<std::string, const char *, Table>>;
+using Row_t = Table::Row_t;
 
 int main() {
   Table styled_table;

samples/iterators.cpp

@@ -1,14 +1,6 @@
 #include <tabulate/table.hpp>
 using namespace tabulate;
-
-#if __cplusplus >= 201703L
-#include <variant>
-using std::variant;
-#else
-#include <tabulate/variant_lite.hpp>
-using nonstd::variant;
-#endif
-using Row_t = std::vector<variant<std::string, const char *, Table>>;
+using Row_t = Table::Row_t;
 
 int main() {
   Table table;

samples/latex_export.cpp

@@ -1,14 +1,6 @@
 #include <tabulate/latex_exporter.hpp>
 using namespace tabulate;
-
-#if __cplusplus >= 201703L
-#include <variant>
-using std::variant;
-#else
-#include <tabulate/variant_lite.hpp>
-using nonstd::variant;
-#endif
-using Row_t = std::vector<variant<std::string, const char *, Table>>;
+using Row_t = Table::Row_t;
 
 int main() {
   Table movies;

samples/mario.cpp

@@ -1,21 +1,13 @@
 #include <tabulate/table.hpp>
 using namespace tabulate;
-
-#if __cplusplus >= 201703L
-#include <variant>
-using std::variant;
-#else
-#include <tabulate/variant_lite.hpp>
-using nonstd::variant;
-#endif
-using Row_t = std::vector<variant<std::string, const char *, Table>>;
+using Row_t = Table::Row_t;
 
 int main() {
   Table mario;
   mario.format().color(Color::white).border("").corner("").column_separator("").padding(0);
   size_t rows = 16;
   for (size_t i = 0; i < rows; ++i) {
-    std::vector<variant<std::string, const char *, Table>> row;
+    Row_t row;
     size_t cols = 30;
     for (size_t j = 0; j < cols; ++j) {
       row.push_back("█");

samples/markdown_export.cpp

@@ -1,14 +1,6 @@
 #include <tabulate/markdown_exporter.hpp>
 using namespace tabulate;
-
-#if __cplusplus >= 201703L
-#include <variant>
-using std::variant;
-#else
-#include <tabulate/variant_lite.hpp>
-using nonstd::variant;
-#endif
-using Row_t = std::vector<variant<std::string, const char *, Table>>;
+using Row_t = Table::Row_t;
 
 int main() {
   Table movies;

samples/movies.cpp

@@ -1,6 +1,6 @@
 #include <tabulate/table.hpp>
 using namespace tabulate;
-using Row_t = std::vector<variant<std::string, const char *, Table>>;
+using Row_t = Table::Row_t;
 
 int main() {
   Table movies;

samples/padding.cpp

@@ -1,14 +1,6 @@
 #include <tabulate/table.hpp>
 using namespace tabulate;
-
-#if __cplusplus >= 201703L
-#include <variant>
-using std::variant;
-#else
-#include <tabulate/variant_lite.hpp>
-using nonstd::variant;
-#endif
-using Row_t = std::vector<variant<std::string, const char *, Table>>;
+using Row_t = Table::Row_t;
 
 int main() {
   Table no_padding;

samples/refresh_table.cpp

@@ -6,7 +6,7 @@
 
 
 using namespace tabulate;
-using Row_t = std::vector<variant<std::string, const char *, Table>>;
+using Row_t = Table::Row_t;
 std::atomic_bool keep_running(true);
 
 void waitingForWorkEnterKey() {

samples/runic.cpp

@@ -1,14 +1,6 @@
 #include <tabulate/table.hpp>
 using namespace tabulate;
-
-#if __cplusplus >= 201703L
-#include <variant>
-using std::variant;
-#else
-#include <tabulate/variant_lite.hpp>
-using nonstd::variant;
-#endif
-using Row_t = std::vector<variant<std::string, const char *, Table>>;
+using Row_t = Table::Row_t;
 
 int main() {
   Table table;

samples/shape.cpp

@@ -1,14 +1,6 @@
 #include <tabulate/table.hpp>
 using namespace tabulate;
-
-#if __cplusplus >= 201703L
-#include <variant>
-using std::variant;
-#else
-#include <tabulate/variant_lite.hpp>
-using nonstd::variant;
-#endif
-using Row_t = std::vector<variant<std::string, const char *, Table>>;
+using Row_t = Table::Row_t;
 
 void print_shape(Table &table) {
   auto shape = table.shape();

samples/string_view_in_row.cpp

@@ -0,0 +1,30 @@
+#include <tabulate/table.hpp>
+using namespace tabulate;
+using Row_t = Table::Row_t;
+
+#if __cplusplus >= 201703L
+#include <string_view>
+using std::string_view;
+#else
+#include <tabulate/string_view_lite.hpp>
+using nonstd::string_view;
+#endif
+
+int main() {
+  Table table;
+
+  string_view c0 = "string_view";
+  const char * c1 = "const char *";
+  std::string c2 = "std::string";
+
+  Table c3;
+  c3.add_row({"Table", "", ""});
+  c3.add_row({c0, c1, c2});
+  c3[0].format()
+    .border("")
+    .corner("");
+
+  table.add_row({c0, c1, c2, c3});
+
+  std::cout << table << std::endl;
+}

samples/summary.cpp

@@ -1,14 +1,6 @@
 #include <tabulate/table.hpp>
 using namespace tabulate;
-
-#if __cplusplus >= 201703L
-#include <variant>
-using std::variant;
-#else
-#include <tabulate/variant_lite.hpp>
-using nonstd::variant;
-#endif
-using Row_t = std::vector<variant<std::string, const char *, Table>>;
+using Row_t = Table::Row_t;
 
 int main() {
 
@@ -117,15 +109,15 @@ int main() {
       .hide_border();
 
   for (size_t i = 0; i < 9; ++i) {
-    std::vector<variant<std::string, const char *, Table>> row;
+    Row_t row;
     row.push_back(std::to_string(90 - i * 10));
     for (size_t j = 0; j <= 50; ++j) {
       row.push_back(" ");
     }
     chart.add_row(row);
   }
 
-  std::vector<variant<std::string, const char *, Table>> row;
+  Row_t row;
   for (int i = 0; i <= 12; ++i) {
     if ((i + 1) % 4 == 0) {
       row.push_back(std::to_string(i + 1));

samples/unicode.cpp

@@ -1,14 +1,6 @@
 #include <tabulate/table.hpp>
 using namespace tabulate;
-
-#if __cplusplus >= 201703L
-#include <variant>
-using std::variant;
-#else
-#include <tabulate/variant_lite.hpp>
-using nonstd::variant;
-#endif
-using Row_t = std::vector<variant<std::string, const char *, Table>>;
+using Row_t = Table::Row_t;
 
 int main() {
   Table table;

samples/universal_constants.cpp

@@ -1,14 +1,6 @@
 #include <tabulate/table.hpp>
 using namespace tabulate;
-
-#if __cplusplus >= 201703L
-#include <variant>
-using std::variant;
-#else
-#include <tabulate/variant_lite.hpp>
-using nonstd::variant;
-#endif
-using Row_t = std::vector<variant<std::string, const char *, Table>>;
+using Row_t = Table::Row_t;
 
 int main() {
 

samples/word_wrapping.cpp

@@ -1,14 +1,6 @@
 #include <tabulate/table.hpp>
 using namespace tabulate;
-
-#if __cplusplus >= 201703L
-#include <variant>
-using std::variant;
-#else
-#include <tabulate/variant_lite.hpp>
-using nonstd::variant;
-#endif
-using Row_t = std::vector<variant<std::string, const char *, Table>>;
+using Row_t = Table::Row_t;
 
 int main() {
   Table table;

single_include.json

@@ -4,6 +4,7 @@
     "sources": [
         "include/tabulate/variant_lite.hpp",
         "include/tabulate/optional_lite.hpp",
+        "include/tabulate/string_view_lite.hpp",        
         "include/tabulate/termcolor.hpp",
         "include/tabulate/utf8.hpp",
         "include/tabulate/color.hpp",