authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2023-06-21 18:28:43 -07:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2023-06-21 18:28:43 -07:00
log70d6284bd93fa0e3c6c2310e5e62f1a36535b6ca
tree6682f3f307df172e2d7ea4a35a3293b6d3fc64e8
parent8401a1944fff76034468cbc9daf74f19aabfe8fb

add number literal arguments to custom functions

3 files changed, 11 insertions(+), 1 deletions(-)

src/astgen.zig+8-1
......@@ -1,5 +1,6 @@
11const std = @import("std");
22const Token = @import("./tokenize.zig").Token;
3const extras = @import("extras");
34
45const string = []const u8;
56
......@@ -59,6 +60,7 @@ pub const Fn = struct {
5960pub const Arg = union(enum) {
6061 lookup: []const string,
6162 plain: string,
63 int: u64,
6264};
6365
6466//
......@@ -209,7 +211,12 @@ const Parser = struct {
209211 continue;
210212 }
211213 if (temp.len == 0 and self.nextIs(.word)) {
212 temp = temp ++ &[_]string{self.eat(.word)};
214 const next_word = self.eat(.word);
215 if (extras.matchesAll(u8, next_word, std.ascii.isDigit)) {
216 ret = ret ++ &[_]Arg{.{ .int = std.fmt.parseUnsigned(u64, next_word, 10) catch unreachable }};
217 continue;
218 }
219 temp = temp ++ &[_]string{next_word};
213220 }
214221 if (self.tryEatSymbol(".")) {
215222 temp = temp ++ &[_]string{self.eat(.word)};
src/lib.zig+2
......@@ -251,6 +251,7 @@ fn resolveArg(comptime arg: astgen.Arg, data: anytype, ctx: anytype) ResolveArg(
251251 return switch (arg) {
252252 .plain => |av| av[1 .. av.len - 1],
253253 .lookup => |av| if (comptime std.mem.eql(u8, av[0], "this")) search(av[1..], data) else search(av, ctx),
254 .int => |av| av,
254255 };
255256}
256257
......@@ -258,6 +259,7 @@ fn ResolveArg(comptime arg: astgen.Arg, comptime This: type, comptime Ctx: type)
258259 return switch (arg) {
259260 .plain => string,
260261 .lookup => |av| if (comptime std.mem.eql(u8, av[0], "this")) FieldSearch(This, av[1..]) else FieldSearch(Ctx, av),
262 .int => u64,
261263 };
262264}
263265
zig.mod+1
......@@ -5,3 +5,4 @@ license: AGPL-3.0
55description: An HTML preprocessor with a builtin template engine.
66dependencies:
77 - src: git https://github.com/kivikakk/htmlentities.zig
8 - src: git https://github.com/nektro/zig-extras