a/ziglings
1
0
Fork 0
mirror of https://codeberg.org/andyscott/ziglings.git synced 2024-12-22 22:13:11 -05:00
Code Issues Projects Releases Packages Wiki Activity

exclude trailing newlines and spaces

Browse source
This commit is contained in:
Tobias Simetsreiter 2022-11-16 13:00:36 +01:00
parent 980a278ccc
commit ae193c08c3
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
build.zig
View file

@ -54,12 +54,12 @@ const Exercise = struct {
const exercises = [_]Exercise{ const exercises = [_]Exercise{
.{ .{
.main_file = "001_hello.zig", .main_file = "001_hello.zig",
.output = "Hello world", .output = "Hello world!",
.hint = "DON'T PANIC!\nRead the error above.\nSee how it has something to do with 'main'?\nOpen up the source file as noted and read the comments.\nYou can do this!", .hint = "DON'T PANIC!\nRead the error above.\nSee how it has something to do with 'main'?\nOpen up the source file as noted and read the comments.\nYou can do this!",
}, },
.{ .{
.main_file = "002_std.zig", .main_file = "002_std.zig",
.output = "Standard Library", .output = "Standard Library.",
}, },
.{ .{
.main_file = "003_assignment.zig", .main_file = "003_assignment.zig",
@ -420,7 +420,7 @@ const exercises = [_]Exercise{
}, },
.{ .{
.main_file = "084_async.zig", .main_file = "084_async.zig",
.output = "foo() A", .output = "foo() A\nfoo() B",
.hint = "Read the facts. Use the facts.", .hint = "Read the facts. Use the facts.",
.@"async" = true, .@"async" = true,
}, },
@ -682,17 +682,19 @@ const ZiglingStep = struct {
}, },
} }
const trimOutput = std.mem.trimRight(u8, output, " \r\n");
const trimExerciseOutput = std.mem.trimRight(u8, self.exercise.output, " \r\n");
// validate the output // validate the output
if (std.mem.indexOf(u8, output, self.exercise.output) == null or output.len != self.exercise.output.len) { if (std.mem.indexOf(u8, trimOutput, trimExerciseOutput) == null or trimOutput.len != trimExerciseOutput.len) {
print( print(
\\ \\
\\{s}----------- Expected this output -----------{s} \\{s}----------- Expected this output -----------{s}
\\{s} \\"{s}"
\\{s}----------- but found -----------{s} \\{s}----------- but found -----------{s}
\\{s} \\"{s}"
\\{s}-----------{s} \\{s}-----------{s}
\\ \\
, .{ red_text, reset_text, self.exercise.output, red_text, reset_text, output, red_text, reset_text }); , .{ red_text, reset_text, trimExerciseOutput, red_text, reset_text, trimOutput, red_text, reset_text });
return error.InvalidOutput; return error.InvalidOutput;
} }