Performance optimization in the JSON parser.

FossilOrigin-Name: 5a88ba743f55d45b1c0ce0090bb3b396bcf7fcf7b3bcb989aaf30b8bb772599e

diff --git a/manifest b/manifest
index a76a4753ef77f5718cf06253167b8f6979bb1d81..25d0e8f8230dbb74b8e122b789aea48681a491dd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Permit\sJSON5\swhitespace\sin\sall\scontexts\sof\sobjects\sand\sarrays.
-D 2023-04-27T13:44:26.660
+C Performance\soptimization\sin\sthe\sJSON\sparser.
+D 2023-04-27T14:38:51.628
 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 28ca7f26c211e0fd705d06d9036de59304f9a3dd5e69e3745a688aafd8c618ae
+F src/json.c d65da6a334ff2f18cea8fa618bf64e085cf3517bdb9a5e570cb1e8531040d976
 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 14e82f36eed31af1237898728bf353b968523c62b1f8d1d90dbbabd92d0c2834
-R 37b7a9f174ccda66654bba8268903617
+P 93f3ab26b57c0469862a56e97d4b3c796b27f9f582046fcff1f2aa8d8910c550
+R 66ad085cb2272ce979fd2644e3aac860
 U drh
-Z 18c492aceae37854acd7e6823a29d2b5
+Z 7c28704af9aa014ef0ec768389ba7618
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 2f3e3c7fd14bfe79cdb00d3a68dd7db158e1e531..6d73e72cdd4c56c0931f2c1c8a459e10d21bbac6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-93f3ab26b57c0469862a56e97d4b3c796b27f9f582046fcff1f2aa8d8910c550
\ No newline at end of file
+5a88ba743f55d45b1c0ce0090bb3b396bcf7fcf7b3bcb989aaf30b8bb772599e
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index dbc1c6b833684ab6cd4ab99cacad47e467c44ca4..3828ca6bc3d28b30880f81c58f939f09c42e2f60 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -1075,19 +1075,35 @@ json_parse_restart:
       if( z[j]==':' ){
         j++;
       }else{
+        if( fast_isspace(z[j]) ){
+          do{ j++; }while( fast_isspace(z[j]) );
+          if( z[j]==':' ){
+            j++;
+            goto parse_object_value;
+          }
+        }
         x = jsonParseValue(pParse, j);
         if( x!=(-5) ) return -1;
         j = pParse->iErr+1;
       }
+    parse_object_value:
       x = jsonParseValue(pParse, j);
       pParse->iDepth--;
-      if( x<0 ) return -1;
+      if( x<=0 ) return -1;
       j = x;
       if( z[j]==',' ){
         continue;
       }else if( z[j]=='}' ){
         break;
       }else{
+        if( fast_isspace(z[j]) ){
+          do{ j++; }while( fast_isspace(z[j]) );
+          if( z[j]==',' ){
+            continue;
+          }else if( z[j]=='}' ){
+            break;
+          }
+        }
         x = jsonParseValue(pParse, j);
         if( x==(-4) ){
           j = pParse->iErr;
@@ -1112,7 +1128,7 @@ json_parse_restart:
       if( ++pParse->iDepth > JSON_MAX_DEPTH ) return -1;
       x = jsonParseValue(pParse, j);
       pParse->iDepth--;
-      if( x<0 ){
+      if( x<=0 ){
         if( x==(-3) ){
           j = pParse->iErr;
           if( pParse->nNode!=(u32)iThis+1 ) pParse->has5 = 1;
@@ -1126,6 +1142,14 @@ json_parse_restart:
       }else if( z[j]==']' ){
         break;
       }else{
+        if( fast_isspace(z[j]) ){
+          do{ j++; }while( fast_isspace(z[j]) );
+          if( z[j]==',' ){
+            continue;
+          }else if( z[j]==']' ){
+            break;
+          }
+        }
         x = jsonParseValue(pParse, j);
         if( x==(-4) ){
           j = pParse->iErr;
@@ -1378,7 +1402,10 @@ static int jsonParse(
     while( fast_isspace(zJson[i]) ) i++;
     if( zJson[i] ){
       i += json5Whitespace(&zJson[i]);
-      if( zJson[i] ) return -1;
+      if( zJson[i] ){
+        jsonParseReset(pParse);
+        return 1;
+      }
       pParse->has5 = 1;
     }
   }