Improved response to Infinity and NaN. Remove the termporary fpdecode()

function.

FossilOrigin-Name: 76ab8ae809a47a66688e2d50c20dc87ce946d82e9ffebb3adda55c451fad07fc

diff --git a/manifest b/manifest
index 253d40cde3457f0b18490fd9cc8b1d09734d53e4..c7e0fa72ac209a06bbdf46ed15b0441371209212 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Progress\stowards\sfixing\scorner-case\sfloating-point\sformatting\sissues.
-D 2023-07-01T14:03:50.030
+C Improved\sresponse\sto\sInfinity\sand\sNaN.\s\sRemove\sthe\stermporary\sfpdecode()\nfunction.
+D 2023-07-01T15:23:24.956
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -590,7 +590,7 @@ F src/delete.c cd5f5cd06ed0b6a882ec1a8c2a0d73b3cecb28479ad19e9931c4706c5e2182be
 F src/expr.c 8d1656b65e26af3e34f78e947ac423f0d20c214ed25a67486e433bf16ca6b543
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c a7fcbf7e66d14dbb73cf49f31489ebf66d0e6006c62b95246924a3bae9f37b36
-F src/func.c a6917bd4d4d81ac2320664ea982f85e1a08e566162ef1c776e965fc974b26502
+F src/func.c 6b4804738b4d869f40625958b476a8f964d3df65b626e72a530d76051863cf32
 F src/global.c bd0892ade7289f6e20bff44c07d06371f2ff9b53cea359e7854b9b72f65adc30
 F src/hash.c 9ee4269fb1d6632a6fecfb9479c93a1f29271bddbbaf215dd60420bcb80c7220
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
@@ -633,7 +633,7 @@ F src/pcache1.c 602acb23c471bb8d557a6f0083cc2be641d6cafcafa19e481eba7ef4c9ca0f00
 F src/pragma.c 37b8fb02d090262280c86e1e2654bf59d8dbfbfe8dc6733f2b968a11374c095a
 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c d6c4354f8ea0dc06962fbabc4b68c4471a45276a2918c929be00f9f537f69eb1
-F src/printf.c 1291f62b21bbad23d7f9557d5255a0749fb24b86d4bc293fe7210e5a2cdf51b4
+F src/printf.c 161c522372d34eccb6fbc75b62c40533559ce3f7816a95854dc17e1fa4b4c0d7
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 37953a5f36c60bea413c3c04efcd433b6177009f508ef2ace0494728912fe2e9
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
@@ -642,7 +642,7 @@ F src/shell.c.in 2c02c819349de410d63fcc0217763dfe5a42dbe58f2d68046d4ea8a376d12c2
 F src/sqlite.h.in 3076d78836b6dac53b3ab0875fc8fd15bca8077aad4d33c85336e05af6aef8c7
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
-F src/sqliteInt.h 333195d3a62c34af256216e229deb052d87d1068785467a590b56acba0b6c711
+F src/sqliteInt.h 8c1922b2780624225223fd407f995b04392175d33dfcbbca37fe1f00e1abfd0a
 F src/sqliteLimit.h 33b1c9baba578d34efe7dfdb43193b366111cdf41476b1e82699e14c11ee1fb6
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -705,7 +705,7 @@ F src/trigger.c ad6ab9452715fa9a8075442e15196022275b414b9141b566af8cdb7a1605f2b0
 F src/update.c 0aa36561167a7c40d01163238c297297962f31a15a8d742216b3c37cdf25f731
 F src/upsert.c 5303dc6c518fa7d4b280ec65170f465c7a70b7ac2b22491598f6d0b4875b3145
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
-F src/util.c fc7991df98ed37aca761b40671f39b1359ed4accdcd60546ce58a6e9cb28d6c3
+F src/util.c 9cddb6a7b31656609e8585475c30e6148a442273b73bfbb3eaabd56e04f157dd
 F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
 F src/vdbe.c 74282a947234513872a83b0bab1b8c644ece64b3e27b053ef17677c8ff9c81e0
 F src/vdbe.h 41485521f68e9437fdb7ec4a90f9d86ab294e9bb8281e33b235915e29122cfc0
