commit 77c7551b2640ddc5ae31900bb80fa86ade0e133c
author Nigel Tao <nigeltao@golang.org> Mon Jul 27 21:35:11 2020 +1000
committer Nigel Tao <nigeltao@golang.org> Mon Jul 27 21:35:11 2020 +1000
tree 4cef7d7513cd851cbda6ab4107606c0cec649b24
parent 35c4e9532ba13077ce18d83856cb04b8cae9c4c0

Fix jsonptr whitespace and commas for CBOR tags

example/jsonptr/jsonptr.cc

diff --git a/example/jsonptr/jsonptr.cc b/example/jsonptr/jsonptr.cc
index c3d842c..e9ce82f 100644
--- a/example/jsonptr/jsonptr.cc
+++ b/example/jsonptr/jsonptr.cc
@@ -338,6 +338,8 @@
   uint64_t detail;
 } g_token_extension;
 
+bool g_previous_token_was_cbor_tag;
+
 uint32_t g_depth;
 
 enum class context {
@@ -819,6 +821,8 @@
   g_token_extension.category = 0;
   g_token_extension.detail = 0;
 
+  g_previous_token_was_cbor_tag = false;
+
   g_depth = 0;
 
   g_ctx = context::none;
@@ -1593,8 +1597,10 @@
     }
 
     // Write preceding whitespace and punctuation, if it wasn't ']', '}' or a
-    // continuation of a multi-token chain.
-    if (start_of_token_chain) {
+    // continuation of a multi-token chain or a CBOR tagged data item.
+    if (g_previous_token_was_cbor_tag) {
+      g_previous_token_was_cbor_tag = false;
+    } else if (start_of_token_chain) {
       if (g_flags.output_format != file_format::json) {
         // No-op.
       } else if (g_ctx == context::in_dict_after_key) {
@@ -1747,6 +1753,7 @@
           g_token_extension.detail = 0;
           goto after_value;
         case CATEGORY_CBOR_TAG:
+          g_previous_token_was_cbor_tag = true;
           TRY(write_cbor_tag(x, tok));
           g_token_extension.category = 0;
           g_token_extension.detail = 0;
@@ -1763,6 +1770,7 @@
         TRY(write_cbor_simple_value(vbd, tok));
         goto after_value;
       } else if (value_minor & WUFFS_CBOR__TOKEN_VALUE_MINOR__TAG) {
+        g_previous_token_was_cbor_tag = true;
         if (t.continued()) {
           if (tok.len != 0) {
             return "main: internal error: unexpected to-be-extended length";