Diff
Modified: trunk/LayoutTests/ChangeLog (198812 => 198813)
--- trunk/LayoutTests/ChangeLog 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/LayoutTests/ChangeLog 2016-03-30 00:24:16 UTC (rev 198813)
@@ -1,3 +1,12 @@
+2016-03-29 Saam barati <sbar...@apple.com>
+
+ Fix typos in our error messages and remove some trailing periods
+ https://bugs.webkit.org/show_bug.cgi?id=155985
+
+ Reviewed by Mark Lam.
+
+ * js/string-includes-expected.txt:
+
2016-03-29 Keith Miller <keith_mil...@apple.com>
[ES6] Add support for Symbol.isConcatSpreadable.
Modified: trunk/LayoutTests/js/string-includes-expected.txt (198812 => 198813)
--- trunk/LayoutTests/js/string-includes-expected.txt 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/LayoutTests/js/string-includes-expected.txt 2016-03-30 00:24:16 UTC (rev 198813)
@@ -118,9 +118,9 @@
PASS (function() { var f = String.prototype.startsWith; (function() { f('a'); })(); })() threw exception TypeError: Type error.
PASS (function() { var f = String.prototype.endsWith; (function() { f('a'); })(); })() threw exception TypeError: Type error.
PASS (function() { var f = String.prototype.includes; (function() { f('a'); })(); })() threw exception TypeError: Type error.
-PASS 'foo bar'.startsWith(/w+/) threw exception TypeError: Argument to String.prototype.startsWith cannot be a RegExp..
-PASS 'foo bar'.endsWith(/w+/) threw exception TypeError: Argument to String.prototype.endsWith cannot be a RegExp..
-PASS 'foo bar'.includes(/w+/) threw exception TypeError: Argument to String.prototype.includes cannot be a RegExp..
+PASS 'foo bar'.startsWith(/w+/) threw exception TypeError: Argument to String.prototype.startsWith cannot be a RegExp.
+PASS 'foo bar'.endsWith(/w+/) threw exception TypeError: Argument to String.prototype.endsWith cannot be a RegExp.
+PASS 'foo bar'.includes(/w+/) threw exception TypeError: Argument to String.prototype.includes cannot be a RegExp.
PASS stringToSearchIn.startsWith(searchString, startOffset) is true
PASS sideEffect == 'ABC' is true
PASS stringToSearchIn.startsWith(searchString, startOffset) threw exception error.
Modified: trunk/Source/_javascript_Core/ChangeLog (198812 => 198813)
--- trunk/Source/_javascript_Core/ChangeLog 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-03-30 00:24:16 UTC (rev 198813)
@@ -1,3 +1,101 @@
+2016-03-29 Saam barati <sbar...@apple.com>
+
+ Fix typos in our error messages and remove some trailing periods
+ https://bugs.webkit.org/show_bug.cgi?id=155985
+
+ Reviewed by Mark Lam.
+
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::BytecodeGenerator):
+ * runtime/ArrayConstructor.h:
+ (JSC::isArray):
+ * runtime/ProxyConstructor.cpp:
+ (JSC::makeRevocableProxy):
+ (JSC::proxyRevocableConstructorThrowError):
+ (JSC::ProxyConstructor::finishCreation):
+ (JSC::constructProxyObject):
+ * runtime/ProxyObject.cpp:
+ (JSC::ProxyObject::finishCreation):
+ (JSC::performProxyGet):
+ (JSC::ProxyObject::performInternalMethodGetOwnProperty):
+ (JSC::ProxyObject::performHasProperty):
+ (JSC::ProxyObject::performPut):
+ (JSC::performProxyCall):
+ (JSC::performProxyConstruct):
+ (JSC::ProxyObject::performDelete):
+ (JSC::ProxyObject::performPreventExtensions):
+ (JSC::ProxyObject::performIsExtensible):
+ (JSC::ProxyObject::performDefineOwnProperty):
+ (JSC::ProxyObject::performGetOwnPropertyNames):
+ (JSC::ProxyObject::performSetPrototype):
+ (JSC::ProxyObject::performGetPrototype):
+ * runtime/StringPrototype.cpp:
+ (JSC::stringProtoFuncStartsWith):
+ (JSC::stringProtoFuncEndsWith):
+ (JSC::stringProtoFuncIncludes):
+ * runtime/Structure.cpp:
+ (JSC::Structure::preventExtensionsTransition):
+ * tests/stress/proxy-basic.js:
+ * tests/stress/proxy-construct.js:
+ (throw.new.Error):
+ (assert):
+ * tests/stress/proxy-define-own-property.js:
+ (assert):
+ (throw.new.Error):
+ (i.catch):
+ (assert.set get catch):
+ * tests/stress/proxy-delete.js:
+ (assert):
+ * tests/stress/proxy-get-own-property.js:
+ (assert):
+ (i.catch):
+ (set get let):
+ * tests/stress/proxy-get-prototype-of.js:
+ (assert):
+ (assert.get let):
+ (assert.get catch):
+ * tests/stress/proxy-has-property.js:
+ (assert):
+ * tests/stress/proxy-is-array.js:
+ (test):
+ * tests/stress/proxy-is-extensible.js:
+ (assert):
+ * tests/stress/proxy-json.js:
+ (assert):
+ (test):
+ * tests/stress/proxy-own-keys.js:
+ (assert):
+ (i.catch):
+ * tests/stress/proxy-prevent-extensions.js:
+ (assert):
+ * tests/stress/proxy-property-descriptor.js:
+ * tests/stress/proxy-revoke.js:
+ (assert):
+ (throw.new.Error.):
+ (throw.new.Error):
+ (shouldThrowNullHandler):
+ * tests/stress/proxy-set-prototype-of.js:
+ (assert.set let):
+ (assert.set catch):
+ (assert):
+ (set catch):
+ * tests/stress/proxy-set.js:
+ (throw.new.Error.let.handler.set 45):
+ (throw.new.Error):
+ * tests/stress/proxy-with-private-symbols.js:
+ (assert):
+ * tests/stress/proxy-with-unbalanced-getter-setter.js:
+ (assert):
+ * tests/stress/reflect-set-proxy-set.js:
+ (throw.new.Error.let.handler.set 45):
+ (throw.new.Error):
+ * tests/stress/reflect-set-receiver-proxy-set.js:
+ (let.handler.set 45):
+ (catch):
+ * tests/stress/string-prototype-methods-endsWith-startsWith-includes-correctness.js:
+ (test):
+ (test.get let):
+
2016-03-29 Keith Miller <keith_mil...@apple.com>
[ES6] Add support for Symbol.isConcatSpreadable.
Modified: trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp (198812 => 198813)
--- trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2016-03-30 00:24:16 UTC (rev 198813)
@@ -412,7 +412,7 @@
}
} else if (isSimpleParameterList) {
// Create the formal parameters the normal way. Any of them could be captured, or not. If
- // captured, lift them into the scope. We can not do this if we have default parameter expressions
+ // captured, lift them into the scope. We cannot do this if we have default parameter expressions
// because when default parameter expressions exist, they belong in their own lexical environment
// separate from the "var" lexical environment.
for (unsigned i = 0; i < parameters.size(); ++i) {
Modified: trunk/Source/_javascript_Core/runtime/ArrayConstructor.h (198812 => 198813)
--- trunk/Source/_javascript_Core/runtime/ArrayConstructor.h 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/runtime/ArrayConstructor.h 2016-03-30 00:24:16 UTC (rev 198813)
@@ -82,7 +82,7 @@
ProxyObject* proxy = jsCast<ProxyObject*>(argument);
if (proxy->isRevoked()) {
- throwTypeError(exec, ASCIILiteral("Array.isArray can not be called on a Proxy that has been revoked."));
+ throwTypeError(exec, ASCIILiteral("Array.isArray cannot be called on a Proxy that has been revoked"));
return false;
}
argument = proxy->target();
Modified: trunk/Source/_javascript_Core/runtime/ProxyConstructor.cpp (198812 => 198813)
--- trunk/Source/_javascript_Core/runtime/ProxyConstructor.cpp 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/runtime/ProxyConstructor.cpp 2016-03-30 00:24:16 UTC (rev 198813)
@@ -57,7 +57,7 @@
static EncodedJSValue JSC_HOST_CALL makeRevocableProxy(ExecState* exec)
{
if (exec->argumentCount() < 2)
- return throwVMTypeError(exec, ASCIILiteral("Proxy.revocable needs to be called with two arguments: the target and the handler."));
+ return throwVMTypeError(exec, ASCIILiteral("Proxy.revocable needs to be called with two arguments: the target and the handler"));
VM& vm = exec->vm();
ArgList args(exec);
@@ -81,7 +81,7 @@
static EncodedJSValue JSC_HOST_CALL proxyRevocableConstructorThrowError(ExecState* exec)
{
- return throwVMTypeError(exec, ASCIILiteral("Proxy.revocable can not be constructed. It can only be called."));
+ return throwVMTypeError(exec, ASCIILiteral("Proxy.revocable cannot be constructed. It can only be called"));
}
void ProxyConstructor::finishCreation(VM& vm, const char* name, JSGlobalObject* globalObject)
@@ -95,7 +95,7 @@
static EncodedJSValue JSC_HOST_CALL constructProxyObject(ExecState* exec)
{
if (exec->newTarget().isUndefined())
- return throwVMTypeError(exec, ASCIILiteral("new.target of Proxy construct should not be undefined."));
+ return throwVMTypeError(exec, ASCIILiteral("new.target of Proxy construct should not be undefined"));
ArgList args(exec);
JSValue target = args.at(0);
Modified: trunk/Source/_javascript_Core/runtime/ProxyObject.cpp (198812 => 198813)
--- trunk/Source/_javascript_Core/runtime/ProxyObject.cpp 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/runtime/ProxyObject.cpp 2016-03-30 00:24:16 UTC (rev 198813)
@@ -65,7 +65,7 @@
}
if (ProxyObject* targetAsProxy = jsDynamicCast<ProxyObject*>(target)) {
if (targetAsProxy->handler().isNull()) {
- throwTypeError(exec, ASCIILiteral("If a Proxy's handler is another Proxy object, the other Proxy should not have been revoked."));
+ throwTypeError(exec, ASCIILiteral("If a Proxy's handler is another Proxy object, the other Proxy should not have been revoked"));
return;
}
}
@@ -90,7 +90,7 @@
m_handler.set(vm, this, handler);
}
-static const char* s_proxyAlreadyRevokedErrorMessage = "Proxy has already been revoked. No more operations are allowed to be performed on it.";
+static const char* s_proxyAlreadyRevokedErrorMessage = "Proxy has already been revoked. No more operations are allowed to be performed on it";
static EncodedJSValue performProxyGet(ExecState* exec, EncodedJSValue thisValue, PropertyName propertyName)
{
@@ -133,7 +133,7 @@
JSObject* handler = jsCast<JSObject*>(handlerValue);
CallData callData;
CallType callType;
- JSValue getHandler = handler->getMethod(exec, callData, callType, vm.propertyNames->get, ASCIILiteral("'get' property of a Proxy's handler object should be callable."));
+ JSValue getHandler = handler->getMethod(exec, callData, callType, vm.propertyNames->get, ASCIILiteral("'get' property of a Proxy's handler object should be callable"));
if (exec->hadException())
return JSValue::encode(jsUndefined());
@@ -152,10 +152,10 @@
if (target->getOwnPropertyDescriptor(exec, propertyName, descriptor)) {
if (descriptor.isDataDescriptor() && !descriptor.configurable() && !descriptor.writable()) {
if (!sameValue(exec, descriptor.value(), trapResult))
- return throwVMTypeError(exec, ASCIILiteral("Proxy handler's 'get' result of a non-configurable and non-writable property should be the same value as the target's property."));
+ return throwVMTypeError(exec, ASCIILiteral("Proxy handler's 'get' result of a non-configurable and non-writable property should be the same value as the target's property"));
} else if (descriptor.isAccessorDescriptor() && !descriptor.configurable() && descriptor.getter().isUndefined()) {
if (!trapResult.isUndefined())
- return throwVMTypeError(exec, ASCIILiteral("Proxy handler's 'get' result of a non-configurable accessor property without a getter should be undefined."));
+ return throwVMTypeError(exec, ASCIILiteral("Proxy handler's 'get' result of a non-configurable accessor property without a getter should be undefined"));
}
}
@@ -186,7 +186,7 @@
JSObject* handler = jsCast<JSObject*>(handlerValue);
CallData callData;
CallType callType;
- JSValue getOwnPropertyDescriptorMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "getOwnPropertyDescriptor"), ASCIILiteral("'getOwnPropertyDescriptor' property of a Proxy's handler should be callable."));
+ JSValue getOwnPropertyDescriptorMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "getOwnPropertyDescriptor"), ASCIILiteral("'getOwnPropertyDescriptor' property of a Proxy's handler should be callable"));
if (exec->hadException())
return false;
if (getOwnPropertyDescriptorMethod.isUndefined())
@@ -200,7 +200,7 @@
return false;
if (!trapResult.isUndefined() && !trapResult.isObject()) {
- throwVMTypeError(exec, ASCIILiteral("result of 'getOwnPropertyDescriptor' call should either be an Object or undefined."));
+ throwVMTypeError(exec, ASCIILiteral("result of 'getOwnPropertyDescriptor' call should either be an Object or undefined"));
return false;
}
@@ -213,7 +213,7 @@
if (!isTargetPropertyDescriptorDefined)
return false;
if (!targetPropertyDescriptor.configurable()) {
- throwVMTypeError(exec, ASCIILiteral("When the result of 'getOwnPropertyDescriptor' is undefined the target must be configurable."));
+ throwVMTypeError(exec, ASCIILiteral("When the result of 'getOwnPropertyDescriptor' is undefined the target must be configurable"));
return false;
}
// FIXME: this doesn't work if 'target' is another Proxy. We don't have isExtensible implemented in a way that fits w/ Proxys.
@@ -225,7 +225,7 @@
// FIXME: Come up with a test for this error. I'm not sure how to because
// Object.seal(o) will make all fields [[Configurable]] false.
// https://bugs.webkit.org/show_bug.cgi?id=154376
- throwVMTypeError(exec, ASCIILiteral("When 'getOwnPropertyDescriptor' returns undefined, the 'target' of a Proxy should be extensible."));
+ throwVMTypeError(exec, ASCIILiteral("When 'getOwnPropertyDescriptor' returns undefined, the 'target' of a Proxy should be extensible"));
return false;
}
@@ -243,13 +243,13 @@
bool valid = validateAndApplyPropertyDescriptor(exec, nullptr, propertyName, isExtensible,
trapResultAsDescriptor, isTargetPropertyDescriptorDefined, targetPropertyDescriptor, throwException);
if (!valid) {
- throwVMTypeError(exec, ASCIILiteral("Result from 'getOwnPropertyDescriptor' fails the IsCompatiblePropertyDescriptor test."));
+ throwVMTypeError(exec, ASCIILiteral("Result from 'getOwnPropertyDescriptor' fails the IsCompatiblePropertyDescriptor test"));
return false;
}
if (!trapResultAsDescriptor.configurable()) {
if (!isTargetPropertyDescriptorDefined || targetPropertyDescriptor.configurable()) {
- throwVMTypeError(exec, ASCIILiteral("Result from 'getOwnPropertyDescriptor' can't be non-configurable when the 'target' doesn't have it as an own property or if it is a configurable own property on 'target'."));
+ throwVMTypeError(exec, ASCIILiteral("Result from 'getOwnPropertyDescriptor' can't be non-configurable when the 'target' doesn't have it as an own property or if it is a configurable own property on 'target'"));
return false;
}
}
@@ -289,7 +289,7 @@
JSObject* handler = jsCast<JSObject*>(handlerValue);
CallData callData;
CallType callType;
- JSValue hasMethod = handler->getMethod(exec, callData, callType, vm.propertyNames->has, ASCIILiteral("'has' property of a Proxy's handler should be callable."));
+ JSValue hasMethod = handler->getMethod(exec, callData, callType, vm.propertyNames->has, ASCIILiteral("'has' property of a Proxy's handler should be callable"));
if (exec->hadException())
return false;
if (hasMethod.isUndefined())
@@ -313,14 +313,14 @@
return false;
if (isPropertyDescriptorDefined) {
if (!descriptor.configurable()) {
- throwVMTypeError(exec, ASCIILiteral("Proxy 'has' must return 'true' for non-configurable properties."));
+ throwVMTypeError(exec, ASCIILiteral("Proxy 'has' must return 'true' for non-configurable properties"));
return false;
}
bool isExtensible = target->isExtensible(exec);
if (exec->hadException())
return false;
if (!isExtensible) {
- throwVMTypeError(exec, ASCIILiteral("Proxy 'has' must return 'true' for a non-extensible 'target' object with a configurable property."));
+ throwVMTypeError(exec, ASCIILiteral("Proxy 'has' must return 'true' for a non-extensible 'target' object with a configurable property"));
return false;
}
}
@@ -384,7 +384,7 @@
JSObject* handler = jsCast<JSObject*>(handlerValue);
CallData callData;
CallType callType;
- JSValue setMethod = handler->getMethod(exec, callData, callType, vm.propertyNames->set, ASCIILiteral("'set' property of a Proxy's handler should be callable."));
+ JSValue setMethod = handler->getMethod(exec, callData, callType, vm.propertyNames->set, ASCIILiteral("'set' property of a Proxy's handler should be callable"));
if (exec->hadException())
return false;
JSObject* target = this->target();
@@ -409,11 +409,11 @@
if (target->getOwnPropertyDescriptor(exec, propertyName, descriptor)) {
if (descriptor.isDataDescriptor() && !descriptor.configurable() && !descriptor.writable()) {
if (!sameValue(exec, descriptor.value(), putValue)) {
- throwVMTypeError(exec, ASCIILiteral("Proxy handler's 'set' on a non-configurable and non-writable property on 'target' should either return false or be the same value already on the 'target'."));
+ throwVMTypeError(exec, ASCIILiteral("Proxy handler's 'set' on a non-configurable and non-writable property on 'target' should either return false or be the same value already on the 'target'"));
return false;
}
} else if (descriptor.isAccessorDescriptor() && !descriptor.configurable() && descriptor.setter().isUndefined()) {
- throwVMTypeError(exec, ASCIILiteral("Proxy handler's 'set' method on a non-configurable accessor property without a setter should return false."));
+ throwVMTypeError(exec, ASCIILiteral("Proxy handler's 'set' method on a non-configurable accessor property without a setter should return false"));
return false;
}
}
@@ -467,7 +467,7 @@
JSObject* handler = jsCast<JSObject*>(handlerValue);
CallData callData;
CallType callType;
- JSValue applyMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "apply"), ASCIILiteral("'apply' property of a Proxy's handler should be callable."));
+ JSValue applyMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "apply"), ASCIILiteral("'apply' property of a Proxy's handler should be callable"));
if (exec->hadException())
return JSValue::encode(jsUndefined());
JSObject* target = proxy->target();
@@ -512,7 +512,7 @@
JSObject* handler = jsCast<JSObject*>(handlerValue);
CallData callData;
CallType callType;
- JSValue constructMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "construct"), ASCIILiteral("'construct' property of a Proxy's handler should be constructible."));
+ JSValue constructMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "construct"), ASCIILiteral("'construct' property of a Proxy's handler should be constructible"));
if (exec->hadException())
return JSValue::encode(jsUndefined());
JSObject* target = proxy->target();
@@ -534,7 +534,7 @@
if (exec->hadException())
return JSValue::encode(jsUndefined());
if (!result.isObject())
- return throwVMTypeError(exec, ASCIILiteral("Result from Proxy handler's 'construct' method should be an object."));
+ return throwVMTypeError(exec, ASCIILiteral("Result from Proxy handler's 'construct' method should be an object"));
return JSValue::encode(result);
}
@@ -568,7 +568,7 @@
JSObject* handler = jsCast<JSObject*>(handlerValue);
CallData callData;
CallType callType;
- JSValue deletePropertyMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "deleteProperty"), ASCIILiteral("'deleteProperty' property of a Proxy's handler should be callable."));
+ JSValue deletePropertyMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "deleteProperty"), ASCIILiteral("'deleteProperty' property of a Proxy's handler should be callable"));
if (exec->hadException())
return false;
JSObject* target = this->target();
@@ -592,7 +592,7 @@
PropertyDescriptor descriptor;
if (target->getOwnPropertyDescriptor(exec, propertyName, descriptor)) {
if (!descriptor.configurable()) {
- throwVMTypeError(exec, ASCIILiteral("Proxy handler's 'deleteProperty' method should return false when the target's property is not configurable."));
+ throwVMTypeError(exec, ASCIILiteral("Proxy handler's 'deleteProperty' method should return false when the target's property is not configurable"));
return false;
}
}
@@ -637,7 +637,7 @@
JSObject* handler = jsCast<JSObject*>(handlerValue);
CallData callData;
CallType callType;
- JSValue preventExtensionsMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "preventExtensions"), ASCIILiteral("'preventExtensions' property of a Proxy's handler should be callable."));
+ JSValue preventExtensionsMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "preventExtensions"), ASCIILiteral("'preventExtensions' property of a Proxy's handler should be callable"));
if (exec->hadException())
return false;
JSObject* target = this->target();
@@ -659,7 +659,7 @@
if (exec->hadException())
return false;
if (targetIsExtensible) {
- throwVMTypeError(exec, ASCIILiteral("Proxy's 'preventExtensions' trap returned true even though its target is extensible. It should have returned false."));
+ throwVMTypeError(exec, ASCIILiteral("Proxy's 'preventExtensions' trap returned true even though its target is extensible. It should have returned false"));
return false;
}
}
@@ -685,7 +685,7 @@
JSObject* handler = jsCast<JSObject*>(handlerValue);
CallData callData;
CallType callType;
- JSValue isExtensibleMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "isExtensible"), ASCIILiteral("'isExtensible' property of a Proxy's handler should be callable."));
+ JSValue isExtensibleMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "isExtensible"), ASCIILiteral("'isExtensible' property of a Proxy's handler should be callable"));
if (exec->hadException())
return false;
@@ -710,11 +710,11 @@
if (trapResultAsBool != isTargetExtensible) {
if (isTargetExtensible) {
ASSERT(!trapResultAsBool);
- throwVMTypeError(exec, ASCIILiteral("Proxy object's 'isExtensible' trap returned false when the target is extensible. It should have returned true."));
+ throwVMTypeError(exec, ASCIILiteral("Proxy object's 'isExtensible' trap returned false when the target is extensible. It should have returned true"));
} else {
ASSERT(!isTargetExtensible);
ASSERT(trapResultAsBool);
- throwVMTypeError(exec, ASCIILiteral("Proxy object's 'isExtensible' trap returned true when the target is non-extensible. It should have returned false."));
+ throwVMTypeError(exec, ASCIILiteral("Proxy object's 'isExtensible' trap returned true when the target is non-extensible. It should have returned false"));
}
}
@@ -747,7 +747,7 @@
JSObject* handler = jsCast<JSObject*>(handlerValue);
CallData callData;
CallType callType;
- JSValue definePropertyMethod = handler->getMethod(exec, callData, callType, vm.propertyNames->defineProperty, ASCIILiteral("'defineProperty' property of a Proxy's handler should be callable."));
+ JSValue definePropertyMethod = handler->getMethod(exec, callData, callType, vm.propertyNames->defineProperty, ASCIILiteral("'defineProperty' property of a Proxy's handler should be callable"));
if (vm.exception())
return false;
@@ -785,11 +785,11 @@
if (!isTargetDescriptorDefined) {
if (!targetIsExtensible) {
- throwVMTypeError(exec, ASCIILiteral("Proxy's 'defineProperty' trap returned true even though getOwnPropertyDescriptor of the Proxy's target returned undefined and the target is non-extensible."));
+ throwVMTypeError(exec, ASCIILiteral("Proxy's 'defineProperty' trap returned true even though getOwnPropertyDescriptor of the Proxy's target returned undefined and the target is non-extensible"));
return false;
}
if (settingConfigurableToFalse) {
- throwVMTypeError(exec, ASCIILiteral("Proxy's 'defineProperty' trap returned true for a non-configurable field even though getOwnPropertyDescriptor of the Proxy's target returned undefined."));
+ throwVMTypeError(exec, ASCIILiteral("Proxy's 'defineProperty' trap returned true for a non-configurable field even though getOwnPropertyDescriptor of the Proxy's target returned undefined"));
return false;
}
@@ -802,11 +802,11 @@
bool throwException = false;
bool isCompatibleDescriptor = validateAndApplyPropertyDescriptor(exec, nullptr, propertyName, targetIsExtensible, descriptor, isCurrentDefined, current, throwException);
if (!isCompatibleDescriptor) {
- throwVMTypeError(exec, ASCIILiteral("Proxy's 'defineProperty' trap did not define a property on its target that is compatible with the trap's input descriptor."));
+ throwVMTypeError(exec, ASCIILiteral("Proxy's 'defineProperty' trap did not define a property on its target that is compatible with the trap's input descriptor"));
return false;
}
if (settingConfigurableToFalse && targetDescriptor.configurable()) {
- throwVMTypeError(exec, ASCIILiteral("Proxy's 'defineProperty' trap did not define a non-configurable property on its target even though the input descriptor to the trap said it must do so."));
+ throwVMTypeError(exec, ASCIILiteral("Proxy's 'defineProperty' trap did not define a non-configurable property on its target even though the input descriptor to the trap said it must do so"));
return false;
}
@@ -831,7 +831,7 @@
JSObject* handler = jsCast<JSObject*>(handlerValue);
CallData callData;
CallType callType;
- JSValue ownKeysMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "ownKeys"), ASCIILiteral("'ownKeys' property of a Proxy's handler should be callable."));
+ JSValue ownKeysMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "ownKeys"), ASCIILiteral("'ownKeys' property of a Proxy's handler should be callable"));
if (exec->hadException())
return;
JSObject* target = this->target();
@@ -883,7 +883,7 @@
return dontExitEarly;
};
- createListFromArrayLike(exec, arrayLikeObject, dontThrowAnExceptionTypeFilter, ASCIILiteral("Proxy handler's 'ownKeys' method must return a array-like object containing only Strings and Symbols."), addPropName);
+ createListFromArrayLike(exec, arrayLikeObject, dontThrowAnExceptionTypeFilter, ASCIILiteral("Proxy handler's 'ownKeys' method must return an array-like object containing only Strings and Symbols"), addPropName);
if (exec->hadException())
return;
@@ -926,7 +926,7 @@
for (UniquedStringImpl* impl : targetNonConfigurableKeys) {
bool contains = removeIfContainedInUncheckedResultKeys(impl);
if (!contains) {
- throwVMTypeError(exec, makeString("Proxy object's 'target' has the non-configurable property '", String(impl), "' that was not in the result from the 'ownKeys' trap."));
+ throwVMTypeError(exec, makeString("Proxy object's 'target' has the non-configurable property '", String(impl), "' that was not in the result from the 'ownKeys' trap"));
return;
}
}
@@ -937,7 +937,7 @@
for (UniquedStringImpl* impl : targetConfigurableKeys) {
bool contains = removeIfContainedInUncheckedResultKeys(impl);
if (!contains) {
- throwVMTypeError(exec, makeString("Proxy object's non-extensible 'target' has configurable property '", String(impl), "' that was not in the result from the 'ownKeys' trap."));
+ throwVMTypeError(exec, makeString("Proxy object's non-extensible 'target' has configurable property '", String(impl), "' that was not in the result from the 'ownKeys' trap"));
return;
}
}
@@ -950,7 +950,7 @@
#endif
if (totalSize) {
- throwVMTypeError(exec, ASCIILiteral("Proxy handler's 'ownKeys' method returned a key that was not present in its target or it returned duplicate keys."));
+ throwVMTypeError(exec, ASCIILiteral("Proxy handler's 'ownKeys' method returned a key that was not present in its target or it returned duplicate keys"));
return;
}
}
@@ -992,7 +992,7 @@
JSObject* handler = jsCast<JSObject*>(handlerValue);
CallData callData;
CallType callType;
- JSValue setPrototypeOfMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "setPrototypeOf"), ASCIILiteral("'setPrototypeOf' property of a Proxy's handler should be callable."));
+ JSValue setPrototypeOfMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "setPrototypeOf"), ASCIILiteral("'setPrototypeOf' property of a Proxy's handler should be callable"));
if (vm.exception())
return false;
@@ -1013,7 +1013,7 @@
if (!trapResultAsBool) {
if (shouldThrowIfCantSet)
- throwVMTypeError(exec, ASCIILiteral("Proxy 'setPrototypeOf' returned false indicating it could not set the prototype value. The operation was expected to succeed."));
+ throwVMTypeError(exec, ASCIILiteral("Proxy 'setPrototypeOf' returned false indicating it could not set the prototype value. The operation was expected to succeed"));
return false;
}
@@ -1027,7 +1027,7 @@
if (vm.exception())
return false;
if (!sameValue(exec, prototype, targetPrototype)) {
- throwVMTypeError(exec, ASCIILiteral("Proxy 'setPrototypeOf' trap returned true when its target is non-extensible and the new prototype value is not the same as the current prototype value. It should have returned false."));
+ throwVMTypeError(exec, ASCIILiteral("Proxy 'setPrototypeOf' trap returned true when its target is non-extensible and the new prototype value is not the same as the current prototype value. It should have returned false"));
return false;
}
@@ -1052,7 +1052,7 @@
JSObject* handler = jsCast<JSObject*>(handlerValue);
CallData callData;
CallType callType;
- JSValue getPrototypeOfMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "getPrototypeOf"), ASCIILiteral("'getPrototypeOf' property of a Proxy's handler should be callable."));
+ JSValue getPrototypeOfMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "getPrototypeOf"), ASCIILiteral("'getPrototypeOf' property of a Proxy's handler should be callable"));
if (vm.exception())
return JSValue();
@@ -1067,7 +1067,7 @@
return JSValue();
if (!trapResult.isObject() && !trapResult.isNull()) {
- throwVMTypeError(exec, ASCIILiteral("Proxy handler's 'getPrototypeOf' trap should either return an object or null."));
+ throwVMTypeError(exec, ASCIILiteral("Proxy handler's 'getPrototypeOf' trap should either return an object or null"));
return JSValue();
}
@@ -1081,7 +1081,7 @@
if (vm.exception())
return JSValue();
if (!sameValue(exec, targetPrototype, trapResult)) {
- throwVMTypeError(exec, ASCIILiteral("Proxy's 'getPrototypeOf' trap for a non-extensible target should return the same value as the target's prototype."));
+ throwVMTypeError(exec, ASCIILiteral("Proxy's 'getPrototypeOf' trap for a non-extensible target should return the same value as the target's prototype"));
return JSValue();
}
Modified: trunk/Source/_javascript_Core/runtime/StringPrototype.cpp (198812 => 198813)
--- trunk/Source/_javascript_Core/runtime/StringPrototype.cpp 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/runtime/StringPrototype.cpp 2016-03-30 00:24:16 UTC (rev 198813)
@@ -1955,7 +1955,7 @@
if (vm.exception())
return JSValue::encode(JSValue());
if (isRegularExpression)
- return throwVMTypeError(exec, "Argument to String.prototype.startsWith cannot be a RegExp.");
+ return throwVMTypeError(exec, "Argument to String.prototype.startsWith cannot be a RegExp");
String searchString = a0.toString(exec)->value(exec);
if (exec->hadException())
@@ -1991,7 +1991,7 @@
if (vm.exception())
return JSValue::encode(JSValue());
if (isRegularExpression)
- return throwVMTypeError(exec, "Argument to String.prototype.endsWith cannot be a RegExp.");
+ return throwVMTypeError(exec, "Argument to String.prototype.endsWith cannot be a RegExp");
String searchString = a0.toString(exec)->value(exec);
if (exec->hadException())
@@ -2028,7 +2028,7 @@
if (vm.exception())
return JSValue::encode(JSValue());
if (isRegularExpression)
- return throwVMTypeError(exec, "Argument to String.prototype.includes cannot be a RegExp.");
+ return throwVMTypeError(exec, "Argument to String.prototype.includes cannot be a RegExp");
String searchString = a0.toString(exec)->value(exec);
if (exec->hadException())
Modified: trunk/Source/_javascript_Core/runtime/Structure.cpp (198812 => 198813)
--- trunk/Source/_javascript_Core/runtime/Structure.cpp 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/runtime/Structure.cpp 2016-03-30 00:24:16 UTC (rev 198813)
@@ -630,7 +630,7 @@
{
Structure* transition = create(vm, structure);
- // Don't set m_offset, as one can not transition to this.
+ // Don't set m_offset, as one cannot transition to this.
DeferGC deferGC(vm.heap);
structure->materializePropertyMapIfNecessary(vm, deferGC);
Modified: trunk/Source/_javascript_Core/tests/stress/proxy-basic.js (198812 => 198813)
--- trunk/Source/_javascript_Core/tests/stress/proxy-basic.js 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/tests/stress/proxy-basic.js 2016-03-30 00:24:16 UTC (rev 198813)
@@ -133,7 +133,7 @@
proxy["foo"];
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: 'get' property of a Proxy's handler object should be callable.");
+ assert(e.toString() === "TypeError: 'get' property of a Proxy's handler object should be callable");
}
assert(threw);
}
Modified: trunk/Source/_javascript_Core/tests/stress/proxy-construct.js (198812 => 198813)
--- trunk/Source/_javascript_Core/tests/stress/proxy-construct.js 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/tests/stress/proxy-construct.js 2016-03-30 00:24:16 UTC (rev 198813)
@@ -15,7 +15,7 @@
new proxy;
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: 'construct' property of a Proxy's handler should be constructible.");
+ assert(e.toString() === "TypeError: 'construct' property of a Proxy's handler should be constructible");
}
assert(threw);
}
@@ -33,7 +33,7 @@
new proxy;
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: 'construct' property of a Proxy's handler should be constructible.");
+ assert(e.toString() === "TypeError: 'construct' property of a Proxy's handler should be constructible");
}
assert(threw);
}
@@ -121,7 +121,7 @@
new proxy;
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Result from Proxy handler's 'construct' method should be an object.");
+ assert(e.toString() === "TypeError: Result from Proxy handler's 'construct' method should be an object");
}
assert(threw);
}
@@ -141,7 +141,7 @@
new proxy;
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Result from Proxy handler's 'construct' method should be an object.");
+ assert(e.toString() === "TypeError: Result from Proxy handler's 'construct' method should be an object");
}
assert(threw);
}
@@ -161,7 +161,7 @@
new proxy;
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Result from Proxy handler's 'construct' method should be an object.");
+ assert(e.toString() === "TypeError: Result from Proxy handler's 'construct' method should be an object");
}
assert(threw);
}
Modified: trunk/Source/_javascript_Core/tests/stress/proxy-define-own-property.js (198812 => 198813)
--- trunk/Source/_javascript_Core/tests/stress/proxy-define-own-property.js 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/tests/stress/proxy-define-own-property.js 2016-03-30 00:24:16 UTC (rev 198813)
@@ -1,6 +1,6 @@
function assert(b) {
if (!b)
- throw new Error("Bad assertion.");
+ throw new Error("Bad assertion");
}
{
@@ -20,7 +20,7 @@
});
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: 'defineProperty' property of a Proxy's handler should be callable.");
+ assert(e.toString() === "TypeError: 'defineProperty' property of a Proxy's handler should be callable");
}
assert(threw);
@@ -213,7 +213,7 @@
});
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy's 'defineProperty' trap returned true for a non-configurable field even though getOwnPropertyDescriptor of the Proxy's target returned undefined.");
+ assert(e.toString() === "TypeError: Proxy's 'defineProperty' trap returned true for a non-configurable field even though getOwnPropertyDescriptor of the Proxy's target returned undefined");
}
assert(called);
assert(threw);
@@ -243,7 +243,7 @@
});
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy's 'defineProperty' trap returned true even though getOwnPropertyDescriptor of the Proxy's target returned undefined and the target is non-extensible.");
+ assert(e.toString() === "TypeError: Proxy's 'defineProperty' trap returned true even though getOwnPropertyDescriptor of the Proxy's target returned undefined and the target is non-extensible");
}
assert(called);
assert(threw);
@@ -277,7 +277,7 @@
});
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy's 'defineProperty' trap did not define a non-configurable property on its target even though the input descriptor to the trap said it must do so.");
+ assert(e.toString() === "TypeError: Proxy's 'defineProperty' trap did not define a non-configurable property on its target even though the input descriptor to the trap said it must do so");
}
assert(called);
assert(threw);
@@ -325,7 +325,7 @@
});
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy's 'defineProperty' trap did not define a property on its target that is compatible with the trap's input descriptor.");
+ assert(e.toString() === "TypeError: Proxy's 'defineProperty' trap did not define a property on its target that is compatible with the trap's input descriptor");
}
assert(called);
assert(threw);
@@ -368,7 +368,7 @@
});
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy's 'defineProperty' trap did not define a property on its target that is compatible with the trap's input descriptor.");
+ assert(e.toString() === "TypeError: Proxy's 'defineProperty' trap did not define a property on its target that is compatible with the trap's input descriptor");
}
assert(called);
assert(threw);
@@ -412,7 +412,7 @@
});
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy's 'defineProperty' trap did not define a property on its target that is compatible with the trap's input descriptor.");
+ assert(e.toString() === "TypeError: Proxy's 'defineProperty' trap did not define a property on its target that is compatible with the trap's input descriptor");
}
assert(called);
assert(threw);
@@ -604,7 +604,7 @@
let result = Reflect.defineProperty(proxy, "x", {
writable: true,
configurable: false,
- value: "whatever value goes here."
+ value: "whatever value goes here"
});
assert(!result);
assert(target.x === 55);
Modified: trunk/Source/_javascript_Core/tests/stress/proxy-delete.js (198812 => 198813)
--- trunk/Source/_javascript_Core/tests/stress/proxy-delete.js 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/tests/stress/proxy-delete.js 2016-03-30 00:24:16 UTC (rev 198813)
@@ -1,6 +1,6 @@
function assert(b) {
if (!b)
- throw new Error("bad assertion.");
+ throw new Error("bad assertion");
}
{
@@ -59,7 +59,7 @@
try {
delete proxy.x;
} catch(e) {
- assert(e.toString() === "TypeError: 'deleteProperty' property of a Proxy's handler should be callable.");
+ assert(e.toString() === "TypeError: 'deleteProperty' property of a Proxy's handler should be callable");
threw = true;
}
assert(threw);
@@ -85,7 +85,7 @@
try {
delete proxy.x;
} catch(e) {
- assert(e.toString() === "TypeError: Proxy handler's 'deleteProperty' method should return false when the target's property is not configurable.");
+ assert(e.toString() === "TypeError: Proxy handler's 'deleteProperty' method should return false when the target's property is not configurable");
threw = true;
}
assert(threw);
Modified: trunk/Source/_javascript_Core/tests/stress/proxy-get-own-property.js (198812 => 198813)
--- trunk/Source/_javascript_Core/tests/stress/proxy-get-own-property.js 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/tests/stress/proxy-get-own-property.js 2016-03-30 00:24:16 UTC (rev 198813)
@@ -1,6 +1,6 @@
function assert(b) {
if (!b)
- throw new Error("bad assertion.");
+ throw new Error("bad assertion");
}
{
@@ -35,7 +35,7 @@
try {
Object.getOwnPropertyDescriptor(proxy, "x");
} catch(e) {
- assert(e.toString() === "TypeError: result of 'getOwnPropertyDescriptor' call should either be an Object or undefined.");
+ assert(e.toString() === "TypeError: result of 'getOwnPropertyDescriptor' call should either be an Object or undefined");
threw = true;
}
assert(threw);
@@ -61,7 +61,7 @@
try {
Object.getOwnPropertyDescriptor(proxy, "x");
} catch(e) {
- assert(e.toString() === "TypeError: When the result of 'getOwnPropertyDescriptor' is undefined the target must be configurable.");
+ assert(e.toString() === "TypeError: When the result of 'getOwnPropertyDescriptor' is undefined the target must be configurable");
threw = true;
}
assert(threw);
@@ -87,7 +87,7 @@
try {
Object.getOwnPropertyDescriptor(proxy, "x");
} catch(e) {
- assert(e.toString() === "TypeError: Result from 'getOwnPropertyDescriptor' can't be non-configurable when the 'target' doesn't have it as an own property or if it is a configurable own property on 'target'.");
+ assert(e.toString() === "TypeError: Result from 'getOwnPropertyDescriptor' can't be non-configurable when the 'target' doesn't have it as an own property or if it is a configurable own property on 'target'");
threw = true;
}
assert(threw);
@@ -113,7 +113,7 @@
try {
Object.getOwnPropertyDescriptor(proxy, "x");
} catch(e) {
- assert(e.toString() === "TypeError: Result from 'getOwnPropertyDescriptor' fails the IsCompatiblePropertyDescriptor test.");
+ assert(e.toString() === "TypeError: Result from 'getOwnPropertyDescriptor' fails the IsCompatiblePropertyDescriptor test");
threw = true;
}
assert(threw);
@@ -131,7 +131,7 @@
try {
Object.getOwnPropertyDescriptor(proxy, "x");
} catch(e) {
- assert(e.toString() === "TypeError: 'getOwnPropertyDescriptor' property of a Proxy's handler should be callable.");
+ assert(e.toString() === "TypeError: 'getOwnPropertyDescriptor' property of a Proxy's handler should be callable");
threw = true;
}
assert(threw);
@@ -367,7 +367,7 @@
Object.getOwnPropertyDescriptor(proxy, "x");
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Result from 'getOwnPropertyDescriptor' fails the IsCompatiblePropertyDescriptor test.");
+ assert(e.toString() === "TypeError: Result from 'getOwnPropertyDescriptor' fails the IsCompatiblePropertyDescriptor test");
}
assert(threw);
}
@@ -415,7 +415,7 @@
Object.getOwnPropertyDescriptor(proxy, "x");
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Result from 'getOwnPropertyDescriptor' fails the IsCompatiblePropertyDescriptor test.");
+ assert(e.toString() === "TypeError: Result from 'getOwnPropertyDescriptor' fails the IsCompatiblePropertyDescriptor test");
}
assert(threw);
}
Modified: trunk/Source/_javascript_Core/tests/stress/proxy-get-prototype-of.js (198812 => 198813)
--- trunk/Source/_javascript_Core/tests/stress/proxy-get-prototype-of.js 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/tests/stress/proxy-get-prototype-of.js 2016-03-30 00:24:16 UTC (rev 198813)
@@ -1,6 +1,6 @@
function assert(b) {
if (!b)
- throw new Error("Bad assertion.");
+ throw new Error("Bad assertion");
}
{
@@ -116,7 +116,7 @@
try {
get();
} catch(e) {
- assert(e.toString() === "TypeError: 'getPrototypeOf' property of a Proxy's handler should be callable.");
+ assert(e.toString() === "TypeError: 'getPrototypeOf' property of a Proxy's handler should be callable");
threw = true;
}
assert(threw);
@@ -144,7 +144,7 @@
try {
get();
} catch(e) {
- assert(e.toString() === "TypeError: Proxy handler's 'getPrototypeOf' trap should either return an object or null.");
+ assert(e.toString() === "TypeError: Proxy handler's 'getPrototypeOf' trap should either return an object or null");
threw = true;
}
assert(threw);
@@ -172,7 +172,7 @@
try {
get();
} catch(e) {
- assert(e.toString() === "TypeError: Proxy handler's 'getPrototypeOf' trap should either return an object or null.");
+ assert(e.toString() === "TypeError: Proxy handler's 'getPrototypeOf' trap should either return an object or null");
threw = true;
}
assert(threw);
@@ -201,7 +201,7 @@
try {
get();
} catch(e) {
- assert(e.toString() === "TypeError: Proxy's 'getPrototypeOf' trap for a non-extensible target should return the same value as the target's prototype.");
+ assert(e.toString() === "TypeError: Proxy's 'getPrototypeOf' trap for a non-extensible target should return the same value as the target's prototype");
threw = true;
}
assert(threw);
@@ -231,7 +231,7 @@
try {
get();
} catch(e) {
- assert(e.toString() === "TypeError: Proxy's 'getPrototypeOf' trap for a non-extensible target should return the same value as the target's prototype.");
+ assert(e.toString() === "TypeError: Proxy's 'getPrototypeOf' trap for a non-extensible target should return the same value as the target's prototype");
threw = true;
}
assert(threw);
Modified: trunk/Source/_javascript_Core/tests/stress/proxy-has-property.js (198812 => 198813)
--- trunk/Source/_javascript_Core/tests/stress/proxy-has-property.js 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/tests/stress/proxy-has-property.js 2016-03-30 00:24:16 UTC (rev 198813)
@@ -1,6 +1,6 @@
function assert(b) {
if (!b)
- throw new Error("Bad assertion.");
+ throw new Error("Bad assertion");
}
{
@@ -145,7 +145,7 @@
try {
"x" in proxy;
} catch(e) {
- assert(e.toString() === "TypeError: Proxy 'has' must return 'true' for non-configurable properties.");
+ assert(e.toString() === "TypeError: Proxy 'has' must return 'true' for non-configurable properties");
threw = true;
}
assert(threw);
@@ -167,7 +167,7 @@
try {
"x" in proxy;
} catch(e) {
- assert(e.toString() === "TypeError: Proxy 'has' must return 'true' for non-configurable properties.");
+ assert(e.toString() === "TypeError: Proxy 'has' must return 'true' for non-configurable properties");
threw = true;
}
assert(threw);
@@ -189,7 +189,7 @@
try {
"x" in proxy;
} catch(e) {
- assert(e.toString() === "TypeError: Proxy 'has' must return 'true' for non-configurable properties.");
+ assert(e.toString() === "TypeError: Proxy 'has' must return 'true' for non-configurable properties");
threw = true;
}
assert(threw);
@@ -211,7 +211,7 @@
try {
"x" in proxy;
} catch(e) {
- assert(e.toString() === "TypeError: Proxy 'has' must return 'true' for non-configurable properties.");
+ assert(e.toString() === "TypeError: Proxy 'has' must return 'true' for non-configurable properties");
threw = true;
}
assert(threw);
@@ -233,7 +233,7 @@
try {
"x" in proxy;
} catch(e) {
- assert(e.toString() === "TypeError: Proxy 'has' must return 'true' for non-configurable properties.");
+ assert(e.toString() === "TypeError: Proxy 'has' must return 'true' for non-configurable properties");
threw = true;
}
assert(threw);
Modified: trunk/Source/_javascript_Core/tests/stress/proxy-is-array.js (198812 => 198813)
--- trunk/Source/_javascript_Core/tests/stress/proxy-is-array.js 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/tests/stress/proxy-is-array.js 2016-03-30 00:24:16 UTC (rev 198813)
@@ -23,7 +23,7 @@
Array.isArray(proxy);
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Array.isArray can not be called on a Proxy that has been revoked.");
+ assert(e.toString() === "TypeError: Array.isArray cannot be called on a Proxy that has been revoked");
}
assert(threw);
});
@@ -55,7 +55,7 @@
Array.isArray(proxyChain);
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Array.isArray can not be called on a Proxy that has been revoked.");
+ assert(e.toString() === "TypeError: Array.isArray cannot be called on a Proxy that has been revoked");
}
assert(threw);
});
Modified: trunk/Source/_javascript_Core/tests/stress/proxy-is-extensible.js (198812 => 198813)
--- trunk/Source/_javascript_Core/tests/stress/proxy-is-extensible.js 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/tests/stress/proxy-is-extensible.js 2016-03-30 00:24:16 UTC (rev 198813)
@@ -90,7 +90,7 @@
try {
Reflect.isExtensible(proxy);
} catch(e) {
- assert(e.toString() === "TypeError: Proxy object's 'isExtensible' trap returned false when the target is extensible. It should have returned true.");
+ assert(e.toString() === "TypeError: Proxy object's 'isExtensible' trap returned false when the target is extensible. It should have returned true");
threw = true;
}
assert(threw);
@@ -112,7 +112,7 @@
try {
Reflect.isExtensible(proxy);
} catch(e) {
- assert(e.toString() === "TypeError: Proxy object's 'isExtensible' trap returned true when the target is non-extensible. It should have returned false.");
+ assert(e.toString() === "TypeError: Proxy object's 'isExtensible' trap returned true when the target is non-extensible. It should have returned false");
threw = true;
}
assert(threw);
@@ -134,7 +134,7 @@
try {
Reflect.isExtensible(proxy);
} catch(e) {
- assert(e.toString() === "TypeError: Proxy object's 'isExtensible' trap returned true when the target is non-extensible. It should have returned false.");
+ assert(e.toString() === "TypeError: Proxy object's 'isExtensible' trap returned true when the target is non-extensible. It should have returned false");
threw = true;
}
assert(threw);
@@ -156,7 +156,7 @@
try {
Reflect.isExtensible(proxy);
} catch(e) {
- assert(e.toString() === "TypeError: Proxy object's 'isExtensible' trap returned true when the target is non-extensible. It should have returned false.");
+ assert(e.toString() === "TypeError: Proxy object's 'isExtensible' trap returned true when the target is non-extensible. It should have returned false");
threw = true;
}
assert(threw);
@@ -178,7 +178,7 @@
try {
Reflect.isExtensible(proxy);
} catch(e) {
- assert(e.toString() === "TypeError: Proxy object's 'isExtensible' trap returned true when the target is non-extensible. It should have returned false.");
+ assert(e.toString() === "TypeError: Proxy object's 'isExtensible' trap returned true when the target is non-extensible. It should have returned false");
threw = true;
}
assert(threw);
Modified: trunk/Source/_javascript_Core/tests/stress/proxy-json.js (198812 => 198813)
--- trunk/Source/_javascript_Core/tests/stress/proxy-json.js 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/tests/stress/proxy-json.js 2016-03-30 00:24:16 UTC (rev 198813)
@@ -1,6 +1,6 @@
function assert(b) {
if (!b)
- throw new Error("Bad assertion.");
+ throw new Error("Bad assertion");
}
function test(f) {
@@ -81,7 +81,7 @@
JSON.stringify(proxy); // Things are not ok.
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy has already been revoked. No more operations are allowed to be performed on it.");
+ assert(e.toString() === "TypeError: Proxy has already been revoked. No more operations are allowed to be performed on it");
}
assert(threw);
});
@@ -108,7 +108,7 @@
JSON.stringify(proxy); // Things are not ok.
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy has already been revoked. No more operations are allowed to be performed on it.");
+ assert(e.toString() === "TypeError: Proxy has already been revoked. No more operations are allowed to be performed on it");
}
assert(threw);
});
Modified: trunk/Source/_javascript_Core/tests/stress/proxy-own-keys.js (198812 => 198813)
--- trunk/Source/_javascript_Core/tests/stress/proxy-own-keys.js 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/tests/stress/proxy-own-keys.js 2016-03-30 00:24:16 UTC (rev 198813)
@@ -1,6 +1,6 @@
function assert(b) {
if (!b)
- throw new Error("Bad assertion.");
+ throw new Error("Bad assertion");
}
{
@@ -68,7 +68,7 @@
Object.keys(proxy);
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy handler's 'ownKeys' method must return a array-like object containing only Strings and Symbols.");
+ assert(e.toString() === "TypeError: Proxy handler's 'ownKeys' method must return an array-like object containing only Strings and Symbols");
}
assert(threw);
assert(called);
@@ -98,7 +98,7 @@
Object.keys(proxy);
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy object's 'target' has the non-configurable property 'x' that was not in the result from the 'ownKeys' trap.");
+ assert(e.toString() === "TypeError: Proxy object's 'target' has the non-configurable property 'x' that was not in the result from the 'ownKeys' trap");
}
assert(threw);
assert(called);
@@ -129,7 +129,7 @@
Object.keys(proxy);
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy object's non-extensible 'target' has configurable property 'x' that was not in the result from the 'ownKeys' trap.");
+ assert(e.toString() === "TypeError: Proxy object's non-extensible 'target' has configurable property 'x' that was not in the result from the 'ownKeys' trap");
}
assert(threw);
assert(called);
@@ -160,7 +160,7 @@
Object.keys(proxy);
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy handler's 'ownKeys' method returned a key that was not present in its target or it returned duplicate keys.");
+ assert(e.toString() === "TypeError: Proxy handler's 'ownKeys' method returned a key that was not present in its target or it returned duplicate keys");
}
assert(threw);
assert(called);
@@ -191,7 +191,7 @@
Object.keys(proxy);
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy handler's 'ownKeys' method returned a key that was not present in its target or it returned duplicate keys.");
+ assert(e.toString() === "TypeError: Proxy handler's 'ownKeys' method returned a key that was not present in its target or it returned duplicate keys");
}
assert(threw);
assert(called);
@@ -212,7 +212,7 @@
Object.keys(proxy);
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: 'ownKeys' property of a Proxy's handler should be callable.");
+ assert(e.toString() === "TypeError: 'ownKeys' property of a Proxy's handler should be callable");
}
assert(threw);
}
Modified: trunk/Source/_javascript_Core/tests/stress/proxy-prevent-extensions.js (198812 => 198813)
--- trunk/Source/_javascript_Core/tests/stress/proxy-prevent-extensions.js 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/tests/stress/proxy-prevent-extensions.js 2016-03-30 00:24:16 UTC (rev 198813)
@@ -1,6 +1,6 @@
function assert(b) {
if (!b)
- throw new Error("Bad assertion.");
+ throw new Error("Bad assertion");
}
{
@@ -88,7 +88,7 @@
try {
Reflect.preventExtensions(proxy);
} catch(e) {
- assert(e.toString() === "TypeError: 'preventExtensions' property of a Proxy's handler should be callable.");
+ assert(e.toString() === "TypeError: 'preventExtensions' property of a Proxy's handler should be callable");
threw = true;
}
assert(threw);
@@ -137,7 +137,7 @@
try {
Reflect.preventExtensions(proxy);
} catch(e) {
- assert(e.toString() === "TypeError: Proxy's 'preventExtensions' trap returned true even though its target is extensible. It should have returned false.");
+ assert(e.toString() === "TypeError: Proxy's 'preventExtensions' trap returned true even though its target is extensible. It should have returned false");
threw = true;
}
assert(threw);
Modified: trunk/Source/_javascript_Core/tests/stress/proxy-property-descriptor.js (198812 => 198813)
--- trunk/Source/_javascript_Core/tests/stress/proxy-property-descriptor.js 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/tests/stress/proxy-property-descriptor.js 2016-03-30 00:24:16 UTC (rev 198813)
@@ -58,7 +58,7 @@
proxy["y"];
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy handler's 'get' result of a non-configurable and non-writable property should be the same value as the target's property.");
+ assert(e.toString() === "TypeError: Proxy handler's 'get' result of a non-configurable and non-writable property should be the same value as the target's property");
}
assert(threw === true);
}
@@ -77,7 +77,7 @@
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy handler's 'get' result of a non-configurable accessor property without a getter should be undefined.");
+ assert(e.toString() === "TypeError: Proxy handler's 'get' result of a non-configurable accessor property without a getter should be undefined");
}
assert(threw === true);
}
Modified: trunk/Source/_javascript_Core/tests/stress/proxy-revoke.js (198812 => 198813)
--- trunk/Source/_javascript_Core/tests/stress/proxy-revoke.js 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/tests/stress/proxy-revoke.js 2016-03-30 00:24:16 UTC (rev 198813)
@@ -1,6 +1,6 @@
function assert(b) {
if (!b)
- throw new Error("bad assertion.");
+ throw new Error("bad assertion");
}
{
@@ -13,7 +13,7 @@
new Proxy.revocable;
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy.revocable can not be constructed. It can only be called.");
+ assert(e.toString() === "TypeError: Proxy.revocable cannot be constructed. It can only be called");
}
assert(threw);
}
@@ -24,7 +24,7 @@
Proxy.revocable();
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy.revocable needs to be called with two arguments: the target and the handler.");
+ assert(e.toString() === "TypeError: Proxy.revocable needs to be called with two arguments: the target and the handler");
}
assert(threw);
}
@@ -35,7 +35,7 @@
Proxy.revocable({});
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy.revocable needs to be called with two arguments: the target and the handler.");
+ assert(e.toString() === "TypeError: Proxy.revocable needs to be called with two arguments: the target and the handler");
}
assert(threw);
}
@@ -93,7 +93,7 @@
new Proxy(proxy, {});
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: If a Proxy's handler is another Proxy object, the other Proxy should not have been revoked.");
+ assert(e.toString() === "TypeError: If a Proxy's handler is another Proxy object, the other Proxy should not have been revoked");
}
assert(threw);
}
@@ -123,7 +123,7 @@
f();
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy has already been revoked. No more operations are allowed to be performed on it.");
+ assert(e.toString() === "TypeError: Proxy has already been revoked. No more operations are allowed to be performed on it");
}
assert(threw);
}
Modified: trunk/Source/_javascript_Core/tests/stress/proxy-set-prototype-of.js (198812 => 198813)
--- trunk/Source/_javascript_Core/tests/stress/proxy-set-prototype-of.js 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/tests/stress/proxy-set-prototype-of.js 2016-03-30 00:24:16 UTC (rev 198813)
@@ -82,7 +82,7 @@
try {
set();
} catch(e) {
- assert(e.toString() === "TypeError: 'setPrototypeOf' property of a Proxy's handler should be callable.");
+ assert(e.toString() === "TypeError: 'setPrototypeOf' property of a Proxy's handler should be callable");
threw = true;
}
assert(threw);
@@ -177,7 +177,7 @@
threw = true;
assert(called);
called = false;
- assert(e.toString() === "TypeError: Proxy 'setPrototypeOf' trap returned true when its target is non-extensible and the new prototype value is not the same as the current prototype value. It should have returned false.");
+ assert(e.toString() === "TypeError: Proxy 'setPrototypeOf' trap returned true when its target is non-extensible and the new prototype value is not the same as the current prototype value. It should have returned false");
}
assert(threw);
@@ -278,7 +278,7 @@
Object.setPrototypeOf(proxy, obj);
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy 'setPrototypeOf' returned false indicating it could not set the prototype value. The operation was expected to succeed.");
+ assert(e.toString() === "TypeError: Proxy 'setPrototypeOf' returned false indicating it could not set the prototype value. The operation was expected to succeed");
}
assert(threw);
@@ -307,7 +307,7 @@
proxy.__proto__ = obj;
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy 'setPrototypeOf' returned false indicating it could not set the prototype value. The operation was expected to succeed.");
+ assert(e.toString() === "TypeError: Proxy 'setPrototypeOf' returned false indicating it could not set the prototype value. The operation was expected to succeed");
}
assert(threw);
Modified: trunk/Source/_javascript_Core/tests/stress/proxy-set.js (198812 => 198813)
--- trunk/Source/_javascript_Core/tests/stress/proxy-set.js 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/tests/stress/proxy-set.js 2016-03-30 00:24:16 UTC (rev 198813)
@@ -19,7 +19,7 @@
try {
proxy.x = 40;
} catch(e) {
- assert(e.toString() === "TypeError: 'set' property of a Proxy's handler should be callable.");
+ assert(e.toString() === "TypeError: 'set' property of a Proxy's handler should be callable");
threw = true;
}
assert(threw);
@@ -131,7 +131,7 @@
proxy.x = 40;
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy handler's 'set' on a non-configurable and non-writable property on 'target' should either return false or be the same value already on the 'target'.");
+ assert(e.toString() === "TypeError: Proxy handler's 'set' on a non-configurable and non-writable property on 'target' should either return false or be the same value already on the 'target'");
}
assert(threw);
}
@@ -191,7 +191,7 @@
proxy.x = 40;
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy handler's 'set' method on a non-configurable accessor property without a setter should return false.");
+ assert(e.toString() === "TypeError: Proxy handler's 'set' method on a non-configurable accessor property without a setter should return false");
}
assert(threw);
}
Modified: trunk/Source/_javascript_Core/tests/stress/proxy-with-private-symbols.js (198812 => 198813)
--- trunk/Source/_javascript_Core/tests/stress/proxy-with-private-symbols.js 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/tests/stress/proxy-with-private-symbols.js 2016-03-30 00:24:16 UTC (rev 198813)
@@ -1,6 +1,6 @@
function assert(b) {
if (!b)
- throw new Error("bad assertion.");
+ throw new Error("bad assertion");
}
// Currently, only "get", "getOwnPropertyDescriptor", and "set" are testable.
Modified: trunk/Source/_javascript_Core/tests/stress/proxy-with-unbalanced-getter-setter.js (198812 => 198813)
--- trunk/Source/_javascript_Core/tests/stress/proxy-with-unbalanced-getter-setter.js 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/tests/stress/proxy-with-unbalanced-getter-setter.js 2016-03-30 00:24:16 UTC (rev 198813)
@@ -1,6 +1,6 @@
function assert(b) {
if (!b)
- throw new Error("Bad assertion.");
+ throw new Error("Bad assertion");
}
// Setting the getter only.
Modified: trunk/Source/_javascript_Core/tests/stress/reflect-set-proxy-set.js (198812 => 198813)
--- trunk/Source/_javascript_Core/tests/stress/reflect-set-proxy-set.js 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/tests/stress/reflect-set-proxy-set.js 2016-03-30 00:24:16 UTC (rev 198813)
@@ -30,7 +30,7 @@
Reflect.set(proxy, 'x', 40);
unreachable();
} catch(e) {
- assert(e.toString() === "TypeError: 'set' property of a Proxy's handler should be callable.");
+ assert(e.toString() === "TypeError: 'set' property of a Proxy's handler should be callable");
threw = true;
}
assert(threw);
@@ -145,7 +145,7 @@
unreachable();
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy handler's 'set' on a non-configurable and non-writable property on 'target' should either return false or be the same value already on the 'target'.");
+ assert(e.toString() === "TypeError: Proxy handler's 'set' on a non-configurable and non-writable property on 'target' should either return false or be the same value already on the 'target'");
}
assert(threw);
}
@@ -206,7 +206,7 @@
unreachable();
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy handler's 'set' method on a non-configurable accessor property without a setter should return false.");
+ assert(e.toString() === "TypeError: Proxy handler's 'set' method on a non-configurable accessor property without a setter should return false");
}
assert(threw);
}
Modified: trunk/Source/_javascript_Core/tests/stress/reflect-set-receiver-proxy-set.js (198812 => 198813)
--- trunk/Source/_javascript_Core/tests/stress/reflect-set-receiver-proxy-set.js 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/tests/stress/reflect-set-receiver-proxy-set.js 2016-03-30 00:24:16 UTC (rev 198813)
@@ -32,7 +32,7 @@
Reflect.set(proxy, 'x', 40, theReceiver);
unreachable();
} catch(e) {
- assert(e.toString() === "TypeError: 'set' property of a Proxy's handler should be callable.");
+ assert(e.toString() === "TypeError: 'set' property of a Proxy's handler should be callable");
threw = true;
}
assert(threw);
@@ -154,7 +154,7 @@
unreachable();
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy handler's 'set' on a non-configurable and non-writable property on 'target' should either return false or be the same value already on the 'target'.");
+ assert(e.toString() === "TypeError: Proxy handler's 'set' on a non-configurable and non-writable property on 'target' should either return false or be the same value already on the 'target'");
}
assert(threw);
}
@@ -220,7 +220,7 @@
unreachable();
} catch(e) {
threw = true;
- assert(e.toString() === "TypeError: Proxy handler's 'set' method on a non-configurable accessor property without a setter should return false.");
+ assert(e.toString() === "TypeError: Proxy handler's 'set' method on a non-configurable accessor property without a setter should return false");
}
assert(called);
assert(threw);
Modified: trunk/Source/_javascript_Core/tests/stress/string-prototype-methods-endsWith-startsWith-includes-correctness.js (198812 => 198813)
--- trunk/Source/_javascript_Core/tests/stress/string-prototype-methods-endsWith-startsWith-includes-correctness.js 2016-03-30 00:21:46 UTC (rev 198812)
+++ trunk/Source/_javascript_Core/tests/stress/string-prototype-methods-endsWith-startsWith-includes-correctness.js 2016-03-30 00:24:16 UTC (rev 198813)
@@ -14,7 +14,7 @@
try {
foo.endsWith(/foo/);
} catch(e) {
- assert(e.toString() === "TypeError: Argument to String.prototype.endsWith cannot be a RegExp.");
+ assert(e.toString() === "TypeError: Argument to String.prototype.endsWith cannot be a RegExp");
threw = true;
}
assert(threw);
@@ -26,7 +26,7 @@
try {
foo.startsWith(/foo/);
} catch(e) {
- assert(e.toString() === "TypeError: Argument to String.prototype.startsWith cannot be a RegExp.");
+ assert(e.toString() === "TypeError: Argument to String.prototype.startsWith cannot be a RegExp");
threw = true;
}
assert(threw);
@@ -38,7 +38,7 @@
try {
foo.includes(/foo/);
} catch(e) {
- assert(e.toString() === "TypeError: Argument to String.prototype.includes cannot be a RegExp.");
+ assert(e.toString() === "TypeError: Argument to String.prototype.includes cannot be a RegExp");
threw = true;
}
assert(threw);
@@ -58,7 +58,7 @@
try {
foo.endsWith(proxy);
} catch(e) {
- assert(e.toString() === "TypeError: Argument to String.prototype.endsWith cannot be a RegExp.");
+ assert(e.toString() === "TypeError: Argument to String.prototype.endsWith cannot be a RegExp");
threw = true;
}
assert(threw);
@@ -80,7 +80,7 @@
try {
foo.startsWith(proxy);
} catch(e) {
- assert(e.toString() === "TypeError: Argument to String.prototype.startsWith cannot be a RegExp.");
+ assert(e.toString() === "TypeError: Argument to String.prototype.startsWith cannot be a RegExp");
threw = true;
}
assert(threw);
@@ -102,7 +102,7 @@
try {
foo.includes(proxy);
} catch(e) {
- assert(e.toString() === "TypeError: Argument to String.prototype.includes cannot be a RegExp.");
+ assert(e.toString() === "TypeError: Argument to String.prototype.includes cannot be a RegExp");
threw = true;
}
assert(threw);
