Changeset 9676 in webkit for trunk/JavaScriptCore/kjs/function.h

Timestamp:

Jul 12, 2005, 9:48:29 AM (20 years ago)

Author:

ggaren

Message:

-fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=3881
arguments object should share values with function parameters

Reviewed by mjs.

ArgumentsImp now uses a simple hash lookup to share values
with the activation object.

• kjs/function.cpp: (KJS::FunctionImp::getParameterName): (KJS::IndexToNameMap::IndexToNameMap): (KJS::IndexToNameMap::~IndexToNameMap): (KJS::IndexToNameMap::isMapped): (KJS::IndexToNameMap::unMap): (KJS::IndexToNameMap::operator[]): (KJS::ArgumentsImp::ArgumentsImp): (KJS::ArgumentsImp::mark): (KJS::ArgumentsImp::get): (KJS::ArgumentsImp::put): (KJS::ArgumentsImp::deleteProperty): (KJS::ArgumentsImp::hasOwnProperty): (KJS::ActivationImp::createArgumentsObject):
• kjs/function.h:
• tests/mozilla/expected.html: updated results

File:

• trunk/JavaScriptCore/kjs/function.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/function.h

@@ -51 +51 @@
 
     void addParameter(const Identifier &n);
+    Identifier getParameterName(int index);
     // parameters in string representation, e.g. (a, b, c)
     UString parameterString() const;
@@ -88 +89 @@
   };
 
+  class IndexToNameMap {
+  public:
+    IndexToNameMap(FunctionImp *func, const List &args);
+    ~IndexToNameMap();
+    
+    Identifier& operator[](int index);
+    Identifier& operator[](const Identifier &indexIdentifier);
+    bool isMapped(const Identifier &index) const;
+    void IndexToNameMap::unMap(const Identifier &index);
+    
+  private:
+    IndexToNameMap(); // prevent construction w/o parameters
+    int size;
+    Identifier * _map;
+  };
+  
   class ArgumentsImp : public ObjectImp {
   public:
-    ArgumentsImp(ExecState *exec, FunctionImp *func, const List &args);
-
+    ArgumentsImp(ExecState *exec, FunctionImp *func, const List &args, ActivationImp *act);
+    virtual void mark();
+    virtual Value get(ExecState *exec, const Identifier &propertyName) const;
+    virtual void put(ExecState *exec, const Identifier &propertyName,
+                     const Value &value, int attr = None);
+    virtual bool hasOwnProperty(ExecState *exec, const Identifier &propertyName) const;
+    virtual bool deleteProperty(ExecState *exec, const Identifier &propertyName);
     virtual const ClassInfo *classInfo() const { return &info; }
     static const ClassInfo info;
+  private:
+    ActivationImp *_activationObject; 
+    mutable IndexToNameMap indexToNameMap;
   };