Changeset 2049435a in tol

Timestamp:

Nov 4, 2009, 5:39:43 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

99b1a94

Parents:

11cb1142

Message:

Fixes #773

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

Location:

tol/btol/set_type

Files:

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

tol/btol/set_type/set.cpp

@@ -130 +130 @@
 
 //--------------------------------------------------------------------
-void    BSet::Copy(const BSet& set)
+void BSet::Copy(const BSet& set)
 //--------------------------------------------------------------------
 {
@@ -136 +136 @@
   Delete(); 
   array_.ReallocBuffer(set.Card());
-  bool hasIdx = set.HasIndexByName();
+  bool hasIdx = set.HasIndexByName()!=0;
   for(n=0; n<array_.Size(); n++)
   {
@@ -331 +331 @@
 
 //--------------------------------------------------------------------
-void BSet::Append(const BSet& set)
-//--------------------------------------------------------------------
-{
+static bool DoIndexElement(BObjByIdxNameHash** indexByName, 
+                           BSyntaxObject* obj,
+                           int i)
+//--------------------------------------------------------------------
+{
+  bool ok = true;
+  if(indexByName && *indexByName && obj)
+  {
+    const BText& name = obj->Name();
+    if(name.HasName())
+    {
+      BObjByIdxNameHash::const_iterator found = (*indexByName)->find(name);
+      if(found!=(*indexByName)->end())
+      {
+        Error(I2("Duplicated index name ",
+                 "Nombre de ï¿œndice duplicado ")+
+              name);
+        ok = false;
+      }
+      (**indexByName)[name] = BIndexedSyntaxObject(i,obj);
+    }
+    else
+    {
+      Error(I2("A indexed by name set cannot have elements without a valid name ",
+               "Un conjunto indexado por nombres no puede tener elementos sin un nombre vï¿œlido ")
+            +"'"+name+"'");
+      ok = false;
+    }
+   if(!ok) { delete *indexByName; *indexByName = NULL; }
+  }
+  return(ok);
+}
+
+//--------------------------------------------------------------------
+void BSet::Append(const BSet& set, bool incrementalIndex)
+//--------------------------------------------------------------------
+{
+  if(!incrementalIndex && indexByName_) 
+  { delete indexByName_; indexByName_ = NULL; } 
+  if(incrementalIndex && !array_.Size()) 
+  {
+    indexByName_ = new BObjByIdxNameHash;
+    SetEmptyKey((*indexByName_), NULL);
+  }
   int m=Card(), n=set.Card(), i, j=m;
   array_.ReallocBuffer(m+n);
@@ -340 +381 @@
     array_[j]=set[i];
     array_[j]->IncNRefs();
+    DoIndexElement(&indexByName_,array_[j],j);
   }
 }
@@ -393 +435 @@
   SetEmptyKey((*indexByName_), NULL);
 
-  BSyntaxObject* obj;
-  int i, j;
+  int i;
   if(!array_.Size())
   {
@@ -401 +442 @@
     return(false);
   }
-  for(i=j=0; i<array_.Size(); i++)
-  {
-    obj = array_[i];
-    assert(obj);
-    const BText& name = obj->Name();
-    if(name.HasName())
-    {
-      if(operator[](name))
-      {
-        Error(I2("Duplicated index name ",
-                 "Nombre de ï¿œndice duplicado ")+
-              name);
-        return(false);
-      }
-      (*indexByName_)[name] = BIndexedSyntaxObject(i,obj);
-    }
-    else
-    {
-      Error(I2("A indexed by name set cannot have elements without a valid name ",
-               "Un conjunto indexado por nombres no puede tener elementos sin un nombre vï¿œlido ")
-            +"'"+name+"'");
-      return(false);
-    }
+  for(i=0; i<array_.Size(); i++)
+  {
+    assert(array_[i]);
+    if(!DoIndexElement(&indexByName_,array_[i],i)) { return(false); }
   }
   return(true);

tol/btol/set_type/setgra.cpp

@@ -106 +106 @@
   : BExternalOperator
     (
-      "Append", GraSet(), "Set Set", NIL, 2, 2,
-      "(Set set1, Set set2)",
+      "Append", GraSet(), "Set Set Real", NIL, 2, 3,
+      "(Set set1, Set set2, [Real incrementalIndexByName=False])",
                   I2("Attaches the elements of set2 to the end of set1 without "
-       "eliminating repeated elements and preserving the order.",
+       "eliminating repeated elements and preserving the order.\n"
+       "If incrementalIndexByName is true then the index of names "
+       "will be incremented if original set had an index, or created i"  ,
              "Concatena los elementos del conjunto set1 al final de set2 "
-       "sin eliminar elementos repetidos y conservando el orden."),
+       "sin eliminar elementos repetidos y conservando el orden.\n"
+       "Si incrementalIndexByName es cierto entonces el índice de "
+       "nombres, se mantendrá incrementalmente, siempre y cuando "
+       "ya existiera previamente y los nuevos elementos sean "
+       "compatibles, o bien se creará un índice nuevo si se parte "
+       "del conjunto vacío."),
                   BOperClassify::SetAlgebra_
     )
@@ -122 +129 @@
   { 
     BList* lst = arg;
+    bool incrementalIndexByName = false;
     BUserSet* uSet1 = USet(lst->Car()); lst = lst->Cdr();
     BUserSet* uSet2 = USet(lst->Car()); lst = lst->Cdr();
-    uSet1->Contens().Append(uSet2->Contens());
+    if(lst && lst->Car())
+    {
+      BUserDat* uDat3 = UDat(lst->Car());
+      incrementalIndexByName = uDat3->Contens()!=0.0;
+    }
+    uSet1->Contens().Append(uSet2->Contens(),incrementalIndexByName);
     SAFE_DESTROY(arg, uSet1);
     return(uSet1);

tol/btol/set_type/tol_bset.h

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