Changeset 14799 in webkit for trunk/JavaScriptCore/kjs/function.cpp

Timestamp:

Jun 9, 2006, 8:57:13 PM (19 years ago)

Author:

ggaren

Message:

Reviewed by Eric (yay!).

• Removed Context wrapper for ContextImp, renamed ContextImp to Context, split Context into its own file -- Context.cpp -- renamed _var to m_var, change ' *' to '* '.

• JavaScriptCore.xcodeproj/project.pbxproj:
• kjs/Context.cpp: Added. (KJS::Context::Context): (KJS::Context::~Context): (KJS::Context::mark):
• kjs/context.h: (KJS::Context::scopeChain): (KJS::Context::variableObject): (KJS::Context::setVariableObject): (KJS::Context::thisValue): (KJS::Context::callingContext): (KJS::Context::activationObject): (KJS::Context::currentBody): (KJS::Context::function): (KJS::Context::arguments): (KJS::Context::pushScope): (KJS::Context::seenLabels):
• kjs/function.cpp: (KJS::FunctionImp::callAsFunction): (KJS::FunctionImp::processParameters): (KJS::FunctionImp::argumentsGetter): (KJS::GlobalFuncImp::callAsFunction):
• kjs/internal.cpp: (KJS::InterpreterImp::evaluate):
• kjs/internal.h: (KJS::InterpreterImp::setContext): (KJS::InterpreterImp::context):
• kjs/interpreter.cpp:
• kjs/interpreter.h: (KJS::ExecState::context): (KJS::ExecState::ExecState):
• kjs/nodes.cpp: (currentSourceId): (currentSourceURL): (ThisNode::evaluate): (ResolveNode::evaluate): (FunctionCallResolveNode::evaluate): (PostfixResolveNode::evaluate): (DeleteResolveNode::evaluate): (TypeOfResolveNode::evaluate): (PrefixResolveNode::evaluate): (AssignResolveNode::evaluate): (VarDeclNode::evaluate): (VarDeclNode::processVarDecls): (DoWhileNode::execute): (WhileNode::execute): (ForNode::execute): (ForInNode::execute): (ContinueNode::execute): (BreakNode::execute): (ReturnNode::execute): (WithNode::execute): (SwitchNode::execute): (LabelNode::execute): (TryNode::execute): (FuncDeclNode::processFuncDecl): (FuncExprNode::evaluate):

File:

• trunk/JavaScriptCore/kjs/function.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/function.cpp

@@ -72 +72 @@
 
   // enter a new execution context
-  ContextImp ctx(globalObj, exec->dynamicInterpreter()->imp(), thisObj, body.get(),
-                 codeType(), exec->context().imp(), this, &args);
+  Context ctx(globalObj, exec->dynamicInterpreter()->imp(), thisObj, body.get(),
+                 codeType(), exec->context(), this, &args);
   ExecState newExec(exec->dynamicInterpreter(), &ctx);
   newExec.setException(exec->exception()); // could be null
@@ -164 +164 @@
 void FunctionImp::processParameters(ExecState *exec, const List &args)
 {
-  JSObject *variable = exec->context().imp()->variableObject();
+  JSObject* variable = exec->context()->variableObject();
 
 #ifdef KJS_VERBOSE
@@ -204 +204 @@
 {
   FunctionImp *thisObj = static_cast<FunctionImp *>(slot.slotBase());
-  ContextImp *context = exec->m_context;
+  Context *context = exec->m_context;
   while (context) {
     if (context->function() == thisObj) {
@@ -800 +800 @@
 
         // enter a new execution context
-        JSObject *thisVal = static_cast<JSObject *>(exec->context().thisValue());
-        ContextImp ctx(exec->dynamicInterpreter()->globalObject(),
+        JSObject *thisVal = static_cast<JSObject *>(exec->context()->thisValue());
+        Context ctx(exec->dynamicInterpreter()->globalObject(),
                        exec->dynamicInterpreter()->imp(),
                        thisVal,
                        progNode.get(),
                        EvalCode,
-                       exec->context().imp());
+                       exec->context());
         
         ExecState newExec(exec->dynamicInterpreter(), &ctx);