More bug fixes

Author: tomdodd4598

src/dssl/interpret/BuiltIn.java

@@ -1000,6 +1000,7 @@ protected void init() {
 		KEYWORDS.add("dup");
 
 		KEYWORDS.add("stacksize");
+		KEYWORDS.add("stackindex");
 
 		KEYWORDS.add("read");
 		KEYWORDS.add("print");

src/dssl/interpret/element/DictElement.java

@@ -130,7 +130,7 @@ public void putAll(TokenExecutor exec, @NonNull Element elem) {
 
 	@Override
 	public void removeEntry(TokenExecutor exec, @NonNull Element elem0, @NonNull Element elem1) {
-		value.remove(elem0, elem1);
+		value.remove(elem0.toKey(exec), elem1);
 	}
 
 	@Override
@@ -140,13 +140,18 @@ public boolean containsKey(TokenExecutor exec, @NonNull Element elem) {
 
 	@Override
 	public boolean containsValue(TokenExecutor exec, @NonNull Element elem) {
-		return value.containsValue(elem);
+		for (@NonNull Element e : value.values()) {
+			if (elem.dynEqualTo(exec, e)) {
+				return true;
+			}
+		}
+		return false;
 	}
 
 	@Override
 	public boolean containsEntry(TokenExecutor exec, @NonNull Element elem0, @NonNull Element elem1) {
 		@SuppressWarnings("null") Element get = value.get(elem0.toKey(exec));
-		return get == null ? false : get.equals(elem1);
+		return get == null ? false : get.dynEqualTo(exec, elem1);
 	}
 
 	@Override
@@ -177,7 +182,7 @@ public boolean containsEntry(TokenExecutor exec, @NonNull Element elem0, @NonNul
 	@SuppressWarnings("null")
 	@Override
 	public int hash(TokenExecutor exec) {
-		int hash = BuiltIn.LIST.hashCode();
+		int hash = BuiltIn.DICT.hashCode();
 		for (Entry<@NonNull ElementKey, @NonNull Element> entry : value.entrySet()) {
 			hash = 31 * hash + (entry.getKey().hashCode() ^ entry.getValue().dynHash(exec));
 		}

src/dssl/interpret/element/RangeElement.java

@@ -51,21 +51,22 @@ else if (elemCount == 2) {
 			step = args[2];
 		}
 
-		if (step.equals(BigInteger.ZERO)) {
+		int stepSignum = step.signum();
+		if (stepSignum == 0) {
 			throw new IllegalArgumentException(String.format("Range element constructed with zero step size!"));
 		}
 
 		BigInteger diff = stop.subtract(start);
-		int diffComp = diff.compareTo(BigInteger.ZERO), stepComp = step.compareTo(BigInteger.ZERO);
-		if ((diffComp > 0 && stepComp < 0) || (diffComp < 0 && stepComp > 0)) {
+		int diffSignum = diff.signum();
+		if ((stepSignum < 0 && diffSignum > 0) || (stepSignum > 0 && diffSignum < 0)) {
 			throw new IllegalArgumentException(String.format("Range element constructed with invalid arguments start = %s, stop = %s, step = %s!", start, stop, step));
 		}
 
 		this.start = start;
 		this.stop = stop;
 		this.step = step;
 
-		size = diff.abs().subtract(BigInteger.ONE).divide(step.abs()).add(BigInteger.ONE).longValueExact();
+		size = diffSignum == 0 ? 0L : diff.abs().subtract(BigInteger.ONE).divide(step.abs()).add(BigInteger.ONE).longValueExact();
 	}
 
 	public RangeElement(Interpreter interpreter, @NonNull BigInteger start, @NonNull BigInteger stop, @NonNull BigInteger step, long size) {
@@ -154,10 +155,17 @@ public boolean contains(TokenExecutor exec, @NonNull Element elem) {
 		}
 
 		@NonNull BigInteger intValue = intElem.value.raw;
-		if (intValue.compareTo(start) < 0 || intValue.compareTo(stop) >= 0) {
-			return false;
+		if (step.signum() > 0) {
+			if (intValue.compareTo(start) < 0 || intValue.compareTo(stop) >= 0) {
+				return false;
+			}
 		}
-		return intValue.subtract(start).mod(step).equals(BigInteger.ZERO);
+		else {
+			if (intValue.compareTo(start) > 0 || intValue.compareTo(stop) <= 0) {
+				return false;
+			}
+		}
+		return intValue.subtract(start).remainder(step).equals(BigInteger.ZERO);
 	}
 
 	@Override
@@ -219,8 +227,15 @@ public boolean containsAll(TokenExecutor exec, @NonNull Element elem) {
 		}
 
 		@NonNull BigInteger intValue = intElem.value.raw;
-		if (intValue.compareTo(start) < 0 || intValue.compareTo(stop) >= 0) {
-			return interpreter.builtIn.nullElement;
+		if (step.signum() > 0) {
+			if (intValue.compareTo(start) < 0 || intValue.compareTo(stop) >= 0) {
+				return interpreter.builtIn.nullElement;
+			}
+		}
+		else {
+			if (intValue.compareTo(start) > 0 || intValue.compareTo(stop) <= 0) {
+				return interpreter.builtIn.nullElement;
+			}
 		}
 
 		BigInteger[] divRem = intValue.subtract(start).divideAndRemainder(step);
@@ -232,7 +247,7 @@ protected BigInteger at(long index) {
 	}
 
 	protected void methodIndexBoundsCheck(long index, String name) {
-		if (index >= size) {
+		if (index < 0 || index >= size) {
 			throw new IndexOutOfBoundsException(String.format("Built-in method \"%s\" (index: %s, size: %s)", name, index, size));
 		}
 	}
@@ -255,7 +270,7 @@ public int hashCode() {
 	@Override
 	public boolean equals(Object obj) {
 		if (obj instanceof RangeElement other) {
-			return start == other.start && stop == other.stop && step == other.step;
+			return start.equals(other.start) && stop.equals(other.stop) && step.equals(other.step);
 		}
 		return false;
 	}

src/dssl/interpret/element/iter/ChunksIterElement.java

@@ -11,7 +11,6 @@ public class ChunksIterElement extends IterElement {
 	protected final long size;
 
 	protected @Nullable ListElement next = null;
-	protected boolean end = false;
 
 	public ChunksIterElement(Interpreter interpreter, IterElement internal, long size) {
 		super(interpreter);
@@ -20,24 +19,26 @@ public ChunksIterElement(Interpreter interpreter, IterElement internal, long siz
 	}
 
 	protected void prepare(TokenExecutor exec) {
-		if (next == null && !end) {
+		if (next == null) {
 			long count = 0;
 			while (internal.hasNext(exec)) {
-				if (count++ >= size) {
+				if (next == null) {
 					next = new ListElement(interpreter);
-					return;
 				}
-				next.value.add(internal.next(exec));
+				if (count++ < size) {
+					next.value.add(internal.next(exec));
+				}
+				else {
+					break;
+				}
 			}
-			
-			end = true;
 		}
 	}
 
 	@Override
 	public boolean hasNext(TokenExecutor exec) {
 		prepare(exec);
-		return !end;
+		return next != null;
 	}
 
 	@SuppressWarnings("null")

src/dssl/interpret/element/primitive/StringElement.java

@@ -35,7 +35,7 @@ public StringElement(Interpreter interpreter, @NonNull String rawValue) {
 
 	@Override
 	public @NonNull TokenResult onConcat(TokenExecutor exec, @NonNull Element other) {
-		exec.push(new StringElement(interpreter, toString(exec) + other.stringCast(exec)));
+		exec.push(new StringElement(interpreter, toString(exec) + other.stringCast(exec).toString(exec)));
 		return TokenResult.PASS;
 	}