Fixed a misunderstanding about allocations (I did too much go and nim!)

1 files changed, 14 insertions, 12 deletions

diff --git a/src/stackStack.zig b/src/stackStack.zig
index 15578d3..717be3d 100644
--- a/src/stackStack.zig
+++ b/src/stackStack.zig
@@ -1,25 +1,27 @@
 const std = @import("std");
 const stack = @import("stack.zig");
-const vector = std.meta.Vector(2, i64);
 
 pub const StackStack = struct {
-    data: std.ArrayList(stack.Stack),
+    allocator: std.mem.Allocator,
+    data: std.ArrayList(*stack.Stack),
     toss: *stack.Stack,
     pub fn deinit(self: *StackStack) void {
-        for (self.data.items) |*s| {
+        for (self.data.items) |s| {
             s.deinit();
         }
         self.data.deinit();
+        self.allocator.destroy(self);
     }
-    pub fn init(allocator: std.mem.Allocator) !StackStack {
-        var ss = std.ArrayList(stack.Stack).init(allocator);
-        errdefer ss.deinit();
-        var s = try ss.addOne();
-        s.* = stack.Stack.init(allocator);
-        return StackStack{
-            .data = ss,
-            .toss = s,
-        };
+    pub fn init(allocator: std.mem.Allocator) !*StackStack {
+        var ss = try allocator.create(StackStack);
+        errdefer allocator.destroy(ss);
+        ss.allocator = allocator;
+        ss.data = std.ArrayList(*stack.Stack).init(allocator);
+        errdefer ss.data.deinit();
+        var s = try ss.data.addOne();
+        s.* = try stack.Stack.init(allocator);
+        ss.toss = s.*;
+        return ss;
     }
     pub inline fn toss(self: *StackStack) *stack.Stack {
         return self.toss;