Remove unnecessary error logic

[zlox.git] / src / main.zig

diff --git a/src/main.zig b/src/main.zig
index ec4478bce4aa8e614b020308006ef128d46f51ae..a17dbd73fe1b6e874ef360d0b4795c5b1b1220a9 100644 (file)
--- a/src/main.zig
+++ b/src/main.zig
@@ -1,6 +1,9 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 const Scanner = @import("Scanner.zig");
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 const Scanner = @import("Scanner.zig");

+const Token = @import("Token.zig");
+const Parser = @import("Parser.zig");
+const ast_printer = @import("ast_printer.zig");

 
 var hadError = false;
 
 
 var hadError = false;
 


@@ -53,17 +56,22 @@ fn runPrompt(allocator: Allocator) !void {
 }
 
 fn run(allocator: Allocator, source: []const u8) !void {
 }
 
 fn run(allocator: Allocator, source: []const u8) !void {

-    var scanner = Scanner.init(source);
-    const tokens = try scanner.scanTokens(allocator);
+    var scanner = Scanner.init(allocator, source);
+    const tokens = try scanner.scanTokens();

     defer allocator.free(tokens);
     defer allocator.free(tokens);

+    var parser = try Parser.init(allocator, tokens);
+    defer parser.deinit();
+    const expression = try parser.parse();

 
 

-    // For now, just print the tokens.
-    for (tokens) |token| {
-        std.debug.print("{f}\n", .{token});
-    }
+    // Stop if there was a syntax error.
+    if (hadError) return;
+
+    const printed = try ast_printer.print(allocator, expression.?);
+    defer allocator.free(printed);
+    std.debug.print("{s}\n", .{printed});

 }
 
 }
 

-pub fn @"error"(line: u32, message: []const u8) !void {
+pub fn scanError(line: u32, message: []const u8) !void {

     try report(line, "", message);
 }
 
     try report(line, "", message);
 }
 


@@ -76,3 +84,11 @@ fn report(line: u32, where: []const u8, message: []const u8) !void {
     try stderr.flush();
     hadError = true;
 }
     try stderr.flush();
     hadError = true;
 }

+
+pub fn parseError(allocator: Allocator, token: Token, message: []const u8) !void {
+    if (token.type == .eof) {
+        try report(token.line, " at end", message);
+    } else {
+        try report(token.line, try std.fmt.allocPrint(allocator, " at '{s}'", .{token.lexeme}), message);
+    }
+}