aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/exercises/047_methods.zig
diff options
context:
space:
mode:
Diffstat (limited to 'exercises/047_methods.zig')
-rw-r--r--exercises/047_methods.zig21
1 files changed, 13 insertions, 8 deletions
diff --git a/exercises/047_methods.zig b/exercises/047_methods.zig
index aee4c16..0e7bfa8 100644
--- a/exercises/047_methods.zig
+++ b/exercises/047_methods.zig
@@ -10,7 +10,7 @@
// pub fn hello() void {
// std.debug.print("Foo says hello!\n", .{});
// }
-// }
+// };
//
// 2. A function that is a member of a struct is a "method" and is
// called with the "dot syntax" like so:
@@ -23,10 +23,10 @@
// const Bar = struct{
// number: u32,
//
-// pub fn printMe(self: *Bar) void {
+// pub fn printMe(self: Bar) void {
// std.debug.print("{}\n", .{self.number});
// }
-// }
+// };
//
// (Actually, you can name the first parameter anything, but
// please follow convention and use "self".)
@@ -55,10 +55,15 @@ const Alien = struct {
.health = strength * 5,
};
}
+};
+
+// Your trusty weapon. Zap those aliens!
+const HeatRay = struct {
+ damage: u8,
// We love this method:
- pub fn zap(self: *Alien, damage: u8) void {
- self.health -= if (damage >= self.health) self.health else damage;
+ pub fn zap(self: *HeatRay, alien: *Alien) void {
+ alien.health -= if (self.damage >= alien.health) alien.health else self.damage;
}
};
@@ -74,7 +79,7 @@ pub fn main() void {
};
var aliens_alive = aliens.len;
- var heat_ray_strength: u8 = 7; // We've been given a heat ray weapon.
+ var heat_ray = HeatRay{ .damage = 7 }; // We've been given a heat ray weapon.
// We'll keep checking to see if we've killed all the aliens yet.
while (aliens_alive > 0) {
@@ -83,8 +88,8 @@ pub fn main() void {
// Loop through every alien by reference (* makes a pointer capture value)
for (aliens) |*alien| {
- // *** Zap the Alien Here! ***
- ???.zap(heat_ray_strength);
+ // *** Zap the alien with the heat ray here! ***
+ ???.zap(???);
// If the alien's health is still above 0, it's still alive.
if (alien.health > 0) aliens_alive += 1;