21 files changed, 217 insertions, 18 deletions

diff --git a/ast/src/main/java/lv/enes/orang/ast/ArrayExpression.java b/ast/src/main/java/lv/enes/orang/ast/ArrayExpression.java
new file mode 100644
index 0000000..acd1a36
--- /dev/null
+++ b/ast/src/main/java/lv/enes/orang/ast/ArrayExpression.java
@@ -0,0 +1,12 @@
+package lv.enes.orang.ast;
+
+import lv.enes.orang.core.OrangException;
+
+import java.util.List;
+
+public record ArrayExpression(List<Expression> items) implements Expression {
+        @Override
+        public <R, E extends OrangException> R accept(ExpressionVisitor<R, E> visitor) throws E {
+                return visitor.visitArray(this);
+        }
+}
diff --git a/src/main/java/lv/enes/orang/ast/BinaryExpression.java b/ast/src/main/java/lv/enes/orang/ast/BinaryExpression.java
index c0b988c..fb8bac5 100644
--- a/src/main/java/lv/enes/orang/ast/BinaryExpression.java
+++ b/ast/src/main/java/lv/enes/orang/ast/BinaryExpression.java
@@ -1,8 +1,6 @@
 package lv.enes.orang.ast;
 
-import lv.enes.orang.OrangRuntimeException;
-import lv.enes.orang.Scope;
-import lv.enes.orang.value.Value;
+import lv.enes.orang.core.OrangException;
 
 public record BinaryExpression(Operator operator, Expression lhs, Expression rhs) implements Expression {
         public enum Operator {
@@ -34,20 +32,7 @@ public record BinaryExpression(Operator operator, Expression lhs, Expression rhs
         }
 
         @Override
-        public Value evaluateExpression(Scope scope) throws OrangRuntimeException {
-                var lhs = lhs().evaluateExpression(scope);
-                var rhs = rhs().evaluateExpression(scope);
-                return switch (operator) {
-                        case EQUALS -> lhs.orangEquals(rhs);
-                        case NOT_EQUALS -> lhs.notEquals(rhs);
-                        case GT -> lhs.greaterThan(rhs);
-                        case GTE -> lhs.greaterThanOrEqual(rhs);
-                        case LT -> lhs.lessThan(rhs);
-                        case LTE -> lhs.lessThanOrEqual(rhs);
-                        case ADD -> lhs.add(rhs);
-                        case SUBTRACT -> lhs.subtract(rhs);
-                        case MULTIPLY -> lhs.multiply(rhs);
-                        case DIVIDE -> lhs.divide(rhs);
-                };
+        public <R, E extends OrangException> R accept(ExpressionVisitor<R, E> visitor) throws E {
+                return visitor.visitBinaryExpression(this);
         }
 }
diff --git a/ast/src/main/java/lv/enes/orang/ast/BooleanLiteral.java b/ast/src/main/java/lv/enes/orang/ast/BooleanLiteral.java
new file mode 100644
index 0000000..16bf176
--- /dev/null
+++ b/ast/src/main/java/lv/enes/orang/ast/BooleanLiteral.java
@@ -0,0 +1,10 @@
+package lv.enes.orang.ast;
+
+import lv.enes.orang.core.OrangException;
+
+public record BooleanLiteral(boolean value) implements Expression {
+        @Override
+        public <R, E extends OrangException> R accept(ExpressionVisitor<R, E> visitor) throws E {
+                return visitor.visitBoolean(this);
+        }
+}
diff --git a/ast/src/main/java/lv/enes/orang/ast/CallExpression.java b/ast/src/main/java/lv/enes/orang/ast/CallExpression.java
new file mode 100644
index 0000000..38ff7bd
--- /dev/null
+++ b/ast/src/main/java/lv/enes/orang/ast/CallExpression.java
@@ -0,0 +1,10 @@
+package lv.enes.orang.ast;
+
+import lv.enes.orang.core.OrangException;
+
+public record CallExpression(Expression callee, Expression arg) implements Expression {
+        @Override
+        public <R, E extends OrangException> R accept(ExpressionVisitor<R, E> visitor) throws E {
+                return visitor.visitCallExpression(this);
+        }
+}
diff --git a/src/main/java/lv/enes/orang/ast/DefSpec.java b/ast/src/main/java/lv/enes/orang/ast/DefSpec.java
index 2233d3f..2233d3f 100644
--- a/src/main/java/lv/enes/orang/ast/DefSpec.java
+++ b/ast/src/main/java/lv/enes/orang/ast/DefSpec.java
diff --git a/ast/src/main/java/lv/enes/orang/ast/Definition.java b/ast/src/main/java/lv/enes/orang/ast/Definition.java
new file mode 100644
index 0000000..b41cb1f
--- /dev/null
+++ b/ast/src/main/java/lv/enes/orang/ast/Definition.java
@@ -0,0 +1,10 @@
+package lv.enes.orang.ast;
+
+import lv.enes.orang.core.OrangException;
+
+public record Definition(String name, Expression body) implements Statement {
+        @Override
+        public <R, E extends OrangException> R accept(StatementVisitor<R, E> visitor) throws E {
+                return visitor.visitDefinition(this);
+        }
+}
diff --git a/ast/src/main/java/lv/enes/orang/ast/DoExpression.java b/ast/src/main/java/lv/enes/orang/ast/DoExpression.java
new file mode 100644
index 0000000..47eaddd
--- /dev/null
+++ b/ast/src/main/java/lv/enes/orang/ast/DoExpression.java
@@ -0,0 +1,14 @@
+package lv.enes.orang.ast;
+
+import lv.enes.orang.core.OrangException;
+
+import java.util.List;
+
+public record DoExpression(List<Expression> body) implements Expression {
+        // assert body.!isEmpty()
+
+        @Override
+        public <R, E extends OrangException> R accept(ExpressionVisitor<R, E> visitor) throws E {
+                return visitor.visitDoExpression(this);
+        }
+}
diff --git a/ast/src/main/java/lv/enes/orang/ast/Expression.java b/ast/src/main/java/lv/enes/orang/ast/Expression.java
new file mode 100644
index 0000000..a3e2acc
--- /dev/null
+++ b/ast/src/main/java/lv/enes/orang/ast/Expression.java
@@ -0,0 +1,7 @@
+package lv.enes.orang.ast;
+
+import lv.enes.orang.core.OrangException;
+
+public interface Expression {
+        <R, E extends OrangException> R accept(ExpressionVisitor<R, E> visitor) throws E;
+}
diff --git a/ast/src/main/java/lv/enes/orang/ast/ExpressionStatement.java b/ast/src/main/java/lv/enes/orang/ast/ExpressionStatement.java
new file mode 100644
index 0000000..2a9dae1
--- /dev/null
+++ b/ast/src/main/java/lv/enes/orang/ast/ExpressionStatement.java
@@ -0,0 +1,10 @@
+package lv.enes.orang.ast;
+
+import lv.enes.orang.core.OrangException;
+
+public record ExpressionStatement(Expression expr) implements Statement {
+        @Override
+        public <R, E extends OrangException> R accept(StatementVisitor<R, E> visitor) throws E {
+                return visitor.visitExpression(this);
+        }
+}
diff --git a/ast/src/main/java/lv/enes/orang/ast/ExpressionVisitor.java b/ast/src/main/java/lv/enes/orang/ast/ExpressionVisitor.java
new file mode 100644
index 0000000..ddb1157
--- /dev/null
+++ b/ast/src/main/java/lv/enes/orang/ast/ExpressionVisitor.java
@@ -0,0 +1,22 @@
+package lv.enes.orang.ast;
+
+import lv.enes.orang.core.OrangException;
+
+public interface ExpressionVisitor<R, E extends OrangException> {
+        default R visit(Expression expression) throws E {
+                return expression.accept(this);
+        }
+
+        R visitArray(ArrayExpression array) throws E;
+        R visitBoolean(BooleanLiteral expr) throws E;
+        R visitBinaryExpression(BinaryExpression expr) throws E;
+        R visitCallExpression(CallExpression expr) throws E;
+        R visitDoExpression(DoExpression expr) throws E;
+        R visitFnExpression(FnExpression expr) throws E;
+        R visitIfElseExpression(IfElseExpression expr) throws E;
+        R visitIntLiteral(IntLiteral expr) throws E;
+        R visitLetInExpression(LetInExpression expr) throws E;
+        R visitStringLiteral(StringLiteral expr) throws E;
+        R visitUnaryExpression(UnaryExpression expr) throws E;
+        R visitVariable(VariableExpression expr) throws E;
+}
diff --git a/ast/src/main/java/lv/enes/orang/ast/FnExpression.java b/ast/src/main/java/lv/enes/orang/ast/FnExpression.java
new file mode 100644
index 0000000..68f43af
--- /dev/null
+++ b/ast/src/main/java/lv/enes/orang/ast/FnExpression.java
@@ -0,0 +1,11 @@
+package lv.enes.orang.ast;
+
+import lv.enes.orang.utils.NonEmptyList;
+import lv.enes.orang.core.OrangException;
+
+public record FnExpression(NonEmptyList<String> args, Expression body) implements Expression {
+        @Override
+        public <R, E extends OrangException> R accept(ExpressionVisitor<R, E> visitor) throws E {
+                return visitor.visitFnExpression(this);
+        }
+}
diff --git a/ast/src/main/java/lv/enes/orang/ast/IfElseExpression.java b/ast/src/main/java/lv/enes/orang/ast/IfElseExpression.java
new file mode 100644
index 0000000..86e48d4
--- /dev/null
+++ b/ast/src/main/java/lv/enes/orang/ast/IfElseExpression.java
@@ -0,0 +1,10 @@
+package lv.enes.orang.ast;
+
+import lv.enes.orang.core.OrangException;
+
+public record IfElseExpression(Expression condition, Expression trueBranch, Expression falseBranch) implements Expression {
+        @Override
+        public <R, E extends OrangException> R accept(ExpressionVisitor<R, E> visitor) throws E {
+                return visitor.visitIfElseExpression(this);
+        }
+}
diff --git a/ast/src/main/java/lv/enes/orang/ast/IntLiteral.java b/ast/src/main/java/lv/enes/orang/ast/IntLiteral.java
new file mode 100644
index 0000000..12333c9
--- /dev/null
+++ b/ast/src/main/java/lv/enes/orang/ast/IntLiteral.java
@@ -0,0 +1,10 @@
+package lv.enes.orang.ast;
+
+import lv.enes.orang.core.OrangException;
+
+public record IntLiteral(int value) implements Expression {
+        @Override
+        public <R, E extends OrangException> R accept(ExpressionVisitor<R, E> visitor) throws E {
+                return visitor.visitIntLiteral(this);
+        }
+}
diff --git a/ast/src/main/java/lv/enes/orang/ast/LetInExpression.java b/ast/src/main/java/lv/enes/orang/ast/LetInExpression.java
new file mode 100644
index 0000000..b292f08
--- /dev/null
+++ b/ast/src/main/java/lv/enes/orang/ast/LetInExpression.java
@@ -0,0 +1,14 @@
+package lv.enes.orang.ast;
+
+import lv.enes.orang.core.OrangException;
+
+import java.util.List;
+
+public record LetInExpression(List<Binding> bindings, Expression body) implements Expression {
+        @Override
+        public <R, E extends OrangException> R accept(ExpressionVisitor<R, E> visitor) throws E {
+                return visitor.visitLetInExpression(this);
+        }
+
+        public record Binding(String name, Expression value) {}
+}
diff --git a/ast/src/main/java/lv/enes/orang/ast/Program.java b/ast/src/main/java/lv/enes/orang/ast/Program.java
new file mode 100644
index 0000000..9b38f3b
--- /dev/null
+++ b/ast/src/main/java/lv/enes/orang/ast/Program.java
@@ -0,0 +1,12 @@
+package lv.enes.orang.ast;
+
+import lv.enes.orang.core.OrangException;
+
+import java.util.List;
+
+public record Program(List<Statement> statements) implements Statement {
+        @Override
+        public <R, E extends OrangException> R accept(StatementVisitor<R, E> visitor) throws E {
+                return visitor.visitProgram(this);
+        }
+}
diff --git a/ast/src/main/java/lv/enes/orang/ast/Statement.java b/ast/src/main/java/lv/enes/orang/ast/Statement.java
new file mode 100644
index 0000000..283fd40
--- /dev/null
+++ b/ast/src/main/java/lv/enes/orang/ast/Statement.java
@@ -0,0 +1,7 @@
+package lv.enes.orang.ast;
+
+import lv.enes.orang.core.OrangException;
+
+public interface Statement {
+        <R, E extends OrangException> R accept(StatementVisitor<R, E> visitor) throws E;
+}
diff --git a/ast/src/main/java/lv/enes/orang/ast/StatementVisitor.java b/ast/src/main/java/lv/enes/orang/ast/StatementVisitor.java
new file mode 100644
index 0000000..fa3b2f6
--- /dev/null
+++ b/ast/src/main/java/lv/enes/orang/ast/StatementVisitor.java
@@ -0,0 +1,13 @@
+package lv.enes.orang.ast;
+
+import lv.enes.orang.core.OrangException;
+
+public interface StatementVisitor<R, E extends OrangException> {
+        default R visit(Statement stmt) throws E {
+                return stmt.accept(this);
+        }
+
+        R visitDefinition(Definition def) throws E;
+        R visitExpression(ExpressionStatement expr) throws E;
+        R visitProgram(Program program) throws E;
+}
diff --git a/ast/src/main/java/lv/enes/orang/ast/StringLiteral.java b/ast/src/main/java/lv/enes/orang/ast/StringLiteral.java
new file mode 100644
index 0000000..5c47b7e
--- /dev/null
+++ b/ast/src/main/java/lv/enes/orang/ast/StringLiteral.java
@@ -0,0 +1,10 @@
+package lv.enes.orang.ast;
+
+import lv.enes.orang.core.OrangException;
+
+public record StringLiteral(String value) implements Expression {
+        @Override
+        public <R, E extends OrangException> R accept(ExpressionVisitor<R, E> visitor) throws E {
+                return visitor.visitStringLiteral(this);
+        }
+}
diff --git a/ast/src/main/java/lv/enes/orang/ast/UnaryExpression.java b/ast/src/main/java/lv/enes/orang/ast/UnaryExpression.java
new file mode 100644
index 0000000..d96ae6d
--- /dev/null
+++ b/ast/src/main/java/lv/enes/orang/ast/UnaryExpression.java
@@ -0,0 +1,16 @@
+package lv.enes.orang.ast;
+
+import lv.enes.orang.core.OrangException;
+
+public record UnaryExpression(Operator operator, Expression child) implements Expression {
+        public enum Operator {
+                PLUS,
+                NEGATE,
+                NOT,
+        }
+
+        @Override
+        public <R, E extends OrangException> R accept(ExpressionVisitor<R, E> visitor) throws E {
+                return visitor.visitUnaryExpression(this);
+        }
+}
diff --git a/ast/src/main/java/lv/enes/orang/ast/VariableExpression.java b/ast/src/main/java/lv/enes/orang/ast/VariableExpression.java
new file mode 100644
index 0000000..615857b
--- /dev/null
+++ b/ast/src/main/java/lv/enes/orang/ast/VariableExpression.java
@@ -0,0 +1,10 @@
+package lv.enes.orang.ast;
+
+import lv.enes.orang.core.OrangException;
+
+public record VariableExpression(String name) implements Expression {
+        @Override
+        public <R, E extends OrangException> R accept(ExpressionVisitor<R, E> visitor) throws E {
+                return visitor.visitVariable(this);
+        }
+}
diff --git a/ast/src/main/java/module-info.java b/ast/src/main/java/module-info.java
new file mode 100644
index 0000000..7ebe37b
--- /dev/null
+++ b/ast/src/main/java/module-info.java
@@ -0,0 +1,6 @@
+module lv.enes.orang.ast {
+        exports lv.enes.orang.ast;
+
+        requires lv.enes.orang.core;
+        requires lv.enes.orang.utils;
+}
\ No newline at end of file