, memberIndex(0)
, flags(flags)
{
- object->o = (Object*)0;
- current->o = (Object*)0;
+ object->m = (Object*)0;
+ current->m = (Object*)0;
// Caller needs to call init!
}
void ObjectIterator::init(Object *o)
{
- object->o = o;
- current->o = o;
+ object->m = o;
+ current->m = o;
#if QT_POINTER_SIZE == 4
object->tag = QV4::Value::Managed_Type;
}
if (flags & WithProtoChain)
- current->o = current->objectValue()->prototype();
+ current->m = current->objectValue()->prototype();
else
- current->o = (Object *)0;
+ current->m = (Object *)0;
arrayIndex = 0;
memberIndex = 0;
Scope scope(context);
ScopedObject base(scope);
- ScopedValue func(scope, context->getPropertyAndBase(name, base.ptr->o));
+ Object *baseObj = base.ptr->objectValue();
+ ScopedValue func(scope, context->getPropertyAndBase(name, baseObj));
+ base.ptr->m = baseObj;
if (scope.engine->hasException)
return Encode::undefined();
quint64 val;
#if QT_POINTER_SIZE == 8
Managed *m;
- Object *o;
- String *s;
#else
double dbl;
#endif
int int_32;
#if QT_POINTER_SIZE == 4
Managed *m;
- Object *o;
- String *s;
#endif
};
#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
}
String *stringValue() const {
- return s;
+ return reinterpret_cast<String*>(m);
}
Object *objectValue() const {
- return o;
+ return reinterpret_cast<Object*>(m);
}
Managed *managed() const {
return m;
return val;
}
- static inline Value fromManaged(Managed *o);
+ static inline Value fromManaged(Managed *m);
int toUInt16() const;
inline int toInt32() const;