Changeset 29541 in webkit for trunk/JavaScriptCore/kjs/math_object.cpp

Timestamp:

Jan 16, 2008, 2:31:17 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Oliver.

Clean up MathObjectImp, it needed a little scrubbing.

• kjs/math_object.cpp: (KJS::MathObjectImp::MathObjectImp): (KJS::MathObjectImp::getOwnPropertySlot): (KJS::MathObjectImp::getValueProperty): (KJS::mathProtoFuncACos): (KJS::mathProtoFuncASin): (KJS::mathProtoFuncATan): (KJS::mathProtoFuncATan2): (KJS::mathProtoFuncCos): (KJS::mathProtoFuncExp): (KJS::mathProtoFuncLog): (KJS::mathProtoFuncSin): (KJS::mathProtoFuncSqrt): (KJS::mathProtoFuncTan):
• kjs/math_object.h: (KJS::MathObjectImp::classInfo): (KJS::MathObjectImp::):

File:

• trunk/JavaScriptCore/kjs/math_object.cpp (modified) (7 diffs)

trunk/JavaScriptCore/kjs/math_object.cpp

@@ -1 @@
-// -*- c-basic-offset: 2 -*-
 /*
  *  Copyright (C) 1999-2000 Harri Porten ([email protected])
- *  Copyright (C) 2007 Apple Inc. All Rights Reserved.
+ *  Copyright (C) 2007, 2008 Apple Inc. All Rights Reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -66 +65 @@
 */
 
-MathObjectImp::MathObjectImp(ExecState * /*exec*/,
-                             ObjectPrototype *objProto)
-  : JSObject(objProto)
+MathObjectImp::MathObjectImp(ExecState*, ObjectPrototype* objectPrototype)
+    : JSObject(objectPrototype)
 {
 }
@@ -74 +72 @@
 // ECMA 15.8
 
-bool MathObjectImp::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot &slot)
-{
-  return getStaticPropertySlot<MathObjectImp, JSObject>(exec, &mathTable, this, propertyName, slot);
-}
-
-JSValue *MathObjectImp::getValueProperty(ExecState *, int token) const
-{
-  double d = -42; // ;)
-  switch (token) {
-  case Euler:
-    d = exp(1.0);
-    break;
-  case Ln2:
-    d = log(2.0);
-    break;
-  case Ln10:
-    d = log(10.0);
-    break;
-  case Log2E:
-    d = 1.0/log(2.0);
-    break;
-  case Log10E:
-    d = 1.0/log(10.0);
-    break;
-  case Pi:
-    d = piDouble;
-    break;
-  case Sqrt1_2:
-    d = sqrt(0.5);
-    break;
-  case Sqrt2:
-    d = sqrt(2.0);
-    break;
-  default:
-    ASSERT(0);
-  }
-
-  return jsNumber(d);
+bool MathObjectImp::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot &slot)
+{
+    return getStaticPropertySlot<MathObjectImp, JSObject>(exec, &mathTable, this, propertyName, slot);
+}
+
+JSValue* MathObjectImp::getValueProperty(ExecState*, int token) const
+{
+    switch (token) {
+    case Euler:
+        return jsNumber(exp(1.0));
+    case Ln2:
+        return jsNumber(log(2.0));
+    case Ln10:
+        return jsNumber(log(10.0));
+    case Log2E:
+        return jsNumber(1.0 / log(2.0));
+    case Log10E:
+        return jsNumber(1.0 / log(10.0));
+    case Pi:
+        return jsNumber(piDouble);
+    case Sqrt1_2:
+        return jsNumber(sqrt(0.5));
+    case Sqrt2:
+        return jsNumber(sqrt(2.0));
+    }
+
+    ASSERT_NOT_REACHED();
+    return 0;
 }
 
@@ -124 +112 @@
 JSValue* mathProtoFuncACos(ExecState* exec, JSObject*, const List& args)
 {
-    double arg = args[0]->toNumber(exec);
-    return jsNumber(acos(arg));
+    return jsNumber(acos(args[0]->toNumber(exec)));
 }
 
 JSValue* mathProtoFuncASin(ExecState* exec, JSObject*, const List& args)
 {
-    double arg = args[0]->toNumber(exec);
-    return jsNumber(asin(arg));
+    return jsNumber(asin(args[0]->toNumber(exec)));
 }
 
 JSValue* mathProtoFuncATan(ExecState* exec, JSObject*, const List& args)
 {
-    double arg = args[0]->toNumber(exec);
-    return jsNumber(atan(arg));
+    return jsNumber(atan(args[0]->toNumber(exec)));
 }
 
 JSValue* mathProtoFuncATan2(ExecState* exec, JSObject*, const List& args)
 {
-    double arg = args[0]->toNumber(exec);
-    double arg2 = args[1]->toNumber(exec);
-    return jsNumber(atan2(arg, arg2));
+    return jsNumber(atan2(args[0]->toNumber(exec), args[1]->toNumber(exec)));
 }
 
@@ -157 +140 @@
 JSValue* mathProtoFuncCos(ExecState* exec, JSObject*, const List& args)
 {
-    double arg = args[0]->toNumber(exec);
-    return jsNumber(cos(arg));
+    return jsNumber(cos(args[0]->toNumber(exec)));
 }
 
 JSValue* mathProtoFuncExp(ExecState* exec, JSObject*, const List& args)
 {
-    double arg = args[0]->toNumber(exec);
-    return jsNumber(exp(arg));
+    return jsNumber(exp(args[0]->toNumber(exec)));
 }
 
@@ -177 +158 @@
 JSValue* mathProtoFuncLog(ExecState* exec, JSObject*, const List& args)
 {
-    double arg = args[0]->toNumber(exec);
-    return jsNumber(log(arg));
+    return jsNumber(log(args[0]->toNumber(exec)));
 }
 
@@ -248 +228 @@
 JSValue* mathProtoFuncSin(ExecState* exec, JSObject*, const List& args)
 {
-    double arg = args[0]->toNumber(exec);
-    return jsNumber(sin(arg));
+    return jsNumber(sin(args[0]->toNumber(exec)));
 }
 
 JSValue* mathProtoFuncSqrt(ExecState* exec, JSObject*, const List& args)
 {
-    double arg = args[0]->toNumber(exec);
-    return jsNumber(sqrt(arg));
+    return jsNumber(sqrt(args[0]->toNumber(exec)));
 }
 
 JSValue* mathProtoFuncTan(ExecState* exec, JSObject*, const List& args)
 {
-    double arg = args[0]->toNumber(exec);
-    return jsNumber(tan(arg));
+    return jsNumber(tan(args[0]->toNumber(exec)));
 }