summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/script/api/qscriptengine.cpp11
-rw-r--r--src/script/api/qscriptvalue.cpp207
-rw-r--r--src/script/api/qscriptvalue_p.h2
-rw-r--r--src/script/bridge/qscriptfunction.cpp8
-rw-r--r--src/script/bridge/qscriptvariant_p.h2
-rw-r--r--tests/auto/qscriptvalue/tst_qscriptvalue.cpp52
6 files changed, 203 insertions, 79 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 857019e..f4ff4b5 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -842,8 +842,8 @@ QScriptValue QScriptEngine::newRegExp(const QRegExp &regexp)
if (regexp.caseSensitivity() == Qt::CaseInsensitive)
flags.append(QLatin1Char('i'));
JSC::UString jscFlags = QScript::qtStringToJSCUString(flags);
- buf[0] = JSC::jsNontrivialString(exec, jscPattern);
- buf[1] = JSC::jsNontrivialString(exec, jscFlags);
+ buf[0] = JSC::jsString(exec, jscPattern);
+ buf[1] = JSC::jsString(exec, jscFlags);
JSC::JSObject* result = JSC::constructRegExp(exec, args);
return d->scriptValueFromJSCValue(result);
}
@@ -1128,8 +1128,8 @@ QScriptValue QScriptEngine::newRegExp(const QString &pattern, const QString &fla
JSC::ArgList args(buf, sizeof(buf));
JSC::UString jscPattern = QScript::qtStringToJSCUString(pattern);
JSC::UString jscFlags = QScript::qtStringToJSCUString(flags);
- buf[0] = JSC::jsNontrivialString(exec, jscPattern);
- buf[1] = JSC::jsNontrivialString(exec, jscFlags);
+ buf[0] = JSC::jsString(exec, jscPattern);
+ buf[1] = JSC::jsString(exec, jscFlags);
JSC::JSObject* result = JSC::constructRegExp(exec, args);
return d->scriptValueFromJSCValue(result);
}
@@ -1332,6 +1332,7 @@ QScriptValue QScriptEngine::evaluate(const QString &program, const QString &file
JSC::UString jscFileName = QScript::qtStringToJSCUString(fileName);
JSC::ExecState* exec = d->globalObject->globalExec();
+ exec->clearException();
JSC::Completion comp = JSC::evaluate(exec, exec->dynamicGlobalObject()->globalScopeChain(),
JSC::makeSource(jscProgram, jscFileName, lineNumber));
if ((comp.complType() == JSC::Normal) || (comp.complType() == JSC::ReturnValue)) {
@@ -1801,7 +1802,7 @@ bool QScriptEnginePrivate::convert(const QScriptValue &value,
#endif
if (value.isVariant() && name.endsWith('*')) {
int valueType = QMetaType::type(name.left(name.size()-1));
- QVariant var = value.toVariant();
+ QVariant &var = QScriptValuePrivate::get(value)->variantValue();
if (valueType == var.userType()) {
*reinterpret_cast<void* *>(ptr) = var.data();
return true;
diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp
index c2b4bd4..41c908d 100644
--- a/src/script/api/qscriptvalue.cpp
+++ b/src/script/api/qscriptvalue.cpp
@@ -342,6 +342,11 @@ QScriptValue QScriptValuePrivate::property(quint32 index, int resolveMode) const
return eng_p->scriptValueFromJSCValue(result);
}
+QVariant &QScriptValuePrivate::variantValue() const
+{
+ return static_cast<QScript::QVariantWrapperObject*>(JSC::asObject(jscValue))->value();
+}
+
/*!
Constructs an invalid QScriptValue.
*/
@@ -821,8 +826,13 @@ void QScriptValue::setScope(const QScriptValue &scope)
QScriptEnginePrivate *eng_p = QScriptEnginePrivate::get(d->engine);
JSC::JSValue other = eng_p->scriptValueToJSCValue(scope);
JSC::ExecState *exec = eng_p->globalObject->globalExec();
- // ### make hidden property
- JSC::asObject(d->jscValue)->putDirect(JSC::Identifier(exec, "__qt_scope__"), other);
+ JSC::Identifier id = JSC::Identifier(exec, "__qt_scope__");
+ if (!scope.isValid()) {
+ JSC::asObject(d->jscValue)->removeDirect(id);
+ } else {
+ // ### make hidden property
+ JSC::asObject(d->jscValue)->putDirect(id, other);
+ }
}
/*!
@@ -1076,11 +1086,8 @@ bool QScriptValue::equals(const QScriptValue &other) const
eng_p = QScriptEnginePrivate::get(other.d_ptr->engine);
if (eng_p) {
JSC::ExecState *exec = eng_p->globalObject->globalExec();
- Q_ASSERT_X(false, Q_FUNC_INFO, "implement me");
-#if 0
- if (JSC::equal(exec, d->jscValue, other.d_ptr->jscValue))
+ if (JSC::JSValue::equal(exec, d->jscValue, other.d_ptr->jscValue))
return true;
-#endif
}
}
return QScript::Equals(*this, other);
@@ -1406,7 +1413,7 @@ QVariant QScriptValue::toVariant() const
case QScriptValuePrivate::JSC:
if (isObject()) {
if (isVariant())
- return static_cast<QScript::QVariantWrapperObject*>(JSC::asObject(d->jscValue))->value();
+ return d->variantValue();
#ifndef QT_NO_QOBJECT
else if (isQObject())
return qVariantFromValue(toQObject());
@@ -1833,22 +1840,47 @@ QScriptValue QScriptValue::call(const QScriptValue &thisObject,
Q_D(const QScriptValue);
if (!isFunction())
return QScriptValue();
+
+ if (thisObject.engine() && (thisObject.engine() != engine())) {
+ qWarning("QScriptValue::call() failed: "
+ "cannot call function with thisObject created in "
+ "a different engine");
+ return QScriptValue();
+ }
+
QScriptEnginePrivate *eng_p = QScriptEnginePrivate::get(d->engine);
JSC::ExecState *exec = eng_p->globalObject->globalExec();
- JSC::ArgList jscArgs;
- for (int i = 0; i < args.size(); ++i) {
- Q_ASSERT_X(false, Q_FUNC_INFO, "implement me");
-#if 0
- if (!args.at(i).isValid())
- jscArgs.append(JSC::jsUndefined());
- else
- jscArgs.append(eng_p->scriptValueToJSCValue(args.at(i)));
-#endif
- }
+
JSC::JSValue jscThisObject = eng_p->scriptValueToJSCValue(thisObject);
if (!jscThisObject || !jscThisObject.isObject())
jscThisObject = eng_p->globalObject;
- JSC::JSValue result = JSC::asFunction(d->jscValue)->call(exec, jscThisObject, jscArgs);
+
+ QVector<JSC::JSValue> argsVector;
+ argsVector.resize(args.size());
+ for (int i = 0; i < args.size(); ++i) {
+ const QScriptValue &arg = args.at(i);
+ if (!arg.isValid()) {
+ argsVector[i] = JSC::jsUndefined();
+ } else if (arg.engine() && (arg.engine() != engine())) {
+ qWarning("QScriptValue::call() failed: "
+ "cannot call function with argument created in "
+ "a different engine");
+ return QScriptValue();
+ } else {
+ argsVector[i] = eng_p->scriptValueToJSCValue(arg);
+ }
+ }
+ JSC::ArgList jscArgs(argsVector.data(), argsVector.size());
+
+ JSC::JSValue callee = d->jscValue;
+ JSC::JSValue result;
+ JSC::CallData callData;
+ JSC::CallType callType = callee.getCallData(callData);
+ if (callType == JSC::CallTypeJS) {
+ result = JSC::asFunction(callee)->call(exec, jscThisObject, jscArgs);
+ } else if (callType == JSC::CallTypeHost) {
+ result = callData.native.function(exec, JSC::asObject(callee), jscThisObject, jscArgs);
+ }
if (exec->hadException())
result = exec->exception();
return eng_p->scriptValueFromJSCValue(result);
@@ -1883,6 +1915,14 @@ QScriptValue QScriptValue::call(const QScriptValue &thisObject,
Q_D(QScriptValue);
if (!isFunction())
return QScriptValue();
+
+ if (thisObject.engine() && (thisObject.engine() != engine())) {
+ qWarning("QScriptValue::call() failed: "
+ "cannot call function with thisObject created in "
+ "a different engine");
+ return QScriptValue();
+ }
+
QScriptEnginePrivate *eng_p = QScriptEnginePrivate::get(d->engine);
JSC::ExecState *exec = eng_p->globalObject->globalExec();
@@ -1890,32 +1930,39 @@ QScriptValue QScriptValue::call(const QScriptValue &thisObject,
if (!jscThisObject || !jscThisObject.isObject())
jscThisObject = eng_p->globalObject;
- Q_ASSERT_X(false, Q_FUNC_INFO, "implement me");
-#if 0
- // copied from kjs/FunctionPrototype.cpp, functionProtoFuncApply()
- JSC::JSValue argArray = eng_p->scriptValueToJSCValue(arguments);
- JSC::ArgList applyArgs;
- if (!argArray.isUndefinedOrNull()) {
- if (argArray.isObject()) {
- if (static_cast<JSC::JSObject*>(argArray.getObject())->classInfo() == &JSC::Arguments::info)
- static_cast<JSC::Arguments*>(asArguments(argArray))->fillArgList(exec, applyArgs);
- else if (exec->interpreter()->isJSArray(argArray))
- static_cast<JSC::JSArray*>(JSC::asArray(argArray))->fillArgList(exec, applyArgs);
- else if (static_cast<JSC::JSObject*>(argArray.getObject())->inherits(&JSC::JSArray::info)) {
- unsigned length = static_cast<JSC::JSObject*>(argArray.getObject())->get(exec, exec->propertyNames().length)->toUInt32(exec);
- for (unsigned i = 0; i < length; ++i)
- applyArgs.append(static_cast<JSC::JSObject*>(argArray.getObject())->get(exec, i));
- } else
- return QScriptValue(); // ### throwError(exec, TypeError);
- } else
- return QScriptValue(); // ### throwError(exec, TypeError);
+ JSC::JSValue array = eng_p->scriptValueToJSCValue(arguments);
+ // copied from runtime/FunctionPrototype.cpp, functionProtoFuncApply()
+ JSC::MarkedArgumentBuffer applyArgs;
+ if (!array.isUndefinedOrNull()) {
+ if (!array.isObject()) {
+ return eng_p->scriptValueFromJSCValue(JSC::throwError(exec, JSC::TypeError));
+ }
+ if (JSC::asObject(array)->classInfo() == &JSC::Arguments::info)
+ JSC::asArguments(array)->fillArgList(exec, applyArgs);
+ else if (JSC::isJSArray(&exec->globalData(), array))
+ JSC::asArray(array)->fillArgList(exec, applyArgs);
+ else if (JSC::asObject(array)->inherits(&JSC::JSArray::info)) {
+ unsigned length = JSC::asArray(array)->get(exec, exec->propertyNames().length).toUInt32(exec);
+ for (unsigned i = 0; i < length; ++i)
+ applyArgs.append(JSC::asArray(array)->get(exec, i));
+ } else {
+ Q_ASSERT_X(false, Q_FUNC_INFO, "implement me");
+// return JSC::throwError(exec, JSC::TypeError);
+ }
}
- JSC::JSValue result = static_cast<JSC::JSFunction*>(asFunction(d->jscValue))->call(exec, jscThisObject, applyArgs);
+ JSC::JSValue callee = d->jscValue;
+ JSC::JSValue result;
+ JSC::CallData callData;
+ JSC::CallType callType = callee.getCallData(callData);
+ if (callType == JSC::CallTypeJS) {
+ result = JSC::asFunction(callee)->call(exec, jscThisObject, applyArgs);
+ } else if (callType == JSC::CallTypeHost) {
+ result = callData.native.function(exec, JSC::asObject(callee), jscThisObject, applyArgs);
+ }
if (exec->hadException())
result = exec->exception();
return eng_p->scriptValueFromJSCValue(result);
-#endif
}
/*!
@@ -1943,17 +1990,26 @@ QScriptValue QScriptValue::construct(const QScriptValueList &args)
return QScriptValue();
QScriptEnginePrivate *eng_p = QScriptEnginePrivate::get(d->engine);
JSC::ExecState *exec = eng_p->globalObject->globalExec();
- JSC::ArgList jscArgs;
+
+ QVector<JSC::JSValue> argsVector;
+ argsVector.resize(args.size());
for (int i = 0; i < args.size(); ++i) {
-#if 0
- Q_ASSERT_X(false, Q_FUNC_INFO, "implement me");
if (!args.at(i).isValid())
- jscArgs.append(JSC::jsUndefined());
+ argsVector[i] = JSC::jsUndefined();
else
- jscArgs.append(eng_p->scriptValueToJSCValue(args.at(i)));
-#endif
+ argsVector[i] = eng_p->scriptValueToJSCValue(args.at(i));
+ }
+ JSC::ArgList jscArgs(argsVector.data(), argsVector.size());
+
+ JSC::JSValue callee = d->jscValue;
+ JSC::JSValue result;
+ JSC::ConstructData constructData;
+ JSC::ConstructType constructType = callee.getConstructData(constructData);
+ if (constructType == JSC::ConstructTypeJS) {
+ result = JSC::asFunction(callee)->construct(exec, jscArgs);
+ } else if (constructType == JSC::ConstructTypeHost) {
+ result = constructData.native.function(exec, JSC::asObject(callee), jscArgs);
}
- JSC::JSValue result = JSC::asFunction(d->jscValue)->construct(exec, jscArgs);
if (exec->hadException())
result = exec->exception();
return eng_p->scriptValueFromJSCValue(result);
@@ -1982,32 +2038,40 @@ QScriptValue QScriptValue::construct(const QScriptValue &arguments)
QScriptEnginePrivate *eng_p = QScriptEnginePrivate::get(d->engine);
JSC::ExecState *exec = eng_p->globalObject->globalExec();
- Q_ASSERT_X(false, Q_FUNC_INFO, "implement me");
-#if 0
- // copied from kjs/FunctionPrototype.cpp, functionProtoFuncApply()
- JSC::JSValue argArray = eng_p->scriptValueToJSCValue(arguments);
- JSC::ArgList applyArgs;
- if (!argArray.isUndefinedOrNull()) {
- if (argArray.isObject()) {
- if (static_cast<JSC::JSObject*>(argArray.getObject())->classInfo() == &JSC::Arguments::info)
- static_cast<JSC::Arguments*>(JSC::asArguments(argArray))->fillArgList(exec, applyArgs);
- else if (exec->interpreter()->isJSArray(argArray))
- static_cast<JSC::JSArray*>(JSC::asArray(argArray))->fillArgList(exec, applyArgs);
- else if (static_cast<JSC::JSObject*>(argArray.getObject())->inherits(&JSC::JSArray::info)) {
- unsigned length = static_cast<JSC::JSObject*>(argArray.getObject())->get(exec, exec->propertyNames().length)->toUInt32(exec);
- for (unsigned i = 0; i < length; ++i)
- applyArgs.append(static_cast<JSC::JSObject*>(argArray.getObject())->get(exec, i));
- } else
- return QScriptValue(); // ### throwError(exec, TypeError);
- } else
- return QScriptValue(); // ### throwError(exec, TypeError);
+ JSC::JSValue array = eng_p->scriptValueToJSCValue(arguments);
+ // copied from runtime/FunctionPrototype.cpp, functionProtoFuncApply()
+ JSC::MarkedArgumentBuffer applyArgs;
+ if (!array.isUndefinedOrNull()) {
+ if (!array.isObject()) {
+ Q_ASSERT_X(false, Q_FUNC_INFO, "implement me");
+// return JSC::throwError(exec, JSC::TypeError);
+ }
+ if (JSC::asObject(array)->classInfo() == &JSC::Arguments::info)
+ JSC::asArguments(array)->fillArgList(exec, applyArgs);
+ else if (JSC::isJSArray(&exec->globalData(), array))
+ JSC::asArray(array)->fillArgList(exec, applyArgs);
+ else if (JSC::asObject(array)->inherits(&JSC::JSArray::info)) {
+ unsigned length = JSC::asArray(array)->get(exec, exec->propertyNames().length).toUInt32(exec);
+ for (unsigned i = 0; i < length; ++i)
+ applyArgs.append(JSC::asArray(array)->get(exec, i));
+ } else {
+ Q_ASSERT_X(false, Q_FUNC_INFO, "implement me");
+// return JSC::throwError(exec, JSC::TypeError);
+ }
}
- JSC::JSValue result = JSC::asFunction(d->jscValue)->construct(exec, applyArgs);
+ JSC::JSValue callee = d->jscValue;
+ JSC::JSValue result;
+ JSC::ConstructData constructData;
+ JSC::ConstructType constructType = callee.getConstructData(constructData);
+ if (constructType == JSC::ConstructTypeJS) {
+ result = JSC::asFunction(callee)->construct(exec, applyArgs);
+ } else if (constructType == JSC::ConstructTypeHost) {
+ result = constructData.native.function(exec, JSC::asObject(callee), applyArgs);
+ }
if (exec->hadException())
result = exec->exception();
return eng_p->scriptValueFromJSCValue(result);
-#endif
}
/*!
@@ -2236,8 +2300,13 @@ void QScriptValue::setData(const QScriptValue &data)
QScriptEnginePrivate *eng_p = QScriptEnginePrivate::get(d->engine);
JSC::JSValue other = eng_p->scriptValueToJSCValue(data);
JSC::ExecState *exec = eng_p->globalObject->globalExec();
- // ### make hidden property
- JSC::asObject(d->jscValue)->putDirect(JSC::Identifier(exec, "__qt_data__"), other);
+ JSC::Identifier id = JSC::Identifier(exec, "__qt_data__");
+ if (!data.isValid()) {
+ JSC::asObject(d->jscValue)->removeDirect(id);
+ } else {
+ // ### make hidden property
+ JSC::asObject(d->jscValue)->putDirect(id, other);
+ }
}
/*!
diff --git a/src/script/api/qscriptvalue_p.h b/src/script/api/qscriptvalue_p.h
index 31230a6..57c9bfd 100644
--- a/src/script/api/qscriptvalue_p.h
+++ b/src/script/api/qscriptvalue_p.h
@@ -57,6 +57,8 @@ public:
bool isJSC() const;
+ QVariant &variantValue() const;
+
static QScriptValuePrivate *get(const QScriptValue &q);
QScriptValue property(const QString &name, int resolveMode) const;
diff --git a/src/script/bridge/qscriptfunction.cpp b/src/script/bridge/qscriptfunction.cpp
index fd51df1..9634ea7 100644
--- a/src/script/bridge/qscriptfunction.cpp
+++ b/src/script/bridge/qscriptfunction.cpp
@@ -59,6 +59,8 @@ JSC::JSValue FunctionWrapper::proxyCall(JSC::ExecState *, JSC::JSObject *callee,
/*calledAsConstructor=*/false, eng_p);
QScriptContext *ctx = QScriptContextPrivate::create(ctx_p);
QScriptValue result = self->data->function(ctx, self->data->engine);
+ if (!result.isValid())
+ result = QScriptValue(QScriptValue::UndefinedValue);
delete ctx;
return eng_p->scriptValueToJSCValue(result);
}
@@ -73,10 +75,12 @@ JSC::JSObject* FunctionWrapper::proxyConstruct(JSC::ExecState *, JSC::JSObject *
args, /*calledAsConstructor=*/true, eng_p);
QScriptContext *ctx = QScriptContextPrivate::create(ctx_p);
QScriptValue result = self->data->function(ctx, self->data->engine);
+ if (!result.isValid())
+ result = QScriptValue(QScriptValue::UndefinedValue);
delete ctx;
if (result.isObject())
- return static_cast<JSC::JSObject*>(JSC::asObject(eng_p->scriptValueToJSCValue(result)));
- return static_cast<JSC::JSObject*>(JSC::asObject(eng_p->scriptValueToJSCValue(object)));
+ return JSC::asObject(eng_p->scriptValueToJSCValue(result));
+ return JSC::asObject(eng_p->scriptValueToJSCValue(object));
}
FunctionWithArgWrapper::FunctionWithArgWrapper(QScriptEngine *engine, int length, const JSC::Identifier &name,
diff --git a/src/script/bridge/qscriptvariant_p.h b/src/script/bridge/qscriptvariant_p.h
index da0bb26..6e74a6b 100644
--- a/src/script/bridge/qscriptvariant_p.h
+++ b/src/script/bridge/qscriptvariant_p.h
@@ -49,7 +49,7 @@ public:
virtual const JSC::ClassInfo* classInfo() const { return &info; }
static const JSC::ClassInfo info;
- inline const QVariant &value() const { return data->value; }
+ inline QVariant &value() const { return data->value; }
inline void setValue(const QVariant &value) { data->value = value; }
private:
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
index 6377644..6eaf307 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
@@ -408,7 +408,7 @@ void tst_QScriptValue::toString()
"})()");
QVERIFY(!eng.hasUncaughtException());
QVERIFY(objectObject.isObject());
- QEXPECT_FAIL("", "Doesn't work", Continue);
+ QEXPECT_FAIL("", "Should return an error string", Continue);
QCOMPARE(objectObject.toString(), QString::fromLatin1("TypeError: Function.prototype.toString called on incompatible object"));
QVERIFY(eng.hasUncaughtException());
eng.clearExceptions();
@@ -1651,6 +1651,7 @@ void tst_QScriptValue::isError()
for (int i = 0; i < errors.size(); ++i) {
QScriptValue ctor = eng.globalObject().property(errors.at(i));
QVERIFY(ctor.isFunction());
+ QEXPECT_FAIL("", "Error.prototype should itself be an Error object", Continue);
QVERIFY(ctor.property("prototype").isError());
}
QVERIFY(!eng.globalObject().isError());
@@ -1727,6 +1728,7 @@ void tst_QScriptValue::getSetProperty()
QCOMPARE(strstr.engine(), (QScriptEngine *)0);
object.setProperty("foo", strstr);
QCOMPARE(object.property("foo").toString(), strstr.toString());
+ QEXPECT_FAIL("", "String engine binding not implemented", Continue);
QCOMPARE(strstr.engine(), &eng); // the value has been bound to the engine
QScriptValue numnum = QScriptValue(123.0);
@@ -2119,15 +2121,18 @@ void tst_QScriptValue::getSetPrototype()
QScriptValue old = object.prototype();
QTest::ignoreMessage(QtWarningMsg, "QScriptValue::setPrototype() failed: cyclic prototype value");
object.setPrototype(object);
+ QEXPECT_FAIL("", "Cyclic prototype detection not implemented", Continue);
QCOMPARE(object.prototype().strictlyEquals(old), true);
object2.setPrototype(object);
QTest::ignoreMessage(QtWarningMsg, "QScriptValue::setPrototype() failed: cyclic prototype value");
object.setPrototype(object2);
+ QEXPECT_FAIL("", "Cyclic prototype detection not implemented", Continue);
QCOMPARE(object.prototype().strictlyEquals(old), true);
{
QScriptValue ret = eng.evaluate("o = { }; p = { }; o.__proto__ = p; p.__proto__ = o");
+ QEXPECT_FAIL("", "Cyclic prototype detection not implemented", Abort);
QCOMPARE(eng.hasUncaughtException(), true);
QVERIFY(ret.strictlyEquals(eng.uncaughtException()));
QCOMPARE(ret.isError(), true);
@@ -2192,6 +2197,7 @@ public:
void tst_QScriptValue::getSetScriptClass()
{
+ QSKIP("Not implemented", SkipAll);
QScriptEngine eng;
QScriptValue inv;
QCOMPARE(inv.scriptClass(), (QScriptClass*)0);
@@ -2232,7 +2238,9 @@ void tst_QScriptValue::call()
{
QScriptValue fun = eng.evaluate("function() { return 1; }");
+ QEXPECT_FAIL("", "JSC parser doesn't understand function expressions", Continue);
QVERIFY(fun.isFunction());
+ fun = eng.evaluate("(function() { return 1; })");
QScriptValue result = fun.call();
QVERIFY(result.isNumber());
QCOMPARE(result.toInt32(), 1);
@@ -2258,7 +2266,9 @@ void tst_QScriptValue::call()
// test that correct "this" object is used
{
QScriptValue fun = eng.evaluate("function() { return this; }");
+ QEXPECT_FAIL("", "JSC parser doesn't understand function expressions", Continue);
QCOMPARE(fun.isFunction(), true);
+ fun = eng.evaluate("(function() { return this; })");
{
QScriptValue numberObject = QScriptValue(&eng, 123.0).toObject();
@@ -2271,7 +2281,9 @@ void tst_QScriptValue::call()
// test that correct arguments are passed
{
QScriptValue fun = eng.evaluate("function() { return arguments[0]; }");
+ QEXPECT_FAIL("", "JSC parser doesn't understand function expressions", Continue);
QCOMPARE(fun.isFunction(), true);
+ fun = eng.evaluate("(function() { return arguments[0]; })");
{
QScriptValue result = fun.call(eng.undefinedValue());
@@ -2298,7 +2310,9 @@ void tst_QScriptValue::call()
{
QScriptValue fun = eng.evaluate("function() { return arguments[1]; }");
+ QEXPECT_FAIL("", "JSC parser doesn't understand function expressions", Continue);
QCOMPARE(fun.isFunction(), true);
+ fun = eng.evaluate("(function() { return arguments[1]; })");
{
QScriptValueList args;
@@ -2311,7 +2325,10 @@ void tst_QScriptValue::call()
{
QScriptValue fun = eng.evaluate("function() { throw new Error('foo'); }");
+ QEXPECT_FAIL("", "JSC parser doesn't understand function expressions", Continue);
QCOMPARE(fun.isFunction(), true);
+ fun = eng.evaluate("(function() { throw new Error('foo'); })");
+ QVERIFY(!eng.hasUncaughtException());
{
QScriptValue result = fun.call();
@@ -2322,11 +2339,13 @@ void tst_QScriptValue::call()
}
{
+ eng.clearExceptions();
QScriptValue fun = eng.newFunction(getArg);
{
QScriptValueList args;
args << QScriptValue(&eng, 123.0);
QScriptValue result = fun.call(eng.undefinedValue(), args);
+ QVERIFY(!eng.hasUncaughtException());
QCOMPARE(result.isNumber(), true);
QCOMPARE(result.toNumber(), 123.0);
}
@@ -2346,7 +2365,10 @@ void tst_QScriptValue::call()
QScriptValueList args;
args << QScriptValue(&eng, 123.0);
QScriptValue result = fun.call(eng.undefinedValue(), args);
+ QVERIFY(!eng.hasUncaughtException());
+ QEXPECT_FAIL("", "Need to create arguments object for frame", Continue);
QCOMPARE(result.isNumber(), true);
+ QEXPECT_FAIL("", "Need to create arguments object for frame", Continue);
QCOMPARE(result.toNumber(), 123.0);
}
}
@@ -2361,6 +2383,7 @@ void tst_QScriptValue::call()
QScriptValueList args;
args << QScriptValue();
QScriptValue ret = fun.call(QScriptValue(), args);
+ QVERIFY(!eng.hasUncaughtException());
QCOMPARE(ret.isValid(), true);
QCOMPARE(ret.isUndefined(), true);
}
@@ -2372,6 +2395,7 @@ void tst_QScriptValue::call()
args << QScriptValue();
QScriptValue ret = fun.call(QScriptValue(), args);
QCOMPARE(ret.isValid(), true);
+ QEXPECT_FAIL("", "Need to create arguments object for frame", Continue);
QCOMPARE(ret.isUndefined(), true);
}
}
@@ -2382,6 +2406,7 @@ void tst_QScriptValue::call()
args << QScriptValue() << QScriptValue();
QScriptValue ret = fun.call(QScriptValue(), args);
QCOMPARE(ret.isValid(), true);
+ QEXPECT_FAIL("", "Need to create arguments object for frame", Continue);
QCOMPARE(ret.isNumber(), true);
QCOMPARE(qIsNaN(ret.toNumber()), true);
}
@@ -2410,21 +2435,28 @@ void tst_QScriptValue::call()
{
QScriptEngine otherEngine;
QScriptValue fun = otherEngine.evaluate("function() { return 1; }");
+ QEXPECT_FAIL("", "JSC parser doesn't understand function expressions", Continue);
+ QVERIFY(fun.isFunction());
+ fun = otherEngine.evaluate("(function() { return 1; })");
QTest::ignoreMessage(QtWarningMsg, "QScriptValue::call() failed: "
"cannot call function with thisObject created in "
"a different engine");
QCOMPARE(fun.call(Object).isValid(), false);
- QCOMPARE(fun.call(QScriptValue(), QScriptValueList() << QScriptValue(&eng, 123)).isValid(), true);
+ QCOMPARE(fun.call(QScriptValue(), QScriptValueList() << QScriptValue(&eng, 123)).isValid(), false);
}
{
QScriptValue fun = eng.evaluate("function() { return arguments; }");
+ QEXPECT_FAIL("", "JSC parser doesn't understand function expressions", Continue);
+ QVERIFY(fun.isFunction());
+ fun = eng.evaluate("(function() { return arguments; })");
QScriptValue array = eng.newArray(3);
array.setProperty(0, QScriptValue(&eng, 123.0));
array.setProperty(1, QScriptValue(&eng, 456.0));
array.setProperty(2, QScriptValue(&eng, 789.0));
// call with single array object as arguments
QScriptValue ret = fun.call(QScriptValue(), array);
+ QVERIFY(!eng.hasUncaughtException());
QCOMPARE(ret.isError(), false);
QCOMPARE(ret.property(0).strictlyEquals(array.property(0)), true);
QCOMPARE(ret.property(1).strictlyEquals(array.property(1)), true);
@@ -2457,7 +2489,9 @@ void tst_QScriptValue::construct()
{
QScriptValue fun = eng.evaluate("function () { }");
+ QEXPECT_FAIL("", "JSC parser doesn't understand function expressions", Continue);
QVERIFY(fun.isFunction());
+ fun = eng.evaluate("(function () { })");
QScriptValue ret = fun.construct();
QVERIFY(ret.isObject());
QVERIFY(ret.instanceOf(fun));
@@ -2476,7 +2510,9 @@ void tst_QScriptValue::construct()
// test that internal prototype is set correctly
{
QScriptValue fun = eng.evaluate("function() { return this.__proto__; }");
+ QEXPECT_FAIL("", "JSC parser doesn't understand function expressions", Continue);
QCOMPARE(fun.isFunction(), true);
+ fun = eng.evaluate("(function() { return this.__proto__; })");
QCOMPARE(fun.property("prototype").isObject(), true);
QScriptValue ret = fun.construct();
QCOMPARE(fun.property("prototype").strictlyEquals(ret), true);
@@ -2485,14 +2521,18 @@ void tst_QScriptValue::construct()
// test that we return the new object even if a non-object value is returned from the function
{
QScriptValue fun = eng.evaluate("function() { return 123; }");
+ QEXPECT_FAIL("", "JSC parser doesn't understand function expressions", Continue);
QCOMPARE(fun.isFunction(), true);
+ fun = eng.evaluate("(function() { return 123; })");
QScriptValue ret = fun.construct();
QCOMPARE(ret.isObject(), true);
}
{
QScriptValue fun = eng.evaluate("function() { throw new Error('foo'); }");
+ QEXPECT_FAIL("", "JSC parser doesn't understand function expressions", Continue);
QCOMPARE(fun.isFunction(), true);
+ fun = eng.evaluate("(function() { throw new Error('foo'); })");
QScriptValue ret = fun.construct();
QCOMPARE(ret.isError(), true);
QCOMPARE(eng.hasUncaughtException(), true);
@@ -2510,6 +2550,8 @@ void tst_QScriptValue::construct()
array.setProperty(2, QScriptValue(&eng, 789.0));
// construct with single array object as arguments
QScriptValue ret = fun.construct(array);
+ QVERIFY(!eng.hasUncaughtException());
+ QVERIFY(ret.isObject());
QCOMPARE(ret.property(0).strictlyEquals(array.property(0)), true);
QCOMPARE(ret.property(1).strictlyEquals(array.property(1)), true);
QCOMPARE(ret.property(2).strictlyEquals(array.property(2)), true);
@@ -3110,6 +3152,8 @@ void tst_QScriptValue::prettyPrinter_data()
void tst_QScriptValue::prettyPrinter()
{
+ QSKIP("Test is busted because JSC parser doesn't understand function expressions", SkipAll);
+
QFETCH(QString, function);
QFETCH(QString, expected);
QScriptEngine eng;
@@ -3126,6 +3170,8 @@ void tst_QScriptValue::prettyPrinter()
void tst_QScriptValue::engineDeleted()
{
+ QFAIL("Crashes (need to invalidate scriptvalues when engine is deleted)");
+
QScriptEngine *eng = new QScriptEngine;
QScriptValue v1(eng, 123);
QVERIFY(v1.isNumber());
@@ -3167,6 +3213,8 @@ void tst_QScriptValue::valueOfWithClosure()
void tst_QScriptValue::objectId()
{
+ QFAIL("Not implemented");
+
QCOMPARE(QScriptValue().objectId(), (qint64)-1);
QCOMPARE(QScriptValue(QScriptValue::UndefinedValue).objectId(), (qint64)-1);
QCOMPARE(QScriptValue(QScriptValue::NullValue).objectId(), (qint64)-1);
generated by cgit v0.12 at 2024-12-29 09:19:45 (GMT)