Changeset 746 for cpp/frams/vm/classes/collectionobj.h

Timestamp:

02/28/18 19:37:32 (6 years ago)

Author:

Maciej Komosinski

Message:

Code formatting

File:

• cpp/frams/vm/classes/collectionobj.h (modified) (1 diff)

cpp/frams/vm/classes/collectionobj.h

@@ -12 +12 @@
 
 /** object collection, indexed by int */
-class VectorObject: public DestrBase
+class VectorObject : public DestrBase
 {
-  public:
-SList data;
-unsigned int readonly:1, owndata:1;
-void clear();
-ExtValue *get(int i) {return (ExtValue*)data.get(i);}
-void set_or_insert(int i,const ExtValue& val,bool insert);
+public:
+        SList data;
+        unsigned int readonly : 1, owndata : 1;
+        void clear();
+        ExtValue *get(int i) { return (ExtValue*)data.get(i); }
+        void set_or_insert(int i, const ExtValue& val, bool insert);
 
-static Param par;
-VectorObject(Pt3D& pt);
-VectorObject():readonly(0),owndata(1) {}
-~VectorObject() {clear();}
-static Param& getStaticParam() {return par;}
+        static Param par;
+        VectorObject(Pt3D& pt);
+        VectorObject() :readonly(0), owndata(1) {}
+        ~VectorObject() { clear(); }
+        static Param& getStaticParam() { return par; }
 #define STATRICKCLASS VectorObject
-PARAMPROCDEF(p_clear) {if (readonly) return; clear();}
-PARAMGETDEF(size) {arg1->setInt(data.size());}
-PARAMGETDEF(avg);
-PARAMGETDEF(stdev);
-PARAMGETDEF(iterator);
-PARAMPROCDEF(p_remove);
-PARAMPROCDEF(p_get);
-PARAMPROCDEF(p_find);
-PARAMPROCDEF(p_set) {if (!readonly) set_or_insert(arg1[1].getInt(),arg1[0],false);}
-PARAMPROCDEF(p_add) {if (readonly) return; /*ExtValue tmp; get_toString(&tmp); printf("%s += %s",(const char*)tmp.getString(),(const char*)arg1[0].getString());*/ data+=new ExtValue(arg1[0]); /*get_toString(&tmp); printf(" -> %s\n",(const char*)tmp.getString());*/ arg2->setInt(data.size()-1);}
-PARAMPROCDEF(p_insert) {if (!readonly) set_or_insert(arg1[1].getInt(),arg1[0],true);}
-PARAMGETDEF(toString);
-PARAMPROCDEF(p_sort);
-PARAMPROCDEF(p_clone);
+        PARAMPROCDEF(p_clear) { if (readonly) return; clear(); }
+        PARAMGETDEF(size) { arg1->setInt(data.size()); }
+        PARAMGETDEF(avg);
+        PARAMGETDEF(stdev);
+        PARAMGETDEF(iterator);
+        PARAMPROCDEF(p_remove);
+        PARAMPROCDEF(p_get);
+        PARAMPROCDEF(p_find);
+        PARAMPROCDEF(p_set) { if (!readonly) set_or_insert(arg1[1].getInt(), arg1[0], false); }
+        PARAMPROCDEF(p_add) { if (readonly) return; /*ExtValue tmp; get_toString(&tmp); printf("%s += %s",(const char*)tmp.getString(),(const char*)arg1[0].getString());*/ data += new ExtValue(arg1[0]); /*get_toString(&tmp); printf(" -> %s\n",(const char*)tmp.getString());*/ arg2->setInt(data.size() - 1); }
+        PARAMPROCDEF(p_insert) { if (!readonly) set_or_insert(arg1[1].getInt(), arg1[0], true); }
+        PARAMGETDEF(toString);
+        PARAMPROCDEF(p_sort);
+        PARAMPROCDEF(p_clone);
 #undef STATRICKCLASS
-static void p_new(void*,ExtValue*args,ExtValue*ret)
-        {ret->setObject(ExtObject(&par,new VectorObject));}
-SString serialize(SerializationFormat format) const;
-ExtObject makeObject() {return ExtObject(&par,this);}
+        static void p_new(void*, ExtValue*args, ExtValue*ret)
+        {
+                ret->setObject(ExtObject(&par, new VectorObject));
+        }
+        SString serialize(SerializationFormat format) const;
+        ExtObject makeObject() { return ExtObject(&par, this); }
 
-static VectorObject* fromObject(const ExtObject& o, bool warn=true);
+        static VectorObject* fromObject(const ExtObject& o, bool warn = true);
 };
 
 /** object collection, indexed by name */
