Changeset 33979 in webkit for trunk/JavaScriptCore/kjs/function.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/function.h (modified) (9 diffs)

trunk/JavaScriptCore/kjs/function.h

@@ -27 +27 @@
 
 #include "JSVariableObject.h"
-#include "LocalStorageEntry.h"
 #include "SymbolTable.h"
 #include "nodes.h"
@@ -34 +33 @@
 namespace KJS {
 
-  class ActivationImp;
   class FunctionBodyNode;
   class FunctionPrototype;
+  class JSActivation;
   class JSGlobalObject;
 
@@ -44 +43 @@
     InternalFunctionImp(FunctionPrototype*, const Identifier&);
 
-    virtual bool implementsCall() const;
+    virtual CallType getCallData(CallData&);
+
     virtual JSValue* callAsFunction(ExecState*, JSObject* thisObjec, const List& args) = 0;
     virtual bool implementsHasInstance() const;
@@ -57 +57 @@
 
   class FunctionImp : public InternalFunctionImp {
-    friend class ActivationImp;
   public:
-    FunctionImp(ExecState*, const Identifier& name, FunctionBodyNode*, const ScopeChain&);
+    FunctionImp(ExecState*, const Identifier&, FunctionBodyNode*, ScopeChainNode*);
 
     virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
@@ -65 +64 @@
     virtual bool deleteProperty(ExecState*, const Identifier& propertyName);
 
-    virtual bool implementsConstruct() const { return true; }
+    virtual ConstructType getConstructData(ConstructData&);
     virtual JSObject* construct(ExecState*, const List& args);
-    
+
+    virtual CallType getCallData(CallData&);
     virtual JSValue* callAsFunction(ExecState*, JSObject* thisObj, const List& args);
 
@@ -80 +80 @@
 
     void setScope(const ScopeChain& s) { _scope = s; }
-    const ScopeChain& scope() const { return _scope; }
+    ScopeChain& scope() { return _scope; }
 
     virtual void mark();
@@ -108 +108 @@
   class Arguments : public JSObject {
   public:
-    Arguments(ExecState*, FunctionImp* func, const List& args, ActivationImp* act);
+    Arguments(ExecState*, FunctionImp* func, const List& args, JSActivation* act);
     virtual void mark();
     virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
@@ -118 +118 @@
     static JSValue* mappedIndexGetter(ExecState*, JSObject*, const Identifier&, const PropertySlot& slot);
 
-    ActivationImp* _activationObject;
+    JSActivation* _activationObject;
     mutable IndexToNameMap indexToNameMap;
   };
@@ -169 +169 @@
 #endif
 
-    JSValue* eval(ExecState*, const ScopeChain&, JSVariableObject*, JSGlobalObject*, JSObject* thisObj, const List& args);
-
     static const double mantissaOverflowLowerBound = 9007199254740992.0;
     double parseIntOverflow(const char*, int length, int radix);