Changeset 61e1b40 in tol

Timestamp:

Nov 17, 2010, 3:17:12 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

3fab862

Parents:

9338a3e

Message:

Fixes #1011

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@2679 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/btol/set_type

Files:

• set.cpp (modified) (1 diff)
• setgra.cpp (modified) (2 diffs)
• tol_bset.h (modified) (1 diff)

tol/btol/set_type/set.cpp

@@ -389 +389 @@
 }
 
+//--------------------------------------------------------------------
+void BSet::Remove(int n, bool deleteOld)
+//--------------------------------------------------------------------
+{
+  int s = array_.Size();
+  if((n<0)||(n>=s)) { return; }
+  BSyntaxObject* found = array_[n];
+  int i;
+  for(i=n; i<s-1; i++)
+  {
+    array_[i] = array_[i+1];
+  }
+  array_.ReallocBuffer(s-1);
+  found->DecNRefs();
+  if(deleteOld) { DESTROY(found); }
+}
+
+//--------------------------------------------------------------------
+void BSet::Replace(int n, BSyntaxObject* newObject, bool deleteOld)
+//--------------------------------------------------------------------
+{
+  int s = array_.Size();
+  if((n<0)||(n>=s)) { return; }
+  BSyntaxObject* found = array_[n];
+  newObject->IncNRefs();
+  array_[n] = newObject;
+  found->DecNRefs();
+  if(deleteOld) { DESTROY(found); }
+}
 
 //--------------------------------------------------------------------

tol/btol/set_type/setgra.cpp

@@ -149 +149 @@
 };
 
+//--------------------------------------------------------------------
+class BSetRemove: public BExternalOperator
+//--------------------------------------------------------------------
+{
+public:
+  BSetRemove()
+  : BExternalOperator
+    (
+      "Remove", GraSet(), "Set Real", NIL, 2, 2,
+      "(Set set, Real n)",
+                  I2("Removes the n-th element of a set and tries to delete it "
+         "from memory. Returns the own set with the rest of elements."  ,
+               "Elimina el n-esimo elemento de un conjunto e intenta "
+         "borrarlo de la memoria. Devuelve el propio conjunto con "
+         "el resto de elementos."),
+                  BOperClassify::SetAlgebra_
+    )
+  {
+  }
+
+ ~BSetRemove() {}
+
+  BSyntaxObject* Evaluator(BList* arg) const
+  { 
+    if(CheckNonDeclarativeAction("Remove")) { return(NULL); }
+    BList* lst = arg;
+    bool incrementalIndexByName = false;
+    BUserSet* uSet = USet(lst->Car()); lst = lst->Cdr();
+    BUserDat* uDat = UDat(lst->Car()); lst = lst->Cdr();
+    BUserDat* uDel = UDat(lst->Car()); 
+    uSet->Contens().Remove(
+     (int)(uDat->Contens().Value())-1,
+     uDel->Contens().Value()!=0.0);
+    SAFE_DESTROY(arg, uSet);
+    return(uSet);
+  }
+ private:
+  DeclareClassNewDelete(BSetRemove);
+};
+
+//--------------------------------------------------------------------
+class BSetReplace: public BExternalOperator
+//--------------------------------------------------------------------
+{
+public:
+  BSetReplace()
+  : BExternalOperator
+    (
+      "Replace", GraSet(), "Set Real Anything Real", NIL, 4, 4,
+      "(Set set, Real n, Anything new, Real deleteOld)",
+                  I2("Replaces the n-th element of a set by a another new one "
+         "and tries to delete the old one from memory if deleteOld "
+         "is true. Returns the own set with the new changed element.",
+               "Reemplaza el n-ésimo elemento de un conjunto por otro "
+         "nuevo e intenta borrar el viejo de la memoria si deleteOld "
+         "es cierto. Devuelve el propio conjunto con el elemento "
+         "cambiado."),
+                  BOperClassify::SetAlgebra_
+    )
+  {
+  }
+
+ ~BSetReplace() {}
+
+  BSyntaxObject* Evaluator(BList* arg) const
+  { 
+    if(CheckNonDeclarativeAction("Replace")) { return(NULL); }
+    BList* lst = arg;
+    bool incrementalIndexByName = false;
+    BUserSet* uSet = USet(lst->Car()); lst = lst->Cdr();
+    BUserDat* uDat = UDat(lst->Car()); lst = lst->Cdr();
+    BSyntaxObject* uNew = (BSyntaxObject*)(lst->Car()); lst = lst->Cdr();
+    BUserDat* uDel = UDat(lst->Car()); 
+    uSet->Contens().Replace(
+      (int)(uDat->Contens().Value())-1, 
+      uNew,
+      uDel->Contens().Value()!=0.0);
+    SAFE_DESTROY(arg, uSet);
+    return(uSet);
+  }
+ private:
+  DeclareClassNewDelete(BSetReplace);
+};
+
 
 //--------------------------------------------------------------------
@@ -166 +250 @@
     OwnGrammar()->PutDefect(empty1_);
     BSetAppend* BSetAppend_instance = new BSetAppend;
+    BSetRemove* BSetRemove_instance = new BSetRemove;
+    BSetReplace* BSetReplace_instance = new BSetReplace;
 }
 

tol/btol/set_type/tol_bset.h

@@ -135 +135 @@
   void   PrepareStore(int n) { Alloc(n); Alloc(0); }
   void   Append(const BSet& set, bool incrementalIndex);
+  void   Remove(int n, bool deleteOld);
+  void   Replace(int n, BSyntaxObject* newObject, bool deleteOld);
   void   AddElement(BSyntaxObject*);
   void   PutElement(BList* element = NIL);