Fix ungron bug when a line's ending token is a substring of the follo…

…wing ending token
adamritter · Dec 6, 2023 · d01be71 · d01be71
1 parent fd3a34a
commit d01be71
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/fastgron.cpp b/src/fastgron.cpp
@@ -467,6 +467,11 @@ int main(int argc, char *argv[])
             {
                 common++;
             }
+            // if it's not a token ending, make sure we don't use the last token
+            if (common < line.size() && line[common] != ' ' && line[common] != '=' && line[common] != '.' && line[common] != '[')
+            {
+                common--;
+            }
             int index = 0;
             while (index < parse_gron_builder_offsets.size() && parse_gron_builder_offsets[index] <= common)
             {

diff --git a/src/parse_gron.cpp b/src/parse_gron.cpp
@@ -3,7 +3,6 @@
 #include "jsonutils.hpp"
 #include <stdexcept>
 
-
 // BUG: ["..."] is not handled
 void parse_gron(string_view line, Builder &builder, int offset,
                 vector<Builder *> &parse_gron_builders,