Improve quote formatter.

asoffer · Dec 4, 2024 · 8483aca · 8483aca
1 parent 7510163
commit 8483aca
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 11 deletions.
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1,5 @@
+<<<<<<< Updated upstream
 7.4.0
+=======
+7.4.1
+>>>>>>> Stashed changes
diff --git a/nth/format/common_formatters.h b/nth/format/common_formatters.h
@@ -84,6 +84,17 @@ struct text_formatter {
   }
 };
 
+struct byte_formatter {
+  void format(io::writer auto& w, std::byte b) const {
+    constexpr char hex[] = "0123456789abcdef";
+    char buffer[2];
+    uint8_t n = static_cast<uint8_t>(b);
+    buffer[0] = hex[n >> 4];
+    buffer[1] = hex[n & 0x0f];
+    io::write_text(w, buffer);
+  }
+};
+
 // A formatter capable of formatting text as an escaped quotation.
 struct quote_formatter {
   void format(io::writer auto& w, std::string_view s) const {
@@ -103,12 +114,32 @@ struct quote_formatter {
           i = 0;
           io::write_text(w, R"(\")");
           break;
+        case '\t':
+          io::write_text(w, s.substr(0, i));
+          s.remove_prefix(i + 1);
+          i = 0;
+          io::write_text(w, R"(\t")");
+          break;
+        case '\\':
+          io::write_text(w, s.substr(0, i));
+          s.remove_prefix(i + 1);
+          i = 0;
+          io::write_text(w, R"(\\)");
+          break;
+        case '\0':
+          io::write_text(w, s.substr(0, i));
+          s.remove_prefix(i + 1);
+          i = 0;
+          io::write_text(w, R"(\0)");
+          break;
         default:
           if (std::isprint(c)) {
             ++i;
             continue;
           } else {
             io::write_text(w, s.substr(0, i));
+            io::write_text(w, "\\x");
+            byte_formatter{}.format(w, static_cast<std::byte>(c));
             s.remove_prefix(i);
             i = 0;
           }
@@ -119,17 +150,6 @@ struct quote_formatter {
   }
 };
 
-struct byte_formatter {
-  void format(io::writer auto& w, std::byte b) const {
-    constexpr char hex[] = "0123456789abcdef";
-    char buffer[2];
-    uint8_t n = static_cast<uint8_t>(b);
-    buffer[0] = hex[n >> 4];
-    buffer[1] = hex[n & 0x0f];
-    io::write_text(w, buffer);
-  }
-};
-
 struct pointer_formatter {
   void format(io::writer auto& w, void const* ptr) const {
     constexpr char hex[]                   = "0123456789abcdef";

diff --git a/nth/format/json_test.cc b/nth/format/json_test.cc
@@ -42,6 +42,9 @@ NTH_TEST("format/json/string") {
   NTH_EXPECT(json("\"hello\n\"") == R"("\"hello\n\"")");
   NTH_EXPECT(json(std::string_view("\"hello\n\"")) == R"("\"hello\n\"")");
   NTH_EXPECT(json(std::string("\"hello\n\"")) == R"("\"hello\n\"")");
+  NTH_EXPECT(json(std::string("hello\\world")) == R"("hello\\world")");
+  NTH_EXPECT(json(std::string("hello\0world", 11)) ==
+             std::string_view(R"("hello\0world")", 14));
 }
 
 NTH_TEST("format/json/array") {