clean up PR

Author: timfel

graalpython/com.oracle.graal.python.cext/src/errors.c

@@ -158,7 +158,8 @@ void PyErr_Display(PyObject *exception, PyObject *value, PyObject *tb) {
 }
 
 void PyErr_NormalizeException(PyObject **exc, PyObject **val, PyObject **tb) {
-    // TODO (tfel): do we have to?
+    // (tfel): nothing to do here from our side, the exception is already
+    // reified
     return;
 }
 

graalpython/com.oracle.graal.python.cext/src/longobject.c

@@ -133,6 +133,7 @@ PyObject * PyLong_FromSize_t(size_t n)  {
 	return PyLong_FromUnsignedLongLong(n);
 }
 
+// partially taken from CPython 3.7.0 "Objects/longobject.c"
 PyObject * PyLong_FromString(const char* inputStr, char** pend, int base) {
     int negative = 0, error_if_nonzero = 0;
     char* str = (char*)inputStr;

graalpython/com.oracle.graal.python.cext/src/methodobject.c

@@ -43,16 +43,16 @@ typedef PyObject *(*PyCFunction)(PyObject *, PyObject *);
 PyTypeObject PyCFunction_Type = PY_TRUFFLE_TYPE("builtin_function_or_method", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, sizeof(PyCFunctionObject));
 
 PyObject* PyCFunction_NewEx(PyMethodDef *ml, PyObject *self, PyObject *module) {
-    PyObject* func = UPCALL_CEXT_O("PyCFunction_NewEx",
-                                   polyglot_from_string((const char*)(ml->ml_name), SRC_CS),
-                                   ml->ml_meth,
-                                   get_method_flags_cwrapper(ml->ml_flags),
-                                   get_method_flags_wrapper(ml->ml_flags),
-                                   polyglot_from_string((const char*)(ml->ml_doc ? ml->ml_doc : ""), SRC_CS));
-    /* TODO: are the below fields required?
-     * ((PyCFunctionObject*)func)->m_self = self;
-     * ((PyCFunctionObject*)func)->m_module = module;
-     * ((PyCFunctionObject*)func)->m_ml = ml;
-     */
-    return func;
+    PyObject* func = to_sulong(polyglot_invoke(PY_TRUFFLE_CEXT,
+                                               "PyCFunction_NewEx",
+                                               polyglot_from_string((const char*)(ml->ml_name), SRC_CS),
+                                               ml->ml_meth,
+                                               get_method_flags_cwrapper(ml->ml_flags),
+                                               get_method_flags_wrapper(ml->ml_flags),
+                                               polyglot_from_string((const char*)(ml->ml_doc ? ml->ml_doc : ""), SRC_CS)));
+    if (func == ERROR_MARKER) {
+        return NULL;
+    } else {
+        return func;
+    }
 }

graalpython/com.oracle.graal.python.cext/src/typeobject.c

@@ -423,5 +423,6 @@ int PyType_Ready(PyTypeObject* cls) {
 }
 
 void PyType_Modified(PyTypeObject* type) {
-    // TODO: (tfel) what needs to be done?
+    // (tfel) I don't think we have to do anything here, since we track MRO
+    // changes separately, anyway
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -58,6 +58,7 @@
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.TruffleLanguage;
+import com.oracle.truffle.api.TruffleLogger;
 import com.oracle.truffle.api.debug.DebuggerTags;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.MaterializedFrame;
@@ -384,4 +385,8 @@ public static PythonCore getCore() {
         PythonCore core = getCurrentLanguage(PythonLanguage.class).sharedCore;
         return core != null ? core : getContext().getCore();
     }
+
+    public static TruffleLogger getLogger() {
+        return TruffleLogger.getLogger(ID, PythonLanguage.class);
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonObjectNativeWrapperMR.java

@@ -38,6 +38,8 @@
  */
 package com.oracle.graal.python.builtins.objects.cext;
 
+import java.util.logging.Level;
+
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
@@ -413,7 +415,7 @@ Object doGeneric(Object object, String key) {
             if (object instanceof PythonAbstractObject) {
                 PythonObjectNativeWrapper nativeWrapper = ((PythonAbstractObject) object).getNativeWrapper();
                 assert nativeWrapper != null;
-                System.err.println("[python] read of native member " + key);
+                PythonLanguage.getLogger().log(Level.WARNING, "read of Python struct native member", key);
                 return getGetItemNode().execute(nativeWrapper.getNativeMemberStore(), key);
             }
             throw UnknownIdentifierException.raise(key);
@@ -532,7 +534,7 @@ Object doGeneric(Object object, String key, Object value) {
             if (object instanceof PythonAbstractObject) {
                 PythonObjectNativeWrapper nativeWrapper = ((PythonAbstractObject) object).getNativeWrapper();
                 assert nativeWrapper != null;
-                System.err.println("[python] write of native member " + key);
+                PythonLanguage.getLogger().log(Level.WARNING, "write of Python struct native member", key);
                 getSetItemNode().execute(null, nativeWrapper.createNativeMemberStore(), key, value);
                 return value;
             }