made sure ITEM OF returns data matching the shape specified by the qu…

…ery struct
jmoenig · Jan 3, 2024 · 42c457d · 42c457d
1 parent 24fa14b
commit 42c457d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -3,10 +3,12 @@
 ## in development:
 * **Notable Fixes:**
     * fixed a RESHAPE edge case when passing in a single zero dimension
+    * made sure ITEM OF returns data matching the shape specified by the query struct
 
 2024-01-03
 * new dev version for v9.1.2
 * lists: fixed a RESHAPE edge case when passing in a single zero dimension
+* lists: made sure ITEM OF returns data matching the shape specified by the query struct 
 
 ## 9.1.1:
 * **Notable Fixes:**

diff --git a/src/lists.js b/src/lists.js
@@ -485,9 +485,12 @@ List.prototype.query = function (indices) {
     } else {
         select = new List([first]);
     }
-    return select.map(i => this.lookup(i)).map(
-            e => e instanceof List? e.query(indices.cdr()) : e
-    );
+    return select.map(i => this.lookup(i)).map(e => {
+        let rest = indices.cdr();
+        return e instanceof List ? e.query(rest)
+            : (rest.isEmpty() ? e
+                : new List([e]).query(rest));
+    });
 };
 
 List.prototype.slice = function (indices) {