Changeset 2821 in webkit for trunk/JavaScriptCore/kjs/internal.h

Timestamp:

Nov 21, 2002, 10:59:09 PM (23 years ago)

Author:

darin

Message:

top level:

• Site/Internal/Design/CFURL.rtf: Added.

Tools:

• Scripts/last-update: Added. Script for Trey that tells you when you last did a cvs update, based on most-recently updated ChangeLog.

JavaScriptCore:

• stop garbage collecting the ActivationImp objects, gets 3% on iBench
• pave the way to separate the argument lists from scope chains

• kjs/context.h: Added. Moved ContextImp here so it can use things defined in function.h

• kjs/scope_chain.h: Added. Starting as a copy of List, to be improved.
• kjs/scope_chain.cpp: Added. Starting as a copy of List, to be improved.

• JavaScriptCore.pbproj/project.pbxproj: Rearranged things, added context.h.

• kjs/function.cpp: (FunctionImp::call): Pass InterpreterImp, not ExecState, to ContextImp. (DeclaredFunctionImp::DeclaredFunctionImp): List -> ScopeChain. (ActivationImp::createArgumentsObject): ArgumentList -> List. (GlobalFuncImp::call): Pass InterpreterImp, not an ExecState, to ContextImp.
• kjs/function.h: List -> ScopeChain.
• kjs/function_object.cpp: (FunctionObjectImp::construct): List -> ScopeChain.
• kjs/internal.cpp: (ContextImp::ContextImp): Set the context in the interpreter. (ContextImp::~ContextImp): Set the context in the interpreter to the caller. (ContextImp::mark): Mark all the activation objects. (InterpreterImp::InterpreterImp): Initialize context to 0. (InterpreterImp::mark): Mark the top context. (InterpreterImp::evaluate): Pass InterpreterImp to ContextImp.
• kjs/internal.h: Move ContextImp to its own header. Add setContext to InterpreterImp.
• kjs/interpreter.cpp: (Context::scopeChain): List -> ScopeChain.
• kjs/interpreter.h: List -> ScopeChain.
• kjs/nodes.cpp: (ResolveNode::evaluateReference): List -> ScopeChain. (FuncDeclNode::processFuncDecl): List -> ScopeChain. (FuncExprNode::evaluate): List -> ScopeChain.
• kjs/object.cpp: List -> ScopeChain.
• kjs/object.h: List -> ScopeChain.

• kjs/types.h: Remove needsMarking features from List.
• kjs/types.cpp: Ditto.

WebCore:

• khtml/ecma/kjs_dom.cpp: (DOMNode::eventHandlerScope): List -> ScopeChain.
• khtml/ecma/kjs_dom.h: List -> ScopeChain.
• khtml/ecma/kjs_events.cpp: (JSEventListener::handleEvent): List -> ScopeChain.
• khtml/ecma/kjs_html.cpp: (KJS::HTMLElement::eventHandlerScope): List -> ScopeChain.
• khtml/ecma/kjs_html.h: List -> ScopeChain.

• force-js-clean-timestamp: Not sure this is required, but better safe than sorry.

File:

• trunk/JavaScriptCore/kjs/internal.h (modified) (4 diffs)

trunk/JavaScriptCore/kjs/internal.h

@@ -30 +30 @@
 #include "types.h"
 #include "interpreter.h"
+#include "scope_chain.h"
 
 #define I18N_NOOP(s) s
@@ -195 +196 @@
 
   /**
-   * @short Execution context.
-   */
-  class ContextImp {
-  public:
-    ContextImp(Object &glob, ExecState *exec, Object &thisV, CodeType type = GlobalCode,
-               ContextImp *_callingContext = 0L, FunctionImp *func = 0L, const ArgumentList *args = 0);
-    ~ContextImp();
-
-    const List scopeChain() const { return scope; }
-    Object variableObject() const { return variable; }
-    void setVariableObject(const Object &v) { variable = v; }
-    Object thisValue() const { return thisVal; }
-    ContextImp *callingContext() { return callingCon; }
-    ObjectImp *activationObject() { return activation.imp(); }
-    FunctionImp *function() const { return _function; }
-    const ArgumentList *arguments() const { return _arguments; }
-
-    void pushScope(const Object &s);
-    void popScope();
-    LabelStack *seenLabels() { return &ls; }
-
-  private:
-
-    List scope;
-    Object variable;
-    Object thisVal;
-    ContextImp *callingCon;
-    Object activation;
-    FunctionImp *_function;
-    const ArgumentList *_arguments;
-
-    LabelStack ls;
-    CodeType codeType;
-  };
-
-  /**
    * @internal
    *
@@ -309 +274 @@
     InterpreterImp *nextInterpreter() const { return next; }
     InterpreterImp *prevInterpreter() const { return prev; }
+    
+    void setContext(ContextImp *c) { _context = c; }
 
   private:
@@ -360 +327 @@
     static InterpreterImp* s_hook;
     InterpreterImp *next, *prev;
+    
+    ContextImp *_context;
 
     int recursion;