Changeset 34372 in webkit for trunk/JavaScriptCore/kjs/value.h

Timestamp:

Jun 4, 2008, 10:36:55 PM (17 years ago)

Author:

[email protected]

Message:

2008-06-04 Sam Weinig <​[email protected]>

Reviewed by Maciej Stachowiak.

Big cleanup of formatting and whitespace.

File:

• trunk/JavaScriptCore/kjs/value.h (modified) (12 diffs)

trunk/JavaScriptCore/kjs/value.h

@@ -53 +53 @@
     friend class JSCell; // so it can derive from this class
     friend class Collector; // so it can call asCell()
-
 private:
     JSValue();
@@ -68 +67 @@
     bool isString() const;
     bool isObject() const;
-    bool isObject(const ClassInfo *) const;
+    bool isObject(const ClassInfo*) const;
 
     // Extracting the value.
@@ -78 +77 @@
     bool getString(UString&) const;
     UString getString() const; // null string if not a string
-    JSObject *getObject(); // NULL if not an object
-    const JSObject *getObject() const; // NULL if not an object
+    JSObject* getObject(); // NULL if not an object
+    const JSObject* getObject() const; // NULL if not an object
 
     CallType getCallData(CallData&);
@@ -90 +89 @@
     
     // Basic conversions.
-    JSValue* toPrimitive(ExecState* exec, JSType preferredType = UnspecifiedType) const;
-    bool getPrimitiveNumber(ExecState* exec, double& number, JSValue*& value);
-
-    bool toBoolean(ExecState *exec) const;
+    JSValue* toPrimitive(ExecState*, JSType preferredType = UnspecifiedType) const;
+    bool getPrimitiveNumber(ExecState*, double& number, JSValue*&);
+
+    bool toBoolean(ExecState*) const;
 
     // toNumber conversion is expected to be side effect free if an exception has
     // been set in the ExecState already.
-    double toNumber(ExecState *exec) const;
+    double toNumber(ExecState*) const;
     JSValue* toJSNumber(ExecState*) const; // Fast path for when you expect that the value is an immediate number.
-    UString toString(ExecState *exec) const;
-    JSObject* toObject(ExecState *exec) const;
+    UString toString(ExecState*) const;
+    JSObject* toObject(ExecState*) const;
 
     // Integer conversions.
@@ -138 +137 @@
 
     // Implementation details.
-    JSCell *asCell();
-    const JSCell *asCell() const;
+    JSCell* asCell();
+    const JSCell* asCell() const;
 };
 
@@ -152 +151 @@
     JSCell();
     virtual ~JSCell();
+
 public:
     // Querying the type.
@@ -158 +158 @@
     bool isString() const;
     bool isObject() const;
-    bool isObject(const ClassInfo *) const;
+    bool isObject(const ClassInfo*) const;
 
     // Extracting the value.
@@ -165 +165 @@
     bool getString(UString&) const;
     UString getString() const; // null string if not a string
-    JSObject *getObject(); // NULL if not an object
-    const JSObject *getObject() const; // NULL if not an object
+    JSObject* getObject(); // NULL if not an object
+    const JSObject* getObject() const; // NULL if not an object
     
     virtual CallType getCallData(CallData&);
@@ -177 +177 @@
 
     // Basic conversions.
-    virtual JSValue *toPrimitive(ExecState *exec, JSType preferredType = UnspecifiedType) const = 0;
-    virtual bool getPrimitiveNumber(ExecState* exec, double& number, JSValue*& value) = 0;
-    virtual bool toBoolean(ExecState *exec) const = 0;
-    virtual double toNumber(ExecState *exec) const = 0;
-    virtual UString toString(ExecState *exec) const = 0;
-    virtual JSObject *toObject(ExecState *exec) const = 0;
+    virtual JSValue* toPrimitive(ExecState*, JSType preferredType = UnspecifiedType) const = 0;
+    virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue*&) = 0;
+    virtual bool toBoolean(ExecState*) const = 0;
+    virtual double toNumber(ExecState*) const = 0;
+    virtual UString toString(ExecState*) const = 0;
+    virtual JSObject* toObject(ExecState*) const = 0;
 
     // Garbage collection.
