mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-12 17:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix std.fmt to handle std.SegmentedList

Browse Source 
- add guards for use of prealloc_exp in SegmentedList
- define prealloc_exp even when invalid because std.fmt comptime
  triggers lazy-init
- fix std.fmt to print arrays of length 0 as style "[0]<typename>"
  because "<typename>@address" is n/a without address
This commit is contained in:
Michael Dusan 2019-07-25 19:59:34 -04:00 committed by Andrew Kelley
parent 8736a5be2a
commit bc982e65cf
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
std/fmt.zig
View File

@ -426,6 +426,9 @@ pub fn formatType(
if (info.child == u8) { if (info.child == u8) {
return formatText(value, fmt, options, context, Errors, output); return formatText(value, fmt, options, context, Errors, output);
} }
if (value.len == 0) {
return format(context, Errors, output, "[0]{}", @typeName(T.Child));
}
return format(context, Errors, output, "{}@{x}", @typeName(T.Child), @ptrToInt(&value)); return format(context, Errors, output, "{}@{x}", @typeName(T.Child), @ptrToInt(&value));
}, },
.Fn => { .Fn => {

29
std/segmented_list.zig
View File

@ -77,16 +77,20 @@ const Allocator = std.mem.Allocator;
pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type { pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type {
return struct { return struct {
const Self = @This(); const Self = @This();
const prealloc_exp = blk: {
// we don't use the prealloc_exp constant when prealloc_item_count is 0.
assert(prealloc_item_count != 0);
assert(std.math.isPowerOfTwo(prealloc_item_count));
const value = std.math.log2_int(usize, prealloc_item_count);
break :blk @typeOf(1)(value);
};
const ShelfIndex = std.math.Log2Int(usize); const ShelfIndex = std.math.Log2Int(usize);
const prealloc_exp: ShelfIndex = blk: {
// we don't use the prealloc_exp constant when prealloc_item_count is 0
// but lazy-init may still be triggered by other code so supply a value
if (prealloc_item_count == 0) {
break :blk 0;
} else {
assert(std.math.isPowerOfTwo(prealloc_item_count));
const value = std.math.log2_int(usize, prealloc_item_count);
break :blk value;
}
};
prealloc_segment: [prealloc_item_count]T, prealloc_segment: [prealloc_item_count]T,
dynamic_segments: [][*]T, dynamic_segments: [][*]T,
allocator: *Allocator, allocator: *Allocator,
@ -157,12 +161,13 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type
/// Grows or shrinks capacity to match usage. /// Grows or shrinks capacity to match usage.
pub fn setCapacity(self: *Self, new_capacity: usize) !void { pub fn setCapacity(self: *Self, new_capacity: usize) !void {
if (new_capacity <= usize(1) << (prealloc_exp + self.dynamic_segments.len)) { if (prealloc_item_count != 0) {
if (new_capacity <= usize(1) << (prealloc_exp + @intCast(ShelfIndex, self.dynamic_segments.len))) {
return self.shrinkCapacity(new_capacity); return self.shrinkCapacity(new_capacity);
} else {
return self.growCapacity(new_capacity);
} }
} }
return self.growCapacity(new_capacity);
}
/// Only grows capacity, or retains current capacity /// Only grows capacity, or retains current capacity
pub fn growCapacity(self: *Self, new_capacity: usize) !void { pub fn growCapacity(self: *Self, new_capacity: usize) !void {
@ -399,4 +404,6 @@ fn testSegmentedList(comptime prealloc: usize, allocator: *Allocator) !void {
testing.expect(item == i); testing.expect(item == i);
list.shrinkCapacity(list.len); list.shrinkCapacity(list.len);
} }
try list.setCapacity(0);
} }