3 files changed, 24 insertions, 0 deletions

diff --git a/evaluator/src/main/java/lv/enes/orang/evaluator/Array.java b/evaluator/src/main/java/lv/enes/orang/evaluator/Array.java
index 4c76eff..ab0d896 100644
--- a/evaluator/src/main/java/lv/enes/orang/evaluator/Array.java
+++ b/evaluator/src/main/java/lv/enes/orang/evaluator/Array.java
@@ -51,6 +51,18 @@ public record Array(List<Value> items) implements Value {
         }
 
         @Override
+        public Value arrayAccess(Value idx) throws OrangRuntimeException {
+                if (idx instanceof OrangInteger(var i)) {
+                        if (i < 0 || i >= items.size()) {
+                                throw new OrangRuntimeException(STR."Index out of bounds: \{i} not in [0;\{items.size()})");
+                        }
+                        return items.get(i);
+                } else {
+                        throw new OrangRuntimeException(STR."array access not implemented for Array and \{idx.typeName()}");
+                }
+        }
+
+        @Override
         public Value multiply(Value rhs) throws OrangRuntimeException {
                 if (rhs instanceof OrangInteger(var repeat)) {
                         var newItems = new ArrayList<Value>(items.size() * repeat);
diff --git a/evaluator/src/main/java/lv/enes/orang/evaluator/Evaluator.java b/evaluator/src/main/java/lv/enes/orang/evaluator/Evaluator.java
index 1f51b9d..69c03e8 100644
--- a/evaluator/src/main/java/lv/enes/orang/evaluator/Evaluator.java
+++ b/evaluator/src/main/java/lv/enes/orang/evaluator/Evaluator.java
@@ -24,6 +24,13 @@ public record Evaluator(Map<String, Value> scope, Value lastResult) implements E
         }
 
         @Override
+        public Value visitArrayAccess(ArrayAccessExpression arrayAccess) throws OrangRuntimeException {
+                var array = visit(arrayAccess.array());
+                var index = visit(arrayAccess.index());
+                return array.arrayAccess(index);
+        }
+
+        @Override
         public Value visitBinaryExpression(BinaryExpression expr) throws OrangRuntimeException {
                 var lhs = visit(expr.lhs());
                 var rhs = visit(expr.rhs());
diff --git a/evaluator/src/main/java/lv/enes/orang/evaluator/Value.java b/evaluator/src/main/java/lv/enes/orang/evaluator/Value.java
index 1a1aad6..35af35b 100644
--- a/evaluator/src/main/java/lv/enes/orang/evaluator/Value.java
+++ b/evaluator/src/main/java/lv/enes/orang/evaluator/Value.java
@@ -13,6 +13,11 @@ public sealed interface Value
         }
 
 
+        default Value arrayAccess(Value idx) throws OrangRuntimeException {
+                throw new OrangRuntimeException(STR."array access is not implemented for \{typeName()}");
+        }
+
+
         default Value negate() throws OrangRuntimeException {
                 throw new OrangRuntimeException(STR."negate is not implemented for \{typeName()}");
         }