Changeset dcf88ff in git for Singular/pyobject_setup.cc

Timestamp:

Dec 11, 2012, 7:28:54 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

3e7db4d961b4509d248e12d8e96e2bed08d9cfe8

Parents:

e7cccf3b8b35aa52ffffb9f6d1a54ae569d3466fbd8204a951e445d6081f81d1727da65972ead678

Message:

Merge pull request #226 from alexanderdreyer/spielwiese-pyobject

Fix: nonexisting or old python won't break build + ...

File:

• Singular/pyobject_setup.cc (modified) (2 diffs)

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);  
+}
+
+
+