Changeset 41954 in webkit for trunk/JavaScriptCore/wtf/dtoa.cpp

Timestamp:

Mar 24, 2009, 3:22:49 PM (16 years ago)

Author:

[email protected]

Message:

2009-03-24 Eli Fidler <​[email protected]>

Reviewed by George Staikos.

Correct warnings which in some environments are treated as errors.

File:

• trunk/JavaScriptCore/wtf/dtoa.cpp (modified) (8 diffs)

trunk/JavaScriptCore/wtf/dtoa.cpp

@@ -825 +825 @@
 #ifdef Pack_32
     if (k < Ebits) {
-        d0 = Exp_1 | y >> Ebits - k;
+        d0 = Exp_1 | (y >> (Ebits - k));
         w = xa > xa0 ? *--xa : 0;
-        d1 = y << (32 - Ebits) + k | w >> Ebits - k;
+        d1 = (y << (32 - Ebits + k)) | (w >> (Ebits - k));
         goto ret_d;
     }
     z = xa > xa0 ? *--xa : 0;
     if (k -= Ebits) {
-        d0 = Exp_1 | y << k | z >> 32 - k;
+        d0 = Exp_1 | (y << k) | (z >> (32 - k));
         y = xa > xa0 ? *--xa : 0;
-        d1 = z << k | y >> 32 - k;
+        d1 = (z << k) | (y >> (32 - k));
     } else {
         d0 = Exp_1 | y;
@@ -890 +890 @@
     if ((y = d1)) {
         if ((k = lo0bits(&y))) {
-            x[0] = y | z << 32 - k;
+            x[0] = y | (z << (32 - k));
             z >>= k;
         } else
@@ -1350 +1350 @@
                        word0(rv) = (P + 2) * Exp_msk1;
                     else
-                       word0(rv) &= 0xffffffff << j - 32;
+                       word0(rv) &= 0xffffffff << (j - 32);
                 } else
                     word1(rv) &= 0xffffffff << j;
@@ -2012 +2012 @@
 
         i = bbits + be + (Bias + (P - 1) - 1);
-        x = i > 32  ? word0(d) << 64 - i | word1(d) >> i - 32
-                : word1(d) << 32 - i;
+        x = (i > 32) ? (word0(d) << (64 - i)) | (word1(d) >> (i - 32))
+                : word1(d) << (32 - i);
         dval(d2) = x;
         word0(d2) -= 31 * Exp_msk1; /* adjust exponent */
@@ -2194 +2194 @@
             if (i == ilim) {
                 dval(d) += dval(d);
-                if (dval(d) > ds || dval(d) == ds && L & 1) {
+                if (dval(d) > ds || (dval(d) == ds && (L & 1))) {
 bump_up:
                     while (*--s == '9')
@@ -2335 +2335 @@
                 goto ret;
             }
-            if (j < 0 || j == 0 && !(word1(d) & 1)) {
+            if (j < 0 || (j == 0 && !(word1(d) & 1))) {
                 if (!b->x[0] && b->wds <= 1) {
 #ifdef SET_INEXACT
@@ -2345 +2345 @@
                     b = lshift(b, 1);
                     j1 = cmp(b, S);
-                    if ((j1 > 0 || j1 == 0 && dig & 1) && dig++ == '9')
+                    if ((j1 > 0 || (j1 == 0 && (dig & 1))) && dig++ == '9')
                         goto round_9_up;
                 }
@@ -2390 +2390 @@
     b = lshift(b, 1);
     j = cmp(b, S);
-    if (j > 0 || j == 0 && dig & 1) {
+    if (j > 0 || (j == 0 && (dig & 1))) {
 roundoff:
         while (*--s == '9')