authorgravatar for 14938807+xackus@users.noreply.github.comxackus <14938807+xackus@users.noreply.github.com> 2020-03-31 03:17:05+02:00
committergravatar for 14938807+xackus@users.noreply.github.comxackus <14938807+xackus@users.noreply.github.com> 2020-04-02 15:14:28+02:00
log93a20f2e825790daa487eae0ccec3d7c9126f42c
treee2250c5119162dd66ef6d34c27c35e8e5b7a916b
parentdd570dbc0dd78e3b2f9cfb5a1febb325e585e12d

new ArrayList API: fix std.ArrayListSentineled

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

lib/std/array_list_sentineled.zig+8-8
...@@ -82,8 +82,8 @@ pub fn ArrayListSentineled(comptime T: type, comptime sentinel: T) type {...@@ -82,8 +82,8 @@ pub fn ArrayListSentineled(comptime T: type, comptime sentinel: T) type {
82 self.list.deinit();82 self.list.deinit();
83 }83 }
8484
85 pub fn span(self: var) @TypeOf(self.list.items[0 .. self.list.len - 1 :sentinel]) {85 pub fn span(self: var) @TypeOf(self.list.items[0..:sentinel]) {
86 return self.list.span()[0..self.len() :sentinel];86 return self.list.items[0..self.len() :sentinel];
87 }87 }
8888
89 pub fn shrink(self: *Self, new_len: usize) void {89 pub fn shrink(self: *Self, new_len: usize) void {
...@@ -98,16 +98,16 @@ pub fn ArrayListSentineled(comptime T: type, comptime sentinel: T) type {...@@ -98,16 +98,16 @@ pub fn ArrayListSentineled(comptime T: type, comptime sentinel: T) type {
98 }98 }
9999
100 pub fn isNull(self: Self) bool {100 pub fn isNull(self: Self) bool {
101 return self.list.len == 0;101 return self.list.items.len == 0;
102 }102 }
103103
104 pub fn len(self: Self) usize {104 pub fn len(self: Self) usize {
105 return self.list.len - 1;105 return self.list.items.len - 1;
106 }106 }
107107
108 pub fn capacity(self: Self) usize {108 pub fn capacity(self: Self) usize {
109 return if (self.list.items.len > 0)109 return if (self.list.capacity > 0)
110 self.list.items.len - 1110 self.list.capacity - 1
111 else111 else
112 0;112 0;
113 }113 }
...@@ -115,13 +115,13 @@ pub fn ArrayListSentineled(comptime T: type, comptime sentinel: T) type {...@@ -115,13 +115,13 @@ pub fn ArrayListSentineled(comptime T: type, comptime sentinel: T) type {
115 pub fn appendSlice(self: *Self, m: []const T) !void {115 pub fn appendSlice(self: *Self, m: []const T) !void {
116 const old_len = self.len();116 const old_len = self.len();
117 try self.resize(old_len + m.len);117 try self.resize(old_len + m.len);
118 mem.copy(T, self.list.span()[old_len..], m);118 mem.copy(T, self.list.items[old_len..], m);
119 }119 }
120120
121 pub fn append(self: *Self, byte: T) !void {121 pub fn append(self: *Self, byte: T) !void {
122 const old_len = self.len();122 const old_len = self.len();
123 try self.resize(old_len + 1);123 try self.resize(old_len + 1);
124 self.list.span()[old_len] = byte;124 self.list.items[old_len] = byte;
125 }125 }
126126
127 pub fn eql(self: Self, m: []const T) bool {127 pub fn eql(self: Self, m: []const T) bool {