stage2 更多的工具库 stage1 修复问题

stage2/utils/vec.spl

@@ -1,9 +1,10 @@
 // Expect retcode = 0
+
 // 类型擦除的动态数组。元素按值复制，数组只释放自身存储，不释放元素内部资源。
 // Vec 拥有 raw 指向的分配；普通赋值会复制所有权，所有权转移必须使用 take。
 
 type .{ .Error, .Kind, .Status } = @import("error.spl");
-type .{ .SizeResult, .checked_add, .checked_mul, .move } = @import("memory.spl");
+type .{ .SizeResult, .checked_add, .checked_mul, .grow_capacity, .move } = @import("memory.spl");
 type .{ .alloc, .copy, .free } = @import("../sys/mem.spl");
 
 type Vec = @self;
@@ -87,6 +88,9 @@ fn allocate(capacity: usize, elem_size: usize, elem_align: usize): VecResult {
     }
 
     var raw = alloc(total) as *u8;
+    if raw == null {
+        ret .Err(Error.make(.Overflow));
+    }
     var address = raw as usize;
     var mask = elem_align - 1;
     if address > (~(0 as usize)) - mask {
@@ -109,15 +113,7 @@ fn reserve(self: *Vec, need: usize): Status {
     if !valid(self.*) { ret status_error(.InvalidArgument); }
     if need <= self.cap { ret .Ok; }
 
-    var new_cap = self.cap;
-    if new_cap < 8 { new_cap = 8; }
-    while new_cap < need {
-        if new_cap > (~(0 as usize)) / 2 {
-            new_cap = need;
-            break;
-        }
-        new_cap = new_cap * 2;
-    }
+    var new_cap = grow_capacity(self.cap, 8, need);
 
     var fresh: Vec = undefined;
     match allocate(new_cap, self.elem_size, self.elem_align) {
@@ -337,6 +333,7 @@ fn test_construction_and_alignment() {
 
 fn test_growth_and_access() {
     var v = make_vec(@sizeof(i32), @alignof(i32));
+    defer { drop(&v); }
     var i: i32 = 0;
     while i < 1000 {
         var value = i * 3 - 7;
@@ -358,11 +355,11 @@ fn test_growth_and_access() {
     var popped: i32 = 0;
     expect_ok(pop(&v, &popped as *u8));
     @assert(popped == 2990 && v.len == 999, "pop copies then removes");
-    drop(&v);
 }
 
 fn test_self_reference() {
     var v = make_vec(@sizeof(i32), @alignof(i32));
+    defer { drop(&v); }
     var i: i32 = 0;
     while i < 8 {
         expect_ok(push(&v, &i as *u8));
@@ -391,17 +388,18 @@ fn test_self_reference() {
     }
     expect_ok(set(&v, 0, last_ptr));
     expect_i32(&v, 0, 7);
-    drop(&v);
 }
 
 fn test_clone_take_and_failures() {
     var source = make_vec(@sizeof(i32), @alignof(i32));
+    defer { drop(&source); }
     var one: i32 = 1;
     var two: i32 = 2;
     expect_ok(push(&source, &one as *u8));
     expect_ok(push(&source, &two as *u8));
 
     var copy = make_vec(@sizeof(i32), @alignof(i32));
+    defer { drop(&copy); }
     expect_ok(clone(&copy, source));
     expect_i32(&copy, 0, 1);
     one = 99;
@@ -415,6 +413,7 @@ fn test_clone_take_and_failures() {
     expect_i32(&copy, 1, 2);
 
     var moved = take(&copy);
+    defer { drop(&moved); }
     @assert(copy.raw == null && copy.data == null && copy.len == 0 && copy.cap == 0);
     expect_i32(&moved, 0, 1);
 
@@ -430,10 +429,6 @@ fn test_clone_take_and_failures() {
     var output: i32 = 55;
     expect_error(pop(&moved, &output as *u8), false);
     @assert(output == 55, "failed pop preserves output");
-
-    drop(&moved);
-    drop(&copy);
-    drop(&source);
 }
 
 fn main() {