Compare commits

...

5 Commits

Author SHA1 Message Date
kayomn 074a62807b Fix CI not running tests after building them
continuous-integration/drone/push Build is failing Details
2022-10-03 22:58:58 +01:00
kayomn c4775e27d8 Fix tests not running. 2022-10-03 22:58:38 +01:00
kayomn a36b3bc321 Fix inconsistent test naming 2022-10-03 22:58:33 +01:00
kayomn e01b19cd68 Fix compilation errors in I/O module 2022-10-03 22:50:28 +01:00
kayomn 774536fd58 Update references to old tellFile function 2022-10-03 22:45:22 +01:00
5 changed files with 47 additions and 40 deletions

View File

@ -6,3 +6,4 @@ steps:
image: euantorano/zig:0.9.1 image: euantorano/zig:0.9.1
commands: commands:
- zig build test - zig build test
- ./zig-cache/o/b57ef32c79a05339fbe4a8eb648ff6df/test main.zig

View File

@ -10,7 +10,7 @@ pub const Writer = struct {
writeContext: fn (*anyopaque, []const u8) usize, writeContext: fn (*anyopaque, []const u8) usize,
/// ///
/// /// Radices supported by [writeInt].
/// ///
pub const Radix = enum { pub const Radix = enum {
binary, binary,
@ -79,39 +79,45 @@ pub const Writer = struct {
const Int = @TypeOf(value); const Int = @TypeOf(value);
const type_info = @typeInfo(Int); const type_info = @typeInfo(Int);
if (type_info != .Int) @compileError("value must be of type int"); switch (type_info) {
.Int => {
if (value == 0) return writer.writeByte('0');
if (value == 0) return writer.writeByte('0'); // TODO: Unhardcode this as it will break with large ints.
var buffer = std.mem.zeroes([28]u8);
var buffer_count = @as(usize, 0);
var n1 = value;
// TODO: Unhardcode this as it will break with large ints. if ((type_info.Int.signedness == .signed) and (value < 0)) {
var buffer = std.mem.zeroes([28]u8); // Negative value.
var buffer_count = @as(usize, 0); n1 = -value;
var n1 = value; buffer[0] = '-';
buffer_count += 1;
}
if ((type_info.Int.signedness == .signed) and (value < 0)) { while (n1 != 0) {
// Negative value. const base = @enumToInt(radix);
n1 = -value;
buffer[0] = '-'; buffer[buffer_count] = @intCast(u8, (n1 % base) + '0');
buffer_count += 1; n1 = (n1 / base);
buffer_count += 1;
}
for (buffer[0 .. (buffer_count / 2)]) |_, i|
std.mem.swap(u8, &buffer[i], &buffer[buffer_count - i - 1]);
return (writer.write(buffer[0 .. buffer_count]) == buffer_count);
},
// Cast comptime int into known-size integer and try again.
.ComptimeInt => return writer.
writeInt(radix, @intCast(std.math.IntFittingRange(value, value), value)),
else => @compileError("value must be of type int"),
} }
while (n1 != 0) {
const base = @enumToInt(radix);
buffer[buffer_count] = @intCast(u8, (n1 % base) + '0');
n1 = (n1 / base);
buffer_count += 1;
}
for (buffer[0 .. (buffer_count / 2)]) |_, i|
std.mem.swap(u8, &buffer[i], &buffer[buffer_count - i - 1]);
return (writer.write(buffer[0 .. buffer_count]) == buffer_count);
} }
}; };
var null_context = @as(usize, 0);
/// ///
/// Writer that silently throws consumed data away and never fails. /// Writer that silently throws consumed data away and never fails.
/// ///
@ -119,13 +125,10 @@ var null_context = @as(usize, 0);
/// sent somewhere for whatever reason. /// sent somewhere for whatever reason.
/// ///
pub const null_writer = Writer{ pub const null_writer = Writer{
.context = (&null_context), .context = undefined,
.operation = struct {
fn write(context: *anyopaque, buffer: []const u8) usize {
// Validate context canary value.
std.debug.assert(@ptrCast(*usize, @alignCast(@alignOf(usize), context)).* == 0);
.writeContext = struct {
fn write(_: *anyopaque, buffer: []const u8) usize {
return buffer.len; return buffer.len;
} }
}.write, }.write,
@ -137,9 +140,9 @@ test {
{ {
const sequence = "foo"; const sequence = "foo";
testing.expectEqual(null_writer.write(sequence), sequence.len); try testing.expectEqual(null_writer.write(sequence), sequence.len);
} }
testing.expect(null_writer.writeByte(0)); try testing.expect(null_writer.writeByte(0));
testing.expect(null_writer.writeInt(.decimal, 420)); try testing.expect(null_writer.writeInt(.decimal, 420));
} }

View File

@ -15,7 +15,10 @@ pub fn main() anyerror!void {
} }
test { test {
_ = io;
_ = stack;
_ = std;
_ = sys;
} }
fn run(event_loop: *sys.EventLoop, graphics: *sys.GraphicsContext) anyerror!void { fn run(event_loop: *sys.EventLoop, graphics: *sys.GraphicsContext) anyerror!void {

View File

@ -91,7 +91,7 @@ pub const FixedPushError = error {
Overflow, Overflow,
}; };
test "fixed stack" { test {
const testing = std.testing; const testing = std.testing;
var buffer = std.mem.zeroes([4]u8); var buffer = std.mem.zeroes([4]u8);
var stack = Fixed(u8){.buffer = &buffer}; var stack = Fixed(u8){.buffer = &buffer};

View File

@ -377,11 +377,11 @@ pub const FileAccess = opaque {
/// ///
pub fn size(file_access: *FileAccess, event_loop: *EventLoop) FileError!usize { pub fn size(file_access: *FileAccess, event_loop: *EventLoop) FileError!usize {
// Save cursor to return to it later. // Save cursor to return to it later.
const origin_cursor = try event_loop.tellFile(file_access); const origin_cursor = try event_loop.queryFile(file_access);
try event_loop.seekFile(file_access, .tail, 0); try event_loop.seekFile(file_access, .tail, 0);
const ending_cursor = try event_loop.tellFile(file_access); const ending_cursor = try event_loop.queryFile(file_access);
// Return to original cursor. // Return to original cursor.
try event_loop.seekFile(file_access, .head, origin_cursor); try event_loop.seekFile(file_access, .head, origin_cursor);