debugging

koubaa · koubaa · commit 107d22fc3263 · 2019-02-10T16:06:58.000-06:00
diff --git a/src/embed_tests/TestTypeManager.cs b/src/embed_tests/TestTypeManager.cs
@@ -29,15 +29,18 @@ public static void TestNativeCode()
         [Test]
         public static void TestMemoryMapping()
         {
+            System.Console.WriteLine("TestMemoryMapping");
             Assert.That(() => { var _ = TypeManager.CreateMemoryMapper(); }, Throws.Nothing);
             var mapper = TypeManager.CreateMemoryMapper();
 
+            System.Console.WriteLine("TestMemoryMapping 1");
             // Allocate a read-write page.
             int len = 12;
             var page = mapper.MapWriteable(len);
             Assert.That(() => { Marshal.WriteInt64(page, 17); }, Throws.Nothing);
             Assert.That(Marshal.ReadInt64(page), Is.EqualTo(17));
 
+            System.Console.WriteLine("TestMemoryMapping 2");
             // Mark it read-execute. We can still read, haven't changed any values.
             mapper.SetReadExec(page, len);
             Assert.That(Marshal.ReadInt64(page), Is.EqualTo(17));
@@ -54,10 +57,13 @@ public static void TestMemoryMapping()
             // We can't use compiler flags because we compile with MONO_LINUX
             // while running on the Microsoft .NET Core during continuous
             // integration tests.
+            System.Console.WriteLine("TestMemoryMapping 3");
             if (System.Type.GetType ("Mono.Runtime") != null)
             {
                 // Mono throws NRE instead of AccessViolationException for some reason.
                 Assert.That(() => { Marshal.WriteInt64(page, 73); }, Throws.TypeOf<System.NullReferenceException>());
+
+                System.Console.WriteLine("TestMemoryMapping 4");
                 Assert.That(Marshal.ReadInt64(page), Is.EqualTo(17));
             }
         }
diff --git a/src/runtime/classbase.cs b/src/runtime/classbase.cs
@@ -233,6 +233,7 @@ public static IntPtr tp_str(IntPtr ob)
             }
             try
             {
+                Console.WriteLine("classbase tp_str");
                 //As per python doc:
                 //The return value must be a string object.  If a class defines __repr__() but not __str__(),
                 //then __repr__() is also used when an “informal” string representation of instances of that
@@ -245,25 +246,32 @@ public static IntPtr tp_str(IntPtr ob)
                 var instType = co.inst.GetType();
                 foreach (var method in instType.GetMethods())
                 {
-
+                    Console.WriteLine("classbase tp_str in loop");
                     //TODO this could probably be done more cleanly with Linq
                     if (!method.IsPublic) continue; //skip private/protected methods
                     if (method.Name != "ToString") continue; //only look for ToString
                     if (method.DeclaringType == typeof(object)) continue; //ignore default from object
                     if (method.GetParameters().Length != 0) continue; //ignore Formatter overload of ToString
 
+                    Console.WriteLine("classbase tp_str in loop end");
+
                     //match!  something other than object provides a parameter-less overload of ToString
                     return Runtime.PyString_FromString(co.inst.ToString());
                 }
 
+                Console.WriteLine("classbase tp_str after loop");
+
                 //If the object defines __repr__, call it.
                 System.Reflection.MethodInfo reprMethodInfo = instType.GetMethod("__repr__");
                 if (reprMethodInfo != null && reprMethodInfo.IsPublic)
                 {
+                    Console.WriteLine("classbase tp_str has __repr__");
                     var reprString = reprMethodInfo.Invoke(co.inst, null) as string;
                     return Runtime.PyString_FromString(reprString);
                 }
 
+                Console.WriteLine("classbase tp_str fallback");
+
                 //otherwise fallback to object's ToString() implementation
                 return Runtime.PyString_FromString(co.inst.ToString());
                 
@@ -288,6 +296,7 @@ public static IntPtr tp_repr(IntPtr ob)
             }
             try
             {
+                Console.WriteLine("classbase tp_repr");
                 //if __repr__ is defined, use it
                 var instType = co.inst.GetType();
                 System.Reflection.MethodInfo methodInfo = instType.GetMethod("__repr__");
@@ -297,6 +306,8 @@ public static IntPtr tp_repr(IntPtr ob)
                     return Runtime.PyString_FromString(reprString);
                 }
 
+                Console.WriteLine("classbase tp_repr fallback");
+
                 //otherwise use the standard object.__repr__(inst)
                 IntPtr args = Runtime.PyTuple_New(1);
                 Runtime.PyTuple_SetItem(args, 0, ob);
