diff options
author | Lars Knoll <lars.knoll@qt.io> | 2017-08-04 18:53:51 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2017-08-08 18:58:14 +0000 |
commit | 50e7badd5f261bd69db9d8f03d5651e346087218 (patch) | |
tree | 73c2771fbc98168280182e77337b06efa39f4a7b /src/qml/qml | |
parent | 8abb6c41bf055d59c6b57a809e3b027293568848 (diff) |
Remove Scope::result and convert calling convention for builtins
Allow for faster calling of builtins, and completely avoid
scope creation in many cases.
Change-Id: I0f1681e19e9908db10def85a74e134a87fc2e44c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml')
-rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 31 | ||||
-rw-r--r-- | src/qml/qml/qqmldelayedcallqueue.cpp | 5 | ||||
-rw-r--r-- | src/qml/qml/qqmldelayedcallqueue_p.h | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmljavascriptexpression.cpp | 5 | ||||
-rw-r--r-- | src/qml/qml/qqmllistwrapper.cpp | 4 | ||||
-rw-r--r-- | src/qml/qml/qqmllistwrapper_p.h | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmllocale.cpp | 184 | ||||
-rw-r--r-- | src/qml/qml/qqmllocale_p.h | 76 | ||||
-rw-r--r-- | src/qml/qml/qqmlvaluetypewrapper.cpp | 5 | ||||
-rw-r--r-- | src/qml/qml/qqmlvaluetypewrapper_p.h | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlxmlhttprequest.cpp | 288 | ||||
-rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 350 | ||||
-rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions_p.h | 118 | ||||
-rw-r--r-- | src/qml/qml/v8/qv4domerrors_p.h | 3 |
14 files changed, 571 insertions, 504 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index b22fa31d13..a736fb9f9d 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -1096,11 +1096,11 @@ struct QmlIncubatorObject : public QV4::Object V4_OBJECT2(QmlIncubatorObject, Object) V4_NEEDS_DESTROY - static void method_get_statusChanged(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_set_statusChanged(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_get_status(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_get_object(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_forceCompletion(const BuiltinFunction *, Scope &scope, CallData *callData); + static ReturnedValue method_get_statusChanged(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_set_statusChanged(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_get_status(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_get_object(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_forceCompletion(const BuiltinFunction *, CallData *callData); void statusChanged(QQmlIncubator::Status); void setInitialState(QObject *); @@ -1446,17 +1446,19 @@ QQmlComponentExtension::QQmlComponentExtension(QV4::ExecutionEngine *v4) incubationProto.set(v4, proto); } -void QV4::QmlIncubatorObject::method_get_object(const BuiltinFunction *, Scope &scope, CallData *callData) +QV4::ReturnedValue QV4::QmlIncubatorObject::method_get_object(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); QV4::Scoped<QmlIncubatorObject> o(scope, callData->thisObject.as<QmlIncubatorObject>()); if (!o) THROW_TYPE_ERROR(); - scope.result = QV4::QObjectWrapper::wrap(scope.engine, o->d()->incubator->object()); + return QV4::QObjectWrapper::wrap(scope.engine, o->d()->incubator->object()); } -void QV4::QmlIncubatorObject::method_forceCompletion(const BuiltinFunction *, Scope &scope, CallData *callData) +QV4::ReturnedValue QV4::QmlIncubatorObject::method_forceCompletion(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); QV4::Scoped<QmlIncubatorObject> o(scope, callData->thisObject.as<QmlIncubatorObject>()); if (!o) THROW_TYPE_ERROR(); @@ -1466,26 +1468,29 @@ void QV4::QmlIncubatorObject::method_forceCompletion(const BuiltinFunction *, Sc RETURN_UNDEFINED(); } -void QV4::QmlIncubatorObject::method_get_status(const BuiltinFunction *, Scope &scope, CallData *callData) +QV4::ReturnedValue QV4::QmlIncubatorObject::method_get_status(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); QV4::Scoped<QmlIncubatorObject> o(scope, callData->thisObject.as<QmlIncubatorObject>()); if (!o) THROW_TYPE_ERROR(); - scope.result = QV4::Encode(o->d()->incubator->status()); + return QV4::Encode(o->d()->incubator->status()); } -void QV4::QmlIncubatorObject::method_get_statusChanged(const BuiltinFunction *, Scope &scope, CallData *callData) +QV4::ReturnedValue QV4::QmlIncubatorObject::method_get_statusChanged(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); QV4::Scoped<QmlIncubatorObject> o(scope, callData->thisObject.as<QmlIncubatorObject>()); if (!o) THROW_TYPE_ERROR(); - scope.result = o->d()->statusChanged; + return QV4::Encode(o->d()->statusChanged); } -void QV4::QmlIncubatorObject::method_set_statusChanged(const BuiltinFunction *, Scope &scope, CallData *callData) +QV4::ReturnedValue QV4::QmlIncubatorObject::method_set_statusChanged(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); QV4::Scoped<QmlIncubatorObject> o(scope, callData->thisObject.as<QmlIncubatorObject>()); if (!o || callData->argc < 1) THROW_TYPE_ERROR(); diff --git a/src/qml/qml/qqmldelayedcallqueue.cpp b/src/qml/qml/qqmldelayedcallqueue.cpp index 5f274b8da5..a32a9dd783 100644 --- a/src/qml/qml/qqmldelayedcallqueue.cpp +++ b/src/qml/qml/qqmldelayedcallqueue.cpp @@ -105,8 +105,9 @@ void QQmlDelayedCallQueue::init(QV4::ExecutionEngine* engine) m_tickedMethod = metaObject.method(methodIndex); } -void QQmlDelayedCallQueue::addUniquelyAndExecuteLater(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +QV4::ReturnedValue QQmlDelayedCallQueue::addUniquelyAndExecuteLater(const QV4::BuiltinFunction *b, QV4::CallData *callData) { + QV4::Scope scope(b); if (callData->argc == 0) THROW_GENERIC_ERROR("Qt.callLater: no arguments given"); @@ -169,7 +170,7 @@ void QQmlDelayedCallQueue::addUniquelyAndExecuteLater(const QV4::BuiltinFunction m_tickedMethod.invoke(this, Qt::QueuedConnection); m_callbackOutstanding = true; } - scope.result = QV4::Encode::undefined(); + return QV4::Encode::undefined(); } void QQmlDelayedCallQueue::storeAnyArguments(DelayedFunctionCall &dfc, const QV4::CallData *callData, int offset, QV4::ExecutionEngine *engine) diff --git a/src/qml/qml/qqmldelayedcallqueue_p.h b/src/qml/qml/qqmldelayedcallqueue_p.h index cffde4f0c0..5b3043cfed 100644 --- a/src/qml/qml/qqmldelayedcallqueue_p.h +++ b/src/qml/qml/qqmldelayedcallqueue_p.h @@ -70,7 +70,7 @@ public: void init(QV4::ExecutionEngine *); - void addUniquelyAndExecuteLater(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); + QV4::ReturnedValue addUniquelyAndExecuteLater(const QV4::BuiltinFunction *, QV4::CallData *callData); public Q_SLOTS: void ticked(); diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp index 6c5c00e8ae..981f55a399 100644 --- a/src/qml/qml/qqmljavascriptexpression.cpp +++ b/src/qml/qml/qqmljavascriptexpression.cpp @@ -227,11 +227,10 @@ QV4::ReturnedValue QQmlJavaScriptExpression::evaluate(QV4::CallData *callData, b QV4::ExecutionContext *outer = static_cast<QV4::ExecutionContext *>(m_qmlScope.valueRef()); if (v4Function->canUseSimpleFunction()) { - outer->simpleCall(scope, callData, v4Function); + result = outer->simpleCall(scope, callData, v4Function); } else { - outer->call(scope, callData, v4Function); + result = outer->call(scope, callData, v4Function); } - result = scope.result; if (scope.hasException()) { if (watcher.wasDeleted()) diff --git a/src/qml/qml/qqmllistwrapper.cpp b/src/qml/qml/qqmllistwrapper.cpp index 43677e0d78..8204400956 100644 --- a/src/qml/qml/qqmllistwrapper.cpp +++ b/src/qml/qml/qqmllistwrapper.cpp @@ -171,8 +171,9 @@ void PropertyListPrototype::init(ExecutionEngine *) defineDefaultProperty(QStringLiteral("push"), method_push, 1); } -void PropertyListPrototype::method_push(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue PropertyListPrototype::method_push(const BuiltinFunction *b, CallData *callData) { + Scope scope(b); ScopedObject instance(scope, callData->thisObject.toObject(scope.engine)); if (!instance) RETURN_UNDEFINED(); @@ -189,6 +190,7 @@ void PropertyListPrototype::method_push(const BuiltinFunction *, Scope &scope, C if (QV4::QObjectWrapper *wrapper = so->as<QV4::QObjectWrapper>()) w->d()->property().append(&w->d()->property(), wrapper->object() ); } + return Encode::undefined(); } QT_END_NAMESPACE diff --git a/src/qml/qml/qqmllistwrapper_p.h b/src/qml/qml/qqmllistwrapper_p.h index 84dadba01a..0b53395d2b 100644 --- a/src/qml/qml/qqmllistwrapper_p.h +++ b/src/qml/qml/qqmllistwrapper_p.h @@ -103,7 +103,7 @@ struct PropertyListPrototype : Object { void init(ExecutionEngine *engine); - static void method_push(const BuiltinFunction *, Scope &, CallData *callData); + static ReturnedValue method_push(const BuiltinFunction *, CallData *callData); }; } diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp index 326b36c5cd..862d9e1f14 100644 --- a/src/qml/qml/qqmllocale.cpp +++ b/src/qml/qml/qqmllocale.cpp @@ -58,8 +58,7 @@ DEFINE_OBJECT_VTABLE(QQmlLocaleData); #define THROW_ERROR(string) \ do { \ - scope.result = scope.engine->throwError(QString::fromUtf8(string)); \ - return; \ + return scope.engine->throwError(QString::fromUtf8(string)); \ } while (false) @@ -87,18 +86,15 @@ void QQmlDateExtension::registerExtension(QV4::ExecutionEngine *engine) engine->dateCtor()->defineDefaultProperty(QStringLiteral("timeZoneUpdated"), method_timeZoneUpdated); } -void QQmlDateExtension::method_toLocaleString(const BuiltinFunction *b, Scope &scope, CallData *callData) +ReturnedValue QQmlDateExtension::method_toLocaleString(const BuiltinFunction *b, CallData *callData) { - if (callData->argc > 2) { - QV4::DatePrototype::method_toLocaleString(b, scope, callData); - return; - } + Scope scope(b); + if (callData->argc > 2) + return QV4::DatePrototype::method_toLocaleString(b, callData); QV4::DateObject *date = callData->thisObject.as<DateObject>(); - if (!date) { - QV4::DatePrototype::method_toLocaleString(b, scope, callData); - return; - } + if (!date) + return QV4::DatePrototype::method_toLocaleString(b, callData); QDateTime dt = date->toQDateTime(); @@ -108,10 +104,8 @@ void QQmlDateExtension::method_toLocaleString(const BuiltinFunction *b, Scope &s RETURN_RESULT(scope.engine->newString(locale.toString(dt))); } - if (!isLocaleObject(callData->args[0])) { - QV4::DatePrototype::method_toLocaleString(b, scope, callData); // Use the default Date toLocaleString() - return; - } + if (!isLocaleObject(callData->args[0])) + return QV4::DatePrototype::method_toLocaleString(b, callData); // Use the default Date toLocaleString() GET_LOCALE_DATA_RESOURCE(callData->args[0]); @@ -132,21 +126,18 @@ void QQmlDateExtension::method_toLocaleString(const BuiltinFunction *b, Scope &s formattedDt = r->d()->locale->toString(dt, enumFormat); } - scope.result = scope.engine->newString(formattedDt); + RETURN_RESULT(scope.engine->newString(formattedDt)); } -void QQmlDateExtension::method_toLocaleTimeString(const BuiltinFunction *b, Scope &scope, CallData *callData) +ReturnedValue QQmlDateExtension::method_toLocaleTimeString(const BuiltinFunction *b, CallData *callData) { - if (callData->argc > 2) { - QV4::DatePrototype::method_toLocaleTimeString(b, scope, callData); - return; - } + Scope scope(b); + if (callData->argc > 2) + return QV4::DatePrototype::method_toLocaleTimeString(b, callData); QV4::DateObject *date = callData->thisObject.as<DateObject>(); - if (!date) { - QV4::DatePrototype::method_toLocaleTimeString(b, scope, callData); - return; - } + if (!date) + return QV4::DatePrototype::method_toLocaleTimeString(b, callData); QDateTime dt = date->toQDateTime(); QTime time = dt.time(); @@ -158,7 +149,7 @@ void QQmlDateExtension::method_toLocaleTimeString(const BuiltinFunction *b, Scop } if (!isLocaleObject(callData->args[0])) - return QV4::DatePrototype::method_toLocaleTimeString(b, scope, callData); // Use the default Date toLocaleTimeString() + return QV4::DatePrototype::method_toLocaleTimeString(b, callData); // Use the default Date toLocaleTimeString() GET_LOCALE_DATA_RESOURCE(callData->args[0]); @@ -179,21 +170,18 @@ void QQmlDateExtension::method_toLocaleTimeString(const BuiltinFunction *b, Scop formattedTime = r->d()->locale->toString(time, enumFormat); } - scope.result = scope.engine->newString(formattedTime); + RETURN_RESULT(scope.engine->newString(formattedTime)); } -void QQmlDateExtension::method_toLocaleDateString(const BuiltinFunction *b, Scope &scope, CallData *callData) +ReturnedValue QQmlDateExtension::method_toLocaleDateString(const BuiltinFunction *b, CallData *callData) { - if (callData->argc > 2) { - QV4::DatePrototype::method_toLocaleDateString(b, scope, callData); - return; - } + Scope scope(b); + if (callData->argc > 2) + return QV4::DatePrototype::method_toLocaleDateString(b, callData); QV4::DateObject *dateObj = callData->thisObject.as<DateObject>(); - if (!dateObj) { - QV4::DatePrototype::method_toLocaleDateString(b, scope, callData); - return; - } + if (!dateObj) + return QV4::DatePrototype::method_toLocaleDateString(b, callData); QDateTime dt = dateObj->toQDateTime(); QDate date = dt.date(); @@ -205,7 +193,7 @@ void QQmlDateExtension::method_toLocaleDateString(const BuiltinFunction *b, Scop } if (!isLocaleObject(callData->args[0])) - return QV4::DatePrototype::method_toLocaleDateString(b, scope, callData); // Use the default Date toLocaleDateString() + return QV4::DatePrototype::method_toLocaleDateString(b, callData); // Use the default Date toLocaleDateString() GET_LOCALE_DATA_RESOURCE(callData->args[0]); @@ -226,11 +214,12 @@ void QQmlDateExtension::method_toLocaleDateString(const BuiltinFunction *b, Scop formattedDate = r->d()->locale->toString(date, enumFormat); } - scope.result = scope.engine->newString(formattedDate); + RETURN_RESULT(scope.engine->newString(formattedDate)); } -void QQmlDateExtension::method_fromLocaleString(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QQmlDateExtension::method_fromLocaleString(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); QV4::ExecutionEngine * const engine = scope.engine; if (callData->argc == 1) { if (String *s = callData->args[0].stringValue()) { @@ -264,11 +253,12 @@ void QQmlDateExtension::method_fromLocaleString(const BuiltinFunction *, Scope & dt = r->d()->locale->toDateTime(dateString, enumFormat); } - scope.result = engine->newDateObject(dt); + RETURN_RESULT(engine->newDateObject(dt)); } -void QQmlDateExtension::method_fromLocaleTimeString(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QQmlDateExtension::method_fromLocaleTimeString(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); QV4::ExecutionEngine * const engine = scope.engine; if (callData->argc == 1) { @@ -314,8 +304,9 @@ void QQmlDateExtension::method_fromLocaleTimeString(const BuiltinFunction *, Sco RETURN_RESULT(engine->newDateObject(dt)); } -void QQmlDateExtension::method_fromLocaleDateString(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QQmlDateExtension::method_fromLocaleDateString(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); QV4::ExecutionEngine * const engine = scope.engine; if (callData->argc == 1) { @@ -353,8 +344,9 @@ void QQmlDateExtension::method_fromLocaleDateString(const BuiltinFunction *, Sco RETURN_RESULT(engine->newDateObject(QDateTime(dt))); } -void QQmlDateExtension::method_timeZoneUpdated(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QQmlDateExtension::method_timeZoneUpdated(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 0) THROW_ERROR("Locale: Date.timeZoneUpdated(): Invalid arguments"); @@ -373,8 +365,9 @@ void QQmlNumberExtension::registerExtension(QV4::ExecutionEngine *engine) engine->numberCtor()->defineDefaultProperty(QStringLiteral("fromLocaleString"), method_fromLocaleString); } -void QQmlNumberExtension::method_toLocaleString(const BuiltinFunction *b, Scope &scope, CallData *callData) +QV4::ReturnedValue QQmlNumberExtension::method_toLocaleString(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc > 3) THROW_ERROR("Locale: Number.toLocaleString(): Invalid arguments"); @@ -386,10 +379,8 @@ void QQmlNumberExtension::method_toLocaleString(const BuiltinFunction *b, Scope RETURN_RESULT(scope.engine->newString(locale.toString(number))); } - if (!isLocaleObject(callData->args[0])) { - QV4::NumberPrototype::method_toLocaleString(b, scope, callData); // Use the default Number toLocaleString() - return; - } + if (!isLocaleObject(callData->args[0])) + return QV4::NumberPrototype::method_toLocaleString(b, callData); // Use the default Number toLocaleString() GET_LOCALE_DATA_RESOURCE(callData->args[0]); @@ -408,11 +399,12 @@ void QQmlNumberExtension::method_toLocaleString(const BuiltinFunction *b, Scope prec = callData->args[2].toInt32(); } - scope.result = scope.engine->newString(r->d()->locale->toString(number, (char)format, prec)); + RETURN_RESULT(scope.engine->newString(r->d()->locale->toString(number, (char)format, prec))); } -void QQmlNumberExtension::method_toLocaleCurrencyString(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QQmlNumberExtension::method_toLocaleCurrencyString(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc > 2) THROW_ERROR("Locale: Number.toLocaleCurrencyString(): Invalid arguments"); @@ -439,8 +431,9 @@ void QQmlNumberExtension::method_toLocaleCurrencyString(const BuiltinFunction *, RETURN_RESULT(scope.engine->newString(r->d()->locale->toCurrencyString(number, symbol))); } -void QQmlNumberExtension::method_fromLocaleString(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QQmlNumberExtension::method_fromLocaleString(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc < 1 || callData->argc > 2) THROW_ERROR("Locale: Number.fromLocaleString(): Invalid arguments"); @@ -467,45 +460,49 @@ void QQmlNumberExtension::method_fromLocaleString(const BuiltinFunction *, Scope if (!ok) THROW_ERROR("Locale: Number.fromLocaleString(): Invalid format"); - scope.result = QV4::Encode(val); + RETURN_RESULT(QV4::Encode(val)); } //-------------- // Locale object -void QQmlLocaleData::method_get_firstDayOfWeek(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QQmlLocaleData::method_get_firstDayOfWeek(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); QLocale *locale = getThisLocale(scope, callData); if (!locale) - return; + return Encode::undefined(); int fdow = int(locale->firstDayOfWeek()); if (fdow == 7) fdow = 0; // Qt::Sunday = 7, but Sunday is 0 in JS Date - scope.result = QV4::Encode(fdow); + RETURN_RESULT(fdow); } -void QQmlLocaleData::method_get_measurementSystem(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QQmlLocaleData::method_get_measurementSystem(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); QLocale *locale = getThisLocale(scope, callData); if (!locale) - return; - scope.result = QV4::Encode(locale->measurementSystem()); + return Encode::undefined(); + return QV4::Encode(locale->measurementSystem()); } -void QQmlLocaleData::method_get_textDirection(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QQmlLocaleData::method_get_textDirection(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); QLocale *locale = getThisLocale(scope, callData); if (!locale) - return; + return Encode::undefined(); - scope.result = QV4::Encode(locale->textDirection()); + return QV4::Encode(locale->textDirection()); } -void QQmlLocaleData::method_get_weekDays(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QQmlLocaleData::method_get_weekDays(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); QLocale *locale = getThisLocale(scope, callData); if (!locale) - return; + return Encode::undefined(); QList<Qt::DayOfWeek> days = locale->weekdays(); @@ -519,14 +516,15 @@ void QQmlLocaleData::method_get_weekDays(const BuiltinFunction *, Scope &scope, } result->setArrayLengthUnchecked(days.size()); - scope.result = result.asReturnedValue(); + return result.asReturnedValue(); } -void QQmlLocaleData::method_get_uiLanguages(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QQmlLocaleData::method_get_uiLanguages(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); QLocale *locale = getThisLocale(scope, callData); if (!locale) - return; + return Encode::undefined(); QStringList langs = locale->uiLanguages(); QV4::ScopedArrayObject result(scope, scope.engine->newArrayObject()); @@ -537,14 +535,15 @@ void QQmlLocaleData::method_get_uiLanguages(const BuiltinFunction *, Scope &scop result->setArrayLengthUnchecked(langs.size()); - scope.result = result.asReturnedValue(); + return result.asReturnedValue(); } -void QQmlLocaleData::method_currencySymbol(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QQmlLocaleData::method_currencySymbol(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); QLocale *locale = getThisLocale(scope, callData); if (!locale) - return; + return Encode::undefined(); if (callData->argc > 1) THROW_ERROR("Locale: currencySymbol(): Invalid arguments"); @@ -555,14 +554,15 @@ void QQmlLocaleData::method_currencySymbol(const BuiltinFunction *, Scope &scope format = QLocale::CurrencySymbolFormat(intFormat); } - scope.result = scope.engine->newString(locale->currencySymbol(format)); + RETURN_RESULT(scope.engine->newString(locale->currencySymbol(format))); } #define LOCALE_FORMAT(FUNC) \ -void QQmlLocaleData::method_ ##FUNC (const BuiltinFunction *, Scope &scope, CallData *callData) { \ +ReturnedValue QQmlLocaleData::method_ ##FUNC (const BuiltinFunction *b, CallData *callData) { \ + QV4::Scope scope(b); \ QLocale *locale = getThisLocale(scope, callData); \ if (!locale) \ - return; \ + return Encode::undefined(); \ if (callData->argc > 1) \ THROW_ERROR("Locale: " #FUNC "(): Invalid arguments"); \ QLocale::FormatType format = QLocale::LongFormat;\ @@ -570,7 +570,7 @@ void QQmlLocaleData::method_ ##FUNC (const BuiltinFunction *, Scope &scope, Call quint32 intFormat = callData->args[0].toUInt32(); \ format = QLocale::FormatType(intFormat); \ } \ - scope.result = scope.engine->newString(locale-> FUNC (format)); \ + RETURN_RESULT(scope.engine->newString(locale-> FUNC (format))); \ } LOCALE_FORMAT(dateTimeFormat) @@ -579,10 +579,11 @@ LOCALE_FORMAT(dateFormat) // +1 added to idx because JS is 0-based, whereas QLocale months begin at 1. #define LOCALE_FORMATTED_MONTHNAME(VARIABLE) \ -void QQmlLocaleData::method_ ## VARIABLE (const BuiltinFunction *, Scope &scope, CallData *callData) {\ +ReturnedValue QQmlLocaleData::method_ ## VARIABLE (const BuiltinFunction *b, CallData *callData) {\ + Scope scope(b); \ QLocale *locale = getThisLocale(scope, callData); \ if (!locale) \ - return; \ + return Encode::undefined(); \ if (callData->argc < 1 || callData->argc > 2) \ THROW_ERROR("Locale: " #VARIABLE "(): Invalid arguments"); \ QLocale::FormatType enumFormat = QLocale::LongFormat; \ @@ -601,15 +602,16 @@ void QQmlLocaleData::method_ ## VARIABLE (const BuiltinFunction *, Scope &scope, } else { \ name = locale-> VARIABLE(idx, enumFormat); \ } \ - scope.result = scope.engine->newString(name); \ + RETURN_RESULT(scope.engine->newString(name)); \ } // 0 -> 7 as Qt::Sunday is 7, but Sunday is 0 in JS Date #define LOCALE_FORMATTED_DAYNAME(VARIABLE) \ -void QQmlLocaleData::method_ ## VARIABLE (const BuiltinFunction *, Scope &scope, CallData *callData) {\ +ReturnedValue QQmlLocaleData::method_ ## VARIABLE (const BuiltinFunction *b, CallData *callData) {\ + Scope scope(b); \ QLocale *locale = getThisLocale(scope, callData); \ if (!locale) \ - return; \ + return Encode::undefined(); \ if (callData->argc < 1 || callData->argc > 2) \ THROW_ERROR("Locale: " #VARIABLE "(): Invalid arguments"); \ QLocale::FormatType enumFormat = QLocale::LongFormat; \ @@ -629,7 +631,7 @@ void QQmlLocaleData::method_ ## VARIABLE (const BuiltinFunction *, Scope &scope, } else { \ name = locale-> VARIABLE(idx, enumFormat); \ } \ - scope.result = scope.engine->newString(name); \ + RETURN_RESULT(scope.engine->newString(name)); \ } LOCALE_FORMATTED_MONTHNAME(monthName) @@ -637,12 +639,14 @@ LOCALE_FORMATTED_MONTHNAME(standaloneMonthName) LOCALE_FORMATTED_DAYNAME(dayName) LOCALE_FORMATTED_DAYNAME(standaloneDayName) -#define LOCALE_STRING_PROPERTY(VARIABLE) void QQmlLocaleData::method_get_ ## VARIABLE (const BuiltinFunction *, Scope &scope, CallData *callData) \ +#define LOCALE_STRING_PROPERTY(VARIABLE) \ +ReturnedValue QQmlLocaleData::method_get_ ## VARIABLE (const BuiltinFunction *b, CallData *callData) \ { \ + Scope scope(b); \ QLocale *locale = getThisLocale(scope, callData); \ if (!locale) \ - return; \ - scope.result = scope.engine->newString(locale-> VARIABLE());\ + return Encode::undefined(); \ + RETURN_RESULT(scope.engine->newString(locale-> VARIABLE()));\ } LOCALE_STRING_PROPERTY(name) @@ -833,22 +837,18 @@ void QQmlLocale::registerStringLocaleCompare(QV4::ExecutionEngine *engine) engine->stringPrototype()->defineDefaultProperty(QStringLiteral("localeCompare"), method_localeCompare); } -void QQmlLocale::method_localeCompare(const BuiltinFunction *b, Scope &scope, CallData *callData) +ReturnedValue QQmlLocale::method_localeCompare(const BuiltinFunction *b, CallData *callData) { - if (callData->argc != 1 || (!callData->args[0].isString() && !callData->args[0].as<StringObject>())) { - QV4::StringPrototype::method_localeCompare(b, scope, callData); - return; - } + if (callData->argc != 1 || (!callData->args[0].isString() && !callData->args[0].as<StringObject>())) + return QV4::StringPrototype::method_localeCompare(b, callData); - if (!callData->thisObject.isString() && !callData->thisObject.as<StringObject>()) { - QV4::StringPrototype::method_localeCompare(b, scope, callData); - return; - } + if (!callData->thisObject.isString() && !callData->thisObject.as<StringObject>()) + return QV4::StringPrototype::method_localeCompare(b, callData); QString thisString = callData->thisObject.toQStringNoThrow(); QString thatString = callData->args[0].toQStringNoThrow(); - scope.result = QV4::Encode(QString::localeAwareCompare(thisString, thatString)); + return QV4::Encode(QString::localeAwareCompare(thisString, thatString)); } /*! diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h index 1a2ffc72b0..a81fe07b8e 100644 --- a/src/qml/qml/qqmllocale_p.h +++ b/src/qml/qml/qqmllocale_p.h @@ -67,13 +67,13 @@ public: static void registerExtension(QV4::ExecutionEngine *engine); private: - static void method_toLocaleString(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_toLocaleTimeString(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_toLocaleDateString(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_fromLocaleString(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_fromLocaleTimeString(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_fromLocaleDateString(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_timeZoneUpdated(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); + static QV4::ReturnedValue method_toLocaleString(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_toLocaleTimeString(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_toLocaleDateString(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_fromLocaleString(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_fromLocaleTimeString(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_fromLocaleDateString(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_timeZoneUpdated(const QV4::BuiltinFunction *, QV4::CallData *callData); }; @@ -83,9 +83,9 @@ public: static void registerExtension(QV4::ExecutionEngine *engine); private: - static void method_toLocaleString(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_fromLocaleString(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_toLocaleCurrencyString(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); + static QV4::ReturnedValue method_toLocaleString(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_fromLocaleString(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_toLocaleCurrencyString(const QV4::BuiltinFunction *, QV4::CallData *callData); }; @@ -135,7 +135,7 @@ public: private: QQmlLocale(); - static void method_localeCompare(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); + static QV4::ReturnedValue method_localeCompare(const QV4::BuiltinFunction *, QV4::CallData *callData); }; namespace QV4 { @@ -168,33 +168,33 @@ struct QQmlLocaleData : public QV4::Object return thisObject->d()->locale; } - static void method_currencySymbol(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_dateTimeFormat(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_timeFormat(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_dateFormat(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_monthName(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_standaloneMonthName(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_dayName(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_standaloneDayName(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - - static void method_get_firstDayOfWeek(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_measurementSystem(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_textDirection(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_weekDays(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_uiLanguages(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - - static void method_get_name(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_nativeLanguageName(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_nativeCountryName(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_decimalPoint(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_groupSeparator(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_percent(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_zeroDigit(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_negativeSign(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_positiveSign(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_exponential(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_amText(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_pmText(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); + static QV4::ReturnedValue method_currencySymbol(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_dateTimeFormat(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_timeFormat(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_dateFormat(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_monthName(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_standaloneMonthName(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_dayName(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_standaloneDayName(const QV4::BuiltinFunction *, QV4::CallData *callData); + + static QV4::ReturnedValue method_get_firstDayOfWeek(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_get_measurementSystem(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_get_textDirection(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_get_weekDays(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_get_uiLanguages(const QV4::BuiltinFunction *, QV4::CallData *callData); + + static QV4::ReturnedValue method_get_name(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_get_nativeLanguageName(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_get_nativeCountryName(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_get_decimalPoint(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_get_groupSeparator(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_get_percent(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_get_zeroDigit(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_get_negativeSign(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_get_positiveSign(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_get_exponential(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_get_amText(const QV4::BuiltinFunction *, QV4::CallData *callData); + static QV4::ReturnedValue method_get_pmText(const QV4::BuiltinFunction *, QV4::CallData *callData); }; } diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp index bca7391ffc..532c4b1454 100644 --- a/src/qml/qml/qqmlvaluetypewrapper.cpp +++ b/src/qml/qml/qqmlvaluetypewrapper.cpp @@ -316,8 +316,9 @@ bool QQmlValueTypeWrapper::write(QObject *target, int propertyIndex) const return true; } -void QQmlValueTypeWrapper::method_toString(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QQmlValueTypeWrapper::method_toString(const BuiltinFunction *b, CallData *callData) { + Scope scope(b); Object *o = callData->thisObject.as<Object>(); if (!o) THROW_TYPE_ERROR(); @@ -350,7 +351,7 @@ void QQmlValueTypeWrapper::method_toString(const BuiltinFunction *, Scope &scope } result += QLatin1Char(')'); } - scope.result = scope.engine->newString(result); + return Encode(scope.engine->newString(result)); } ReturnedValue QQmlValueTypeWrapper::get(const Managed *m, String *name, bool *hasProperty) diff --git a/src/qml/qml/qqmlvaluetypewrapper_p.h b/src/qml/qml/qqmlvaluetypewrapper_p.h index 630b405c84..da03af6dbc 100644 --- a/src/qml/qml/qqmlvaluetypewrapper_p.h +++ b/src/qml/qml/qqmlvaluetypewrapper_p.h @@ -112,7 +112,7 @@ public: static PropertyAttributes query(const Managed *, String *name); static void advanceIterator(Managed *m, ObjectIterator *it, Value *name, uint *index, Property *p, PropertyAttributes *attributes); - static void method_toString(const BuiltinFunction *, Scope &scope, CallData *callData); + static ReturnedValue method_toString(const BuiltinFunction *, CallData *callData); static void initProto(ExecutionEngine *v4); }; diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp index 59db5bd9ac..526522cb10 100644 --- a/src/qml/qml/qqmlxmlhttprequest.cpp +++ b/src/qml/qml/qqmlxmlhttprequest.cpp @@ -74,8 +74,7 @@ using namespace QV4; #define V4THROW_REFERENCE(string) \ do { \ ScopedObject error(scope, scope.engine->newReferenceErrorObject(QStringLiteral(string))); \ - scope.result = scope.engine->throwError(error); \ - return; \ + return scope.engine->throwError(error); \ } while (false) QT_BEGIN_NAMESPACE @@ -276,25 +275,25 @@ public: static void initClass(ExecutionEngine *engine); // JS API - static void method_get_nodeName(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_nodeValue(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_nodeType(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_namespaceUri(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - - static void method_get_parentNode(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_childNodes(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_firstChild(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_lastChild(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_previousSibling(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_nextSibling(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_attributes(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - - //static void ownerDocument(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - //static void namespaceURI(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - //static void prefix(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - //static void localName(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - //static void baseURI(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - //static void textContent(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); + static ReturnedValue method_get_nodeName(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_get_nodeValue(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_get_nodeType(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_get_namespaceUri(const BuiltinFunction *b, QV4::CallData *callData); + + static ReturnedValue method_get_parentNode(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_get_childNodes(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_get_firstChild(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_get_lastChild(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_get_previousSibling(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_get_nextSibling(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_get_attributes(const BuiltinFunction *b, QV4::CallData *callData); + + //static ReturnedValue ownerDocument(const BuiltinFunction *b, QV4::CallData *callData); + //static ReturnedValue namespaceURI(const BuiltinFunction *b, QV4::CallData *callData); + //static ReturnedValue prefix(const BuiltinFunction *b, QV4::CallData *callData); + //static ReturnedValue localName(const BuiltinFunction *b, QV4::CallData *callData); + //static ReturnedValue baseURI(const BuiltinFunction *b, QV4::CallData *callData); + //static ReturnedValue textContent(const BuiltinFunction *b, QV4::CallData *callData); static ReturnedValue getProto(ExecutionEngine *v4); @@ -355,10 +354,10 @@ class Attr : public Node { public: // JS API - static void method_name(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); + static ReturnedValue method_name(const BuiltinFunction *b, QV4::CallData *callData); // static void specified(CallContext *); - static void method_value(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_ownerElement(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); + static ReturnedValue method_value(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_ownerElement(const BuiltinFunction *b, QV4::CallData *callData); // static void schemaTypeInfo(CallContext *); // static void isId(CallContext *c); @@ -370,7 +369,7 @@ class CharacterData : public Node { public: // JS API - static void method_length(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); + static ReturnedValue method_length(const BuiltinFunction *b, QV4::CallData *callData); // C++ API static ReturnedValue prototype(ExecutionEngine *v4); @@ -380,8 +379,8 @@ class Text : public CharacterData { public: // JS API - static void method_isElementContentWhitespace(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_wholeText(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); + static ReturnedValue method_isElementContentWhitespace(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_wholeText(const BuiltinFunction *b, QV4::CallData *callData); // C++ API static ReturnedValue prototype(ExecutionEngine *); @@ -398,10 +397,10 @@ class Document : public Node { public: // JS API - static void method_xmlVersion(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_xmlEncoding(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_xmlStandalone(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_documentElement(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); + static ReturnedValue method_xmlVersion(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_xmlEncoding(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_xmlStandalone(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_documentElement(const BuiltinFunction *b, QV4::CallData *callData); // C++ API static ReturnedValue prototype(ExecutionEngine *); @@ -420,8 +419,9 @@ void NodeImpl::release() document->release(); } -void NodePrototype::method_get_nodeName(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue NodePrototype::method_get_nodeName(const BuiltinFunction *b, QV4::CallData *callData) { + Scope scope(b); Scoped<Node> r(scope, callData->thisObject.as<Node>()); if (!r) THROW_TYPE_ERROR(); @@ -441,11 +441,12 @@ void NodePrototype::method_get_nodeName(const QV4::BuiltinFunction *, QV4::Scope name = r->d()->d->name; break; } - scope.result = Encode(scope.engine->newString(name)); + return Encode(scope.engine->newString(name)); } -void NodePrototype::method_get_nodeValue(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue NodePrototype::method_get_nodeValue(const BuiltinFunction *b, QV4::CallData *callData) { + QV4::Scope scope(b); Scoped<Node> r(scope, callData->thisObject.as<Node>()); if (!r) THROW_TYPE_ERROR(); @@ -459,74 +460,81 @@ void NodePrototype::method_get_nodeValue(const QV4::BuiltinFunction *, QV4::Scop r->d()->d->type == NodeImpl::Notation) RETURN_RESULT(Encode::null()); - scope.result = Encode(scope.engine->newString(r->d()->d->data)); + return Encode(scope.engine->newString(r->d()->d->data)); } -void NodePrototype::method_get_nodeType(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue NodePrototype::method_get_nodeType(const BuiltinFunction *b, QV4::CallData *callData) { + QV4::Scope scope(b); Scoped<Node> r(scope, callData->thisObject.as<Node>()); if (!r) THROW_TYPE_ERROR(); - scope.result = Encode(r->d()->d->type); + return Encode(r->d()->d->type); } -void NodePrototype::method_get_namespaceUri(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue NodePrototype::method_get_namespaceUri(const BuiltinFunction *b, QV4::CallData *callData) { + QV4::Scope scope(b); Scoped<Node> r(scope, callData->thisObject.as<Node>()); if (!r) THROW_TYPE_ERROR(); - scope.result = Encode(scope.engine->newString(r->d()->d->namespaceUri)); + return Encode(scope.engine->newString(r->d()->d->namespaceUri)); } -void NodePrototype::method_get_parentNode(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue NodePrototype::method_get_parentNode(const BuiltinFunction *b, QV4::CallData *callData) { + QV4::Scope scope(b); Scoped<Node> r(scope, callData->thisObject.as<Node>()); if (!r) THROW_TYPE_ERROR(); if (r->d()->d->parent) - scope.result = Node::create(scope.engine, r->d()->d->parent); + return Node::create(scope.engine, r->d()->d->parent); else - scope.result = Encode::null(); + return Encode::null(); } -void NodePrototype::method_get_childNodes(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue NodePrototype::method_get_childNodes(const BuiltinFunction *b, QV4::CallData *callData) { + QV4::Scope scope(b); Scoped<Node> r(scope, callData->thisObject.as<Node>()); if (!r) THROW_TYPE_ERROR(); - scope.result = NodeList::create(scope.engine, r->d()->d); + return NodeList::create(scope.engine, r->d()->d); } -void NodePrototype::method_get_firstChild(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue NodePrototype::method_get_firstChild(const BuiltinFunction *b, QV4::CallData *callData) { + QV4::Scope scope(b); Scoped<Node> r(scope, callData->thisObject.as<Node>()); if (!r) THROW_TYPE_ERROR(); if (r->d()->d->children.isEmpty()) - scope.result = Encode::null(); + return Encode::null(); else - scope.result = Node::create(scope.engine, r->d()->d->children.constFirst()); + return Node::create(scope.engine, r->d()->d->children.constFirst()); } -void NodePrototype::method_get_lastChild(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue NodePrototype::method_get_lastChild(const BuiltinFunction *b, QV4::CallData *callData) { + QV4::Scope scope(b); Scoped<Node> r(scope, callData->thisObject.as<Node>()); if (!r) THROW_TYPE_ERROR(); if (r->d()->d->children.isEmpty()) - scope.result = Encode::null(); + return Encode::null(); else - scope.result = Node::create(scope.engine, r->d()->d->children.constLast()); + return Node::create(scope.engine, r->d()->d->children.constLast()); } -void NodePrototype::method_get_previousSibling(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue NodePrototype::method_get_previousSibling(const BuiltinFunction *b, QV4::CallData *callData) { + QV4::Scope scope(b); Scoped<Node> r(scope, callData->thisObject.as<Node>()); if (!r) THROW_TYPE_ERROR(); @@ -537,18 +545,18 @@ void NodePrototype::method_get_previousSibling(const QV4::BuiltinFunction *, QV4 for (int ii = 0; ii < r->d()->d->parent->children.count(); ++ii) { if (r->d()->d->parent->children.at(ii) == r->d()->d) { if (ii == 0) - scope.result = Encode::null(); + return Encode::null(); else - scope.result = Node::create(scope.engine, r->d()->d->parent->children.at(ii - 1)); - return; + return Node::create(scope.engine, r->d()->d->parent->children.at(ii - 1)); } } - scope.result = Encode::null(); + return Encode::null(); } -void NodePrototype::method_get_nextSibling(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue NodePrototype::method_get_nextSibling(const BuiltinFunction *b, QV4::CallData *callData) { + QV4::Scope scope(b); Scoped<Node> r(scope, callData->thisObject.as<Node>()); if (!r) THROW_TYPE_ERROR(); @@ -559,26 +567,26 @@ void NodePrototype::method_get_nextSibling(const QV4::BuiltinFunction *, QV4::Sc for (int ii = 0; ii < r->d()->d->parent->children.count(); ++ii) { if (r->d()->d->parent->children.at(ii) == r->d()->d) { if ((ii + 1) == r->d()->d->parent->children.count()) - scope.result = Encode::null(); + return Encode::null(); else - scope.result = Node::create(scope.engine, r->d()->d->parent->children.at(ii + 1)); - return; + return Node::create(scope.engine, r->d()->d->parent->children.at(ii + 1)); } } - scope.result = Encode::null(); + return Encode::null(); } -void NodePrototype::method_get_attributes(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue NodePrototype::method_get_attributes(const BuiltinFunction *b, QV4::CallData *callData) { + QV4::Scope scope(b); Scoped<Node> r(scope, callData->thisObject.as<Node>()); if (!r) THROW_TYPE_ERROR(); if (r->d()->d->type != NodeImpl::Element) - scope.result = Encode::null(); + return Encode::null(); else - scope.result = NamedNodeMap::create(scope.engine, r->d()->d, r->d()->d->attributes); + return NamedNodeMap::create(scope.engine, r->d()->d, r->d()->d->attributes); } ReturnedValue NodePrototype::getProto(ExecutionEngine *v4) @@ -659,40 +667,44 @@ ReturnedValue Attr::prototype(ExecutionEngine *engine) return d->attrPrototype.value(); } -void Attr::method_name(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue Attr::method_name(const BuiltinFunction *b, QV4::CallData *callData) { + QV4::Scope scope(b); Scoped<Node> r(scope, callData->thisObject.as<Node>()); if (!r) RETURN_UNDEFINED(); - scope.result = scope.engine->newString(r->d()->d->name); + return Encode(scope.engine->newString(r->d()->d->name)); } -void Attr::method_value(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue Attr::method_value(const BuiltinFunction *b, QV4::CallData *callData) { + QV4::Scope scope(b); Scoped<Node> r(scope, callData->thisObject.as<Node>()); if (!r) RETURN_UNDEFINED(); - scope.result = scope.engine->newString(r->d()->d->data); + return Encode(scope.engine->newString(r->d()->d->data)); } -void Attr::method_ownerElement(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue Attr::method_ownerElement(const BuiltinFunction *b, QV4::CallData *callData) { + QV4::Scope scope(b); Scoped<Node> r(scope, callData->thisObject.as<Node>()); if (!r) RETURN_UNDEFINED(); - scope.result = Node::create(scope.engine, r->d()->d->parent); + return Node::create(scope.engine, r->d()->d->parent); } -void CharacterData::method_length(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue CharacterData::method_length(const BuiltinFunction *b, QV4::CallData *callData) { + QV4::Scope scope(b); Scoped<Node> r(scope, callData->thisObject.as<Node>()); if (!r) RETURN_UNDEFINED(); - scope.result = Encode(r->d()->d->data.length()); + return Encode(r->d()->d->data.length()); } ReturnedValue CharacterData::prototype(ExecutionEngine *v4) @@ -711,22 +723,24 @@ ReturnedValue CharacterData::prototype(ExecutionEngine *v4) return d->characterDataPrototype.value(); } -void Text::method_isElementContentWhitespace(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue Text::method_isElementContentWhitespace(const BuiltinFunction *b, QV4::CallData *callData) { + QV4::Scope scope(b); Scoped<Node> r(scope, callData->thisObject.as<Node>()); if (!r) RETURN_UNDEFINED(); - scope.result = Encode(QStringRef(&r->d()->d->data).trimmed().isEmpty()); + return Encode(QStringRef(&r->d()->d->data).trimmed().isEmpty()); } -void Text::method_wholeText(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue Text::method_wholeText(const BuiltinFunction *b, QV4::CallData *callData) { + QV4::Scope scope(b); Scoped<Node> r(scope, callData->thisObject.as<Node>()); if (!r) RETURN_UNDEFINED(); - scope.result = scope.engine->newString(r->d()->d->data); + return Encode(scope.engine->newString(r->d()->d->data)); } ReturnedValue Text::prototype(ExecutionEngine *v4) @@ -952,40 +966,44 @@ ReturnedValue NodeList::create(ExecutionEngine *v4, NodeImpl *data) return (v4->memoryManager->allocObject<NodeList>(data))->asReturnedValue(); } -void Document::method_documentElement(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue Document::method_documentElement(const BuiltinFunction *b, QV4::CallData *callData) { + Scope scope(b); Scoped<Node> r(scope, callData->thisObject.as<Node>()); if (!r || r->d()->d->type != NodeImpl::Document) RETURN_UNDEFINED(); - scope.result = Node::create(scope.engine, static_cast<DocumentImpl *>(r->d()->d)->root); + return Node::create(scope.engine, static_cast<DocumentImpl *>(r->d()->d)->root); } -void Document::method_xmlStandalone(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue Document::method_xmlStandalone(const BuiltinFunction *b, QV4::CallData *callData) { + Scope scope(b); Scoped<Node> r(scope, callData->thisObject.as<Node>()); if (!r || r->d()->d->type != NodeImpl::Document) RETURN_UNDEFINED(); - scope.result = Encode(static_cast<DocumentImpl *>(r->d()->d)->isStandalone); + return Encode(static_cast<DocumentImpl *>(r->d()->d)->isStandalone); } -void Document::method_xmlVersion(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue Document::method_xmlVersion(const BuiltinFunction *b, QV4::CallData *callData) { + Scope scope(b); Scoped<Node> r(scope, callData->thisObject.as<Node>()); if (!r || r->d()->d->type != NodeImpl::Document) RETURN_UNDEFINED(); - scope.result = scope.engine->newString(static_cast<DocumentImpl *>(r->d()->d)->version); + return Encode(scope.engine->newString(static_cast<DocumentImpl *>(r->d()->d)->version)); } -void Document::method_xmlEncoding(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue Document::method_xmlEncoding(const BuiltinFunction *b, QV4::CallData *callData) { + Scope scope(b); Scoped<Node> r(scope, callData->thisObject.as<Node>()); if (!r || r->d()->d->type != NodeImpl::Document) RETURN_UNDEFINED(); - scope.result = scope.engine->newString(static_cast<DocumentImpl *>(r->d()->d)->encoding); + return Encode(scope.engine->newString(static_cast<DocumentImpl *>(r->d()->d)->encoding)); } class QQmlXMLHttpRequest : public QObject @@ -1637,21 +1655,21 @@ struct QQmlXMLHttpRequestCtor : public FunctionObject void setupProto(); - static void method_open(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_setRequestHeader(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_send(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_abort(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_getResponseHeader(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_getAllResponseHeaders(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - - static void method_get_readyState(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_status(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_statusText(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_responseText(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_responseXML(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_response(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_get_responseType(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); - static void method_set_responseType(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); + static ReturnedValue method_open(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_setRequestHeader(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_send(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_abort(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_getResponseHeader(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_getAllResponseHeaders(const BuiltinFunction *b, QV4::CallData *callData); + + static ReturnedValue method_get_readyState(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_get_status(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_get_statusText(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_get_responseText(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_get_responseXML(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_get_response(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_get_responseType(const BuiltinFunction *b, QV4::CallData *callData); + static ReturnedValue method_set_responseType(const BuiltinFunction *b, QV4::CallData *callData); }; } @@ -1713,8 +1731,9 @@ void QQmlXMLHttpRequestCtor::setupProto() // XMLHttpRequest methods -void QQmlXMLHttpRequestCtor::method_open(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue QQmlXMLHttpRequestCtor::method_open(const BuiltinFunction *b, QV4::CallData *callData) { + Scope scope(b); Scoped<QQmlXMLHttpRequestWrapper> w(scope, callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); if (!w) V4THROW_REFERENCE("Not an XMLHttpRequest object"); @@ -1761,11 +1780,12 @@ void QQmlXMLHttpRequestCtor::method_open(const QV4::BuiltinFunction *, QV4::Scop if (!username.isNull()) url.setUserName(username); if (!password.isNull()) url.setPassword(password); - scope.result = r->open(w, scope.engine->callingQmlContext(), method, url, async ? QQmlXMLHttpRequest::AsynchronousLoad : QQmlXMLHttpRequest::SynchronousLoad); + return r->open(w, scope.engine->callingQmlContext(), method, url, async ? QQmlXMLHttpRequest::AsynchronousLoad : QQmlXMLHttpRequest::SynchronousLoad); } -void QQmlXMLHttpRequestCtor::method_setRequestHeader(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue QQmlXMLHttpRequestCtor::method_setRequestHeader(const BuiltinFunction *b, QV4::CallData *callData) { + Scope scope(b); Scoped<QQmlXMLHttpRequestWrapper> w(scope, callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); if (!w) V4THROW_REFERENCE("Not an XMLHttpRequest object"); @@ -1810,8 +1830,9 @@ void QQmlXMLHttpRequestCtor::method_setRequestHeader(const QV4::BuiltinFunction RETURN_UNDEFINED(); } -void QQmlXMLHttpRequestCtor::method_send(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue QQmlXMLHttpRequestCtor::method_send(const BuiltinFunction *b, QV4::CallData *callData) { + Scope scope(b); Scoped<QQmlXMLHttpRequestWrapper> w(scope, callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); if (!w) V4THROW_REFERENCE("Not an XMLHttpRequest object"); @@ -1825,21 +1846,23 @@ void QQmlXMLHttpRequestCtor::method_send(const QV4::BuiltinFunction *, QV4::Scop if (callData->argc > 0) data = callData->args[0].toQStringNoThrow().toUtf8(); - scope.result = r->send(w, scope.engine->callingQmlContext(), data); + return r->send(w, scope.engine->callingQmlContext(), data); } -void QQmlXMLHttpRequestCtor::method_abort(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue QQmlXMLHttpRequestCtor::method_abort(const BuiltinFunction *b, QV4::CallData *callData) { + Scope scope(b); Scoped<QQmlXMLHttpRequestWrapper> w(scope, callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); if (!w) V4THROW_REFERENCE("Not an XMLHttpRequest object"); QQmlXMLHttpRequest *r = w->d()->request; - scope.result = r->abort(w, scope.engine->callingQmlContext()); + return r->abort(w, scope.engine->callingQmlContext()); } -void QQmlXMLHttpRequestCtor::method_getResponseHeader(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue QQmlXMLHttpRequestCtor::method_getResponseHeader(const BuiltinFunction *b, QV4::CallData *callData) { + Scope scope(b); Scoped<QQmlXMLHttpRequestWrapper> w(scope, callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); if (!w) V4THROW_REFERENCE("Not an XMLHttpRequest object"); @@ -1853,11 +1876,12 @@ void QQmlXMLHttpRequestCtor::method_getResponseHeader(const QV4::BuiltinFunction r->readyState() != QQmlXMLHttpRequest::HeadersReceived) THROW_DOM(DOMEXCEPTION_INVALID_STATE_ERR, "Invalid state"); - scope.result = scope.engine->newString(r->header(callData->args[0].toQStringNoThrow())); + return Encode(scope.engine->newString(r->header(callData->args[0].toQStringNoThrow()))); } -void QQmlXMLHttpRequestCtor::method_getAllResponseHeaders(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue QQmlXMLHttpRequestCtor::method_getAllResponseHeaders(const BuiltinFunction *b, QV4::CallData *callData) { + Scope scope(b); Scoped<QQmlXMLHttpRequestWrapper> w(scope, callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); if (!w) V4THROW_REFERENCE("Not an XMLHttpRequest object"); @@ -1871,22 +1895,24 @@ void QQmlXMLHttpRequestCtor::method_getAllResponseHeaders(const QV4::BuiltinFunc r->readyState() != QQmlXMLHttpRequest::HeadersReceived) THROW_DOM(DOMEXCEPTION_INVALID_STATE_ERR, "Invalid state"); - scope.result = scope.engine->newString(r->headers()); + return Encode(scope.engine->newString(r->headers())); } // XMLHttpRequest properties -void QQmlXMLHttpRequestCtor::method_get_readyState(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue QQmlXMLHttpRequestCtor::method_get_readyState(const BuiltinFunction *b, QV4::CallData *callData) { + Scope scope(b); Scoped<QQmlXMLHttpRequestWrapper> w(scope, callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); if (!w) V4THROW_REFERENCE("Not an XMLHttpRequest object"); QQmlXMLHttpRequest *r = w->d()->request; - scope.result = Encode(r->readyState()); + return Encode(r->readyState()); } -void QQmlXMLHttpRequestCtor::method_get_status(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue QQmlXMLHttpRequestCtor::method_get_status(const BuiltinFunction *b, QV4::CallData *callData) { + Scope scope(b); Scoped<QQmlXMLHttpRequestWrapper> w(scope, callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); if (!w) V4THROW_REFERENCE("Not an XMLHttpRequest object"); @@ -1897,13 +1923,14 @@ void QQmlXMLHttpRequestCtor::method_get_status(const QV4::BuiltinFunction *, QV4 THROW_DOM(DOMEXCEPTION_INVALID_STATE_ERR, "Invalid state"); if (r->errorFlag()) - scope.result = Encode(0); + return Encode(0); else - scope.result = Encode(r->replyStatus()); + return Encode(r->replyStatus()); } -void QQmlXMLHttpRequestCtor::method_get_statusText(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue QQmlXMLHttpRequestCtor::method_get_statusText(const BuiltinFunction *b, QV4::CallData *callData) { + Scope scope(b); Scoped<QQmlXMLHttpRequestWrapper> w(scope, callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); if (!w) V4THROW_REFERENCE("Not an XMLHttpRequest object"); @@ -1914,13 +1941,14 @@ void QQmlXMLHttpRequestCtor::method_get_statusText(const QV4::BuiltinFunction *, THROW_DOM(DOMEXCEPTION_INVALID_STATE_ERR, "Invalid state"); if (r->errorFlag()) - scope.result = scope.engine->newString(QString()); + return Encode(scope.engine->newString(QString())); else - scope.result = scope.engine->newString(r->replyStatusText()); + return Encode(scope.engine->newString(r->replyStatusText())); } -void QQmlXMLHttpRequestCtor::method_get_responseText(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue QQmlXMLHttpRequestCtor::method_get_responseText(const BuiltinFunction *b, QV4::CallData *callData) { + Scope scope(b); Scoped<QQmlXMLHttpRequestWrapper> w(scope, callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); if (!w) V4THROW_REFERENCE("Not an XMLHttpRequest object"); @@ -1928,13 +1956,14 @@ void QQmlXMLHttpRequestCtor::method_get_responseText(const QV4::BuiltinFunction if (r->readyState() != QQmlXMLHttpRequest::Loading && r->readyState() != QQmlXMLHttpRequest::Done) - scope.result = scope.engine->newString(QString()); + return Encode(scope.engine->newString(QString())); else - scope.result = scope.engine->newString(r->responseBody()); + return Encode(scope.engine->newString(r->responseBody())); } -void QQmlXMLHttpRequestCtor::method_get_responseXML(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue QQmlXMLHttpRequestCtor::method_get_responseXML(const BuiltinFunction *b, QV4::CallData *callData) { + Scope scope(b); Scoped<QQmlXMLHttpRequestWrapper> w(scope, callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); if (!w) V4THROW_REFERENCE("Not an XMLHttpRequest object"); @@ -1943,16 +1972,17 @@ void QQmlXMLHttpRequestCtor::method_get_responseXML(const QV4::BuiltinFunction * if (!r->receivedXml() || (r->readyState() != QQmlXMLHttpRequest::Loading && r->readyState() != QQmlXMLHttpRequest::Done)) { - scope.result = Encode::null(); + return Encode::null(); } else { if (r->responseType().isEmpty()) r->setResponseType(QLatin1String("document")); - scope.result = r->xmlResponseBody(scope.engine); + return r->xmlResponseBody(scope.engine); } } -void QQmlXMLHttpRequestCtor::method_get_response(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue QQmlXMLHttpRequestCtor::method_get_response(const BuiltinFunction *b, QV4::CallData *callData) { + Scope scope(b); Scoped<QQmlXMLHttpRequestWrapper> w(scope, callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); if (!w) V4THROW_REFERENCE("Not an XMLHttpRequest object"); @@ -1977,17 +2007,19 @@ void QQmlXMLHttpRequestCtor::method_get_response(const QV4::BuiltinFunction *, Q } -void QQmlXMLHttpRequestCtor::method_get_responseType(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue QQmlXMLHttpRequestCtor::method_get_responseType(const BuiltinFunction *b, QV4::CallData *callData) { + Scope scope(b); Scoped<QQmlXMLHttpRequestWrapper> w(scope, callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); if (!w) V4THROW_REFERENCE("Not an XMLHttpRequest object"); QQmlXMLHttpRequest *r = w->d()->request; - scope.result = scope.engine->newString(r->responseType()); + return Encode(scope.engine->newString(r->responseType())); } -void QQmlXMLHttpRequestCtor::method_set_responseType(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) +ReturnedValue QQmlXMLHttpRequestCtor::method_set_responseType(const BuiltinFunction *b, QV4::CallData *callData) { + Scope scope(b); Scoped<QQmlXMLHttpRequestWrapper> w(scope, callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); if (!w) V4THROW_REFERENCE("Not an XMLHttpRequest object"); @@ -1999,7 +2031,7 @@ void QQmlXMLHttpRequestCtor::method_set_responseType(const QV4::BuiltinFunction // Argument 0 - response type r->setResponseType(callData->args[0].toQStringNoThrow()); - scope.result = Encode::undefined(); + return Encode::undefined(); } void qt_rem_qmlxmlhttprequest(ExecutionEngine * /* engine */, void *d) diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index 459d9afe2a..ebf8918d31 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -87,8 +87,7 @@ DEFINE_OBJECT_VTABLE(QtObject); #define THROW_TYPE_ERROR_WITH_MESSAGE(msg) \ do { \ - scope.result = scope.engine->throwTypeError(QString::fromUtf8(msg)); \ - return; \ + return scope.engine->throwTypeError(QString::fromUtf8(msg)); \ } while (false) struct StaticQtMetaObject : public QObject @@ -229,12 +228,12 @@ void QtObject::advanceIterator(Managed *m, ObjectIterator *it, Value *name, uint \qmlmethod bool Qt::isQtObject(object) Returns true if \c object is a valid reference to a Qt or QML object, otherwise false. */ -void QtObject::method_isQtObject(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_isQtObject(const BuiltinFunction *, CallData *callData) { if (callData->argc == 0) RETURN_RESULT(QV4::Encode(false)); - scope.result = QV4::Encode(callData->args[0].as<QV4::QObjectWrapper>() != 0); + return QV4::Encode(callData->args[0].as<QV4::QObjectWrapper>() != 0); } /*! @@ -243,8 +242,9 @@ void QtObject::method_isQtObject(const BuiltinFunction *, Scope &scope, CallData Returns a color with the specified \c red, \c green, \c blue and \c alpha components. All components should be in the range 0-1 inclusive. */ -void QtObject::method_rgba(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_rgba(const BuiltinFunction *builtin, CallData *callData) { + QV4::Scope scope(builtin); int argCount = callData->argc; if (argCount < 3 || argCount > 4) THROW_GENERIC_ERROR("Qt.rgba(): Invalid arguments"); @@ -263,7 +263,7 @@ void QtObject::method_rgba(const BuiltinFunction *, Scope &scope, CallData *call if (a < 0.0) a=0.0; if (a > 1.0) a=1.0; - scope.result = scope.engine->fromVariant(QQml_colorProvider()->fromRgbF(r, g, b, a)); + return scope.engine->fromVariant(QQml_colorProvider()->fromRgbF(r, g, b, a)); } /*! @@ -272,8 +272,9 @@ void QtObject::method_rgba(const BuiltinFunction *, Scope &scope, CallData *call Returns a color with the specified \c hue, \c saturation, \c lightness and \c alpha components. All components should be in the range 0-1 inclusive. */ -void QtObject::method_hsla(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_hsla(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); int argCount = callData->argc; if (argCount < 3 || argCount > 4) THROW_GENERIC_ERROR("Qt.hsla(): Invalid arguments"); @@ -292,7 +293,7 @@ void QtObject::method_hsla(const BuiltinFunction *, Scope &scope, CallData *call if (a < 0.0) a=0.0; if (a > 1.0) a=1.0; - scope.result = scope.engine->fromVariant(QQml_colorProvider()->fromHslF(h, s, l, a)); + return scope.engine->fromVariant(QQml_colorProvider()->fromHslF(h, s, l, a)); } /*! @@ -303,8 +304,9 @@ All components should be in the range 0-1 inclusive. \since 5.5 */ -void QtObject::method_hsva(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_hsva(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); int argCount = callData->argc; if (argCount < 3 || argCount > 4) THROW_GENERIC_ERROR("Qt.hsva(): Invalid arguments"); @@ -319,7 +321,7 @@ void QtObject::method_hsva(const BuiltinFunction *, Scope &scope, CallData *call v = qBound(0.0, v, 1.0); a = qBound(0.0, a, 1.0); - scope.result = scope.engine->fromVariant(QQml_colorProvider()->fromHsvF(h, s, v, a)); + return scope.engine->fromVariant(QQml_colorProvider()->fromHsvF(h, s, v, a)); } /*! @@ -330,8 +332,9 @@ may be either color values or string values. If a string value is supplied it must be convertible to a color, as described for the \l{colorbasictypedocs}{color} basic type. */ -void QtObject::method_colorEqual(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_colorEqual(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 2) THROW_GENERIC_ERROR("Qt.colorEqual(): Invalid arguments"); @@ -358,7 +361,7 @@ void QtObject::method_colorEqual(const BuiltinFunction *, Scope &scope, CallData } bool equal = (lhs == rhs); - scope.result = QV4::Encode(equal); + return QV4::Encode(equal); } /*! @@ -368,8 +371,9 @@ Returns a \c rect with the top-left corner at \c x, \c y and the specified \c wi The returned object has \c x, \c y, \c width and \c height attributes with the given values. */ -void QtObject::method_rect(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_rect(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 4) THROW_GENERIC_ERROR("Qt.rect(): Invalid arguments"); @@ -378,37 +382,39 @@ void QtObject::method_rect(const BuiltinFunction *, Scope &scope, CallData *call double w = callData->args[2].toNumber(); double h = callData->args[3].toNumber(); - scope.result = scope.engine->fromVariant(QVariant::fromValue(QRectF(x, y, w, h))); + return scope.engine->fromVariant(QVariant::fromValue(QRectF(x, y, w, h))); } /*! \qmlmethod point Qt::point(int x, int y) Returns a Point with the specified \c x and \c y coordinates. */ -void QtObject::method_point(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_point(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 2) THROW_GENERIC_ERROR("Qt.point(): Invalid arguments"); double x = callData->args[0].toNumber(); double y = callData->args[1].toNumber(); - scope.result = scope.engine->fromVariant(QVariant::fromValue(QPointF(x, y))); + return scope.engine->fromVariant(QVariant::fromValue(QPointF(x, y))); } /*! \qmlmethod Qt::size(int width, int height) Returns a Size with the specified \c width and \c height. */ -void QtObject::method_size(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_size(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 2) THROW_GENERIC_ERROR("Qt.size(): Invalid arguments"); double w = callData->args[0].toNumber(); double h = callData->args[1].toNumber(); - scope.result = scope.engine->fromVariant(QVariant::fromValue(QSizeF(w, h))); + return scope.engine->fromVariant(QVariant::fromValue(QSizeF(w, h))); } /*! @@ -419,8 +425,9 @@ key-value pairs where valid keys are the \l{fontbasictypedocs}{font} type's subproperty names, and the values are valid values for each subproperty. Invalid keys will be ignored. */ -void QtObject::method_font(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_font(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 1 || !callData->args[0].isObject()) THROW_GENERIC_ERROR("Qt.font(): Invalid arguments"); @@ -429,7 +436,7 @@ void QtObject::method_font(const BuiltinFunction *, Scope &scope, CallData *call QVariant v = QQml_valueTypeProvider()->createVariantFromJsObject(QMetaType::QFont, QQmlV4Handle(callData->args[0]), v4, &ok); if (!ok) THROW_GENERIC_ERROR("Qt.font(): Invalid argument: no valid font subproperties specified"); - scope.result = scope.engine->fromVariant(v); + return scope.engine->fromVariant(v); } @@ -438,8 +445,9 @@ void QtObject::method_font(const BuiltinFunction *, Scope &scope, CallData *call \qmlmethod Qt::vector2d(real x, real y) Returns a Vector2D with the specified \c x and \c y. */ -void QtObject::method_vector2d(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_vector2d(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 2) THROW_GENERIC_ERROR("Qt.vector2d(): Invalid arguments"); @@ -448,15 +456,16 @@ void QtObject::method_vector2d(const BuiltinFunction *, Scope &scope, CallData * xy[1] = callData->args[1].toNumber(); const void *params[] = { xy }; - scope.result = scope.engine->fromVariant(QQml_valueTypeProvider()->createValueType(QMetaType::QVector2D, 1, params)); + return scope.engine->fromVariant(QQml_valueTypeProvider()->createValueType(QMetaType::QVector2D, 1, params)); } /*! \qmlmethod Qt::vector3d(real x, real y, real z) Returns a Vector3D with the specified \c x, \c y and \c z. */ -void QtObject::method_vector3d(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_vector3d(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 3) THROW_GENERIC_ERROR("Qt.vector3d(): Invalid arguments"); @@ -466,15 +475,16 @@ void QtObject::method_vector3d(const BuiltinFunction *, Scope &scope, CallData * xyz[2] = callData->args[2].toNumber(); const void *params[] = { xyz }; - scope.result = scope.engine->fromVariant(QQml_valueTypeProvider()->createValueType(QMetaType::QVector3D, 1, params)); + return scope.engine->fromVariant(QQml_valueTypeProvider()->createValueType(QMetaType::QVector3D, 1, params)); } /*! \qmlmethod Qt::vector4d(real x, real y, real z, real w) Returns a Vector4D with the specified \c x, \c y, \c z and \c w. */ -void QtObject::method_vector4d(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_vector4d(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 4) THROW_GENERIC_ERROR("Qt.vector4d(): Invalid arguments"); @@ -485,15 +495,16 @@ void QtObject::method_vector4d(const BuiltinFunction *, Scope &scope, CallData * xyzw[3] = callData->args[3].toNumber(); const void *params[] = { xyzw }; - scope.result = scope.engine->fromVariant(QQml_valueTypeProvider()->createValueType(QMetaType::QVector4D, 1, params)); + return scope.engine->fromVariant(QQml_valueTypeProvider()->createValueType(QMetaType::QVector4D, 1, params)); } /*! \qmlmethod Qt::quaternion(real scalar, real x, real y, real z) Returns a Quaternion with the specified \c scalar, \c x, \c y, and \c z. */ -void QtObject::method_quaternion(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_quaternion(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 4) THROW_GENERIC_ERROR("Qt.quaternion(): Invalid arguments"); @@ -504,7 +515,7 @@ void QtObject::method_quaternion(const BuiltinFunction *, Scope &scope, CallData sxyz[3] = callData->args[3].toNumber(); const void *params[] = { sxyz }; - scope.result = scope.engine->fromVariant(QQml_valueTypeProvider()->createValueType(QMetaType::QQuaternion, 1, params)); + return scope.engine->fromVariant(QQml_valueTypeProvider()->createValueType(QMetaType::QQuaternion, 1, params)); } /*! @@ -516,22 +527,20 @@ matrix values. Finally, the function may be called with no arguments and the resulting matrix will be the identity matrix. */ -void QtObject::method_matrix4x4(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_matrix4x4(const BuiltinFunction *b, CallData *callData) { - QV4::ExecutionEngine *v4 = scope.engine; + QV4::Scope scope(b); if (callData->argc == 0) { - scope.result = scope.engine->fromVariant(QQml_valueTypeProvider()->createValueType(QMetaType::QMatrix4x4, 0, Q_NULLPTR)); - return; + return scope.engine->fromVariant(QQml_valueTypeProvider()->createValueType(QMetaType::QMatrix4x4, 0, Q_NULLPTR)); } if (callData->argc == 1 && callData->args[0].isObject()) { bool ok = false; - QVariant v = QQml_valueTypeProvider()->createVariantFromJsObject(QMetaType::QMatrix4x4, QQmlV4Handle(callData->args[0]), v4, &ok); + QVariant v = QQml_valueTypeProvider()->createVariantFromJsObject(QMetaType::QMatrix4x4, QQmlV4Handle(callData->args[0]), scope.engine, &ok); if (!ok) THROW_GENERIC_ERROR("Qt.matrix4x4(): Invalid argument: not a valid matrix4x4 values array"); - scope.result = scope.engine->fromVariant(v); - return; + return scope.engine->fromVariant(v); } if (callData->argc != 16) @@ -556,7 +565,7 @@ void QtObject::method_matrix4x4(const BuiltinFunction *, Scope &scope, CallData vals[15] = callData->args[15].toNumber(); const void *params[] = { vals }; - scope.result = scope.engine->fromVariant(QQml_valueTypeProvider()->createValueType(QMetaType::QMatrix4x4, 1, params)); + return scope.engine->fromVariant(QQml_valueTypeProvider()->createValueType(QMetaType::QMatrix4x4, 1, params)); } /*! @@ -573,8 +582,9 @@ by factor and converts the color back to RGB. If \c factor is not supplied, returns a color 50% lighter than \c baseColor (factor 1.5). */ -void QtObject::method_lighter(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_lighter(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 1 && callData->argc != 2) THROW_GENERIC_ERROR("Qt.lighter(): Invalid arguments"); @@ -583,19 +593,17 @@ void QtObject::method_lighter(const BuiltinFunction *, Scope &scope, CallData *c bool ok = false; v = QQmlStringConverters::colorFromString(v.toString(), &ok); if (!ok) { - scope.result = QV4::Encode::null(); - return; + return QV4::Encode::null(); } } else if (v.userType() != QVariant::Color) { - scope.result = QV4::Encode::null(); - return; + return QV4::Encode::null(); } qreal factor = 1.5; if (callData->argc == 2) factor = callData->args[1].toNumber(); - scope.result = scope.engine->fromVariant(QQml_colorProvider()->lighter(v, factor)); + return scope.engine->fromVariant(QQml_colorProvider()->lighter(v, factor)); } /*! @@ -613,8 +621,9 @@ by factor and converts the color back to RGB. If \c factor is not supplied, returns a color 50% darker than \c baseColor (factor 2.0). */ -void QtObject::method_darker(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_darker(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 1 && callData->argc != 2) THROW_GENERIC_ERROR("Qt.darker(): Invalid arguments"); @@ -623,19 +632,17 @@ void QtObject::method_darker(const BuiltinFunction *, Scope &scope, CallData *ca bool ok = false; v = QQmlStringConverters::colorFromString(v.toString(), &ok); if (!ok) { - scope.result = QV4::Encode::null(); - return; + return QV4::Encode::null(); } } else if (v.userType() != QVariant::Color) { - scope.result = QV4::Encode::null(); - return; + return QV4::Encode::null(); } qreal factor = 2.0; if (callData->argc == 2) factor = callData->args[1].toNumber(); - scope.result = scope.engine->fromVariant(QQml_colorProvider()->darker(v, factor)); + return scope.engine->fromVariant(QQml_colorProvider()->darker(v, factor)); } /*! @@ -662,8 +669,9 @@ void QtObject::method_darker(const BuiltinFunction *, Scope &scope, CallData *ca Tint is most useful when a subtle change is intended to be conveyed due to some event; you can then use tinting to more effectively tune the visible color. */ -void QtObject::method_tint(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_tint(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 2) THROW_GENERIC_ERROR("Qt.tint(): Invalid arguments"); @@ -673,12 +681,10 @@ void QtObject::method_tint(const BuiltinFunction *, Scope &scope, CallData *call bool ok = false; v1 = QQmlStringConverters::colorFromString(v1.toString(), &ok); if (!ok) { - scope.result = QV4::Encode::null(); - return; + return QV4::Encode::null(); } } else if (v1.userType() != QVariant::Color) { - scope.result = QV4::Encode::null(); - return; + return QV4::Encode::null(); } // tint color @@ -687,15 +693,13 @@ void QtObject::method_tint(const BuiltinFunction *, Scope &scope, CallData *call bool ok = false; v2 = QQmlStringConverters::colorFromString(v2.toString(), &ok); if (!ok) { - scope.result = QV4::Encode::null(); - return; + return QV4::Encode::null(); } } else if (v2.userType() != QVariant::Color) { - scope.result = QV4::Encode::null(); - return; + return QV4::Encode::null(); } - scope.result = scope.engine->fromVariant(QQml_colorProvider()->tint(v1, v2)); + return scope.engine->fromVariant(QQml_colorProvider()->tint(v1, v2)); } /*! @@ -714,8 +718,9 @@ If \a format is not specified, \a date is formatted using \sa Locale */ -void QtObject::method_formatDate(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_formatDate(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc < 1 || callData->argc > 2) THROW_GENERIC_ERROR("Qt.formatDate(): Invalid arguments"); @@ -738,7 +743,7 @@ void QtObject::method_formatDate(const BuiltinFunction *, Scope &scope, CallData formattedDate = date.toString(enumFormat); } - scope.result = scope.engine->newString(formattedDate); + return Encode(scope.engine->newString(formattedDate)); } /*! @@ -756,8 +761,9 @@ If \a format is not specified, \a time is formatted using \sa Locale */ -void QtObject::method_formatTime(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_formatTime(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc < 1 || callData->argc > 2) THROW_GENERIC_ERROR("Qt.formatTime(): Invalid arguments"); @@ -786,7 +792,7 @@ void QtObject::method_formatTime(const BuiltinFunction *, Scope &scope, CallData formattedTime = time.toString(enumFormat); } - scope.result = scope.engine->newString(formattedTime); + return Encode(scope.engine->newString(formattedTime)); } /*! @@ -879,8 +885,9 @@ with the \a format values below to produce the following results: \sa Locale */ -void QtObject::method_formatDateTime(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_formatDateTime(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc < 1 || callData->argc > 2) THROW_GENERIC_ERROR("Qt.formatDateTime(): Invalid arguments"); @@ -903,7 +910,7 @@ void QtObject::method_formatDateTime(const BuiltinFunction *, Scope &scope, Call formattedDt = dt.toString(enumFormat); } - scope.result = scope.engine->newString(formattedDt); + return Encode(scope.engine->newString(formattedDt)); } /*! @@ -917,94 +924,97 @@ void QtObject::method_formatDateTime(const BuiltinFunction *, Scope &scope, Call still fail to launch or fail to open the requested URL. This result will not be reported back to the application. */ -void QtObject::method_openUrlExternally(const BuiltinFunction *b, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_openUrlExternally(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 1) { - scope.result = QV4::Encode(false); - return; + return QV4::Encode(false); } - method_resolvedUrl(b, scope, callData); - QUrl url(scope.result.toQStringNoThrow()); - scope.result = scope.engine->fromVariant(QQml_guiProvider()->openUrlExternally(url)); + ScopedValue result(scope, method_resolvedUrl(b, callData)); + QUrl url(result->toQStringNoThrow()); + return scope.engine->fromVariant(QQml_guiProvider()->openUrlExternally(url)); } /*! \qmlmethod url Qt::resolvedUrl(url url) Returns \a url resolved relative to the URL of the caller. */ -void QtObject::method_resolvedUrl(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_resolvedUrl(const BuiltinFunction *b, CallData *callData) { - ExecutionEngine *v4 = scope.engine; + QV4::Scope scope(b); - QUrl url = v4->toVariant(callData->args[0], -1).toUrl(); - QQmlEngine *e = v4->qmlEngine(); + QUrl url = scope.engine->toVariant(callData->args[0], -1).toUrl(); + QQmlEngine *e = scope.engine->qmlEngine(); QQmlEnginePrivate *p = 0; if (e) p = QQmlEnginePrivate::get(e); if (p) { - QQmlContextData *ctxt = v4->callingQmlContext(); + QQmlContextData *ctxt = scope.engine->callingQmlContext(); if (ctxt) - scope.result = v4->newString(ctxt->resolvedUrl(url).toString()); + return Encode(scope.engine->newString(ctxt->resolvedUrl(url).toString())); else - scope.result = v4->newString(url.toString()); - return; + return Encode(scope.engine->newString(url.toString())); } - scope.result = v4->newString(e->baseUrl().resolved(url).toString()); + return Encode(scope.engine->newString(e->baseUrl().resolved(url).toString())); } /*! \qmlmethod list<string> Qt::fontFamilies() Returns a list of the font families available to the application. */ -void QtObject::method_fontFamilies(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_fontFamilies(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 0) THROW_GENERIC_ERROR("Qt.fontFamilies(): Invalid arguments"); - scope.result = scope.engine->fromVariant(QVariant(QQml_guiProvider()->fontFamilies())); + return scope.engine->fromVariant(QVariant(QQml_guiProvider()->fontFamilies())); } /*! \qmlmethod string Qt::md5(data) Returns a hex string of the md5 hash of \c data. */ -void QtObject::method_md5(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_md5(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 1) THROW_GENERIC_ERROR("Qt.md5(): Invalid arguments"); QByteArray data = callData->args[0].toQStringNoThrow().toUtf8(); QByteArray result = QCryptographicHash::hash(data, QCryptographicHash::Md5); - scope.result = scope.engine->newString(QLatin1String(result.toHex())); + return Encode(scope.engine->newString(QLatin1String(result.toHex()))); } /*! \qmlmethod string Qt::btoa(data) Binary to ASCII - this function returns a base64 encoding of \c data. */ -void QtObject::method_btoa(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_btoa(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 1) THROW_GENERIC_ERROR("Qt.btoa(): Invalid arguments"); QByteArray data = callData->args[0].toQStringNoThrow().toUtf8(); - scope.result = scope.engine->newString(QLatin1String(data.toBase64())); + return Encode(scope.engine->newString(QLatin1String(data.toBase64()))); } /*! \qmlmethod string Qt::atob(data) ASCII to binary - this function decodes the base64 encoded \a data string and returns it. */ -void QtObject::method_atob(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_atob(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 1) THROW_GENERIC_ERROR("Qt.atob(): Invalid arguments"); QByteArray data = callData->args[0].toQStringNoThrow().toLatin1(); - scope.result = scope.engine->newString(QString::fromUtf8(QByteArray::fromBase64(data))); + return Encode(scope.engine->newString(QString::fromUtf8(QByteArray::fromBase64(data)))); } /*! @@ -1016,10 +1026,10 @@ QQmlEngine::quit() signal to the QCoreApplication::quit() slot. \sa exit() */ -void QtObject::method_quit(const BuiltinFunction *, Scope &scope, CallData *) +ReturnedValue QtObject::method_quit(const BuiltinFunction *b, CallData *) { - QQmlEnginePrivate::get(scope.engine->qmlEngine())->sendQuit(); - scope.result = Encode::undefined(); + QQmlEnginePrivate::get(b->engine()->qmlEngine())->sendQuit(); + return Encode::undefined(); } /*! @@ -1033,15 +1043,16 @@ void QtObject::method_quit(const BuiltinFunction *, Scope &scope, CallData *) \sa quit() */ -void QtObject::method_exit(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_exit(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 1) THROW_GENERIC_ERROR("Qt.exit(): Invalid arguments"); int retCode = callData->args[0].toNumber(); QQmlEnginePrivate::get(scope.engine->qmlEngine())->sendExit(retCode); - scope.result = QV4::Encode::undefined(); + return QV4::Encode::undefined(); } /*! @@ -1068,8 +1079,9 @@ If this is the case, consider using \l{QtQml::Qt::createComponent()}{Qt.createCo See \l {Dynamic QML Object Creation from JavaScript} for more information on using this function. */ -void QtObject::method_createQmlObject(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_createQmlObject(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc < 2 || callData->argc > 3) THROW_GENERIC_ERROR("Qt.createQmlObject(): Invalid arguments"); @@ -1168,13 +1180,12 @@ void QtObject::method_createQmlObject(const BuiltinFunction *, Scope &scope, Cal if (component.isError()) { ScopedValue v(scope, Error::create(scope.engine, component.errors())); - scope.result = scope.engine->throwError(v); - return; + return scope.engine->throwError(v); } Q_ASSERT(obj); - scope.result = QV4::QObjectWrapper::wrap(scope.engine, obj); + return QV4::QObjectWrapper::wrap(scope.engine, obj); } /*! @@ -1221,8 +1232,9 @@ See \l {Dynamic QML Object Creation from JavaScript} for more information on usi To create a QML object from an arbitrary string of QML (instead of a file), use \l{QtQml::Qt::createQmlObject()}{Qt.createQmlObject()}. */ -void QtObject::method_createComponent(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_createComponent(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc < 1 || callData->argc > 3) THROW_GENERIC_ERROR("Qt.createComponent(): Invalid arguments"); @@ -1280,7 +1292,7 @@ void QtObject::method_createComponent(const BuiltinFunction *, Scope &scope, Cal QQmlData::get(c, true)->explicitIndestructibleSet = false; QQmlData::get(c)->indestructible = false; - scope.result = QV4::QObjectWrapper::wrap(scope.engine, c); + return QV4::QObjectWrapper::wrap(scope.engine, c); } /*! @@ -1303,8 +1315,9 @@ void QtObject::method_createComponent(const BuiltinFunction *, Scope &scope, Cal \sa Locale */ -void QtObject::method_locale(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_locale(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); QString code; if (callData->argc > 1) THROW_GENERIC_ERROR("locale() requires 0 or 1 argument"); @@ -1314,7 +1327,7 @@ void QtObject::method_locale(const BuiltinFunction *, Scope &scope, CallData *ca if (callData->argc == 1) code = callData->args[0].toQStringNoThrow(); - scope.result = QQmlLocale::locale(scope.engine, code); + return QQmlLocale::locale(scope.engine, code); } void Heap::QQmlBindingFunction::init(const QV4::FunctionObject *originalFunction) @@ -1376,20 +1389,22 @@ DEFINE_OBJECT_VTABLE(QQmlBindingFunction); \since 5.0 */ -void QtObject::method_binding(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_binding(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 1) THROW_GENERIC_ERROR("binding() requires 1 argument"); const QV4::FunctionObject *f = callData->args[0].as<FunctionObject>(); if (!f) THROW_TYPE_ERROR_WITH_MESSAGE("binding(): argument (binding expression) must be a function"); - scope.result = scope.engine->memoryManager->allocObject<QQmlBindingFunction>(f); + return Encode(scope.engine->memoryManager->allocObject<QQmlBindingFunction>(f)); } -void QtObject::method_get_platform(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_get_platform(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); // ### inefficient. Should be just a value based getter Object *o = callData->thisObject.as<Object>(); if (!o) @@ -1402,11 +1417,12 @@ void QtObject::method_get_platform(const BuiltinFunction *, Scope &scope, CallDa // Only allocate a platform object once qt->d()->platform = new QQmlPlatform(scope.engine->jsEngine()); - scope.result = QV4::QObjectWrapper::wrap(scope.engine, qt->d()->platform); + return QV4::QObjectWrapper::wrap(scope.engine, qt->d()->platform); } -void QtObject::method_get_application(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_get_application(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); // ### inefficient. Should be just a value based getter Object *o = callData->thisObject.as<Object>(); if (!o) @@ -1419,19 +1435,19 @@ void QtObject::method_get_application(const BuiltinFunction *, Scope &scope, Cal // Only allocate an application object once qt->d()->application = QQml_guiProvider()->application(scope.engine->jsEngine()); - scope.result = QV4::QObjectWrapper::wrap(scope.engine, qt->d()->application); + return QV4::QObjectWrapper::wrap(scope.engine, qt->d()->application); } -void QtObject::method_get_inputMethod(const BuiltinFunction *, Scope &scope, CallData *) +ReturnedValue QtObject::method_get_inputMethod(const BuiltinFunction *b, CallData *) { QObject *o = QQml_guiProvider()->inputMethod(); - scope.result = QV4::QObjectWrapper::wrap(scope.engine, o); + return QV4::QObjectWrapper::wrap(b->engine(), o); } -void QtObject::method_get_styleHints(const BuiltinFunction *, Scope &scope, CallData *) +ReturnedValue QtObject::method_get_styleHints(const BuiltinFunction *b, CallData *) { QObject *o = QQml_guiProvider()->styleHints(); - scope.result = QV4::QObjectWrapper::wrap(scope.engine, o); + return QV4::QObjectWrapper::wrap(b->engine(), o); } @@ -1491,11 +1507,12 @@ static QString jsStack(QV4::ExecutionEngine *engine) { return stack; } -static void writeToConsole(const BuiltinFunction *, Scope &scope, CallData *callData, - ConsoleLogTypes logType, bool printStack = false) +static ReturnedValue writeToConsole(const BuiltinFunction *b, CallData *callData, + ConsoleLogTypes logType, bool printStack = false) { QLoggingCategory *loggingCategory = 0; QString result; + QV4::Scope scope(b); QV4::ExecutionEngine *v4 = scope.engine; int start = 0; @@ -1556,31 +1573,32 @@ static void writeToConsole(const BuiltinFunction *, Scope &scope, CallData *call break; } - scope.result = QV4::Encode::undefined(); + return Encode::undefined(); } DEFINE_OBJECT_VTABLE(ConsoleObject); -void ConsoleObject::method_error(const BuiltinFunction *b, Scope &scope, CallData *callData) +ReturnedValue ConsoleObject::method_error(const BuiltinFunction *b, CallData *callData) { - writeToConsole(b, scope, callData, Error); + return writeToConsole(b, callData, Error); } -void ConsoleObject::method_log(const BuiltinFunction *b, Scope &scope, CallData *callData) +ReturnedValue ConsoleObject::method_log(const BuiltinFunction *b, CallData *callData) { //console.log //console.debug //print - writeToConsole(b, scope, callData, Log); + return writeToConsole(b, callData, Log); } -void ConsoleObject::method_info(const BuiltinFunction *b, Scope &scope, CallData *callData) +ReturnedValue ConsoleObject::method_info(const BuiltinFunction *b, CallData *callData) { - writeToConsole(b, scope, callData, Info); + return writeToConsole(b, callData, Info); } -void ConsoleObject::method_profile(const BuiltinFunction *, Scope &scope, CallData *) +ReturnedValue ConsoleObject::method_profile(const BuiltinFunction *b, CallData *) { + QV4::Scope scope(b); QV4::ExecutionEngine *v4 = scope.engine; QV4::EngineBase::StackFrame *frame = v4->currentStackFrame; @@ -1595,11 +1613,12 @@ void ConsoleObject::method_profile(const BuiltinFunction *, Scope &scope, CallDa logger.debug("Profiling started."); } - scope.result = QV4::Encode::undefined(); + return QV4::Encode::undefined(); } -void ConsoleObject::method_profileEnd(const BuiltinFunction *, Scope &scope, CallData *) +ReturnedValue ConsoleObject::method_profileEnd(const BuiltinFunction *b, CallData *) { + QV4::Scope scope(b); QV4::ExecutionEngine *v4 = scope.engine; QV4::EngineBase::StackFrame *frame = v4->currentStackFrame; @@ -1615,11 +1634,12 @@ void ConsoleObject::method_profileEnd(const BuiltinFunction *, Scope &scope, Cal logger.debug("Profiling ended."); } - scope.result = QV4::Encode::undefined(); + return QV4::Encode::undefined(); } -void ConsoleObject::method_time(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue ConsoleObject::method_time(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 1) THROW_GENERIC_ERROR("console.time(): Invalid arguments"); @@ -1627,11 +1647,12 @@ void ConsoleObject::method_time(const BuiltinFunction *, Scope &scope, CallData QString name = callData->args[0].toQStringNoThrow(); v8engine->startTimer(name); - scope.result = QV4::Encode::undefined(); + return QV4::Encode::undefined(); } -void ConsoleObject::method_timeEnd(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue ConsoleObject::method_timeEnd(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 1) THROW_GENERIC_ERROR("console.timeEnd(): Invalid arguments"); @@ -1643,16 +1664,17 @@ void ConsoleObject::method_timeEnd(const BuiltinFunction *, Scope &scope, CallDa if (wasRunning) { qDebug("%s: %llims", qPrintable(name), elapsed); } - scope.result = QV4::Encode::undefined(); + return QV4::Encode::undefined(); } -void ConsoleObject::method_count(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue ConsoleObject::method_count(const BuiltinFunction *b, CallData *callData) { // first argument: name to print. Ignore any additional arguments QString name; if (callData->argc > 0) name = callData->args[0].toQStringNoThrow(); + Scope scope(b); QV4::ExecutionEngine *v4 = scope.engine; QV8Engine *v8engine = scope.engine->v8Engine; @@ -1667,11 +1689,12 @@ void ConsoleObject::method_count(const BuiltinFunction *, Scope &scope, CallData qPrintable(frame->function())) .debug("%s", qPrintable(message)); - scope.result = QV4::Encode::undefined(); + return QV4::Encode::undefined(); } -void ConsoleObject::method_trace(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue ConsoleObject::method_trace(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 0) THROW_GENERIC_ERROR("console.trace(): Invalid arguments"); @@ -1684,16 +1707,17 @@ void ConsoleObject::method_trace(const BuiltinFunction *, Scope &scope, CallData frame->function().toUtf8().constData()) .debug("%s", qPrintable(stack)); - scope.result = QV4::Encode::undefined(); + return QV4::Encode::undefined(); } -void ConsoleObject::method_warn(const BuiltinFunction *b, Scope &scope, CallData *callData) +ReturnedValue ConsoleObject::method_warn(const BuiltinFunction *b, CallData *callData) { - return writeToConsole(b, scope, callData, Warn); + return writeToConsole(b, callData, Warn); } -void ConsoleObject::method_assert(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue ConsoleObject::method_assert(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc == 0) THROW_GENERIC_ERROR("console.assert(): Missing argument"); @@ -1716,17 +1740,16 @@ void ConsoleObject::method_assert(const BuiltinFunction *, Scope &scope, CallDat .critical("%s\n%s",qPrintable(message), qPrintable(stack)); } - scope.result = QV4::Encode::undefined(); + return QV4::Encode::undefined(); } -void ConsoleObject::method_exception(const BuiltinFunction *b, Scope &scope, CallData *callData) +ReturnedValue ConsoleObject::method_exception(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc == 0) THROW_GENERIC_ERROR("console.exception(): Missing argument"); - writeToConsole(b, scope, callData, Error, true); - - scope.result = QV4::Encode::undefined(); + return writeToConsole(b, callData, Error, true); } @@ -1782,8 +1805,9 @@ void QV4::GlobalExtensions::init(Object *globalObject, QJSEngine::Extensions ext \sa {Internationalization and Localization with Qt Quick} */ -void GlobalExtensions::method_qsTranslate(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue GlobalExtensions::method_qsTranslate(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc < 2) THROW_GENERIC_ERROR("qsTranslate() requires at least two arguments"); if (!callData->args[0].isString()) @@ -1813,7 +1837,7 @@ void GlobalExtensions::method_qsTranslate(const BuiltinFunction *, Scope &scope, comment.toUtf8().constData(), n); - scope.result = scope.engine->newString(result); + return Encode(scope.engine->newString(result)); } /*! @@ -1838,12 +1862,13 @@ void GlobalExtensions::method_qsTranslate(const BuiltinFunction *, Scope &scope, \sa {Internationalization and Localization with Qt Quick} */ -void GlobalExtensions::method_qsTranslateNoOp(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue GlobalExtensions::method_qsTranslateNoOp(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc < 2) - scope.result = QV4::Encode::undefined(); + return QV4::Encode::undefined(); else - scope.result = callData->args[1]; + return callData->args[1].asReturnedValue(); } /*! @@ -1863,8 +1888,9 @@ void GlobalExtensions::method_qsTranslateNoOp(const BuiltinFunction *, Scope &sc \sa {Internationalization and Localization with Qt Quick} */ -void GlobalExtensions::method_qsTr(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue GlobalExtensions::method_qsTr(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc < 1) THROW_GENERIC_ERROR("qsTr() requires at least one argument"); if (!callData->args[0].isString()) @@ -1912,7 +1938,7 @@ void GlobalExtensions::method_qsTr(const BuiltinFunction *, Scope &scope, CallDa QString result = QCoreApplication::translate(context.toUtf8().constData(), text.toUtf8().constData(), comment.toUtf8().constData(), n); - scope.result = scope.engine->newString(result); + return Encode(scope.engine->newString(result)); } /*! @@ -1937,12 +1963,12 @@ void GlobalExtensions::method_qsTr(const BuiltinFunction *, Scope &scope, CallDa \sa {Internationalization and Localization with Qt Quick} */ -void GlobalExtensions::method_qsTrNoOp(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue GlobalExtensions::method_qsTrNoOp(const BuiltinFunction *, CallData *callData) { if (callData->argc < 1) - scope.result = QV4::Encode::undefined(); + return QV4::Encode::undefined(); else - scope.result = callData->args[0]; + return callData->args[0].asReturnedValue(); } /*! @@ -1975,8 +2001,9 @@ void GlobalExtensions::method_qsTrNoOp(const BuiltinFunction *, Scope &scope, Ca \sa QT_TRID_NOOP(), {Internationalization and Localization with Qt Quick} */ -void GlobalExtensions::method_qsTrId(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue GlobalExtensions::method_qsTrId(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc < 1) THROW_GENERIC_ERROR("qsTrId() requires at least one argument"); if (!callData->args[0].isString()) @@ -1988,7 +2015,7 @@ void GlobalExtensions::method_qsTrId(const BuiltinFunction *, Scope &scope, Call if (callData->argc > 1) n = callData->args[1].toInt32(); - scope.result = scope.engine->newString(qtTrId(callData->args[0].toQStringNoThrow().toUtf8().constData(), n)); + return Encode(scope.engine->newString(qtTrId(callData->args[0].toQStringNoThrow().toUtf8().constData(), n))); } /*! @@ -2007,27 +2034,28 @@ void GlobalExtensions::method_qsTrId(const BuiltinFunction *, Scope &scope, Call \sa qsTrId(), {Internationalization and Localization with Qt Quick} */ -void GlobalExtensions::method_qsTrIdNoOp(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue GlobalExtensions::method_qsTrIdNoOp(const BuiltinFunction *, CallData *callData) { if (callData->argc < 1) - scope.result = QV4::Encode::undefined(); + return QV4::Encode::undefined(); else - scope.result = callData->args[0]; + return callData->args[0].asReturnedValue(); } #endif // translation -void GlobalExtensions::method_gc(const BuiltinFunction *, Scope &scope, CallData *) +ReturnedValue GlobalExtensions::method_gc(const BuiltinFunction *b, CallData *) { - scope.engine->memoryManager->runGC(); + b->engine()->memoryManager->runGC(); - scope.result = QV4::Encode::undefined(); + return QV4::Encode::undefined(); } -void GlobalExtensions::method_string_arg(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue GlobalExtensions::method_string_arg(const BuiltinFunction *b, CallData *callData) { + QV4::Scope scope(b); if (callData->argc != 1) THROW_GENERIC_ERROR("String.arg(): Invalid arguments"); @@ -2064,10 +2092,10 @@ be passed on to the function invoked. Note that if redundant calls are eliminated, then only the last set of arguments will be passed to the function. */ -void QtObject::method_callLater(const BuiltinFunction *b, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_callLater(const BuiltinFunction *b, CallData *callData) { - QV8Engine *v8engine = scope.engine->v8Engine; - v8engine->delayedCallQueue()->addUniquelyAndExecuteLater(b, scope, callData); + QV8Engine *v8engine = b->engine()->v8Engine; + return v8engine->delayedCallQueue()->addUniquelyAndExecuteLater(b, callData); } QT_END_NAMESPACE diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h index 21613b7c10..7d61aa0ada 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h +++ b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h @@ -93,45 +93,45 @@ struct QtObject : Object static ReturnedValue get(const Managed *m, String *name, bool *hasProperty); static void advanceIterator(Managed *m, ObjectIterator *it, Value *name, uint *index, Property *p, PropertyAttributes *attributes); - static void method_isQtObject(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_rgba(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_hsla(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_hsva(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_colorEqual(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_font(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_rect(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_point(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_size(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_vector2d(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_vector3d(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_vector4d(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_quaternion(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_matrix4x4(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_lighter(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_darker(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_tint(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_formatDate(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_formatTime(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_formatDateTime(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_openUrlExternally(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_fontFamilies(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_md5(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_btoa(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_atob(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_quit(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_exit(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_resolvedUrl(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_createQmlObject(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_createComponent(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_locale(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_binding(const BuiltinFunction *, Scope &scope, CallData *callData); - - static void method_get_platform(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_get_application(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_get_inputMethod(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_get_styleHints(const BuiltinFunction *, Scope &scope, CallData *callData); - - static void method_callLater(const BuiltinFunction *, Scope &scope, CallData *callData); + static ReturnedValue method_isQtObject(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_rgba(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_hsla(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_hsva(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_colorEqual(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_font(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_rect(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_point(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_size(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_vector2d(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_vector3d(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_vector4d(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_quaternion(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_matrix4x4(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_lighter(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_darker(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_tint(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_formatDate(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_formatTime(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_formatDateTime(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_openUrlExternally(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_fontFamilies(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_md5(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_btoa(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_atob(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_quit(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_exit(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_resolvedUrl(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_createQmlObject(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_createComponent(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_locale(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_binding(const BuiltinFunction *, CallData *callData); + + static ReturnedValue method_get_platform(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_get_application(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_get_inputMethod(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_get_styleHints(const BuiltinFunction *, CallData *callData); + + static ReturnedValue method_callLater(const BuiltinFunction *, CallData *callData); private: void addAll(); @@ -142,18 +142,18 @@ struct ConsoleObject : Object { V4_OBJECT2(ConsoleObject, Object) - static void method_error(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_log(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_info(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_profile(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_profileEnd(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_time(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_timeEnd(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_count(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_trace(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_warn(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_assert(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_exception(const BuiltinFunction *, Scope &scope, CallData *callData); + static ReturnedValue method_error(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_log(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_info(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_profile(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_profileEnd(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_time(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_timeEnd(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_count(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_trace(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_warn(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_assert(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_exception(const BuiltinFunction *, CallData *callData); }; @@ -161,17 +161,17 @@ struct Q_QML_PRIVATE_EXPORT GlobalExtensions { static void init(Object *globalObject, QJSEngine::Extensions extensions); #if QT_CONFIG(translation) - static void method_qsTranslate(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_qsTranslateNoOp(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_qsTr(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_qsTrNoOp(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_qsTrId(const BuiltinFunction *, Scope &scope, CallData *callData); - static void method_qsTrIdNoOp(const BuiltinFunction *, Scope &scope, CallData *callData); + static ReturnedValue method_qsTranslate(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_qsTranslateNoOp(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_qsTr(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_qsTrNoOp(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_qsTrId(const BuiltinFunction *, CallData *callData); + static ReturnedValue method_qsTrIdNoOp(const BuiltinFunction *, CallData *callData); #endif - static void method_gc(const BuiltinFunction *, Scope &scope, CallData *callData); + static ReturnedValue method_gc(const BuiltinFunction *, CallData *callData); // on String:prototype - static void method_string_arg(const BuiltinFunction *, Scope &scope, CallData *callData); + static ReturnedValue method_string_arg(const BuiltinFunction *, CallData *callData); }; diff --git a/src/qml/qml/v8/qv4domerrors_p.h b/src/qml/qml/v8/qv4domerrors_p.h index a9bdbe01ae..06a70a13e9 100644 --- a/src/qml/qml/v8/qv4domerrors_p.h +++ b/src/qml/qml/v8/qv4domerrors_p.h @@ -78,8 +78,7 @@ QT_BEGIN_NAMESPACE QV4::ScopedValue v(scope, scope.engine->newString(QStringLiteral(string))); \ QV4::ScopedObject ex(scope, scope.engine->newErrorObject(v)); \ ex->put(QV4::ScopedString(scope, scope.engine->newIdentifier(QStringLiteral("code"))), QV4::ScopedValue(scope, QV4::Primitive::fromInt32(error))); \ - scope.result = scope.engine->throwError(ex); \ - return; \ + return scope.engine->throwError(ex); \ } namespace QV4 { |