@@ -2041,8 +2041,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 bdfd1eb1d7b4c570a53d58789dac0bf55fdaf8eba515d5a0caf2e57e25b51952
-R fb72667e1d4a1498dbacfca13643a6ba
+P 1138b8d16edef16d2943d407e289d07d546a14e64c3efa3c94127631e06fafeb
+R 9f9cd9357c9913af2aa19cc840191091
 U drh
-Z 2c618a760c02dc2da550092622885ef7
+Z 1a305ec6bce26e8306c1bccf245f209e
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 6095020f47a44bacda6df9595d88b42561fbd518..2f293ccf31d37306dc91dd3bcd09e95502128984 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1138b8d16edef16d2943d407e289d07d546a14e64c3efa3c94127631e06fafeb
\ No newline at end of file
+76ab8ae809a47a66688e2d50c20dc87ce946d82e9ffebb3adda55c451fad07fc
\ No newline at end of file

diff --git a/src/func.c b/src/func.c
index e41af59b7b5b52d85f2974d8d280f185360e7c5f..b243591863fdf61177b42cf6b61586164f90bca4 100644 (file)
--- a/src/func.c
+++ b/src/func.c
@@ -2371,25 +2371,6 @@ static void signFunc(
   sqlite3_result_int(context, x<0.0 ? -1 : x>0.0 ? +1 : 0);
 }
 
-
-#if 1 /* Temporary prototyping logic */
-static void fpdecodeFunc(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  double r = sqlite3_value_double(argv[0]);
-  int n = 15;
-  FpDecode s;
-  char zBuf[50];
-
-  if( argc>=2 ) n = sqlite3_value_int(argv[1]);
-  sqlite3FpDecode(&s, r, n);
-  sqlite3_snprintf(sizeof(zBuf), zBuf, "%c%.*s/%d", s.sign, s.n, s.z, s.iDP);
-  sqlite3_result_text(context, zBuf, -1, SQLITE_TRANSIENT);
-}
-#endif /* Temporary prototyping logic */
-
 /*
 ** All of the FuncDef structures in the aBuiltinFunc[] array above
 ** to the global function hash table.  This occurs at start-time (as
@@ -2461,12 +2442,6 @@ void sqlite3RegisterBuiltinFunctions(void){
     FUNCTION(unicode,            1, 0, 0, unicodeFunc      ),
     FUNCTION(char,              -1, 0, 0, charFunc         ),
     FUNCTION(abs,                1, 0, 0, absFunc          ),
-
-#if 1  /* Temporary prototyping function */
-    FUNCTION(fpdecode,           1, 0, 0, fpdecodeFunc     ),
-    FUNCTION(fpdecode,           2, 0, 0, fpdecodeFunc     ),
-#endif
-  
 #ifndef SQLITE_OMIT_FLOATING_POINT
     FUNCTION(round,              1, 0, 0, roundFunc        ),
     FUNCTION(round,              2, 0, 0, roundFunc        ),

