Update

6 files changed, 95 insertions, 30 deletions

diff --git a/scl/src/main/java/bjc/dicelang/scl/StreamEngine.java b/scl/src/main/java/bjc/dicelang/scl/StreamEngine.java
index 7d7c39e..59c2121 100644
--- a/scl/src/main/java/bjc/dicelang/scl/StreamEngine.java
+++ b/scl/src/main/java/bjc/dicelang/scl/StreamEngine.java
@@ -10,7 +10,6 @@ import bjc.utils.funcdata.IMap;
 import bjc.utils.funcutils.ListUtils;
 
 import java.util.Arrays;
-import java.util.function.BooleanSupplier;
 import java.util.function.Predicate;
 
 import static bjc.dicelang.scl.Errors.ErrorKey.*;
diff --git a/scl/src/main/java/bjc/dicelang/scl/tokens/ArraySCLToken.java b/scl/src/main/java/bjc/dicelang/scl/tokens/ArraySCLToken.java
index 28cab78..a06a0fd 100644
--- a/scl/src/main/java/bjc/dicelang/scl/tokens/ArraySCLToken.java
+++ b/scl/src/main/java/bjc/dicelang/scl/tokens/ArraySCLToken.java
@@ -2,8 +2,20 @@ package bjc.dicelang.scl.tokens;
 
 import bjc.utils.funcdata.IList;
 
