Further optimizations to the JSON parser.

FossilOrigin-Name: bb8f1c16f244f893170f3d03bc445bd15fc337804c7c3e76c548397f5b95b39a

diff --git a/manifest b/manifest
index ecb7db6751eccc3f838f2239189bf841348bd787..a630d6827fe1eb1d122f22be410a3ce39ba9789d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Faster\simplementation\sof\snumberic\sliteral\sparsing\sin\sJSON.
-D 2023-04-27T19:13:20.680
+C Further\soptimizations\sto\sthe\sJSON\sparser.
+D 2023-04-27T19:30:53.107
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -592,7 +592,7 @@ F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h b638809e083b601b618df877b2e89cb87c2a47a01f4def10be4c4ebb54664ac7
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c a8de1db43335fc4946370a7a7e47d89975ad678ddb15078a150e993ba2fb37d4
-F src/json.c dc5befb58a71eca4c3703b2b62f4ef7bfe2087f261a21f84c0aa0f0d930e04f3
+F src/json.c 1c1cc509dd866dc05973eea6bd390c318c57fdad63c239ed3e2d214f78560dd5
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c be5af440f3192c58681b5d43167dbca3ccbfce394d89faa22378a14264781136
 F src/main.c 09bc5191f75dc48fc4dfddda143cb864c0c3dbc3297eb9a9c8e01fea58ff847d
@@ -2063,8 +2063,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 85e00c9e68d0695592e8f72555ee133c096bfca5a860a8e21d1e0ef756705aaf
-R 2024c2bf9c60e37e973abadb1fa7e9e0
+P 58398292e8473b0b9e4b77dd5ed27334bc24a85d0c399e8d0b86de6fb59dadce
+R 89caa52021148a7b8eb691f84233609e
 U drh
-Z 1a9a05d48349450ebaef68906cd35ee3
+Z e1f8b732b22a9ab7f249168903fe39b6
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index b162c935120e1c839cf2ed2da27bba0bd2302198..29f502947ffb0fa5de924667b75fce84f228c31a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-58398292e8473b0b9e4b77dd5ed27334bc24a85d0c399e8d0b86de6fb59dadce
\ No newline at end of file
+bb8f1c16f244f893170f3d03bc445bd15fc337804c7c3e76c548397f5b95b39a
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index ce33f83d545bc58f2b3f18f2d3094a91f1ab6a22..72ec1af10e9452f9f059850ab11a6dbe78cdff2b 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -891,8 +891,8 @@ static int jsonParseAddNode(
     return jsonParseAddNodeExpand(pParse, eType, n, zContent);
   }
   p = &pParse->aNode[pParse->nNode];
-  p->eType = (u8)eType;
-  p->jnFlags = 0;
+  p->eType = (u8)(eType & 0xff);
+  p->jnFlags = (u8)(eType >> 8);
   VVA( p->eU = zContent ? 1 : 0 );
   p->n = n;
   p->u.zJContent = zContent;
@@ -1092,10 +1092,7 @@ json_parse_restart:
         if( sqlite3Isalpha(z[j]) || z[j]=='_' || z[j]=='$' ){
           int k;
           for(k=j+1; sqlite3Isalnum(z[k]) || z[k]=='_' || z[k]=='$'; k++){}
-          jsonParseAddNode(pParse, JSON_STRING, k-j, &z[j]);
-          if( !pParse->oom ){
-            pParse->aNode[pParse->nNode-1].jnFlags = JNODE_RAW;
-          }
+          jsonParseAddNode(pParse, JSON_STRING | (JNODE_RAW<<8), k-j, &z[j]);
           pParse->has5 = 1;
           x = k;
         }else{
@@ -1239,8 +1236,7 @@ json_parse_restart:
       }
       j++;
     }
-    jsonParseAddNode(pParse, JSON_STRING, j+1-i, &z[i]);
-    if( !pParse->oom ) pParse->aNode[pParse->nNode-1].jnFlags = jnFlags;
+    jsonParseAddNode(pParse, JSON_STRING | (jnFlags<<8), j+1-i, &z[i]);
     return j+1;
   }
   case 'n': {
@@ -1395,10 +1391,7 @@ json_parse_restart:
       }
     }
   parse_number_finish:
-    jsonParseAddNode(pParse, seenDP, j - i, &z[i]);
-    if( jnFlags && !pParse->oom ){
-      pParse->aNode[pParse->nNode-1].jnFlags = jnFlags;
-    }
+    jsonParseAddNode(pParse, seenDP | (jnFlags<<8), j - i, &z[i]);
     return j;
   }
   case 'N': {