a/ziglings
1
0
Fork 0
mirror of https://codeberg.org/andyscott/ziglings.git synced 2024-09-19 11:28:08 -04:00
Code Issues Projects Releases Packages Wiki Activity

build: rename Exercise.baseName to name

Browse source 
The name "baseName" is confusing, since it refers to the UNIX basename
command, and not to the basename function in some programming languages
including Zig.

Use the std.fs.path.stem function to remove the file extension, instead
of slicing.

Remove the use of the assertion, since it is no longer necessary.
Instead, add a check to ensure that the exercise must be a Zig source
file in the validate_exercises function.

Update the validate_exercises function to check the last exercise, too.
This commit is contained in:
Manlio Perillo 2023-04-30 18:48:52 +02:00
parent 69103a3b82
commit 5c20e2b553
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
build.zig
View file

@ -39,9 +39,8 @@ pub const Exercise = struct {
skip: bool = false, skip: bool = false,
/// Returns the name of the main file with .zig stripped. /// Returns the name of the main file with .zig stripped.
pub fn baseName(self: Exercise) []const u8 { pub fn name(self: Exercise) []const u8 {
assert(std.mem.endsWith(u8, self.main_file, ".zig")); return std.fs.path.stem(self.main_file);
return self.main_file[0 .. self.main_file.len - 4];
} }
/// Returns the key of the main file, the string before the '_' with /// Returns the key of the main file, the string before the '_' with
@ -68,7 +67,7 @@ pub const Exercise = struct {
@panic("OOM"); @panic("OOM");
return b.addExecutable(.{ return b.addExecutable(.{
.name = self.baseName(), .name = self.name(),
.root_source_file = .{ .path = file_path }, .root_source_file = .{ .path = file_path },
.link_libc = self.link_libc, .link_libc = self.link_libc,
}); });
@ -598,9 +597,12 @@ fn validate_exercises() bool {
// Don't use the "multi-object for loop" syntax, in order to avoid a syntax // Don't use the "multi-object for loop" syntax, in order to avoid a syntax
// error with old Zig compilers. // error with old Zig compilers.
var i: usize = 0; var i: usize = 0;
for (exercises[0 .. exercises.len - 1]) |ex| { for (exercises[0..]) |ex| {
const exno = ex.number();
const last = 999;
i += 1; i += 1;
if (ex.number() != i) {
if (exno != i and exno != last) {
print("exercise {s} has an incorrect number: expected {}, got {s}\n", .{ print("exercise {s} has an incorrect number: expected {}, got {s}\n", .{
ex.main_file, ex.main_file,
i, i,
@ -618,6 +620,12 @@ fn validate_exercises() bool {
return false; return false;
} }
if (!std.mem.endsWith(u8, ex.main_file, ".zig")) {
print("exercise {s} is not a zig source file\n", .{ex.main_file});
return false;
}
} }
return true; return true;

2
test/tests.zig
View file

@ -323,7 +323,7 @@ fn heal(allocator: Allocator, exercises: []const Exercise, outdir: []const u8) !
const patches_path = "patches/patches"; const patches_path = "patches/patches";
for (exercises) |ex| { for (exercises) |ex| {
const name = ex.baseName(); const name = ex.name();
// Use the POSIX patch variant. // Use the POSIX patch variant.
const file = try join(allocator, &.{ exercises_path, ex.main_file }); const file = try join(allocator, &.{ exercises_path, ex.main_file });