Changeset 8a839d1 in git

Timestamp:

Sep 22, 1998, 12:29:45 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

e0d91ca23156d80a43dde9ffd342ab947b5cc298

Parents:

3ab190a8d35777d9a45959eb4ca0dedfb3ec5683

Message:

* hannes: fixed last fix


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

File:

• Singular/mpsr_Put.cc (modified) (25 diffs)

Singular/mpsr_Put.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpsr_Put.cc,v 1.11 1998-09-21 12:42:10 Singular Exp $ */
+/* $Id: mpsr_Put.cc,v 1.12 1998-09-22 10:29:45 Singular Exp $ */
 
 
@@ -13 +13 @@
  * Change History (most recent first):
  *  o 1/97 obachman
- *    Updated putting routines to MP and MPP v1.1 
+ *    Updated putting routines to MP and MPP v1.1
  *
  ***************************************************************/
@@ -131 +131 @@
       case NONE:
         return mpsr_Success;
-        
+
       default:
         return mpsr_SetError(mpsr_UnknownLeftvType);
@@ -144 +144 @@
 {
   int length = iv->length();
-  
-  // Put the Vector Operator 
+
+  // Put the Vector Operator
   mp_failr(MP_PutCommonOperatorPacket(link,
                                       MP_MatrixDict,
@@ -151 +151 @@
                                       1,
                                       length));
-  // Prototype Annot 
+  // Prototype Annot
   mp_failr(MP_PutAnnotationPacket(link,
                                   MP_ProtoDict,
@@ -157 +157 @@
                                   MP_AnnotReqValNode));
   // Together with the CommonMetaTypePacket specifying that each element of
-  // the vector is an Sint32 
+  // the vector is an Sint32
   mp_failr(MP_PutCommonMetaTypePacket(link,
                                       MP_ProtoDict,
                                       MP_CmtProtoIMP_Sint32,
                                       0));
-  
-  // Now we finally put the data 
+
+  // Now we finally put the data
   mp_return(IMP_PutSint32Vector(link, (MP_Sint32_t *) iv->ivGetVec(),
                                 length));
@@ -172 +172 @@
   int r = iv->rows(), c = iv->cols(), length = r*c;
 
-  // First, we put the Matrix operator 
+  // First, we put the Matrix operator
   mp_failr(MP_PutCommonOperatorPacket(link,
                                       MP_MatrixDict,
@@ -178 +178 @@
                                       2,
                                       length));
-  // Put the two annotations 
-  // First, the prototype annot 
+  // Put the two annotations
+  // First, the prototype annot
   mp_failr(MP_PutAnnotationPacket(link,
                                   MP_ProtoDict,
@@ -188 +188 @@
                                   MP_CmtProtoIMP_Sint32,
                                   0));
-  // And second, the dimension annot 
+  // And second, the dimension annot
   mp_failr(MP_PutAnnotationPacket(link,
                                   MP_MatrixDict,
@@ -202 +202 @@
   mp_failr(MP_PutUint32Packet(link, (MP_Uint32_t) c, 0));
 
-  // And finally, we put the elments 
+  // And finally, we put the elments
   mp_return(IMP_PutSint32Vector(link, (MP_Sint32_t *) iv->ivGetVec(),
                                 length));
@@ -224 +224 @@
 
   failr(mpsr_tok2mp('=', &dict, &cop));
-  
+
   // A Singular- procedure is sent as a cop with the string as arg
   mp_failr(MP_PutCommonOperatorPacket(link,
-                                        dict,
-                                        cop,
-                                        0,
-                                        2));
+                                        dict,
+                                        cop,
+                                        0,
+                                        2));
   mp_failr(MP_PutIdentifierPacket(link, MP_SingularDict, pname,1));
   mp_failr(MP_PutAnnotationPacket(link,
-                                  MP_SingularDict,
-                                  MP_AnnotSingularProcDef,
-                                  0));
+                                  MP_SingularDict,
+                                  MP_AnnotSingularProcDef,
+                                  0));
   if( proc->language == LANG_SINGULAR) {
     if (proc->data.s.body == NULL)
@@ -336 +336 @@
     mpsr_SetCurrRing(cring, TRUE);
   }
-  
+
   if (!nIsZero(n))
   {
@@ -346 +346 @@
 
   if (rr != NULL) mpsr_SetCurrRing(rr, TRUE);
-  
+
   return r;
 }
@@ -421 +421 @@
                                           0));
   failr(mpsr_PutRingAnnots(link, cring, 1));
-  
+
   mp_failr(MP_PutAnnotationPacket(link,
                                     MP_PolyDict,
@@ -427 +427 @@
                                     MP_AnnotValuated));
   mp_failr(MP_PutUint32Packet(link, id->rank, 0));
-  
+
   for (i=0; i < idn; i++)
   {
@@ -441 +441 @@
   MP_Uint32_t n = nrows*ncols, i;
 
-  // First, we put the Matrix operator 
+  // First, we put the Matrix operator
   mp_failr(MP_PutCommonOperatorPacket(link,
                                       MP_MatrixDict,
@@ -447 +447 @@
                                       2,
                                       n));
-  // Put the two annotations 
-  // First, the prototype annot 
+  // Put the two annotations
+  // First, the prototype annot
   mp_failr(MP_PutAnnotationPacket(link,
                                   MP_ProtoDict,
@@ -473 +473 @@
   mp_failr(MP_PutUint32Packet(link, (MP_Uint32_t) ncols, 0));
 
-  // And finally, we put the elments 
+  // And finally, we put the elments
   for (i=0; i < n; i++)
   {
@@ -507 +507 @@
   // Second, the name of the ring
   mp_failr(MP_PutStringPacket(link, m->preimage,0));
-  
+
   // and third, the ideal --
   // supposing that we can cast a map to an ideal
@@ -515 +515 @@
 
 /***************************************************************
- *  
+ *
  * A routine which dumps the content of Singular to a file
  *
@@ -532 +532 @@
   cmd.arg1.rtyp = DEF_CMD;
   lv = mpsr_InitLeftv(COMMAND, (void *) &cmd);
-  
+
   MP_ResetLink(link);
   while (h != NULL && h2 == NULL)
   {
-    
+
     if (IDTYP(h) == PROC_CMD)
     {
@@ -569 +569 @@
           cmd.arg1.name = IDID(h2);
           //memcpy(&(cmd.arg2), h2, sizeof(sleftv));
-          cmd.arg2.data=IDDATA(h);
-          cmd.arg2.flag=h->flag;
-          cmd.arg2.attribute=h->attribute;
-          cmd.arg2.rtyp=h->typ;
+          cmd.arg2.data=IDDATA(h2);
+          cmd.arg2.flag=h2->flag;
+          cmd.arg2.attribute=h2->attribute;
+          cmd.arg2.rtyp=h2->typ;
           if (mpsr_PutLeftv(link, lv, r) != mpsr_Success) break;
 #ifdef MPSR_DEBUG
@@ -581 +581 @@
       }
     }
-    
+
     h = h->next;
   }
@@ -587 +587 @@
   Free(lv, sizeof(sleftv));
   if (rh != NULL && rh != currRingHdl) rSetHdl(rh, TRUE);
-  
+
   if (h == NULL && h2 == NULL)
     return mpsr_Success;
@@ -593 +593 @@
     return mpsr_Failure;
 }
-  
+
 #endif // HAVE_MPSR