Compare commits

..

No commits in common. "150b3de2995dc0f6da3b03113151488fadab246b" and "71b4f5ea8130432c162de1f230c95d19f43b24a3" have entirely different histories.

2 changed files with 14 additions and 16 deletions

View file

@ -110,15 +110,15 @@ pub fn main() void {
// name will not be printed if the field is of type 'void'
// (which is a zero-bit type that takes up no space at all!):
if (fields[0].??? != void) {
print(" {s}", .{fields[0].name});
print(" {s}", .{@typeInfo(Narcissus).@"struct".fields[0].name});
}
if (fields[1].??? != void) {
print(" {s}", .{fields[1].name});
print(" {s}", .{@typeInfo(Narcissus).@"struct".fields[1].name});
}
if (fields[2].??? != void) {
print(" {s}", .{fields[2].name});
print(" {s}", .{@typeInfo(Narcissus).@"struct".fields[2].name});
}
// Yuck, look at all that repeated code above! I don't know
@ -136,16 +136,14 @@ pub fn main() void {
// But a change after Zig 0.10.0 added the source file name to the
// type. "Narcissus" became "065_builtins2.Narcissus".
//
// To fix this, we've added this function to strip the filename from
// the front of the type name. (It returns a slice of the type name
// starting at the index + 1 of character ".")
// To fix this, I've added this function to strip the filename from
// the front of the type name in the dumbest way possible. (It returns
// a slice of the type name starting at character 14 (assuming
// single-byte characters).
//
// We'll be seeing @typeName again in Exercise 070. For now, you can
// see that it takes a Type and returns a u8 "string".
fn maximumNarcissism(myType: anytype) []const u8 {
const indexOf = @import("std").mem.indexOf;
// Turn "065_builtins2.Narcissus" into "Narcissus"
const name = @typeName(myType);
return name[indexOf(u8, name, ".").? + 1 ..];
// Turn '065_builtins2.Narcissus' into 'Narcissus'
return @typeName(myType)[14..];
}

View file

@ -1,5 +1,5 @@
--- exercises/065_builtins2.zig 2024-11-02 16:58:30.607829441 +0100
+++ answers/065_builtins2.zig 2024-11-02 16:58:33.821220588 +0100
--- exercises/065_builtins2.zig 2024-09-02 19:15:56.569952315 +0200
+++ answers/065_builtins2.zig 2024-09-02 19:13:44.280600350 +0200
@@ -58,7 +58,7 @@
// Oops! We cannot leave the 'me' and 'myself' fields
// undefined. Please set them here:
@ -24,16 +24,16 @@
// (which is a zero-bit type that takes up no space at all!):
- if (fields[0].??? != void) {
+ if (fields[0].type != void) {
print(" {s}", .{fields[0].name});
print(" {s}", .{@typeInfo(Narcissus).@"struct".fields[0].name});
}
- if (fields[1].??? != void) {
+ if (fields[1].type != void) {
print(" {s}", .{fields[1].name});
print(" {s}", .{@typeInfo(Narcissus).@"struct".fields[1].name});
}
- if (fields[2].??? != void) {
+ if (fields[2].type != void) {
print(" {s}", .{fields[2].name});
print(" {s}", .{@typeInfo(Narcissus).@"struct".fields[2].name});
}