Commit 488ba1560fb80c1115b3b4794031859c0063ba3e | zig

author	daurnimator <quae@daurnimator.com> 2020-03-05 15:59:19+11:00
committer	daurnimator <quae@daurnimator.com> 2020-03-05 16:00:19+11:00
log	488ba1560fb80c1115b3b4794031859c0063ba3e
tree	9a83d6820cc0788fb64511691c0f2789aebdfd55
parent	4f58bfe1a81a385ac9120510b816ff081ab73437
signature	Commit is signed but in an unrecognized format.

2 files changed, 25 insertions(+), 13 deletions(-)

lib/std/fmt.zig+1-1

...	@@ -947,7 +947,7 @@ fn formatIntSigned(	...	@@ -947,7 +947,7 @@ fn formatIntSigned(
947	const Uint = std.meta.IntType(false, bit_count);	947	const Uint = std.meta.IntType(false, bit_count);
948	if (value < 0) {	948	if (value < 0) {
949	try output(context, "-");	949	try output(context, "-");
950	const new_value = ~@bitCast(Uint, value +% -1);	950	const new_value = math.absCast(value);
951	return formatIntUnsigned(new_value, base, uppercase, new_options, context, Errors, output);	951	return formatIntUnsigned(new_value, base, uppercase, new_options, context, Errors, output);
952	} else if (options.width == null or options.width.? == 0) {	952	} else if (options.width == null or options.width.? == 0) {
953	return formatIntUnsigned(@intCast(Uint, value), base, uppercase, options, context, Errors, output);	953	return formatIntUnsigned(@intCast(Uint, value), base, uppercase, options, context, Errors, output);

lib/std/math.zig+24-12

 @@ -670,23 +670,35 @@ fn testRem() void {
 /// Returns the absolute value of the integer parameter.
 /// Result is an unsigned integer.
-pub fn absCast(x: var) t: {
+pub fn absCast(x: var) switch(@typeInfo(@TypeOf(x))) {
-    if (@TypeOf(x) == comptime_int) {
+        .ComptimeInt => comptime_int,
-        break :t comptime_int;
+        .Int => |intInfo| std.meta.IntType(false, intInfo.bits),
-    } else {
+        else => @compileError("absCast only accepts integers"),
-        break :t std.meta.IntType(false, @TypeOf(x).bit_count);
     }
-} {
+{
-    if (@TypeOf(x) == comptime_int) {
+    switch(@typeInfo(@TypeOf(x))) {
-        return if (x < 0) -x else x;
+        .ComptimeInt => {
+            if (x < 0) {
+                return -x;
+            } else {
+                return x;
+            }
+        },
+        .Int => |intInfo| {
+            const Uint = std.meta.IntType(false, intInfo.bits);
+            if (x < 0) {
+                return ~@bitCast(Uint, x +% -1);
+            } else {
+                return @intCast(Uint, x);
+            }
+        },
+        else => unreachable,
     }
-    const uint = std.meta.IntType(false, @TypeOf(x).bit_count);
-    if (x >= 0) return @intCast(uint, x);
-    return @intCast(uint, -(x + 1)) + 1;
 }
 test "math.absCast" {
+    testing.expect(absCast(@as(i1, -1)) == 1);
     testing.expect(absCast(@as(i32, -999)) == 999);
     testing.expect(@TypeOf(absCast(@as(i32, -999))) == u32);