Added scopes, variables and functions

5 files changed, 94 insertions, 4 deletions

diff --git a/main/core/parser/ASTGenerator.java b/main/core/parser/ASTGenerator.java
index 548735b..3d19a8c 100644
--- a/main/core/parser/ASTGenerator.java
+++ b/main/core/parser/ASTGenerator.java
@@ -2,6 +2,7 @@ package com.jantuomi.interpreter.main.core.parser;
 
 import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
 import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
+import com.jantuomi.interpreter.main.exception.InterpreterException;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,7 +19,7 @@ public class ASTGenerator {
         return instance;
     }
 
-    public List<ASTNode> generate(List<Token> trees) {
+    public List<ASTNode> generate(List<Token> trees) throws InterpreterException {
         List<ASTNode> list = new ArrayList<>();
 
         for (Token root : trees) {
diff --git a/main/core/parser/ast/AssignmentNode.java b/main/core/parser/ast/AssignmentNode.java
new file mode 100644
index 0000000..bcbff1c
--- /dev/null
+++ b/main/core/parser/ast/AssignmentNode.java
@@ -0,0 +1,33 @@
+package com.jantuomi.interpreter.main.core.parser.ast;
+
+import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
+import com.jantuomi.interpreter.main.core.runtime.State;
+import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Created by jan on 21.6.2016.
+ */
+public class AssignmentNode extends BinaryOperatorNode {
+    public AssignmentNode(Token token, SymbolNode lhs, ASTNode rhs) {
+        super(token, lhs, rhs);
+    }
+
+    @Override
+    public DataContainer evaluate() {
+        SymbolNode symbol = (SymbolNode) lhs;
+        DataContainer rValue = rhs.evaluate();
+        State.getInstance().setSymbolValueToScope(
+                symbol.getName(),
+                rValue
+        );
+        return rValue;
+    }
+
+    @Override
+    List<ASTNode> getChildren() {
+        return Arrays.asList(lhs, rhs);
+    }
+}
diff --git a/main/core/parser/ast/FunctionDefineNode.java b/main/core/parser/ast/FunctionDefineNode.java
index e867f78..2402bed 100644
--- a/main/core/parser/ast/FunctionDefineNode.java
+++ b/main/core/parser/ast/FunctionDefineNode.java
@@ -1,8 +1,14 @@
 package com.jantuomi.interpreter.main.core.parser.ast;
 
 import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
+import com.jantuomi.interpreter.main.core.parser.datatype.StringDataContainer;
+import com.jantuomi.interpreter.main.core.runtime.Function;
+import com.jantuomi.interpreter.main.core.runtime.State;
 import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Created by jan on 17.6.2016.
  */
@@ -26,8 +32,15 @@ public class FunctionDefineNode extends VarargOperatorNode {
 
     @Override
     public DataContainer evaluate() {
-        // TODO add function in State
-        return null;
+        List<String> argumentNames = new ArrayList<>();
+        for (ASTNode arg : args) {
+            SymbolNode argSym = (SymbolNode) arg;
+            argumentNames.add(argSym.getName());
+        }
+        Function function = new Function(argumentNames, (FunctionBodyNode) body);
+        State.getInstance().addFunctionToScope(name, function);
+
+        return new StringDataContainer("function " + name);
     }
 
     @Override
diff --git a/main/core/parser/ast/SymbolNode.java b/main/core/parser/ast/SymbolNode.java
index 7ea8d96..4dfb403 100644
--- a/main/core/parser/ast/SymbolNode.java
+++ b/main/core/parser/ast/SymbolNode.java
@@ -4,6 +4,7 @@ import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
 import com.jantuomi.interpreter.main.core.runtime.State;
 import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -26,6 +27,10 @@ public class SymbolNode extends ASTNode {
         this.name = name;
     }
 
+    public String getName() {
+        return name;
+    }
+
     private String name;
 
     public SymbolNode(Token token) {
@@ -34,7 +39,13 @@ public class SymbolNode extends ASTNode {
 
     @Override
     public DataContainer evaluate() {
-        return State.getInstance().getSymbolValue(name, parameterListNode.getParameters());
+        List<DataContainer> paramValues = new ArrayList<>();
+        if (parameterListNode != null) {
+            for (ASTNode param : parameterListNode.getChildren()) {
+                paramValues.add(param.evaluate());
+            }
+        }
+        return State.getInstance().getSymbolValue(name, paramValues);
     }
 
     @Override
diff --git a/main/core/parser/ast/VariableDeclareNode.java b/main/core/parser/ast/VariableDeclareNode.java
new file mode 100644
index 0000000..185edda
--- /dev/null
+++ b/main/core/parser/ast/VariableDeclareNode.java
@@ -0,0 +1,32 @@
+package com.jantuomi.interpreter.main.core.parser.ast;
+
+import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
+import com.jantuomi.interpreter.main.core.parser.datatype.StringDataContainer;
+import com.jantuomi.interpreter.main.core.runtime.State;
+import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Created by jan on 20.6.2016.
+ */
+public class VariableDeclareNode extends ASTNode {
+    private SymbolNode variable;
+
+    public VariableDeclareNode(Token source, SymbolNode variable) {
+        super(source);
+        this.variable = variable;
+    }
+
+    @Override
+    public DataContainer evaluate() {
+        State.getInstance().addSymbolToScope(variable.getName());
+        return new StringDataContainer(variable.getName());
+    }
+
+    @Override
+    List<ASTNode> getChildren() {
+        return Arrays.asList();
+    }
+}