-class DictionaryObject: public DestrBase
+class DictionaryObject : public DestrBase
 {
-  public:
-HashTable hash;
-HashEntryIterator it;
-int it_index;
+public:
+        HashTable hash;
+        HashEntryIterator it;
+        int it_index;
 
-void clear();
-HashEntryIterator* getIndexIterator(int i);
+        void clear();
+        HashEntryIterator* getIndexIterator(int i);
 
-static Param par;
-DictionaryObject():it(hash),it_index(-1) {}
-~DictionaryObject() {clear();}
-static Param& getStaticParam() {return par;}
+        static Param par;
+        DictionaryObject() :it(hash), it_index(-1) {}
+        ~DictionaryObject() { clear(); }
+        static Param& getStaticParam() { return par; }
 #define STATRICKCLASS DictionaryObject
-PARAMPROCDEF(p_clear) {clear();}
-PARAMGETDEF(size) {arg1->setInt(hash.getSize());}
-PARAMPROCDEF(p_remove);
-PARAMPROCDEF(p_get);
-PARAMPROCDEF(p_getKey);
-PARAMPROCDEF(p_set);
-PARAMPROCDEF(p_find);
-PARAMGETDEF(toString);
-PARAMPROCDEF(p_clone);
-PARAMPROCDEF(p_assign);
+        PARAMPROCDEF(p_clear) { clear(); }
+        PARAMGETDEF(size) { arg1->setInt(hash.getSize()); }
+        PARAMPROCDEF(p_remove);
+        PARAMPROCDEF(p_get);
+        PARAMPROCDEF(p_getKey);
+        PARAMPROCDEF(p_set);
+        PARAMPROCDEF(p_find);
+        PARAMGETDEF(toString);
+        PARAMPROCDEF(p_clone);
+        PARAMPROCDEF(p_assign);
 #undef STATRICKCLASS
-ExtValue get(SString key);
-ExtValue get(int index);
-ExtValue set(SString key,ExtValue new_value);
-void copyFrom(DictionaryObject *other);
-SString serialize(SerializationFormat format) const;
-static void p_new(void*,ExtValue*args,ExtValue*ret)
-        {ret->setObject(ExtObject(&par,new DictionaryObject));}
-static DictionaryObject* fromObject(const ExtObject& v, bool warn=true);
-ExtObject makeObject() {return ExtObject(&par,this);}
+        ExtValue get(SString key);
+        ExtValue get(int index);
+        ExtValue set(SString key, ExtValue new_value);
+        void copyFrom(DictionaryObject *other);
+        SString serialize(SerializationFormat format) const;
+        static void p_new(void*, ExtValue*args, ExtValue*ret)
+        {
+                ret->setObject(ExtObject(&par, new DictionaryObject));
+        }
+        static DictionaryObject* fromObject(const ExtObject& v, bool warn = true);
+        ExtObject makeObject() { return ExtObject(&par, this); }
 };
 
-class VectorIterator: public DestrBase
+class VectorIterator : public DestrBase
 {
-  public:
-VectorObject *vec;
-int pos;
-VectorIterator(VectorObject* v);
-~VectorIterator();
+public:
+        VectorObject *vec;
+        int pos;
+        VectorIterator(VectorObject* v);
+        ~VectorIterator();
 #define STATRICKCLASS VectorIterator
-PARAMGETDEF(next);
-PARAMGETDEF(value);
+        PARAMGETDEF(next);
+        PARAMGETDEF(value);
 #undef STATRICKCLASS
-static ExtObject makeFrom(VectorObject *v);
+        static ExtObject makeFrom(VectorObject *v);
 };