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

Timestamp:

Jun 12, 2006, 11:08:52 PM (19 years ago)

Author:

ggaren

Message:

JavaScriptCore:

Reviewed by TimO, Maciej.

• Merged InterpreterImp code into Interpreter, which implements all interpreter functionality now. This is part of my continuing quest to create an external notion of JS "execution context" that is unified and simple -- something to replace the mix of Context, ContextImp, ExecState, Interpreter, InterpreterImp, and JSRun.

All tests pass. Leaks test has not regressed from its baseline ~207 leaks
with ~3460 leaked nodes.

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• bindings/NP_jsobject.cpp:
• bindings/objc/WebScriptObject.mm: (+[WebScriptObject throwException:]):
• bindings/runtime_root.cpp:
• bindings/runtime_root.h:
• kjs/Context.cpp: (KJS::Context::Context):
• kjs/ExecState.cpp: Added. (KJS::ExecState::lexicalInterpreter):
• kjs/ExecState.h: Added. (KJS::ExecState::dynamicInterpreter):
• kjs/SavedBuiltins.h: Added.
• kjs/bool_object.cpp: (BooleanPrototype::BooleanPrototype):
• kjs/collector.cpp: (KJS::Collector::collect): (KJS::Collector::numInterpreters):
• kjs/context.h:
• kjs/debugger.cpp: (Debugger::attach): (Debugger::detach):
• kjs/function.cpp: (KJS::FunctionImp::callAsFunction): (KJS::GlobalFuncImp::callAsFunction):
• kjs/function_object.cpp: (FunctionObjectImp::construct):
• kjs/internal.cpp:
• kjs/internal.h:
• kjs/interpreter.cpp: (KJS::interpreterMap): (KJS::Interpreter::Interpreter): (KJS::Interpreter::init): (KJS::Interpreter::~Interpreter): (KJS::Interpreter::globalObject): (KJS::Interpreter::initGlobalObject): (KJS::Interpreter::globalExec): (KJS::Interpreter::checkSyntax): (KJS::Interpreter::evaluate): (KJS::Interpreter::builtinObject): (KJS::Interpreter::builtinFunction): (KJS::Interpreter::builtinArray): (KJS::Interpreter::builtinBoolean): (KJS::Interpreter::builtinString): (KJS::Interpreter::builtinNumber): (KJS::Interpreter::builtinDate): (KJS::Interpreter::builtinRegExp): (KJS::Interpreter::builtinError): (KJS::Interpreter::builtinObjectPrototype): (KJS::Interpreter::builtinFunctionPrototype): (KJS::Interpreter::builtinArrayPrototype): (KJS::Interpreter::builtinBooleanPrototype): (KJS::Interpreter::builtinStringPrototype): (KJS::Interpreter::builtinNumberPrototype): (KJS::Interpreter::builtinDatePrototype): (KJS::Interpreter::builtinRegExpPrototype): (KJS::Interpreter::builtinErrorPrototype): (KJS::Interpreter::builtinEvalError): (KJS::Interpreter::builtinRangeError): (KJS::Interpreter::builtinReferenceError): (KJS::Interpreter::builtinSyntaxError): (KJS::Interpreter::builtinTypeError): (KJS::Interpreter::builtinURIError): (KJS::Interpreter::builtinEvalErrorPrototype): (KJS::Interpreter::builtinRangeErrorPrototype): (KJS::Interpreter::builtinReferenceErrorPrototype): (KJS::Interpreter::builtinSyntaxErrorPrototype): (KJS::Interpreter::builtinTypeErrorPrototype): (KJS::Interpreter::builtinURIErrorPrototype): (KJS::Interpreter::mark): (KJS::Interpreter::interpreterWithGlobalObject): (KJS::Interpreter::saveBuiltins): (KJS::Interpreter::restoreBuiltins):
• kjs/interpreter.h: (KJS::Interpreter::setCompatMode): (KJS::Interpreter::compatMode): (KJS::Interpreter::firstInterpreter): (KJS::Interpreter::nextInterpreter): (KJS::Interpreter::prevInterpreter): (KJS::Interpreter::debugger): (KJS::Interpreter::setDebugger): (KJS::Interpreter::setContext): (KJS::Interpreter::context):
• kjs/nodes.cpp: (StatementNode::hitStatement): (RegExpNode::evaluate):
• kjs/protect.h:

