summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.zig2
-rw-r--r--exercises/060_floats.zig6
-rw-r--r--patches/patches/060_floats.patch8
3 files changed, 8 insertions, 8 deletions
diff --git a/build.zig b/build.zig
index 51288ad..8941610 100644
--- a/build.zig
+++ b/build.zig
@@ -963,7 +963,7 @@ const exercises = [_]Exercise{
},
.{
.main_file = "060_floats.zig",
- .output = "Shuttle liftoff weight: 2032kg",
+ .output = "Shuttle liftoff weight: 2032 metric tons",
},
.{
.main_file = "061_coercions.zig",
diff --git a/exercises/060_floats.zig b/exercises/060_floats.zig
index 217c265..b570518 100644
--- a/exercises/060_floats.zig
+++ b/exercises/060_floats.zig
@@ -41,14 +41,14 @@ pub fn main() void {
// The approximate weight of the Space Shuttle upon liftoff
// (including boosters and fuel tank) was 4,480,000 lb.
//
- // We'll convert this weight from pound to kilograms at a
- // conversion of 0.453592kg to the pound.
+ // We'll convert this weight from pounds to metric units at a
+ // conversion of 0.453592 kg to the pound.
const shuttle_weight: f16 = 0.453592 * 4480e3;
// By default, float values are formatted in scientific
// notation. Try experimenting with '{d}' and '{d:.3}' to see
// how decimal formatting works.
- print("Shuttle liftoff weight: {d:.0}kg\n", .{shuttle_weight});
+ print("Shuttle liftoff weight: {d:.0} metric tons\n", .{shuttle_weight});
}
// Floating further:
diff --git a/patches/patches/060_floats.patch b/patches/patches/060_floats.patch
index e74f87e..9e64c6f 100644
--- a/patches/patches/060_floats.patch
+++ b/patches/patches/060_floats.patch
@@ -1,9 +1,9 @@
---- exercises/060_floats.zig 2025-02-14 09:10:40.443151829 +0100
-+++ answers/060_floats.zig 2025-02-14 09:10:47.576619873 +0100
+--- exercises/060_floats.zig 2025-03-03 20:23:40.255443963 +0400
++++ answers/060_floats.zig 2025-03-03 20:29:58.554854977 +0400
@@ -43,7 +43,7 @@
//
- // We'll convert this weight from pound to kilograms at a
- // conversion of 0.453592kg to the pound.
+ // We'll convert this weight from pounds to metric units at a
+ // conversion of 0.453592 kg to the pound.
- const shuttle_weight: f16 = 0.453592 * 4480e3;
+ const shuttle_weight: f32 = 0.453592 * 4.480e3;