Merge pull request #86 from NuruProgramming/fh/cleanup

use NuruProgramming packages
NuruProgramming · Jun 9, 2024 · 9c317d5 · 9c317d5
2 parents 1a9ee6f + 31cbcf3
commit 9c317d5
Show file tree

Hide file tree

Showing 68 changed files with 197 additions and 201 deletions.
diff --git a/README.md b/README.md
@@ -1,14 +1,14 @@
 <h1 align="center">NURU🔥PROGRAMMING🔥LANGUAGE</h1>
 <p align="center">
-    <a href="https://github.com/AvicennaJr/Nuru"><img alt="Nuru Programming Language" src="https://img.shields.io/badge/Nuru-Programming%20Language-yellow"></a>
-    <a href="https://github.com/AvicennaJr/Nuru"><img alt="Nuru Programming Language" src="https://img.shields.io/badge/platform-Linux | Windows | Android-green.svg"></a>
-    <a href="https://github.com/AvicennaJr/Nuru"><img alt="Nuru Programming Language" src="https://img.shields.io/github/last-commit/AvicennaJr/Nuru"></a>
+    <a href="https://github.com/NuruProgramming/Nuru"><img alt="Nuru Programming Language" src="https://img.shields.io/badge/Nuru-Programming%20Language-yellow"></a>
+    <a href="https://github.com/NuruProgramming/Nuru"><img alt="Nuru Programming Language" src="https://img.shields.io/badge/platform-Linux | Windows | Android-green.svg"></a>
+    <a href="https://github.com/NuruProgramming/Nuru"><img alt="Nuru Programming Language" src="https://img.shields.io/github/last-commit/AvicennaJr/Nuru"></a>
 <br>
-    <a href="https://github.com/AvicennaJr/Nuru"><img alt="Nuru Programming Language" src="https://img.shields.io/github/downloads/avicennajr/nuru/total"></a>
-    <a href="https://github.com/AvicennaJr/Nuru/releases"><img alt="Nuru Programming Language" src="https://img.shields.io/github/v/release/avicennajr/nuru?include_prereleases"></a>
-    <a href="https://github.com/AvicennaJr/Nuru"><img alt="Nuru Programming Language" src="https://img.shields.io/github/actions/workflow/status/AvicennaJr/Nuru/tests.yml?style=plastic"></a>
+    <a href="https://github.com/NuruProgramming/Nuru"><img alt="Nuru Programming Language" src="https://img.shields.io/github/downloads/avicennajr/nuru/total"></a>
+    <a href="https://github.com/NuruProgramming/Nuru/releases"><img alt="Nuru Programming Language" src="https://img.shields.io/github/v/release/avicennajr/nuru?include_prereleases"></a>
+    <a href="https://github.com/NuruProgramming/Nuru"><img alt="Nuru Programming Language" src="https://img.shields.io/github/actions/workflow/status/AvicennaJr/Nuru/tests.yml?style=plastic"></a>
 <br>
-    <a href="https://github.com/AvicennaJr/Nuru"><img alt="Nuru Programming Language" src="https://img.shields.io/github/stars/AvicennaJr/Nuru?style=social"></a>
+    <a href="https://github.com/NuruProgramming/Nuru"><img alt="Nuru Programming Language" src="https://img.shields.io/github/stars/AvicennaJr/Nuru?style=social"></a>
 </p>
 A Swahili Programming Language of its kind built from the ground up.
 
@@ -21,7 +21,7 @@ To get started download the executables from the release page or follow the inst
  - Download the binary:
 
 ```
-curl -O -L https://github.com/AvicennaJr/Nuru/releases/download/v0.5.16/nuru_Linux_amd64.tar.gz
+curl -O -L https://github.com/NuruProgramming/Nuru/releases/download/v0.5.16/nuru_Linux_amd64.tar.gz
 ```
 
   - Extract the file to make global available:
@@ -44,13 +44,13 @@ nuru -v
     - For apple silicon mac use:
 
         ```
-        curl -O -L https://github.com/AvicennaJr/Nuru/releases/download/v0.5.16/nuru_Darwin_arm64.tar.gz
+        curl -O -L https://github.com/NuruProgramming/Nuru/releases/download/v0.5.16/nuru_Darwin_arm64.tar.gz
         ```
 
     - For apple intel mac use:
 
         ```
-        curl -O -L https://github.com/AvicennaJr/Nuru/releases/download/v0.5.16/nuru_Darwin_amd64.tar.gz
+        curl -O -L https://github.com/NuruProgramming/Nuru/releases/download/v0.5.16/nuru_Darwin_amd64.tar.gz
         ```
 
 - Extract the file to make global available:
@@ -114,14 +114,14 @@ To install Nuru on your Android device using Termux, follow these steps:
 For a more streamlined installation, you can use the following one-liner:
 
 ```bash
-curl -O -L https://github.com/AvicennaJr/Nuru/releases/download/v0.5.16/nuru_Android_arm64.tar.gz && mkdir -p /data/data/com.termux/files/usr/share/nuru && tar -xzvf nuru_Android_arm64.tar.gz -C /data/data/com.termux/files/usr/share/nuru && echo "alias nuru='/data/data/com.termux/files/usr/share/nuru/nuru'" >> ~/.bashrc && source ~/.bashrc && echo "Installation complete.."
+curl -O -L https://github.com/NuruProgramming/Nuru/releases/download/v0.5.16/nuru_Android_arm64.tar.gz && mkdir -p /data/data/com.termux/files/usr/share/nuru && tar -xzvf nuru_Android_arm64.tar.gz -C /data/data/com.termux/files/usr/share/nuru && echo "alias nuru='/data/data/com.termux/files/usr/share/nuru/nuru'" >> ~/.bashrc && source ~/.bashrc && echo "Installation complete.."
 ```
 
 
 ### Windows
 
 - Executable:
-    - Download the Nuru zip file [Here](https://github.com/AvicennaJr/Nuru/releases/download/v0.5.16/nuru_Windows_amd64.zip)
+    - Download the Nuru zip file [Here](https://github.com/NuruProgramming/Nuru/releases/download/v0.5.16/nuru_Windows_amd64.zip)
     - Unzip to get the executable
     - Double click the executable
 
@@ -370,7 +370,7 @@ nuru myFile.nr
 
 ## Issues
 
-Kindly open an [Issue](https://github.com/AvicennaJr/Nuru/issues) to make suggestions and anything else.
+Kindly open an [Issue](https://github.com/NuruProgramming/Nuru/issues) to make suggestions and anything else.
 
 ## Contributions
 

diff --git a/ast/ast.go b/ast/ast.go
@@ -4,12 +4,12 @@ import (
 	"bytes"
 	"strings"
 
-	"github.com/AvicennaJr/Nuru/token"
+	"github.com/NuruProgramming/Nuru/token"
 )
 
 type Node interface {
 	TokenLiteral() string
-	String() string // to help debug the many errors lmao
+	String() string
 }
 
 type Statement interface {

diff --git a/ast/ast_test.go b/ast/ast_test.go
@@ -3,7 +3,7 @@ package ast
 import (
 	"testing"
 
-	"github.com/AvicennaJr/Nuru/token"
+	"github.com/NuruProgramming/Nuru/token"
 )
 
 func TestString(t *testing.T) {

diff --git a/evaluator/assign.go b/evaluator/assign.go
@@ -1,8 +1,8 @@
 package evaluator
 
 import (
-	"github.com/AvicennaJr/Nuru/ast"
-	"github.com/AvicennaJr/Nuru/object"
+	"github.com/NuruProgramming/Nuru/ast"
+	"github.com/NuruProgramming/Nuru/object"
 )
 
 func evalAssign(node *ast.Assign, env *object.Environment) object.Object {

diff --git a/evaluator/assignEqual.go b/evaluator/assignEqual.go
@@ -3,8 +3,8 @@ package evaluator
 import (
 	"strings"
 
-	"github.com/AvicennaJr/Nuru/ast"
-	"github.com/AvicennaJr/Nuru/object"
+	"github.com/NuruProgramming/Nuru/ast"
+	"github.com/NuruProgramming/Nuru/object"
 )
 
 func evalAssignEqual(node *ast.AssignEqual, env *object.Environment) object.Object {

diff --git a/evaluator/at.go b/evaluator/at.go
@@ -1,8 +1,8 @@
 package evaluator
 
 import (
-	"github.com/AvicennaJr/Nuru/ast"
-	"github.com/AvicennaJr/Nuru/object"
+	"github.com/NuruProgramming/Nuru/ast"
+	"github.com/NuruProgramming/Nuru/object"
 )
 
 func evalAt(node *ast.At, env *object.Environment) object.Object {

diff --git a/evaluator/bang.go b/evaluator/bang.go
@@ -1,6 +1,6 @@
 package evaluator
 
-import "github.com/AvicennaJr/Nuru/object"
+import "github.com/NuruProgramming/Nuru/object"
 
 func evalBangOperatorExpression(right object.Object) object.Object {
 	switch right {
@@ -13,4 +13,4 @@ func evalBangOperatorExpression(right object.Object) object.Object {
 	default:
 		return FALSE
 	}
-}
+}
diff --git a/evaluator/block.go b/evaluator/block.go
@@ -1,8 +1,8 @@
 package evaluator
 
 import (
-	"github.com/AvicennaJr/Nuru/ast"
-	"github.com/AvicennaJr/Nuru/object"
+	"github.com/NuruProgramming/Nuru/ast"
+	"github.com/NuruProgramming/Nuru/object"
 )
 
 func evalBlockStatement(block *ast.BlockStatement, env *object.Environment) object.Object {

diff --git a/evaluator/builtins.go b/evaluator/builtins.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/AvicennaJr/Nuru/object"
+	"github.com/NuruProgramming/Nuru/object"
 )
 
 var builtins = map[string]*object.Builtin{

diff --git a/evaluator/call.go b/evaluator/call.go
@@ -1,8 +1,8 @@
 package evaluator
 
 import (
-	"github.com/AvicennaJr/Nuru/ast"
-	"github.com/AvicennaJr/Nuru/object"
+	"github.com/NuruProgramming/Nuru/ast"
+	"github.com/NuruProgramming/Nuru/object"
 )
 
 func evalCall(node *ast.CallExpression, env *object.Environment) object.Object {

diff --git a/evaluator/dict.go b/evaluator/dict.go
@@ -1,8 +1,8 @@
 package evaluator
 
 import (
-	"github.com/AvicennaJr/Nuru/ast"
-	"github.com/AvicennaJr/Nuru/object"
+	"github.com/NuruProgramming/Nuru/ast"
+	"github.com/NuruProgramming/Nuru/object"
 )
 
 func evalDictLiteral(node *ast.DictLiteral, env *object.Environment) object.Object {
@@ -29,4 +29,4 @@ func evalDictLiteral(node *ast.DictLiteral, env *object.Environment) object.Obje
 	}
 
 	return &object.Dict{Pairs: pairs}
-}
+}
diff --git a/evaluator/evaluator.go b/evaluator/evaluator.go
@@ -3,8 +3,8 @@ package evaluator
 import (
 	"fmt"
 
-	"github.com/AvicennaJr/Nuru/ast"
-	"github.com/AvicennaJr/Nuru/object"
+	"github.com/NuruProgramming/Nuru/ast"
+	"github.com/NuruProgramming/Nuru/object"
 )
 
 var (
@@ -134,7 +134,7 @@ func Eval(node ast.Node, env *object.Environment) object.Object {
 			return val
 		}
 		return evalPropertyAssignment(node.Name, val, env)
-	case *ast.Assign: // making let temporarily optional as I debug
+	case *ast.Assign:
 		return evalAssign(node, env)
 	case *ast.AssignEqual:
 		return evalAssignEqual(node, env)

diff --git a/evaluator/evaluator_test.go b/evaluator/evaluator_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/AvicennaJr/Nuru/lexer"
-	"github.com/AvicennaJr/Nuru/object"
-	"github.com/AvicennaJr/Nuru/parser"
+	"github.com/NuruProgramming/Nuru/lexer"
+	"github.com/NuruProgramming/Nuru/object"
+	"github.com/NuruProgramming/Nuru/parser"
 )
 
 func TestEvalIntegerExpression(t *testing.T) {

diff --git a/evaluator/forin.go b/evaluator/forin.go
@@ -1,8 +1,8 @@
 package evaluator
 
 import (
-	"github.com/AvicennaJr/Nuru/ast"
-	"github.com/AvicennaJr/Nuru/object"
+	"github.com/NuruProgramming/Nuru/ast"
+	"github.com/NuruProgramming/Nuru/object"
 )
 
 func evalForInExpression(fie *ast.ForIn, env *object.Environment, line int) object.Object {
@@ -26,4 +26,4 @@ func evalForInExpression(fie *ast.ForIn, env *object.Environment, line int) obje
 	default:
 		return newError("Mstari %d: Huwezi kufanya operesheni hii na %s", line, i.Type())
 	}
-}
+}
diff --git a/evaluator/function.go b/evaluator/function.go
@@ -1,8 +1,8 @@
 package evaluator
 
 import (
-	"github.com/AvicennaJr/Nuru/ast"
-	"github.com/AvicennaJr/Nuru/object"
+	"github.com/NuruProgramming/Nuru/ast"
+	"github.com/NuruProgramming/Nuru/object"
 )
 
 func evalFunction(node *ast.FunctionLiteral, env *object.Environment) object.Object {

diff --git a/evaluator/identifier.go b/evaluator/identifier.go
@@ -1,8 +1,8 @@
 package evaluator
 
 import (
-	"github.com/AvicennaJr/Nuru/ast"
-	"github.com/AvicennaJr/Nuru/object"
+	"github.com/NuruProgramming/Nuru/ast"
+	"github.com/NuruProgramming/Nuru/object"
 )
 
 func evalIdentifier(node *ast.Identifier, env *object.Environment) object.Object {
@@ -14,4 +14,4 @@ func evalIdentifier(node *ast.Identifier, env *object.Environment) object.Object
 	}
 
 	return newError("Mstari %d: Neno Halifahamiki: %s", node.Token.Line, node.Value)
-}
+}
diff --git a/evaluator/if.go b/evaluator/if.go
@@ -1,8 +1,8 @@
 package evaluator
 
 import (
-	"github.com/AvicennaJr/Nuru/ast"
-	"github.com/AvicennaJr/Nuru/object"
+	"github.com/NuruProgramming/Nuru/ast"
+	"github.com/NuruProgramming/Nuru/object"
 )
 
 func evalIfExpression(ie *ast.IfExpression, env *object.Environment) object.Object {
@@ -19,4 +19,4 @@ func evalIfExpression(ie *ast.IfExpression, env *object.Environment) object.Obje
 	} else {
 		return NULL
 	}
-}
+}
diff --git a/evaluator/import.go b/evaluator/import.go
@@ -2,16 +2,15 @@ package evaluator
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
 
-	"github.com/AvicennaJr/Nuru/ast"
-	"github.com/AvicennaJr/Nuru/lexer"
-	"github.com/AvicennaJr/Nuru/module"
-	"github.com/AvicennaJr/Nuru/object"
-	"github.com/AvicennaJr/Nuru/parser"
+	"github.com/NuruProgramming/Nuru/ast"
+	"github.com/NuruProgramming/Nuru/lexer"
+	"github.com/NuruProgramming/Nuru/module"
+	"github.com/NuruProgramming/Nuru/object"
+	"github.com/NuruProgramming/Nuru/parser"
 )
 
 var searchPaths []string
@@ -62,7 +61,7 @@ func fileExists(file string) bool {
 }
 
 func evaluateFile(file string, env *object.Environment) (*object.Environment, object.Object) {
-	source, err := ioutil.ReadFile(file)
+	source, err := os.ReadFile(file)
 	if err != nil {
 		return nil, &object.Error{Message: fmt.Sprintf("Tumeshindwa kufungua pakeji: %s", file)}
 	}

diff --git a/evaluator/in.go b/evaluator/in.go
@@ -3,7 +3,7 @@ package evaluator
 import (
 	"strings"
 
-	"github.com/AvicennaJr/Nuru/object"
+	"github.com/NuruProgramming/Nuru/object"
 )
 
 func evalInExpression(left, right object.Object, line int) object.Object {

diff --git a/evaluator/index.go b/evaluator/index.go
@@ -1,6 +1,6 @@
 package evaluator
 
-import "github.com/AvicennaJr/Nuru/object"
+import "github.com/NuruProgramming/Nuru/object"
 
 func evalIndexExpression(left, index object.Object, line int) object.Object {
 	switch {
@@ -41,4 +41,4 @@ func evalDictIndexExpression(dict, index object.Object, line int) object.Object
 	}
 
 	return pair.Value
-}
+}
diff --git a/evaluator/infix.go b/evaluator/infix.go
@@ -4,13 +4,13 @@ import (
 	"math"
 	"strings"
 
-	"github.com/AvicennaJr/Nuru/object"
+	"github.com/NuruProgramming/Nuru/object"
 )
 
 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)
 	}

diff --git a/evaluator/method.go b/evaluator/method.go
@@ -1,8 +1,8 @@
 package evaluator
 
 import (
-	"github.com/AvicennaJr/Nuru/ast"
-	"github.com/AvicennaJr/Nuru/object"
+	"github.com/NuruProgramming/Nuru/ast"
+	"github.com/NuruProgramming/Nuru/object"
 )
 
 func evalMethodExpression(node *ast.MethodExpression, env *object.Environment) object.Object {

diff --git a/evaluator/package.go b/evaluator/package.go
@@ -1,8 +1,8 @@
 package evaluator
 
 import (
-	"github.com/AvicennaJr/Nuru/ast"
-	"github.com/AvicennaJr/Nuru/object"
+	"github.com/NuruProgramming/Nuru/ast"
+	"github.com/NuruProgramming/Nuru/object"
 )
 
 func evalPackage(node *ast.Package, env *object.Environment) object.Object {