adyxax/zigfunge98
1
0
Fork 0
Code Issues Activity

Fixed #1: wrongful handling of \r newlines

Browse source
This commit is contained in:
Julien Dessaux 2023-01-06 21:35:45 +01:00
parent 2517e44899
commit 381126dccb
Signed by: adyxax
GPG key ID: F92E51B86E07177E
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/field.zig
View file

@ -283,7 +283,7 @@ pub const Field = struct {
lastIsCR = false; lastIsCR = false;
switch (buffer[i]) { switch (buffer[i]) {
'\n' => continue, '\n' => continue,
else => return error.GOT_CR_WITHOUT_LF, else => {},
} }
} }
switch (buffer[i]) { switch (buffer[i]) {
@ -322,7 +322,14 @@ pub const Field = struct {
try std.testing.expectEqual(f.load(cr2.reader()), error.FIELD_NOT_EMPTY); try std.testing.expectEqual(f.load(cr2.reader()), error.FIELD_NOT_EMPTY);
var f2 = try Field.init(std.testing.allocator); var f2 = try Field.init(std.testing.allocator);
defer f2.deinit(); defer f2.deinit();
try std.testing.expectEqual(f2.load(cr2.reader()), error.GOT_CR_WITHOUT_LF); try f2.load(cr2.reader());
try std.testing.expectEqual(f2.x, 0);
try std.testing.expectEqual(f2.y, 0);
try std.testing.expectEqual(f2.lx, 1);
try std.testing.expectEqual(f2.lines.items.len, 2);
try std.testing.expectEqual(f2.lines.items[0].data.items[0], 'v');
try std.testing.expectEqual(f2.lines.items[1].x, 0);
try std.testing.expectEqual(f2.lines.items[1].data.items[0], '@');
} }
pub fn set(f: *Field, x: i64, y: i64, v: i64) !void { pub fn set(f: *Field, x: i64, y: i64, v: i64) !void {
if (v == ' ') return f.blank(x, y); if (v == ' ') return f.blank(x, y);