From 1340862c2875c683e9cc277052c2b2a207e03070 Mon Sep 17 00:00:00 2001 From: jaina heartles Date: Fri, 18 Nov 2022 02:02:24 -0800 Subject: [PATCH] Add It param to ParseResult --- src/template/lib.zig | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/template/lib.zig b/src/template/lib.zig index 56b9946..7c402f9 100644 --- a/src/template/lib.zig +++ b/src/template/lib.zig @@ -123,7 +123,7 @@ const TemplateType = enum { if_block, }; -fn parseTemplate(comptime tokens: TokenIter, comptime template_type: TemplateType) ParseResult([]const TemplateItem) { +fn parseTemplate(comptime tokens: TokenIter, comptime template_type: TemplateType) ParseResult(TokenIter, []const TemplateItem) { comptime { var iter = tokens; var items: []const TemplateItem = &.{}; @@ -177,7 +177,7 @@ fn parseTemplate(comptime tokens: TokenIter, comptime template_type: TemplateTyp } } -fn parseExpression(comptime tokens: TokenIter) ParseResult(Expression) { +fn parseExpression(comptime tokens: TokenIter) ParseResult(TokenIter, Expression) { comptime { var iter = tokens; @@ -203,7 +203,7 @@ fn parseExpression(comptime tokens: TokenIter) ParseResult(Expression) { } } -fn parseControlBlock(comptime tokens: TokenIter) ParseResult(ControlBlock) { +fn parseControlBlock(comptime tokens: TokenIter) ParseResult(TokenIter, ControlBlock) { comptime { var iter = tokens; var first_token: bool = true; @@ -325,7 +325,7 @@ fn endControlBlock(comptime tokens: TokenIter) TokenIter { } } -fn parseForLoop(comptime tokens: TokenIter) ParseResult(ForLoop) { +fn parseForLoop(comptime tokens: TokenIter) ParseResult(TokenIter, ForLoop) { comptime { const iterable = parseExpression(tokens); var iter = iterable.new_iter; @@ -360,7 +360,7 @@ fn parseForLoop(comptime tokens: TokenIter) ParseResult(ForLoop) { } } -fn parseIfStatement(comptime tokens: TokenIter) ParseResult(IfStatement) { +fn parseIfStatement(comptime tokens: TokenIter) ParseResult(TokenIter, IfStatement) { comptime { const condition = parseExpression(tokens); var iter = endControlBlock(condition.new_iter); @@ -371,7 +371,7 @@ fn parseIfStatement(comptime tokens: TokenIter) ParseResult(IfStatement) { } } -fn parseDeref(comptime tokens: TokenIter) ParseResult([]const []const u8) { +fn parseDeref(comptime tokens: TokenIter) ParseResult(TokenIter, []const []const u8) { comptime { var iter = tokens; var fields: []const []const u8 = &.{}; @@ -398,9 +398,9 @@ fn parseDeref(comptime tokens: TokenIter) ParseResult([]const []const u8) { } } -fn ParseResult(comptime T: type) type { +fn ParseResult(comptime It: type, comptime T: type) type { return struct { - new_iter: TokenIter, + new_iter: It, item: T, }; }