Changeset e87d40 in git

Timestamp:

Dec 11, 2012, 2:50:20 PM (11 years ago)

Author:

Alexander Dreyer <adreyer@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

bd8204a951e445d6081f81d1727da65972ead678

Parents:

7b9d49ecf5884d5163955044b27dd3eca2dc6b04

Message:

Introducing system("pyobject") to ensure pyobject functionality

Files:

• Singular/extra.cc (modified) (2 diffs)
• Singular/pyobject_setup.cc (modified) (2 diffs)
• Singular/pyobject_setup.h (modified) (1 diff)
• doc/pyobject.doc (modified) (previous)

Singular/extra.cc

@@ -94 +94 @@
 #include "walk.h"
 #include <Singular/newstruct.h>
-
+#include <Singular/pyobject_setup.h>
 
 
@@ -2947 +2947 @@
        else
 
+  /*==== pyobject (or pyobject*, like pyobject.so) force loading python ===*/
+       if (strncmp(sys_cmd, "pyobject", 8) == 0)
+       {
+         res->rtyp = NONE;
+         return pyobject_ensure();
+       }
+       else
 
   /*==================== DLL =================*/

Singular/pyobject_setup.cc

@@ -49 +49 @@
 void* pyobject_autoload(blackbox* bbx)
 {
-  if (pyobject_load()) return NULL;
-  return bbx->blackbox_Init(bbx);
+  assume(bbx != NULL);
+  return (pyobject_load()? NULL: bbx->blackbox_Init(bbx));
 }
 
@@ -67 +67 @@
 }
 
+/// Explicitely load, if not loaded already
+BOOLEAN pyobject_ensure() {
+
+  int tok = -1;
+  blackbox* bbx = (blackboxIsCmd("pyobject", tok) == ROOT_DECL?
+                   getBlackboxStuff(tok): (blackbox*)NULL);
+  if (bbx == NULL) return TRUE;
+  return (bbx->blackbox_Init == pyobject_autoload?  pyobject_load(): FALSE);  
+}
+
+
+

Singular/pyobject_setup.h

@@ -17 +17 @@
 #define SINGULAR_PYOBJECT_SETUP_H
 
+/// initialize blackbox support for @c pyobject; functionilty os autoloaded on demand 
 void pyobject_setup();
 
+/// force leading of pyobject functionality
+BOOLEAN pyobject_ensure();
+
 #endif