Changeset 58bbda in git for Singular/ipassign.cc

Timestamp:

Jun 17, 1997, 11:44:32 AM (27 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

623e7ca4e8b2344c62d7c256c94ecdb52b6d1cdb

Parents:

388fe1e36784de6985ec8bb9daeb7bd4f2c0c751

Message:

* hannes/siebert: bugfixes for qring, assignment for proc
  (grammar.y ideals.cc ipassign.cc ipid.cc polys.cc)


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

File:

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

Singular/ipassign.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
+/* $Id: ipassign.cc,v 1.13 1997-06-17 09:44:25 Singular Exp $ */
+
 /*
 * ABSTRACT: interpreter:
@@ -107 +109 @@
 {
 #ifdef HAVE_TCL
-  if (!tclmode) 
+  if (!tclmode)
 #endif
     pShortOut=(int)a->Data();
@@ -271 +273 @@
           return TRUE;
         }
-      }  
+      }
     }
     else
@@ -467 +469 @@
 ,{jiA_STRING,   STRING_CMD,     STRING_CMD }
 ,{jiA_STRING,   PROC_CMD,       STRING_CMD }
+,{jiA_STRING,   PROC_CMD,       PROC_CMD }
 ,{jiA_POLY,     VECTOR_CMD,     VECTOR_CMD }
 ,{jiA_INTVEC,   INTVEC_CMD,     INTVEC_CMD }
@@ -490 +493 @@
 #ifdef HAVE_RTIMER
 ,{jjRTIMER,     VRTIMER,        INT_CMD }
-#endif 
+#endif
 ,{jjMAXDEG,     VMAXDEG,        INT_CMD }
 ,{jjMAXMULT,    VMAXMULT,       INT_CMD }
@@ -501 +504 @@
 /*=================== operations ============================*/
 /*2
-* assign a = b 
+* assign a = b
 */
 static BOOLEAN jiAssign_1(leftv l, leftv r)
@@ -511 +514 @@
     return TRUE;
   }
-  
+
   int lt=l->Typ();
   if((lt==0)&&(l->name!=NULL))
@@ -523 +526 @@
     return TRUE;
   }
-  
+
   int i=0;
   BOOLEAN nok=FALSE;
@@ -549 +552 @@
     if ((l->data==r->data)&&(l->e==NULL)&&(r->e==NULL))
       return FALSE;
-  }    
+  }
+  leftv ld=l;
+  if ((l->rtyp==IDHDL)&&(lt!=QRING_CMD)&&(lt!=RING_CMD))
+    ld=(leftv)l->data;
   while (((dAssign[i].res!=lt)
       || (dAssign[i].arg!=rt))
@@ -556 +562 @@
   {
     BOOLEAN b;
-    leftv ld=l;
-    if ((l->rtyp==IDHDL)&&(lt!=QRING_CMD)&&(lt!=RING_CMD))
-      ld=(leftv)l->data;
     b=dAssign[i].p(ld,r,l->e);
+    if(l!=ld) /* i.e. l is IDHDL, l->data is ld */
+    {
+      l->flag=ld->flag;
+      l->attribute=ld->attribute;
+    }
     return b;
   }
@@ -578 +586 @@
         if(!failed)
         {
-          if((l->rtyp==IDHDL)&&(lt!=QRING_CMD)&&(lt!=RING_CMD))
-            failed=dAssign[i].p((leftv)l->data,rn,l->e);
-          else
-            failed= dAssign[i].p(l,rn,l->e);
-        }    
+          failed= dAssign[i].p(ld,rn,l->e);
+        }
         // everything done, clean up temp. variables
         rn->CleanUp();
@@ -593 +598 @@
         else
         {
+          if(l!=ld) /* i.e. l is IDHDL, l->data is ld */
+          {
+            l->flag=ld->flag;
+            l->attribute=ld->attribute;
+          }
           // everything ok, return
           return FALSE;
@@ -922 +932 @@
       nok=jiAssign_1(l,&t);
       l->next=h;
-      if (nok) 
+      if (nok)
       {
         idDelete((ideal *)&m);
@@ -959 +969 @@
       nok=TRUE;
       break;
-    }  
-  }
-ende:  
+    }
+  }
+ende:
   or->CleanUp();
   ol->CleanUp();
@@ -993 +1003 @@
     l->next=NULL;
     nok=jiAssign_1(l,&t);
-    if (nok) 
+    if (nok)
     {
       break;
@@ -1016 +1026 @@
     atKillAll((idhdl)l);
     l->attribute=NULL;
-  }  
+  }
   l->flag=0;
   lists li;
-  if (l->rtyp==IDHDL) 
+  if (l->rtyp==IDHDL)
   {
     li=IDLIST((idhdl)l->data);
-  }  
+  }
   else
   {
@@ -1054 +1064 @@
     b=iiAssign(ld,r);
     l->e->next=ld->e;
-  }  
+  }
   return b;
 }
@@ -1101 +1111 @@
   {
     IDFLAG((idhdl)l->data)=0;
-  }  
+  }
   l->flag=0;
   if (ll==1)
@@ -1108 +1118 @@
     if((l->e!=NULL)
     && (((l->rtyp==IDHDL) && (IDTYP((idhdl)l->data)==LIST_CMD))
-      || (l->rtyp==LIST_CMD)))   
+      || (l->rtyp==LIST_CMD)))
     {
        if(r->next!=NULL)
          b=jiA_L_LIST(l,r);
-       else  
+       else
          b=jiAssign_list(l,r);
        if((l->rtyp==IDHDL) && (l->data!=NULL))
@@ -1119 +1129 @@
          l->attribute=IDATTR((idhdl)l->data);
          l->flag=IDFLAG((idhdl)l->data);
-       }  
+       }
        r->CleanUp();
        Subexpr h;
@@ -1155 +1165 @@
            l->flag=IDFLAG((idhdl)l->data);
            l->CleanUp();
-         }  
+         }
          r->CleanUp();
          return b;
-      } 
+      }
       if ((lt!=LIST_CMD)
       &&((rt==MATRIX_CMD)
@@ -1164 +1174 @@
         ||(rt==INTVEC_CMD)
         ||(rt==MODUL_CMD)))
-      {   
+      {
          b=jiAssign_1(l,r);
          if((l->rtyp==IDHDL)&&(l->data!=NULL))
@@ -1171 +1181 @@
            l->attribute=IDATTR((idhdl)l->data);
            l->flag=IDFLAG((idhdl)l->data);
-         }  
+         }
          r->CleanUp();
          Subexpr h;