Merge pull request #111 from Heracraft/main

First class WASM support

Author: AvicennaJr

.gitignore

@@ -59,3 +59,4 @@ config.json
 /Nuru
 
 dist/
+*.wasm

Makefile

@@ -34,6 +34,15 @@ build_android:
 	@echo 'cleaning up...'
 	rm nuru
 
+build_wasm:
+	@echo 'building wasm binary'
+	GOOS=js GOARCH=wasm go build -o nuru.wasm
+	@echo 'zipping build...'
+	tar -zcvf nuru_wasm_v${VERSION}.tar.gz nuru.wasm
+	@echo 'cleaning up...'
+	rm nuru.wasm
+
+
 build_test:
 	go build -ldflags="-s -w" -o nuru
 

README.md

@@ -404,7 +404,7 @@ There are documentations for two languages, English and Kiswahili, which are bot
 
 Clone the repo, hack it, make sure all tests are passing then submit a pull request.
 
-> Make sure ALL tests are passing before making a pull request. You can confirm with running `make tests`
+> Make sure ALL tests are passing before making a pull request. You can confirm with running `make test`
 
 ## Community
 

evaluator/builtins.go

@@ -1,3 +1,5 @@
+//go:build !js || !wasm 
+
 package evaluator
 
 import (
@@ -71,176 +73,11 @@ var builtins = map[string]*object.Builtin{
 			}
 		},
 	},
-	"aina": {
-		Fn: func(args ...object.Object) object.Object {
-			if len(args) != 1 {
-				return newError("Samahani, tunahitaji hoja 1, wewe umeweka %d", len(args))
-			}
-
-			return &object.String{Value: string(args[0].Type())}
-		},
-	},
-	"fungua": {
-		Fn: func(args ...object.Object) object.Object {
-
-			if len(args) != 1 {
-				return newError("Samahani, tunahitaji hoja 1, wewe umeweka %d", len(args))
-			}
-			filename := args[0].(*object.String).Value
-
-			file, err := os.ReadFile(filename)
-			if err != nil {
-				return &object.Error{Message: "Tumeshindwa kusoma faili au faili halipo"}
-			}
-			return &object.File{Filename: filename, Content: string(file)}
-		},
-	},
-	"mfululizo": {
-		Fn: func(args ...object.Object) object.Object {
-			if len(args) < 1 || len(args) > 3 {
-				return newError("Samahani, mfululizo inahitaji hoja 1 hadi 3, wewe umeweka %d", len(args))
-			}
 
-			var start, end, step int64
-			var err error
-
-			switch len(args) {
-			case 1:
-				end, err = getIntValue(args[0])
-				if err != nil {
-					return newError("Hoja lazima iwe nambari nzima")
-				}
-				start, step = 0, 1
-			case 2:
-				start, err = getIntValue(args[0])
-				if err != nil {
-					return newError("Hoja ya kwanza lazima iwe nambari nzima")
-				}
-				end, err = getIntValue(args[1])
-				if err != nil {
-					return newError("Hoja ya pili lazima iwe nambari nzima")
-				}
-				step = 1
-			case 3:
-				start, err = getIntValue(args[0])
-				if err != nil {
-					return newError("Hoja ya kwanza lazima iwe nambari nzima")
-				}
-				end, err = getIntValue(args[1])
-				if err != nil {
-					return newError("Hoja ya pili lazima iwe nambari nzima")
-				}
-				step, err = getIntValue(args[2])
-				if err != nil {
-					return newError("Hoja ya tatu lazima iwe nambari nzima")
-				}
-				if step == 0 {
-					return newError("Hatua haiwezi kuwa sifuri")
-				}
-			}
-
-			elements := []object.Object{}
-			for i := start; (step > 0 && i < end) || (step < 0 && i > end); i += step {
-				elements = append(elements, &object.Integer{Value: i})
-			}
-
-			return &object.Array{Elements: elements}
-		},
-	},
-
-	"badilisha": {
-		Fn: func(args ...object.Object) object.Object {
-			if len(args) != 2 {
-				return newError("Samahani, badili inahitaji hoja 2, wewe umeweka %d", len(args))
-			}
-
-			value := args[0]
-			targetType := args[1]
-
-			if targetType.Type() != object.STRING_OBJ {
-				return newError("Aina ya lengo lazima iwe neno")
-			}
-
-			targetTypeStr := targetType.(*object.String).Value
-
-			switch targetTypeStr {
-			case "NAMBA":
-				return convertToInteger(value)
-			case "DESIMALI":
-				return convertToFloat(value)
-			case "NENO":
-				return convertToString(value)
-			case "BOOLEAN":
-				return convertToBoolean(value)
-			default:
-				return newError("Aina isiyojulikana: %s", targetTypeStr)
-			}
-		},
-	},
-	"namba": {
-		Fn: func(args ...object.Object) object.Object {
-			if len(args) != 1 {
-				return newError("Samahani, namba inahitaji hoja 1, wewe umeweka %d", len(args))
-			}
-			value := args[0]
-			return convertToInteger(value)
-		},
-	},
-	"tungo": {
-		Fn: func(args ...object.Object) object.Object {
-			if len(args) != 1 {
-				return newError("Samahani, tungo inahitaji hoja 1, wewe umeweka %d", len(args))
-			}
-			value := args[0]
-			return convertToString(value)
-		},
-	},
-
-	// "jumla": {
-	// 	Fn: func(args ...object.Object) object.Object {
-	// 		if len(args) != 1 {
-	// 			return newError("Hoja hazilingani, tunahitaji=1, tumepewa=%d", len(args))
-	// 		}
-
-	// 		switch arg := args[0].(type) {
-	// 		case *object.Array:
-
-	// 			var sums float64
-	// 			for _, num := range arg.Elements {
-
-	// 				if num.Type() != object.INTEGER_OBJ && num.Type() != object.FLOAT_OBJ {
-	// 					return newError("Samahani namba tu zinahitajika")
-	// 				} else {
-	// 					if num.Type() == object.INTEGER_OBJ {
-	// 						no, _ := strconv.Atoi(num.Inspect())
-	// 						floatnum := float64(no)
-	// 						sums += floatnum
-	// 					} else if num.Type() == object.FLOAT_OBJ {
-	// 						no, _ := strconv.ParseFloat(num.Inspect(), 64)
-	// 						sums += no
-	// 					}
-
-	// 				}
-	// 			}
-
-	// 			if math.Mod(sums, 1) == 0 {
-	// 				return &object.Integer{Value: int64(sums)}
-	// 			}
-
-	// 			return &object.Float{Value: float64(sums)}
-
-	// 		default:
-	// 			return newError("Samahani, hii function haitumiki na %s", args[0].Type())
-	// 		}
-	// 	},
-	// },
 }
 
-func getIntValue(obj object.Object) (int64, error) {
-	switch obj := obj.(type) {
-	case *object.Integer:
-		return obj.Value, nil
-	default:
-		return 0, fmt.Errorf("expected integer, got %T", obj)
+func init(){
+	for name, builtin := range commonBuiltins{
+		builtins[name]=builtin
 	}
-}
+}