Changeset e94f7f in git

Timestamp:

Feb 28, 2017, 4:24:40 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

4d24f6272fb2b5388b2a23b455a78b4439e1eece

Parents:

ddf313aa15678b49ae4cbd1aa2881b4a49296061

Message:

fix: python_module, needed for openmath

Location:

Singular/dyn_modules

Files:

• openmath/primdec.in (deleted)
• openmath/singularserver.sing (modified) (1 diff)
• python/interpreter_support.cc (modified) (1 diff)

Singular/dyn_modules/openmath/singularserver.sing

@@ -11 +11 @@
 
 print(i2);
-LIB("/Users/michael/sing2/modules/python/python_module.so");
+LIB("python_module.so");
 Python_module::python("from interpreter import SingularGlobalsProxy
 #import psyco

Singular/dyn_modules/python/interpreter_support.cc

@@ -445 +445 @@
 boost::python::object call_interpreter_method(const idhdl_wrap& proc, const arg_list& args)
 {
-  //idhdl oldPackHDL=currPackHdl;
-
-  //package oldPack=currPack;
-  //currPack=proc.id->data.pinf->pack;
-  //currPackHdl=packFindHdl(currPack);
-  //FIXME: will call procedure from different package, maybe use iiMakeProc
-
-  int err=iiPStart(proc.id, args.args);
-  //currPack=oldPack;
-  //currPackHdl=oldPackHDL;
-  int voice=myynest+1;
+  int err=iiMake_proc(proc.id, NULL, args.args);
   errorreported=inerror=0;
 
   return buildPyObjectFromLeftv(&iiRETURNEXPR);
-
-  //return res;
 }
 boost::python::object call_builtin_method_general(const char* name, arg_list& l)