19 files changed, 36 insertions, 22 deletions

diff --git a/evaluator/build.gradle.kts b/evaluator/build.gradle.kts
new file mode 100644
index 0000000..9172259
--- /dev/null
+++ b/evaluator/build.gradle.kts
@@ -0,0 +1,9 @@
+plugins {
+    id("orang.java-conventions")
+}
+
+dependencies {
+    implementation(project(":ast"))
+    implementation(project(":core"))
+    implementation(project(":utils"))
+}
\ No newline at end of file
diff --git a/orang/src/main/java/lv/enes/orang/value/Array.java b/evaluator/src/main/java/lv/enes/orang/evaluator/Array.java
index 33e1516..4c76eff 100644
--- a/orang/src/main/java/lv/enes/orang/value/Array.java
+++ b/evaluator/src/main/java/lv/enes/orang/evaluator/Array.java
@@ -1,4 +1,4 @@
-package lv.enes.orang.value;
+package lv.enes.orang.evaluator;
 
 import lv.enes.orang.core.OrangRuntimeException;
 
diff --git a/orang/src/main/java/lv/enes/orang/value/BuiltinFunction.java b/evaluator/src/main/java/lv/enes/orang/evaluator/BuiltinFunction.java
index 1a61cfb..1f37280 100644
--- a/orang/src/main/java/lv/enes/orang/value/BuiltinFunction.java
+++ b/evaluator/src/main/java/lv/enes/orang/evaluator/BuiltinFunction.java
@@ -1,4 +1,4 @@
-package lv.enes.orang.value;
+package lv.enes.orang.evaluator;
 
 import lv.enes.orang.core.OrangRuntimeException;
 
diff --git a/orang/src/main/java/lv/enes/orang/Evaluator.java b/evaluator/src/main/java/lv/enes/orang/evaluator/Evaluator.java
index 69a256f..6925bac 100644
--- a/orang/src/main/java/lv/enes/orang/Evaluator.java
+++ b/evaluator/src/main/java/lv/enes/orang/evaluator/Evaluator.java
@@ -1,8 +1,7 @@
-package lv.enes.orang;
+package lv.enes.orang.evaluator;
 
 import lv.enes.orang.ast.*;
 import lv.enes.orang.core.OrangRuntimeException;
