Compare commits

...

2 commits

Author SHA1 Message Date
6b2ce7e425 properly fix memleaks 2022-04-28 00:28:07 -03:00
2796b654e5 port main() code path to latest zig 2022-04-28 00:08:52 -03:00
4 changed files with 18 additions and 19 deletions

1
.gitignore vendored
View file

@ -1,4 +1,5 @@
zig-cache/
zig-out/
*.mp3
*.wav
build_runner.zig

View file

@ -161,7 +161,7 @@ pub const Image = struct {
var in_fmt = mkSfInfo();
// clone sndfile
var sndfile = try sopen(self.allocator, self.curpath, c.SFM_READ, &in_fmt);
std.testing.expectEqual(self.frames, @intCast(usize, in_fmt.frames));
std.debug.assert(self.frames == @intCast(usize, in_fmt.frames));
var image = try self.allocator.create(Image);

View file

@ -479,25 +479,24 @@ pub const CommandList = struct {
pub fn deinit(self: *Self) void {
for (self.list.items) |cmd_ptr| {
//self.list.allocator.destroy(cmd_ptr);
inline for (@typeInfo(Command.Tag).Enum.fields) |field| {
if (cmd_ptr.tag == @field(Command.Tag, field.name)) {
const actual_tag =
@field(Command.Tag, field.name);
// if we find a match on the tag, we can get the type
const typ = Command.tagToType(actual_tag);
_ = typ;
// TODO fix
//inline for (@typeInfo(typ).Struct.fields) |cmd_field| {
// switch (cmd_field.field_type) {
// []u8, []const u8 => self.list.allocator.destroy(@field(typ, cmd_field.name)),
// else => {},
// }
//}
const inner_command = cmd_ptr.cast(typ).?;
inline for (@typeInfo(typ).Struct.fields) |cmd_field| {
switch (cmd_field.field_type) {
[]u8, []const u8 => self.list.allocator.free(@field(inner_command, cmd_field.name)),
else => {},
}
}
}
}
self.list.allocator.destroy(cmd_ptr);
}
self.list.deinit();
}

View file

@ -41,7 +41,7 @@ fn copyCommandToHeap(allocator: std.mem.Allocator, command: langs.Command, compt
pub fn doRepl(allocator: std.mem.Allocator, args_it: anytype) !void {
var stdout_file = std.io.getStdOut();
const stdout = &stdout_file.writer();
const scri_path = try (args_it.next(allocator) orelse @panic("expected scri path"));
const scri_path = (args_it.next() orelse @panic("expected scri path"));
errdefer allocator.free(scri_path);
defer allocator.free(scri_path);
@ -246,8 +246,7 @@ fn doRun(allocator: std.mem.Allocator, args_it: anytype) !void {
var runner = runners.Runner.init(allocator, false);
defer runner.deinit();
const scri_path = try (args_it.next(allocator) orelse @panic("run: expected scri path"));
defer allocator.free(scri_path);
const scri_path = (args_it.next() orelse @panic("run: expected scri path"));
var file = try std.fs.cwd().openFile(scri_path, .{});
defer file.close();
@ -270,18 +269,18 @@ pub fn main() !void {
defer {
_ = allocator_instance.deinit();
}
const allocator = &allocator_instance.allocator;
const allocator = allocator_instance.allocator();
var args_it = std.process.args();
var args_it = try std.process.argsWithAllocator(allocator);
defer args_it.deinit();
_ = args_it.skip();
const cli_command_opt = args_it.next(allocator);
const cli_command_opt = args_it.next();
if (cli_command_opt == null) {
return doHelp();
}
const cli_command = try cli_command_opt.?;
defer allocator.free(cli_command);
const cli_command = cli_command_opt.?;
if (std.mem.eql(u8, cli_command, "help")) {
return doHelp();