Added eval package

src/core/CompileAssignArray.go

@@ -1,11 +1,13 @@
 package core
 
 import (
+	"fmt"
 	"math"
 
 	"git.urbach.dev/cli/q/src/asm"
 	"git.urbach.dev/cli/q/src/ast"
 	"git.urbach.dev/cli/q/src/errors"
+	"git.urbach.dev/cli/q/src/eval"
 	"git.urbach.dev/cli/q/src/types"
 )
 
@@ -13,7 +15,6 @@ import (
 func (f *Function) CompileAssignArray(node *ast.Assign) error {
 	left := node.Expression.Children[0]
 	right := node.Expression.Children[1]
-
 	name := left.Children[0].Token.Text(f.File.Bytes)
 	variable := f.VariableByName(name)
 
@@ -31,30 +32,26 @@ func (f *Function) CompileAssignArray(node *ast.Assign) error {
 	}
 
 	indexExpr := left.Children[1]
+	index, err := f.Evaluate(indexExpr)
 
-	if indexExpr.Token.IsNumeric() {
-		index, err := f.ToNumber(indexExpr.Token)
-
-		if err != nil {
-			return err
-		}
-
-		memory.Offset = int8(index)
-	} else {
-		index, err := f.Evaluate(indexExpr)
-
-		if err != nil {
-			return err
-		}
-
-		if !types.Is(index.Type, types.AnyInt) {
-			return errors.New(&errors.TypeMismatch{Encountered: index.Type.Name(), Expected: types.AnyInt.Name()}, f.File, indexExpr.Token.Position)
-		}
-
-		memory.OffsetRegister = index.Register
-		defer f.FreeRegister(index.Register)
+	if err != nil {
+		return err
 	}
 
-	_, err := f.ExpressionToMemory(right, memory)
+	if !types.Is(index.Type, types.AnyInt) {
+		return errors.New(&errors.TypeMismatch{Encountered: index.Type.Name(), Expected: types.AnyInt.Name()}, f.File, indexExpr.Token.Position)
+	}
+
+	switch index.Kind {
+	case eval.Number:
+		memory.Offset = int8(index.Number)
+	case eval.Register:
+		memory.OffsetRegister = index.Register
+		defer f.FreeRegister(index.Register)
+	default:
+		panic(fmt.Errorf("%s: not implemented: %d", f.UniqueName, index.Kind))
+	}
+
+	_, err = f.ExpressionToMemory(right, memory)
 	return err
 }