+/**
+ * Represents an array token.
+ * 
+ * @author student
+ *
+ */
 public class ArraySCLToken extends WordListSCLToken {
 
+	/**
+	 * Create a new array token.
+	 * 
+	 * @param tokens
+	 *            The tokens in the array.
+	 */
 	public ArraySCLToken(IList<SCLToken> tokens) {
 		super(true, tokens);
 	}
diff --git a/scl/src/main/java/bjc/dicelang/scl/tokens/BooleanSCLToken.java b/scl/src/main/java/bjc/dicelang/scl/tokens/BooleanSCLToken.java
index c62e4a6..25fb1ac 100644
--- a/scl/src/main/java/bjc/dicelang/scl/tokens/BooleanSCLToken.java
+++ b/scl/src/main/java/bjc/dicelang/scl/tokens/BooleanSCLToken.java
@@ -1,9 +1,23 @@
 package bjc.dicelang.scl.tokens;
 
+/**
+ * Represents a boolean token.
+ * 
+ * @author student
+ *
+ */
 public class BooleanSCLToken extends SCLToken {
-	/* Used for BLIT */
+	/**
+	 * The value of the token.
+	 */
 	public boolean boolVal;
 
+	/**
+	 * Create a new token.
+	 * 
+	 * @param val
+	 *            The value of the token.
+	 */
 	public BooleanSCLToken(boolean val) {
 		super(Type.BLIT);
 
@@ -20,11 +34,15 @@ public class BooleanSCLToken extends SCLToken {
 
 	@Override
 	public boolean equals(Object obj) {
-		if(this == obj) return true;
-		if(!super.equals(obj)) return false;
-		if(getClass() != obj.getClass()) return false;
+		if (this == obj)
+			return true;
+		if (!super.equals(obj))
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
 		BooleanSCLToken other = (BooleanSCLToken) obj;
-		if(boolVal != other.boolVal) return false;
+		if (boolVal != other.boolVal)
+			return false;
 		return true;
 	}
 
diff --git a/scl/src/main/java/bjc/dicelang/scl/tokens/FloatSCLToken.java b/scl/src/main/java/bjc/dicelang/scl/tokens/FloatSCLToken.java
index 6c07c4d..ee924c9 100644
--- a/scl/src/main/java/bjc/dicelang/scl/tokens/FloatSCLToken.java
+++ b/scl/src/main/java/bjc/dicelang/scl/tokens/FloatSCLToken.java
@@ -1,9 +1,23 @@
 package bjc.dicelang.scl.tokens;
 
+/**
+ * Represents a floating-point token.
+ * 
+ * @author student
+ *
+ */
 public class FloatSCLToken extends SCLToken {
-	/* Used for FLIT */
+	/**
+	 * The value of the token.
+	 */
 	public double floatVal;
 
+	/**
+	 * Create a new floating-point token.
+	 * 
+	 * @param val
+	 *            The value of the token.
+	 */
 	public FloatSCLToken(double val) {
 		super(Type.FLIT);
 
@@ -22,11 +36,15 @@ public class FloatSCLToken extends SCLToken {
 
 	@Override
 	public boolean equals(Object obj) {
-		if(this == obj) return true;
-		if(!super.equals(obj)) return false;
-		if(getClass() != obj.getClass()) return false;
+		if (this == obj)
+			return true;
+		if (!super.equals(obj))
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
 		FloatSCLToken other = (FloatSCLToken) obj;
-		if(Double.doubleToLongBits(floatVal) != Double.doubleToLongBits(other.floatVal)) return false;
+		if (Double.doubleToLongBits(floatVal) != Double.doubleToLongBits(other.floatVal))
+			return false;
 		return true;
 	}
 
diff --git a/scl/src/main/java/bjc/dicelang/scl/tokens/IntSCLToken.java b/scl/src/main/java/bjc/dicelang/scl/tokens/IntSCLToken.java
index b185926..03be900 100644
--- a/scl/src/main/java/bjc/dicelang/scl/tokens/IntSCLToken.java
+++ b/scl/src/main/java/bjc/dicelang/scl/tokens/IntSCLToken.java
@@ -1,15 +1,23 @@
 package bjc.dicelang.scl.tokens;
 
+/**
+ * Represents an integer token.
+ * 
+ * @author student
+ *
+ */
 public class IntSCLToken extends SCLToken {
-	/* Used for ILIT */
+	/**
+	 * The integer value of the token.
+	 */
 	public long intVal;
 
-	/* Create a new token. */
-	public IntSCLToken(final Type typ) {
-		super(typ);
-	}
-
-	/* Create a new token. */
+	/**
+	 * Create a new integer token.
+	 * 
+	 * @param iVal
+	 *            The value of the token.
+	 */
 	public IntSCLToken(final long iVal) {
 		super(Type.ILIT);
 
diff --git a/scl/src/main/java/bjc/dicelang/scl/tokens/SCLToken.java b/scl/src/main/java/bjc/dicelang/scl/tokens/SCLToken.java
index d729705..127756b 100644
--- a/scl/src/main/java/bjc/dicelang/scl/tokens/SCLToken.java
+++ b/scl/src/main/java/bjc/dicelang/scl/tokens/SCLToken.java
@@ -9,6 +9,12 @@ import bjc.utils.parserutils.TokenUtils;
 import static bjc.dicelang.scl.Errors.ErrorKey.*;
 import static bjc.dicelang.scl.tokens.SCLToken.Type.*;
 
+/**
+ * Base class for SCL tokens.
+ * 
+ * @author student
+ *
+ */
 public class SCLToken {
 
 	public static enum Type {
@@ -22,19 +28,19 @@ public class SCLToken {
 	public SCLToken.Type type;
 
 	public static SCLToken tokenizeString(final String token) {
-		if(litTokens.containsKey(token)) {
-			return new IntSCLToken(litTokens.get(token));
-		} else if(token.startsWith("\\")) {
+		if (litTokens.containsKey(token)) {
+			return new SCLToken(litTokens.get(token));
+		} else if (token.startsWith("\\")) {
 			return new SymbolSCLToken(token.substring(1));
-		} else if(WordSCLToken.isBuiltinWord(token)) {
+		} else if (WordSCLToken.isBuiltinWord(token)) {
 			return new WordSCLToken(token);
-		} else if(token.equals("true")) {
+		} else if (token.equals("true")) {
 			return new BooleanSCLToken(true);
-		} else if(token.equals("false")) {
+		} else if (token.equals("false")) {
 			return new BooleanSCLToken(false);
-		} else if(TokenUtils.isInt(token)) {
+		} else if (TokenUtils.isInt(token)) {
 			return new IntSCLToken(Long.parseLong(token));
-		} else if(TokenUtils.isDouble(token)) {
+		} else if (TokenUtils.isDouble(token)) {
 			return new FloatSCLToken(Double.parseDouble(token));
 		} else {
 			Errors.inst.printError(EK_SCL_INVTOKEN, token);
@@ -72,11 +78,15 @@ public class SCLToken {
 
 	@Override
 	public boolean equals(Object obj) {
-		if(this == obj) return true;
-		if(obj == null) return false;
-		if(getClass() != obj.getClass()) return false;
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
 		SCLToken other = (SCLToken) obj;
-		if(type != other.type) return false;
+		if (type != other.type)
+			return false;
 		return true;
 	}