JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / runtime / FunctionConstructor.cpp

diff --git a/runtime/FunctionConstructor.cpp b/runtime/FunctionConstructor.cpp
index 9d55dd109b00ffd40d9aa9ff0999faf6654b7c98..dbe42fa5fe26304e86ee2013b100cabb221c429c 100644 (file)
--- a/runtime/FunctionConstructor.cpp
+++ b/runtime/FunctionConstructor.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
 /*
  *  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
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public


@@ -22,92 +22,113 @@
 #include "FunctionConstructor.h"
 
 #include "Debugger.h"
 #include "FunctionConstructor.h"
 
 #include "Debugger.h"

+#include "ExceptionHelpers.h"

 #include "FunctionPrototype.h"
 #include "JSFunction.h"
 #include "JSGlobalObject.h"
 #include "JSString.h"
 #include "Lexer.h"
 #include "Nodes.h"
 #include "FunctionPrototype.h"
 #include "JSFunction.h"
 #include "JSGlobalObject.h"
 #include "JSString.h"
 #include "Lexer.h"
 #include "Nodes.h"

+#include "JSCInlines.h"

 #include "Parser.h"
 #include "Parser.h"

-#include "StringBuilder.h"
+#include <wtf/text/StringBuilder.h>

 
 namespace JSC {
 
 
 namespace JSC {
 

-ASSERT_CLASS_FITS_IN_CELL(FunctionConstructor);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(FunctionConstructor);

 
 

-FunctionConstructor::FunctionConstructor(ExecState* exec, NonNullPassRefPtr<Structure> structure, FunctionPrototype* functionPrototype)
-    : InternalFunction(&exec->globalData(), structure, Identifier(exec, functionPrototype->classInfo()->className))
+const ClassInfo FunctionConstructor::s_info = { "Function", &Base::s_info, 0, CREATE_METHOD_TABLE(FunctionConstructor) };
+
+FunctionConstructor::FunctionConstructor(VM& vm, Structure* structure)
+    : InternalFunction(vm, structure)
+{
+}
+
+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
 
     // 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;
 }
 
 {
     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
 }
 
 // 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;
 }
 
 // ECMA 15.3.2 The Function Constructor
 {
     callData.native.function = callFunctionConstructor;
     return CallTypeHost;
 }
 
 // ECMA 15.3.2 The Function Constructor

-JSObject* constructFunction(ExecState* exec, const ArgList& args, const Identifier& functionName, const UString& sourceURL, int lineNumber)
+JSObject* constructFunction(ExecState* exec, JSGlobalObject* globalObject, const ArgList& args, const Identifier& functionName, const String& sourceURL, const TextPosition& position)

 {
 {

-    // 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;
+    if (!globalObject->evalEnabled())
+        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, int overrideLineNumber)
+{
+    // 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())
     if (args.isEmpty())

-        program = "(function() { \n})";
+        program = makeString("{function ", functionName.string(), "() {\n\n}}");

     else if (args.size() == 1)
     else if (args.size() == 1)

-        program = makeString("(function() { ", args.at(0).toString(exec), "\n})");
+        program = makeString("{function ", functionName.string(), "() {\n", args.at(0).toString(exec)->value(exec), "\n}}");

     else {
         StringBuilder builder;
     else {
         StringBuilder builder;

-        builder.append("(function(");
-        builder.append(args.at(0).toString(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++) {
         for (size_t i = 1; i < args.size() - 1; i++) {

-            builder.append(",");
-            builder.append(args.at(i).toString(exec));
+            builder.appendLiteral(", ");
+            builder.append(args.at(i).toString(exec)->view(exec));

         }
         }

-        builder.append(") { ");
-        builder.append(args.at(args.size() - 1).toString(exec));
-        builder.append("\n})");
-        program = builder.release();
+        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<FunctionExecutable> function = FunctionExecutable::fromGlobalCode(functionName, exec, exec->dynamicGlobalObject()->debugger(), source, &errLine, &errMsg);
-    if (!function)
-        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(), globalObject, exec->globalThisValue());
-    return new (exec) JSFunction(exec, function, scopeChain.node());
+    return JSFunction::create(exec->vm(), function, globalObject);

 }
 
 // ECMA 15.3.2 The Function Constructor
 }
 
 // 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
 }
 
 } // namespace JSC