Changeset fc8d35 in git for Singular/ipassign.cc

Timestamp:

Mar 24, 2011, 4:22:39 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0dfa244172c41202ec5a6f6e99d2e04d2f572a2f

Parents:

22d1b1b8711921372328997bce54200d7b93ac90

Message:

fix tr. 120

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

File:

• Singular/ipassign.cc (modified) (6 diffs)

Singular/ipassign.cc

@@ -601 +601 @@
   if ((idElem(id)>1) || rIsSCA(currRing) || (currRing->qideal!=NULL))
     assumeStdFlag(a);
-    
+
 #ifdef HAVE_RINGS
   if (rField_is_Ring(currRing))
@@ -781 +781 @@
           failed= dAssign[i].p(ld,rn,l->e);
           if (TEST_V_ALLWARN)
-            Print("assign %s=%s ok? %d\n",Tok2Cmdname(lt),Tok2Cmdname(rn->rtyp),!failed);
+            Print("assign %s=%s ok? %d\n",Tok2Cmdname(lt),Tok2Cmdname(rn->rtyp),!failed);
         }
         // everything done, clean up temp. variables
@@ -1043 +1043 @@
   while (hh!=NULL)
   {
-    if (i>=iv->length()) break;
+    if (i>=iv->length())
+    {
+      if (TEST_V_ALLWARN)
+      {
+        Warn("expression list length(%d) does not match intmat size(%d)",
+              iv->length()+exprlist_length(hh),iv->length());
+      }
+      break;
+    }
     if (hh->Typ() == INT_CMD)
     {
@@ -1382 +1390 @@
           l->e=h;
         }
-        if ((!b) && (like_lists==1))
-        {
-          // check blackbox/newtype type:
-          if(bb->blackbox_Check(bb,l->Data())) return TRUE;
-        }
+        if ((!b) && (like_lists==1))
+        {
+          // check blackbox/newtype type:
+          if(bb->blackbox_Check(bb,l->Data())) return TRUE;
+        }
         return b;
       }
@@ -1393 +1401 @@
     rl=r->listLength();
     if (rl==1)
-    {               
+    {
       /* system variables = ... */
       if(((l->rtyp>=VECHO)&&(l->rtyp<=VPRINTLEVEL))
@@ -1538 +1546 @@
         num=olm->cols()*olm->rows();
         lm=mpNew(olm->rows(),olm->cols());
+        int el;
+        if ((TEST_V_ALLWARN) && (num!=(el=exprlist_length(hh))))
+        {
+          Warn("expression list length(%d) does not match matrix size(%d)",el,num);
+        }
       }
       else /* IDEAL_CMD or MODUL_CMD */