Changeset a4382f in git for Singular/iparith.cc

Timestamp:

Nov 2, 2010, 12:26:42 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1eee1942009036293bba4732cba8350d473b4c15

Parents:

31f8c8f690fbefca075070a16cd0ba9496de5824

Message:

fix error mesage for std(4 args)

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

File:

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

Singular/iparith.cc

@@ -7765 +7765 @@
   ideal i1=(ideal)(u->Data());
   ideal i0;
+  if (((u->Typ()!=IDEAL_CMD)&&(u->Typ()!=MODUL_CMD))
+  || (h->Typ()!=INTVEC_CMD)
+  || (w->Typ()!=INTVEC_CMD))
+  {
+    WerrorS("expected `std(`ideal/module`,`poly/vector`,`intvec`,`intvec`)");
+    return TRUE;
+  }
   intvec *vw=(intvec *)w->Data(); // weights of vars
   /* merging std_hilb_w and std_1 */
@@ -7778 +7785 @@
     i0=idInit(1,i1->rank);
     i0->m[0]=(poly)v->Data();
-    BOOLEAN cleanup_i0=TRUE;;
-  }
-  else /* IDEAL */
+    BOOLEAN cleanup_i0=TRUE;
+  }
+  else if (r==IDEAL_CMD)/* IDEAL */
   {
     i0=(ideal)v->Data();
+  }
+  else
+  {
+    WerrorS("expected `std(`ideal/module`,`poly/vector`,`intvec`,`intvec`)");
+    return TRUE;
   }
   int ii0=idElem(i0);