Changeset 94d691 in git

Timestamp:

Mar 27, 2017, 2:04:58 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

19e445169dc94cfe73bfa752bb44871e975d40dfc3b003914c0b9ce9b79928dbffdac547fdfc1700

Parents:

0d1a367213d4988be6eb6006d04b503fd8914d97

Message:

add iiCallLibProc1, iiCallLibProcM (<- iiCallLib): call LIB-proc from C++

Files:

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

Singular/iplib.cc

@@ -586 +586 @@
   return FALSE;
 }
-
-void* iiCallLib(const char*n, void *arg, int arg_type, BOOLEAN &err)
-{
-  idhdl h=ggetid(n);
-  if ((h==NULL)
-  || (IDTYP(h)!=PROC_CMD))
-  {
-    err=2;
-    return NULL;
-  }
-  // ring handling
-  idhdl save_ringhdl=currRingHdl;
-  ring save_ring=currRing;
+static void iiCallLibProcBegin()
+{
   idhdl tmp_ring=NULL;
   if (currRing!=NULL)
@@ -614 +603 @@
     }
   }
+}
+static void iiCallLibProcEnd(idhdl save_ringhdl, ring save_ring)
+{
+  if ((currRing!=NULL) 
+  &&(currRing!=save_ring))
+  {
+    currRing->ref--;
+    idhdl hh=IDROOT;
+    idhdl prev=NULL;
+    while((hh!=currRingHdl) && (hh!=NULL)) { prev=hh; hh=hh->next; }
+    if (hh!=NULL)
+    {
+      if (prev==NULL) IDROOT=hh->next;
+      else prev->next=hh->next;
+      omFree((ADDRESS)IDID(hh));
+      omFreeBin((ADDRESS)hh, idrec_bin);
+    }
+    else
+    {
+      WarnS("internal: lost ring in iiCallLib");
+    }
+  }
+  currRingHdl=save_ringhdl;
+  currRing=save_ring;
+}
+
+void* iiCallLibProc1(const char*n, void *arg, int arg_type, BOOLEAN &err)
+{
+  idhdl h=ggetid(n);
+  if ((h==NULL)
+  || (IDTYP(h)!=PROC_CMD))
+  {
+    err=2;
+    return NULL;
+  }
+  // ring handling
+  idhdl save_ringhdl=currRingHdl;
+  ring save_ring=currRing;
+  iiCallLibProcBegin();
   // argument:
   sleftv tmp;
@@ -622 +650 @@
   err=iiMake_proc(h,currPack,&tmp);
   // clean up ring
-  if (tmp_ring!=NULL)
-  {
-    IDRING(tmp_ring)->ref--;
-    idhdl hh=IDROOT;
-    idhdl prev=NULL;
-    while((hh!=tmp_ring) && (hh!=NULL)) { prev=hh; hh=hh->next; }
-    if (hh!=NULL)
-    {
-      if (prev==NULL) IDROOT=hh->next;
-      else prev->next=hh->next;
-      omFree((ADDRESS)IDID(hh));
-      omFreeBin((ADDRESS)hh, idrec_bin);
-    }
-    else
-    {
-      WarnS("internal: lost ring in iiCallLib");
-    }
-  }
-  currRingHdl=save_ringhdl;
-  currRing=save_ring;
+  iiCallLibProcEnd(save_ringhdl,save_ring);
+  // return
+  if (err==FALSE)
+  {
+    void*r=iiRETURNEXPR.data;
+    iiRETURNEXPR.data=NULL;
+    iiRETURNEXPR.CleanUp();
+    return r;
+  }
+  return NULL;
+}
+/// args: NULL terminated arry of arguments
+/// arg_types: 0 terminated array of corresponding types
+void* iiCallLibProcM(const char*n, void **args, int* arg_types, BOOLEAN &err)
+{
+  idhdl h=ggetid(n);
+  if ((h==NULL)
+  || (IDTYP(h)!=PROC_CMD))
+  {
+    err=2;
+    return NULL;
+  }
+  // ring handling
+  idhdl save_ringhdl=currRingHdl;
+  ring save_ring=currRing;
+  iiCallLibProcBegin();
+  // argument:
+  if (arg_types[0]!=0)
+  {
+    sleftv tmp;
+    leftv tt=&tmp;
+    int i=1;
+    tmp.Init();
+    tmp.data=args[0];
+    tmp.rtyp=arg_types[0];
+    while(arg_types[i]!=0)
+    {
+      tt->next=(leftv)omAlloc0(sizeof(sleftv));
+      tt=tt->next;
+      tt->rtyp=arg_types[i];
+      tt->data=args[i];
+      i++;
+    }
+    // call proc
+    err=iiMake_proc(h,currPack,&tmp);
+  }
+  else
+  // call proc
+    err=iiMake_proc(h,currPack,NULL);
+  // clean up ring
+  iiCallLibProcEnd(save_ringhdl,save_ring);
   // return
   if (err==FALSE)

Singular/ipshell.h

@@ -193 +193 @@
   BOOLEAN isring = FALSE, BOOLEAN init_b=TRUE);
 BOOLEAN iiMake_proc(idhdl pn, package pack, leftv sl);
-void* iiCallLib(const char*n, void *arg, int arg_type, BOOLEAN &err);
+void* iiCallLibProc1(const char*n, void *arg, int arg_type, BOOLEAN &err);
+void* iiCallLibProcM(const char*n, void **args, int *arg_types, BOOLEAN &err);
 // from misc.cc:
 char *  showOption();

kernel/ideals.cc

@@ -519 +519 @@
   {
     BOOLEAN err;
-    h3=(ideal)iiCallLib("groebner",idCopy(h2),MODUL_CMD,err);
+    h3=(ideal)iiCallLibProc1("groebner",idCopy(h2),MODUL_CMD,err);
     if (err)
     {