lang: add basic argument validation
This commit is contained in:
parent
9fd41a61bf
commit
422cd2502c
1 changed files with 39 additions and 1 deletions
40
src/lang.zig
40
src/lang.zig
|
@ -6,6 +6,7 @@ pub const ParseError = error{
|
||||||
NoCommandGiven,
|
NoCommandGiven,
|
||||||
UnknownCommand,
|
UnknownCommand,
|
||||||
ArgRequired,
|
ArgRequired,
|
||||||
|
FloatParseFail,
|
||||||
};
|
};
|
||||||
|
|
||||||
pub const CommandType = enum {
|
pub const CommandType = enum {
|
||||||
|
@ -232,6 +233,40 @@ pub const Lang = struct {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn expectSingle(self: *Lang, args: ArgList) !void {
|
||||||
|
if (args.len != 1) {
|
||||||
|
std.debug.warn("expected 1 argument, found {}\n", args.len);
|
||||||
|
return error.ArgRequired;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn expectFloat(self: *Lang, count: usize, args: ArgList) !void {
|
||||||
|
var i: usize = 0;
|
||||||
|
|
||||||
|
if (args.len != count) {
|
||||||
|
std.debug.warn("expected {} arguments, found {}\n", count, args.len);
|
||||||
|
return error.ArgRequired;
|
||||||
|
}
|
||||||
|
|
||||||
|
while (i < count) : (i += 1) {
|
||||||
|
var arg = args.at(i);
|
||||||
|
|
||||||
|
_ = std.fmt.parseFloat(f32, arg) catch |err| {
|
||||||
|
std.debug.warn("failed to parse f32: {}\n", err);
|
||||||
|
return error.FloatParseFail;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn validateCommand(self: *Lang, cmd: *Command) !void {
|
||||||
|
switch (cmd.command) {
|
||||||
|
.Quicksave, .Noop => {},
|
||||||
|
.Load, .RunQS => try self.expectSingle(cmd.args),
|
||||||
|
.Amp => try self.expectFloat(3, cmd.args),
|
||||||
|
else => std.debug.warn("WARN unchecked command {}\n", cmd.command),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
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 splitted_it = std.mem.separate(data, ";");
|
||||||
try self.fillKeywords();
|
try self.fillKeywords();
|
||||||
|
@ -261,14 +296,17 @@ pub const Lang = struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
var args = ArgList.init(self.allocator);
|
var args = ArgList.init(self.allocator);
|
||||||
|
|
||||||
while (tok_it.next()) |arg| {
|
while (tok_it.next()) |arg| {
|
||||||
try args.append(arg);
|
try args.append(arg);
|
||||||
}
|
}
|
||||||
|
|
||||||
// construct final Command based on command
|
// construct final Command based on command
|
||||||
var cmd_ptr = try self.allocator.create(Command);
|
var cmd_ptr = try self.allocator.create(Command);
|
||||||
|
errdefer self.allocator.destroy(cmd_ptr);
|
||||||
|
|
||||||
cmd_ptr.* = Command{ .command = ctype, .args = args };
|
cmd_ptr.* = Command{ .command = ctype, .args = args };
|
||||||
|
try self.validateCommand(cmd_ptr);
|
||||||
|
|
||||||
try cmds.append(cmd_ptr);
|
try cmds.append(cmd_ptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue