implementation of increment and decrement

Author: Ravenwater

include/universal/blas/blas_l1.hpp

@@ -6,7 +6,7 @@
 //
 // This file is part of the universal numbers project, which is released under an MIT Open Source license.
 #include <cmath>
-#include <universal/math/math>  // injection of native IEEE-754 math library functions into sw::universal namespace
+#include <universal/math/mathlib_shim.hpp>  // injection of native IEEE-754 math library functions into sw::universal namespace
 #include <universal/blas/vector.hpp>
 
 namespace sw { namespace universal { namespace blas { 

include/universal/blas/scaling.hpp

@@ -6,7 +6,7 @@
 //
 // This file is part of the universal numbers project, which is released under an MIT Open Source license.
 #include <cmath>
-#include <universal/math/math>  // injection of native IEEE-754 math library functions into sw::universal namespace
+#include <universal/math/mathlib_shim.hpp>  // injection of native IEEE-754 math library functions into sw::universal namespace
 
 namespace sw { namespace universal { namespace blas {
 

include/universal/number/dd/dd_impl.hpp

@@ -280,7 +280,7 @@ class dd {
 			// move into or through the subnormal range of the high limb
 			hi = std::nextafter(hi, +INFINITY);
 		}
-		else if (isfinite(hi)) {
+		else if (std::isfinite(hi)) {
 			int highScale = sw::universal::scale(hi);
 			if (lo == 0.0) {
 				// the second limb cannot be a denorm, so we need to jump to the first normal value
@@ -292,7 +292,7 @@ class dd {
 				lo = std::nextafter(lo, +INFINITY);
 				int newLowScale = sw::universal::scale(lo);
 				// check for overflow: could be transitioning into the next binade, or INF in last binade
-				if (lowScale < newLowScale || isinf(lo)) {
+				if (lowScale < newLowScale || std::isinf(lo)) {
 					lo = 0.0;
 					hi = std::nextafter(hi, +INFINITY);
 				}
@@ -313,8 +313,7 @@ class dd {
 			// move into or through the subnormal range of the high limb
 			hi = std::nextafter(hi, -INFINITY);
 		}
-		else if (isfinite(hi)) {
-			int highScale = sw::universal::scale(hi);
+		else if (std::isfinite(hi)) {
 			if (lo == 0.0) {
 				// we need to drop into a lower binade, thus we need to update the high limb first
 				hi = std::nextafter(hi, -INFINITY);
@@ -327,7 +326,7 @@ class dd {
 				lo = std::nextafter(lo, -INFINITY);
 				int newLowScale = sw::universal::scale(lo);
 				// check for overflow
-				if (lowScale < newLowScale || isinf(lo)) {
+				if (lowScale < newLowScale || std::isinf(lo)) {
 					lo = 0.0;
 					hi = std::nextafter(hi, -INFINITY);
 				}
@@ -599,7 +598,7 @@ class dd {
 		}
 		else {
 			hi = static_cast<double>(v);
-			lo = static_cast<double>(v - static_cast<int64_t>(hi));
+			lo = 0.0;
 		}
 		return *this;
 	}
@@ -610,7 +609,7 @@ class dd {
 		}
 		else {
 			hi = static_cast<double>(v);
-			lo = static_cast<double>(v - static_cast<uint64_t>(hi));  // difference is always positive
+			lo = 0.0;
 		}
 		return *this;
 	}

include/universal/verification/areal_test_suite.hpp

@@ -143,7 +143,7 @@ namespace sw { namespace universal {
 					}
 					// da + delta = (0,minpos)
 					testValue = da + delta;
-					if (issubnorm(testValue)) { std::cout << testValue << " is denormalized\n"; }
+					if (isdenorm(testValue)) { std::cout << testValue << " is denormalized\n"; }
 					nut = testValue;
 					nrOfFailedTests += Compare(testValue, nut, interval, reportTestCases);
 				}

static/dd/api/api.cpp

@@ -196,10 +196,14 @@ try {
 		ReportValue(a, "nextbelow 1.0", 20, 32);
 
 		{
+			// iszero() and isdenorm() are defined in the sw::universal namespace
+			// In clang there is an ambiguity in math.h
+			// and for some reason isdenorm is not in std namespace
+			// so make the call explicit for double
 			double d(0.0);
-			if (iszero(d)) std::cout << d << " is zero\n";
+			if (sw::universal::iszero(d)) std::cout << d << " is zero\n";
 			d = std::nextafter(d, +INFINITY);
-			if (isdenorm(d)) std::cout << d << " is a subnormal number\n";
+			if (sw::universal::isdenorm(d)) std::cout << d << " is a subnormal number\n";
 		}
 		{
 			dd d(0.0);