Changeset 490 for cpp/frams/vm

Timestamp:

03/30/16 17:08:08 (8 years ago)

Author:

Maciej Komosinski

Message:

Introduced general-use ErrorObject?, fixed enumeration of mixed private/public property lists

Location:

cpp/frams/vm/classes

Files:

• collectionobj.cpp (modified) (1 diff)
• collectionobj.h (modified) (2 diffs)

cpp/frams/vm/classes/collectionobj.cpp

@@ -545 +545 @@
         ret->setEmpty();
 }
+
+// not actually needed for deserialization (vector and dict are special cases) but findDeserializableClass can be also used in other contexts
+REGISTER_DESERIALIZABLE(VectorObject)
+REGISTER_DESERIALIZABLE(DictionaryObject)

cpp/frams/vm/classes/collectionobj.h

@@ -25 +25 @@
 VectorObject():readonly(0),owndata(1) {}
 ~VectorObject() {clear();}
+static Param& getStaticParam() {return par;}
 #define STATRICKCLASS VectorObject
 PARAMPROCDEF(p_clear) {if (readonly) return; clear();}
@@ -62 +63 @@
 DictionaryObject():it(hash),it_index(-1) {}
 ~DictionaryObject() {clear();}
+static Param& getStaticParam() {return par;}
 #define STATRICKCLASS DictionaryObject
 PARAMPROCDEF(p_clear) {clear();}