Make errors more readable

errd/sintaksia.go

@@ -0,0 +1,28 @@
+package errd
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/NuruProgramming/Nuru/token"
+)
+
+type MakosaSintaksia struct {
+	Ujumbe       string
+	Muktadha string
+	Info token.Token
+}
+
+func (s *MakosaSintaksia) Kosa() string {
+	return fmt.Sprintf("Kosa la kisintaksia: %s:%d:%d\n%s\n\n%s",
+		s.Info.Filename, s.Info.Line.Start.Line, s.Info.Line.Start.Column, s.Ujumbe, s.Muktadha)
+}
+
+func (s *MakosaSintaksia) Onyesha() {
+	fmt.Fprintf(os.Stderr, "%s\n", s.Kosa())
+}
+
+func (s *MakosaSintaksia) Hatari() {
+	s.Onyesha()
+	os.Exit(1)
+}

evaluator/call.go

@@ -31,7 +31,7 @@ func evalCall(node *ast.CallExpression, env *object.Environment) object.Object {
 		return args[0]
 	}
 
-	return applyFunction(function, args, node.Token.Line)
+	return applyFunction(function, args, node.Token.Line.Start.Line)
 }
 
 func evalArgsExpressions(node *ast.CallExpression, fn *object.Function, env *object.Environment) []object.Object {

evaluator/evaluator.go

@@ -37,7 +37,7 @@ func Eval(node ast.Node, env *object.Environment) object.Object {
 		if isError(right) {
 			return right
 		}
-		return evalPrefixExpression(node.Operator, right, node.Token.Line)
+		return evalPrefixExpression(node.Operator, right, node.Token.Line.Start.Line)
 
 	case *ast.InfixExpression:
 		left := Eval(node.Left, env)
@@ -48,7 +48,7 @@ func Eval(node ast.Node, env *object.Environment) object.Object {
 		if isError(right) && right != nil {
 			return right
 		}
-		return evalInfixExpression(node.Operator, left, right, node.Token.Line)
+		return evalInfixExpression(node.Operator, left, right, node.Token.Line.Start.Line)
 	case *ast.PostfixExpression:
 		return evalPostfixExpression(env, node.Operator, node)
 
@@ -107,7 +107,7 @@ func Eval(node ast.Node, env *object.Environment) object.Object {
 		if isError(index) {
 			return index
 		}
-		return evalIndexExpression(left, index, node.Token.Line)
+		return evalIndexExpression(left, index, node.Token.Line.Start.Line)
 	case *ast.DictLiteral:
 		return evalDictLiteral(node, env)
 	case *ast.WhileExpression:
@@ -123,7 +123,7 @@ func Eval(node ast.Node, env *object.Environment) object.Object {
 	// case *ast.For:
 	// 	return evalForExpression(node, env)
 	case *ast.ForIn:
-		return evalForInExpression(node, env, node.Token.Line)
+		return evalForInExpression(node, env, node.Token.Line.Start.Line)
 	case *ast.Package:
 		return evalPackage(node, env)
 	case *ast.PropertyExpression:
@@ -155,7 +155,7 @@ func Eval(node ast.Node, env *object.Environment) object.Object {
 		op := node.Token.Literal
 		if len(op) >= 2 {
 			op = op[:len(op)-1]
-			value = evalInfixExpression(op, left, value, node.Token.Line)
+			value = evalInfixExpression(op, left, value, node.Token.Line.Start.Line)
 			if isError(value) {
 				return value
 			}
@@ -291,7 +291,7 @@ func applyFunction(fn object.Object, args []object.Object, line int) object.Obje
 			return newError("Hamna andaa kiendesha")
 		}
 		node.(*object.Function).Env.Set("@", obj)
-		applyFunction(node, args, fn.Name.Token.Line)
+		applyFunction(node, args, fn.Name.Token.Line.Start.Line)
 		node.(*object.Function).Env.Del("@")
 		return obj
 	default:

evaluator/import.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"strings"
 
 	"github.com/NuruProgramming/Nuru/ast"
 	"github.com/NuruProgramming/Nuru/lexer"
@@ -65,12 +64,10 @@ func evaluateFile(file string, env *object.Environment) (*object.Environment, ob
 	if err != nil {
 		return nil, &object.Error{Message: fmt.Sprintf("Tumeshindwa kufungua pakeji: %s", file)}
 	}
-	l := lexer.New(string(source))
-	p := parser.New(l)
+	l := lexer.New(file, string(source))
+	p := parser.New(string(source), l)
 	program := p.ParseProgram()
-	if len(p.Errors()) != 0 {
-		return nil, &object.Error{Message: fmt.Sprintf("Pakeji %s ina makosa yafuatayo:\n%s", file, strings.Join(p.Errors(), "\n"))}
-	}
+	// There was a nil return here (and errors), this change may cause nil dereference somewhere
 
 	scope := object.NewEnvironment()
 	result := Eval(program, scope)

evaluator/method.go

@@ -20,7 +20,7 @@ func evalMethodExpression(node *ast.MethodExpression, env *object.Environment) o
 	for k, v := range node.Defaults {
 		defs[k] = Eval(v, env)
 	}
-	return applyMethod(obj, node.Method, args, defs, node.Token.Line)
+	return applyMethod(obj, node.Method, args, defs, node.Token.Line.Start.Line)
 }
 
 func applyMethod(obj object.Object, method ast.Expression, args []object.Object, defs map[string]object.Object, l int) object.Object {