JavaScriptGlue:

Reviewed by TimO, Maciej.

• JSGlue part of merging InterpreterImp into Interpreter.

Since there's now a kjs forwarding header, I moved all forwarding
headers into a "ForwardingHeaders" directory, like in WebCore.

• ForwardingHeaders: Added.
• ForwardingHeaders/kjs: Added.
• ForwardingHeaders/kjs/ExecState.h: Added.
• ForwardingHeaders/wtf: Added.
• JavaScriptGlue.xcodeproj/project.pbxproj:
• config.h:
• wtf: Removed.
• wtf/AlwaysInline.h: Removed.
• wtf/Assertions.h: Removed.
• wtf/FastMalloc.h: Removed.
• wtf/Forward.h: Removed.
• wtf/HashCountedSet.h: Removed.
• wtf/HashSet.h: Removed.
• wtf/Noncopyable.h: Removed.
• wtf/OwnArrayPtr.h: Removed.
• wtf/OwnPtr.h: Removed.
• wtf/PassRefPtr.h: Removed.
• wtf/Platform.h: Removed.
• wtf/RefPtr.h: Removed.
• wtf/Vector.h: Removed.

WebCore:

Reviewed by TimO, Maciej.

• WebCore part of merging InterpreterImp into Interpreter. No test because there's no behavior change.

A substantive change here is that ScriptInterpreter::mark must now chain to
Interpreter::mark, since Interpreter needs to mark the things that
InterpreterImp used to mark.

• WebCore.xcodeproj/project.pbxproj:
• bindings/js/kjs_binding.cpp:
• bindings/js/kjs_window.cpp: (KJS::Window::put):
• bridge/mac/WebCoreFrameBridge.mm:
• bridge/mac/WebCoreScriptDebugger.mm: (-[WebCoreScriptCallFrame evaluateWebScript:]):
• kwq/KWQPageState.mm:

File:

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

trunk/JavaScriptCore/kjs/function.cpp

@@ -72 +72 @@
 
   // enter a new execution context
-  Context ctx(globalObj, exec->dynamicInterpreter()->imp(), thisObj, body.get(),
+  Context ctx(globalObj, exec->dynamicInterpreter(), thisObj, body.get(),
                  codeType(), exec->context(), this, &args);
   ExecState newExec(exec->dynamicInterpreter(), &ctx);
@@ -82 +82 @@
   processVarDecls(&newExec);
 
-  Debugger *dbg = exec->dynamicInterpreter()->imp()->debugger();
+  Debugger *dbg = exec->dynamicInterpreter()->debugger();
   int sid = -1;
   int lineno = -1;
@@ -788 +788 @@
         RefPtr<ProgramNode> progNode(Parser::parse(UString(), 0, s.data(),s.size(),&sid,&errLine,&errMsg));
 
-        Debugger *dbg = exec->dynamicInterpreter()->imp()->debugger();
+        Debugger *dbg = exec->dynamicInterpreter()->debugger();
         if (dbg) {
           bool cont = dbg->sourceParsed(exec, sid, UString(), s, errLine);
@@ -802 +802 @@
         JSObject *thisVal = static_cast<JSObject *>(exec->context()->thisValue());
         Context ctx(exec->dynamicInterpreter()->globalObject(),
-                       exec->dynamicInterpreter()->imp(),
+                       exec->dynamicInterpreter(),
                        thisVal,
                        progNode.get(),