fix: upcasts

kamva9697 · Dec 17, 2023 · 6a0ace8 · 6a0ace8
1 parent 2edda48
commit 6a0ace8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/src/object.zig b/src/object.zig
@@ -22,7 +22,7 @@ pub const Object = struct {
         Function,
         Error,
 
-        pub fn Type(comptime ty: ObjectType) type {
+        pub inline fn Type(comptime ty: ObjectType) type {
             return switch (ty) {
                 .Integer => Integer,
                 .Boolean => Boolean,
@@ -32,7 +32,7 @@ pub const Object = struct {
                 .Error => Error,
             };
         }
-        pub fn toString(ty: ObjectType) []const u8 {
+        pub inline fn toString(ty: ObjectType) []const u8 {
             return switch (ty) {
                 .Integer => "Integer",
                 .Boolean => "Boolean",
@@ -48,7 +48,7 @@ pub const Object = struct {
         return @fieldParentPtr(ty.Type(), "base", base);
     }
 
-    pub fn create(comptime T: type, alloc: Allocator, value: T) !*T {
+    pub inline fn create(comptime T: type, alloc: Allocator, value: T) !*T {
         const obj = try alloc.create(T);
         obj.* = value;
         return obj;
@@ -57,22 +57,22 @@ pub const Object = struct {
     pub fn Inspect(self: *Object, alloc: Allocator, writer: anytype) !void {
         switch (self.ty) {
             .Integer => {
-                const int = cast(self, .Integer).?;
+                const int = cast(self, .Integer);
                 try writer.print("{d}", .{int.value});
             },
             .Boolean => {
-                const _bool = cast(self, .Boolean).?;
+                const _bool = cast(self, .Boolean);
                 try writer.print("{any}", .{_bool.value});
             },
             .ReturnValue => {
-                const rv = cast(self, .ReturnValue).?;
+                const rv = cast(self, .ReturnValue);
                 try rv.value.Inspect(alloc, writer);
             },
             .Null => {
                 try writer.print("null", .{});
             },
             .Function => {
-                const func = cast(self, .Function).?;
+                const func = cast(self, .Function);
 
                 var params = std.ArrayList(u8).init(alloc);
                 const paramsWriter = params.writer();
@@ -88,7 +88,7 @@ pub const Object = struct {
                 try writer.writeAll("\n");
             },
             .Error => {
-                const err = cast(self, .Error).?;
+                const err = cast(self, .Error);
                 try writer.print("Error: {s}", .{err.message});
             },
         }

diff --git a/src/parser.zig b/src/parser.zig
@@ -100,7 +100,7 @@ pub const Parser = struct {
         return p;
     }
 
-    pub fn nextToken(self: *Parser) void {
+    pub inline fn nextToken(self: *Parser) void {
         self.curToken = self.peekToken;
         self.peekToken = self.lex.nextToken();
     }
@@ -120,7 +120,7 @@ pub const Parser = struct {
         return treePtr.toNode();
     }
 
-    pub fn parseStatement(self: *Parser) !?*Node {
+    pub inline fn parseStatement(self: *Parser) !?*Node {
         return switch (self.curToken.Type) {
             .LET => try self.parseLetStatement(),
             .RETURN => try self.parseReturnStatement(),
@@ -442,10 +442,10 @@ pub const Parser = struct {
     }
 
     ///////////// Utilities ////////////////////////
-    pub fn peekPrecedence(self: *Parser) Precedence {
+    pub inline fn peekPrecedence(self: *Parser) Precedence {
         return Precedence.fromTokenType(self.peekToken.Type);
     }
-    pub fn curPrecedence(self: *Parser) Precedence {
+    pub inline fn curPrecedence(self: *Parser) Precedence {
         return Precedence.fromTokenType(self.curToken.Type);
     }
 
@@ -476,13 +476,13 @@ pub const Parser = struct {
         try self.errors.append(self.arena.allocator(), ctx);
     }
 
-    pub fn registerPrefix(self: *Parser, currentToken: TokenType, prefixFunc: prefixParseFn) void {
+    pub inline fn registerPrefix(self: *Parser, currentToken: TokenType, prefixFunc: prefixParseFn) void {
         self.prefixParseFns.put(self.arena.allocator(), currentToken, prefixFunc) catch |err| {
             std.debug.panic("Error: {any}", .{err});
         };
     }
 
-    pub fn registerInfix(self: *Parser, currentToken: TokenType, infixFunc: infixParseFn) void {
+    pub inline fn registerInfix(self: *Parser, currentToken: TokenType, infixFunc: infixParseFn) void {
         self.infixParseFns.put(self.arena.allocator(), currentToken, infixFunc) catch |err| {
             std.debug.panic("Error: {any}", .{err});
         };

diff --git a/src/repl.zig b/src/repl.zig
@@ -27,8 +27,6 @@ pub fn start(gpa: std.mem.Allocator) !void {
     var bufOut = std.ArrayList(u8).init(gpa);
     const writer = bufOut.writer();
     const env = try Environment.newEnvironment(gpa);
-    const internPool = evaluator.InternPool(gpa);
-    _ = internPool;
 
     while (true) {
         print("{s}", .{Prompt});