diff --git a/src/printf.c b/src/printf.c
index 78f59757df26265cd45bb48b7485a15d32d36a96..4de06c1162bc3d35c2044209e930c740b08b9b33 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -482,6 +482,7 @@ void sqlite3_str_vappendf(
       case etEXP:
       case etGENERIC: {
         FpDecode s;
+        int iRound;
 
         if( bArgList ){
           realvalue = getDoubleArg(pArgList);
@@ -494,33 +495,36 @@ void sqlite3_str_vappendf(
           precision = SQLITE_FP_PRECISION_LIMIT;
         }
 #endif
-        switch( xtype ){
-          case etFLOAT:    sqlite3FpDecode(&s, realvalue, -precision);  break;
-          case etGENERIC:  sqlite3FpDecode(&s, realvalue, precision);   break;
-          case etEXP:      sqlite3FpDecode(&s, realvalue, precision+1); break;
-        }
-        if( s.isNan ){
-          if( flag_zeropad ){
-            bufpt = "null";
-            length = 4;
-          }else{
-            bufpt = "NaN";
-            length = 3;
-          }
-          break;
+        if( xtype==etFLOAT ){
+          iRound = -precision;
+        }else if( xtype==etGENERIC ){
+          iRound = precision;
+        }else{
+          iRound = precision+1;
         }
-        if( s.isInf ){
-          if( s.sign=='-' ){
-            bufpt = "-Inf";
-            length = 4;
-          }else if( flag_prefix=='+' ){
-            bufpt = "+Inf";
-            length = 4;
+        sqlite3FpDecode(&s, realvalue, iRound);
+        if( s.isSpecial ){
+          if( s.isSpecial==2 ){
+            bufpt = flag_zeropad ? "null" : "NaN";
+            length = sqlite3Strlen30(bufpt);
+            break;
+          }else if( flag_zeropad ){
+            s.z[0] = '9';
+            s.iDP = 1000;
+            s.n = 1;
           }else{
-            bufpt = "Inf";
-            length = 3;
+            memcpy(buf, "-Inf", 5);
+            bufpt = buf;
+            if( s.sign=='-' ){
+              /* no-op */
+            }else if( flag_prefix ){
+              buf[0] = flag_prefix;
+            }else{
+              bufpt++;
+            }
+            length = sqlite3Strlen30(bufpt);
+            break;
           }
-          break;
         }
         if( s.sign=='-' ){
           prefix = '-';

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 96cac978c7ca4c5b4bc094aec9804d71aaf7d46a..011a44bcb9ce752f5471eb13c76b698f94295c05 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -4604,8 +4604,7 @@ struct PrintfArguments {
 */
 struct FpDecode {
   char sign;           /* '+' or '-' */
-  char isNan;          /* True if not-a-number */
-  char isInf;          /* True if infinity */
+  char isSpecial;      /* 1: Infinity  2: NaN */
   int n;               /* Significant digits in the decode */
   int iDP;             /* Location of the decimal point */
   char z[24];          /* Significiant digits */

diff --git a/src/util.c b/src/util.c
index a648dc2d113bc50320cf645d739eff515897c79a..0950d8427a5055fa71753ee91de78c10e995a506 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -941,6 +941,7 @@ void sqlite3FpDecode(FpDecode *p, double r, int iRound){
   int i;
   u64 v;
   int e, exp = 0;
+  p->isSpecial = 0;
   if( r<0.0 ){
     p->sign = '-';
     r = -r;
@@ -949,8 +950,6 @@ void sqlite3FpDecode(FpDecode *p, double r, int iRound){
     p->n = 1;
     p->iDP = 1;
     p->z[0] = '0';
-    p->isNan = 0;
-    p->isInf = 0;
     return;
   }else{
     p->sign = '+';
@@ -958,24 +957,11 @@ void sqlite3FpDecode(FpDecode *p, double r, int iRound){
   memcpy(&v,&r,8);
   e = v>>52;
   if( (e&0x7ff)==0x7ff ){
-    if( v==0x7ff0000000000000L ){
-      p->isInf = 1;
-      p->isNan = 0;
-      p->z[0] = 'I';
-      p->z[1] = 'n';
-      p->z[2] = 'f';
-    }else{
-      p->isInf = 0;
-      p->isNan = 1;
-      p->z[0] = 'N';
-      p->z[1] = 'a';
-      p->z[2] = 'N';
-    }
-    p->n = 3;
-    p->iDP = 3;
+    p->isSpecial = 1 + (v!=0x7ff0000000000000L);
+    p->n = 0;
+    p->iDP = 0;
     return;
   }
-  p->isNan = p->isInf = 0;
 
   /* At this point, r is positive (non-zero) and is not Inf or NaN.
   ** The strategy is to multiple or divide r by powers of 10 until