From 5713df2a8b4d97756d505ab76a354d79d073a91b Mon Sep 17 00:00:00 2001 From: Luna Date: Thu, 23 Jul 2020 17:17:06 -0300 Subject: [PATCH] more fixes --- src/ast_printer.zig | 8 ++++---- src/codegen/llvm.zig | 2 +- src/parsers.zig | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ast_printer.zig b/src/ast_printer.zig index 6b8f85c..69d7629 100644 --- a/src/ast_printer.zig +++ b/src/ast_printer.zig @@ -345,7 +345,7 @@ fn prettyType(typ: SymbolUnderlyingType) []const u8 { pub fn printScope(scope: *Scope, ident: usize) void { print(ident, "scope '{}' at addr {}\n", .{ scope.id, @ptrToInt(scope) }); - while (scope.env.items()) |entry| { + for (scope.env.items()) |entry| { print(ident + 1, "sym: {}, typ: {}\n", .{ entry.key, prettyType(entry.value) }); } @@ -366,10 +366,10 @@ pub fn printContext(ctx: CompilationContext) void { }); for (fn_sym.decl.params.items) |param| { - var param_kv = fn_sym.parameters.get(param.name.lexeme).?; + var actual_param = fn_sym.parameters.get(param.name.lexeme).?; std.debug.warn("\tparameter {} typ {}\n", .{ - param_kv.key, - prettyType(param_kv.value.typ), + param.name.lexeme, + prettyType(actual_param.typ), }); } diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig index 890b64d..f0894fb 100644 --- a/src/codegen/llvm.zig +++ b/src/codegen/llvm.zig @@ -65,7 +65,7 @@ pub const Codegen = struct { } fn emitForVariableType(self: *@This(), vari: anytype, get: anytype, kv: anytype) !llvm.LLVMValueRef { - var sym = kv.value; + var sym = kv; switch (sym.*) { .Enum => |map| { diff --git a/src/parsers.zig b/src/parsers.zig index d8a2448..db41947 100644 --- a/src/parsers.zig +++ b/src/parsers.zig @@ -215,7 +215,7 @@ pub const Parser = struct { } /// check() against multiple tokens - fn compareAnyOf(self: *@This(), ttypes: []TokenType) bool { + fn compareAnyOf(self: *@This(), ttypes: []const TokenType) bool { for (ttypes) |typ| { if (self.check(typ)) return true; }