X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/ba379fdc102753d6be2c4d937058fe40257329fe..ed1e77d3adeb83d26fd1dfb16dd84cabdcefd250:/runtime/FunctionConstructor.cpp?ds=sidebyside diff --git a/runtime/FunctionConstructor.cpp b/runtime/FunctionConstructor.cpp index f4f5cc8..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 @@ -21,113 +21,114 @@ #include "config.h" #include "FunctionConstructor.h" +#include "Debugger.h" +#include "ExceptionHelpers.h" #include "FunctionPrototype.h" #include "JSFunction.h" #include "JSGlobalObject.h" #include "JSString.h" -#include "Parser.h" -#include "Debugger.h" #include "Lexer.h" #include "Nodes.h" +#include "JSCInlines.h" +#include "Parser.h" +#include namespace JSC { -ASSERT_CLASS_FITS_IN_CELL(FunctionConstructor); +STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(FunctionConstructor); + +const ClassInfo FunctionConstructor::s_info = { "Function", &Base::s_info, 0, CREATE_METHOD_TABLE(FunctionConstructor) }; + +FunctionConstructor::FunctionConstructor(VM& vm, Structure* structure) + : InternalFunction(vm, structure) +{ +} -FunctionConstructor::FunctionConstructor(ExecState* exec, PassRefPtr structure, FunctionPrototype* functionPrototype) - : InternalFunction(&exec->globalData(), structure, Identifier(exec, functionPrototype->classInfo()->className)) +void FunctionConstructor::finishCreation(VM& vm, FunctionPrototype* functionPrototype) { - putDirectWithoutTransition(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->propertyNames().length, jsNumber(exec, 1), ReadOnly | DontDelete | DontEnum); + putDirectWithoutTransition(vm, vm.propertyNames->length, jsNumber(1), ReadOnly | DontDelete | DontEnum); } -static JSObject* constructWithFunctionConstructor(ExecState* exec, JSObject*, const ArgList& args) +static EncodedJSValue JSC_HOST_CALL constructWithFunctionConstructor(ExecState* exec) { - return constructFunction(exec, args); + ArgList args(exec); + return JSValue::encode(constructFunction(exec, asInternalFunction(exec->callee())->globalObject(), args)); } -ConstructType FunctionConstructor::getConstructData(ConstructData& constructData) +ConstructType FunctionConstructor::getConstructData(JSCell*, ConstructData& constructData) { constructData.native.function = constructWithFunctionConstructor; return ConstructTypeHost; } -static JSValue JSC_HOST_CALL callFunctionConstructor(ExecState* exec, JSObject*, JSValue, const ArgList& args) +static EncodedJSValue JSC_HOST_CALL callFunctionConstructor(ExecState* exec) { - return constructFunction(exec, args); + ArgList args(exec); + return JSValue::encode(constructFunction(exec, asInternalFunction(exec->callee())->globalObject(), args)); } // ECMA 15.3.1 The Function Constructor Called as a Function -CallType FunctionConstructor::getCallData(CallData& callData) +CallType FunctionConstructor::getCallData(JSCell*, CallData& callData) { callData.native.function = callFunctionConstructor; return CallTypeHost; } -FunctionBodyNode* extractFunctionBody(ProgramNode* program) +// ECMA 15.3.2 The Function Constructor +JSObject* constructFunction(ExecState* exec, JSGlobalObject* globalObject, const ArgList& args, const Identifier& functionName, const String& sourceURL, const TextPosition& position) { - if (!program) - return 0; - - StatementVector& children = program->children(); - if (children.size() != 1) - return 0; - - StatementNode* exprStatement = children[0]; - ASSERT(exprStatement); - ASSERT(exprStatement->isExprStatement()); - if (!exprStatement || !exprStatement->isExprStatement()) - return 0; - - ExpressionNode* funcExpr = static_cast(exprStatement)->expr(); - ASSERT(funcExpr); - ASSERT(funcExpr->isFuncExprNode()); - if (!funcExpr || !funcExpr->isFuncExprNode()) - return 0; - - FunctionBodyNode* body = static_cast(funcExpr)->body(); - ASSERT(body); - return body; + if (!globalObject->evalEnabled()) + return exec->vm().throwException(exec, createEvalError(exec, globalObject->evalDisabledErrorMessage())); + return constructFunctionSkippingEvalEnabledCheck(exec, globalObject, args, functionName, sourceURL, position); } -// ECMA 15.3.2 The Function Constructor -JSObject* constructFunction(ExecState* exec, const ArgList& args, const Identifier& functionName, const UString& sourceURL, int lineNumber) +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 - UString program; + // 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 = "(function() { \n})"; + program = makeString("{function ", functionName.string(), "() {\n\n}}"); else if (args.size() == 1) - program = "(function() { " + args.at(0).toString(exec) + "\n})"; + program = makeString("{function ", functionName.string(), "() {\n", args.at(0).toString(exec)->value(exec), "\n}}"); else { - program = "(function(" + args.at(0).toString(exec); - for (size_t i = 1; i < args.size() - 1; i++) - program += "," + args.at(i).toString(exec); - program += ") { " + args.at(args.size() - 1).toString(exec) + "\n})"; + StringBuilder builder; + 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.appendLiteral(", "); + builder.append(args.at(i).toString(exec)->view(exec)); + } + builder.appendLiteral(") {\n"); + builder.append(args.at(args.size() - 1).toString(exec)->view(exec)); + builder.appendLiteral("\n}}"); + program = builder.toString(); } - int errLine; - UString errMsg; - SourceCode source = makeSource(program, sourceURL, lineNumber); - RefPtr programNode = exec->globalData().parser->parse(exec, exec->dynamicGlobalObject()->debugger(), source, &errLine, &errMsg); - - FunctionBodyNode* body = extractFunctionBody(programNode.get()); - if (!body) - return throwError(exec, SyntaxError, errMsg, errLine, source.provider()->asID(), source.provider()->url()); + SourceCode source = makeSource(program, sourceURL, position); + JSObject* exception = nullptr; + FunctionExecutable* function = FunctionExecutable::fromGlobalCode(functionName, *exec, source, exception, overrideLineNumber); + if (!function) { + ASSERT(exception); + return exec->vm().throwException(exec, exception); + } - JSGlobalObject* globalObject = exec->lexicalGlobalObject(); - ScopeChain scopeChain(globalObject, globalObject->globalData(), exec->globalThisValue()); - return new (exec) JSFunction(exec, functionName, body, scopeChain.node()); + return JSFunction::create(exec->vm(), function, globalObject); } // ECMA 15.3.2 The Function Constructor -JSObject* constructFunction(ExecState* exec, const ArgList& args) +JSObject* constructFunction(ExecState* exec, JSGlobalObject* globalObject, const ArgList& args) { - return constructFunction(exec, args, Identifier(exec, "anonymous"), UString(), 1); + return constructFunction(exec, globalObject, args, exec->propertyNames().anonymous, String(), TextPosition::minimumPosition()); } } // namespace JSC