Changeset 6959c4 in git

Timestamp:

Jul 9, 1999, 5:27:28 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

7e77a5bfe230c1a49479c409f74bc08bc1c2b249

Parents:

34fbd934a748fec8c0dcc9325052eddde20bd10e

Message:

* hannes: name conflicts parameter, varnames  (+ bug fix for "real(..)")


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

Location:

Singular

Files:

• iparith.cc (modified) (2 diffs)
• ring.cc (modified) (2 diffs)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.158 1999-07-09 14:58:25 Singular Exp $ */
+/* $Id: iparith.cc,v 1.159 1999-07-09 15:27:26 Singular Exp $ */
 
 /*
@@ -4522 +4522 @@
 static BOOLEAN jjKLAMMER_PL(leftv res, leftv u)
 {
-  if (yyInRingConstruction)
+  if ((yyInRingConstruction) 
+  && ((strcmp(u->Name(),"real")==0) || (strcmp(u->Name(),"complex")==0)))
   {
     memcpy(res,u,sizeof(sleftv));

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.59 1999-07-09 14:06:50 obachman Exp $ */
+/* $Id: ring.cc,v 1.60 1999-07-09 15:27:28 Singular Exp $ */
 
 /*
@@ -608 +608 @@
   }
 
+  /* check names nad parameters for conflicts ------------------------- */
+  {
+    int i,j;
+    for(i=0;i<R->P; i++)
+    {
+      for(j=0;j<R->N;j++)
+      {
+        if (strcmp(R->parameter[i],R->names[j])==0)
+        {
+          Werror("parameter %d conflicts with variable %d",i+1,j+1);
+          goto rInitError;
+        }
+      }
+    }
+  }
   /* ordering -------------------------------------------------------------*/
   if (rSleftvOrdering2Ordering(ord, R))