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

Merge upstream with solutions

Browse source
This commit is contained in:
Andrew Scott 2024-02-24 18:08:34 -05:00
commit 1a1b7937f6
Signed by: a
GPG key ID: 7CD5A5977E4931C1
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.zig
View file

@ -15,7 +15,7 @@ const print = std.debug.print;
// 1) Getting Started // 1) Getting Started
// 2) Version Changes // 2) Version Changes
comptime { comptime {
const required_zig = "0.12.0-dev.2043"; const required_zig = "0.12.0-dev.2618";
const current_zig = builtin.zig_version; const current_zig = builtin.zig_version;
const min_zig = std.SemanticVersion.parse(required_zig) catch unreachable; const min_zig = std.SemanticVersion.parse(required_zig) catch unreachable;
if (current_zig.order(min_zig) == .lt) { if (current_zig.order(min_zig) == .lt) {
@ -386,7 +386,7 @@ const ZiglingStep = struct {
var zig_args = std.ArrayList([]const u8).init(b.allocator); var zig_args = std.ArrayList([]const u8).init(b.allocator);
defer zig_args.deinit(); defer zig_args.deinit();
zig_args.append(b.zig_exe) catch @panic("OOM"); zig_args.append(b.graph.zig_exe) catch @panic("OOM");
const cmd = switch (self.exercise.kind) { const cmd = switch (self.exercise.kind) {
.exe => "build-exe", .exe => "build-exe",

6
exercises/103_tokenization.zig
View file

@ -1,9 +1,9 @@
// //
// The functionality of the standard library is becoming increasingly // The functionality of the standard library is becoming increasingly
// important in Zig. On the one hand, it is helpful to look at how // important in Zig. First of all, it is helpful to take a look at how
// the individual functions are implemented. Because this is wonderfully // the individual functions are implemented. Because this is wonderfully
// suitable as a template for your own functions. On the other hand, // suitable as a template for your own functions. In addition these
// these standard functions are part of the basic equipment of Zig. // standard functions are part of the basic configuration of Zig.
// //
// This means that they are always available on every system. // This means that they are always available on every system.
// Therefore it is worthwhile to deal with them also in Ziglings. // Therefore it is worthwhile to deal with them also in Ziglings.

6
test/tests.zig
View file

@ -33,7 +33,7 @@ pub fn addCliTests(b: *std.Build, exercises: []const Exercise) *Step {
const n = ex.number(); const n = ex.number();
const cmd = b.addSystemCommand(&.{ const cmd = b.addSystemCommand(&.{
b.zig_exe, b.graph.zig_exe,
"build", "build",
"-Dhealed", "-Dhealed",
b.fmt("-Dhealed-path={s}", .{tmp_path}), b.fmt("-Dhealed-path={s}", .{tmp_path}),
@ -69,7 +69,7 @@ pub fn addCliTests(b: *std.Build, exercises: []const Exercise) *Step {
// TODO: when an exercise is modified, the cache is not invalidated. // TODO: when an exercise is modified, the cache is not invalidated.
const cmd = b.addSystemCommand(&.{ const cmd = b.addSystemCommand(&.{
b.zig_exe, b.graph.zig_exe,
"build", "build",
"-Dhealed", "-Dhealed",
b.fmt("-Dhealed-path={s}", .{tmp_path}), b.fmt("-Dhealed-path={s}", .{tmp_path}),
@ -99,7 +99,7 @@ pub fn addCliTests(b: *std.Build, exercises: []const Exercise) *Step {
const n = ex.number(); const n = ex.number();
const cmd = b.addSystemCommand(&.{ const cmd = b.addSystemCommand(&.{
b.zig_exe, b.graph.zig_exe,
"build", "build",
b.fmt("-Dn={}", .{n}), b.fmt("-Dn={}", .{n}),
}); });