Changeset 7ef4c2 in git for kernel/ring.cc

Timestamp:

Feb 13, 2009, 10:15:41 AM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'd0474371d8c5d8068ab70bfb42719c97936b18a6')

Children:

f9ffa1187e21ddea0986a5d4614216f62c066d70

Parents:

fec31e1b0b4219695838afd56e61b869215483ec

Message:

*hannes: rNameCheck: also for parameters


git-svn-id: file:///usr/local/Singular/svn/trunk@11385 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/ring.cc (modified) (2 diffs)

kernel/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.113 2009-01-08 10:21:35 Singular Exp $ */
+/* $Id: ring.cc,v 1.114 2009-02-13 09:15:41 Singular Exp $ */
 
 /*
@@ -128 +128 @@
       if (strcmp(R->names[i],R->names[j])==0)
       {
-        Warn("name conflict var(%d) and var(%d): `%s`",i+1,j+1,R->names[i]);
+        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);
+      }
+    }
+  }
+  for(i=0;i<R->P; i++)
+  {
+    for(j=0;j<R->N;j++)
+    {
+      if (strcmp(R->parameter[i],R->names[j])==0)
+      {
+        Warn("name conflict par(%d) and var(%d): `%s`, rename to `@@(%d)`",i+1,j+1,R->names[j],i+1);
+        omFree(R->parameter[i]);
+        R->parameter[i]=(char *)omAlloc(10);
+        sprintf(R->parameter[i],"@@(%d)",i+1);
       }
     }