Changeset 28e0ac8 in git

Timestamp:

Feb 5, 2002, 10:32:21 AM (22 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

703b5a30d9a0e3c4a0a56969ed2a954ba94a7429

Parents:

143730551d27a93040ea2cf6e367f92279ad2276

Message:

*hannes: more checks in rCompose


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

File:

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

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.181 2002-02-04 17:12:59 Singular Exp $ */
+/* $Id: ring.cc,v 1.182 2002-02-05 09:32:21 Singular Exp $ */
 
 /*
@@ -4085 +4085 @@
     {
     // todo: a(..), M
-      lists vv=(lists)v->m[j].Data(); // assume LIST
+      if (v->m[j].Typ()!=LIST_CMD)
+      {
+        WerrorS("ordering must be list of lists");
+        goto rCompose_err;
+      }
+      lists vv=(lists)v->m[j].Data();
+      if ((vv->nr!=1)
+      || (vv->m[0].Typ()!=STRING_CMD)
+      || ((vv->m[1].Typ()!=INTVEC_CMD) && (vv->m[1].Typ()!=INT_CMD)))
+      {
+        WerrorS("ordering name must be a (string,intvec)");
+        goto rCompose_err;
+      }
       R->order[j]=rOrderName(omStrDup((char*)vv->m[0].Data())); // assume STRING
       if (j==0) R->block0[0]=1;
       else      R->block0[j]=R->block1[j-1]+1;
-      intvec *iv=ivCopy((intvec*)vv->m[1].Data()); //assume INTVEC
+      intvec *iv;
+      if (vv->m[1].Typ()==INT_CMD)
+        iv=new intvec((int)vv->m[1].Data(),(int)vv->m[1].Data());
+      else
+        iv=ivCopy((intvec*)vv->m[1].Data()); //assume INTVEC
       R->block1[j]=R->block0[j]+iv->length()-1;
       int i;