From 736277db049fdffb6f8d3eddfde1bcd4c77fbc48 Mon Sep 17 00:00:00 2001 From: Luna Date: Sun, 8 Sep 2019 23:28:09 -0300 Subject: [PATCH 1/4] add parsing of given repl line --- src/lang.zig | 12 +++++------- src/main.zig | 12 +++++++++++- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/lang.zig b/src/lang.zig index 3af632c..fe31d11 100644 --- a/src/lang.zig +++ b/src/lang.zig @@ -3,10 +3,8 @@ const std = @import("std"); const plugin = @import("plugin.zig"); pub const ParseError = error{ - NoCommandGiven, - UnknownCommand, + OutOfMemory, ArgRequired, - FloatParseFail, ParseFail, }; @@ -261,7 +259,7 @@ pub const Lang = struct { fn expectAny(self: *Lang, count: usize, args: ArgList) !void { if (args.len != count) { - std.debug.warn("expected {} arguments, found {}\n", count, args.len); + self.doError("expected {} arguments, found {}", count, args.len); return error.ArgRequired; } } @@ -274,7 +272,7 @@ pub const Lang = struct { var i: usize = 0; if (args.len != count) { - std.debug.warn("expected {} arguments, found {}\n", count, args.len); + self.doError("expected {} arguments, found {}", count, args.len); return error.ArgRequired; } @@ -319,7 +317,7 @@ pub const Lang = struct { self.has_error = true; } - pub fn parse(self: *Lang, data: []const u8) !CommandList { + pub fn parse(self: *Lang, data: []const u8) ParseError!CommandList { var splitted_it = std.mem.separate(data, ";"); try self.fillKeywords(); var cmds = CommandList.init(self.allocator); @@ -359,7 +357,7 @@ pub const Lang = struct { // construct final Command based on command var cmd = Command{ .command = ctype, .args = args }; self.validateCommand(cmd) catch |err| { - self.doError("Unknown command '{}' (length {})", command, command.len); + //self.doError("error validating command '{}': {}", command, err); continue; }; diff --git a/src/main.zig b/src/main.zig index fe3ce9a..1ac9680 100644 --- a/src/main.zig +++ b/src/main.zig @@ -8,6 +8,9 @@ test "scritcher" { } pub fn doRepl(allocator: *std.mem.Allocator, args_it: var) !void { + var stdout_file = try std.io.getStdOut(); + const stdout = &stdout_file.outStream().stream; + const scri_path = try (args_it.next(allocator) orelse @panic("expected scri path")); // the thing here is that 'load :0' would load the scri_path, since we @@ -29,6 +32,9 @@ pub fn doRepl(allocator: *std.mem.Allocator, args_it: var) !void { // TODO start a runner and keep it hot + var lang = langs.Lang.init(allocator); + defer lang.deinit(); + while (true) { try stdout.print("> "); @@ -38,7 +44,11 @@ pub fn doRepl(allocator: *std.mem.Allocator, args_it: var) !void { return err; }; - // TODO parse the line through langs.parse, then add the command to cmds + var cmds_parsed = lang.parse(line) catch |err| { + std.debug.warn("repl: error while parsing: {}\n", err); + continue; + }; + try cmds.append(cmds_parsed.at(0)); // TODO save the line to scri_file? or should we have a special `push` // to do so? From 8b67ccc1bfc0944720d3ffc0cc583658f1c07a04 Mon Sep 17 00:00:00 2001 From: Luna Date: Tue, 10 Sep 2019 11:45:04 -0300 Subject: [PATCH 2/4] add printing of commands to any stream --- src/main.zig | 4 ++++ src/printer.zig | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 src/printer.zig diff --git a/src/main.zig b/src/main.zig index 1ac9680..5c414a8 100644 --- a/src/main.zig +++ b/src/main.zig @@ -1,6 +1,7 @@ const std = @import("std"); const langs = @import("lang.zig"); const runners = @import("runner.zig"); +const printer = @import("printer.zig"); test "scritcher" { _ = @import("lang.zig"); @@ -52,6 +53,9 @@ pub fn doRepl(allocator: *std.mem.Allocator, args_it: var) !void { // TODO save the line to scri_file? or should we have a special `push` // to do so? + + // note this is debug + try printer.printList(cmds, stdout); } } diff --git a/src/printer.zig b/src/printer.zig new file mode 100644 index 0000000..29aeb9b --- /dev/null +++ b/src/printer.zig @@ -0,0 +1,23 @@ +const langs = @import("lang.zig"); + +pub fn printList(list: langs.CommandList, stream: var) !void { + for (list.toSlice()) |cmd| { + var command = switch (cmd.command) { + .Noop => "noop", + .Load => "load", + .Quicksave => "quicksave", + .RunQS => "runqs", + + // TODO rest of commands + else => unreachable, + }; + + try stream.print("{}", command); + + for (cmd.args.toSlice()) |arg| { + try stream.print(" {}", arg); + } + + try stream.write(";\n"); + } +} From c90590e3b53f4953569dec8a128a02f4cd7c31b7 Mon Sep 17 00:00:00 2001 From: Luna Date: Tue, 10 Sep 2019 12:12:10 -0300 Subject: [PATCH 3/4] add Lang.reset, open scri_file and write current commands to it --- src/lang.zig | 5 +++++ src/main.zig | 14 +++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/lang.zig b/src/lang.zig index fe31d11..9724dfb 100644 --- a/src/lang.zig +++ b/src/lang.zig @@ -158,6 +158,11 @@ pub const Lang = struct { self.keywords.deinit(); } + pub fn reset(self: *Lang) void { + self.has_error = false; + self.line = 0; + } + fn fillKeywords(self: *Lang) !void { _ = try self.keywords.put("noop", .Noop); _ = try self.keywords.put("load", .Load); diff --git a/src/main.zig b/src/main.zig index 5c414a8..c0af701 100644 --- a/src/main.zig +++ b/src/main.zig @@ -14,6 +14,12 @@ pub fn doRepl(allocator: *std.mem.Allocator, args_it: var) !void { const scri_path = try (args_it.next(allocator) orelse @panic("expected scri path")); + var file = try std.fs.File.openWrite(scri_path); + defer file.close(); + + var out = file.outStream(); + var stream = &out.stream; + // the thing here is that 'load :0' would load the scri_path, since we // now have a 'repl' argument right before it. to counteract that, the // initial repl buffer contains 'load :1' instead. @@ -41,7 +47,7 @@ pub fn doRepl(allocator: *std.mem.Allocator, args_it: var) !void { var buffer = try std.Buffer.init(allocator, ""[0..]); var line = std.io.readLine(&buffer) catch |err| { - if (err == error.EndOfStream) return; + if (err == error.EndOfStream) break; return err; }; @@ -51,11 +57,13 @@ pub fn doRepl(allocator: *std.mem.Allocator, args_it: var) !void { }; try cmds.append(cmds_parsed.at(0)); + lang.reset(); + // TODO save the line to scri_file? or should we have a special `push` // to do so? - // note this is debug - try printer.printList(cmds, stdout); + try file.seekTo(0); + try printer.printList(cmds, stream); } } From 058bf8deb90c21c3d318df79af173a2b527de439 Mon Sep 17 00:00:00 2001 From: Luna Date: Tue, 10 Sep 2019 14:51:41 -0300 Subject: [PATCH 4/4] add push and list commands --- src/main.zig | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main.zig b/src/main.zig index c0af701..1c7acaf 100644 --- a/src/main.zig +++ b/src/main.zig @@ -43,6 +43,7 @@ pub fn doRepl(allocator: *std.mem.Allocator, args_it: var) !void { defer lang.deinit(); while (true) { + lang.reset(); try stdout.print("> "); var buffer = try std.Buffer.init(allocator, ""[0..]); @@ -51,19 +52,20 @@ pub fn doRepl(allocator: *std.mem.Allocator, args_it: var) !void { return err; }; + if (std.mem.eql(u8, line, "push")) { + try file.seekTo(0); + try printer.printList(cmds, stream); + continue; + } else if (std.mem.eql(u8, line, "list")) { + try printer.printList(cmds, stream); + continue; + } + var cmds_parsed = lang.parse(line) catch |err| { std.debug.warn("repl: error while parsing: {}\n", err); continue; }; try cmds.append(cmds_parsed.at(0)); - - lang.reset(); - - // TODO save the line to scri_file? or should we have a special `push` - // to do so? - - try file.seekTo(0); - try printer.printList(cmds, stream); } }