Add ALWAYS macros on unreachable branches in the new JSON5 logic.

FossilOrigin-Name: 91e15ed9d93e51b750172a074dbbcf206128e9476571ce6189b8ea0ba5ab4135

diff --git a/manifest b/manifest
index 3a9b1fb48b8d654aaed4d47a1aaff89b90a45965..f13e0d02403b517c14803d26c4d0a162e5dbed04 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Simplification\sof\sthe\slogic\sthat\snormalizes\sJSON5\sinteger\sliterals\sinto\ncanonical\sJSON\sinteger\sliterals.\s\sImproved\sreporting\sof\sOOM.
-D 2023-04-29T16:31:08.205
+C Add\sALWAYS\smacros\son\sunreachable\sbranches\sin\sthe\snew\sJSON5\slogic.
+D 2023-04-29T17:13:39.696
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -594,7 +594,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 6029d4ce8705ebad5817386a326b620772dcc165e1b23a8e4645061621679538
+F src/json.c 0de525ac85b275cfbe6a7eb565c9c7849f884331153f60024715a47a18ed781e
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c be5af440f3192c58681b5d43167dbca3ccbfce394d89faa22378a14264781136
 F src/main.c 09bc5191f75dc48fc4dfddda143cb864c0c3dbc3297eb9a9c8e01fea58ff847d
@@ -2067,8 +2067,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 3e91494390ba88498eb243f61ce4ef4efa23b58326108a769bc72331d7d7d75b
-R 9934ae2414640783ca534819ca587694
+P 01ee613c07fcb87e7d7b7f1b1387982715d1343418f37f4a1dc90e43a76d20e8
+R 8691ebe0c22e2def3817b9ef68bc683b
 U drh
-Z fec85eb0c6f9c0d91d036f5cadb9198f
+Z 4bc62005656847ff8857de80fff89c9b
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index beb328db1e9909beda6fdb63905260c61f9fc1bb..8139537284e36c59d7e1a7b29bb787586df16168 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-01ee613c07fcb87e7d7b7f1b1387982715d1343418f37f4a1dc90e43a76d20e8
\ No newline at end of file
+91e15ed9d93e51b750172a074dbbcf206128e9476571ce6189b8ea0ba5ab4135
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index 17908fd9766e69ddd9fab3183fa76dda1b11bec6..7876bdcbc47cec525119b00da674a87e1f1e6695 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -1393,7 +1393,7 @@ json_parse_restart:
       }
       if( c=='e' || c=='E' ){
         if( z[j-1]<'0' ){
-          if( z[j-1]=='.' && j-2>=i && sqlite3Isdigit(z[j-2]) ){
+          if( ALWAYS(z[j-1]=='.') && j-2>=i && sqlite3Isdigit(z[j-2]) ){
             pParse->has5 = 1;
             jnFlags |= JNODE_JSON5;
           }else{
@@ -1421,7 +1421,7 @@ json_parse_restart:
       break;
     }
     if( z[j-1]<'0' ){
-      if( z[j-1]=='.' && j-2>=i && sqlite3Isdigit(z[j-2]) ){
+      if( ALWAYS(z[j-1]=='.') && j-2>=i && sqlite3Isdigit(z[j-2]) ){
         pParse->has5 = 1;
         jnFlags |= JNODE_JSON5;
       }else{
@@ -2626,7 +2626,7 @@ static void jsonErrorFunc(
     int n = 1;
     int i;
     const char *z = p->zJson;
-    for(i=0; i<p->iErr && z[i]; i++){
+    for(i=0; i<p->iErr && ALWAYS(z[i]); i++){
       if( (z[i]&0xc0)!=0x80 ) n++;
     }
     sqlite3_result_int(ctx, n);