2006-03-30 Eric Seidel <eseidel@apple.com>

        Reviewed by anders.

        Small code-style update.

        * kjs/operations.cpp:
        (KJS::isNaN):
        (KJS::isInf):
        (KJS::isPosInf):
        (KJS::isNegInf):
        (KJS::equal):
        (KJS::strictEqual):
        (KJS::relation):
        (KJS::maxInt):
        (KJS::minInt):
        (KJS::add):
        (KJS::mult):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13598 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index fb43bf1390e5e48c24c15f8c03cd784e3c22bfd9..310d6985ece4d46ca14cb6cfd42bc07f2d64dfee 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,22 @@
+2006-03-30  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by anders.
+
+        Small code-style update.
+
+        * kjs/operations.cpp:
+        (KJS::isNaN):
+        (KJS::isInf):
+        (KJS::isPosInf):
+        (KJS::isNegInf):
+        (KJS::equal):
+        (KJS::strictEqual):
+        (KJS::relation):
+        (KJS::maxInt):
+        (KJS::minInt):
+        (KJS::add):
+        (KJS::mult):
+
 2006-03-31  Anders Carlsson  <andersca@mac.com>
 
         Reviewed by Maciej.
@@ -7,7 +26,7 @@
         * kjs/internal.cpp:
         (KJS::GetterSetterImp::mark):
         Call JSCell::mark().
-        
+
 2006-03-30  Eric Seidel  <eseidel@apple.com>
 
         Reviewed by ggaren.

