Changeset ad42cac in git

Timestamp:

Mar 21, 1997, 3:58:56 PM (27 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1078af0712ed3a28a3f58e682e3f859a02bb9d66

Parents:

9c7667c132e7a9924e9e92fb80f4ca2d6cd4dd0a

Message:

Fixed little bugs in sleftv::Eval and mpsr_GetMisc


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

Location:

Singular

Files:

• mpsr_GetMisc.cc (modified) (4 diffs)
• subexpr.cc (modified) (2 diffs)

Singular/mpsr_GetMisc.cc

@@ -163 +163 @@
   return 1;
 }
-  
+
   
 // returns TRUE, if r1 less or equals r2
@@ -175 +175 @@
 
   if (r1 == NULL) return 1;
+
+  if (r2 == NULL) return 0;
 
   if ((r1->N > r2->N) || (r1->OrdSgn != r2->OrdSgn) || (r1->P > r2->P))
@@ -219 +221 @@
     r = r1;
   }
+  else if (RingLessEqual(r1, r2))
+  {
+    r = r2;
+    if (r1 != NULL)
+    {
+      mpsr_MapLeftv(mlv1->lv, r1, r);
+      rKill(r1);
+    }
+  }
   else if (RingLessEqual(r2, r1))
   {
@@ -226 +237 @@
       mpsr_MapLeftv(mlv2->lv, r2, r);
       rKill(r2);
-    }
-  }
-  else if (RingLessEqual(r1, r2))
-  {
-    r = r2;
-    if (r1 != NULL)
-    {
-      mpsr_MapLeftv(mlv1->lv, r1, r);
-      rKill(r1);
     }
   }

Singular/subexpr.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-static char rcsid[] = "$Header: /exports/cvsroot-2/cvsroot/Singular/subexpr.cc,v 1.3 1997-03-21 14:06:52 Singular Exp $";
+static char rcsid[] = "$Header: /exports/cvsroot-2/cvsroot/Singular/subexpr.cc,v 1.4 1997-03-21 14:58:56 obachman Exp $";
 /* $Log: not supported by cvs2svn $
+// Revision 1.3  1997/03/21  14:06:52  Singular
+// * hannes: changed return value for Eval(assignment) to 'nothing'
+//
 // Revision 1.2  1997/03/21  13:19:05  Singular
 // fixed assignment of lists, det(constants), comparision of intmats
@@ -1283 +1286 @@
       nok = iiExprArithM(this, NULL, d->op);
     }
-    if(nok)
-    {
-      rtyp=COMMAND;
-      data=(char *)d;
-    }
-    else
-    {
-      Free((ADDRESS)d,sizeof(ip_command));
-    }
   }
   else if (((rtyp==0)||(rtyp==DEF_CMD))