From 4bbe98001412c0bbffb62b7823a8d1ed5f2093ad Mon Sep 17 00:00:00 2001 From: Luna Date: Sun, 7 Jul 2019 23:03:55 -0300 Subject: [PATCH 1/3] add basic lang parse code --- src/lang.zig | 43 +++++++++++++++++++++++++++++++++++++++++++ src/main.zig | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 src/lang.zig diff --git a/src/lang.zig b/src/lang.zig new file mode 100644 index 0000000..bc22627 --- /dev/null +++ b/src/lang.zig @@ -0,0 +1,43 @@ +const std = @import("std"); + +pub const CommandType = enum { + Noop, + Load, + Amp, + Quicksave, +}; + +pub const Command = struct { + command: CommandType, + args: []const u8, + + pub fn print(self: *const Command) void { + std.debug.warn("cmd:{} args:{}\n", self.command, self.args); + } +}; + +pub const CommandList = std.ArrayList(Command); + +pub const Lang = struct { + allocator: *std.mem.Allocator, + + pub fn init(allocator: *std.mem.Allocator) Lang { + return Lang{ .allocator = allocator }; + } + + pub fn parse(self: *Lang, data: []const u8) CommandList { + var splitted_it = std.mem.separate(data, ";"); + var cmds = CommandList.init(self.allocator); + + while (splitted_it.next()) |stmt_orig| { + var stmt = std.mem.trimRight(u8, stmt_orig, "\n"); + + if (stmt.len == 0) continue; + + // TODO parse stmt + std.debug.warn("full cmd: '{}'\n", stmt); + } + + return cmds; + } +}; diff --git a/src/main.zig b/src/main.zig index fc61a2c..262e475 100644 --- a/src/main.zig +++ b/src/main.zig @@ -16,6 +16,7 @@ // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. const std = @import("std"); +const langs = @import("lang.zig"); const c = @cImport({ @cInclude("assert.h"); @@ -302,6 +303,37 @@ pub fn main() !void { var arena = std.heap.ArenaAllocator.init(std.heap.c_allocator); const allocator = &arena.allocator; + var lang = langs.Lang.init(allocator); + //defer lang.deinit(); + + var args_it = std.process.args(); + + const exe_name = try (args_it.next(allocator) orelse @panic("expected exe name")); + + // args[1] is the path to scri file + const scri_path = try (args_it.next(allocator) orelse @panic("expected scri path")); + + std.debug.warn("path: '{}'\n", scri_path); + + var file = try std.fs.File.openRead(scri_path); + defer file.close(); + + // sadly, we read it all into memory. such is life + const total_bytes = try file.getEndPos(); + var data = try allocator.alloc(u8, total_bytes); + _ = try file.read(data); + + var cmds = lang.parse(data); + var it = cmds.iterator(); + while (it.next()) |cmd| { + cmd.print(); + } +} + +pub fn oldMain() !void { + var arena = std.heap.ArenaAllocator.init(std.heap.c_allocator); + const allocator = &arena.allocator; + var in_path: ?[]u8 = null; var out_path: ?[]u8 = null; From be280d44f3d6070506c442be78b16e8c5edb2900 Mon Sep 17 00:00:00 2001 From: Luna Date: Mon, 8 Jul 2019 00:09:34 -0300 Subject: [PATCH 2/3] basic parser --- src/lang.zig | 46 ++++++++++++++++++++++++++++++++++++++++------ src/main.zig | 2 +- 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/src/lang.zig b/src/lang.zig index bc22627..b76e337 100644 --- a/src/lang.zig +++ b/src/lang.zig @@ -5,18 +5,36 @@ pub const CommandType = enum { Load, Amp, Quicksave, + + // TODO proper errs + Error, }; pub const Command = struct { command: CommandType, - args: []const u8, + args: ArgList, pub fn print(self: *const Command) void { - std.debug.warn("cmd:{} args:{}\n", self.command, self.args); + std.debug.warn("cmd:{}\n", self.command); } }; -pub const CommandList = std.ArrayList(Command); +pub const CommandList = std.ArrayList(*Command); +pub const ArgList = std.ArrayList([]const u8); + +pub fn commandToCmdType(command: []const u8) CommandType { + if (std.mem.eql(u8, command, "noop")) { + return .Noop; + } else if (std.mem.eql(u8, command, "load")) { + return .Load; + } else if (std.mem.eql(u8, command, "amp")) { + return .Amp; + } else if (std.mem.eql(u8, command, "quicksave")) { + return .Quicksave; + } else { + return .Error; + } +} pub const Lang = struct { allocator: *std.mem.Allocator, @@ -25,7 +43,7 @@ pub const Lang = struct { return Lang{ .allocator = allocator }; } - pub fn parse(self: *Lang, data: []const u8) CommandList { + pub fn parse(self: *Lang, data: []const u8) !CommandList { var splitted_it = std.mem.separate(data, ";"); var cmds = CommandList.init(self.allocator); @@ -34,10 +52,26 @@ pub const Lang = struct { if (stmt.len == 0) continue; - // TODO parse stmt - std.debug.warn("full cmd: '{}'\n", stmt); + // TODO better tokenizer instead of just tokenize(" "); + var tok_it = std.mem.tokenize(stmt, " "); + + // TODO send errors + var command = tok_it.next().?; + var ctype = commandToCmdType(command); + var args = ArgList.init(self.allocator); + + while (tok_it.next()) |arg| { + try args.append(arg); + } + + // construct final Command based on command + var cmd_ptr = try self.allocator.create(Command); + cmd_ptr.* = Command{ .command = ctype, .args = args }; + try cmds.append(cmd_ptr); } return cmds; } }; + +// TODO tests diff --git a/src/main.zig b/src/main.zig index 262e475..f75c1ef 100644 --- a/src/main.zig +++ b/src/main.zig @@ -323,7 +323,7 @@ pub fn main() !void { var data = try allocator.alloc(u8, total_bytes); _ = try file.read(data); - var cmds = lang.parse(data); + var cmds = try lang.parse(data); var it = cmds.iterator(); while (it.next()) |cmd| { cmd.print(); From ac4624ae58d86acba1ed1a1b508ec21e5725e331 Mon Sep 17 00:00:00 2001 From: Luna Date: Mon, 8 Jul 2019 00:23:12 -0300 Subject: [PATCH 3/3] add better errors --- src/lang.zig | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/src/lang.zig b/src/lang.zig index b76e337..0916aeb 100644 --- a/src/lang.zig +++ b/src/lang.zig @@ -1,13 +1,15 @@ const std = @import("std"); +pub const ParseError = error{ + NoCommandGiven, + UnknownCommand, +}; + pub const CommandType = enum { Noop, Load, Amp, Quicksave, - - // TODO proper errs - Error, }; pub const Command = struct { @@ -22,17 +24,18 @@ pub const Command = struct { pub const CommandList = std.ArrayList(*Command); pub const ArgList = std.ArrayList([]const u8); -pub fn commandToCmdType(command: []const u8) CommandType { +pub fn commandToCmdType(command: []const u8) ParseError!CommandType { if (std.mem.eql(u8, command, "noop")) { - return .Noop; + return CommandType.Noop; } else if (std.mem.eql(u8, command, "load")) { - return .Load; + return CommandType.Load; } else if (std.mem.eql(u8, command, "amp")) { - return .Amp; + return CommandType.Amp; } else if (std.mem.eql(u8, command, "quicksave")) { - return .Quicksave; + return CommandType.Quicksave; } else { - return .Error; + std.debug.warn("Unknown command: '{}'\n", command); + return ParseError.UnknownCommand; } } @@ -55,9 +58,11 @@ pub const Lang = struct { // TODO better tokenizer instead of just tokenize(" "); var tok_it = std.mem.tokenize(stmt, " "); - // TODO send errors - var command = tok_it.next().?; - var ctype = commandToCmdType(command); + var cmd_opt = tok_it.next(); + if (cmd_opt == null) return ParseError.NoCommandGiven; + + var command = cmd_opt.?; + var ctype = try commandToCmdType(command); var args = ArgList.init(self.allocator); while (tok_it.next()) |arg| {