Handle managed exception

amos402 · amos402 · commit 5205f8442c7c · 2018-08-23T23:14:13.000+08:00
diff --git a/src/runtime/exceptions.cs b/src/runtime/exceptions.cs
@@ -267,6 +267,19 @@ public static void SetError(Exception e)
             Runtime.XDecref(op);
         }
 
+        public static void SetErrorWithoutOverride(Exception e)
+        {
+            if (ErrorOccurred())
+            {
+                return;
+            }
+            if (e.InnerException != null)
+            {
+                e = e.InnerException;
+            }
+            SetError(e);
+        }
+
         /// <summary>
         /// ErrorOccurred Method
         /// </summary>
diff --git a/src/runtime/methodobject.cs b/src/runtime/methodobject.cs
@@ -393,12 +393,7 @@ public IntPtr PyCall(IntPtr self, IntPtr args)
                 }
                 catch (Exception e)
                 {
-                    if (e.InnerException != null)
-                    {
-                        e = e.InnerException;
-                    }
-                    Console.WriteLine(e);
-                    Exceptions.SetError(e);
+                    Exceptions.SetErrorWithoutOverride(e);
                     return IntPtr.Zero;
                 }
             }
diff --git a/src/runtime/propertyobject.cs b/src/runtime/propertyobject.cs
@@ -181,7 +181,15 @@ public StaticPropertyObject(PropertyInfo md)
         public static IntPtr tp_descr_get(IntPtr ds, IntPtr ob, IntPtr tp)
         {
             var self = (StaticPropertyObject<T>)GetManagedObject(ds);
-            return PyValueConverter<T>.Convert(self.getter());
+            try
+            {
+                return PyValueConverter<T>.Convert(self.getter());
+            }
+            catch (Exception e)
+            {
+                Exceptions.SetErrorWithoutOverride(e);
+                return IntPtr.Zero;
+            }
         }
 
         public new static int tp_descr_set(IntPtr ds, IntPtr ob, IntPtr val)
@@ -192,8 +200,16 @@ public static IntPtr tp_descr_get(IntPtr ds, IntPtr ob, IntPtr tp)
                 Exceptions.RaiseTypeError("property is read-only");
                 return -1;
             }
-            T value = ValueConverter<T>.Get(val);
-            self.setter(value);
+            try
+            {
+                T value = ValueConverter<T>.Get(val);
+                self.setter(value);
+            }
+            catch (Exception e)
+            {
+                Exceptions.SetErrorWithoutOverride(e);
+                return -1;
+            }
             return 0;
         }
     }
@@ -231,8 +247,16 @@ public static IntPtr tp_descr_get(IntPtr ds, IntPtr ob, IntPtr tp)
             {
                 return Exceptions.RaiseTypeError("invalid target");
             }
-            T value = self.getter((Cls)co.inst);
-            return value.ToPythonPtr();
+            try
+            {
+                T value = self.getter((Cls)co.inst);
+                return value.ToPythonPtr();
+            }
+            catch (Exception e)
+            {
+                Exceptions.SetErrorWithoutOverride(e);
+                return IntPtr.Zero;
+            }
         }
 
         public new static int tp_descr_set(IntPtr ds, IntPtr ob, IntPtr val)
@@ -256,7 +280,15 @@ public static IntPtr tp_descr_get(IntPtr ds, IntPtr ob, IntPtr tp)
                 Exceptions.RaiseTypeError("invalid target");
                 return -1;
             }
-            self.setter((Cls)co.inst, ValueConverter<T>.Get(val));
+            try
+            {
+                self.setter((Cls)co.inst, ValueConverter<T>.Get(val));
+            }
+            catch (Exception e)
+            {
+                Exceptions.SetErrorWithoutOverride(e);
+                return -1;
+            }
             return 0;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -393,12 +393,7 @@ public IntPtr PyCall(IntPtr self, IntPtr args)`
`393`	`393`	`}`
`394`	`394`	`catch (Exception e)`
`395`	`395`	`{`
`396`		`- if (e.InnerException != null)`
`397`		`- {`
`398`		`- e = e.InnerException;`
`399`		`- }`
`400`		`- Console.WriteLine(e);`
`401`		`- Exceptions.SetError(e);`
	`396`	`+ Exceptions.SetErrorWithoutOverride(e);`
`402`	`397`	`return IntPtr.Zero;`
`403`	`398`	`}`
`404`	`399`	`}`