Просмотр исходного кода

Merge pull request 'Shuttle weight fixed' (#208) from e60 into main

Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/208
Chris Boesch 6 месяцев назад
Родитель
Сommit
2a9ef2d2c8
3 измененных файлов с 7 добавлено и 8 удалено
  1. 2 3
      build.zig
  2. 1 1
      exercises/060_floats.zig
  3. 4 4
      patches/patches/060_floats.patch

+ 2 - 3
build.zig

@@ -283,12 +283,11 @@ pub fn build(b: *Build) !void {
         starting_exercise = try std.fmt.parseInt(u32, contents, 10);
     } else |err| {
         switch (err) {
-
             std.fs.File.OpenError.FileNotFound => {
                 // This is fine, may be the first time tests are run or progress have been reset
             },
             else => {
-                print("Unable to open {s}: {}\n", .{progress_filename, err});
+                print("Unable to open {s}: {}\n", .{ progress_filename, err });
                 return err;
             },
         }
@@ -964,7 +963,7 @@ const exercises = [_]Exercise{
     },
     .{
         .main_file = "060_floats.zig",
-        .output = "Shuttle liftoff weight: 2032092kg",
+        .output = "Shuttle liftoff weight: 2032kg",
     },
     .{
         .main_file = "061_coercions.zig",

+ 1 - 1
exercises/060_floats.zig

@@ -43,7 +43,7 @@ pub fn main() void {
     //
     // We'll convert this weight from pound to kilograms at a
     // conversion of 0.453592kg to the pound.
-    const shuttle_weight: f16 = 0.453592 * 4480e6;
+    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

+ 4 - 4
patches/patches/060_floats.patch

@@ -1,11 +1,11 @@
---- exercises/060_floats.zig	2023-11-06 19:45:03.609687304 +0100
-+++ answers/060_floats.zig	2023-11-06 19:44:49.249419994 +0100
+--- exercises/060_floats.zig	2025-02-14 09:10:40.443151829 +0100
++++ answers/060_floats.zig	2025-02-14 09:10:47.576619873 +0100
 @@ -43,7 +43,7 @@
      //
      // We'll convert this weight from pound to kilograms at a
      // conversion of 0.453592kg to the pound.
--    const shuttle_weight: f16 = 0.453592 * 4480e6;
-+    const shuttle_weight: f32 = 0.453592 * 4.480e6;
+-    const shuttle_weight: f16 = 0.453592 * 4480e3;
++    const shuttle_weight: f32 = 0.453592 * 4.480e3;
  
      // By default, float values are formatted in scientific
      // notation. Try experimenting with '{d}' and '{d:.3}' to see