adrien/zig-dimal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Changed Quantity fn to be inline

Browse Source
This commit is contained in:
adrien 2026-04-21 17:49:53 +02:00
parent 7b038dd2a5
commit a16bbedbd8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Quantity.zig
View File

@ -8,6 +8,7 @@ const Dimensions = @import("Dimensions.zig");
const Dimension = Dimensions.Dimension; const Dimension = Dimensions.Dimension;
pub fn Quantity(comptime T: type, comptime d: Dimensions, comptime s: Scales) type { pub fn Quantity(comptime T: type, comptime d: Dimensions, comptime s: Scales) type {
@setEvalBranchQuota(100_000);
return struct { return struct {
value: T, value: T,
@ -18,7 +19,7 @@ pub fn Quantity(comptime T: type, comptime d: Dimensions, comptime s: Scales) ty
pub const dims: Dimensions = d; pub const dims: Dimensions = d;
pub const scales = s; pub const scales = s;
pub fn add(self: Self, rhs: anytype) Quantity( pub inline fn add(self: Self, rhs: anytype) Quantity(
T, T,
dims, dims,
scales.min(@TypeOf(rhs).scales), scales.min(@TypeOf(rhs).scales),
@ -33,7 +34,7 @@ pub fn Quantity(comptime T: type, comptime d: Dimensions, comptime s: Scales) ty
return .{ .value = lhs_converted.value + rhs_converted.value }; return .{ .value = lhs_converted.value + rhs_converted.value };
} }
pub fn sub(self: Self, rhs: anytype) Quantity( pub inline fn sub(self: Self, rhs: anytype) Quantity(
T, T,
dims, dims,
scales.min(@TypeOf(rhs).scales), scales.min(@TypeOf(rhs).scales),
@ -48,7 +49,7 @@ pub fn Quantity(comptime T: type, comptime d: Dimensions, comptime s: Scales) ty
return .{ .value = lhs_converted.value - rhs_converted.value }; return .{ .value = lhs_converted.value - rhs_converted.value };
} }
pub fn mulBy(self: Self, rhs: anytype) Quantity( pub inline fn mulBy(self: Self, rhs: anytype) Quantity(
T, T,
dims.add(@TypeOf(rhs).dims), dims.add(@TypeOf(rhs).dims),
scales.min(@TypeOf(rhs).scales), scales.min(@TypeOf(rhs).scales),
@ -58,7 +59,7 @@ pub fn Quantity(comptime T: type, comptime d: Dimensions, comptime s: Scales) ty
return .{ .value = self_.value * rhs_.value }; return .{ .value = self_.value * rhs_.value };
} }
pub fn divBy(self: Self, rhs: anytype) Quantity(T, dims.sub(@TypeOf(rhs).dims), scales.min(@TypeOf(rhs).scales)) { pub inline fn divBy(self: Self, rhs: anytype) Quantity(T, dims.sub(@TypeOf(rhs).dims), scales.min(@TypeOf(rhs).scales)) {
const self_ = self.to(Quantity(T, dims, scales.min(@TypeOf(rhs).scales))); const self_ = self.to(Quantity(T, dims, scales.min(@TypeOf(rhs).scales)));
const rhs_ = rhs.to(Quantity(T, @TypeOf(rhs).dims, scales.min(@TypeOf(rhs).scales))); const rhs_ = rhs.to(Quantity(T, @TypeOf(rhs).dims, scales.min(@TypeOf(rhs).scales)));
@ -69,11 +70,11 @@ pub fn Quantity(comptime T: type, comptime d: Dimensions, comptime s: Scales) ty
} }
} }
pub fn scale(self: Self, sc: T) Self { pub inline fn scale(self: Self, sc: T) Self {
return .{ .value = self.value * sc }; return .{ .value = self.value * sc };
} }
pub fn to(self: Self, comptime Dest: type) Dest { pub inline fn to(self: Self, comptime Dest: type) Dest {
if (comptime !dims.eql(Dest.dims)) if (comptime !dims.eql(Dest.dims))
@compileError("Dimension mismatch in to: " ++ dims.str() ++ " vs " ++ Dest.dims.str()); @compileError("Dimension mismatch in to: " ++ dims.str() ++ " vs " ++ Dest.dims.str());
if (comptime @TypeOf(self) == Dest) if (comptime @TypeOf(self) == Dest)

1
src/Scales.zig
View File

@ -82,7 +82,6 @@ pub fn set(comptime self: *Scales, comptime key: Dimension, comptime val: UnitSc
} }
pub fn min(comptime s1: Scales, comptime s2: Scales) Scales { pub fn min(comptime s1: Scales, comptime s2: Scales) Scales {
@setEvalBranchQuota(10_000);
comptime var out = Scales.initFill(.none); comptime var out = Scales.initFill(.none);
inline for (std.enums.values(Dimension)) |dim| inline for (std.enums.values(Dimension)) |dim|
out.set(dim, if (s1.get(dim).getFactorInt() > s2.get(dim).getFactorInt()) s2.get(dim) else s1.get(dim)); out.set(dim, if (s1.get(dim).getFactorInt() > s2.get(dim).getFactorInt()) s2.get(dim) else s1.get(dim));