From 1a3bdc7592686e6a3634c250aa0a104876164f4d Mon Sep 17 00:00:00 2001
From: Fernando Araoz <fernando@araozu.dev>
Date: Mon, 27 Jan 2025 19:34:24 -0500
Subject: [PATCH] refactor: return null on expression unmatch

---
 src/02_syntax/expression.zig | 24 +++++++++++++-----------
 src/02_syntax/variable.zig   |  5 +++--
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/02_syntax/expression.zig b/src/02_syntax/expression.zig
index 1e58a62..f5aa43e 100644
--- a/src/02_syntax/expression.zig
+++ b/src/02_syntax/expression.zig
@@ -11,12 +11,12 @@ pub const Expression = union(enum) {
     /// Attempts to parse an expression from a token stream.
     ///
     /// Receives a pointer to the memory for initialization
-    pub fn init(self: *@This(), tokens: *const std.ArrayList(Token), pos: usize) error{Unmatched}!void {
+    pub fn init(self: *@This(), tokens: *const std.ArrayList(Token), pos: usize) ?void {
         std.debug.assert(pos < tokens.items.len);
 
         const t = tokens.items[pos];
         if (t.token_type != TokenType.Int) {
-            return error.Unmatched;
+            return null;
         }
 
         self.* = .{
@@ -33,9 +33,12 @@ test "should parse expression" {
     defer tokens.deinit();
 
     var expr: Expression = undefined;
-    try expr.init(&tokens, 0);
-    try std.testing.expectEqualDeep("322", expr.number.value);
-    try std.testing.expectEqualDeep(TokenType.Int, expr.number.token_type);
+    if (expr.init(&tokens, 0)) |_| {
+        try std.testing.expectEqualDeep("322", expr.number.value);
+        try std.testing.expectEqualDeep(TokenType.Int, expr.number.token_type);
+        return;
+    }
+    try std.testing.expect(false);
 }
 
 test "should fail on non expression" {
@@ -46,11 +49,10 @@ test "should fail on non expression" {
     defer tokens.deinit();
 
     var expr: Expression = undefined;
-    expr.init(&tokens, 0) catch |err| {
-        try std.testing.expectEqual(ParseError.Unmatched, err);
-        return;
-    };
+    if (expr.init(&tokens, 0)) |_| {
+        std.debug.print("v: {s}", .{expr.number.value});
+        try std.testing.expect(false);
+    }
 
-    std.debug.print("v: {s}", .{expr.number.value});
-    try std.testing.expect(false);
+    return;
 }
diff --git a/src/02_syntax/variable.zig b/src/02_syntax/variable.zig
index 7f02f99..7455616 100644
--- a/src/02_syntax/variable.zig
+++ b/src/02_syntax/variable.zig
@@ -48,9 +48,10 @@ pub const VariableBinding = struct {
             return ParseError.OutOfMemory;
         };
         errdefer allocator.destroy(exp);
-        exp.init(tokens, pos + 3) catch {
+        const res = exp.init(tokens, pos + 3);
+        if (res == null) {
             return ParseError.Error;
-        };
+        }
 
         // return
         target.* = .{