Changeset b67caf4 in git for Singular/ipshell.cc

Timestamp:

Jan 23, 2015, 6:37:31 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '873fc1222e995d7cb33f79d8f1792ce418c8c72c')

Children:

97a7da2750245efc953ff12aad2e56a4bff4374e

Parents:

51d7406c03edf243bdd427e9698f4c38805e0743

Message:

changed "apply": returns expr_list

File:

• Singular/ipshell.cc (modified) (4 diffs)

Singular/ipshell.cc

@@ -5868 +5868 @@
 {
   intvec *aa=(intvec*)a->Data();
-  intvec *r=ivCopy(aa);
   sleftv tmp_out;
   sleftv tmp_in;
+  leftv curr=res;
   BOOLEAN bo=FALSE;
   for(int i=0;i<aa->length(); i++)
@@ -5881 +5881 @@
     else
       bo=jjPROC(&tmp_out,proc,&tmp_in);
-    if (bo || (tmp_out.rtyp!=INT_CMD))
-    {
-      if (r!=NULL) delete r;
+    if (bo)
+    {
+      res->CleanUp(currRing);
       Werror("apply fails at index %d",i+1);
       return TRUE;
     }
-    (*r)[i]=(int)(long)tmp_out.data;
-  }
-  res->data=(void*)r;
+    if (i==0) { memcpy(res,&tmp_out,sizeof(tmp_out)); }
+    else
+    {
+      curr->next=(leftv)omAllocBin(sleftv_bin);
+      curr=curr->next;
+      memcpy(curr,&tmp_out,sizeof(tmp_out));
+    }
+  }
   return FALSE;
 }
@@ -5905 +5910 @@
 {
   lists aa=(lists)a->Data();
-  lists r=(lists)omAlloc0Bin(slists_bin); r->Init(aa->nr+1);
   sleftv tmp_out;
   sleftv tmp_in;
+  leftv curr=res;
   BOOLEAN bo=FALSE;
   for(int i=0;i<=aa->nr; i++)
@@ -5920 +5925 @@
     if (bo)
     {
-      if (r!=NULL) r->Clean();
+      res->CleanUp(currRing);
       Werror("apply fails at index %d",i+1);
       return TRUE;
     }
-    memcpy(&(r->m[i]),&tmp_out,sizeof(sleftv));
-  }
-  res->data=(void*)r;
+    if (i==0) { memcpy(res,&tmp_out,sizeof(tmp_out)); }
+    else
+    {
+      curr->next=(leftv)omAllocBin(sleftv_bin);
+      curr=curr->next;
+      memcpy(curr,&tmp_out,sizeof(tmp_out));
+    }
+  }
   return FALSE;
 }