Changeset 1505bd in git

Timestamp:

May 13, 2019, 4:44:50 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

493663662cc7fa3b704960e9bc976cd4e6fdcb2d

Parents:

d0ca0b8ae05c9cfcf2578b78e43825144b88299c

Message:

change iiCallLibProcM -> ii_CallLibProcM

Files:

• Singular/iplib.cc (modified) (4 diffs)
• Singular/ipshell.h (modified) (1 diff)
• kernel/ideals.cc (modified) (5 diffs)

Singular/iplib.cc

@@ -603 +603 @@
       omFreeBin((ADDRESS)hh, idrec_bin);
     }
-    else
-    {
-      WarnS("internal: lost ring in iiCallLib");
-    }
   }
   currRingHdl=save_ringhdl;
@@ -686 +682 @@
 /// args: NULL terminated array of arguments
 /// arg_types: 0 terminated array of corresponding types
-void* iiCallLibProcM(const char*n, void **args, int* arg_types, BOOLEAN &err)
+leftv ii_CallLibProcM(const char*n, void **args, int* arg_types, const ring R, BOOLEAN &err)
 {
   idhdl h=ggetid(n);
@@ -698 +694 @@
   idhdl save_ringhdl=currRingHdl;
   ring save_ring=currRing;
+  rChangeCurrRing(R);
   iiCallLibProcBegin();
   // argument:
@@ -727 +724 @@
   if (err==FALSE)
   {
-    void*r=iiRETURNEXPR.data;
-    iiRETURNEXPR.data=NULL;
-    iiRETURNEXPR.CleanUp();
-    return r;
+    leftv h=(leftv)omAllocBin(sleftv_bin);
+    memcpy(h,&iiRETURNEXPR,sizeof(sleftv));
+    memset(&iiRETURNEXPR,0,sizeof(sleftv));
+    return h;
   }
   return NULL;

Singular/ipshell.h

@@ -196 +196 @@
 BOOLEAN iiMake_proc(idhdl pn, package pack, leftv sl);
 void* iiCallLibProc1(const char* n, void *arg, int arg_type, BOOLEAN &err);
-void* iiCallLibProcM(const char* n, void **args, int *arg_types, BOOLEAN &err);
+leftv ii_CallLibProcM(const char* n, void **args, int *arg_types, const ring R, BOOLEAN &err);
 ideal ii_CallProcId2Id(const char* lib,const char* proc, ideal arg,const ring R);
 int ii_CallProcId2Int(const char* lib,const char* proc, ideal arg,const ring R);

kernel/ideals.cc

@@ -303 +303 @@
     void *args[]={temp,(void*)1,NULL};
     int arg_t[]={MODUL_CMD,INT_CMD,0};
-    temp1=(ideal)iiCallLibProcM("modStd",args,arg_t,err);
+    leftv temp0=ii_CallLibProcM("modStd",args,arg_t,currRing,err);
+    temp1=(ideal)temp0->data;
+    omFreeBin((ADDRESS)temp0,sleftv_bin);
     if (err)
     {
@@ -345 +347 @@
       void *args[]={temp,v,NULL};
       int arg_t[]={MODUL_CMD,IDEAL_CMD,0};
-      temp1=(ideal)iiCallLibProcM("satstd",args,arg_t,err);
+      leftv temp0=ii_CallLibProcM("satstd",args,arg_t,currRing,err);
+      temp1=(ideal)temp0->data;
+      omFreeBin((ADDRESS)temp0, sleftv_bin);
     }
     if (err)
@@ -655 +659 @@
     void *args[]={idCopy(h2),(void*)1,NULL};
     int arg_t[]={MODUL_CMD,INT_CMD,0};
-    h3=(ideal)iiCallLibProcM("modStd",args,arg_t,err);
+    leftv temp0=ii_CallLibProcM("modStd",args,arg_t,currRing,err);
+    h3=(ideal)temp0->data;
+    omFreeBin((ADDRESS)temp0,sleftv_bin);
     if (err)
     {
@@ -697 +703 @@
       void *args[]={idCopy(h2),v,NULL};
       int arg_t[]={MODUL_CMD,IDEAL_CMD,0};
-      h3=(ideal)iiCallLibProcM("satstd",args,arg_t,err);
+      leftv temp0=ii_CallLibProcM("satstd",args,arg_t,currRing,err);
+      h3=(ideal)temp0->data;
+      omFreeBin((ADDRESS)temp0,sleftv_bin);
     }
     if (err)
@@ -1757 +1765 @@
     void *args[]={idCopy(h),(void*)1,NULL};
     int arg_t[]={IDEAL_CMD,INT_CMD,0};
-    hh=(ideal)iiCallLibProcM("modStd",args,arg_t,err);
+    leftv temp0=ii_CallLibProcM("modStd",args,arg_t,currRing,err);
+    hh=(ideal)temp0->data;
+    omFreeBin((ADDRESS)temp0,sleftv_bin);
     if (err)
     {