Improved string escaping

adamritter · Dec 5, 2023 · 71cdbe8 · 71cdbe8
1 parent 81c6d56
commit 71cdbe8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/src/jsonutils.hpp b/src/jsonutils.hpp
@@ -70,6 +70,10 @@ inline int raw_json_string_length(string_view str)
                 return s - str.begin();
             }
             break;
+        case '\n':
+        case '\r':
+        case 0:
+            return -1;
         default:
             if (in_escape)
             {

diff --git a/src/parse_gron.cpp b/src/parse_gron.cpp
@@ -1,5 +1,6 @@
 #include <string_view>
 #include "parse_gron.hpp"
+#include "jsonutils.hpp"
 #include <stdexcept>
 
 
@@ -48,11 +49,13 @@ void parse_gron(string_view line, Builder &builder, int offset,
 
         // find end of key
         size_t end = 2;
-        while (end < line.size() && line[end] != '"')
+        size_t len = raw_json_string_length(line.substr(2));
+        if (len == -1)
         {
-            end++;
+            throw std::runtime_error("Expected \"");
         }
-        string key(line.substr(2, end - 2));
+        end += len;
+        string key(line.substr(2, len));
         auto child = map_alt.find(key);
         if (child == map_alt.end())
         {

diff --git a/src/print_gron.cpp b/src/print_gron.cpp
@@ -89,15 +89,18 @@ void recursive_print_gron(simdjson::ondemand::value element, growing_string &pat
             growing_string out2;
             for (auto field : element.get_object())
             {
-                auto key = field.unescaped_key();
-                string key_str(key.value());
-                if (!is_js_identifier(key.value()))
+                auto key_orig = field.key();
+                auto key_value_raw = key_orig.value().raw();
+                auto key =  string_view(key_value_raw, raw_json_string_length(key_value_raw));
+
+                string key_str(key);
+                if (!is_js_identifier(key))
                 {
                     if (flags & COLOR)
                         path.append("\033[1;34m[\033[1;35m\"");
                     else
                         path.append("[\"");
-                    path.append(key.value());
+                    path.append(key);
 
                     if (flags & COLOR)
                         path.append("\"\033[1;34m]\033[0m");
@@ -109,7 +112,7 @@ void recursive_print_gron(simdjson::ondemand::value element, growing_string &pat
                     path.append(".");
                     if (flags & COLOR)
                         path.append("\033[1;34m");
-                    path.append(key.value());
+                    path.append(key);
                     if (flags & COLOR)
                         path.append("\033[0m");
                 }
@@ -130,14 +133,16 @@ void recursive_print_gron(simdjson::ondemand::value element, growing_string &pat
 
             for (auto field : element.get_object())
             {
-                auto key = field.unescaped_key();
-                if (!is_js_identifier(key.value()))
+                auto key_orig = field.key();
+                auto key_value_raw = key_orig.value().raw();
+                auto key =  string_view(key_value_raw, raw_json_string_length(key_value_raw));
+                if (!is_js_identifier(key))
                 {
                     if (flags & COLOR)
                         path.append("\033[1;34m[\033[1;35m\"");
                     else
                         path.append("[\"");
-                    path.append(key.value());
+                    path.append(key);
                     if (flags & COLOR)
                         path.append("\"\033[1;34m]\033[0m");
                     else
@@ -148,7 +153,7 @@ void recursive_print_gron(simdjson::ondemand::value element, growing_string &pat
                     path.append(".");
                     if (flags & COLOR)
                         path.append("\033[1;34m");
-                    path.append(key.value());
+                    path.append(key);
                     if (flags & COLOR)
                         path.append("\033[0m");
                 }