Merge pull request #80 from gekkowrld/fi

Handle `nil` dereference in expressions
NuruProgramming · Mar 22, 2024 · 7f69b77 · 7f69b77
2 parents 3b2207a + 226d721
commit 7f69b77
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/evaluator/evaluator.go b/evaluator/evaluator.go
@@ -45,7 +45,7 @@ func Eval(node ast.Node, env *object.Environment) object.Object {
 			return left
 		}
 		right := Eval(node.Right, env)
-		if isError(right) {
+		if isError(right) && right != nil {
 			return right
 		}
 		return evalInfixExpression(node.Operator, left, right, node.Token.Line)

diff --git a/evaluator/infix.go b/evaluator/infix.go
@@ -8,6 +8,9 @@ import (
 )
 
 func evalInfixExpression(operator string, left, right object.Object, line int) object.Object {
+	if right == nil {
+		return newError("Mstari %d: Umekosea hapa", line)
+			}
 	if left == nil {
 		return newError("Mstari %d: Umekosea hapa", line)
 	}