Fixed typo when looping over dicts

Additional typo fixes

Author: AvicennaJr

.gitignore

@@ -51,4 +51,4 @@ tests_random
 parser/tracingZeAnnoyingParser.go 
 testTracing.go
 Notes.md
-
+nuru

ast/ast_test.go

@@ -10,7 +10,7 @@ func TestString(t *testing.T) {
 	program := &Program{
 		Statements: []Statement{
 			&LetStatement{
-				Token: token.Token{Type: token.LET, Literal: "acha"},
+				Token: token.Token{Type: token.LET, Literal: "fanya"},
 				Name: &Identifier{
 					Token: token.Token{Type: token.IDENT, Literal: "myVar"},
 					Value: "myVar",
@@ -23,7 +23,7 @@ func TestString(t *testing.T) {
 		},
 	}
 
-	if program.String() != "acha myVar = anotherVar;" {
+	if program.String() != "fanya myVar = anotherVar;" {
 		t.Errorf("program.String() wrong. got=%q", program.String())
 	}
 }

evaluator/builtins.go

@@ -114,27 +114,6 @@ var builtins = map[string]*object.Builtin{
 			}
 
 			return &object.String{Value: string(args[0].Type())}
-			// switch args[0].(type) {
-			// case *object.String:
-			// 	return &object.String{Value: "NENO (STRING)"}
-			// case *object.Boolean:
-			// 	return &object.String{Value: "BOOLEAN (KWELI AU SIKWELI)"}
-			// case *object.Builtin:
-			// 	return &object.String{Value: "YA_NDANI (Builtin Function)"}
-			// case *object.Array:
-			// 	return &object.String{Value: "ORODHA (Array)"}
-			// case *object.Function:
-			// 	return &object.String{Value: "UNDO (Function)"}
-			// case *object.Integer:
-			// 	return &object.String{Value: "NAMBA (Integer)"}
-			// case *object.Float:
-			// 	return &object.String{Value: "DESIMALI (Float)"}
-			// case *object.Dict:
-			// 	return &object.String{Value: "KAMUSI (Dict)"}
-			// default:
-			// 	return newError("argument to `type` not supported, got=%s",
-			// 		args[0].Type())
-			// }
 		},
 	},
 }

evaluator/evaluator.go

@@ -494,7 +494,7 @@ func evalPostfixExpression(env *object.Environment, operator string, node *ast.P
 			v := arg.Value + 1
 			return env.Set(node.Token.Literal, &object.Float{Value: v})
 		default:
-			return newError("%s sio kitambulishi cha namba. Tumia '++' na kitambulishi cha namba au desimali.\nMfano:\tacha i = 2; i++", node.Token.Literal)
+			return newError("Mstari %d: %s sio kitambulishi cha namba. Tumia '++' na kitambulishi cha namba au desimali.\nMfano:\tfanya i = 2; i++", node.Token.Line, node.Token.Literal)
 
 		}
 	case "--":
@@ -506,7 +506,7 @@ func evalPostfixExpression(env *object.Environment, operator string, node *ast.P
 			v := arg.Value - 1
 			return env.Set(node.Token.Literal, &object.Float{Value: v})
 		default:
-			return newError("%s sio kitambulishi cha namba. Tumia '--' na kitambulishi cha namba au desimali.\nMfano:\tacha i = 2; i++", node.Token.Literal)
+			return newError("Mstari %d: %s sio kitambulishi cha namba. Tumia '--' na kitambulishi cha namba au desimali.\nMfano:\tfanya i = 2; i++", node.Token.Line, node.Token.Literal)
 		}
 	default:
 		return newError("Haifahamiki: %s", operator)

examples/example.nr

@@ -1,8 +1,8 @@
 andika("Testing basic types...");
 andika(2 + 2);
 andika(4 * 4);
-acha a = 10;
-acha b = 20;
+fanya a = 10;
+fanya b = 20;
 
 andika(a + b);
 
@@ -15,23 +15,23 @@ andika("Mambo vipi");
 
 andika("Testing Functions... ");
 
-acha jumlisha = fn(x, y) {x + y};
+fanya jumlisha = unda(x, y) {x + y};
 
 andika(jumlisha(20,30));
 andika(jumlisha(100,1000));
 
-acha zidisha = fn(x, y) {x * y};
+fanya zidisha = unda(x, y) {x * y};
 
 andika(zidisha(100,1000));
 andika(zidisha(200, 20));
 
 // lists can hold any value
 andika("Testing lists...");
-acha list = [1, "a", kweli, sikweli];
+fanya list = [1, "a", kweli, sikweli];
 
 // a few builtins
 
-acha list = sukuma(list, jumlisha(4,5));
+fanya list = sukuma(list, jumlisha(4,5));
 
 andika(list);
 andika(list[2]);
@@ -57,7 +57,7 @@ kama (idadi("Habari") == 6) {
 // fibonacci example
 andika("Testing fibonacci...");
 
-acha fibo = fn(x) {
+fanya fibo = unda(x) {
 	kama (x == 0) {
 		rudisha 0;
 	} au kama (x == 1) {
@@ -72,8 +72,8 @@ andika(fibo(10));
 
 // testing input
 andika("Testing input from user...");
-acha salamu = fn() {
-        acha jina = jaza("Unaitwa nani rafiki? ");
+fanya salamu = unda() {
+        fanya jina = jaza("Unaitwa nani rafiki? ");
         rudisha "Mambo vipi " + jina;
     }
 
@@ -87,7 +87,7 @@ Multiline comment
 
 andika("Testing dictionaries...")
 
-acha watu = [{"jina": "Mojo", "kabila": "Mnyakusa"}, {"jina": "Avi", "kabila": "Mwarabu wa dubai"}]
+fanya watu = [{"jina": "Mojo", "kabila": "Mnyakusa"}, {"jina": "Avi", "kabila": "Mwarabu wa dubai"}]
 
 andika(watu, watu[0], watu[0]["jina"], watu[0]["kabila"])
 
@@ -99,7 +99,7 @@ andika({"a":1} + {"b": 2})
 
 andika("Testing while loop...");
 
-acha i = 10;
+fanya i = 10;
 
 wakati (i > 0) {
 	andika(i);

lexer/lexer.go

@@ -5,10 +5,10 @@ import (
 )
 
 type Lexer struct {
-	input        string // string or runes. Runes should be better.
+	input        string
 	position     int
 	readPosition int
-	ch           byte // make this a rune too
+	ch           byte
 	line         int
 }
 

lexer/lexer_test.go

@@ -9,14 +9,14 @@ import (
 func TestNextToken(t *testing.T) {
 	input := `
 	// Testing kama lex luther iko sawa
-	acha tano = 5;
-	acha kumi = 10;
+	fanya tano = 5;
+	fanya kumi = 10;
 
-	acha jumla = fn(x, y){
+	fanya jumla = unda(x, y){
 	x + y;
 	};
 
-	acha jibu = jumla(tano, kumi);
+	fanya jibu = jumla(tano, kumi);
 
 	!-/5;
 	5 < 10 > 5;
@@ -46,20 +46,20 @@ func TestNextToken(t *testing.T) {
 		expectedType    token.TokenType
 		expectedLiteral string
 	}{
-		{token.LET, "acha"},
+		{token.LET, "fanya"},
 		{token.IDENT, "tano"},
 		{token.ASSIGN, "="},
 		{token.INT, "5"},
 		{token.SEMICOLON, ";"},
-		{token.LET, "acha"},
+		{token.LET, "fanya"},
 		{token.IDENT, "kumi"},
 		{token.ASSIGN, "="},
 		{token.INT, "10"},
 		{token.SEMICOLON, ";"},
-		{token.LET, "acha"},
+		{token.LET, "fanya"},
 		{token.IDENT, "jumla"},
 		{token.ASSIGN, "="},
-		{token.FUNCTION, "fn"},
+		{token.FUNCTION, "unda"},
 		{token.LPAREN, "("},
 		{token.IDENT, "x"},
 		{token.COMMA, ","},
@@ -72,7 +72,7 @@ func TestNextToken(t *testing.T) {
 		{token.SEMICOLON, ";"},
 		{token.RBRACE, "}"},
 		{token.SEMICOLON, ";"},
-		{token.LET, "acha"},
+		{token.LET, "fanya"},
 		{token.IDENT, "jibu"},
 		{token.ASSIGN, "="},
 		{token.IDENT, "jumla"},

object/object.go

@@ -98,7 +98,7 @@ func (f *Function) Inspect() string {
 		params = append(params, p.String())
 	}
 
-	out.WriteString("fn")
+	out.WriteString("unda")
 	out.WriteString("(")
 	out.WriteString(strings.Join(params, ", "))
 	out.WriteString(") {\n")
@@ -252,7 +252,7 @@ func (d *Dict) Next() (Object, Object) {
 	return nil, nil
 }
 
-func (d *Dict) Resest() {
+func (d *Dict) Reset() {
 	d.offset = 0
 }
 

parser/parser.go

@@ -198,7 +198,7 @@ func (p *Parser) parseAssignmentExpression(exp ast.Expression) ast.Expression {
 	switch node := exp.(type) {
 	case *ast.Identifier, *ast.IndexExpression:
 	default:
-		msg := fmt.Sprintf("Tulitegemea kupata kitambulishi au array, badala yake tumepata: %T %#v", node, exp)
+		msg := fmt.Sprintf("Mstari %d:Tulitegemea kupata kitambulishi au array, badala yake tumepata: %s %s", p.curToken.Line, p.prevToken.Type, node.TokenLiteral())
 		p.errors = append(p.errors, msg)
 		return nil
 	}

token/token.go

@@ -56,7 +56,7 @@ const (
 
 	// Keywords
 	FUNCTION = "FUNCTION"
-	LET      = "ACHA"
+	LET      = "FANYA"
 	TRUE     = "KWELI"
 	FALSE    = "SIKWELI"
 	IF       = "KAMA"