Changeset b2a6e3 in git

Timestamp:

May 5, 2009, 10:17:46 AM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7bd06876c68417663814d23718236d06ed4f91b3

Parents:

5684dfa909063f2b118082f73dce26a57ed264e0

Message:

*hannes: code simplification


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

File:

• Singular/iparith.cc (modified) (4 diffs)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.504 2009-04-08 17:18:55 motsak Exp $ */
+/* $Id: iparith.cc,v 1.505 2009-05-05 08:17:46 Singular Exp $ */
 
 /*
@@ -2524 +2524 @@
   if ( l->name[0]!='\0') // "" is the stop condition
   {
-    char *opt;
+    const char *opt;
     int mode=0;
-    if (v==NULL) opt="i";
-    else         opt=(char *)v->Data();
+    if (v==NULL) opt=(const char*)"i";
+    else         opt=(const char *)v->Data();
     while(*opt!='\0')
     {
@@ -6654 +6654 @@
   leftv u3=u2->next;
   leftv u4=u3->next;
-  if((u1->Typ()==POLY_CMD)&&(u2->Typ()==POLY_CMD)&&(u3->Typ()==INT_CMD)&&
-     (u4->Typ()==INTVEC_CMD)||
-     (u1->Typ()==VECTOR_CMD)&&(u2->Typ()==POLY_CMD)&&(u3->Typ()==INT_CMD)&&
-     (u4->Typ()==INTVEC_CMD))
+  if((u2->Typ()==POLY_CMD)&&(u3->Typ()==INT_CMD)&&(u4->Typ()==INTVEC_CMD)
+  &&((u1->Typ()==POLY_CMD)||(u1->Typ()==VECTOR_CMD)))
   {
     if(!pIsUnit((poly)u2->Data()))
@@ -6670 +6668 @@
   }
   else
-  if((u1->Typ()==IDEAL_CMD)&&(u2->Typ()==MATRIX_CMD)&&(u3->Typ()==INT_CMD)&&
-     (u4->Typ()==INTVEC_CMD)||
-     (u1->Typ()==MODUL_CMD)&&(u2->Typ()==MATRIX_CMD)&&(u3->Typ()==INT_CMD)&&
-     (u4->Typ()==INTVEC_CMD))
+  if((u2->Typ()==MATRIX_CMD)&&(u3->Typ()==INT_CMD)&&(u4->Typ()==INTVEC_CMD)
+  &&((u1->Typ()==IDEAL_CMD)||(u1->Typ()==MODUL_CMD)))
   {
     if(!mpIsDiagUnit((matrix)u2->Data()))