Improvements to the sqlite3IntFloatCompare() routine for systems that

lack the long double type.

FossilOrigin-Name: ea6a03a89dc23e860e53e79ec3fddf0ae7072a23b73aef3d2d181b426566b677

diff --git a/manifest b/manifest
index 0e98844ccb63916203e2046cecd3d14fa796eb2b..35568654767c2bb259e0a87eb7c2b94ac9e77b41 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\sCLI\swith\sthe\s-A\scommand,\sif\sthe\sfile\sdoes\snot\spreviously\sexist\sand\nits\sname\slooks\slike\sa\sZIP\sarchive\sname,\sthen\screate\sit\sas\sa\sZIP\sarchive.
-D 2018-05-17T20:04:24.639
+C Improvements\sto\sthe\ssqlite3IntFloatCompare()\sroutine\sfor\ssystems\sthat\nlack\sthe\slong\sdouble\stype.
+D 2018-05-18T13:39:00.453
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
@@ -567,7 +567,7 @@ F src/vdbe.c 066a4e1de2ed83e253adfd2e97a684cf562eaa41d31ee7f3d3e4c8aea4485a55
 F src/vdbe.h d970d9738efdd09cb2df73e3a40856e7df13e88a3486789c49fcdd322c9eb8a2
 F src/vdbeInt.h 95f7adfdc5c8f1353321f55a6c5ec00a90877e3b85af5159e393afb41ff54110
 F src/vdbeapi.c 29d2baf9c1233131ec467d7bed1b7c8a03c27579048d768c4b04acf427838858
-F src/vdbeaux.c f1cb5ae6e42c54d4991e2951e5293c1e18bad6847056e9b17622fbf6b17964a9
+F src/vdbeaux.c 8442dd6b7aec70e034cee8221ca8fd906706c475072390e3cb8d9b498b31f4c5
 F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
 F src/vdbemem.c 0cbe9b9560e42b72983cf9e1bceba48f297e51142bfb6b57f3747cf60106b92d
 F src/vdbesort.c 731a09e5cb9e96b70c394c1b7cf3860fbe84acca7682e178615eb941a3a0ef2f
@@ -1728,7 +1728,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 02541ac6f919a8a8b18ef0525c4ee24fdbc5c1883171fb1a492434cd0f006f7c
-R 5813b43636e3c1dfad760cb10ce61cfe
+P 33dc8fad7f2b467f259eb78eb7342a760f01d54d95da7fe4cace10e558788a58
+R 172d94da653421dfa4a13bdf39921f71
 U drh
-Z acb1b3ae3afe9e045167e0aeea3fdccf
+Z c89655e68cdf9c04b590b1bb59f1f9b2

diff --git a/manifest.uuid b/manifest.uuid
index 90d0b49d16907711fe4f5999ce37a36e1f712842..b6047ecbff0e8658af033de12744092be33a295e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-33dc8fad7f2b467f259eb78eb7342a760f01d54d95da7fe4cace10e558788a58
\ No newline at end of file
+ea6a03a89dc23e860e53e79ec3fddf0ae7072a23b73aef3d2d181b426566b677
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 210712a8aaf4e65187cac459723f57bd34303288..76b46acbb818b68c091e735bc61c0ea6935f6655 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -3917,16 +3917,13 @@ static int sqlite3IntFloatCompare(i64 i, double r){
     i64 y;
     double s;
     if( r<-9223372036854775808.0 ) return +1;
-    if( r>9223372036854775807.0 ) return -1;
+    if( r>=9223372036854775808.0 ) return -1;
     y = (i64)r;
     if( i<y ) return -1;
-    if( i>y ){
-      if( y==SMALLEST_INT64 && r>0.0 ) return -1;
-      return +1;
-    }
+    if( i>y ) return +1;
     s = (double)i;
     if( s<r ) return -1;
-    if( s>r ) return +1;
+    if( NEVER(s>r) ) return +1;
     return 0;
   }
 }