summaryrefslogtreecommitdiff
path: root/src/PropsData.zig
diff options
context:
space:
mode:
authorGravatar lch3612025-03-25 00:29:52 +0300
committerGravatar Sam Atman2025-04-29 12:30:55 -0400
commit2f44fdebca57d9eabb682e05d04189d0600b8664 (patch)
tree617e7d4be89c1a965848dbc7f9b5f2a273faa9d7 /src/PropsData.zig
parentBump copyright year, isolate iterator tests (diff)
downloadzg-2f44fdebca57d9eabb682e05d04189d0600b8664.tar.gz
zg-2f44fdebca57d9eabb682e05d04189d0600b8664.tar.xz
zg-2f44fdebca57d9eabb682e05d04189d0600b8664.zip
All the std.mem.Allocators that were stored just for init and deinit
methods were removed, mem.Allocators were added to deinit as arguments.
Diffstat (limited to 'src/PropsData.zig')
-rw-r--r--src/PropsData.zig17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/PropsData.zig b/src/PropsData.zig
index b77bf30..09c69c7 100644
--- a/src/PropsData.zig
+++ b/src/PropsData.zig
@@ -4,7 +4,6 @@ const compress = std.compress;
4const mem = std.mem; 4const mem = std.mem;
5const testing = std.testing; 5const testing = std.testing;
6 6
7allocator: mem.Allocator,
8core_s1: []u16 = undefined, 7core_s1: []u16 = undefined,
9core_s2: []u8 = undefined, 8core_s2: []u8 = undefined,
10props_s1: []u16 = undefined, 9props_s1: []u16 = undefined,
@@ -24,7 +23,7 @@ pub fn init(allocator: mem.Allocator) !Self {
24 var core_decomp = decompressor(.raw, core_fbs.reader()); 23 var core_decomp = decompressor(.raw, core_fbs.reader());
25 var core_reader = core_decomp.reader(); 24 var core_reader = core_decomp.reader();
26 25
27 var self = Self{ .allocator = allocator }; 26 var self = Self{};
28 27
29 const core_stage_1_len: u16 = try core_reader.readInt(u16, endian); 28 const core_stage_1_len: u16 = try core_reader.readInt(u16, endian);
30 self.core_s1 = try allocator.alloc(u16, core_stage_1_len); 29 self.core_s1 = try allocator.alloc(u16, core_stage_1_len);
@@ -71,13 +70,13 @@ pub fn init(allocator: mem.Allocator) !Self {
71 return self; 70 return self;
72} 71}
73 72
74pub fn deinit(self: *const Self) void { 73pub fn deinit(self: *const Self, allocator: mem.Allocator) void {
75 self.allocator.free(self.core_s1); 74 allocator.free(self.core_s1);
76 self.allocator.free(self.core_s2); 75 allocator.free(self.core_s2);
77 self.allocator.free(self.props_s1); 76 allocator.free(self.props_s1);
78 self.allocator.free(self.props_s2); 77 allocator.free(self.props_s2);
79 self.allocator.free(self.num_s1); 78 allocator.free(self.num_s1);
80 self.allocator.free(self.num_s2); 79 allocator.free(self.num_s2);
81} 80}
82 81
83/// True if `cp` is a mathematical symbol. 82/// True if `cp` is a mathematical symbol.