Changeset 2778 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Nov 20, 2002, 1:11:43 AM (23 years ago)

Author:

darin

Message:

• on the road to killing ActivationImp

• kjs/function.h: Add get/put to FunctionImp. Remove argumentsObject() from ActivationImp. Add function() to ActivationImp.
• kjs/function.cpp: (FunctionImp::FunctionImp): No arguments property. (FunctionImp::call): No need to set up the arguments property. (FunctionImp::parameterString): Remove strangeness. (FunctionImp::processParameters): Ditto. (FunctionImp::get): Added, handles arguments and length properties. (FunctionImp::put): Ditto. (FunctionImp::hasProperty): Ditto. (FunctionImp::deleteProperty): Ditto. (ActivationImp::ActivationImp): Store a function pointer so we can find it in the context.

• kjs/function_object.cpp: (FunctionObjectImp::construct): No need to set up arguments property.
• kjs/nodes.cpp: (FuncExprNode::evaluate): No need to set up length property.

• kjs/internal.h: Return ObjectImp * for activation object.

• kjs/interpreter.h: Remove stray declaration of ExecStateImp.

Location:

trunk/JavaScriptCore/kjs

Files:

• function.cpp (modified) (7 diffs)
• function.h (modified) (2 diffs)
• function_object.cpp (modified) (1 diff)
• internal.h (modified) (1 diff)
• interpreter.h (modified) (1 diff)
• nodes.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/function.cpp

@@ -58 +58 @@
       ), param(0L), ident(n)
 {
-  Value protect(this);
   //fprintf(stderr,"FunctionImp::FunctionImp this=%p\n");
-  put(exec,argumentsPropertyName,Null(),ReadOnly|DontDelete|DontEnum);
 }
 
@@ -105 +103 @@
   newExec.setException(exec->exception()); // could be null
 
-  // In order to maintain our "arguments" property, we save the old
-  // value from a possible earlier call. Upon return, we restore the
-  // previous arguments object.
-  // Note: this does not appear to be part of the spec
-  Value oldArgs = get(&newExec, argumentsPropertyName);
-
-  if (codeType() == FunctionCode) {
-    assert(ctx.activationObject().inherits(&ActivationImp::info));
-    Object argsObj = static_cast<ActivationImp*>(ctx.activationObject().imp())->argumentsObject();
-    put(&newExec, argumentsPropertyName, argsObj, DontDelete|DontEnum|ReadOnly);
-  }
-
   // assign user supplied arguments to parameters
   processParameters(&newExec, args);
@@ -127 +113 @@
   if (newExec.hadException())
     exec->setException(newExec.exception());
-  if (codeType() == FunctionCode)
-    put(&newExec, argumentsPropertyName, oldArgs, DontDelete|DontEnum|ReadOnly);
 
 #ifdef KJS_VERBOSE
