upgrade zig codes to 0.11.0-dev.3379+629f0d23b

coderonion · coderonion · commit 1d6a1e1da96e · 2023-06-23T23:07:50.000+08:00
diff --git a/zig/chapter_hashing/array_hash_map.zig b/zig/chapter_hashing/array_hash_map.zig
@@ -5,13 +5,13 @@
 const std = @import("std");
 const inc = @import("include");
 
-// 键值对 int->String
-const Entry = struct {
+// 键值对
+const Pair = struct {
     key: usize = undefined,
     val: []const u8 = undefined,
 
-   pub fn init(key: usize, val: []const u8) Entry {
-        return Entry {
+   pub fn init(key: usize, val: []const u8) Pair {
+        return Pair {
             .key = key,
             .val = val,
         };
@@ -57,7 +57,7 @@ pub fn ArrayHashMap(comptime T: type) type {
 
         // 添加操作
         pub fn put(self: *Self, key: usize, val: []const u8) !void {
-            var pair = Entry.init(key, val);
+            var pair = Pair.init(key, val);
             var index = hashFunc(key);
             self.bucket.?.items[index] = pair;
         }
@@ -70,7 +70,7 @@ pub fn ArrayHashMap(comptime T: type) type {
         }       
 
         // 获取所有键值对
-        pub fn entrySet(self: *Self) !std.ArrayList(T) {
+        pub fn pairSet(self: *Self) !std.ArrayList(T) {
             var entry_set = std.ArrayList(T).init(self.mem_allocator);
             for (self.bucket.?.items) |item| {
                 if (item == null) continue;
@@ -101,7 +101,7 @@ pub fn ArrayHashMap(comptime T: type) type {
 
         // 打印哈希表
         pub fn print(self: *Self) !void {
-            var entry_set = try self.entrySet();
+            var entry_set = try self.pairSet();
             defer entry_set.deinit();
             for (entry_set.items) |item| {
                 std.debug.print("{} -> {s}\n", .{item.key, item.val});
@@ -113,7 +113,7 @@ pub fn ArrayHashMap(comptime T: type) type {
 // Driver Code
 pub fn main() !void {
     // 初始化哈希表
-    var map = ArrayHashMap(Entry){};
+    var map = ArrayHashMap(Pair){};
     try map.init(std.heap.page_allocator);
     defer map.deinit();
 
@@ -140,7 +140,7 @@ pub fn main() !void {
     
     // 遍历哈希表
     std.debug.print("\n遍历键值对 Key->Value\n", .{});
-    var entry_set = try map.entrySet();
+    var entry_set = try map.pairSet();
     for (entry_set.items) |kv| {
         std.debug.print("{} -> {s}\n", .{kv.key, kv.val});
     }
diff --git a/zig/chapter_searching/linear_search.zig b/zig/chapter_searching/linear_search.zig
@@ -6,7 +6,7 @@ const std = @import("std");
 const inc = @import("include");
 
 // 线性查找（数组）
-fn linearSearchList(comptime T: type, nums: std.ArrayList(T), target: T) T {
+fn linearSearchArray(comptime T: type, nums: std.ArrayList(T), target: T) T {
     // 遍历数组
     for (nums.items, 0..) |num, i| {
         // 找到目标元素， 返回其索引
@@ -38,7 +38,7 @@ pub fn main() !void {
     var nums = std.ArrayList(i32).init(std.heap.page_allocator);
     defer nums.deinit();
     try nums.appendSlice(&[_]i32{ 1, 5, 3, 2, 4, 7, 5, 9, 10, 8 });
-    var index = linearSearchList(i32, nums, target);
+    var index = linearSearchArray(i32, nums, target);
     std.debug.print("目标元素 3 的索引 = {}\n", .{index});
 
     // 在链表中执行线性查找
diff --git a/zig/chapter_sorting/radix_sort.zig b/zig/chapter_sorting/radix_sort.zig
@@ -17,27 +17,27 @@ fn countingSortDigit(nums: []i32, exp: i32) !void {
     var mem_arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     // defer mem_arena.deinit();
     const mem_allocator = mem_arena.allocator();
-    var bucket = try mem_allocator.alloc(usize, 10);
-    @memset(bucket, 0);
+    var counter = try mem_allocator.alloc(usize, 10);
+    @memset(counter, 0);
     var n = nums.len;
     // 借助桶来统计 0~9 各数字的出现次数
     for (nums) |num| {
         var d = @bitCast(u32, digit(num, exp));    // 获取 nums[i] 第 k 位，记为 d
-        bucket[d] += 1;             // 统计数字 d 的出现次数
+        counter[d] += 1;             // 统计数字 d 的出现次数
     }
     // 求前缀和，将“出现个数”转换为“数组索引”
     var i: usize = 1;
     while (i < 10) : (i += 1) {
-        bucket[i] += bucket[i - 1];
+        counter[i] += counter[i - 1];
     }
     // 倒序遍历，根据桶内统计结果，将各元素填入 res
     var res = try mem_allocator.alloc(i32, n);
     i = n - 1;
     while (i >= 0) : (i -= 1) {
         var d = @bitCast(u32, digit(nums[i], exp));
-        var j = bucket[d] - 1;  // 获取 d 在数组中的索引 j
+        var j = counter[d] - 1;  // 获取 d 在数组中的索引 j
         res[j] = nums[i];       // 将当前元素填入索引 j
-        bucket[d] -= 1;         // 将 d 的数量减 1
+        counter[d] -= 1;         // 将 d 的数量减 1
         if (i == 0) break;
     }
     // 使用结果覆盖原数组 nums
diff --git a/zig/chapter_stack_and_queue/array_queue.zig b/zig/chapter_stack_and_queue/array_queue.zig
@@ -50,7 +50,7 @@ pub fn ArrayQueue(comptime T: type) type {
         }
 
         // 入队
-        pub fn offer(self: *Self, num: T) !void {
+        pub fn push(self: *Self, num: T) !void {
             if (self.size() == self.capacity()) {
                 std.debug.print("队列已满\n", .{});
                 return;
@@ -102,11 +102,11 @@ pub fn main() !void {
     defer queue.deinit();
 
     // 元素入队
-    try queue.offer(1);
-    try queue.offer(3);
-    try queue.offer(2);
-    try queue.offer(5);
-    try queue.offer(4);
+    try queue.push(1);
+    try queue.push(3);
+    try queue.push(2);
+    try queue.push(5);
+    try queue.push(4);
     std.debug.print("队列 queue = ", .{});
     inc.PrintUtil.printArray(i32, try queue.toArray());
 
@@ -130,7 +130,7 @@ pub fn main() !void {
     // 测试环形数组
     var i: i32 = 0;
     while (i < 10) : (i += 1) {
-        try queue.offer(i);
+        try queue.push(i);
         _ = queue.pop();
         std.debug.print("\n第 {} 轮入队 + 出队后 queue = ", .{i});
         inc.PrintUtil.printArray(i32, try queue.toArray());
diff --git a/zig/include/PrintUtil.zig b/zig/include/PrintUtil.zig
@@ -130,5 +130,4 @@ pub fn printTree(root: ?*TreeNode(i32), prev: ?*Trunk, isLeft: bool) !void {
     trunk.str = "   |";
 
     try printTree(root.?.left, &trunk, false);
-}
-
+}
