Fixed: LIST() did not encapsulate non-list values properly.

BlackRookSoftware · Jan 9, 2022 · a48ec98 · a48ec98
1 parent c905885
commit a48ec98
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -3,6 +3,12 @@ RookScript (C) Black Rook Software
 by Matt Tropiano et al. (see AUTHORS.txt)
 
 
+Changed in 1.14.1
+-----------------
+
+- `Fixed` Host function `LIST()` did not encapsulate non-list values properly.
+
+
 Changed in 1.14.0
 -----------------
 

diff --git a/src/main/java/com/blackrook/rookscript/functions/common/ListFunctions.java b/src/main/java/com/blackrook/rookscript/functions/common/ListFunctions.java
@@ -57,7 +57,7 @@ public boolean execute(ScriptInstance scriptInstance, ScriptValue returnValue)
 				scriptInstance.popStackValue(value);
 				if (value.isList())
 				{
-					returnValue.setEmptyList(value.length());
+					returnValue.setEmptyList(value.length(), value.length());
 					for (int i = 0; i < value.length(); i++)
 					{
 						value.listGetByIndex(i, temp);
@@ -66,7 +66,7 @@ public boolean execute(ScriptInstance scriptInstance, ScriptValue returnValue)
 				}
 				else
 				{
-					returnValue.setEmptyList(4);
+					returnValue.setEmptyList(1, 4);
 					returnValue.listSetByIndex(0, value);
 				}
 				return true;

diff --git a/src/test/resources/scripts/test7.txt b/src/test/resources/scripts/test7.txt
@@ -0,0 +1,9 @@
+
+entry main()
+{
+	x = [1,2];
+	println(list(1));
+	println(list(x));
+	println(list(x) === x); // should be false
+	println(listnew(1));
+}