@@ -170 +154 @@
 {
   UString s;
-  const Parameter * const *p = &param;
-  while (*p) {
+  const Parameter *p = param;
+  while (p) {
     if (!s.isEmpty())
         s += ", ";
-    s += (*p)->name.ustring();
-    p = &(*p)->next;
+    s += p->name.ustring();
+    p = p->next;
   }
 
@@ -195 +179 @@
   if (param) {
     ListIterator it = args.begin();
-    Parameter **p = &param;
-    while (*p) {
+    Parameter *p = param;
+    while (p) {
       if (it != args.end()) {
 #ifdef KJS_VERBOSE
-        fprintf(stderr, "setting parameter %s ", (*p)->name.ascii());
+        fprintf(stderr, "setting parameter %s ", p->name.ascii());
         printInfo(exec,"to", *it);
 #endif
-        variable.put(exec,(*p)->name, *it);
+        variable.put(exec, p->name, *it);
         it++;
       } else
-        variable.put(exec,(*p)->name, Undefined());
-      p = &(*p)->next;
+        variable.put(exec, p->name, Undefined());
+      p = p->next;
     }
   }
@@ -219 +203 @@
 void FunctionImp::processVarDecls(ExecState */*exec*/)
 {
+}
+
+Value FunctionImp::get(ExecState *exec, const Identifier &propertyName) const
+{
+    // Find the arguments from the closest context.
+    if (propertyName == argumentsPropertyName) {
+        ContextImp *context = exec->_context;
+        while (context) {
+            ActivationImp *activation = static_cast<ActivationImp *>(context->activationObject());
+            if (activation->function() == this)
+                return activation->get(exec, propertyName);
+            context = context->callingContext();
+        }
+        return Undefined();
+    }
+    
+    // Compute length of parameters.
+    if (propertyName == lengthPropertyName) {
+        const Parameter * p = param;
+        int count = 0;
+        while (p) {
+            ++count;
+            p = p->next;
+        }
+        return Number(count);
+    }
+    
+    return InternalFunctionImp::get(exec, propertyName);
+}
+
+void FunctionImp::put(ExecState *exec, const Identifier &propertyName, const Value &value, int attr)
+{
+    if (propertyName == argumentsPropertyName || propertyName == lengthPropertyName)
+        return;
+    InternalFunctionImp::put(exec, propertyName, value, attr);
+}
+
+bool FunctionImp::hasProperty(ExecState *exec, const Identifier &propertyName) const
+{
+    if (propertyName == argumentsPropertyName || propertyName == lengthPropertyName)
+        return true;
+    return InternalFunctionImp::hasProperty(exec, propertyName);
+}
+
+bool FunctionImp::deleteProperty(ExecState *exec, const Identifier &propertyName)
+{
+    if (propertyName == argumentsPropertyName || propertyName == lengthPropertyName)
+        return false;
+    return InternalFunctionImp::deleteProperty(exec, propertyName);
 }
 
@@ -305 +338 @@
 // ECMA 10.1.6
 ActivationImp::ActivationImp(ExecState *exec, FunctionImp *f, const List &args)
-  : ObjectImp()
+  : _function(f)
 {
   Value protect(this);

trunk/JavaScriptCore/kjs/function.h

@@ -39 +39 @@
     FunctionImp(ExecState *exec, const Identifier &n = Identifier::null);
     virtual ~FunctionImp();
+
+    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 hasProperty(ExecState *exec, const Identifier &propertyName) const;
+    virtual bool deleteProperty(ExecState *exec, const Identifier &propertyName);
 
     virtual void mark();
@@ -99 +104 @@
     ~ActivationImp();
 
-    Object argumentsObject() { return Object(arguments); }
-
     virtual const ClassInfo *classInfo() const { return &info; }
     static const ClassInfo info;
+    
+    FunctionImp *function() const { return _function; }
+    
   private:
+    FunctionImp *_function;
     ObjectImp* arguments;
   };

trunk/JavaScriptCore/kjs/function_object.cpp

@@ -284 +284 @@
                 Object(fimp), DontEnum|DontDelete|ReadOnly);
   fimp->put(exec,prototypePropertyName,prototype,DontEnum|DontDelete|ReadOnly);
-  fimp->put(exec,argumentsPropertyName,Null(),DontEnum|DontDelete|ReadOnly);
   return ret;
 }

trunk/JavaScriptCore/kjs/internal.h

@@ -197 +197 @@
     Object thisValue() const { return thisVal; }
     ContextImp *callingContext() { return callingCon; }
-    Object activationObject() { return activation; }
+    ObjectImp *activationObject() { return activation.imp(); }
 
     void pushScope(const Object &s);

trunk/JavaScriptCore/kjs/interpreter.h

@@ -32 +32 @@
 
   class ContextImp;
-  class ExecStateImp;
   class InterpreterImp;
 

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -2831 +2831 @@
   for(ParameterNode *p = param; p != 0L; p = p->nextParam(), plen++)
     fimp->addParameter(p->ident());
-  fimp->put(exec,lengthPropertyName, Number(plen), ReadOnly|DontDelete|DontEnum);
 
   return ret;