Changeset 11527 in webkit for trunk/JavaScriptCore/kjs/number_object.cpp

Timestamp:

Dec 10, 2005, 6:06:17 PM (19 years ago)

Author:

darin

Message:

JavaScriptCore:

Rubber stamped by Maciej.

• did long-promised KJS renaming:

ValueImp -> JSValue
ObjectImp -> JSObject
AllocatedValueImp -> JSCell

A renaming to get a class out of the way

KJS::Bindings::JSObject -> JavaJSObject

and some other "imp-reduction" renaming

*InstanceImp -> *Instance
*ProtoFuncImp -> *ProtoFunc
*PrototypeImp -> *Prototype
ArgumentsImp -> Arguments
RuntimeArrayImp -> RuntimeArray
RuntimeMethodImp -> RuntimeMethod

• most files and functions

WebCore:

Rubber stamped by Maciej.

• updated for KJS class renaming

• many files and functions

File:

• trunk/JavaScriptCore/kjs/number_object.cpp (modified) (10 diffs)

trunk/JavaScriptCore/kjs/number_object.cpp

@@ -37 +37 @@
 
 
-// ------------------------------ NumberInstanceImp ----------------------------
-
-const ClassInfo NumberInstanceImp::info = {"Number", 0, 0, 0};
-
-NumberInstanceImp::NumberInstanceImp(ObjectImp *proto)
-  : ObjectImp(proto)
-{
-}
-// ------------------------------ NumberPrototypeImp ---------------------------
+// ------------------------------ NumberInstance ----------------------------
+
+const ClassInfo NumberInstance::info = {"Number", 0, 0, 0};
+
+NumberInstance::NumberInstance(JSObject *proto)
+  : JSObject(proto)
+{
+}
+// ------------------------------ NumberPrototype ---------------------------
 
 // ECMA 15.7.4
 
