Changeset bff7f6 in git

Timestamp:

Nov 7, 2017, 1:53:12 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

63b86a1dcf2f3f960fbc42e28042aafc8bccbdb7

Parents:

75958aa02cc3de1feb3f010173cbb8e32c90218f

Message:

fix: simplified system("rcolon"...) via iiCheckTypes

File:

• Singular/extra.cc (modified) (1 diff)

Singular/extra.cc

@@ -390 +390 @@
   if(strcmp(sys_cmd,"rcolon") == 0)
   {
-    ideal i; poly w; int lV;
-    if((h != NULL)&&(h->Typ() == IDEAL_CMD))
-      i = (ideal)h->Data();
-    else
-    {
-      WerrorS("nc_Hilb:ideal expected");
+    const short t1[]={3,IDEAL_CMD,POLY_CMD,INT_CMD};
+    if (iiCheckTypes(h,t1,1))
+    {
+      ideal i = (ideal)h->Data();
+      h = h->next;
+      poly w=(poly)h->Data();
+      h = h->next;
+      int lV = (int)(long)h->Data();
+      res->rtyp = IDEAL_CMD;
+      res->data = RightColonOperation(i, w, lV);
+      return(FALSE);
+    }
+    else
       return TRUE;
-    }
-    h = h->next;
-    if((h != NULL)&&(h->Typ() == POLY_CMD))
-      w=(poly)h->Data();
-    else
-    {
-      WerrorS("nc_Hilb:monomial expected");
-      return TRUE;
-    }
-    h = h->next;
-    if((h != NULL)&&(h->Typ() == INT_CMD))
-      lV = (int)(long)h->Data();
-    else
-    {
-      WerrorS("nc_Hilb:int expected");
-      return TRUE;
-    }
-    res->rtyp = IDEAL_CMD;
-    res->data = RightColonOperation(i, w, lV);
-    return(FALSE);
   }
   else