/*
* Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
* Copyright (C) 2001 Peter Kelly (pmk@post.com)
- * Copyright (C) 2003, 2007 Apple Inc.
+ * Copyright (C) 2003, 2007, 2013 Apple Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
#include "Interpreter.h"
#include "JSGlobalObject.h"
#include "JSLock.h"
-#include "Operations.h"
+#include "JSCInlines.h"
#include "Parser.h"
#include <wtf/WTFThreadData.h>
-#include <stdio.h>
namespace JSC {
bool checkSyntax(ExecState* exec, const SourceCode& source, JSValue* returnedException)
{
JSLockHolder lock(exec);
- RELEASE_ASSERT(exec->vm().identifierTable == wtfThreadData().currentIdentifierTable());
+ RELEASE_ASSERT(exec->vm().atomicStringTable() == wtfThreadData().atomicStringTable());
ProgramExecutable* program = ProgramExecutable::create(exec, source);
JSObject* error = program->checkSyntax(exec);
bool checkSyntax(VM& vm, const SourceCode& source, ParserError& error)
{
JSLockHolder lock(vm);
- RELEASE_ASSERT(vm.identifierTable == wtfThreadData().currentIdentifierTable());
+ RELEASE_ASSERT(vm.atomicStringTable() == wtfThreadData().atomicStringTable());
RefPtr<ProgramNode> programNode = parse<ProgramNode>(&vm, source, 0, Identifier(), JSParseNormal, JSParseProgramCode, error);
return programNode;
}
JSValue evaluate(ExecState* exec, const SourceCode& source, JSValue thisValue, JSValue* returnedException)
{
JSLockHolder lock(exec);
- RELEASE_ASSERT(exec->vm().identifierTable == wtfThreadData().currentIdentifierTable());
+ RELEASE_ASSERT(exec->vm().atomicStringTable() == wtfThreadData().atomicStringTable());
RELEASE_ASSERT(!exec->vm().isCollectorBusy());
CodeProfiling profile(source);
ProgramExecutable* program = ProgramExecutable::create(exec, source);
if (!program) {
if (returnedException)
- *returnedException = exec->vm().exception;
+ *returnedException = exec->vm().exception();
- exec->vm().exception = JSValue();
+ exec->vm().clearException();
return jsUndefined();
}
if (!thisValue || thisValue.isUndefinedOrNull())
- thisValue = exec->dynamicGlobalObject();
- JSObject* thisObj = thisValue.toThisObject(exec);
+ thisValue = exec->vmEntryGlobalObject();
+ JSObject* thisObj = jsCast<JSObject*>(thisValue.toThis(exec, NotStrictMode));
JSValue result = exec->interpreter()->execute(program, exec, thisObj);
if (exec->hadException()) {