authorgravatar for kate@kxt.ioKate Tsuyu <kate@kxt.io> 2020-08-29 00:21:17-04:00
committergravatar for kate@kxt.ioKate Tsuyu <kate@kxt.io> 2020-08-29 00:21:17-04:00
log933bfcff6483897a6fcf24f38e0571d2ae960441
tree8bb66f5ed01256d0a6433327c2af41e619de58a6
parentf577d12fbc6a5136b238b4d8e7e361578a66ddd6
signaturelock-open Commit is signed but in an unrecognized format.

std.math.divCeil: support comptime_int/float

1 files changed, 26 insertions(+), 8 deletions(-)

lib/std/math.zig+26-8
...@@ -624,15 +624,21 @@ fn testDivFloor() void {...@@ -624,15 +624,21 @@ fn testDivFloor() void {
624pub fn divCeil(comptime T: type, numerator: T, denominator: T) !T {624pub fn divCeil(comptime T: type, numerator: T, denominator: T) !T {
625 @setRuntimeSafety(false);625 @setRuntimeSafety(false);
626 if (denominator == 0) return error.DivisionByZero;626 if (denominator == 0) return error.DivisionByZero;
627 if (@typeInfo(T) == .Float) return @ceil(numerator / denominator);627 const info = @typeInfo(T);
628 if (T.is_signed and numerator < 0 and denominator < 0) {628 switch (info) {
629 if (numerator == minInt(T) and denominator == -1)629 .ComptimeFloat, .Float => return @ceil(numerator / denominator),
630 return error.Overflow;630 .ComptimeInt, .Int => {
631 return @divFloor(numerator + 1, denominator) + 1;631 if (numerator < 0 and denominator < 0) {
632 if (info == .Int and numerator == minInt(T) and denominator == -1)
633 return error.Overflow;
634 return @divFloor(numerator + 1, denominator) + 1;
635 }
636 if (numerator > 0 and denominator > 0)
637 return @divFloor(numerator - 1, denominator) + 1;
638 return @divTrunc(numerator, denominator);
639 },
640 else => @compileError("divCeil unsupported on " ++ @typeName(T)),
632 }641 }
633 if (numerator > 0 and denominator > 0)
634 return @divFloor(numerator - 1, denominator) + 1;
635 return @divTrunc(numerator, denominator);
636}642}
637643
638test "math.divCeil" {644test "math.divCeil" {
...@@ -654,6 +660,18 @@ fn testDivCeil() void {...@@ -654,6 +660,18 @@ fn testDivCeil() void {
654 testing.expect((divCeil(f32, -5.0, 3.0) catch unreachable) == -1.0);660 testing.expect((divCeil(f32, -5.0, 3.0) catch unreachable) == -1.0);
655 testing.expect((divCeil(f32, 5.0, -3.0) catch unreachable) == -1.0);661 testing.expect((divCeil(f32, 5.0, -3.0) catch unreachable) == -1.0);
656 testing.expect((divCeil(f32, -5.0, -3.0) catch unreachable) == 2.0);662 testing.expect((divCeil(f32, -5.0, -3.0) catch unreachable) == 2.0);
663
664 testing.expect((divCeil(comptime_int, 23, 4) catch unreachable) == 6);
665 testing.expect((divCeil(comptime_int, -23, 4) catch unreachable) == -5);
666 testing.expect((divCeil(comptime_int, 23, -4) catch unreachable) == -5);
667 testing.expect((divCeil(comptime_int, -23, -4) catch unreachable) == 6);
668 testing.expectError(error.DivisionByZero, divCeil(comptime_int, 23, 0));
669
670 testing.expect((divCeil(comptime_float, 23.0, 4.0) catch unreachable) == 6.0);
671 testing.expect((divCeil(comptime_float, -23.0, 4.0) catch unreachable) == -5.0);
672 testing.expect((divCeil(comptime_float, 23.0, -4.0) catch unreachable) == -5.0);
673 testing.expect((divCeil(comptime_float, -23.0, -4.0) catch unreachable) == 6.0);
674 testing.expectError(error.DivisionByZero, divCeil(comptime_float, 23.0, 0.0));
657}675}
658676
659pub fn divExact(comptime T: type, numerator: T, denominator: T) !T {677pub fn divExact(comptime T: type, numerator: T, denominator: T) !T {