-NumberPrototypeImp::NumberPrototypeImp(ExecState *exec,
-                                       ObjectPrototypeImp *objProto,
-                                       FunctionPrototypeImp *funcProto)
-  : NumberInstanceImp(objProto)
+NumberPrototype::NumberPrototype(ExecState *exec,
+                                       ObjectPrototype *objProto,
+                                       FunctionPrototype *funcProto)
+  : NumberInstance(objProto)
 {
   setInternalValue(jsNumber(0));
@@ -58 +58 @@
   // The constructor will be added later, after NumberObjectImp has been constructed
 
-  putDirect(toStringPropertyName,       new NumberProtoFuncImp(exec,funcProto,NumberProtoFuncImp::ToString,       1), DontEnum);
-  putDirect(toLocaleStringPropertyName, new NumberProtoFuncImp(exec,funcProto,NumberProtoFuncImp::ToLocaleString, 0), DontEnum);
-  putDirect(valueOfPropertyName,        new NumberProtoFuncImp(exec,funcProto,NumberProtoFuncImp::ValueOf,        0), DontEnum);
-  putDirect(toFixedPropertyName,        new NumberProtoFuncImp(exec,funcProto,NumberProtoFuncImp::ToFixed,        1), DontEnum);
-  putDirect(toExponentialPropertyName,  new NumberProtoFuncImp(exec,funcProto,NumberProtoFuncImp::ToExponential,  1), DontEnum);
-  putDirect(toPrecisionPropertyName,    new NumberProtoFuncImp(exec,funcProto,NumberProtoFuncImp::ToPrecision,    1), DontEnum);
-}
-
-
-// ------------------------------ NumberProtoFuncImp ---------------------------
-
-NumberProtoFuncImp::NumberProtoFuncImp(ExecState *exec,
-                                       FunctionPrototypeImp *funcProto, int i, int len)
+  putDirect(toStringPropertyName,       new NumberProtoFunc(exec,funcProto,NumberProtoFunc::ToString,       1), DontEnum);
+  putDirect(toLocaleStringPropertyName, new NumberProtoFunc(exec,funcProto,NumberProtoFunc::ToLocaleString, 0), DontEnum);
+  putDirect(valueOfPropertyName,        new NumberProtoFunc(exec,funcProto,NumberProtoFunc::ValueOf,        0), DontEnum);
+  putDirect(toFixedPropertyName,        new NumberProtoFunc(exec,funcProto,NumberProtoFunc::ToFixed,        1), DontEnum);
+  putDirect(toExponentialPropertyName,  new NumberProtoFunc(exec,funcProto,NumberProtoFunc::ToExponential,  1), DontEnum);
+  putDirect(toPrecisionPropertyName,    new NumberProtoFunc(exec,funcProto,NumberProtoFunc::ToPrecision,    1), DontEnum);
+}
+
+
+// ------------------------------ NumberProtoFunc ---------------------------
+
+NumberProtoFunc::NumberProtoFunc(ExecState *exec,
+                                       FunctionPrototype *funcProto, int i, int len)
   : InternalFunctionImp(funcProto), id(i)
 {
@@ -77 +77 @@
 
 
-bool NumberProtoFuncImp::implementsCall() const
+bool NumberProtoFunc::implementsCall() const
 {
   return true;
@@ -127 +127 @@
 
 // ECMA 15.7.4.2 - 15.7.4.7
-ValueImp *NumberProtoFuncImp::callAsFunction(ExecState *exec, ObjectImp *thisObj, const List &args)
+JSValue *NumberProtoFunc::callAsFunction(ExecState *exec, JSObject *thisObj, const List &args)
 {
   // no generic function. "this" has to be a Number object
-  if (!thisObj->inherits(&NumberInstanceImp::info))
+  if (!thisObj->inherits(&NumberInstance::info))
     return throwError(exec, TypeError);
 
-  ValueImp *v = thisObj->internalValue();
+  JSValue *v = thisObj->internalValue();
   switch (id) {
   case ToString: {
@@ -159 +159 @@
   case ToFixed: 
   {
-      ValueImp *fractionDigits = args[0];
+      JSValue *fractionDigits = args[0];
       double df = fractionDigits->toInteger(exec);
       if (!(df >= 0 && df <= 20)) // true for NaN
@@ -204 +204 @@
           return jsString(UString::from(x));
       
-      ValueImp *fractionDigits = args[0];
+      JSValue *fractionDigits = args[0];
       double df = fractionDigits->toInteger(exec);
       if (!(df >= 0 && df <= 20)) // true for NaN
@@ -368 +368 @@
 */
 NumberObjectImp::NumberObjectImp(ExecState *exec,
-                                 FunctionPrototypeImp *funcProto,
-                                 NumberPrototypeImp *numberProto)
+                                 FunctionPrototype *funcProto,
+                                 NumberPrototype *numberProto)
   : InternalFunctionImp(funcProto)
 {
@@ -384 +384 @@
 }
 
-ValueImp *NumberObjectImp::getValueProperty(ExecState *, int token) const
+JSValue *NumberObjectImp::getValueProperty(ExecState *, int token) const
 {
   // ECMA 15.7.3
@@ -409 +409 @@
 
 // ECMA 15.7.1
-ObjectImp *NumberObjectImp::construct(ExecState *exec, const List &args)
-{
-  ObjectImp *proto = exec->lexicalInterpreter()->builtinNumberPrototype();
-  ObjectImp *obj(new NumberInstanceImp(proto));
+JSObject *NumberObjectImp::construct(ExecState *exec, const List &args)
+{
+  JSObject *proto = exec->lexicalInterpreter()->builtinNumberPrototype();
+  JSObject *obj(new NumberInstance(proto));
 
   double n;
@@ -431 +431 @@
 
 // ECMA 15.7.2
-ValueImp *NumberObjectImp::callAsFunction(ExecState *exec, ObjectImp */*thisObj*/, const List &args)
+JSValue *NumberObjectImp::callAsFunction(ExecState *exec, JSObject */*thisObj*/, const List &args)
 {
   if (args.isEmpty())