diff options
| author | Chris Boesch <chrboesch@noreply.codeberg.org> | 2025-03-03 21:45:34 +0000 |
|---|---|---|
| committer | Chris Boesch <chrboesch@noreply.codeberg.org> | 2025-03-03 21:45:34 +0000 |
| commit | ce64fe5a1a35015aa2968519face9f5d50fb6458 (patch) | |
| tree | 1b50964d17e029dc9bf6929e4cb193d4047316d6 | |
| parent | 2a9ef2d2c8e50e85a82a43d008abfbefb7011d58 (diff) | |
| parent | a22f1df0a1d98322dd28067ba5509f71a8f3e6b8 (diff) | |
Merge pull request 'Shuttle weight fixed w.r.t. issue-211' (#212) from mz0/ziglings:shuttle-weight into main
Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/212
| -rw-r--r-- | build.zig | 2 | ||||
| -rw-r--r-- | exercises/060_floats.zig | 6 | ||||
| -rw-r--r-- | patches/patches/060_floats.patch | 8 |
3 files changed, 8 insertions, 8 deletions
@@ -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; |