* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
* its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
#include "CodeBlock.h"
#include "CallFrame.h"
-#include "ErrorInstance.h"
+#include "ErrorHandlingScope.h"
+#include "Exception.h"
#include "JSGlobalObjectFunctions.h"
-#include "JSObject.h"
#include "JSNotAnObject.h"
#include "Interpreter.h"
#include "Nodes.h"
-#include "UStringConcatenate.h"
+#include "JSCInlines.h"
+#include "RuntimeType.h"
+#include <wtf/text/StringBuilder.h>
+#include <wtf/text/StringView.h>
namespace JSC {
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(InterruptedExecutionError);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(TerminatedExecutionError);
-const ClassInfo InterruptedExecutionError::s_info = { "InterruptedExecutionError", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(InterruptedExecutionError) };
+const ClassInfo TerminatedExecutionError::s_info = { "TerminatedExecutionError", &Base::s_info, 0, CREATE_METHOD_TABLE(TerminatedExecutionError) };
-JSValue InterruptedExecutionError::defaultValue(const JSObject*, ExecState* exec, PreferredPrimitiveType hint)
+JSValue TerminatedExecutionError::defaultValue(const JSObject*, ExecState* exec, PreferredPrimitiveType hint)
{
if (hint == PreferString)
- return jsNontrivialString(exec, "JavaScript execution exceeded timeout.");
- return JSValue(std::numeric_limits<double>::quiet_NaN());
+ return jsNontrivialString(exec, String(ASCIILiteral("JavaScript execution terminated.")));
+ return JSValue(PNaN);
}
-JSObject* createInterruptedExecutionException(JSGlobalData* globalData)
+JSObject* createTerminatedExecutionException(VM* vm)
{
- return InterruptedExecutionError::create(*globalData);
+ return TerminatedExecutionError::create(*vm);
}
-bool isInterruptedExecutionException(JSObject* object)
+bool isTerminatedExecutionException(Exception* exception)
{
- return object->inherits(&InterruptedExecutionError::s_info);
+ return exception->value().inherits(TerminatedExecutionError::info());
}
-bool isInterruptedExecutionException(JSValue value)
+JSObject* createStackOverflowError(ExecState* exec)
{
- return value.inherits(&InterruptedExecutionError::s_info);
+ return createRangeError(exec, ASCIILiteral("Maximum call stack size exceeded."));
}
-
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(TerminatedExecutionError);
-
-const ClassInfo TerminatedExecutionError::s_info = { "TerminatedExecutionError", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(TerminatedExecutionError) };
-
-JSValue TerminatedExecutionError::defaultValue(const JSObject*, ExecState* exec, PreferredPrimitiveType hint)
+JSObject* createUndefinedVariableError(ExecState* exec, const Identifier& ident)
{
- if (hint == PreferString)
- return jsNontrivialString(exec, "JavaScript execution terminated.");
- return JSValue(std::numeric_limits<double>::quiet_NaN());
+ if (exec->propertyNames().isPrivateName(ident)) {
+ String message(makeString("Can't find private variable: @", exec->propertyNames().getPublicName(ident).string()));
+ return createReferenceError(exec, message);
+ }
+ String message(makeString("Can't find variable: ", ident.string()));
+ return createReferenceError(exec, message);
}
-
-JSObject* createTerminatedExecutionException(JSGlobalData* globalData)
+
+JSString* errorDescriptionForValue(ExecState* exec, JSValue v)
{
- return TerminatedExecutionError::create(*globalData);
+ if (v.isString())
+ return jsNontrivialString(exec, makeString('"', asString(v)->value(exec), '"'));
+ if (v.isObject()) {
+ CallData callData;
+ JSObject* object = asObject(v);
+ if (object->methodTable()->getCallData(object, callData) != CallTypeNone)
+ return exec->vm().smallStrings.functionString();
+ return jsString(exec, JSObject::calculatedClassName(object));
+ }
+ return v.toString(exec);
}
-
-bool isTerminatedExecutionException(JSObject* object)
+
+static String defaultApproximateSourceError(const String& originalMessage, const String& sourceText)
{
- return object->inherits(&TerminatedExecutionError::s_info);
+ return makeString(originalMessage, " (near '...", sourceText, "...')");
}
-bool isTerminatedExecutionException(JSValue value)
+static String defaultSourceAppender(const String& originalMessage, const String& sourceText, RuntimeType, ErrorInstance::SourceTextWhereErrorOccurred occurrence)
{
- return value.inherits(&TerminatedExecutionError::s_info);
+ if (occurrence == ErrorInstance::FoundApproximateSource)
+ return defaultApproximateSourceError(originalMessage, sourceText);
+
+ ASSERT(occurrence == ErrorInstance::FoundExactSource);
+ return makeString(originalMessage, " (evaluating '", sourceText, "')");
}
+static String functionCallBase(const String& sourceText)
+{
+ // This function retrieves the 'foo.bar' substring from 'foo.bar(baz)'.
+ // FIXME: This function has simple processing of /* */ style comments.
+ // It doesn't properly handle embedded comments of string literals that contain
+ // parenthesis or comment constructs, e.g. foo.bar("/abc\)*/").
+ // https://bugs.webkit.org/show_bug.cgi?id=146304
-JSObject* createStackOverflowError(ExecState* exec)
+ unsigned sourceLength = sourceText.length();
+ unsigned idx = sourceLength - 1;
+ if (sourceLength < 2 || sourceText[idx] != ')') {
+ // For function calls that have many new lines in between their open parenthesis
+ // and their closing parenthesis, the text range passed into the message appender
+ // will not inlcude the text in between these parentheses, it will just be the desired
+ // text that precedes the parentheses.
+ return sourceText;
+ }
+
+ unsigned parenStack = 1;
+ bool isInMultiLineComment = false;
+ idx -= 1;
+ // Note that we're scanning text right to left instead of the more common left to right,
+ // so syntax detection is backwards.
+ while (parenStack > 0) {
+ UChar curChar = sourceText[idx];
+ if (isInMultiLineComment) {
+ if (idx > 0 && curChar == '*' && sourceText[idx - 1] == '/') {
+ isInMultiLineComment = false;
+ idx -= 1;
+ }
+ } else if (curChar == '(')
+ parenStack -= 1;
+ else if (curChar == ')')
+ parenStack += 1;
+ else if (idx > 0 && curChar == '/' && sourceText[idx - 1] == '*') {
+ isInMultiLineComment = true;
+ idx -= 1;
+ }
+
+ if (!idx)
+ break;
+
+ idx -= 1;
+ }
+
+ return sourceText.left(idx + 1);
+}
+
+static String notAFunctionSourceAppender(const String& originalMessage, const String& sourceText, RuntimeType type, ErrorInstance::SourceTextWhereErrorOccurred occurrence)
{
- return createRangeError(exec, "Maximum call stack size exceeded.");
+ ASSERT(type != TypeFunction);
+
+ if (occurrence == ErrorInstance::FoundApproximateSource)
+ return defaultApproximateSourceError(originalMessage, sourceText);
+
+ ASSERT(occurrence == ErrorInstance::FoundExactSource);
+ auto notAFunctionIndex = originalMessage.reverseFind("is not a function");
+ RELEASE_ASSERT(notAFunctionIndex != notFound);
+ StringView displayValue;
+ if (originalMessage.is8Bit())
+ displayValue = StringView(originalMessage.characters8(), notAFunctionIndex - 1);
+ else
+ displayValue = StringView(originalMessage.characters16(), notAFunctionIndex - 1);
+
+ String base = functionCallBase(sourceText);
+ StringBuilder builder;
+ builder.append(base);
+ builder.appendLiteral(" is not a function. (In '");
+ builder.append(sourceText);
+ builder.appendLiteral("', '");
+ builder.append(base);
+ builder.appendLiteral("' is ");
+ if (type == TypeObject)
+ builder.appendLiteral("an instance of ");
+ builder.append(displayValue);
+ builder.appendLiteral(")");
+
+ return builder.toString();
}
-JSObject* createStackOverflowError(JSGlobalObject* globalObject)
+static String invalidParameterInSourceAppender(const String& originalMessage, const String& sourceText, RuntimeType type, ErrorInstance::SourceTextWhereErrorOccurred occurrence)
{
- return createRangeError(globalObject, "Maximum call stack size exceeded.");
+ ASSERT_UNUSED(type, type != TypeObject);
+
+ if (occurrence == ErrorInstance::FoundApproximateSource)
+ return defaultApproximateSourceError(originalMessage, sourceText);
+
+ ASSERT(occurrence == ErrorInstance::FoundExactSource);
+ auto inIndex = sourceText.reverseFind("in");
+ RELEASE_ASSERT(inIndex != notFound);
+ if (sourceText.find("in") != inIndex)
+ return makeString(originalMessage, " (evaluating '", sourceText, "')");
+
+ static const unsigned inLength = 2;
+ String rightHandSide = sourceText.substring(inIndex + inLength).simplifyWhiteSpace();
+ return makeString(rightHandSide, " is not an Object. (evaluating '", sourceText, "')");
}
-JSObject* createUndefinedVariableError(ExecState* exec, const Identifier& ident)
+static String invalidParameterInstanceofSourceAppender(const String& originalMessage, const String& sourceText, RuntimeType, ErrorInstance::SourceTextWhereErrorOccurred occurrence)
{
- UString message(makeUString("Can't find variable: ", ident.ustring()));
- return createReferenceError(exec, message);
+ if (occurrence == ErrorInstance::FoundApproximateSource)
+ return defaultApproximateSourceError(originalMessage, sourceText);
+
+ ASSERT(occurrence == ErrorInstance::FoundExactSource);
+ auto instanceofIndex = sourceText.reverseFind("instanceof");
+ RELEASE_ASSERT(instanceofIndex != notFound);
+ if (sourceText.find("instanceof") != instanceofIndex)
+ return makeString(originalMessage, " (evaluating '", sourceText, "')");
+
+ static const unsigned instanceofLength = 10;
+ String rightHandSide = sourceText.substring(instanceofIndex + instanceofLength).simplifyWhiteSpace();
+ return makeString(rightHandSide, " is not a function. (evaluating '", sourceText, "')");
}
-
-JSObject* createInvalidParamError(ExecState* exec, const char* op, JSValue value)
+
+JSObject* createError(ExecState* exec, JSValue value, const String& message, ErrorInstance::SourceAppender appender)
{
- UString errorMessage = makeUString("'", value.toString(exec)->value(exec), "' is not a valid argument for '", op, "'");
- JSObject* exception = createTypeError(exec, errorMessage);
+ String errorMessage = makeString(errorDescriptionForValue(exec, value)->value(exec), ' ', message);
+ JSObject* exception = createTypeError(exec, errorMessage, appender, runtimeTypeForValue(value));
ASSERT(exception->isErrorInstance());
- static_cast<ErrorInstance*>(exception)->setAppendSourceToMessage();
return exception;
}
-JSObject* createNotAConstructorError(ExecState* exec, JSValue value)
+JSObject* createInvalidFunctionApplyParameterError(ExecState* exec, JSValue value)
{
- UString errorMessage = makeUString("'", value.toString(exec)->value(exec), "' is not a constructor");
- JSObject* exception = createTypeError(exec, errorMessage);
+ JSObject* exception = createTypeError(exec, makeString("second argument to Function.prototype.apply must be an Array-like object"), defaultSourceAppender, runtimeTypeForValue(value));
ASSERT(exception->isErrorInstance());
- static_cast<ErrorInstance*>(exception)->setAppendSourceToMessage();
return exception;
}
-JSObject* createNotAFunctionError(ExecState* exec, JSValue value)
+JSObject* createInvalidInParameterError(ExecState* exec, JSValue value)
{
- UString errorMessage = makeUString("'", value.toString(exec)->value(exec), "' is not a function");
- JSObject* exception = createTypeError(exec, errorMessage);
- ASSERT(exception->isErrorInstance());
- static_cast<ErrorInstance*>(exception)->setAppendSourceToMessage();
- return exception;
+ return createError(exec, value, makeString("is not an Object."), invalidParameterInSourceAppender);
}
-JSObject* createNotAnObjectError(ExecState* exec, JSValue value)
+JSObject* createInvalidInstanceofParameterError(ExecState* exec, JSValue value)
{
- UString errorMessage = makeUString("'", value.toString(exec)->value(exec), "' is not an object");
- JSObject* exception = createTypeError(exec, errorMessage);
- ASSERT(exception->isErrorInstance());
- static_cast<ErrorInstance*>(exception)->setAppendSourceToMessage();
- return exception;
+ return createError(exec, value, makeString("is not a function."), invalidParameterInstanceofSourceAppender);
}
-JSObject* createErrorForInvalidGlobalAssignment(ExecState* exec, const UString& propertyName)
+JSObject* createNotAConstructorError(ExecState* exec, JSValue value)
{
- return createReferenceError(exec, makeUString("Strict mode forbids implicit creation of global property '", propertyName, "'"));
+ return createError(exec, value, ASCIILiteral("is not a constructor"), defaultSourceAppender);
}
-JSObject* createOutOfMemoryError(JSGlobalObject* globalObject)
+JSObject* createNotAFunctionError(ExecState* exec, JSValue value)
+{
+ return createError(exec, value, ASCIILiteral("is not a function"), notAFunctionSourceAppender);
+}
+
+JSObject* createNotAnObjectError(ExecState* exec, JSValue value)
{
- return createError(globalObject, "Out of memory");
+ return createError(exec, value, ASCIILiteral("is not an object"), defaultSourceAppender);
+}
+
+JSObject* createErrorForInvalidGlobalAssignment(ExecState* exec, const String& propertyName)
+{
+ return createReferenceError(exec, makeString("Strict mode forbids implicit creation of global property '", propertyName, '\''));
}
JSObject* throwOutOfMemoryError(ExecState* exec)
{
- return throwError(exec, createOutOfMemoryError(exec->lexicalGlobalObject()));
+ return exec->vm().throwException(exec, createOutOfMemoryError(exec));
}
JSObject* throwStackOverflowError(ExecState* exec)
{
- return throwError(exec, createStackOverflowError(exec));
+ VM& vm = exec->vm();
+ ErrorHandlingScope errorScope(vm);
+ return vm.throwException(exec, createStackOverflowError(exec));
+}
+
+JSObject* throwTerminatedExecutionException(ExecState* exec)
+{
+ VM& vm = exec->vm();
+ ErrorHandlingScope errorScope(vm);
+ return vm.throwException(exec, createTerminatedExecutionException(&vm));
}
} // namespace JSC
projects / apple / javascriptcore.git / blobdiff