2 files changed, 20 insertions, 9 deletions
diff --git a/Shenanigans/src/org/archphantom/shenanigans/elements/values/Array.java b/Shenanigans/src/org/archphantom/shenanigans/elements/values/Array.java
index c03b66f..242e81a 100644
--- a/Shenanigans/src/org/archphantom/shenanigans/elements/values/Array.java
+++ b/Shenanigans/src/org/archphantom/shenanigans/elements/values/Array.java
@@ -1,36 +1,47 @@
 package org.archphantom.shenanigans.elements.values;
 import java.util.ArrayList;
 import org.archphantom.shenanigans.elements.Program;
-import org.archphantom.shenanigans.elements.expressions.Expression;
 import org.archphantom.shenanigans.elements.variables.VarTable;
 
 public class Array extends Value {
-	private ArrayList<Expression> vals;
+	private ArrayList<Value> vals;
 	
-	public Array (ArrayList<Expression> values) {
+	public Array () {
+		this.vals = new ArrayList<Value>();
+	}
+	
+	public Array (ArrayList<Value> values) {
 		this.vals = values;
 	}
 	
 	public Array (String string) {
-		this.vals = new ArrayList<Expression>(string.length());
+		this.vals = new ArrayList<Value>(string.length());
 		for (int i = 0; i < string.length(); i++) {
 			this.vals.add(new CharValue(string.charAt(i)));
 		}
 	}
 	
-	public Expression getElement (IntValue index, VarTable vars, Program program) {
+	public Value getElement (IntValue index, VarTable vars, Program program) {
 		return vals.get(index.intValue(vars, program).intValue());
 	}
 	
-	public Expression setElement (IntValue index, Expression value, VarTable vars, Program program) {
-		return vals.set(index.intValue(vars, program).intValue(), value);
+	public Value setElement (IntValue index, Value value, VarTable vars, Program program) {
+		int iindex = index.intValue(vars, program).intValue();
+		int size = vals.size();
+		if (iindex >= size) {
+			for (int i = size; i <= iindex; i++) {
+				vals.add(null);
+			}
+		}
+		vals.set(index.intValue(vars, program).intValue(), value);
+		return value;
 	}
 	
 	public int size () {
 		return vals.size();
 	}
 
-	public ArrayList<Expression> getValue(VarTable vars, Program program) {
+	public ArrayList<Value> getValue(VarTable vars, Program program) {
 		return vals;
 	}
 
diff --git a/Shenanigans/src/org/archphantom/shenanigans/elements/values/Namespace.java b/Shenanigans/src/org/archphantom/shenanigans/elements/values/Namespace.java
index 5b33bf2..81bfd27 100644
--- a/Shenanigans/src/org/archphantom/shenanigans/elements/values/Namespace.java
+++ b/Shenanigans/src/org/archphantom/shenanigans/elements/values/Namespace.java
@@ -18,7 +18,7 @@ public class Namespace extends Value {
 		return name;
 	}
 	
-	public Expression getVar (String identifier, VarTable vars, Program program) {
+	public Value getVar (String identifier, VarTable vars, Program program) {
 		if (identifier.contains(".")) {
 			String nspacecall = identifier.substring(0, identifier.indexOf('.'));
 			String varname = identifier.substring(identifier.indexOf('.')+1);