Changeset 4038 for neercs/trunk/src/interpreter.cTweet

Timestamp:

Nov 25, 2009, 4:07:46 PM (11 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Better python command handling
• Added get(str) to neercs python module, doesn't work as I would like to
• Avoid redefining everything while including neercs.h several times

File:

• neercs/trunk/src/interpreter.c (modified) (4 diffs)

neercs/trunk/src/interpreter.c

@@ -182 +182 @@
     Py_Initialize();
     
-    PyInit_neercs();
+    PyInit_neercs(sl);
     
     return 0;
@@ -219 +219 @@
     }
     
-    PyObject *pModule, *pName, *pFunc, *pValue;
+    PyObject *pModule, *pName, *pFunc;
 
     /* Module from which to call the function */
@@ -236 +236 @@
     if (pModule != NULL)
     {
-        pFunc = PyObject_GetAttrString(pModule, sl->interpreter_props.command);
-        if (pFunc && PyCallable_Check(pFunc))
+                PyObject *o = PyRun_String(sl->interpreter_props.command, Py_eval_input, PyModule_GetDict(pModule), NULL);
+        debug("py object is %p\n", o);
+        if(!o) 
         {
-            pValue = PyObject_CallObject(pFunc, NULL);
-            if (pValue != NULL) {
-                char *res = getStringFromPyObject(pValue);
-                sl->interpreter_props.output_res = res;
-                debug("py Result of call: %s\n", res);
-                Py_DECREF(pValue);
-                err = 2;
-            }
-            else {
-                Py_DECREF(pFunc);
-                Py_DECREF(pModule);
-                sl->interpreter_props.output_err = getPythonError();
-                err = 1;
-                debug("py Call failed\n");
-                goto end;
-                return 1;
-            }
+                sl->interpreter_props.output_err = getPythonError();   
+            err = 1;
         }
         else
         {
-            sl->interpreter_props.output_err = getPythonError();
+            debug("py res : %s\n", getStringFromPyObject(o));
+            sl->interpreter_props.output_res = getStringFromPyObject(o);
             err = 1;
-            debug("py Error 2\n");
-            goto end;
         }
+                goto end;
+            
     }
     else
@@ -299 +286 @@
     PyErr_Fetch(&type, &value, &traceback);
 
-    char *etype = getStringFromPyObject(type);
     char *evalue = getStringFromPyObject(value);