Make errorObject's provide the return value

Author: frmdstryr

example/pyzigtest.zig

@@ -9,11 +9,11 @@ const Module = py.Module;
 pub fn add(mod: *Module, args: [*]*Object, n: isize) ?*Object {
     _ = mod;
     if (n != 2) {
-        return py.typeErrorObject("sum requires 2 arguments", .{});
+        return py.typeErrorObject(null, "sum requires 2 arguments", .{});
     }
     // We can now safely access  indexes 0 and 1
     if (!Int.check(args[0]) or !Int.check(args[1])) {
-        return py.typeErrorObject("both arguments must be ints!", .{});
+        return py.typeErrorObject(null, "both arguments must be ints!", .{});
     }
 
     // We can now safely cast to Int objects and access their methods

py.zig

@@ -110,48 +110,49 @@ pub inline fn typeError(msg: [:0]const u8, args: anytype) !void {
     return errorFormat(@ptrCast(c.PyExc_TypeError), msg, args);
 }
 
-pub inline fn typeErrorObject(msg: [:0]const u8, args: anytype) ?*Object {
-    typeError(msg, args) catch return null;
-    unreachable;
+pub inline fn typeErrorObject(comptime value: anytype, msg: [:0]const u8, args: anytype) @TypeOf(value) {
+    typeError(msg, args) catch {};
+    return value;
 }
 
 // Helper that is the equivalent to `SystemError(msg)`
 pub inline fn systemError(msg: [:0]const u8, args: anytype) !void {
     return errorFormat(@ptrCast(c.PyExc_SystemError), msg, args);
 }
 
-pub inline fn systemErrorObject(msg: [:0]const u8, args: anytype) ?*Object {
-    systemError(msg, args) catch return null;
-    unreachable;
+pub inline fn systemErrorObject(comptime value: anytype, msg: [:0]const u8, args: anytype) @TypeOf(value) {
+    systemError(msg, args) catch {};
+    return value;
 }
 
 // Helper that is the equivalent to `ValueError(msg)`
 pub inline fn valueError(msg: [:0]const u8, args: anytype) !void {
     return errorFormat(@ptrCast(c.PyExc_ValueError), msg, args);
 }
 
-pub inline fn valueErrorObject(msg: [:0]const u8, args: anytype) ?*Object {
-    valueError(msg, args) catch return null;
-    unreachable;
+pub inline fn valueErrorObject(comptime value: anytype, msg: [:0]const u8, args: anytype) @TypeOf(value) {
+    valueError(msg, args) catch {};
+    return value;
 }
 
 // Helper that is the equivalent to `AttributeError(msg)`
 pub inline fn attributeError(msg: [:0]const u8, args: anytype) !void {
     return errorFormat(@ptrCast(c.PyExc_AttributeError), msg, args);
 }
 
-pub inline fn attributeErrorObject(msg: [:0]const u8, args: anytype) ?*Object {
-    attributeError(msg, args) catch return null;
-    unreachable;
+pub inline fn attributeErrorObject(comptime value: anytype, msg: [:0]const u8, args: anytype) @TypeOf(value) {
+    attributeError(msg, args) catch {};
+    return value;
 }
 
 pub inline fn memoryError() !void {
     _ = c.PyErr_NoMemory();
     return error.PyError;
 }
 
-pub inline fn memoryErrorObject() ?*Object {
-    return @ptrCast(c.PyErr_NoMemory());
+pub inline fn memoryErrorObject(comptime value: anytype) @TypeOf(value) {
+    memoryError() catch {};
+    return value;
 }
 
 // Clear a reference to **Object or *?*Object