diff --git a/JavaScriptCore/kjs/operations.cpp b/JavaScriptCore/kjs/operations.cpp
index d92d813a55ab0e5c0cd721dadf7d0d57d7dc9a2e..579ffa482f6f6598988098441d882a63241bc314 100644 (file)
--- a/JavaScriptCore/kjs/operations.cpp
+++ b/JavaScriptCore/kjs/operations.cpp
@@ -41,69 +41,69 @@
 #include "object.h"
 
 namespace KJS {
-
+    
 #if !PLATFORM(DARWIN)
-  // FIXME: should probably be inlined on other platforms too, and controlled exclusively
-  // by HAVE macros
-
-
+// FIXME: should probably be inlined on other platforms too, and controlled exclusively
+// by HAVE macros
+    
+    
 bool isNaN(double d)
 {
 #if HAVE(FUNC_ISNAN)
-  return isnan(d);
+    return isnan(d);
 #elif HAVE(FLOAT_H)
-  return _isnan(d) != 0;
+    return _isnan(d) != 0;
 #else
-  return !(d == d);
+    return !(d == d);
 #endif
 }
 
 bool isInf(double d)
 {
-  // FIXME: should be HAVE(_FPCLASS)
+    // FIXME: should be HAVE(_FPCLASS)
 #if PLATFORM(WIN_OS)
-  int fpClass = _fpclass(d);
-  return _FPCLASS_PINF == fpClass || _FPCLASS_NINF == fpClass;
+    int fpClass = _fpclass(d);
+    return _FPCLASS_PINF == fpClass || _FPCLASS_NINF == fpClass;
 #elif HAVE(FUNC_ISINF)
-  return isinf(d);
+    return isinf(d);
 #elif HAVE(FUNC_FINITE)
-  return finite(d) == 0 && d == d;
+    return finite(d) == 0 && d == d;
 #elif HAVE(FUNC__FINITE)
-  return _finite(d) == 0 && d == d;
+    return _finite(d) == 0 && d == d;
 #else
-  return false;
+    return false;
 #endif
 }
 
 bool isPosInf(double d)
 {
-  // FIXME: should be HAVE(_FPCLASS)
+    // FIXME: should be HAVE(_FPCLASS)
 #if PLATFORM(WIN_OS)
-  return _FPCLASS_PINF == _fpclass(d);
+    return _FPCLASS_PINF == _fpclass(d);
 #elif HAVE(FUNC_ISINF)
-  return (isinf(d) == 1);
+    return (isinf(d) == 1);
 #elif HAVE(FUNC_FINITE)
-  return !finite(d) && d == d; // ### can we distinguish between + and - ?
+    return !finite(d) && d == d; // ### can we distinguish between + and - ?
 #elif HAVE(FUNC__FINITE)
-  return !_finite(d) && d == d; // ###
+    return !_finite(d) && d == d; // ###
 #else
-  return false;
+    return false;
 #endif
 }
 
 bool isNegInf(double d)
 {
-  // FIXME: should be HAVE(_FPCLASS)
+    // FIXME: should be HAVE(_FPCLASS)
 #if PLATFORM(WIN_OS)
-  return _FPCLASS_NINF == _fpclass(d);
+    return _FPCLASS_NINF == _fpclass(d);
 #elif HAVE(FUNC_ISINF)
-  return (isinf(d) == -1);
+    return (isinf(d) == -1);
 #elif HAVE(FUNC_FINITE)
-  return finite(d) == 0 && d == d; // ###
+    return finite(d) == 0 && d == d; // ###
 #elif HAVE(FUNC__FINITE)
-  return _finite(d) == 0 && d == d; // ###
+    return _finite(d) == 0 && d == d; // ###
 #else
-  return false;
+    return false;
 #endif
 }
 
@@ -114,18 +114,18 @@ bool equal(ExecState *exec, JSValue *v1, JSValue *v2)
 {
     JSType t1 = v1->type();
     JSType t2 = v2->type();
-
+    
     if (t1 != t2) {
         if (t1 == UndefinedType)
             t1 = NullType;
         if (t2 == UndefinedType)
             t2 = NullType;
-
+        
         if (t1 == BooleanType)
             t1 = NumberType;
         if (t2 == BooleanType)
             t2 = NumberType;
-
+        
         if (t1 == NumberType && t2 == StringType) {
             // use toNumber
         } else if (t1 == StringType && t2 == NumberType) {
@@ -144,115 +144,113 @@ bool equal(ExecState *exec, JSValue *v1, JSValue *v2)
                 return false;
         }
     }
-
+    
     if (t1 == UndefinedType || t1 == NullType)
         return true;
-
+    
     if (t1 == NumberType) {
         double d1 = v1->toNumber(exec);
         double d2 = v2->toNumber(exec);
         return d1 == d2;
     }
-
+    
     if (t1 == StringType)
         return v1->toString(exec) == v2->toString(exec);
-
+    
     if (t1 == BooleanType)
         return v1->toBoolean(exec) == v2->toBoolean(exec);
-
+    
     // types are Object
     return v1 == v2;
 }
 
 bool strictEqual(ExecState *exec, JSValue *v1, JSValue *v2)
 {
-  JSType t1 = v1->type();
-  JSType t2 = v2->type();
-
-  if (t1 != t2)
-    return false;
-  if (t1 == UndefinedType || t1 == NullType)
-    return true;
-  if (t1 == NumberType) {
-    double n1 = v1->toNumber(exec);
-    double n2 = v2->toNumber(exec);
-    if (n1 == n2)
+    JSType t1 = v1->type();
+    JSType t2 = v2->type();
+    
+    if (t1 != t2)
+        return false;
+    if (t1 == UndefinedType || t1 == NullType)
         return true;
+    if (t1 == NumberType) {
+        double n1 = v1->toNumber(exec);
+        double n2 = v2->toNumber(exec);
+        if (n1 == n2)
+            return true;
+        return false;
+    } else if (t1 == StringType)
+        return v1->toString(exec) == v2->toString(exec);
+    else if (t2 == BooleanType)
+        return v1->toBoolean(exec) == v2->toBoolean(exec);
+    
+    if (v1 == v2)
+        return true;
+    /* TODO: joined objects */
+    
     return false;
-  } else if (t1 == StringType) {
-    return v1->toString(exec) == v2->toString(exec);
-  } else if (t2 == BooleanType) {
-    return v1->toBoolean(exec) == v2->toBoolean(exec);
-  }
-  if (v1 == v2)
-    return true;
-  /* TODO: joined objects */
-
-  return false;
 }
 
 int relation(ExecState *exec, JSValue *v1, JSValue *v2)
 {
-  JSValue *p1 = v1->toPrimitive(exec,NumberType);
-  JSValue *p2 = v2->toPrimitive(exec,NumberType);
-
-  if (p1->isString() && p2->isString())
-    return p1->toString(exec) < p2->toString(exec) ? 1 : 0;
-
-  double n1 = p1->toNumber(exec);
-  double n2 = p2->toNumber(exec);
-  if (n1 < n2)
-    return 1;
-  if (n1 >= n2)
-    return 0;
-  return -1; // must be NaN, so undefined
+    JSValue *p1 = v1->toPrimitive(exec,NumberType);
+    JSValue *p2 = v2->toPrimitive(exec,NumberType);
+    
+    if (p1->isString() && p2->isString())
+        return p1->toString(exec) < p2->toString(exec) ? 1 : 0;
+    
+    double n1 = p1->toNumber(exec);
+    double n2 = p2->toNumber(exec);
+    if (n1 < n2)
+        return 1;
+    if (n1 >= n2)
+        return 0;
+    return -1; // must be NaN, so undefined
 }
 
 int maxInt(int d1, int d2)
 {
-  return (d1 > d2) ? d1 : d2;
+    return (d1 > d2) ? d1 : d2;
 }
 
 int minInt(int d1, int d2)
 {
-  return (d1 < d2) ? d1 : d2;
+    return (d1 < d2) ? d1 : d2;
 }
 
 // ECMA 11.6
 JSValue *add(ExecState *exec, JSValue *v1, JSValue *v2, char oper)
 {
-  // exception for the Date exception in defaultValue()
-  JSType preferred = oper == '+' ? UnspecifiedType : NumberType;
-  JSValue *p1 = v1->toPrimitive(exec, preferred);
-  JSValue *p2 = v2->toPrimitive(exec, preferred);
-
-  if ((p1->isString() || p2->isString()) && oper == '+') {
-    return jsString(p1->toString(exec) + p2->toString(exec));
-  }
-
-  if (oper == '+')
-    return jsNumber(p1->toNumber(exec) + p2->toNumber(exec));
-  else
-    return jsNumber(p1->toNumber(exec) - p2->toNumber(exec));
+    // exception for the Date exception in defaultValue()
+    JSType preferred = oper == '+' ? UnspecifiedType : NumberType;
+    JSValue *p1 = v1->toPrimitive(exec, preferred);
+    JSValue *p2 = v2->toPrimitive(exec, preferred);
+    
+    if ((p1->isString() || p2->isString()) && oper == '+')
+        return jsString(p1->toString(exec) + p2->toString(exec));
+    
+    if (oper == '+')
+        return jsNumber(p1->toNumber(exec) + p2->toNumber(exec));
+    else
+        return jsNumber(p1->toNumber(exec) - p2->toNumber(exec));
 }
 
 // ECMA 11.5
 JSValue *mult(ExecState *exec, JSValue *v1, JSValue *v2, char oper)
 {
-  double n1 = v1->toNumber(exec);
-  double n2 = v2->toNumber(exec);
-
-  double result;
-
-  if (oper == '*') {
-    result = n1 * n2;
-  } else if (oper == '/') {
-    result = n1 / n2;
-  } else {
-    result = fmod(n1, n2);
-  }
-
-  return jsNumber(result);
+    double n1 = v1->toNumber(exec);
+    double n2 = v2->toNumber(exec);
+    
+    double result;
+    
+    if (oper == '*')
+        result = n1 * n2;
+    else if (oper == '/')
+        result = n1 / n2;
+    else
+        result = fmod(n1, n2);
+    
+    return jsNumber(result);
 }
 
 }