aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/v4/qv4engine.cpp2
-rw-r--r--src/v4/qv4functionobject.cpp6
-rw-r--r--src/v4/qv4global.h14
-rw-r--r--src/v4/qv4internalclass.cpp10
-rw-r--r--src/v4/qv4internalclass.h6
-rw-r--r--src/v4/qv4jsonobject.cpp2
-rw-r--r--src/v4/qv4managed.h4
-rw-r--r--src/v4/qv4object.cpp24
-rw-r--r--src/v4/qv4object.h6
-rw-r--r--src/v4/qv4propertydescriptor.h45
-rw-r--r--src/v4/qv4regexp.cpp8
-rw-r--r--src/v4/qv4regexp.h4
-rw-r--r--src/v4/qv4regexpobject.cpp3
-rw-r--r--src/v4/qv4runtime.cpp4
-rw-r--r--src/v4/qv4string.cpp8
-rw-r--r--src/v4/qv4string.h4
-rw-r--r--src/v4/qv4v8.cpp47
17 files changed, 117 insertions, 80 deletions
diff --git a/src/v4/qv4engine.cpp b/src/v4/qv4engine.cpp
index 54655d173b..24770d20a9 100644
--- a/src/v4/qv4engine.cpp
+++ b/src/v4/qv4engine.cpp
@@ -109,7 +109,7 @@ ExecutionEngine::ExecutionEngine(EvalISelFactory *factory)
id_eval = newIdentifier(QStringLiteral("eval"));
emptyClass = new InternalClass(this);
- arrayClass = emptyClass->addMember(id_length);
+ arrayClass = emptyClass->addMember(id_length, Attr_ReadOnly);
initRootContext();
objectPrototype = new (memoryManager) ObjectPrototype(this);
diff --git a/src/v4/qv4functionobject.cpp b/src/v4/qv4functionobject.cpp
index 0d8bac8215..4deb3189a8 100644
--- a/src/v4/qv4functionobject.cpp
+++ b/src/v4/qv4functionobject.cpp
@@ -341,7 +341,7 @@ ScriptFunction::ScriptFunction(ExecutionContext *scope, Function *function)
Object *proto = scope->engine->newObject();
proto->defineDefaultProperty(scope->engine->id_constructor, Value::fromObject(this));
- PropertyDescriptor *pd = insertMember(scope->engine->id_prototype);
+ PropertyDescriptor *pd = insertMember(scope->engine->id_prototype, Attr_NotEnumerable|Attr_NotConfigurable);
pd->type = PropertyDescriptor::Data;
pd->writable = PropertyDescriptor::Enabled;
pd->enumerable = PropertyDescriptor::Disabled;
@@ -482,8 +482,8 @@ BoundFunction::BoundFunction(ExecutionContext *scope, FunctionObject *target, Va
PropertyDescriptor pd = PropertyDescriptor::fromAccessor(thrower, thrower);
pd.configurable = PropertyDescriptor::Disabled;
pd.enumerable = PropertyDescriptor::Disabled;
- *insertMember(scope->engine->id_arguments) = pd;
- *insertMember(scope->engine->id_caller) = pd;
+ *insertMember(scope->engine->id_arguments, Attr_Accessor|Attr_NotConfigurable|Attr_NotEnumerable) = pd;
+ *insertMember(scope->engine->id_caller, Attr_Accessor|Attr_NotConfigurable|Attr_NotEnumerable) = pd;
}
void BoundFunction::destroy(Managed *that)
diff --git a/src/v4/qv4global.h b/src/v4/qv4global.h
index f3964e9113..43409b2650 100644
--- a/src/v4/qv4global.h
+++ b/src/v4/qv4global.h
@@ -59,12 +59,18 @@ QT_BEGIN_NAMESPACE
namespace QQmlJS {
namespace VM {
-enum PropertyFlags {
- Writable = 0x1,
- Enumerable = 0x2,
- Configurable = 0x4
+enum {
+ Attr_Default = 0,
+ Attr_Accessor = 0x1,
+ Attr_NotWritable = 0x2,
+ Attr_NotEnumerable = 0x4,
+ Attr_NotConfigurable = 0x8,
+ Attr_ReadOnly = Attr_NotWritable|Attr_NotEnumerable|Attr_NotConfigurable,
+ Attr_Invalid = 0xff
};
+typedef uchar PropertyAttributes;
+
}
}
diff --git a/src/v4/qv4internalclass.cpp b/src/v4/qv4internalclass.cpp
index 25857de361..0f4a94527c 100644
--- a/src/v4/qv4internalclass.cpp
+++ b/src/v4/qv4internalclass.cpp
@@ -52,15 +52,16 @@ InternalClass::InternalClass(const QQmlJS::VM::InternalClass &other)
: engine(other.engine)
, propertyTable(other.propertyTable)
, nameMap(other.nameMap)
+ , propertyData(other.propertyData)
, transitions()
, size(other.size)
{
}
-InternalClass *InternalClass::addMember(String *string, uint *index)
+InternalClass *InternalClass::addMember(String *string, PropertyAttributes data, uint *index)
{
engine->identifierCache->toIdentifier(string);
- uint id = string->identifier;
+ uint id = string->identifier | ((uint)data << 24);
assert(propertyTable.constFind(id) == propertyTable.constEnd());
@@ -73,8 +74,9 @@ InternalClass *InternalClass::addMember(String *string, uint *index)
} else {
// create a new class and add it to the tree
InternalClass *newClass = new InternalClass(*this);
- newClass->propertyTable.insert(id, size);
+ newClass->propertyTable.insert(string->identifier, size);
newClass->nameMap.append(string);
+ newClass->propertyData.append(data);
++newClass->size;
transitions.insert(id, newClass);
return newClass;
@@ -100,7 +102,7 @@ void InternalClass::removeMember(Object *object, uint id)
for (int i = 0; i < nameMap.size(); ++i) {
if (i == propIdx)
continue;
- object->internalClass = object->internalClass->addMember(nameMap.at(i));
+ object->internalClass = object->internalClass->addMember(nameMap.at(i), propertyData.at(i));
}
transitions.insert(toRemove, object->internalClass);
diff --git a/src/v4/qv4internalclass.h b/src/v4/qv4internalclass.h
index 8ad14123f0..92bf19a741 100644
--- a/src/v4/qv4internalclass.h
+++ b/src/v4/qv4internalclass.h
@@ -43,6 +43,7 @@
#include <QHash>
#include <QVector>
+#include <qv4global.h>
QT_BEGIN_NAMESPACE
@@ -57,12 +58,15 @@ struct InternalClass {
ExecutionEngine *engine;
QHash<uint, uint> propertyTable; // id to valueIndex
QVector<String *> nameMap;
+
+ QVector<PropertyAttributes> propertyData;
+
QHash<int, InternalClass *> transitions; // id to next class, positive means add, negative delete
uint size;
InternalClass(ExecutionEngine *engine) : engine(engine), size(0) {}
- InternalClass *addMember(String *string, uint *index = 0);
+ InternalClass *addMember(String *string, PropertyAttributes data, uint *index = 0);
void removeMember(Object *object, uint id);
uint find(String *s);
diff --git a/src/v4/qv4jsonobject.cpp b/src/v4/qv4jsonobject.cpp
index 015557f85f..64f5a6c007 100644
--- a/src/v4/qv4jsonobject.cpp
+++ b/src/v4/qv4jsonobject.cpp
@@ -281,7 +281,7 @@ bool Parser::parseMember(Object *o)
if (!parseValue(&val))
return false;
- PropertyDescriptor *p = o->insertMember(context->engine->newIdentifier(key));
+ PropertyDescriptor *p = o->insertMember(context->engine->newIdentifier(key), Attr_Default);
p->type = PropertyDescriptor::Data;
p->writable = PropertyDescriptor::Enabled;
p->enumerable = PropertyDescriptor::Enabled;
diff --git a/src/v4/qv4managed.h b/src/v4/qv4managed.h
index 264c92c1c0..844c88772b 100644
--- a/src/v4/qv4managed.h
+++ b/src/v4/qv4managed.h
@@ -84,8 +84,8 @@ struct ManagedVTable
Value (*getIndexed)(Managed *, ExecutionContext *ctx, uint index, bool *hasProperty);
void (*put)(Managed *, ExecutionContext *ctx, String *name, const Value &value);
void (*putIndexed)(Managed *, ExecutionContext *ctx, uint index, const Value &value);
- PropertyFlags (*query)(Managed *, ExecutionContext *ctx, String *name);
- PropertyFlags (*queryIndexed)(Managed *, ExecutionContext *ctx, uint index);
+ PropertyAttributes (*query)(Managed *, ExecutionContext *ctx, String *name);
+ PropertyAttributes (*queryIndexed)(Managed *, ExecutionContext *ctx, uint index);
bool (*deleteProperty)(Managed *m, ExecutionContext *ctx, String *name);
bool (*deleteIndexedProperty)(Managed *m, ExecutionContext *ctx, uint index);
const char *className;
diff --git a/src/v4/qv4object.cpp b/src/v4/qv4object.cpp
index 36af4b65a0..a48a74a352 100644
--- a/src/v4/qv4object.cpp
+++ b/src/v4/qv4object.cpp
@@ -192,7 +192,7 @@ void Object::inplaceBinOp(ExecutionContext *ctx, BinOp op, const Value &index, c
void Object::defineDefaultProperty(String *name, Value value)
{
- PropertyDescriptor *pd = insertMember(name);
+ PropertyDescriptor *pd = insertMember(name, Attr_Default);
pd->type = PropertyDescriptor::Data;
pd->writable = PropertyDescriptor::Enabled;
pd->enumerable = PropertyDescriptor::Disabled;
@@ -221,7 +221,7 @@ void Object::defineReadonlyProperty(ExecutionEngine *engine, const QString &name
void Object::defineReadonlyProperty(String *name, Value value)
{
- PropertyDescriptor *pd = insertMember(name);
+ PropertyDescriptor *pd = insertMember(name, Attr_ReadOnly);
pd->type = PropertyDescriptor::Data;
pd->writable = PropertyDescriptor::Disabled;
pd->enumerable = PropertyDescriptor::Disabled;
@@ -250,10 +250,10 @@ void Object::markObjects(Managed *that)
o->markArrayObjects();
}
-PropertyDescriptor *Object::insertMember(String *s)
+PropertyDescriptor *Object::insertMember(String *s, PropertyAttributes attributes)
{
uint idx;
- internalClass = internalClass->addMember(s, &idx);
+ internalClass = internalClass->addMember(s, attributes, &idx);
if (idx >= memberDataAlloc) {
memberDataAlloc = qMax((uint)8, 2*memberDataAlloc);
@@ -346,22 +346,22 @@ void Object::putIndexed(Managed *m, ExecutionContext *ctx, uint index, const Val
static_cast<Object *>(m)->internalPutIndexed(ctx, index, value);
}
-PropertyFlags Object::query(Managed *m, ExecutionContext *ctx, String *name)
+PropertyAttributes Object::query(Managed *m, ExecutionContext *ctx, String *name)
{
Object *that = static_cast<Object *>(m);
PropertyDescriptor *pd = that->__getPropertyDescriptor__(ctx, name);
if (!pd || pd->type == PropertyDescriptor::Generic)
- return PropertyFlags(0);
- return pd->propertyFlags();
+ return Attr_Invalid;
+ return pd->toPropertyAttributes();
}
-PropertyFlags Object::queryIndexed(Managed *m, ExecutionContext *ctx, uint index)
+PropertyAttributes Object::queryIndexed(Managed *m, ExecutionContext *ctx, uint index)
{
Object *that = static_cast<Object *>(m);
PropertyDescriptor *pd = that->__getPropertyDescriptor__(ctx, index);
if (!pd || pd->type == PropertyDescriptor::Generic)
- return PropertyFlags(0);
- return pd->propertyFlags();
+ return Attr_Invalid;
+ return pd->toPropertyAttributes();
}
bool Object::deleteProperty(Managed *m, ExecutionContext *ctx, String *name)
@@ -509,7 +509,7 @@ void Object::internalPut(ExecutionContext *ctx, String *name, const Value &value
}
{
- PropertyDescriptor *p = insertMember(name);
+ PropertyDescriptor *p = insertMember(name, Attr_Default);
p->type = PropertyDescriptor::Data;
p->value = value;
p->configurable = PropertyDescriptor::Enabled;
@@ -685,7 +685,7 @@ bool Object::__defineOwnProperty__(ExecutionContext *ctx, String *name, const Pr
if (!extensible)
goto reject;
// clause 4
- PropertyDescriptor *pd = insertMember(name);
+ PropertyDescriptor *pd = insertMember(name, desc->toPropertyAttributes());
*pd = *desc;
pd->fullyPopulated();
return true;
diff --git a/src/v4/qv4object.h b/src/v4/qv4object.h
index caee8b625a..004b537bed 100644
--- a/src/v4/qv4object.h
+++ b/src/v4/qv4object.h
@@ -183,7 +183,7 @@ struct Q_V4_EXPORT Object: Managed {
void defineReadonlyProperty(ExecutionEngine *engine, const QString &name, Value value);
void defineReadonlyProperty(String *name, Value value);
- PropertyDescriptor *insertMember(String *s);
+ PropertyDescriptor *insertMember(String *s, PropertyAttributes attributes);
// Array handling
@@ -338,8 +338,8 @@ protected:
static Value getIndexed(Managed *m, ExecutionContext *ctx, uint index, bool *hasProperty);
static void put(Managed *m, ExecutionContext *ctx, String *name, const Value &value);
static void putIndexed(Managed *m, ExecutionContext *ctx, uint index, const Value &value);
- static PropertyFlags query(Managed *m, ExecutionContext *ctx, String *name);
- static PropertyFlags queryIndexed(Managed *m, ExecutionContext *ctx, uint index);
+ static PropertyAttributes query(Managed *m, ExecutionContext *ctx, String *name);
+ static PropertyAttributes queryIndexed(Managed *m, ExecutionContext *ctx, uint index);
static bool deleteProperty(Managed *m, ExecutionContext *ctx, String *name);
static bool deleteIndexedProperty(Managed *m, ExecutionContext *ctx, uint index);
diff --git a/src/v4/qv4propertydescriptor.h b/src/v4/qv4propertydescriptor.h
index 9a07c39cc9..7bde67b3da 100644
--- a/src/v4/qv4propertydescriptor.h
+++ b/src/v4/qv4propertydescriptor.h
@@ -43,6 +43,7 @@
#include "qv4global.h"
#include "qv4value.h"
+#include "qv4internalclass.h"
QT_BEGIN_NAMESPACE
@@ -51,7 +52,18 @@ namespace VM {
struct FunctionObject;
-struct PropertyDescriptor {
+struct Property {
+ union {
+ Value value;
+ struct {
+ FunctionObject *get;
+ FunctionObject *set;
+ };
+ };
+};
+
+struct PropertyDescriptor : public Property
+{
enum Type {
Generic,
Data,
@@ -62,29 +74,11 @@ struct PropertyDescriptor {
Disabled,
Enabled
};
- union {
- Value value;
- struct {
- FunctionObject *get;
- FunctionObject *set;
- };
- };
uint type : 8;
uint writable : 8;
uint enumerable : 8;
uint configurable : 8;
- PropertyFlags propertyFlags() {
- int f = 0;
- if (writable == Enabled)
- f |= Writable;
- if (configurable == Enabled)
- f |= Configurable;
- if (enumerable == Enabled)
- f |= Enumerable;
- return PropertyFlags(f);
- }
-
static inline PropertyDescriptor fromValue(Value v) {
PropertyDescriptor pd;
pd.value = v;
@@ -105,6 +99,19 @@ struct PropertyDescriptor {
return pd;
}
+ PropertyAttributes toPropertyAttributes() const {
+ PropertyAttributes attrs = 0;
+ if (type == Accessor)
+ attrs |= Attr_Accessor;
+ else if (writable != Enabled)
+ attrs |= Attr_NotWritable;
+ if (enumerable != Enabled)
+ attrs |= Attr_NotEnumerable;
+ if (configurable != Enabled)
+ attrs |= Attr_NotConfigurable;
+ return attrs;
+ }
+
// Section 8.10
inline void fullyPopulated() {
if (type == Generic) {
diff --git a/src/v4/qv4regexp.cpp b/src/v4/qv4regexp.cpp
index 303d2c1ea7..c0f7cee51d 100644
--- a/src/v4/qv4regexp.cpp
+++ b/src/v4/qv4regexp.cpp
@@ -141,14 +141,14 @@ void RegExp::putIndexed(Managed *m, ExecutionContext *ctx, uint index, const Val
{
}
-PropertyFlags RegExp::query(Managed *m, ExecutionContext *ctx, String *name)
+PropertyAttributes RegExp::query(Managed *m, ExecutionContext *ctx, String *name)
{
- return PropertyFlags(0);
+ return Attr_Invalid;
}
-PropertyFlags RegExp::queryIndexed(Managed *m, ExecutionContext *ctx, uint index)
+PropertyAttributes RegExp::queryIndexed(Managed *m, ExecutionContext *ctx, uint index)
{
- return PropertyFlags(0);
+ return Attr_Invalid;
}
bool RegExp::deleteProperty(Managed *m, ExecutionContext *ctx, String *name)
diff --git a/src/v4/qv4regexp.h b/src/v4/qv4regexp.h
index 15b81f44da..b0c95843f3 100644
--- a/src/v4/qv4regexp.h
+++ b/src/v4/qv4regexp.h
@@ -115,8 +115,8 @@ protected:
static Value getIndexed(Managed *m, ExecutionContext *ctx, uint index, bool *hasProperty);
static void put(Managed *m, ExecutionContext *ctx, String *name, const Value &value);
static void putIndexed(Managed *m, ExecutionContext *ctx, uint index, const Value &value);
- static PropertyFlags query(Managed *m, ExecutionContext *ctx, String *name);
- static PropertyFlags queryIndexed(Managed *m, ExecutionContext *ctx, uint index);
+ static PropertyAttributes query(Managed *m, ExecutionContext *ctx, String *name);
+ static PropertyAttributes queryIndexed(Managed *m, ExecutionContext *ctx, uint index);
static bool deleteProperty(Managed *m, ExecutionContext *ctx, String *name);
static bool deleteIndexedProperty(Managed *m, ExecutionContext *ctx, uint index);
diff --git a/src/v4/qv4regexpobject.cpp b/src/v4/qv4regexpobject.cpp
index 94f7f795c8..32db30b51c 100644
--- a/src/v4/qv4regexpobject.cpp
+++ b/src/v4/qv4regexpobject.cpp
@@ -73,7 +73,8 @@ RegExpObject::RegExpObject(ExecutionEngine *engine, RegExp* value, bool global)
vtbl = &static_vtbl;
type = Type_RegExpObject;
- PropertyDescriptor *lastIndexProperty = insertMember(engine->newIdentifier(QStringLiteral("lastIndex")));
+ PropertyDescriptor *lastIndexProperty = insertMember(engine->newIdentifier(QStringLiteral("lastIndex")),
+ Attr_NotEnumerable|Attr_NotConfigurable);
lastIndexProperty->type = PropertyDescriptor::Data;
lastIndexProperty->writable = PropertyDescriptor::Enabled;
lastIndexProperty->enumerable = PropertyDescriptor::Disabled;
diff --git a/src/v4/qv4runtime.cpp b/src/v4/qv4runtime.cpp
index b539f9d0ca..f85fc512dc 100644
--- a/src/v4/qv4runtime.cpp
+++ b/src/v4/qv4runtime.cpp
@@ -1210,7 +1210,7 @@ void __qmljs_builtin_define_property(ExecutionContext *ctx, const Value &object,
assert(o);
uint idx = name->asArrayIndex();
- PropertyDescriptor *pd = (idx != UINT_MAX) ? o->arrayInsert(idx) : o->insertMember(name);
+ PropertyDescriptor *pd = (idx != UINT_MAX) ? o->arrayInsert(idx) : o->insertMember(name, Attr_Default);
pd->value = val ? *val : Value::undefinedValue();
pd->type = PropertyDescriptor::Data;
pd->writable = PropertyDescriptor::Enabled;
@@ -1255,7 +1255,7 @@ void __qmljs_builtin_define_getter_setter(ExecutionContext *ctx, const Value &ob
assert(o);
uint idx = name->asArrayIndex();
- PropertyDescriptor *pd = (idx != UINT_MAX) ? o->arrayInsert(idx) : o->insertMember(name);
+ PropertyDescriptor *pd = (idx != UINT_MAX) ? o->arrayInsert(idx) : o->insertMember(name, Attr_Accessor);
pd->get = getter ? getter->asFunctionObject() : 0;
pd->set = setter ? setter->asFunctionObject() : 0;
pd->type = PropertyDescriptor::Accessor;
diff --git a/src/v4/qv4string.cpp b/src/v4/qv4string.cpp
index 46e56cc4de..c16be933be 100644
--- a/src/v4/qv4string.cpp
+++ b/src/v4/qv4string.cpp
@@ -150,15 +150,15 @@ void String::putIndexed(Managed *m, ExecutionContext *ctx, uint index, const Val
o->putIndexed(ctx, index, value);
}
-PropertyFlags String::query(Managed *m, ExecutionContext *ctx, String *name)
+PropertyAttributes String::query(Managed *m, ExecutionContext *ctx, String *name)
{
- return PropertyFlags(0);
+ return Attr_Invalid;
}
-PropertyFlags String::queryIndexed(Managed *m, ExecutionContext *ctx, uint index)
+PropertyAttributes String::queryIndexed(Managed *m, ExecutionContext *ctx, uint index)
{
String *that = static_cast<String *>(m);
- return (index < that->_text.length()) ? PropertyFlags(Enumerable) : PropertyFlags(0);
+ return (index < that->_text.length()) ? Attr_NotConfigurable|Attr_NotWritable : Attr_Invalid;
}
bool String::deleteProperty(Managed *m, ExecutionContext *ctx, String *name)
diff --git a/src/v4/qv4string.h b/src/v4/qv4string.h
index 8c483b265e..cc93532e34 100644
--- a/src/v4/qv4string.h
+++ b/src/v4/qv4string.h
@@ -117,8 +117,8 @@ protected:
static Value getIndexed(Managed *m, ExecutionContext *ctx, uint index, bool *hasProperty);
static void put(Managed *m, ExecutionContext *ctx, String *name, const Value &value);
static void putIndexed(Managed *m, ExecutionContext *ctx, uint index, const Value &value);
- static PropertyFlags query(Managed *m, ExecutionContext *ctx, String *name);
- static PropertyFlags queryIndexed(Managed *m, ExecutionContext *ctx, uint index);
+ static PropertyAttributes query(Managed *m, ExecutionContext *ctx, String *name);
+ static PropertyAttributes queryIndexed(Managed *m, ExecutionContext *ctx, uint index);
static bool deleteProperty(Managed *m, ExecutionContext *ctx, String *name);
static bool deleteIndexedProperty(Managed *m, ExecutionContext *ctx, uint index);
diff --git a/src/v4/qv4v8.cpp b/src/v4/qv4v8.cpp
index 2c7b83a1bd..56acd1140e 100644
--- a/src/v4/qv4v8.cpp
+++ b/src/v4/qv4v8.cpp
@@ -920,7 +920,12 @@ bool Object::SetAccessor(Handle<String> name, AccessorGetter getter, AccessorSet
QQmlJS::VM::Object *o = ConstValuePtr(this)->asObject();
assert(o);
- VM::PropertyDescriptor *pd = o->insertMember(name->asVMString());
+ PropertyAttributes attrs = Attr_Accessor;
+ if (attribute & DontDelete)
+ attrs |= Attr_NotConfigurable;
+ if (attribute & DontEnum)
+ attrs |= Attr_NotEnumerable;
+ VM::PropertyDescriptor *pd = o->insertMember(name->asVMString(), attrs);
*pd = VM::PropertyDescriptor::fromAccessor(wrappedGetter, wrappedSetter);
pd->writable = VM::PropertyDescriptor::Undefined;
pd->configurable = attribute & DontDelete ? VM::PropertyDescriptor::Disabled : VM::PropertyDescriptor::Enabled;
@@ -1424,7 +1429,12 @@ public:
m_template = Persistent<ObjectTemplate>::New(ObjectTemplate::New());
foreach (const ObjectTemplate::Accessor &acc, m_template->m_accessors) {
- VM::PropertyDescriptor *pd = this->insertMember(acc.name->asVMString());
+ PropertyAttributes attrs = Attr_Accessor;
+ if (acc.attribute & DontDelete)
+ attrs |= Attr_NotConfigurable;
+ if (acc.attribute & DontEnum)
+ attrs |= Attr_NotEnumerable;
+ VM::PropertyDescriptor *pd = this->insertMember(acc.name->asVMString(), attrs);
*pd = VM::PropertyDescriptor::fromAccessor(acc.getter->vmValue().asFunctionObject(),
acc.setter->vmValue().asFunctionObject());
pd->writable = VM::PropertyDescriptor::Undefined;
@@ -1438,7 +1448,14 @@ public:
void initProperties(Template *tmpl)
{
foreach (const Template::Property &p, tmpl->m_properties) {
- VM::PropertyDescriptor *pd = this->insertMember(p.name->asVMString());
+ PropertyAttributes attrs = Attr_Default;
+ if (p.attributes & DontDelete)
+ attrs |= Attr_NotConfigurable;
+ if (p.attributes & DontEnum)
+ attrs |= Attr_NotEnumerable;
+ if (p.attributes & ReadOnly)
+ attrs |= Attr_NotWritable;
+ VM::PropertyDescriptor *pd = this->insertMember(p.name->asVMString(), attrs);
*pd = VM::PropertyDescriptor::fromValue(p.value->vmValue());
pd->writable = p.attributes & ReadOnly ? VM::PropertyDescriptor::Disabled : VM::PropertyDescriptor::Enabled;
pd->configurable = p.attributes & DontDelete ? VM::PropertyDescriptor::Disabled : VM::PropertyDescriptor::Enabled;
@@ -1539,20 +1556,20 @@ protected:
BaseClass::putIndexed(m, ctx, index, value);
}
- static PropertyFlags propertyAttributesToFlags(const Handle<Value> &attr)
+ static PropertyAttributes propertyAttributesToFlags(const Handle<Value> &attr)
{
- int flags = 0;
+ PropertyAttributes flags = 0;
int intAttr = attr->ToInt32()->Value();
- if (!(intAttr & ReadOnly))
- flags |= VM::Writable;
- if (!(intAttr & DontDelete))
- flags |= VM::Configurable;
- if (!(intAttr & DontEnum))
- flags |= VM::Enumerable;
- return PropertyFlags(flags);
+ if (intAttr & ReadOnly)
+ flags |= VM::Attr_NotWritable;
+ if (intAttr & DontDelete)
+ flags |= VM::Attr_NotConfigurable;
+ if (intAttr & DontEnum)
+ flags |= VM::Attr_NotEnumerable;
+ return flags;
}
- static PropertyFlags query(VM::Managed *m, ExecutionContext *ctx, VM::String *name)
+ static PropertyAttributes query(VM::Managed *m, ExecutionContext *ctx, VM::String *name)
{
V4V8Object *that = static_cast<V4V8Object*>(m);
if (that->m_template->m_namedPropertyQuery) {
@@ -1560,7 +1577,7 @@ protected:
if (!result.IsEmpty())
return propertyAttributesToFlags(result);
}
- PropertyFlags flags = BaseClass::query(m, ctx, name);
+ PropertyAttributes flags = BaseClass::query(m, ctx, name);
if (flags == 0 && that->m_template->m_fallbackPropertySetter) {
Handle<Value> result = that->m_template->m_fallbackPropertyQuery(String::New(name), that->fallbackAccessorInfo());
if (!result.IsEmpty())
@@ -1570,7 +1587,7 @@ protected:
return flags;
}
- static PropertyFlags queryIndexed(VM::Managed *m, ExecutionContext *ctx, uint index)
+ static PropertyAttributes queryIndexed(VM::Managed *m, ExecutionContext *ctx, uint index)
{
V4V8Object *that = static_cast<V4V8Object*>(m);
if (that->m_template->m_indexedPropertyQuery) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 17:25:42 +0000