Improved accuracy of floating-point conversion constants as suggested by

[forum:/info/598d32f6135c41c1|forum post 598d32f6135c41c1].

FossilOrigin-Name: 4943e8a1819e189747eefc414d02c0485e1620deff9cf92664295b21a8a9a83c

diff --git a/manifest b/manifest
index 4b3f698179eb6ee221fe49fab1d3a0cc5684fb97..8cd8dc169f9bb5af1b3ab19678e98061d474678f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sCLI\s.sha3sum\serror\smessage\sfor\skeyword\sidentifiers,\sreported\sin\s[forum:/forumpost/7cbe081746dd|forum\spost\s7cbe081746dd].
-D 2023-06-26T17:08:08.442
+C Improved\saccuracy\sof\sfloating-point\sconversion\sconstants\sas\ssuggested\sby\n[forum:/info/598d32f6135c41c1|forum\spost\s598d32f6135c41c1].
+D 2023-06-28T11:46:28.098
 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 b9320cdbeca0b336c3f139fd36dd121e4167dd62b35fbe9ccaa9bab44c0af38d
+F src/printf.c cb8357e7810848a2148acacfa8897c84905cadc3b040c2e7e0d2b000a3bcef82
 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 6f9d2f278dcc8d41c618980cd3cfe88e1bafc0626209b917c6773d8202d29ef6
+F src/util.c 4264102045fdb36e9af3ff361e390a5f7a76342a2bd7069e55d8ad332026d6b5
 F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
 F src/vdbe.c c993304c609326cf625b4ad30cbb0e15a3f64c941cf2c9713d0c360b4abbaa98
 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 d4e66dfc2e87112fa73a9c64db358429d88fb2ab3a08908b0eb655f6ed42f94b
-R 0390daf8d0a458de7e53173bbe3626cd
-U larrybr
-Z 444f1861e33b5e178835f8d9ea3e3c0a
+P 9d7813ddcf67f1256e7331c5f390cb122b3f7e35cf46e0b33b610216a5396a00
+R 169687b27435f028f9845b8b7f3b29b8
+U drh
+Z 4fc8fce670e6ce62ea8a2e6be22b995e
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 3961b8c6d5d4a04688cbac790cfa7e7f1b8d91ad..d18d43c4d44942702848554c8eaf07af5ec29bb0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9d7813ddcf67f1256e7331c5f390cb122b3f7e35cf46e0b33b610216a5396a00
\ No newline at end of file
+4943e8a1819e189747eefc414d02c0485e1620deff9cf92664295b21a8a9a83c
\ No newline at end of file

diff --git a/src/printf.c b/src/printf.c
index 3e1782d4667ec0909456dcedcad102e320c51ab5..77108929c7940cded3ed7e1b7ea2977aa4365793 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -598,13 +598,13 @@ void sqlite3_str_vappendf(
 
           /* Normalize realvalue to within 10.0 > realvalue >= 1.0 */
           if( ALWAYS(realvalue>0.0) ){
-            LONGDOUBLE_TYPE scale = 1.0;
-            while( realvalue>=1e100*scale && exp<=350){ scale*=1e100;exp+=100;}
-            while( realvalue>=1e10*scale && exp<=350 ){ scale*=1e10; exp+=10; }
-            while( realvalue>=10.0*scale && exp<=350 ){ scale *= 10.0; exp++; }
+            LONGDOUBLE_TYPE scale = 1.0L;
+            while( realvalue>=1e100*scale && exp<=350){ scale*=1e100L;exp+=100;}
+            while( realvalue>=1e10*scale && exp<=350 ){ scale*=1e10L; exp+=10; }
+            while( realvalue>=10.0*scale && exp<=350 ){ scale*=10.0L; exp++; }
             realvalue /= scale;
-            while( realvalue<1e-8 ){ realvalue *= 1e8; exp-=8; }
-            while( realvalue<1.0 ){ realvalue *= 10.0; exp--; }
+            while( realvalue<1e-8 ){ realvalue *= 1e8L; exp-=8; }
+            while( realvalue<1.0 ){ realvalue *= 10.0L; exp--; }
             if( exp>350 ){
               if( flag_zeropad ){
                 realvalue = 9.0;

diff --git a/src/util.c b/src/util.c
index bed86a569085f17edd6bdc6dd5ea22ff9f43913e..abd36eda87dbdab1bc591d0366c547f0d1529cc2 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -468,7 +468,7 @@ int sqlite3AtoF(const char *z, double *pResult, int length, u8 enc){
   int esign = 1;   /* sign of exponent */
   int e = 0;       /* exponent */
   int eValid = 1;  /* True exponent is either not used or is well-formed */
-  double result;
+  LONGDOUBLE_TYPE result;
   int nDigit = 0;  /* Number of digits processed */
   int eType = 1;   /* 1: pure integer,  2+: fractional  -1 or less: bad UTF16 */
 
@@ -597,7 +597,7 @@ do_atof_calc:
     s = sign<0 ? -s : s;
 
     if( e==0 ){                                         /*OPTIMIZATION-IF-TRUE*/
-      result = (double)s;
+      result = (LONGDOUBLE_TYPE)s;
     }else{
       /* attempt to handle extremely small/large numbers better */
       if( e>307 ){                                      /*OPTIMIZATION-IF-TRUE*/
@@ -605,10 +605,10 @@ do_atof_calc:
           LONGDOUBLE_TYPE scale = sqlite3Pow10(e-308);
           if( esign<0 ){
             result = s / scale;
-            result /= 1.0e+308;
+            result /= 1.0e+308L;
           }else{
             result = s * scale;
-            result *= 1.0e+308;
+            result *= 1.0e+308L;
           }
         }else{ assert( e>=342 );
           if( esign<0 ){