-    void *operator new(size_t);
+    void* operator new(size_t);
     virtual void mark();
     bool marked() const;
@@ -200 +200 @@
 
 class NumberImp : public JSCell {
-  friend JSValue* jsNumberCell(double);
-
+    friend JSValue* jsNumberCell(double);
 public:
-  double value() const { return val; }
-
-  virtual JSType type() const;
-
-  virtual JSValue* toPrimitive(ExecState*, JSType preferred = UnspecifiedType) const;
-  virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue*& value);
-  virtual bool toBoolean(ExecState* exec) const;
-  virtual double toNumber(ExecState* exec) const;
-  virtual UString toString(ExecState* exec) const;
-  virtual JSObject* toObject(ExecState* exec) const;
+    double value() const { return val; }
+
+    virtual JSType type() const;
+
+    virtual JSValue* toPrimitive(ExecState*, JSType preferred = UnspecifiedType) const;
+    virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue*& value);
+    virtual bool toBoolean(ExecState*) const;
+    virtual double toNumber(ExecState*) const;
+    virtual UString toString(ExecState*) const;
+    virtual JSObject* toObject(ExecState*) const;
     virtual JSObject* toThisObject(ExecState*) const;
 
-  void* operator new(size_t size)
-  {
+    void* operator new(size_t size)
+    {
 #ifdef JAVASCRIPTCORE_BUILDING_ALL_IN_ONE_FILE
-      return Collector::inlineAllocateNumber(size);
+        return Collector::inlineAllocateNumber(size);
 #else
-      return Collector::allocateNumber(size);
+        return Collector::allocateNumber(size);
 #endif
-  }
+    }
 
 private:
-  NumberImp(double v) : val(v) { }
-
-  virtual bool getUInt32(uint32_t&) const;
-  virtual bool getTruncatedInt32(int32_t&) const;
-  virtual bool getTruncatedUInt32(uint32_t&) const;
-
-  double val;
+    NumberImp(double v)
+        : val(v)
+    {
+    }
+
+    virtual bool getUInt32(uint32_t&) const;
+    virtual bool getTruncatedInt32(int32_t&) const;
+    virtual bool getTruncatedUInt32(uint32_t&) const;
+
+    double val;
 };
 
-JSCell *jsString(const UString&); // returns empty string if passed null string
-JSCell *jsString(const char* = ""); // returns empty string if passed 0
+JSCell* jsString(const UString&); // returns empty string if passed null string
+JSCell* jsString(const char* = ""); // returns empty string if passed 0
 
 // should be used for strings that are owned by an object that will
 // likely outlive the JSValue this makes, such as the parse tree or a
 // DOM object that contains a UString
-JSCell *jsOwnedString(const UString&); 
+JSCell* jsOwnedString(const UString&); 
 
 extern const double NaN;
@@ -252 +254 @@
 }
 
-ALWAYS_INLINE JSValue *jsUndefined()
+ALWAYS_INLINE JSValue* jsUndefined()
 {
     return JSImmediate::undefinedImmediate();
 }
 
-inline JSValue *jsNull()
+inline JSValue* jsNull()
 {
     return JSImmediate::nullImmediate();
 }
 
-inline JSValue *jsNaN()
+inline JSValue* jsNaN()
 {
     return jsNumberCell(NaN);
 }
 
-inline JSValue *jsBoolean(bool b)
+inline JSValue* jsBoolean(bool b)
 {
     return b ? JSImmediate::trueImmediate() : JSImmediate::falseImmediate();
@@ -608 +610 @@
 }
 
-} // namespace
+} // namespace KJS
 
 #endif // KJS_VALUE_H