Other small updates

Author: der-teufel-programming

src/Diagnostics.zig

@@ -6,11 +6,11 @@ const Location = @import("Location.zig");
 const Self = @This();
 
 memory: std.heap.ArenaAllocator,
-errors: std.ArrayListUnmanaged(Error) = .{},
+errors: std.ArrayList(Error) = .{},
 
 pub fn init(allocator: std.mem.Allocator) Self {
     return Self{
-        .memory = std.heap.ArenaAllocator.init(allocator),
+        .memory = .init(allocator),
     };
 }
 
@@ -22,20 +22,26 @@ pub fn deinit(self: *Self) void {
 pub fn print(self: Self, writer: anytype) !void {
     for (self.errors.items) |err| {
         const source = err.location.source orelse "???";
-        try writer.print("{s}:{d}:{d}: {s}: {s}\n", .{
+        try writer.print("{s}:{d}:{d}: {t}: {s}\n", .{
             source,
             err.location.line,
             err.location.column,
-            @tagName(err.level),
+            err.level,
             err.message,
         });
     }
 }
 
-pub fn emit(self: *Self, location: Location, level: Error.Level, comptime fmt: []const u8, args: anytype) !void {
+pub fn emit(
+    self: *Self,
+    location: Location,
+    level: Error.Level,
+    comptime fmt: []const u8,
+    args: anytype,
+) !void {
     const allocator = self.memory.allocator();
 
-    const str = try std.fmt.allocPrintZ(allocator, fmt, args);
+    const str = try std.fmt.allocPrintSentinel(allocator, fmt, args, 0);
     errdefer allocator.free(str);
 
     try self.errors.append(allocator, Error{

src/Location.zig

@@ -13,11 +13,12 @@ pub fn min(a: Location, b: Location) Location {
         if (!std.mem.eql(u8, a.source.?, b.source.?))
             @panic("a and b must be from the same source file!");
     }
-    var loc = Location{
+    var loc: Location = .{
         .line = undefined,
         .column = undefined,
         .source = a.source orelse b.source,
     };
+
     if (a.line < b.line) {
         loc.line = a.line;
         loc.column = a.column;
@@ -36,11 +37,12 @@ pub fn max(a: Location, b: Location) Location {
         if (!std.mem.eql(u8, a.source.?, b.source.?))
             @panic("a and b must be from the same source file!");
     }
-    var loc = Location{
+    var loc: Location = .{
         .line = undefined,
         .column = undefined,
         .source = a.source orelse b.source,
     };
+
     if (a.line > b.line) {
         loc.line = a.line;
         loc.column = a.column;

src/StringCache.zig

@@ -11,7 +11,7 @@ items: std.StringHashMapUnmanaged(void),
 
 pub fn init(allocator: std.mem.Allocator) StringCache {
     return StringCache{
-        .arena = std.heap.ArenaAllocator.init(allocator),
+        .arena = .init(allocator),
         .items = .{},
     };
 }

src/parser_core.zig

@@ -26,7 +26,7 @@ pub fn ParserCore(comptime TokenizerT: type, comptime ignore_list: anytype) type
         /// The core will only reference the Tokenizer and will modify
         /// it's state.
         pub fn init(tokenizer: *Tokenizer) Self {
-            return Self{
+            return .{
                 .tokenizer = tokenizer,
             };
         }

src/tokenizer.zig

@@ -13,7 +13,7 @@ pub fn Pattern(comptime TokenType: type) type {
         match: Matcher,
 
         pub fn create(token_type: TokenType, match: Matcher) Self {
-            return Self{
+            return .{
                 .type = token_type,
                 .match = match,
             };
@@ -40,7 +40,7 @@ pub fn Tokenizer(comptime TokenTypeT: type, comptime patterns: []const Pattern(T
             return Self{
                 .source = source,
                 .offset = 0,
-                .current_location = Location{
+                .current_location = .{
                     .source = file_name,
                     .line = 1,
                     .column = 1,
@@ -49,7 +49,7 @@ pub fn Tokenizer(comptime TokenTypeT: type, comptime patterns: []const Pattern(T
         }
 
         pub fn saveState(self: Self) State {
-            return State{
+            return .{
                 .offset = self.offset,
                 .location = self.current_location,
             };
@@ -65,17 +65,18 @@ pub fn Tokenizer(comptime TokenTypeT: type, comptime patterns: []const Pattern(T
             const rest = self.source[self.offset..];
             if (rest.len == 0)
                 return null;
-            const maybe_token = for (patterns) |pat| {
+            const maybe_token: ?Token = for (patterns) |pat| {
                 if (pat.match(rest)) |len| {
                     if (len > 0) {
-                        break Token{
+                        break .{
                             .location = self.current_location,
                             .text = rest[0..len],
                             .type = pat.type,
                         };
                     }
                 }
             } else null;
+
             if (maybe_token) |token| {
                 self.offset += token.text.len;
                 self.current_location.advance(token.text);