-import lv.enes.orang.value.*;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -10,10 +9,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 public record Evaluator(Map<String, Value> scope, Value lastResult) implements ExpressionVisitor<Value, OrangRuntimeException>, StatementVisitor<Evaluator, OrangRuntimeException> {
-        public Evaluator() {
-                this(new HashMap<>(Builtins.BUILTINS));
-        }
-
         public Evaluator(Map<String, Value> scope) {
                 this(scope, Undefined.INSTANCE);
         }
diff --git a/orang/src/main/java/lv/enes/orang/value/Function.java b/evaluator/src/main/java/lv/enes/orang/evaluator/Function.java
index f8c1a7f..33102fb 100644
--- a/orang/src/main/java/lv/enes/orang/value/Function.java
+++ b/evaluator/src/main/java/lv/enes/orang/evaluator/Function.java
@@ -1,4 +1,4 @@
-package lv.enes.orang.value;
+package lv.enes.orang.evaluator;
 
 import lv.enes.orang.ast.ArgSpec;
 import lv.enes.orang.ast.Expression;
diff --git a/orang/src/main/java/lv/enes/orang/value/Nothing.java b/evaluator/src/main/java/lv/enes/orang/evaluator/Nothing.java
index 4a90010..c971649 100644
--- a/orang/src/main/java/lv/enes/orang/value/Nothing.java
+++ b/evaluator/src/main/java/lv/enes/orang/evaluator/Nothing.java
@@ -1,4 +1,4 @@
-package lv.enes.orang.value;
+package lv.enes.orang.evaluator;
 
 import lombok.EqualsAndHashCode;
 
diff --git a/orang/src/main/java/lv/enes/orang/value/OrangBoolean.java b/evaluator/src/main/java/lv/enes/orang/evaluator/OrangBoolean.java
index 59aa9b7..3564a9c 100644
--- a/orang/src/main/java/lv/enes/orang/value/OrangBoolean.java
+++ b/evaluator/src/main/java/lv/enes/orang/evaluator/OrangBoolean.java
@@ -1,4 +1,4 @@
-package lv.enes.orang.value;
+package lv.enes.orang.evaluator;
 
 import lombok.EqualsAndHashCode;
 import lv.enes.orang.core.OrangRuntimeException;
diff --git a/orang/src/main/java/lv/enes/orang/value/OrangInteger.java b/evaluator/src/main/java/lv/enes/orang/evaluator/OrangInteger.java
index 63a44da..90de0b5 100644
--- a/orang/src/main/java/lv/enes/orang/value/OrangInteger.java
+++ b/evaluator/src/main/java/lv/enes/orang/evaluator/OrangInteger.java
@@ -1,4 +1,4 @@
-package lv.enes.orang.value;
+package lv.enes.orang.evaluator;
 
 import lv.enes.orang.core.OrangRuntimeException;
 
diff --git a/orang/src/main/java/lv/enes/orang/value/OrangString.java b/evaluator/src/main/java/lv/enes/orang/evaluator/OrangString.java
index b4ede1f..5c38842 100644
--- a/orang/src/main/java/lv/enes/orang/value/OrangString.java
+++ b/evaluator/src/main/java/lv/enes/orang/evaluator/OrangString.java
@@ -1,4 +1,4 @@
-package lv.enes.orang.value;
+package lv.enes.orang.evaluator;
 
 import lv.enes.orang.core.OrangRuntimeException;
 
diff --git a/orang/src/main/java/lv/enes/orang/value/PartialBuiltinFunction.java b/evaluator/src/main/java/lv/enes/orang/evaluator/PartialBuiltinFunction.java
index c1be22a..f1e8cc6 100644
--- a/orang/src/main/java/lv/enes/orang/value/PartialBuiltinFunction.java
+++ b/evaluator/src/main/java/lv/enes/orang/evaluator/PartialBuiltinFunction.java
@@ -1,4 +1,4 @@
-package lv.enes.orang.value;
+package lv.enes.orang.evaluator;
 
 import lv.enes.orang.core.OrangRuntimeException;
 
diff --git a/orang/src/main/java/lv/enes/orang/value/PartialFunction.java b/evaluator/src/main/java/lv/enes/orang/evaluator/PartialFunction.java
index 427da76..d0125f6 100644
--- a/orang/src/main/java/lv/enes/orang/value/PartialFunction.java
+++ b/evaluator/src/main/java/lv/enes/orang/evaluator/PartialFunction.java
@@ -1,6 +1,5 @@
-package lv.enes.orang.value;
+package lv.enes.orang.evaluator;
 
-import lv.enes.orang.*;
 import lv.enes.orang.ast.ArgSpec;
 import lv.enes.orang.ast.Expression;
 import lv.enes.orang.core.OrangRuntimeException;
diff --git a/orang/src/main/java/lv/enes/orang/value/Undefined.java b/evaluator/src/main/java/lv/enes/orang/evaluator/Undefined.java
index a341ee8..2aec74b 100644
--- a/orang/src/main/java/lv/enes/orang/value/Undefined.java
+++ b/evaluator/src/main/java/lv/enes/orang/evaluator/Undefined.java
@@ -1,4 +1,4 @@
-package lv.enes.orang.value;
+package lv.enes.orang.evaluator;
 
 import lombok.EqualsAndHashCode;
 
diff --git a/orang/src/main/java/lv/enes/orang/value/Value.java b/evaluator/src/main/java/lv/enes/orang/evaluator/Value.java
index 07e6848..d8c8b9c 100644
--- a/orang/src/main/java/lv/enes/orang/value/Value.java
+++ b/evaluator/src/main/java/lv/enes/orang/evaluator/Value.java
@@ -1,4 +1,4 @@
-package lv.enes.orang.value;
+package lv.enes.orang.evaluator;
 
 import lv.enes.orang.core.OrangRuntimeException;
 
diff --git a/evaluator/src/main/java/module-info.java b/evaluator/src/main/java/module-info.java
new file mode 100644
index 0000000..4cb992c
--- /dev/null
+++ b/evaluator/src/main/java/module-info.java
@@ -0,0 +1,9 @@
+module lv.enes.orang.evaluator {
+        exports lv.enes.orang.evaluator;
+
+        requires lv.enes.orang.ast;
+        requires lv.enes.orang.core;
+        requires lv.enes.orang.utils;
+
+        requires static lombok;
+}
\ No newline at end of file
diff --git a/orang/build.gradle.kts b/orang/build.gradle.kts
index 4be19a4..8c9de5f 100644
--- a/orang/build.gradle.kts
+++ b/orang/build.gradle.kts
@@ -14,6 +14,7 @@ dependencies {
     implementation(project(":ast"))
     implementation(project(":checker"))
     implementation(project(":core"))
+    implementation(project(":evaluator"))
     implementation(project(":parser"))
     implementation(project(":utils"))
 }
diff --git a/orang/src/main/java/lv/enes/orang/Builtins.java b/orang/src/main/java/lv/enes/orang/Builtins.java
index a83f4c5..eea8ef4 100644
--- a/orang/src/main/java/lv/enes/orang/Builtins.java
+++ b/orang/src/main/java/lv/enes/orang/Builtins.java
@@ -2,7 +2,7 @@ package lv.enes.orang;
 
 import lombok.extern.slf4j.Slf4j;
 import lv.enes.orang.core.OrangRuntimeException;
-import lv.enes.orang.value.*;
+import lv.enes.orang.evaluator.*;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/orang/src/main/java/lv/enes/orang/Main.java b/orang/src/main/java/lv/enes/orang/Main.java
index 9a061fe..5730fd1 100644
--- a/orang/src/main/java/lv/enes/orang/Main.java
+++ b/orang/src/main/java/lv/enes/orang/Main.java
@@ -2,6 +2,7 @@ package lv.enes.orang;
 
 import lv.enes.orang.checker.Checker;
 import lv.enes.orang.core.OrangException;
+import lv.enes.orang.evaluator.Evaluator;
 import lv.enes.orang.parser.Parser;
 
 import java.io.FileReader;
@@ -19,7 +20,7 @@ public class Main {
 
         private static void repl() throws IOException {
                 var checker = Checker.of(Builtins.BUILTINS);
-                var evaluator = new Evaluator();
+                var evaluator = new Evaluator(Builtins.BUILTINS);
 
                 try (var stream = Main.class.getResourceAsStream("prelude.orang")) {
                         var prog = Parser.parseProgram(stream);
diff --git a/orang/src/main/java/module-info.java b/orang/src/main/java/module-info.java
index 5b7b601..cb61de3 100644
--- a/orang/src/main/java/module-info.java
+++ b/orang/src/main/java/module-info.java
@@ -1,10 +1,10 @@
 module lv.enes.orang {
         exports lv.enes.orang;
-        exports lv.enes.orang.value;
 
         requires lv.enes.orang.ast;
         requires lv.enes.orang.checker;
         requires lv.enes.orang.core;
+        requires lv.enes.orang.evaluator;
         requires lv.enes.orang.parser;
         requires lv.enes.orang.utils;
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a64dfa6..bd27876 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,3 +1,3 @@
 rootProject.name = "orang"
 
-include("ast", "checker", "core", "lexer", "orang", "parser", "utils")
\ No newline at end of file
+include("ast", "checker", "core", "evaluator", "lexer", "orang", "parser", "utils")
\ No newline at end of file