X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/93a3786624b2768d89bfa27e46598dc64e2fb70a..ed1e77d3adeb83d26fd1dfb16dd84cabdcefd250:/runtime/FunctionConstructor.cpp diff --git a/runtime/FunctionConstructor.cpp b/runtime/FunctionConstructor.cpp index 3c4379b..dbe42fa 100644 --- a/runtime/FunctionConstructor.cpp +++ b/runtime/FunctionConstructor.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 1999-2001 Harri Porten (porten@kde.org) - * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2013 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,28 +29,28 @@ #include "JSString.h" #include "Lexer.h" #include "Nodes.h" -#include "Operations.h" +#include "JSCInlines.h" #include "Parser.h" #include namespace JSC { -ASSERT_HAS_TRIVIAL_DESTRUCTOR(FunctionConstructor); +STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(FunctionConstructor); -const ClassInfo FunctionConstructor::s_info = { "Function", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(FunctionConstructor) }; +const ClassInfo FunctionConstructor::s_info = { "Function", &Base::s_info, 0, CREATE_METHOD_TABLE(FunctionConstructor) }; -FunctionConstructor::FunctionConstructor(JSGlobalObject* globalObject, Structure* structure) - : InternalFunction(globalObject, structure) +FunctionConstructor::FunctionConstructor(VM& vm, Structure* structure) + : InternalFunction(vm, structure) { } -void FunctionConstructor::finishCreation(ExecState* exec, FunctionPrototype* functionPrototype) +void FunctionConstructor::finishCreation(VM& vm, FunctionPrototype* functionPrototype) { - Base::finishCreation(exec->vm(), functionPrototype->classInfo()->className); - putDirectWithoutTransition(exec->vm(), exec->propertyNames().prototype, functionPrototype, DontEnum | DontDelete | ReadOnly); + Base::finishCreation(vm, functionPrototype->classInfo()->className); + putDirectWithoutTransition(vm, vm.propertyNames->prototype, functionPrototype, DontEnum | DontDelete | ReadOnly); // Number of arguments for constructor - putDirectWithoutTransition(exec->vm(), exec->propertyNames().length, jsNumber(1), ReadOnly | DontDelete | DontEnum); + putDirectWithoutTransition(vm, vm.propertyNames->length, jsNumber(1), ReadOnly | DontDelete | DontEnum); } static EncodedJSValue JSC_HOST_CALL constructWithFunctionConstructor(ExecState* exec) @@ -82,43 +82,47 @@ CallType FunctionConstructor::getCallData(JSCell*, CallData& callData) JSObject* constructFunction(ExecState* exec, JSGlobalObject* globalObject, const ArgList& args, const Identifier& functionName, const String& sourceURL, const TextPosition& position) { if (!globalObject->evalEnabled()) - return throwError(exec, createEvalError(exec, globalObject->evalDisabledErrorMessage())); + return exec->vm().throwException(exec, createEvalError(exec, globalObject->evalDisabledErrorMessage())); return constructFunctionSkippingEvalEnabledCheck(exec, globalObject, args, functionName, sourceURL, position); } -JSObject* constructFunctionSkippingEvalEnabledCheck(ExecState* exec, JSGlobalObject* globalObject, const ArgList& args, const Identifier& functionName, const String& sourceURL, const TextPosition& position) +JSObject* constructFunctionSkippingEvalEnabledCheck( + ExecState* exec, JSGlobalObject* globalObject, const ArgList& args, + const Identifier& functionName, const String& sourceURL, + const TextPosition& position, int overrideLineNumber) { - // Functions need to have a space following the opening { due to for web compatibility - // see https://bugs.webkit.org/show_bug.cgi?id=24350 - // We also need \n before the closing } to handle // comments at the end of the last line + // How we stringify functions is sometimes important for web compatibility. + // See https://bugs.webkit.org/show_bug.cgi?id=24350. String program; if (args.isEmpty()) - program = ASCIILiteral("(function() { \n})"); + program = makeString("{function ", functionName.string(), "() {\n\n}}"); else if (args.size() == 1) - program = makeString("(function() { ", args.at(0).toString(exec)->value(exec), "\n})"); + program = makeString("{function ", functionName.string(), "() {\n", args.at(0).toString(exec)->value(exec), "\n}}"); else { StringBuilder builder; - builder.appendLiteral("(function("); - builder.append(args.at(0).toString(exec)->value(exec)); + builder.appendLiteral("{function "); + builder.append(functionName.string()); + builder.append('('); + builder.append(args.at(0).toString(exec)->view(exec)); for (size_t i = 1; i < args.size() - 1; i++) { - builder.append(','); - builder.append(args.at(i).toString(exec)->value(exec)); + builder.appendLiteral(", "); + builder.append(args.at(i).toString(exec)->view(exec)); } - builder.appendLiteral(") { "); - builder.append(args.at(args.size() - 1).toString(exec)->value(exec)); - builder.appendLiteral("\n})"); + builder.appendLiteral(") {\n"); + builder.append(args.at(args.size() - 1).toString(exec)->view(exec)); + builder.appendLiteral("\n}}"); program = builder.toString(); } SourceCode source = makeSource(program, sourceURL, position); - JSObject* exception = 0; - FunctionExecutable* function = FunctionExecutable::fromGlobalCode(functionName, exec, exec->dynamicGlobalObject()->debugger(), source, &exception); + JSObject* exception = nullptr; + FunctionExecutable* function = FunctionExecutable::fromGlobalCode(functionName, *exec, source, exception, overrideLineNumber); if (!function) { ASSERT(exception); - return throwError(exec, exception); + return exec->vm().throwException(exec, exception); } - return JSFunction::create(exec, function, globalObject); + return JSFunction::create(exec->vm(), function, globalObject); } // ECMA 15.3.2 The Function Constructor