Changeset 7c5dd1 in git

Timestamp:

Jul 7, 2010, 7:57:19 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

9ae29ad7f27f9415c15371ba0d402a92043d4875

Parents:

06662e1138acc7765201463c7220765b864749fd

Message:

rNameCheck ->rRenaveVars

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

File:

• Singular/ipshell.cc (modified) (3 diffs)

Singular/ipshell.cc

@@ -1992 +1992 @@
 #endif
 
+static void rRenameVars(ring R)
+{
+  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);
+      }
+    }
+  }
+  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);
+      }
+    }
+  }
+}
+
 ring rCompose(const lists  L)
 {
@@ -2263 +2294 @@
     goto rCompose_err;
   }
-  rNameCheck(R);
+  rRenameVars(R);
   // ------------------------ Q-IDEAL ------------------------
   rComplete(R);
@@ -4885 +4916 @@
 
   /* check names and parameters for conflicts ------------------------- */
-  rNameCheck(R); // conflicting variables will be renamed
+  rRenameVars(R); // conflicting variables will be renamed
   /* ordering -------------------------------------------------------------*/
   if (rSleftvOrdering2Ordering(ord, R))