Ekdohibs/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

std: fix mem.span* when an optional pointer is passed

Browse Source
This commit is contained in:
daurnimator 2020-04-01 01:44:14 +11:00
parent d57b5205c6
commit b1eb831aba
No known key found for this signature in database
GPG Key ID: 45B429A8F9D9D22A
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/std/mem.zig
View File

@ -559,10 +559,14 @@ test "Span" {
/// When there is both a sentinel and an array length or slice length, the /// When there is both a sentinel and an array length or slice length, the
/// length value is used instead of the sentinel. /// length value is used instead of the sentinel.
pub fn span(ptr: var) Span(@TypeOf(ptr)) { pub fn span(ptr: var) Span(@TypeOf(ptr)) {
const Result = Span(@TypeOf(ptr)); if (@typeInfo(@TypeOf(ptr)) == .Optional) {
if (@typeInfo(@TypeOf(ptr)) == .Optional and ptr == null) { if (ptr) |non_null| {
return span(non_null);
} else {
return null; return null;
} }
}
const Result = Span(@TypeOf(ptr));
const l = len(ptr); const l = len(ptr);
if (@typeInfo(Result).Pointer.sentinel) |s| { if (@typeInfo(Result).Pointer.sentinel) |s| {
return ptr[0..l :s]; return ptr[0..l :s];
@ -576,16 +580,21 @@ test "span" {
const ptr = @as([*:3]u16, array[0..2 :3]); const ptr = @as([*:3]u16, array[0..2 :3]);
testing.expect(eql(u16, span(ptr), &[_]u16{ 1, 2 })); testing.expect(eql(u16, span(ptr), &[_]u16{ 1, 2 }));
testing.expect(eql(u16, span(&array), &[_]u16{ 1, 2, 3, 4, 5 })); testing.expect(eql(u16, span(&array), &[_]u16{ 1, 2, 3, 4, 5 }));
testing.expectEqual(@as(?[:0]u16, null), span(@as(?[*:0]u16, null)));
} }
/// Same as `span`, except when there is both a sentinel and an array /// Same as `span`, except when there is both a sentinel and an array
/// length or slice length, scans the memory for the sentinel value /// length or slice length, scans the memory for the sentinel value
/// rather than using the length. /// rather than using the length.
pub fn spanZ(ptr: var) Span(@TypeOf(ptr)) { pub fn spanZ(ptr: var) Span(@TypeOf(ptr)) {
const Result = Span(@TypeOf(ptr)); if (@typeInfo(@TypeOf(ptr)) == .Optional) {
if (@typeInfo(@TypeOf(ptr)) == .Optional and ptr == null) { if (ptr) |non_null| {
return spanZ(non_null);
} else {
return null; return null;
} }
}
const Result = Span(@TypeOf(ptr));
const l = lenZ(ptr); const l = lenZ(ptr);
if (@typeInfo(Result).Pointer.sentinel) |s| { if (@typeInfo(Result).Pointer.sentinel) |s| {
return ptr[0..l :s]; return ptr[0..l :s];
@ -599,6 +608,7 @@ test "spanZ" {
const ptr = @as([*:3]u16, array[0..2 :3]); const ptr = @as([*:3]u16, array[0..2 :3]);
testing.expect(eql(u16, spanZ(ptr), &[_]u16{ 1, 2 })); testing.expect(eql(u16, spanZ(ptr), &[_]u16{ 1, 2 }));
testing.expect(eql(u16, spanZ(&array), &[_]u16{ 1, 2, 3, 4, 5 })); testing.expect(eql(u16, spanZ(&array), &[_]u16{ 1, 2, 3, 4, 5 }));
testing.expectEqual(@as(?[:0]u16, null), spanZ(@as(?[*:0]u16, null)));
} }
/// Takes a pointer to an array, an array, a sentinel-terminated pointer, /// Takes a pointer to an array, an array, a sentinel-terminated pointer,