Changeset 09da99 in git for ntl/src/xdouble.c

Timestamp:

Nov 3, 2003, 6:33:49 PM (21 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b9f50b373314e74e83c7c060a651dd2913e1f033')

Children:

70fea801cbe08a22d1b0e9d8d1d410144e0e91f6

Parents:

be2bb37dcbd03b120f14559d378b21b104d907c4

Message:

*hannes: NTL- 5.3.1


git-svn-id: file:///usr/local/Singular/svn/trunk@6910 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• ntl/src/xdouble.c (modified) (10 diffs)

ntl/src/xdouble.c

@@ -16 +16 @@
    if (p < 1) p = 1;
 
-   if (p >= (1L << (NTL_BITS_PER_LONG-4))) 
+   if (NTL_OVERFLOW(p, 1, 0)) 
       Error("xdouble: output precision too big");
 
@@ -35 +35 @@
    }
 
-   if (e >= (1L << (NTL_BITS_PER_LONG-4)))
+   if (e >= NTL_OVFBND)
       Error("xdouble: overflow");
 
-   if (e <= -(1L << (NTL_BITS_PER_LONG-4)))
+   if (e <= -NTL_OVFBND)
       Error("xdouble: underflow");
 }
@@ -391 +391 @@
    }
 
-   if (q >= (1L << (NTL_BITS_PER_LONG-4)))
+   if (q >= NTL_OVFBND)
       Error("xdouble: overflow");
 
-   if (q <= -(1L << (NTL_BITS_PER_LONG-4)))
+   if (q <= -NTL_OVFBND)
       Error("xdouble: underflow");
 
-   int rr = r;
-   double x = ldexp(1.0, rr);
+   double x = _ntl_ldexp(1.0, r);
 
    z.x = x;
@@ -530 +529 @@
    double iy = floor(y+0.5);
 
-   if (iy >= (1L << (NTL_BITS_PER_LONG-4)))
+   if (iy >= NTL_OVFBND)
       Error("xdouble: overflow");
 
-   if (iy <= -(1L << (NTL_BITS_PER_LONG-4)))
+   if (iy <= -NTL_OVFBND)
       Error("xdouble: underflow");
 
@@ -561 +560 @@
    ComputeLn10(ln10);
 
-   long k = to_long( to_RR(1L << (NTL_BITS_PER_LONG-5)) * ln2 / ln10 );
+   long k = to_long( to_RR(NTL_OVFBND/2) * ln2 / ln10 );
 
    RR::SetPrecision(old_p);
@@ -614 +613 @@
 
 
-
-
 xdouble to_xdouble(const char *s)
 {
    long c;
+   long cval;
    long sign;
    ZZ a, b;
@@ -626 +624 @@
 
    c = s[i];
-   while (c == ' ' || c == '\n' || c == '\t') {
+   while (IsWhiteSpace(c)) {
       i++;
       c = s[i];
@@ -646 +644 @@
    b = 1;
 
-   if (c >= '0' && c <= '9') {
+   cval = CharToIntVal(c);
+
+   if (cval >= 0 && cval <= 9) {
       got1 = 1;
 
-      while (c >= '0' && c <= '9') {
+      while (cval >= 0 && cval <= 9) {
          mul(a, a, 10);
-         add(a, a, c-'0');
+         add(a, a, cval);
          i++;
          c = s[i];
+         cval = CharToIntVal(c);
       }
    }
@@ -662 +663 @@
       i++;
       c = s[i];
-
-      if (c >= '0' && c <= '9') {
+      cval = CharToIntVal(c);
+
+      if (cval >= 0 && cval <= 9) {
          got2 = 1;
    
-         while (c >= '0' && c <= '9') {
+         while (cval >= 0 && cval <= 9) {
             mul(a, a, 10);
-            add(a, a, c-'0');
+            add(a, a, cval);
             mul(b, b, 10);
             i++;
             c = s[i];
+            cval = CharToIntVal(c);
          }
       }
@@ -702 +705 @@
          e_sign = 1;
 
-      if (c < '0' || c > '9') Error("bad xdouble input");
+      cval = CharToIntVal(c);
+
+      if (cval < 0 || cval > 9) Error("bad xdouble input");
 
       e = 0;
-      while (c >= '0' && c <= '9') {
+      while (cval >= 0 && cval <= 9) {
          mul(e, e, 10);
-         add(e, e, c-'0');
+         add(e, e, cval);
          i++;
          c = s[i];
+         cval = CharToIntVal(c);
       }
    }