Changeset 642 for cpp/frams

Timestamp:

12/31/16 20:32:03 (7 years ago)

Author:

Maciej Komosinski

Message:

Implemented insert() in FramScript? Vector class

Location:

cpp/frams/vm/classes

Files:

• collectionobj.cpp (modified) (4 diffs)
• collectionobj.h (modified) (2 diffs)

cpp/frams/vm/classes/collectionobj.cpp

@@ -15 +15 @@
 ParamEntry vector_paramtab[]=
 {
-{"Vector",1,14,"Vector","Vector is a 1-dimensional array indexed by an integer value (starting from 0). "
+{"Vector",1,15,"Vector","Vector is a 1-dimensional array indexed by an integer value (starting from 0). "
  "Multidimensional arrays can be simulated by putting other Vector objects into a Vector.\n"
 "Examples:\n"
@@ -33 +33 @@
 {"get",0,PARAM_NOSTATIC,"Get value at position","p x(d position)",PROCEDURE(p_get),"object[position] can be always used instead of object.get(position)"},
 {"set",0,PARAM_NOSTATIC,"Set value at position","p(d position,x value)",PROCEDURE(p_set),"object[position]=value can be always used instead of object.set(position,value)"},
+{"insert",0,PARAM_NOSTATIC,"Insert value at position","p(d position,x value)",PROCEDURE(p_insert),},
 {"add",0,PARAM_NOSTATIC,"Append at the end","p(x value)",PROCEDURE(p_add),},
 {"find",0,PARAM_NOSTATIC,"Find","p d(x value)",PROCEDURE(p_find),"returns the element index or -1 if not found"},
@@ -95 +96 @@
         :readonly(0),owndata(1)
 {
-set(0,ExtValue(pt.x));
-set(1,ExtValue(pt.y));
-set(2,ExtValue(pt.z));
+set_or_insert(0,ExtValue(pt.x),false);
+set_or_insert(1,ExtValue(pt.y),false);
+set_or_insert(2,ExtValue(pt.z),false);
 }
 
@@ -121 +122 @@
 }
 
-void VectorObject::set(int i,const ExtValue& val)
-{
+void VectorObject::set_or_insert(int i,const ExtValue& val,bool insert)
+{
+if (i<0) return;
 int oldsize=data.size();
-if (i<0) return;
-ExtValue *v=(ExtValue*)data.get(i);
-if (v) delete v;
-data.set(i,new ExtValue(val));
-i--;
-while(i>=oldsize)
-        {
-        data.set(i,0);
-        i--;
+if (i>oldsize)
+        {
+        data.setSize(i);
+        while(i>oldsize)
+                data.set(oldsize++,0);
+        }
+if (insert)
+        data.insert(i,new ExtValue(val));
+else
+        {
+        ExtValue *v=(ExtValue*)data.get(i);
+        if (v) delete v;
+        data.set(i,new ExtValue(val));
         }
 }

cpp/frams/vm/classes/collectionobj.h

@@ -19 +19 @@
 void clear();
 ExtValue *get(int i) {return (ExtValue*)data.get(i);}
-void set(int i,const ExtValue& val);
+void set_or_insert(int i,const ExtValue& val,bool insert);
 
 static Param par;
@@ -35 +35 @@
 PARAMPROCDEF(p_get);
 PARAMPROCDEF(p_find);
-PARAMPROCDEF(p_set) {if (!readonly) set(arg1[1].getInt(),arg1[0]);}
+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);