@fraczak/k 2.1.0 → 2.1.1

package/README.md

@@ -205,7 +205,7 @@ by `[ codeExp ]`. All members of the vector are the same code. E.g.,
                                           -- of integers and a vector of strings
 ---
 
-### List comprehension on vectors
+### List comprehension on vectors (experimental!)
 
 A vector can be "open" by PIPE (`|`) operator so the following partial function is applied to
 each element of the vector one by one, yielding another open value. An open value can be "closed", 
@@ -241,6 +241,15 @@ times value `x` appears in the list. (see `Examples/list-comprehension.k` for a
     $ int;        
 ```
 
+**WARNING**: The `CARET` operator makes composition not associative, i.e., if you use
+nested _list comprehension_ you cannot drop paranthesis anymore.
+E.g., `| (| PLUS ^ .0) ^` and `| | PLUS ^ .0 ^` are two different functions:
+
+```k
+   { |(| PLUS ^ .0) ^  x,  | | PLUS ^ .0 ^  y }:
+     [[[1,2],[3,4]],[[5,6],[7,8]]]   --> {"x":[3,11],"y":[3,7]}
+```
+
 ---
 
 ## Examples

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fraczak/k",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "description": "k-language for JSON-like data transformation",
     "main": "index.mjs",
     "scripts": {

package/run.mjs

@@ -10,7 +10,16 @@ function isOpen(x) {
 function isClosed(x) {
   return (Array.isArray(x) && !x.open);
 }
-  
+
+Array.prototype.toJSON = function () {
+  if (this.open) {
+    // throw new Error(`Cannot serialize open vector: ${JSON.stringify([...this])}.`);
+    return {"OPEN VECTOR": [...this]};
+  }
+  return this;
+};
+
+
 const builtin = {
   "_log!": (arg) => {
     console.error(`_log!: ${JSON.stringify(arg)}`);

package/symbol-table.mjs

@@ -52,26 +52,42 @@ function is_full_rel(rel) {
   }
 }
 
+function does_list_comprehension (e) {
+  switch (e.op) {
+    case "caret":
+      return true;
+    case "comp":
+      return e.comp.some((e) => e.op === "caret");
+    default:
+      return false;
+  }
+}
+
 function comp_first(e1, e2) {
   if (is_identity_rel(e1)) return e2;
   if (is_identity_rel(e2)) return e1;
   if (is_empty_rel(e1)) return e1;
   if (is_empty_rel(e2)) return e2;
-  if (e1.op === "comp" && e2.op === "comp")
-    return {
-      op: "comp",
-      comp: [].concat(e1.comp, e2.comp),
-    };
-  if (e1.op === "comp")
-    return {
-      op: "comp",
-      comp: [].concat(e1.comp, [e2]),
-    };
-  if (e2.op === "comp")
-    return {
-      op: "comp",
-      comp: [].concat([e1], e2.comp),
-    };
+  if (! does_list_comprehension(e1) && ! does_list_comprehension(e2)) {
+    if (e1.op === "comp" && e2.op === "comp") {
+      return {
+        op: "comp",
+        comp: [].concat(e1.comp, e2.comp),
+      };
+    }
+    if (e1.op === "comp") {
+      return {
+        op: "comp",
+        comp: [].concat(e1.comp, [e2]),
+      };
+    }
+    if (e2.op === "comp") {
+      return {
+        op: "comp",
+        comp: [].concat([e1], e2.comp),
+      };
+    }
+  }
   return {
     op: "comp",
     comp: [e1, e2],