Changeset 09123d in git

Timestamp:

Dec 11, 2006, 2:14:43 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

428906ed82f492718d68a350f58015629da94156

Parents:

b70e541cf9b24785ba6107432a7f82b67ac6e61c

Message:

*hannes: define sleftv


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

File:

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

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.421 2006-12-09 14:24:14 Singular Exp $ */
+/* $Id: iparith.cc,v 1.422 2006-12-11 13:14:43 Singular Exp $ */
 
 /*
@@ -1617 +1617 @@
   memcpy(u->next,v,sizeof(sleftv));
   BOOLEAN r=iiExprArithM(res,u,iiOp);
+  v->Init();
   // iiExprArithM did the CleanUp
   return r;
@@ -5030 +5031 @@
   memcpy(u->next->next,w,sizeof(sleftv));
   BOOLEAN r=iiExprArithM(res,u,iiOp);
+  v->Init();
+  w->Init();
+  //w->rtyp=0; w->data=NULL;
   // iiExprArithM did the CleanUp
-  w->rtyp=0; w->data=NULL;
   return r;
 }
@@ -7044 +7047 @@
       command d=(command)omAlloc0Bin(ip_command_bin);
       memcpy(&d->arg1,a,sizeof(sleftv));
+      //a->Init();
       memcpy(&d->arg2,b,sizeof(sleftv));
+      //b->Init();
       d->argc=2;
       d->op=op;
@@ -7223 +7228 @@
       command d=(command)omAlloc0Bin(ip_command_bin);
       memcpy(&d->arg1,a,sizeof(sleftv));
+      //a->Init();
       d->op=op;
       d->argc=1;
@@ -7398 +7404 @@
       command d=(command)omAlloc0Bin(ip_command_bin);
       memcpy(&d->arg1,a,sizeof(sleftv));
+      //a->Init();
       memcpy(&d->arg2,b,sizeof(sleftv));
+      //b->Init();
       memcpy(&d->arg3,c,sizeof(sleftv));
+      //c->Init();
       d->op=op;
       d->argc=3;
@@ -7612 +7621 @@
           case 3:
             memcpy(&d->arg3,a->next->next,sizeof(sleftv));
-            a->next->next->rtyp=0;
-            a->next->next->data=NULL;
-            a->next->next->name=NULL;
-            a->next->next->attribute=NULL;
+            a->next->next->Init();
             /* no break */
           case 2:
             memcpy(&d->arg2,a->next,sizeof(sleftv));
-            a->next->rtyp=0;
-            a->next->name=NULL;
-            a->next->data=NULL;
-            a->next->attribute=NULL;
+            a->next->Init();
+            a->next->next=d->arg2.next;
             d->arg2.next=NULL;
             /* no break */
           case 1:
+            a->Init();
+            a->next=d->arg1.next;
             d->arg1.next=NULL;
         }
-        if (d->argc>3) a->next=NULL;
+        if (d->argc>3) a->next=NULL;
+        a->name=NULL;
         a->rtyp=0;
         a->data=NULL;
-        a->name=NULL;
+        a->e=NULL;
+        a->attribute=NULL;
         a->CleanUp();
       }