Changeset 09c91c1 in tol

Timestamp:

Feb 18, 2013, 2:41:27 PM (14 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

7387675

Parents:

72f8151

Message:

Allowing multiple copies in DeepCopy

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

File:

• tol/btol/bgrammar/spfuninst.cpp (modified) (1 diff)

tol/btol/bgrammar/spfuninst.cpp

@@ -1466 +1466 @@
           if(uM && (uM->Grammar()==GraMatrix()))
           { 
-            p   = uM->Contens().Data();
-            SAFE_DESTROY(uM,result);
+            BMat& M = uM->Contens();
+            int r = M.Rows();
+            int c = M.Columns();
+            p   = M.Data();
             pos = 0;
+            if(r==1)
+            {
+              DeepCopy(uS->Contens(),res->Contens(),p,pos);
+            }
+            else
+            {
+              int i;
+              res->Contens().PrepareStore(r);
+              for(i=0; i<r; i++)
+              {
+                BContensSet* res_i = new BContensSet;
+                DeepCopy(uS->Contens(),res_i->Contens(),p,pos); 
+                res->Contens().AddElement(res_i);
+              }
+            }
           }
-        }
-        DeepCopy(uS->Contens(),res->Contens(),p,pos);
+          SAFE_DESTROY(uM,result);
+        }
+        if(pos==-1) { DeepCopy(uS->Contens(),res->Contens(),p,pos); }
         SAFE_DESTROY(toCopy,result);
       }