Progress towards fixing corner-case floating-point formatting issues.

FossilOrigin-Name: 1138b8d16edef16d2943d407e289d07d546a14e64c3efa3c94127631e06fafeb

diff --git a/manifest b/manifest
index 2b00cbffa5b45f01fb77fc1fc0d566c5680e56c8..253d40cde3457f0b18490fd9cc8b1d09734d53e4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sissue\swith\sthe\s"+"\sattribute\sin\sprintf().
-D 2023-06-30T23:42:46.836
+C Progress\stowards\sfixing\scorner-case\sfloating-point\sformatting\sissues.
+D 2023-07-01T14:03:50.030
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -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 890a111a37f300e171d9df601115774dc964c57b4b1ed7206da849d4861f0188
+F src/printf.c 1291f62b21bbad23d7f9557d5255a0749fb24b86d4bc293fe7210e5a2cdf51b4
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 37953a5f36c60bea413c3c04efcd433b6177009f508ef2ace0494728912fe2e9
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
@@ -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 f7efa26a9cae5efc0d01d008fe4bf0e5e1acc09c1a4a3f30d5097a8c67888d2f
+F src/util.c fc7991df98ed37aca761b40671f39b1359ed4accdcd60546ce58a6e9cb28d6c3
 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 c134d423e79ba5d3343d7480229822a0c83210f67f12129e0237181f892f97a5
-R 8f07870f9b2d96881336f99b2799e75b
+P bdfd1eb1d7b4c570a53d58789dac0bf55fdaf8eba515d5a0caf2e57e25b51952
+R fb72667e1d4a1498dbacfca13643a6ba
 U drh
-Z 159b2bbd6094de9112f8c4b9400c21f4
+Z 2c618a760c02dc2da550092622885ef7
 # Remove this line to create a well-formed Fossil manifest.

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

diff --git a/src/printf.c b/src/printf.c
index b71584af0ce9d0e3def5c4bf0750538076bf8fed..78f59757df26265cd45bb48b7485a15d32d36a96 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -494,7 +494,11 @@ void sqlite3_str_vappendf(
           precision = SQLITE_FP_PRECISION_LIMIT;
         }
 #endif
-        sqlite3FpDecode(&s, realvalue, xtype==etFLOAT ? -precision : precision);
+        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";
@@ -509,18 +513,19 @@ void sqlite3_str_vappendf(
           if( s.sign=='-' ){
             bufpt = "-Inf";
             length = 4;
+          }else if( flag_prefix=='+' ){
+            bufpt = "+Inf";
+            length = 4;
           }else{
             bufpt = "Inf";
             length = 3;
           }
           break;
         }
-        if( flag_prefix ){
-          prefix = s.sign;
-        }else if( s.sign=='-' ){
+        if( s.sign=='-' ){
           prefix = '-';
         }else{
-          prefix = 0;
+          prefix = flag_prefix;
         }
 
         exp = s.iDP-1;
@@ -568,7 +573,7 @@ void sqlite3_str_vappendf(
           *(bufpt++) = '0';
         }else{
           for(; e2>=0; e2--){
-            *(bufpt++) = s.z[j++];
+            *(bufpt++) = j<s.n ? s.z[j++] : '0';
             if( cThousand && (e2%3)==0 && e2>1 ) *(bufpt++) = ',';
           }
         }

diff --git a/src/util.c b/src/util.c
index cd4eec8d2d6700759e44fff5663ebcfa93c53993..a648dc2d113bc50320cf645d739eff515897c79a 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -957,7 +957,7 @@ void sqlite3FpDecode(FpDecode *p, double r, int iRound){
   }
   memcpy(&v,&r,8);
   e = v>>52;
-  if( e==0x7ff ){
+  if( (e&0x7ff)==0x7ff ){
     if( v==0x7ff0000000000000L ){
       p->isInf = 1;
       p->isNan = 0;
@@ -996,7 +996,15 @@ void sqlite3FpDecode(FpDecode *p, double r, int iRound){
   while( v ){  p->z[i--] = (v%10) + '0'; v /= 10; }
   p->n = sizeof(p->z) - 1 - i;
   p->iDP = p->n + exp;
-  if( iRound<0 ) iRound = p->iDP - iRound;
+  if( iRound<0 ){
+    iRound = p->iDP - iRound;
+    if( iRound==0 && p->z[i+1]>='5' ){
+      iRound = 1;
+      p->z[i--] = '0';
+      p->n++;
+      p->iDP++;
+    }
+  }
   if( iRound>0 && iRound<p->n ){
     char *z = &p->z[i+1];
     p->n = iRound;