Changeset b9502a in git

Timestamp:

Feb 28, 2017, 12:28:39 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ddf313aa15678b49ae4cbd1aa2881b4a49296061

Parents:

5c773a32c223f8f216df09eef7badedc4d0754a6

Message:

dyn_mod: python: setring

Location:

Singular

Files:

• dyn_modules/python/ring_wrap.cc (modified) (2 diffs)
• iparith.cc (modified) (1 diff)
• iplib.cc (modified) (1 diff)
• table.h (modified) (1 diff)

Singular/dyn_modules/python/ring_wrap.cc

@@ -2 +2 @@
 #include <boost/python.hpp>
 #include <kernel/mod2.h>
+#include <Singular/ipshell.h>
 #include "ring_wrap.h"
 #include "poly_wrap.h"
@@ -12 +13 @@
   return boost::python::str(out,strlen(out));
 }
-void ring_set(Ring & r)
+void ring_set(Ring & R)
 {
-      //FIXME: only a hack, no solution
+    ring r=R.pimpl.get();
+    idhdl h=rFindHdl(r,NULL);
+    if (h==NULL)
+    {
       char name_buffer[100];
       static int ending=0;
       ending++;
       sprintf(name_buffer, "PYTHON_RING_VAR%d",ending);
-      idhdl shadow_hdl=enterid(name_buffer,0,RING_CMD,&IDROOT);
-      r.pimpl.get()->ref++;
-      shadow_hdl->data.uring=r.pimpl.get();
-      rChangeCurrRing(r.pimpl.get());
-      currRingHdl=shadow_hdl;
-
+      h=enterid(omStrDup(name_buffer),0,RING_CMD,&IDROOT);
+      IDRING(h)=r;
+      r->ref++;
+    }
+    rSetHdl(h);
+    for(int i=myynest;i>=0;i--) iiLocalRing[i]=r;
 }
 void export_ring()

Singular/iparith.cc

@@ -3553 +3553 @@
   (*bim)*=(-1);
   res->data = (char *)bim;
+  return FALSE;
+}
+// dummy for python_module.so and similiar
+static BOOLEAN jjSetRing(leftv res, leftv u)
+{
+  if (u->rtyp==IDHDL) rSetHdl((idhdl)u->data);
+  else
+  {
+    ring r=(ring)u->Data();
+    idhdl h=rFindHdl(r,NULL);
+    if (h==NULL)
+    {
+      char name_buffer[100];
+      static int ending=1000000;
+      ending++;
+      sprintf(name_buffer, "PYTHON_RING_VAR%d",ending);
+      h=enterid(omStrDup(name_buffer),0,RING_CMD,&IDROOT);
+      IDRING(h)=r;
+      r->ref++;
+    }
+    rSetHdl(h);
+  }
   return FALSE;
 }

Singular/iplib.cc

@@ -434 +434 @@
         if (nh!=NULL)          n=nh->id;
         else                   n="none";
-        Werror("ring change during procedure call: %s -> %s (level %d)",o,n,myynest);
+        Werror("ring change during procedure call %s: %s -> %s (level %d)",pi->procname,o,n,myynest);
         iiRETURNEXPR.CleanUp();
         err=TRUE;

Singular/table.h

@@ -241 +241 @@
 ,{D(jjSBA),        SBA_CMD,         IDEAL_CMD,      IDEAL_CMD     , ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjSBA),        SBA_CMD,         MODUL_CMD,      MODUL_CMD     , ALLOW_PLURAL |ALLOW_RING}
+,{D(jjSetRing),    SETRING_CMD,     NONE,           RING_CMD      , ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjSLIM_GB),    SLIM_GB_CMD,     IDEAL_CMD,      IDEAL_CMD     , ALLOW_PLURAL }
 ,{D(jjSLIM_GB),    SLIM_GB_CMD,     MODUL_CMD,      MODUL_CMD     , ALLOW_PLURAL }