add cloning of Runner and Image + basic Runner REPL logic

This commit is contained in:
Luna 2019-09-10 21:31:23 -03:00
parent 88a73e64d8
commit 67c42e39d4
3 changed files with 53 additions and 6 deletions

View file

@ -131,7 +131,6 @@ pub const Image = struct {
/// Open a BMP image for later. /// Open a BMP image for later.
pub fn open(allocator: *std.mem.Allocator, path: []const u8) !*Image { pub fn open(allocator: *std.mem.Allocator, path: []const u8) !*Image {
var in_fmt = mkSfInfo(); var in_fmt = mkSfInfo();
var sndfile = try sopen(allocator, path, c.SFM_READ, &in_fmt); var sndfile = try sopen(allocator, path, c.SFM_READ, &in_fmt);
var image = try allocator.create(Image); var image = try allocator.create(Image);
@ -149,6 +148,26 @@ pub const Image = struct {
return image; return image;
} }
pub fn clone(self: *Image) !*Image {
var in_fmt = mkSfInfo();
// clone sndfile
var sndfile = try sopen(self.allocator, self.path, c.SFM_READ, &in_fmt);
var image = try allocator.create(Image);
std.debug.assert(in_fmt.frames > i64(0));
std.debug.assert(in_fmt.seekable == i32(1));
image.* = Image{
.allocator = self.allocator,
.sndfile = sndfile,
.path = self.path,
.curpath = self.curpath,
.frames = @intCast(usize, in_fmt.frames),
};
return image;
}
pub fn close(self: *Image) void { pub fn close(self: *Image) void {
//self.allocator.free(self.path); //self.allocator.free(self.path);
//self.allocator.free(self.curpath); //self.allocator.free(self.curpath);

View file

@ -8,6 +8,13 @@ test "scritcher" {
_ = @import("runner.zig"); _ = @import("runner.zig");
} }
fn wrapInCmdList(allocator: *std.mem.Allocator, cmd: langs.Command) !langs.CommandList {
var cmds = try langs.CommandList.init(allocator);
try cmds.append(cmd);
return cmds;
}
pub fn doRepl(allocator: *std.mem.Allocator, args_it: var) !void { pub fn doRepl(allocator: *std.mem.Allocator, args_it: var) !void {
var stdout_file = try std.io.getStdOut(); var stdout_file = try std.io.getStdOut();
const stdout = &stdout_file.outStream().stream; const stdout = &stdout_file.outStream().stream;
@ -24,30 +31,38 @@ pub fn doRepl(allocator: *std.mem.Allocator, args_it: var) !void {
// now have a 'repl' argument right before it. to counteract that, the // now have a 'repl' argument right before it. to counteract that, the
// initial repl buffer contains 'load :1' instead. // initial repl buffer contains 'load :1' instead.
var cmds = langs.CommandList.init(allocator);
defer cmds.deinit();
var loadargs = langs.ArgList.init(allocator); var loadargs = langs.ArgList.init(allocator);
defer loadargs.deinit(); defer loadargs.deinit();
try loadargs.append(":1"); try loadargs.append(":1");
try cmds.append(langs.Command{ var cmds = try wrapInCmdList(allocator, langs.Command{
.command = .Load, .command = .Load,
.args = loadargs, .args = loadargs,
}); });
// TODO start a runner and keep it hot defer cmds.deinit();
// we keep // we keep
// - a CommandList with the full commands we have right now // - a CommandList with the full commands we have right now
// - a Command with the current last typed successful command // - a Command with the current last typed successful command
// - one runner that contains the current full state of the image
// as if the current cmds was ran over it (TODO better wording)
// - one runner that gets copied from the original on every new
// command the user issues
var lang = langs.Lang.init(allocator); var lang = langs.Lang.init(allocator);
defer lang.deinit(); defer lang.deinit();
var current: langs.Command = undefined; var current: langs.Command = undefined;
var runner = runners.Runner.init(allocator);
defer runner.deinit();
// run the load command
try runner.runCommands(cmds, true);
while (true) { while (true) {
lang.reset(); lang.reset();
try stdout.print("> "); try stdout.print("> ");
@ -60,6 +75,10 @@ pub fn doRepl(allocator: *std.mem.Allocator, args_it: var) !void {
if (std.mem.eql(u8, line, "push")) { if (std.mem.eql(u8, line, "push")) {
try cmds.append(current); try cmds.append(current);
var cmds_wrapped = try wrapInCmdList(allocator, current);
defer cmds_wrapped.deinit();
try runner.runCommands(cmds_wrapped, true);
continue; continue;
} else if (std.mem.eql(u8, line, "list")) { } else if (std.mem.eql(u8, line, "list")) {
try printer.printList(cmds, stdout); try printer.printList(cmds, stdout);
@ -75,6 +94,11 @@ pub fn doRepl(allocator: *std.mem.Allocator, args_it: var) !void {
continue; continue;
}; };
current = cmds_parsed.at(0); current = cmds_parsed.at(0);
var runner_clone = try runner.clone();
defer runner_clone.deinit();
try runner_clone.runCommands(cmds_parsed, true);
} }
} }

View file

@ -33,6 +33,10 @@ pub const Runner = struct {
} }
} }
pub fn clone(self: *Runner) *Runner {
return Runner{ .allocator = allocator, .image = try image.clone() };
}
fn resolveArg(self: *Runner, load_path: []const u8) ![]const u8 { fn resolveArg(self: *Runner, load_path: []const u8) ![]const u8 {
if (load_path[0] == ':') { if (load_path[0] == ':') {
// parse the index from 1 to end // parse the index from 1 to end