Changeset 33979 in webkit for trunk/JavaScriptCore/kjs/object.h

Timestamp:

May 21, 2008, 6:20:45 PM (17 years ago)

Author:

[email protected]

Message:

Merge squirrelfish branch into trunk.

File:

• trunk/JavaScriptCore/kjs/object.h (modified) (10 diffs)

trunk/JavaScriptCore/kjs/object.h

@@ -235 +235 @@
      * @return The specified property, or Undefined
      */
-    JSValue *get(ExecState *exec, const Identifier &propertyName) const;
-    JSValue *get(ExecState *exec, unsigned propertyName) const;
-
-    bool getPropertySlot(ExecState *, const Identifier&, PropertySlot&);
-    bool getPropertySlot(ExecState *, unsigned, PropertySlot&);
-
-    virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
-    virtual bool getOwnPropertySlot(ExecState *, unsigned index, PropertySlot&);
+    JSValue* get(ExecState* exec, const Identifier& propertyName) const;
+    JSValue* get(ExecState* exec, unsigned propertyName) const;
+
+    bool getPropertySlot(ExecState*, const Identifier&, PropertySlot&);
+    bool getPropertySlot(ExecState*, unsigned, PropertySlot&);
+
+    virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
+    virtual bool getOwnPropertySlot(ExecState*, unsigned index, PropertySlot&);
 
     /**
@@ -315 +315 @@
      */
     virtual JSValue *defaultValue(ExecState *exec, JSType hint) const;
-
-    /**
-     * Whether or not the object implements the construct() method. If this
-     * returns false you should not call the construct() method on this
-     * object (typically, an assertion will fail to indicate this).
-     *
-     * @return true if this object implements the construct() method, otherwise
-     * false
-     */
-    virtual bool implementsConstruct() const;
 
     /**
@@ -343 +333 @@
      * Under some circumstances, the exception object may also be returned.
      *
-     * Note: This function should not be called if implementsConstruct() returns
-     * false, in which case it will result in an assertion failure.
+     * Note: This function should not be called if getConstructData() returns
+     * ConstructTypeNone, in which case it will result in an assertion failure.
      *
      * @param exec The current execution state
@@ -356 +346 @@
     virtual JSObject* construct(ExecState* exec, const List& args);
     virtual JSObject* construct(ExecState* exec, const List& args, const Identifier& functionName, const UString& sourceURL, int lineNumber);
-
-    /**
-     * Whether or not the object implements the call() method. If this returns
-     * false you should not call the call() method on this object (typically,
-     * an assertion will fail to indicate this).
-     *
-     * @return true if this object implements the call() method, otherwise
-     * false
-     */
-    virtual bool implementsCall() const;
 
     /**
@@ -384 +364 @@
      * @return The return value from the function
      */
+    bool implementsCall();
     JSValue *call(ExecState *exec, JSObject *thisObj, const List &args);
+
     virtual JSValue *callAsFunction(ExecState *exec, JSObject *thisObj, const List &args);
 
@@ -432 +414 @@
     JSValue **getDirectLocation(const Identifier& propertyName)
         { return _prop.getLocation(propertyName); }
+   JSValue **getDirectLocation(const Identifier& propertyName, bool& isWriteable)
+        { return _prop.getLocation(propertyName, isWriteable); }
     void putDirect(const Identifier &propertyName, JSValue *value, int attr = 0);
     void putDirect(const Identifier &propertyName, int value, int attr = 0);
@@ -452 +436 @@
   protected:
     PropertyMap _prop;
+    bool getOwnPropertySlotForWrite(ExecState*, const Identifier&, PropertySlot&, bool& slotIsWriteable);
 
   private:
@@ -541 +526 @@
 }
 
+inline JSValue *JSObject::get(ExecState *exec, const Identifier &propertyName) const
+{
+  PropertySlot slot;
+
+  if (const_cast<JSObject *>(this)->getPropertySlot(exec, propertyName, slot))
+    return slot.getValue(exec, const_cast<JSObject *>(this), propertyName);
+    
+  return jsUndefined();
+}
+
+inline JSValue *JSObject::get(ExecState *exec, unsigned propertyName) const
+{
+  PropertySlot slot;
+  if (const_cast<JSObject *>(this)->getPropertySlot(exec, propertyName, slot))
+    return slot.getValue(exec, const_cast<JSObject *>(this), propertyName);
+    
+  return jsUndefined();
+}
+
 // It may seem crazy to inline a function this large but it makes a big difference
 // since this is function very hot in variable lookup
@@ -556 +560 @@
         object = static_cast<JSObject *>(proto);
     }
+}
+
+inline bool JSObject::getPropertySlot(ExecState *exec, unsigned propertyName, PropertySlot& slot)
+{
+  JSObject *imp = this;
+  
+  while (true) {
+    if (imp->getOwnPropertySlot(exec, propertyName, slot))
+      return true;
+    
+    JSValue *proto = imp->_proto;
+    if (!proto->isObject())
+      break;
+    
+    imp = static_cast<JSObject *>(proto);
+  }
+  
+  return false;
+}
+
+// It may seem crazy to inline a function this large, especially a virtual function,
+// but it makes a big difference to property lookup that derived classes can inline their
+// base class call to this.
+ALWAYS_INLINE bool JSObject::getOwnPropertySlotForWrite(ExecState* exec, const Identifier& propertyName, PropertySlot& slot, bool& slotIsWriteable)
+{
+    if (JSValue **location = getDirectLocation(propertyName, slotIsWriteable)) {
+        if (_prop.hasGetterSetterProperties() && location[0]->type() == GetterSetterType) {
+            slotIsWriteable = false;
+            fillGetterPropertySlot(slot, location);
+        } else
+            slot.setValueSlot(this, location);
+        return true;
+    }
+
+    // non-standard Netscape extension
+    if (propertyName == exec->propertyNames().underscoreProto) {
+        slot.setValueSlot(this, &_proto);
+        slotIsWriteable = true;
+        return true;
+    }
+
+    return false;
 }
 
@@ -580 +626 @@
 }
 
-inline void ScopeChain::release()
-{
-    // This function is only called by deref(),
-    // Deref ensures these conditions are true.
-    ASSERT(_node && _node->refCount == 0);
-    ScopeChainNode *n = _node;
-    do {
-        ScopeChainNode *next = n->next;
-        delete n;
-        n = next;
-    } while (n && --n->refCount == 0);
+inline void JSObject::putDirect(const Identifier &propertyName, JSValue *value, int attr)
+{
+    _prop.put(propertyName, value, attr);
+}
+
+inline void JSObject::putDirect(const Identifier &propertyName, int value, int attr)
+{
+    _prop.put(propertyName, jsNumber(value), attr);
 }