diff options
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/jsruntime/qv4arrayobject.cpp | 4 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4functionobject.cpp | 4 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4jsonobject.cpp | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4managed_p.h | 12 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4objectproto.cpp | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4qobjectwrapper.cpp | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4regexpobject.cpp | 11 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4runtime.cpp | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4scopedvalue_p.h | 39 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4script.cpp | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4sequenceobject.cpp | 4 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4serialize.cpp | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4value_def_p.h | 18 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4value_p.h | 12 | ||||
-rw-r--r-- | src/qml/qml/qqmlvmemetaobject.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlxmlhttprequest.cpp | 2 | ||||
-rw-r--r-- | src/qml/types/qqmldelegatemodel.cpp | 2 |
17 files changed, 60 insertions, 62 deletions
diff --git a/src/qml/jsruntime/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp index 6f19597e6e..92fa196331 100644 --- a/src/qml/jsruntime/qv4arrayobject.cpp +++ b/src/qml/jsruntime/qv4arrayobject.cpp @@ -523,7 +523,7 @@ ReturnedValue ArrayPrototype::method_unshift(SimpleCallContext *ctx) --instance->arrayAttributes; *instance->arrayAttributes = Attr_Data; } - instance->arrayData->value = v; + instance->arrayData->value = v.asReturnedValue(); } else { uint idx = instance->allocArrayValue(v); instance->sparseArray->push_front(idx); @@ -643,7 +643,7 @@ ReturnedValue ArrayPrototype::method_every(SimpleCallContext *ctx) ctx->throwTypeError(); ScopedCallData callData(scope, 3); - callData->args[2] = instance.asValue(); + callData->args[2] = instance; callData->thisObject = ctx->argument(1); ScopedValue r(scope); ScopedValue v(scope); diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp index 11580b00c4..7ef0b96f17 100644 --- a/src/qml/jsruntime/qv4functionobject.cpp +++ b/src/qml/jsruntime/qv4functionobject.cpp @@ -144,7 +144,7 @@ void FunctionObject::init(const StringRef n, bool createProto) if (createProto) { Scoped<Object> proto(s, scope->engine->newObject(scope->engine->protoClass)); proto->memberData[Index_ProtoConstructor].value = this->asReturnedValue(); - memberData[Index_Prototype].value = proto.asValue(); + memberData[Index_Prototype].value = proto.asReturnedValue(); } ScopedValue v(s, n.asReturnedValue()); @@ -443,7 +443,7 @@ ReturnedValue ScriptFunction::construct(Managed *that, CallData *callData) ScopedObject obj(scope, v4->newObject(ic)); ExecutionContext *context = v4->current; - callData->thisObject = obj.asValue(); + callData->thisObject = obj.asReturnedValue(); ExecutionContext *ctx = context->newCallContext(f.getPointer(), callData); ScopedValue result(scope); diff --git a/src/qml/jsruntime/qv4jsonobject.cpp b/src/qml/jsruntime/qv4jsonobject.cpp index 10d30756a1..2295fb5aa8 100644 --- a/src/qml/jsruntime/qv4jsonobject.cpp +++ b/src/qml/jsruntime/qv4jsonobject.cpp @@ -285,7 +285,7 @@ bool JsonParser::parseMember(ObjectRef o) ScopedString s(scope, context->engine->newIdentifier(key)); Property *p = o->insertMember(s, Attr_Data); - p->value = val; + p->value = val.asReturnedValue(); END; return true; diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h index aca41bed06..d189c1961b 100644 --- a/src/qml/jsruntime/qv4managed_p.h +++ b/src/qml/jsruntime/qv4managed_p.h @@ -61,18 +61,6 @@ inline int qYouForgotTheQ_MANAGED_Macro(T, T) { return 0; } template <typename T1, typename T2> inline void qYouForgotTheQ_MANAGED_Macro(T1, T2) {} -template <typename T> -struct Returned : private T -{ - static Returned<T> *create(T *t) { return static_cast<Returned<T> *>(t); } - T *getPointer() { return this; } - template<typename X> - static T *getPointer(Returned<X> *x) { return x->getPointer(); } - template<typename X> - Returned<X> *as() { return Returned<X>::create(Returned<X>::getPointer(this)); } - using T::asReturnedValue; -}; - #define Q_MANAGED \ public: \ Q_MANAGED_CHECK \ diff --git a/src/qml/jsruntime/qv4objectproto.cpp b/src/qml/jsruntime/qv4objectproto.cpp index 4693834144..21cbc8d7fd 100644 --- a/src/qml/jsruntime/qv4objectproto.cpp +++ b/src/qml/jsruntime/qv4objectproto.cpp @@ -185,7 +185,7 @@ ReturnedValue ObjectPrototype::method_create(SimpleCallContext *ctx) newObject->setPrototype(O->asObject()); if (ctx->callData->argc > 1 && !ctx->callData->args[1].isUndefined()) { - ctx->callData->args[0] = newObject.asValue(); + ctx->callData->args[0] = newObject.asReturnedValue(); return method_defineProperties(ctx); } diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index 90a1950395..92cfdd8301 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -1640,7 +1640,7 @@ QV4::ReturnedValue CallArgument::toValue(QV8Engine *engine) } else if (type == -1 || type == qMetaTypeId<QVariant>()) { QVariant value = *qvariantPtr; QV4::ScopedValue rv(scope, engine->fromVariant(value)); - if (QV4::QObjectWrapper *qobjectWrapper = rv->as<QV4::QObjectWrapper>()) { + if (QV4::Referenced<QObjectWrapper> qobjectWrapper = rv->asRef<QV4::QObjectWrapper>()) { if (QObject *object = qobjectWrapper->object()) QQmlData::get(object, true)->setImplicitDestructible(); } diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp index 899938faae..9c7fe94759 100644 --- a/src/qml/jsruntime/qv4regexpobject.cpp +++ b/src/qml/jsruntime/qv4regexpobject.cpp @@ -243,7 +243,8 @@ ReturnedValue RegExpCtor::construct(Managed *m, CallData *callData) ScopedValue r(scope, callData->argument(0)); ScopedValue f(scope, callData->argument(1)); - if (RegExpObject *re = r->as<RegExpObject>()) { + Scoped<RegExpObject> re(scope, r); + if (re) { if (!f->isUndefined()) ctx->throwTypeError(); @@ -273,11 +274,11 @@ ReturnedValue RegExpCtor::construct(Managed *m, CallData *callData) } } - RegExp* re = RegExp::create(ctx->engine, pattern, ignoreCase, multiLine); - if (!re->isValid()) + RegExp *regexp = RegExp::create(ctx->engine, pattern, ignoreCase, multiLine); + if (!regexp->isValid()) ctx->throwSyntaxError(0); - return Encode(ctx->engine->newRegExpObject(re, global)); + return Encode(ctx->engine->newRegExpObject(regexp, global)); } ReturnedValue RegExpCtor::call(Managed *that, CallData *callData) @@ -341,7 +342,7 @@ ReturnedValue RegExpPrototype::method_exec(SimpleCallContext *ctx) array->setArrayLengthUnchecked(len); array->memberData[Index_ArrayIndex].value = Primitive::fromInt32(result); - array->memberData[Index_ArrayInput].value = arg; + array->memberData[Index_ArrayInput].value = arg.asReturnedValue(); if (r->global) r->lastIndexProperty(ctx)->value = Primitive::fromInt32(matchOffsets[1]); diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp index b5c48af9e7..95fe39ba5a 100644 --- a/src/qml/jsruntime/qv4runtime.cpp +++ b/src/qml/jsruntime/qv4runtime.cpp @@ -782,7 +782,7 @@ ReturnedValue __qmljs_call_property(ExecutionContext *context, const StringRef n } baseObject = __qmljs_convert_to_object(context, ValueRef(&callData->thisObject)); - callData->thisObject = baseObject.asValue(); + callData->thisObject = baseObject.asReturnedValue(); } Scoped<FunctionObject> o(scope, baseObject->get(name)); diff --git a/src/qml/jsruntime/qv4scopedvalue_p.h b/src/qml/jsruntime/qv4scopedvalue_p.h index a1f6f4b2ac..2e39f035fe 100644 --- a/src/qml/jsruntime/qv4scopedvalue_p.h +++ b/src/qml/jsruntime/qv4scopedvalue_p.h @@ -169,18 +169,14 @@ struct ScopedValue return *this; } - Value *operator->() { + SafeValue *operator->() { return ptr; } - const Value *operator->() const { + const SafeValue *operator->() const { return ptr; } - operator const Value &() const { - return *ptr; - } - ReturnedValue asReturnedValue() const { return ptr->val; } SafeValue *ptr; @@ -326,12 +322,6 @@ struct Scoped return static_cast<T *>(ptr->managed()); } - Value asValue() const { - if (ptr->m) - return *ptr; - return QV4::Primitive::undefinedValue(); - } - ReturnedValue asReturnedValue() const { #if QT_POINTER_SIZE == 8 return ptr->val ? ptr->val : Primitive::undefinedValue().asReturnedValue(); @@ -427,7 +417,7 @@ struct ValueRef { operator Value *() { return ptr; } - Value *operator->() { + SafeValue *operator->() { return ptr; } @@ -479,14 +469,14 @@ struct Referenced { } operator const T *() const { - return static_cast<T*>(ptr->managed()); + return ptr ? static_cast<T*>(ptr->managed()) : 0; } const T *operator->() const { return static_cast<T*>(ptr->managed()); } operator T *() { - return static_cast<T*>(ptr->managed()); + return ptr ? static_cast<T*>(ptr->managed()) : 0; } T *operator->() { return static_cast<T*>(ptr->managed()); @@ -496,6 +486,19 @@ struct Referenced { return static_cast<T *>(ptr->managed()); } ReturnedValue asReturnedValue() const { return ptr ? ptr->val : Primitive::undefinedValue().asReturnedValue(); } + operator Returned<T> *() const { return ptr ? Returned<T>::create(getPointer()) : 0; } + + bool operator==(const Referenced<T> &other) { + if (ptr == other.ptr) + return true; + return ptr && other.ptr && ptr->m == other.ptr->m; + } + bool operator!=(const Referenced<T> &other) { + if (ptr == other.ptr) + return false; + return !ptr || ptr->m != other.ptr->m; + } + bool operator!() const { return !ptr || !ptr->managed(); } static Referenced null() { return Referenced(Null); } bool isNull() const { return !ptr; } @@ -642,6 +645,12 @@ inline Returned<T> *SafeValue::as() return Returned<T>::create(value_cast<T>(*this)); } +template<typename T> inline +Referenced<T> SafeValue::asRef() +{ + return Referenced<T>(*this); +} + template<typename T> inline Safe<T> &Safe<T>::operator =(T *t) { diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp index 2350224c32..0dddbe87e7 100644 --- a/src/qml/jsruntime/qv4script.cpp +++ b/src/qml/jsruntime/qv4script.cpp @@ -152,7 +152,7 @@ Script::Script(ExecutionEngine *v4, ObjectRef qml, CompiledData::CompilationUnit vmFunction = compilationUnit->linkToEngine(v4); Q_ASSERT(vmFunction); Scope valueScope(v4); - ScopedValue holder(valueScope, Value::fromObject(new (v4->memoryManager) CompilationUnitHolder(v4, compilationUnit))); + ScopedValue holder(valueScope, new (v4->memoryManager) CompilationUnitHolder(v4, compilationUnit)); compilationUnitHolder = holder; } else vmFunction = 0; diff --git a/src/qml/jsruntime/qv4sequenceobject.cpp b/src/qml/jsruntime/qv4sequenceobject.cpp index 10293a7d9e..5c8f7db97e 100644 --- a/src/qml/jsruntime/qv4sequenceobject.cpp +++ b/src/qml/jsruntime/qv4sequenceobject.cpp @@ -575,7 +575,7 @@ bool SequencePrototype::isSequenceType(int sequenceTypeId) #define NEW_REFERENCE_SEQUENCE(ElementType, ElementTypeName, SequenceType, unused) \ if (sequenceType == qMetaTypeId<SequenceType>()) { \ - QV4::Scoped<QV4::Object> obj(scope, QV4::Value::fromObject(new (engine->memoryManager) QQml##ElementTypeName##List(engine, object, propertyIndex))); \ + QV4::Scoped<QV4::Object> obj(scope, new (engine->memoryManager) QQml##ElementTypeName##List(engine, object, propertyIndex)); \ return obj.asReturnedValue(); \ } else @@ -593,7 +593,7 @@ ReturnedValue SequencePrototype::newSequence(QV4::ExecutionEngine *engine, int s #define NEW_COPY_SEQUENCE(ElementType, ElementTypeName, SequenceType, unused) \ if (sequenceType == qMetaTypeId<SequenceType>()) { \ - QV4::Scoped<QV4::Object> obj(scope, QV4::Value::fromObject(new (engine->memoryManager) QQml##ElementTypeName##List(engine, v.value<SequenceType >()))); \ + QV4::Scoped<QV4::Object> obj(scope, new (engine->memoryManager) QQml##ElementTypeName##List(engine, v.value<SequenceType >())); \ return obj.asReturnedValue(); \ } else diff --git a/src/qml/jsruntime/qv4serialize.cpp b/src/qml/jsruntime/qv4serialize.cpp index f775a44858..7d3214e8f8 100644 --- a/src/qml/jsruntime/qv4serialize.cpp +++ b/src/qml/jsruntime/qv4serialize.cpp @@ -392,7 +392,7 @@ ReturnedValue Serialize::deserialize(const char *&data, QV8Engine *engine) array->arrayReserve(seqLength); for (quint32 ii = 0; ii < seqLength; ++ii) { value = deserialize(data, engine); - array->arrayData[ii].value = value; + array->arrayData[ii].value = value.asReturnedValue(); array->arrayDataLen = ii + 1; } array->setArrayLengthUnchecked(seqLength); diff --git a/src/qml/jsruntime/qv4value_def_p.h b/src/qml/jsruntime/qv4value_def_p.h index 11b70ef37c..f552798a4b 100644 --- a/src/qml/jsruntime/qv4value_def_p.h +++ b/src/qml/jsruntime/qv4value_def_p.h @@ -50,6 +50,18 @@ namespace QV4 { typedef uint Bool; +template <typename T> +struct Returned : private T +{ + static Returned<T> *create(T *t) { return static_cast<Returned<T> *>(t); } + T *getPointer() { return this; } + template<typename X> + static T *getPointer(Returned<X> *x) { return x->getPointer(); } + template<typename X> + Returned<X> *as() { return Returned<X>::create(Returned<X>::getPointer(this)); } + using T::asReturnedValue; +}; + struct Q_QML_EXPORT Value { /* @@ -273,7 +285,6 @@ struct Q_QML_EXPORT Value return val; } - static Value fromObject(Object *o); static Value fromManaged(Managed *o); int toUInt16() const; @@ -349,9 +360,10 @@ struct SafeValue : public Value val = v.val; return *this; } - template<typename T> - Returned<T> *as(); + inline Returned<T> *as(); + template<typename T> + inline Referenced<T> asRef(); }; struct Q_QML_EXPORT Primitive : public Value diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h index e751a07992..507c0f9575 100644 --- a/src/qml/jsruntime/qv4value_p.h +++ b/src/qml/jsruntime/qv4value_p.h @@ -165,18 +165,6 @@ inline Primitive Primitive::fromUInt32(uint i) return v; } -inline Value Value::fromObject(Object *o) -{ - Value v; -#if QT_POINTER_SIZE == 8 - v.o = o; -#else - v.tag = Managed_Type; - v.o = o; -#endif - return v; -} - inline Value Value::fromManaged(Managed *m) { if (!m) diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp index dfba6bb3b6..ecc6287823 100644 --- a/src/qml/qml/qqmlvmemetaobject.cpp +++ b/src/qml/qml/qqmlvmemetaobject.cpp @@ -1085,7 +1085,7 @@ void QQmlVMEMetaObject::writeProperty(int id, const QVariant &value) // And, if the new value is a scarce resource, we need to ensure that it does not get // automatically released by the engine until no other references to it exist. QV4::ScopedValue newv(scope, QQmlEnginePrivate::get(ctxt->engine)->v8engine()->fromVariant(value)); - if (QV4::VariantObject *v = newv->as<QV4::VariantObject>()) + if (QV4::Referenced<QV4::VariantObject> v = newv->asRef<QV4::VariantObject>()) v->addVmePropertyReference(); // Write the value and emit change signal as appropriate. diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp index 066a266991..3097031765 100644 --- a/src/qml/qml/qqmlxmlhttprequest.cpp +++ b/src/qml/qml/qqmlxmlhttprequest.cpp @@ -1560,7 +1560,7 @@ void QQmlXMLHttpRequest::dispatchCallback(const ValueRef me) QQmlContextData *callingContext = QmlContextWrapper::getContext(activationObject); if (callingContext) { QV4::ScopedCallData callData(scope, 0); - callData->thisObject = activationObject.asValue(); + callData->thisObject = activationObject.asReturnedValue(); callback->call(callData); } diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index b87ed63f2b..bfce21f7ea 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -3226,7 +3226,7 @@ public: if (!array) m->engine()->current->throwTypeError(); - if (name == m->engine()->id_length) { + if (name->isEqualTo(m->engine()->id_length)) { if (hasProperty) *hasProperty = true; return QV4::Encode(array->count()); |