Changeset 24f03be in tol

Timestamp:

Jul 20, 2009, 9:03:57 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

64231ec

Parents:

cb1355f

Message:

DeepCopy will call BCode::Replicate to create a new object independent from original one

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

File:

• tol/btol/set_type/setgra.cpp (modified) (2 diffs)

tol/btol/set_type/setgra.cpp

@@ -2097 +2097 @@
 
 //--------------------------------------------------------------------
+BSyntaxObject* CopyCode(BSyntaxObject* obj)
+{
+  BCode cod;
+  cod.Replicate(Code(obj));
+  return(new BContensCode("",cod,""));
+};
+/*
+//--------------------------------------------------------------------
+BSyntaxObject* CopyNameBlock(BSyntaxObject* obj,const BArray<BDat>& p,BInt& pos)
+{
+  BUseerNameBlock* unb = (BUseerNameBlock*)obj
+  BNameBlock mat = unb->Contens();
+  if(p.Size())
+  {
+          for(BInt i=0; i<mat.Rows(); i++)
+          {
+            for(BInt j=0; j<mat.Columns(); j++)
+            {
+                mat(i,j) = p[pos++];
+            }
+        }
+    }
+    return(new BContensMat("",mat,""));
+};
+*/
+
+//--------------------------------------------------------------------
 BSyntaxObject* CopySet(BSyntaxObject* obj,const BArray<BDat>& p,BInt& pos);
 
@@ -2102 +2129 @@
 void DeepCopy(const BSet& sample,BSet& copy,const BArray<BDat>& p,BInt& pos)
 {
-    BList* lst = NIL;
-    BList* aux = NIL;
-    BInt i;
-    for(i=1; i<=sample.Card(); i++)
-    {
-        if(sample[i])
-        {
-            BSyntaxObject* obj = NIL;
-            BGrammar*        gra = sample[i]->Grammar();
-            if(gra==GraReal   ())      { obj = CopyReal   (sample[i],p,pos); }
-            else if(gra==GraPolyn  ()) { obj = CopyPolyn  (sample[i],p,pos); }
-            else if(gra==GraRatio ()) { obj = CopyRatio (sample[i],p,pos); }
-            else if(gra==GraMatrix ()) { obj = CopyMatrix (sample[i],p,pos); }
-            else if(gra==GraSet    ()) { obj = CopySet    (sample[i],p,pos); }
-            else                       { obj = sample[i]->CopyContens ();    }
-            LstFastAppend(lst,aux,obj);
-        }
-    }
-    copy.RobStruct(lst,sample.Struct(),sample.SubType());
+  BList* lst = NIL;
+  BList* aux = NIL;
+  BInt i;
+  for(i=1; i<=sample.Card(); i++)
+  {
+    if(sample[i])
+    {
+      BSyntaxObject* obj = NIL;
+      BGrammar*      gra = sample[i]->Grammar();
+           if(gra==GraReal   ()) { obj = CopyReal   (sample[i],p,pos); }
+      else if(gra==GraPolyn  ()) { obj = CopyPolyn  (sample[i],p,pos); }
+      else if(gra==GraRatio  ()) { obj = CopyRatio  (sample[i],p,pos); }
+      else if(gra==GraMatrix ()) { obj = CopyMatrix (sample[i],p,pos); }
+      else if(gra==GraSet    ()) { obj = CopySet    (sample[i],p,pos); }
+      else if(gra==GraCode   ()) { obj = CopyCode   (sample[i]);       }
+      else                                 { obj = sample[i]->CopyContens ();    }
+      if(obj && !obj->HasName())
+      {
+        obj->PutName(sample[i]->Name());
+      }
+      LstFastAppend(lst,aux,obj);
+    }
+  }
+  copy.RobStruct(lst,sample.Struct(),sample.SubType());
+  if(sample.HasIndexByName())
+  {
+    copy.SetIndexByName();
+  }
 };
+
 
 //--------------------------------------------------------------------