Changeset 153 for cpp

Timestamp:

03/01/14 22:20:08 (11 years ago)

Author:

sz

Message:

SList container iteration: FOREACH() macro now creates local variable for maintaining the loop, removed the obsolete SList iteration implementation, replaced some unnecessarily complex for() with FOREACH()

Location:

cpp/frams

Files:

• model/model.cpp (modified) (1 diff)
• util/list.h (modified) (5 diffs)
• vm/classes/collectionobj.cpp (modified) (2 diffs)

cpp/frams/model/model.cpp

@@ -135 +135 @@
 void Model::clear()
 {
-Part *p;
-for (parts.start();p=(Part*)parts();) delete p;
-Joint* j;
-for (joints.start();j=(Joint*)joints();) delete j;
-Neuro *n;
-for (neurons.start();n=(Neuro*)neurons();) delete n;
+FOREACH(Part*,p,parts)
+        delete p;
+FOREACH(Joint*,j,joints)
+        delete j;
+FOREACH(Neuro*,n,neurons)
+        delete n;
 parts.clear(); joints.clear(); neurons.clear();
 delMap();

cpp/frams/util/list.h

@@ -87 +87 @@
         {return mem[i];}
 bool hasMore() {return pos<size();}
-T& operator()() ///< return next element
-        { return mem[pos++];}
 int operator==(const SListTempl<T>& l) const ///< compare list
  {
@@ -97 +95 @@
 int find(const T& e) const ///< return position of element, or -1 if not found
         { for (int i=0;i<size();i++) if (mem[i]==e) return i;   return -1; }
-int start() {return pos=0;} ///< start iteration throgh list
 void append(const T& data) ///< add 1 element
         {needSize(size()+1); mem[used++]=data;}
@@ -128 +125 @@
         { needSize(s); used=s;}
 T& get(int i) const {return operator()(i);}
-T& get() {return operator()();}
 void clear() {used=0;} ///< remove all elements
 void hardclear() {resize(0); used=0;} ///< remove all elements and free mem
@@ -148 +144 @@
 };
 
-#define FOREACH(type,var,list) for(type var=(type)list.start();var=(type)list();)
+#define FOREACH(type,var,list) for(int _ ## var ## _i_=0,_ ## var ## _tmp_=0; _ ## var ## _i_==0;_ ## var ## _i_++) \
+                for(type var;((_ ## var ## _tmp_=(_ ## var ## _i_<list.size()))?(var=(type)list(_ ## var ## _i_)):0),_ ## var ## _tmp_;_ ## var ## _i_++)
 
 // usage example: FOREACH(char*,t,thelist) printf("t=%s\n",t);
@@ -155 +152 @@
 {
    public:
-T operator()() ///< return next element
-     {if (this->pos>=this->size()) return 0; else return 
-this->mem[this->pos++];}
-
 T operator()(int i) const ///< return element at position i
      {if (i>=this->size()) return 0; else return this->mem[i];}
 
 T get(int i) const {return operator()(i);}
-T get() {return operator()();}
 T& getref(int i) const {return SListTempl<T>::get(i);}
-T& getref() {return SListTempl<T>::get();}
 };
 

cpp/frams/vm/classes/collectionobj.cpp

@@ -248 +248 @@
         {
         VMVEComparator cmp(jto);
-        ExtValue **first=(ExtValue**)&data.getref();
+        ExtValue **first=(ExtValue**)&data.getref(0);
         std::sort(first,first+data.size(),cmp);
         }
@@ -255 +255 @@
         {
         VEComparator cmp;
-        ExtValue **first=(ExtValue**)&data.getref();
+        ExtValue **first=(ExtValue**)&data.getref(0);
         std::sort(first,first+data.size(),cmp);
         }