Compare commits
2 Commits
1987c4d497
...
6b2ce7e425
Author | SHA1 | Date |
---|---|---|
Luna | 6b2ce7e425 | |
Luna | 2796b654e5 |
|
@ -1,4 +1,5 @@
|
||||||
zig-cache/
|
zig-cache/
|
||||||
|
zig-out/
|
||||||
*.mp3
|
*.mp3
|
||||||
*.wav
|
*.wav
|
||||||
build_runner.zig
|
build_runner.zig
|
||||||
|
|
|
@ -161,7 +161,7 @@ pub const Image = struct {
|
||||||
var in_fmt = mkSfInfo();
|
var in_fmt = mkSfInfo();
|
||||||
// clone sndfile
|
// clone sndfile
|
||||||
var sndfile = try sopen(self.allocator, self.curpath, c.SFM_READ, &in_fmt);
|
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);
|
var image = try self.allocator.create(Image);
|
||||||
|
|
||||||
|
|
19
src/lang.zig
19
src/lang.zig
|
@ -479,25 +479,24 @@ pub const CommandList = struct {
|
||||||
|
|
||||||
pub fn deinit(self: *Self) void {
|
pub fn deinit(self: *Self) void {
|
||||||
for (self.list.items) |cmd_ptr| {
|
for (self.list.items) |cmd_ptr| {
|
||||||
//self.list.allocator.destroy(cmd_ptr);
|
|
||||||
inline for (@typeInfo(Command.Tag).Enum.fields) |field| {
|
inline for (@typeInfo(Command.Tag).Enum.fields) |field| {
|
||||||
if (cmd_ptr.tag == @field(Command.Tag, field.name)) {
|
if (cmd_ptr.tag == @field(Command.Tag, field.name)) {
|
||||||
const actual_tag =
|
const actual_tag =
|
||||||
@field(Command.Tag, field.name);
|
@field(Command.Tag, field.name);
|
||||||
// if we find a match on the tag, we can get the type
|
// if we find a match on the tag, we can get the type
|
||||||
const typ = Command.tagToType(actual_tag);
|
const typ = Command.tagToType(actual_tag);
|
||||||
_ = typ;
|
|
||||||
|
|
||||||
// TODO fix
|
const inner_command = cmd_ptr.cast(typ).?;
|
||||||
|
inline for (@typeInfo(typ).Struct.fields) |cmd_field| {
|
||||||
//inline for (@typeInfo(typ).Struct.fields) |cmd_field| {
|
switch (cmd_field.field_type) {
|
||||||
// switch (cmd_field.field_type) {
|
[]u8, []const u8 => self.list.allocator.free(@field(inner_command, cmd_field.name)),
|
||||||
// []u8, []const u8 => self.list.allocator.destroy(@field(typ, cmd_field.name)),
|
else => {},
|
||||||
// else => {},
|
}
|
||||||
// }
|
}
|
||||||
//}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
self.list.allocator.destroy(cmd_ptr);
|
||||||
}
|
}
|
||||||
self.list.deinit();
|
self.list.deinit();
|
||||||
}
|
}
|
||||||
|
|
15
src/main.zig
15
src/main.zig
|
@ -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 {
|
pub fn doRepl(allocator: std.mem.Allocator, args_it: anytype) !void {
|
||||||
var stdout_file = std.io.getStdOut();
|
var stdout_file = std.io.getStdOut();
|
||||||
const stdout = &stdout_file.writer();
|
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);
|
errdefer allocator.free(scri_path);
|
||||||
defer 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);
|
var runner = runners.Runner.init(allocator, false);
|
||||||
defer runner.deinit();
|
defer runner.deinit();
|
||||||
|
|
||||||
const scri_path = try (args_it.next(allocator) orelse @panic("run: expected scri path"));
|
const scri_path = (args_it.next() orelse @panic("run: expected scri path"));
|
||||||
defer allocator.free(scri_path);
|
|
||||||
|
|
||||||
var file = try std.fs.cwd().openFile(scri_path, .{});
|
var file = try std.fs.cwd().openFile(scri_path, .{});
|
||||||
defer file.close();
|
defer file.close();
|
||||||
|
@ -270,18 +269,18 @@ pub fn main() !void {
|
||||||
defer {
|
defer {
|
||||||
_ = allocator_instance.deinit();
|
_ = 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();
|
_ = args_it.skip();
|
||||||
const cli_command_opt = args_it.next(allocator);
|
const cli_command_opt = args_it.next();
|
||||||
if (cli_command_opt == null) {
|
if (cli_command_opt == null) {
|
||||||
return doHelp();
|
return doHelp();
|
||||||
}
|
}
|
||||||
|
|
||||||
const cli_command = try cli_command_opt.?;
|
const cli_command = cli_command_opt.?;
|
||||||
defer allocator.free(cli_command);
|
|
||||||
|
|
||||||
if (std.mem.eql(u8, cli_command, "help")) {
|
if (std.mem.eql(u8, cli_command, "help")) {
|
||||||
return doHelp();
|
return doHelp();
|
||||||
|
|
Loading…
Reference in New Issue