Changeset 7df5dbe in git

Timestamp:

Sep 15, 2014, 6:30:00 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

9ee58600ea602eefc9da288c53b6bd382fe6dc4f

Parents:

5faa0e147458dacf2fbe178a3ebe9b2d0957424b

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-09-15 18:30:00+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-09-15 18:33:25+02:00

Message:

fix: tr.#643

File:

• Singular/ipshell.cc (modified) (1 diff)

Singular/ipshell.cc

@@ -2096 +2096 @@
 {
   int i,j;
-  for(i=0;i<R->N-1;i++)
-  {
-    for(j=i+1;j<R->N;j++)
-    {
-      if (strcmp(R->names[i],R->names[j])==0)
-      {
-        Warn("name conflict var(%d) and var(%d): `%s`, rename to `@(%d)`",i+1,j+1,R->names[i],j+1);
-        omFree(R->names[j]);
-        R->names[j]=(char *)omAlloc(10);
-        sprintf(R->names[j],"@(%d)",j+1);
-      }
-    }
-  }
+  BOOLEAN ch;
+  do
+  {
+    ch=0;
+    for(i=0;i<R->N-1;i++)
+    {
+      for(j=i+1;j<R->N;j++)
+      {
+        if (strcmp(R->names[i],R->names[j])==0)
+        {
+          ch=TRUE;
+          Warn("name conflict var(%d) and var(%d): `%s`, rename to `@%s`",i+1,j+1,R->names[i],R->names[i]);
+          omFree(R->names[j]);
+          R->names[j]=(char *)omAlloc(2+strlen(R->names[i]));
+          sprintf(R->names[j],"@%s",R->names[i]);
+        }
+      }
+    }
+  }
+  while (ch);
   for(i=0;i<rPar(R); i++)
   {