Code maintenance and changes

3 files changed, 24 insertions, 3 deletions

diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcdata/FunctionalMap.java b/BJC-Utils2/src/main/java/bjc/utils/funcdata/FunctionalMap.java
index 0eb2e94..f1d4cc6 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/FunctionalMap.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/FunctionalMap.java
@@ -32,6 +32,16 @@ public class FunctionalMap<K, V> {
 		public V2 get(K key) {
 			return transformer.apply(mapToTransform.get(key));
 		}
+
+		@Override
+		public boolean containsKey(K key) {
+			return mapToTransform.containsKey(key);
+		}
+
+		@Override
+		public String toString() {
+			return mapToTransform.toString();
+		}
 	}
 
 	private Map<K, V> wrappedMap;
@@ -108,7 +118,7 @@ public class FunctionalMap<K, V> {
 			throw new NullPointerException("Key must not be null");
 		}
 
-		if (wrappedMap.containsKey(wrappedMap)) {
+		if (wrappedMap.containsKey(key)) {
 			return wrappedMap.get(key);
 		} else {
 			throw new IllegalArgumentException(
@@ -148,4 +158,9 @@ public class FunctionalMap<K, V> {
 	public boolean containsKey(K key) {
 		return wrappedMap.containsKey(key);
 	}
-}
+
+	@Override
+	public String toString() {
+		return wrappedMap.toString();
+	}
+}
\ No newline at end of file
diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/AST.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/AST.java
index d5ae3f2..c4450f8 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/AST.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/AST.java
@@ -224,6 +224,8 @@ public class AST<T> {
 
 		internalToString(builder, -1);
 
+		builder.deleteCharAt(builder.length() - 1);
+
 		return builder.toString();
 	}
 
diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/TreeConstructor.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/TreeConstructor.java
index 28ca1e3..6fedf87 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/TreeConstructor.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/TreeConstructor.java
@@ -41,7 +41,11 @@ public class TreeConstructor {
 					} else {
 						if (queue.size() < 2) {
 							throw new IllegalStateException(
-									"Attempted to parse binary operator without enough operands");
+									"Attempted to parse binary operator without enough operands.\n"
+											+ "Problem operator is "
+											+ element
+											+ "\nPossible operand is: \n\t"
+											+ queue.peek());
 						}
 
 						AST<T> rightAST = queue.pop();