diff options
Diffstat (limited to 'src/qml/qml/v8/qqmlbuiltinfunctions.cpp')
| -rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 903 |
1 files changed, 492 insertions, 411 deletions
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index 8cc0b32168..64dc581a56 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -44,7 +44,9 @@ #include <private/qqmlcomponent_p.h> #include <private/qqmlloggingcategory_p.h> #include <private/qqmlstringconverters_p.h> +#if QT_CONFIG(qml_locale) #include <private/qqmllocale_p.h> +#endif #include <private/qv8engine_p.h> #include <private/qqmldelayedcallqueue_p.h> #include <QFileInfo> @@ -65,6 +67,7 @@ #include <private/qv4jsonobject_p.h> #include <private/qv4objectproto_p.h> #include <private/qv4qobjectwrapper_p.h> +#include <private/qv4stackframe_p.h> #include <QtCore/qstring.h> #include <QtCore/qdatetime.h> @@ -87,8 +90,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 @@ -108,8 +110,8 @@ void Heap::QtObject::init(QQmlEngine *qmlEngine) { ScopedString str(scope); ScopedValue v(scope); - o->put((str = scope.engine->newString(QStringLiteral("Asynchronous"))), (v = QV4::Primitive::fromInt32(0))); - o->put((str = scope.engine->newString(QStringLiteral("Synchronous"))), (v = QV4::Primitive::fromInt32(1))); + o->put((str = scope.engine->newString(QStringLiteral("Asynchronous"))), (v = QV4::Value::fromInt32(0))); + o->put((str = scope.engine->newString(QStringLiteral("Synchronous"))), (v = QV4::Value::fromInt32(1))); } o->defineDefaultProperty(QStringLiteral("include"), QV4Include::method_include); @@ -139,7 +141,9 @@ void Heap::QtObject::init(QQmlEngine *qmlEngine) o->defineDefaultProperty(QStringLiteral("btoa"), QV4::QtObject::method_btoa); o->defineDefaultProperty(QStringLiteral("atob"), QV4::QtObject::method_atob); o->defineDefaultProperty(QStringLiteral("resolvedUrl"), QV4::QtObject::method_resolvedUrl); +#if QT_CONFIG(qml_locale) o->defineDefaultProperty(QStringLiteral("locale"), QV4::QtObject::method_locale); +#endif o->defineDefaultProperty(QStringLiteral("binding"), QV4::QtObject::method_binding); if (qmlEngine) { @@ -152,10 +156,10 @@ void Heap::QtObject::init(QQmlEngine *qmlEngine) o->defineDefaultProperty(QStringLiteral("createComponent"), QV4::QtObject::method_createComponent); } - o->defineAccessorProperty(QStringLiteral("platform"), QV4::QtObject::method_get_platform, 0); - o->defineAccessorProperty(QStringLiteral("application"), QV4::QtObject::method_get_application, 0); - o->defineAccessorProperty(QStringLiteral("inputMethod"), QV4::QtObject::method_get_inputMethod, 0); - o->defineAccessorProperty(QStringLiteral("styleHints"), QV4::QtObject::method_get_styleHints, 0); + o->defineAccessorProperty(QStringLiteral("platform"), QV4::QtObject::method_get_platform, nullptr); + o->defineAccessorProperty(QStringLiteral("application"), QV4::QtObject::method_get_application, nullptr); + o->defineAccessorProperty(QStringLiteral("inputMethod"), QV4::QtObject::method_get_inputMethod, nullptr); + o->defineAccessorProperty(QStringLiteral("styleHints"), QV4::QtObject::method_get_styleHints, nullptr); o->defineDefaultProperty(QStringLiteral("callLater"), QV4::QtObject::method_callLater); } @@ -179,7 +183,7 @@ ReturnedValue QtObject::findAndAdd(const QString *name, bool &foundProperty) con QMetaEnum enumerator = qtMetaObject->enumerator(d()->enumeratorIterator); for (int keyCount = enumerator.keyCount(); d()->keyIterator < keyCount; ++d()->keyIterator) { key = scope.engine->newString(QString::fromUtf8(enumerator.key(d()->keyIterator))); - value = QV4::Primitive::fromInt32(enumerator.value(d()->keyIterator)); + value = QV4::Value::fromInt32(enumerator.value(d()->keyIterator)); o->put(key, value); if (name && key->toQString() == *name) { ++d()->keyIterator; @@ -194,47 +198,46 @@ ReturnedValue QtObject::findAndAdd(const QString *name, bool &foundProperty) con return Encode::undefined(); } -ReturnedValue QtObject::get(const Managed *m, String *name, bool *hasProperty) +ReturnedValue QtObject::virtualGet(const Managed *m, PropertyKey id, const Value *receiver, bool *hasProperty) { bool hasProp = false; if (hasProperty == nullptr) { hasProperty = &hasProp; } - ReturnedValue ret = QV4::Object::get(m, name, hasProperty); + ReturnedValue ret = QV4::Object::virtualGet(m, id, receiver, hasProperty); if (*hasProperty) { return ret; } auto that = static_cast<const QtObject*>(m); if (!that->d()->isComplete()) { - const QString key = name->toQString(); + const QString key = id.toQString(); ret = that->findAndAdd(&key, *hasProperty); } return ret; } -void QtObject::advanceIterator(Managed *m, ObjectIterator *it, Value *name, uint *index, Property *p, PropertyAttributes *attributes) +OwnPropertyKeyIterator *QtObject::virtualOwnPropertyKeys(const Object *m, Value *target) { - auto that = static_cast<QtObject*>(m); - if (!that->d()->isComplete()) { - that->addAll(); - } + auto that = static_cast<const QtObject*>(m); + if (!that->d()->isComplete()) + const_cast<QtObject *>(that)->addAll(); - QV4::Object::advanceIterator(m, it, name, index, p, attributes); + return Object::virtualOwnPropertyKeys(m, target); } /*! \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 FunctionObject *, const Value *, const Value *argv, int argc) { - if (callData->argc == 0) + if (argc == 0) RETURN_RESULT(QV4::Encode(false)); - scope.result = QV4::Encode(callData->args[0].as<QV4::QObjectWrapper>() != 0); + return QV4::Encode(argv[0].as<QV4::QObjectWrapper>() != nullptr); } /*! @@ -243,16 +246,16 @@ 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 FunctionObject *f, const Value *, const Value *argv, int argc) { - int argCount = callData->argc; - if (argCount < 3 || argCount > 4) + QV4::Scope scope(f); + if (argc < 3 || argc > 4) THROW_GENERIC_ERROR("Qt.rgba(): Invalid arguments"); - double r = callData->args[0].toNumber(); - double g = callData->args[1].toNumber(); - double b = callData->args[2].toNumber(); - double a = (argCount == 4) ? callData->args[3].toNumber() : 1; + double r = argv[0].toNumber(); + double g = argv[1].toNumber(); + double b = argv[2].toNumber(); + double a = (argc == 4) ? argv[3].toNumber() : 1; if (r < 0.0) r=0.0; if (r > 1.0) r=1.0; @@ -263,7 +266,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,16 +275,17 @@ 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 FunctionObject *b, const Value *, const Value *argv, int argc) { - int argCount = callData->argc; + QV4::Scope scope(b); + int argCount = argc; if (argCount < 3 || argCount > 4) THROW_GENERIC_ERROR("Qt.hsla(): Invalid arguments"); - double h = callData->args[0].toNumber(); - double s = callData->args[1].toNumber(); - double l = callData->args[2].toNumber(); - double a = (argCount == 4) ? callData->args[3].toNumber() : 1; + double h = argv[0].toNumber(); + double s = argv[1].toNumber(); + double l = argv[2].toNumber(); + double a = (argCount == 4) ? argv[3].toNumber() : 1; if (h < 0.0) h=0.0; if (h > 1.0) h=1.0; @@ -292,7 +296,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,23 +307,24 @@ 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 FunctionObject *b, const Value *, const Value *argv, int argc) { - int argCount = callData->argc; + QV4::Scope scope(b); + int argCount = argc; if (argCount < 3 || argCount > 4) THROW_GENERIC_ERROR("Qt.hsva(): Invalid arguments"); - double h = callData->args[0].toNumber(); - double s = callData->args[1].toNumber(); - double v = callData->args[2].toNumber(); - double a = (argCount == 4) ? callData->args[3].toNumber() : 1; + double h = argv[0].toNumber(); + double s = argv[1].toNumber(); + double v = argv[2].toNumber(); + double a = (argCount == 4) ? argv[3].toNumber() : 1; h = qBound(0.0, h, 1.0); s = qBound(0.0, s, 1.0); 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,14 +335,15 @@ 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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc != 2) + QV4::Scope scope(b); + if (argc != 2) THROW_GENERIC_ERROR("Qt.colorEqual(): Invalid arguments"); bool ok = false; - QVariant lhs = scope.engine->toVariant(callData->args[0], -1); + QVariant lhs = scope.engine->toVariant(argv[0], -1); if (lhs.userType() == QVariant::String) { lhs = QQmlStringConverters::colorFromString(lhs.toString(), &ok); if (!ok) { @@ -347,7 +353,7 @@ void QtObject::method_colorEqual(const BuiltinFunction *, Scope &scope, CallData THROW_GENERIC_ERROR("Qt.colorEqual(): Invalid arguments"); } - QVariant rhs = scope.engine->toVariant(callData->args[1], -1); + QVariant rhs = scope.engine->toVariant(argv[1], -1); if (rhs.userType() == QVariant::String) { rhs = QQmlStringConverters::colorFromString(rhs.toString(), &ok); if (!ok) { @@ -358,7 +364,7 @@ void QtObject::method_colorEqual(const BuiltinFunction *, Scope &scope, CallData } bool equal = (lhs == rhs); - scope.result = QV4::Encode(equal); + return QV4::Encode(equal); } /*! @@ -368,47 +374,50 @@ 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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc != 4) + QV4::Scope scope(b); + if (argc != 4) THROW_GENERIC_ERROR("Qt.rect(): Invalid arguments"); - double x = callData->args[0].toNumber(); - double y = callData->args[1].toNumber(); - double w = callData->args[2].toNumber(); - double h = callData->args[3].toNumber(); + double x = argv[0].toNumber(); + double y = argv[1].toNumber(); + double w = argv[2].toNumber(); + double h = argv[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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc != 2) + QV4::Scope scope(b); + if (argc != 2) THROW_GENERIC_ERROR("Qt.point(): Invalid arguments"); - double x = callData->args[0].toNumber(); - double y = callData->args[1].toNumber(); + double x = argv[0].toNumber(); + double y = argv[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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc != 2) + QV4::Scope scope(b); + if (argc != 2) THROW_GENERIC_ERROR("Qt.size(): Invalid arguments"); - double w = callData->args[0].toNumber(); - double h = callData->args[1].toNumber(); + double w = argv[0].toNumber(); + double h = argv[1].toNumber(); - scope.result = scope.engine->fromVariant(QVariant::fromValue(QSizeF(w, h))); + return scope.engine->fromVariant(QVariant::fromValue(QSizeF(w, h))); } /*! @@ -419,17 +428,18 @@ 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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc != 1 || !callData->args[0].isObject()) + QV4::Scope scope(b); + if (argc != 1 || !argv[0].isObject()) THROW_GENERIC_ERROR("Qt.font(): Invalid arguments"); QV4::ExecutionEngine *v4 = scope.engine; bool ok = false; - QVariant v = QQml_valueTypeProvider()->createVariantFromJsObject(QMetaType::QFont, QQmlV4Handle(callData->args[0]), v4, &ok); + QVariant v = QQml_valueTypeProvider()->createVariantFromJsObject(QMetaType::QFont, QQmlV4Handle(argv[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,73 +448,77 @@ 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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc != 2) + QV4::Scope scope(b); + if (argc != 2) THROW_GENERIC_ERROR("Qt.vector2d(): Invalid arguments"); float xy[3]; // qvector2d uses float internally - xy[0] = callData->args[0].toNumber(); - xy[1] = callData->args[1].toNumber(); + xy[0] = argv[0].toNumber(); + xy[1] = argv[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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc != 3) + QV4::Scope scope(b); + if (argc != 3) THROW_GENERIC_ERROR("Qt.vector3d(): Invalid arguments"); float xyz[3]; // qvector3d uses float internally - xyz[0] = callData->args[0].toNumber(); - xyz[1] = callData->args[1].toNumber(); - xyz[2] = callData->args[2].toNumber(); + xyz[0] = argv[0].toNumber(); + xyz[1] = argv[1].toNumber(); + xyz[2] = argv[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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc != 4) + QV4::Scope scope(b); + if (argc != 4) THROW_GENERIC_ERROR("Qt.vector4d(): Invalid arguments"); float xyzw[4]; // qvector4d uses float internally - xyzw[0] = callData->args[0].toNumber(); - xyzw[1] = callData->args[1].toNumber(); - xyzw[2] = callData->args[2].toNumber(); - xyzw[3] = callData->args[3].toNumber(); + xyzw[0] = argv[0].toNumber(); + xyzw[1] = argv[1].toNumber(); + xyzw[2] = argv[2].toNumber(); + xyzw[3] = argv[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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc != 4) + QV4::Scope scope(b); + if (argc != 4) THROW_GENERIC_ERROR("Qt.quaternion(): Invalid arguments"); qreal sxyz[4]; // qquaternion uses qreal internally - sxyz[0] = callData->args[0].toNumber(); - sxyz[1] = callData->args[1].toNumber(); - sxyz[2] = callData->args[2].toNumber(); - sxyz[3] = callData->args[3].toNumber(); + sxyz[0] = argv[0].toNumber(); + sxyz[1] = argv[1].toNumber(); + sxyz[2] = argv[2].toNumber(); + sxyz[3] = argv[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,47 +530,45 @@ 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 FunctionObject *b, const Value *, const Value *argv, int argc) { - 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; + if (argc == 0) { + return scope.engine->fromVariant(QQml_valueTypeProvider()->createValueType(QMetaType::QMatrix4x4, 0, nullptr)); } - if (callData->argc == 1 && callData->args[0].isObject()) { + if (argc == 1 && argv[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(argv[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) + if (argc != 16) THROW_GENERIC_ERROR("Qt.matrix4x4(): Invalid arguments"); qreal vals[16]; // qmatrix4x4 uses qreal internally - vals[0] = callData->args[0].toNumber(); - vals[1] = callData->args[1].toNumber(); - vals[2] = callData->args[2].toNumber(); - vals[3] = callData->args[3].toNumber(); - vals[4] = callData->args[4].toNumber(); - vals[5] = callData->args[5].toNumber(); - vals[6] = callData->args[6].toNumber(); - vals[7] = callData->args[7].toNumber(); - vals[8] = callData->args[8].toNumber(); - vals[9] = callData->args[9].toNumber(); - vals[10] = callData->args[10].toNumber(); - vals[11] = callData->args[11].toNumber(); - vals[12] = callData->args[12].toNumber(); - vals[13] = callData->args[13].toNumber(); - vals[14] = callData->args[14].toNumber(); - vals[15] = callData->args[15].toNumber(); + vals[0] = argv[0].toNumber(); + vals[1] = argv[1].toNumber(); + vals[2] = argv[2].toNumber(); + vals[3] = argv[3].toNumber(); + vals[4] = argv[4].toNumber(); + vals[5] = argv[5].toNumber(); + vals[6] = argv[6].toNumber(); + vals[7] = argv[7].toNumber(); + vals[8] = argv[8].toNumber(); + vals[9] = argv[9].toNumber(); + vals[10] = argv[10].toNumber(); + vals[11] = argv[11].toNumber(); + vals[12] = argv[12].toNumber(); + vals[13] = argv[13].toNumber(); + vals[14] = argv[14].toNumber(); + vals[15] = argv[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,29 +585,28 @@ 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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc != 1 && callData->argc != 2) + QV4::Scope scope(b); + if (argc != 1 && argc != 2) THROW_GENERIC_ERROR("Qt.lighter(): Invalid arguments"); - QVariant v = scope.engine->toVariant(callData->args[0], -1); + QVariant v = scope.engine->toVariant(argv[0], -1); if (v.userType() == QVariant::String) { 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(); + if (argc == 2) + factor = argv[1].toNumber(); - scope.result = scope.engine->fromVariant(QQml_colorProvider()->lighter(v, factor)); + return scope.engine->fromVariant(QQml_colorProvider()->lighter(v, factor)); } /*! @@ -613,29 +624,28 @@ 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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc != 1 && callData->argc != 2) + QV4::Scope scope(b); + if (argc != 1 && argc != 2) THROW_GENERIC_ERROR("Qt.darker(): Invalid arguments"); - QVariant v = scope.engine->toVariant(callData->args[0], -1); + QVariant v = scope.engine->toVariant(argv[0], -1); if (v.userType() == QVariant::String) { 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(); + if (argc == 2) + factor = argv[1].toNumber(); - scope.result = scope.engine->fromVariant(QQml_colorProvider()->darker(v, factor)); + return scope.engine->fromVariant(QQml_colorProvider()->darker(v, factor)); } /*! @@ -662,40 +672,37 @@ 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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc != 2) + QV4::Scope scope(b); + if (argc != 2) THROW_GENERIC_ERROR("Qt.tint(): Invalid arguments"); // base color - QVariant v1 = scope.engine->toVariant(callData->args[0], -1); + QVariant v1 = scope.engine->toVariant(argv[0], -1); if (v1.userType() == QVariant::String) { 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 - QVariant v2 = scope.engine->toVariant(callData->args[1], -1); + QVariant v2 = scope.engine->toVariant(argv[1], -1); if (v2.userType() == QVariant::String) { 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,21 +721,22 @@ 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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc < 1 || callData->argc > 2) + QV4::Scope scope(b); + if (argc < 1 || argc > 2) THROW_GENERIC_ERROR("Qt.formatDate(): Invalid arguments"); Qt::DateFormat enumFormat = Qt::DefaultLocaleShortDate; - QDate date = scope.engine->toVariant(callData->args[0], -1).toDateTime().date(); + QDate date = scope.engine->toVariant(argv[0], -1).toDateTime().date(); QString formattedDate; - if (callData->argc == 2) { - QV4::ScopedString s(scope, callData->args[1]); + if (argc == 2) { + QV4::ScopedString s(scope, argv[1]); if (s) { QString format = s->toQString(); formattedDate = date.toString(format); - } else if (callData->args[1].isNumber()) { - quint32 intFormat = callData->args[1].asDouble(); + } else if (argv[1].isNumber()) { + quint32 intFormat = argv[1].asDouble(); Qt::DateFormat format = Qt::DateFormat(intFormat); formattedDate = date.toString(format); } else { @@ -738,7 +746,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,27 +764,28 @@ 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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc < 1 || callData->argc > 2) + QV4::Scope scope(b); + if (argc < 1 || argc > 2) THROW_GENERIC_ERROR("Qt.formatTime(): Invalid arguments"); - QVariant argVariant = scope.engine->toVariant(callData->args[0], -1); + QVariant argVariant = scope.engine->toVariant(argv[0], -1); QTime time; - if (callData->args[0].as<DateObject>() || (argVariant.type() == QVariant::String)) + if (argv[0].as<DateObject>() || (argVariant.type() == QVariant::String)) time = argVariant.toDateTime().time(); else // if (argVariant.type() == QVariant::Time), or invalid. time = argVariant.toTime(); Qt::DateFormat enumFormat = Qt::DefaultLocaleShortDate; QString formattedTime; - if (callData->argc == 2) { - QV4::ScopedString s(scope, callData->args[1]); + if (argc == 2) { + QV4::ScopedString s(scope, argv[1]); if (s) { QString format = s->toQString(); formattedTime = time.toString(format); - } else if (callData->args[1].isNumber()) { - quint32 intFormat = callData->args[1].asDouble(); + } else if (argv[1].isNumber()) { + quint32 intFormat = argv[1].asDouble(); Qt::DateFormat format = Qt::DateFormat(intFormat); formattedTime = time.toString(format); } else { @@ -786,7 +795,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)); } /*! @@ -851,6 +860,8 @@ In addition the following expressions can be used to specify the time: \li use AM/PM display. \e AP will be replaced by either "AM" or "PM". \row \li ap \li use am/pm display. \e ap will be replaced by either "am" or "pm". + \row \li t + \li include a time-zone indicator. \endtable All other input characters will be ignored. Any sequence of characters that @@ -879,21 +890,22 @@ 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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc < 1 || callData->argc > 2) + QV4::Scope scope(b); + if (argc < 1 || argc > 2) THROW_GENERIC_ERROR("Qt.formatDateTime(): Invalid arguments"); Qt::DateFormat enumFormat = Qt::DefaultLocaleShortDate; - QDateTime dt = scope.engine->toVariant(callData->args[0], -1).toDateTime(); + QDateTime dt = scope.engine->toVariant(argv[0], -1).toDateTime(); QString formattedDt; - if (callData->argc == 2) { - QV4::ScopedString s(scope, callData->args[1]); + if (argc == 2) { + QV4::ScopedString s(scope, argv[1]); if (s) { QString format = s->toQString(); formattedDt = dt.toString(format); - } else if (callData->args[1].isNumber()) { - quint32 intFormat = callData->args[1].asDouble(); + } else if (argv[1].isNumber()) { + quint32 intFormat = argv[1].asDouble(); Qt::DateFormat format = Qt::DateFormat(intFormat); formattedDt = dt.toString(format); } else { @@ -903,7 +915,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 +929,98 @@ 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 FunctionObject *b, const Value *thisObject, const Value *argv, int argc) { - if (callData->argc != 1) { - scope.result = QV4::Encode(false); - return; - } + QV4::Scope scope(b); + if (argc != 1) + 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, thisObject, argv, argc)); + 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 FunctionObject *b, const Value *, const Value *argv, int argc) { - ExecutionEngine *v4 = scope.engine; + QV4::Scope scope(b); + if (argc != 1) + return Encode::undefined(); - QUrl url = v4->toVariant(callData->args[0], -1).toUrl(); - QQmlEngine *e = v4->qmlEngine(); - QQmlEnginePrivate *p = 0; + QUrl url = scope.engine->toVariant(argv[0], -1).toUrl(); + QQmlEngine *e = scope.engine->qmlEngine(); + QQmlEnginePrivate *p = nullptr; 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 FunctionObject *b, const Value *, const Value *, int argc) { - if (callData->argc != 0) + QV4::Scope scope(b); + if (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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc != 1) + QV4::Scope scope(b); + if (argc != 1) THROW_GENERIC_ERROR("Qt.md5(): Invalid arguments"); - QByteArray data = callData->args[0].toQStringNoThrow().toUtf8(); + QByteArray data = argv[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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc != 1) + QV4::Scope scope(b); + if (argc != 1) THROW_GENERIC_ERROR("Qt.btoa(): Invalid arguments"); - QByteArray data = callData->args[0].toQStringNoThrow().toUtf8(); + QByteArray data = argv[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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc != 1) + QV4::Scope scope(b); + if (argc != 1) THROW_GENERIC_ERROR("Qt.atob(): Invalid arguments"); - QByteArray data = callData->args[0].toQStringNoThrow().toLatin1(); + QByteArray data = argv[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 +1032,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 FunctionObject *b, const Value *, const Value *, int) { - QQmlEnginePrivate::get(scope.engine->qmlEngine())->sendQuit(); - scope.result = Encode::undefined(); + QQmlEnginePrivate::get(b->engine()->qmlEngine())->sendQuit(); + return Encode::undefined(); } /*! @@ -1033,15 +1049,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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc != 1) + QV4::Scope scope(b); + if (argc != 1) THROW_GENERIC_ERROR("Qt.exit(): Invalid arguments"); - int retCode = callData->args[0].toNumber(); + int retCode = argv[0].toNumber(); QQmlEnginePrivate::get(scope.engine->qmlEngine())->sendExit(retCode); - scope.result = QV4::Encode::undefined(); + return QV4::Encode::undefined(); } /*! @@ -1068,9 +1085,10 @@ 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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc < 2 || callData->argc > 3) + QV4::Scope scope(b); + if (argc < 2 || argc > 3) THROW_GENERIC_ERROR("Qt.createQmlObject(): Invalid arguments"); struct Error { @@ -1088,11 +1106,11 @@ void QtObject::method_createQmlObject(const BuiltinFunction *, Scope &scope, Cal const QQmlError &error = errors.at(ii); errorstr += QLatin1String("\n ") + error.toString(); qmlerror = v4->newObject(); - qmlerror->put((s = v4->newString(QStringLiteral("lineNumber"))), (v = QV4::Primitive::fromInt32(error.line()))); - qmlerror->put((s = v4->newString(QStringLiteral("columnNumber"))), (v = QV4::Primitive::fromInt32(error.column()))); + qmlerror->put((s = v4->newString(QStringLiteral("lineNumber"))), (v = QV4::Value::fromInt32(error.line()))); + qmlerror->put((s = v4->newString(QStringLiteral("columnNumber"))), (v = QV4::Value::fromInt32(error.column()))); qmlerror->put((s = v4->newString(QStringLiteral("fileName"))), (v = v4->newString(error.url().toString()))); qmlerror->put((s = v4->newString(QStringLiteral("message"))), (v = v4->newString(error.description()))); - qmlerrors->putIndexed(ii, qmlerror); + qmlerrors->put(ii, qmlerror); } v = v4->newString(errorstr); @@ -1102,39 +1120,43 @@ void QtObject::method_createQmlObject(const BuiltinFunction *, Scope &scope, Cal } }; - QV8Engine *v8engine = scope.engine->v8Engine; - QQmlEngine *engine = v8engine->engine(); + QQmlEngine *engine = scope.engine->qmlEngine(); QQmlContextData *context = scope.engine->callingQmlContext(); + if (!context) { + QQmlEngine *qmlEngine = scope.engine->qmlEngine(); + if (qmlEngine) + context = QQmlContextData::get(QQmlEnginePrivate::get(qmlEngine)->rootContext); + } Q_ASSERT(context); - QQmlContext *effectiveContext = 0; + QQmlContext *effectiveContext = nullptr; if (context->isPragmaLibraryContext) effectiveContext = engine->rootContext(); else effectiveContext = context->asQQmlContext(); Q_ASSERT(effectiveContext); - QString qml = callData->args[0].toQStringNoThrow(); + QString qml = argv[0].toQStringNoThrow(); if (qml.isEmpty()) RETURN_RESULT(Encode::null()); QUrl url; - if (callData->argc > 2) - url = QUrl(callData->args[2].toQStringNoThrow()); + if (argc > 2) + url = QUrl(argv[2].toQStringNoThrow()); else url = QUrl(QLatin1String("inline")); if (url.isValid() && url.isRelative()) url = context->resolvedUrl(url); - QObject *parentArg = 0; - QV4::Scoped<QV4::QObjectWrapper> qobjectWrapper(scope, callData->args[1]); + QObject *parentArg = nullptr; + QV4::Scoped<QV4::QObjectWrapper> qobjectWrapper(scope, argv[1]); if (!!qobjectWrapper) parentArg = qobjectWrapper->object(); if (!parentArg) THROW_GENERIC_ERROR("Qt.createQmlObject(): Missing parent object"); - QQmlTypeData *typeData = QQmlEnginePrivate::get(engine)->typeLoader.getType( + QQmlRefPointer<QQmlTypeData> typeData = QQmlEnginePrivate::get(engine)->typeLoader.getType( qml.toUtf8(), url, QQmlTypeLoader::Synchronous); Q_ASSERT(typeData->isCompleteOrError()); QQmlComponent component(engine); @@ -1150,6 +1172,10 @@ void QtObject::method_createQmlObject(const BuiltinFunction *, Scope &scope, Cal if (!component.isReady()) THROW_GENERIC_ERROR("Qt.createQmlObject(): Component is not ready"); + if (!effectiveContext->isValid()) { + THROW_GENERIC_ERROR("Qt.createQmlObject(): Cannot create a component in an invalid context"); + } + QObject *obj = component.beginCreate(effectiveContext); if (obj) { QQmlData::get(obj, true)->explicitIndestructibleSet = false; @@ -1168,13 +1194,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,45 +1246,50 @@ 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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc < 1 || callData->argc > 3) + QV4::Scope scope(b); + if (argc < 1 || argc > 3) THROW_GENERIC_ERROR("Qt.createComponent(): Invalid arguments"); - QV8Engine *v8engine = scope.engine->v8Engine; - QQmlEngine *engine = v8engine->engine(); + QQmlEngine *engine = scope.engine->qmlEngine(); QQmlContextData *context = scope.engine->callingQmlContext(); + if (!context) { + QQmlEngine *qmlEngine = scope.engine->qmlEngine(); + if (qmlEngine) + context = QQmlContextData::get(QQmlEnginePrivate::get(qmlEngine)->rootContext); + } Q_ASSERT(context); QQmlContextData *effectiveContext = context; if (context->isPragmaLibraryContext) - effectiveContext = 0; + effectiveContext = nullptr; - QString arg = callData->args[0].toQStringNoThrow(); + QString arg = argv[0].toQStringNoThrow(); if (arg.isEmpty()) RETURN_RESULT(QV4::Encode::null()); QQmlComponent::CompilationMode compileMode = QQmlComponent::PreferSynchronous; - QObject *parentArg = 0; + QObject *parentArg = nullptr; int consumedCount = 1; - if (callData->argc > 1) { - ScopedValue lastArg(scope, callData->args[callData->argc-1]); + if (argc > 1) { + ScopedValue lastArg(scope, argv[argc-1]); // The second argument could be the mode enum - if (callData->args[1].isInteger()) { - int mode = callData->args[1].integerValue(); + if (argv[1].isInteger()) { + int mode = argv[1].integerValue(); if (mode != int(QQmlComponent::PreferSynchronous) && mode != int(QQmlComponent::Asynchronous)) THROW_GENERIC_ERROR("Qt.createComponent(): Invalid arguments"); compileMode = QQmlComponent::CompilationMode(mode); consumedCount += 1; } else { // The second argument could be the parent only if there are exactly two args - if ((callData->argc != 2) || !(lastArg->isObject() || lastArg->isNull())) + if ((argc != 2) || !(lastArg->isObject() || lastArg->isNull())) THROW_GENERIC_ERROR("Qt.createComponent(): Invalid arguments"); } - if (consumedCount < callData->argc) { + if (consumedCount < argc) { if (lastArg->isObject()) { Scoped<QObjectWrapper> qobjectWrapper(scope, lastArg); if (qobjectWrapper) @@ -1267,7 +1297,7 @@ void QtObject::method_createComponent(const BuiltinFunction *, Scope &scope, Cal if (!parentArg) THROW_GENERIC_ERROR("Qt.createComponent(): Invalid parent object"); } else if (lastArg->isNull()) { - parentArg = 0; + parentArg = nullptr; } else { THROW_GENERIC_ERROR("Qt.createComponent(): Invalid parent object"); } @@ -1280,9 +1310,10 @@ 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); } +#if QT_CONFIG(qml_locale) /*! \qmlmethod Qt::locale(name) @@ -1303,31 +1334,37 @@ 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 FunctionObject *b, const Value *, const Value *argv, int argc) { + QV4::Scope scope(b); QString code; - if (callData->argc > 1) + if (argc > 1) THROW_GENERIC_ERROR("locale() requires 0 or 1 argument"); - if (callData->argc == 1 && !callData->args[0].isString()) + if (argc == 1 && !argv[0].isString()) THROW_TYPE_ERROR_WITH_MESSAGE("locale(): argument (locale code) must be a string"); - if (callData->argc == 1) - code = callData->args[0].toQStringNoThrow(); + if (argc == 1) + code = argv[0].toQStringNoThrow(); - scope.result = QQmlLocale::locale(scope.engine, code); + return QQmlLocale::locale(scope.engine, code); } +#endif -void Heap::QQmlBindingFunction::init(const QV4::FunctionObject *originalFunction) +void Heap::QQmlBindingFunction::init(const QV4::FunctionObject *bindingFunction) { - Scope scope(originalFunction->engine()); - ScopedContext context(scope, originalFunction->scope()); - FunctionObject::init(context, originalFunction->function()); + Scope scope(bindingFunction->engine()); + ScopedContext context(scope, bindingFunction->scope()); + FunctionObject::init(context, bindingFunction->function()); + this->bindingFunction.set(internalClass->engine, bindingFunction->d()); } QQmlSourceLocation QQmlBindingFunction::currentLocation() const { - QV4::StackFrame frame = engine()->currentStackFrame(); - return QQmlSourceLocation(frame.source, frame.line, 0); + QV4::CppStackFrame *frame = engine()->currentStackFrame; + if (frame->v4Function) // synchronous loading: + return QQmlSourceLocation(frame->source(), frame->lineNumber(), 0); + else // async loading: + return bindingFunction()->function->sourceLocation(); } DEFINE_OBJECT_VTABLE(QQmlBindingFunction); @@ -1370,31 +1407,29 @@ DEFINE_OBJECT_VTABLE(QQmlBindingFunction); \snippet qml/qtBinding.4.qml 0 - \note In \l {Qt Quick 1}, all function assignments were treated as - binding assignments. The Qt.binding() function is new to - \l {Qt Quick}{Qt Quick 2}. - \since 5.0 */ -void QtObject::method_binding(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_binding(const FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc != 1) + QV4::Scope scope(b); + if (argc != 1) THROW_GENERIC_ERROR("binding() requires 1 argument"); - const QV4::FunctionObject *f = callData->args[0].as<FunctionObject>(); + const QV4::FunctionObject *f = argv[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->allocate<QQmlBindingFunction>(f)); } -void QtObject::method_get_platform(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue QtObject::method_get_platform(const FunctionObject *b, const Value *thisObject, const Value *, int) { + QV4::Scope scope(b); // ### inefficient. Should be just a value based getter - Object *o = callData->thisObject.as<Object>(); + const Object *o = thisObject->as<Object>(); if (!o) THROW_TYPE_ERROR(); - QtObject *qt = o->as<QtObject>(); + const QtObject *qt = o->as<QtObject>(); if (!qt) THROW_TYPE_ERROR(); @@ -1402,16 +1437,17 @@ 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 FunctionObject *b, const Value *thisObject, const Value *, int) { + QV4::Scope scope(b); // ### inefficient. Should be just a value based getter - Object *o = callData->thisObject.as<Object>(); + const Object *o = thisObject->as<Object>(); if (!o) THROW_TYPE_ERROR(); - QtObject *qt = o->as<QtObject>(); + const QtObject *qt = o->as<QtObject>(); if (!qt) THROW_TYPE_ERROR(); @@ -1419,19 +1455,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 FunctionObject *b, const Value *, const Value *, int) { 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 FunctionObject *b, const Value *, const Value *, int) { QObject *o = QQml_guiProvider()->styleHints(); - scope.result = QV4::QObjectWrapper::wrap(scope.engine, o); + return QV4::QObjectWrapper::wrap(b->engine(), o); } @@ -1491,16 +1527,38 @@ static QString jsStack(QV4::ExecutionEngine *engine) { return stack; } -static void writeToConsole(const BuiltinFunction *, Scope &scope, CallData *callData, - ConsoleLogTypes logType, bool printStack = false) +static QString serializeArray(Object *array, ExecutionEngine *v4) { + Scope scope(v4); + ScopedValue val(scope); + QString result; + + result += QLatin1Char('['); + const uint length = array->getLength(); + for (uint i = 0; i < length; ++i) { + if (i != 0) + result += QLatin1Char(','); + val = array->get(i); + if (val->isManaged() && val->managed()->isArrayLike()) + result += serializeArray(val->objectValue(), v4); + else + result += val->toQStringNoThrow(); + } + result += QLatin1Char(']'); + + return result; +}; + +static ReturnedValue writeToConsole(const FunctionObject *b, const Value *, const Value *argv, int argc, + ConsoleLogTypes logType, bool printStack = false) { - QLoggingCategory *loggingCategory = 0; + QLoggingCategory *loggingCategory = nullptr; QString result; + QV4::Scope scope(b); QV4::ExecutionEngine *v4 = scope.engine; int start = 0; - if (callData->argc > 0) { - if (const QObjectWrapper* wrapper = callData->args[0].as<QObjectWrapper>()) { + if (argc > 0) { + if (const QObjectWrapper* wrapper = argv[0].as<QObjectWrapper>()) { if (QQmlLoggingCategory* category = qobject_cast<QQmlLoggingCategory*>(wrapper->object())) { if (category->category()) loggingCategory = category->category(); @@ -1512,14 +1570,14 @@ static void writeToConsole(const BuiltinFunction *, Scope &scope, CallData *call } - for (int i = start; i < callData->argc; ++i) { + for (int i = start, ei = argc; i < ei; ++i) { if (i != start) result.append(QLatin1Char(' ')); - if (callData->args[i].as<ArrayObject>()) - result += QLatin1Char('[') + callData->args[i].toQStringNoThrow() + QLatin1Char(']'); + if (argv[i].isManaged() && argv[i].managed()->isArrayLike()) + result.append(serializeArray(argv[i].objectValue(), v4)); else - result.append(callData->args[i].toQStringNoThrow()); + result.append(argv[i].toQStringNoThrow()); } if (printStack) @@ -1530,10 +1588,10 @@ static void writeToConsole(const BuiltinFunction *, Scope &scope, CallData *call if (!loggingCategory) loggingCategory = v4->qmlEngine() ? &qmlLoggingCategory : &jsLoggingCategory; - QV4::StackFrame frame = v4->currentStackFrame(); - const QByteArray baSource = frame.source.toUtf8(); - const QByteArray baFunction = frame.function.toUtf8(); - QMessageLogger logger(baSource.constData(), frame.line, baFunction.constData(), loggingCategory->categoryName()); + QV4::CppStackFrame *frame = v4->currentStackFrame; + const QByteArray baSource = frame->source().toUtf8(); + const QByteArray baFunction = frame->function().toUtf8(); + QMessageLogger logger(baSource.constData(), frame->lineNumber(), baFunction.constData(), loggingCategory->categoryName()); switch (logType) { case Log: @@ -1556,37 +1614,38 @@ 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 FunctionObject *b, const Value *thisObject, const Value *argv, int argc) { - writeToConsole(b, scope, callData, Error); + return writeToConsole(b, thisObject, argv, argc, Error); } -void ConsoleObject::method_log(const BuiltinFunction *b, Scope &scope, CallData *callData) +ReturnedValue ConsoleObject::method_log(const FunctionObject *b, const Value *thisObject, const Value *argv, int argc) { //console.log //console.debug //print - writeToConsole(b, scope, callData, Log); + return writeToConsole(b, thisObject, argv, argc, Log); } -void ConsoleObject::method_info(const BuiltinFunction *b, Scope &scope, CallData *callData) +ReturnedValue ConsoleObject::method_info(const FunctionObject *b, const Value *thisObject, const Value *argv, int argc) { - writeToConsole(b, scope, callData, Info); + return writeToConsole(b, thisObject, argv, argc, Info); } -void ConsoleObject::method_profile(const BuiltinFunction *, Scope &scope, CallData *) +ReturnedValue ConsoleObject::method_profile(const FunctionObject *b, const Value *, const Value *, int) { + QV4::Scope scope(b); QV4::ExecutionEngine *v4 = scope.engine; - QV4::StackFrame frame = v4->currentStackFrame(); - const QByteArray baSource = frame.source.toUtf8(); - const QByteArray baFunction = frame.function.toUtf8(); - QMessageLogger logger(baSource.constData(), frame.line, baFunction.constData()); + QV4::CppStackFrame *frame = v4->currentStackFrame; + const QByteArray baSource = frame->source().toUtf8(); + const QByteArray baFunction = frame->function().toUtf8(); + QMessageLogger logger(baSource.constData(), frame->lineNumber(), baFunction.constData()); QQmlProfilerService *service = QQmlDebugConnector::service<QQmlProfilerService>(); if (!service) { logger.warning("Cannot start profiling because debug service is disabled. Start with -qmljsdebugger=port:XXXXX."); @@ -1595,17 +1654,18 @@ 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 FunctionObject *b, const Value *, const Value *, int) { + QV4::Scope scope(b); QV4::ExecutionEngine *v4 = scope.engine; - QV4::StackFrame frame = v4->currentStackFrame(); - const QByteArray baSource = frame.source.toUtf8(); - const QByteArray baFunction = frame.function.toUtf8(); - QMessageLogger logger(baSource.constData(), frame.line, baFunction.constData()); + QV4::CppStackFrame *frame = v4->currentStackFrame; + const QByteArray baSource = frame->source().toUtf8(); + const QByteArray baFunction = frame->function().toUtf8(); + QMessageLogger logger(baSource.constData(), frame->lineNumber(), baFunction.constData()); QQmlProfilerService *service = QQmlDebugConnector::service<QQmlProfilerService>(); if (!service) { @@ -1615,118 +1675,122 @@ 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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc != 1) + QV4::Scope scope(b); + if (argc != 1) THROW_GENERIC_ERROR("console.time(): Invalid arguments"); QV8Engine *v8engine = scope.engine->v8Engine; - QString name = callData->args[0].toQStringNoThrow(); + QString name = argv[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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc != 1) + QV4::Scope scope(b); + if (argc != 1) THROW_GENERIC_ERROR("console.timeEnd(): Invalid arguments"); QV8Engine *v8engine = scope.engine->v8Engine; - QString name = callData->args[0].toQStringNoThrow(); + QString name = argv[0].toQStringNoThrow(); bool wasRunning; qint64 elapsed = v8engine->stopTimer(name, &wasRunning); 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 FunctionObject *b, const Value *, const Value *argv, int argc) { // first argument: name to print. Ignore any additional arguments QString name; - if (callData->argc > 0) - name = callData->args[0].toQStringNoThrow(); + if (argc > 0) + name = argv[0].toQStringNoThrow(); + Scope scope(b); QV4::ExecutionEngine *v4 = scope.engine; QV8Engine *v8engine = scope.engine->v8Engine; - QV4::StackFrame frame = v4->currentStackFrame(); + QV4::CppStackFrame *frame = v4->currentStackFrame; - QString scriptName = frame.source; + QString scriptName = frame->source(); - int value = v8engine->consoleCountHelper(scriptName, frame.line, frame.column); + int value = v8engine->consoleCountHelper(scriptName, frame->lineNumber(), 0); QString message = name + QLatin1String(": ") + QString::number(value); - QMessageLogger(qPrintable(scriptName), frame.line, - qPrintable(frame.function)) + QMessageLogger(qPrintable(scriptName), frame->lineNumber(), + 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 FunctionObject *b, const Value *, const Value *, int argc) { - if (callData->argc != 0) + QV4::Scope scope(b); + if (argc != 0) THROW_GENERIC_ERROR("console.trace(): Invalid arguments"); QV4::ExecutionEngine *v4 = scope.engine; QString stack = jsStack(v4); - QV4::StackFrame frame = v4->currentStackFrame(); - QMessageLogger(frame.source.toUtf8().constData(), frame.line, - frame.function.toUtf8().constData()) + QV4::CppStackFrame *frame = v4->currentStackFrame; + QMessageLogger(frame->source().toUtf8().constData(), frame->lineNumber(), + 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 FunctionObject *b, const Value *thisObject, const Value *argv, int argc) { - return writeToConsole(b, scope, callData, Warn); + return writeToConsole(b, thisObject, argv, argc, Warn); } -void ConsoleObject::method_assert(const BuiltinFunction *, Scope &scope, CallData *callData) +ReturnedValue ConsoleObject::method_assert(const FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc == 0) + QV4::Scope scope(b); + if (argc == 0) THROW_GENERIC_ERROR("console.assert(): Missing argument"); QV4::ExecutionEngine *v4 = scope.engine; - if (!callData->args[0].toBoolean()) { + if (!argv[0].toBoolean()) { QString message; - for (int i = 1; i < callData->argc; ++i) { + for (int i = 1, ei = argc; i < ei; ++i) { if (i != 1) message.append(QLatin1Char(' ')); - message.append(callData->args[i].toQStringNoThrow()); + message.append(argv[i].toQStringNoThrow()); } QString stack = jsStack(v4); - QV4::StackFrame frame = v4->currentStackFrame(); - QMessageLogger(frame.source.toUtf8().constData(), frame.line, - frame.function.toUtf8().constData()) + QV4::CppStackFrame *frame = v4->currentStackFrame; + QMessageLogger(frame->source().toUtf8().constData(), frame->lineNumber(), + frame->function().toUtf8().constData()) .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 FunctionObject *b, const Value *thisObject, const Value *argv, int argc) { - if (callData->argc == 0) + QV4::Scope scope(b); + if (argc == 0) THROW_GENERIC_ERROR("console.exception(): Missing argument"); - writeToConsole(b, scope, callData, Error, true); - - scope.result = QV4::Encode::undefined(); + return writeToConsole(b, thisObject, argv, argc, Error, true); } @@ -1754,7 +1818,7 @@ void QV4::GlobalExtensions::init(Object *globalObject, QJSEngine::Extensions ext globalObject->defineDefaultProperty(QStringLiteral("print"), QV4::ConsoleObject::method_log); - QV4::ScopedObject console(scope, globalObject->engine()->memoryManager->allocObject<QV4::ConsoleObject>()); + QV4::ScopedObject console(scope, globalObject->engine()->memoryManager->allocate<QV4::ConsoleObject>()); globalObject->defineDefaultProperty(QStringLiteral("console"), console); } @@ -1782,38 +1846,43 @@ 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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc < 2) + QV4::Scope scope(b); + if (argc < 2) THROW_GENERIC_ERROR("qsTranslate() requires at least two arguments"); - if (!callData->args[0].isString()) + if (!argv[0].isString()) THROW_GENERIC_ERROR("qsTranslate(): first argument (context) must be a string"); - if (!callData->args[1].isString()) + if (!argv[1].isString()) THROW_GENERIC_ERROR("qsTranslate(): second argument (sourceText) must be a string"); - if ((callData->argc > 2) && !callData->args[2].isString()) + if ((argc > 2) && !argv[2].isString()) THROW_GENERIC_ERROR("qsTranslate(): third argument (disambiguation) must be a string"); - QString context = callData->args[0].toQStringNoThrow(); - QString text = callData->args[1].toQStringNoThrow(); + QString context = argv[0].toQStringNoThrow(); + QString text = argv[1].toQStringNoThrow(); QString comment; - if (callData->argc > 2) comment = callData->args[2].toQStringNoThrow(); + if (argc > 2) comment = argv[2].toQStringNoThrow(); int i = 3; - if (callData->argc > i && callData->args[i].isString()) { + if (argc > i && argv[i].isString()) { qWarning("qsTranslate(): specifying the encoding as fourth argument is deprecated"); ++i; } int n = -1; - if (callData->argc > i) - n = callData->args[i].toInt32(); + if (argc > i) + n = argv[i].toInt32(); + + if (QQmlEnginePrivate *ep = (scope.engine->qmlEngine() ? QQmlEnginePrivate::get(scope.engine->qmlEngine()) : nullptr)) + if (ep->propertyCapture) + ep->propertyCapture->captureTranslation(); 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)); } /*! @@ -1838,12 +1907,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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc < 2) - scope.result = QV4::Encode::undefined(); + QV4::Scope scope(b); + if (argc < 2) + return QV4::Encode::undefined(); else - scope.result = callData->args[1]; + return argv[1].asReturnedValue(); } /*! @@ -1863,15 +1933,16 @@ 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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc < 1) + QV4::Scope scope(b); + if (argc < 1) THROW_GENERIC_ERROR("qsTr() requires at least one argument"); - if (!callData->args[0].isString()) + if (!argv[0].isString()) THROW_GENERIC_ERROR("qsTr(): first argument (sourceText) must be a string"); - if ((callData->argc > 1) && !callData->args[1].isString()) + if ((argc > 1) && !argv[1].isString()) THROW_GENERIC_ERROR("qsTr(): second argument (disambiguation) must be a string"); - if ((callData->argc > 2) && !callData->args[2].isNumber()) + if ((argc > 2) && !argv[2].isNumber()) THROW_GENERIC_ERROR("qsTr(): third argument (n) must be a number"); QString context; @@ -1882,10 +1953,10 @@ void GlobalExtensions::method_qsTr(const BuiltinFunction *, Scope &scope, CallDa int length = lastDot - (lastSlash + 1); context = (lastSlash > -1) ? path.mid(lastSlash + 1, (length > -1) ? length : -1) : QString(); } else { - ExecutionContext *parentCtx = scope.engine->currentContext; + CppStackFrame *frame = scope.engine->currentStackFrame; // The first non-empty source URL in the call stack determines the translation context. - while (!!parentCtx && context.isEmpty()) { - if (CompiledData::CompilationUnit *unit = static_cast<CompiledData::CompilationUnit*>(parentCtx->d()->compilationUnit)) { + while (frame && context.isEmpty()) { + if (CompiledData::CompilationUnit *unit = frame->v4Function->compilationUnit) { QString fileName = unit->fileName(); QUrl url(unit->fileName()); if (url.isValid() && url.isRelative()) { @@ -1897,22 +1968,26 @@ void GlobalExtensions::method_qsTr(const BuiltinFunction *, Scope &scope, CallDa } context = QFileInfo(context).baseName(); } - parentCtx = scope.engine->parentContext(parentCtx); + frame = frame->parent; } } - QString text = callData->args[0].toQStringNoThrow(); + QString text = argv[0].toQStringNoThrow(); QString comment; - if (callData->argc > 1) - comment = callData->args[1].toQStringNoThrow(); + if (argc > 1) + comment = argv[1].toQStringNoThrow(); int n = -1; - if (callData->argc > 2) - n = callData->args[2].toInt32(); + if (argc > 2) + n = argv[2].toInt32(); + + if (QQmlEnginePrivate *ep = (scope.engine->qmlEngine() ? QQmlEnginePrivate::get(scope.engine->qmlEngine()) : nullptr)) + if (ep->propertyCapture) + ep->propertyCapture->captureTranslation(); 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 +2012,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 FunctionObject *, const Value *, const Value *argv, int argc) { - if (callData->argc < 1) - scope.result = QV4::Encode::undefined(); + if (argc < 1) + return QV4::Encode::undefined(); else - scope.result = callData->args[0]; + return argv[0].asReturnedValue(); } /*! @@ -1975,20 +2050,25 @@ 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 FunctionObject *b, const Value *, const Value *argv, int argc) { - if (callData->argc < 1) + QV4::Scope scope(b); + if (argc < 1) THROW_GENERIC_ERROR("qsTrId() requires at least one argument"); - if (!callData->args[0].isString()) + if (!argv[0].isString()) THROW_TYPE_ERROR_WITH_MESSAGE("qsTrId(): first argument (id) must be a string"); - if (callData->argc > 1 && !callData->args[1].isNumber()) + if (argc > 1 && !argv[1].isNumber()) THROW_TYPE_ERROR_WITH_MESSAGE("qsTrId(): second argument (n) must be a number"); int n = -1; - if (callData->argc > 1) - n = callData->args[1].toInt32(); + if (argc > 1) + n = argv[1].toInt32(); + + if (QQmlEnginePrivate *ep = (scope.engine->qmlEngine() ? QQmlEnginePrivate::get(scope.engine->qmlEngine()) : nullptr)) + if (ep->propertyCapture) + ep->propertyCapture->captureTranslation(); - scope.result = scope.engine->newString(qtTrId(callData->args[0].toQStringNoThrow().toUtf8().constData(), n)); + return Encode(scope.engine->newString(qtTrId(argv[0].toQStringNoThrow().toUtf8().constData(), n))); } /*! @@ -2007,33 +2087,34 @@ 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 FunctionObject *, const Value *, const Value *argv, int argc) { - if (callData->argc < 1) - scope.result = QV4::Encode::undefined(); + if (argc < 1) + return QV4::Encode::undefined(); else - scope.result = callData->args[0]; + return argv[0].asReturnedValue(); } #endif // translation -void GlobalExtensions::method_gc(const BuiltinFunction *, Scope &scope, CallData *) +ReturnedValue GlobalExtensions::method_gc(const FunctionObject *b, const Value *, const Value *, int) { - 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 FunctionObject *b, const Value *thisObject, const Value *argv, int argc) { - if (callData->argc != 1) + QV4::Scope scope(b); + if (argc != 1) THROW_GENERIC_ERROR("String.arg(): Invalid arguments"); - QString value = callData->thisObject.toQString(); + QString value = thisObject->toQString(); - QV4::ScopedValue arg(scope, callData->args[0]); + QV4::ScopedValue arg(scope, argv[0]); if (arg->isInteger()) RETURN_RESULT(scope.engine->newString(value.arg(arg->integerValue()))); else if (arg->isDouble()) @@ -2064,10 +2145,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 FunctionObject *b, const Value *thisObject, const Value *argv, int argc) { - QV8Engine *v8engine = scope.engine->v8Engine; - v8engine->delayedCallQueue()->addUniquelyAndExecuteLater(b, scope, callData); + QV8Engine *v8engine = b->engine()->v8Engine; + return v8engine->delayedCallQueue()->addUniquelyAndExecuteLater(b, thisObject, argv, argc); } QT_END_NAMESPACE |