@fraczak/k 2.1.3 → 2.1.5

package/README.md

@@ -185,6 +185,7 @@ can be written as `[.toto, .titi, 123]`.
 
 _Codes_ (prefixed by `$`) can be defined by taged union and product. E.g.:
 
+
       $nat = <nat 1, {} 0>;
       $pair = {nat x, nat y};
 
@@ -217,7 +218,7 @@ i.e., turn into a regular vector using `CARET` (`^`) operator. E.g.:
        [1,2,3]                            -->  []
 ```
 
-The PIPE operator can be used, e.g., to define a Cartesian product:
+The PIPE operator can be used for defining the Cartesian product:
 
 ```k
     [.0 |, .1 |] ^ :
@@ -241,13 +242,11 @@ 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:
+**WARNING**: When using `CARET` operator paranthesis may be required, e.g., like in:
 
 ```k
-   { |(| PLUS ^ .0) ^  x,  | | PLUS ^ .0 ^  y }:
-     [[[1,2],[3,4]],[[5,6],[7,8]]]   --> {"x":[3,11],"y":[3,7]}
+    | ( [|,|] ^ ) ^ :
+        [[1,2],[3,4]]     -->  [[[1,1],[1,2],[2,1],[2,2]],[[3,3],[3,4],[4,3],[4,4]]]             
 ```
 
 ---

package/package.json

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

package/repl.mjs

@@ -46,30 +46,31 @@ const re = /^[ \n\t]*(?:--l[ ]+)(.+[^ ])[ ]*?$/;
           file = line.match(re)[1];
           console.log(`-- loading file: ${file} ...`);
           kScript = fs.readFileSync(file).toString();
-          val = k.compile(kScript)(val);
+          val = k.compile(kScript + "\n()")(val);
           console.log(`=> ${JSON.stringify(val)}`);
         } else if (line.match(/^[ \n\t]*(?:--a)?$/)) {
           console.log(JSON.stringify(run.defs, " ", 2));
         } else if (line.match(/^[ \n\t]*(?:--r)?$/)) {
-          (function (defs, result) {
-            if (defs == null) {
-              return result;
-            }
-            return (function (prettyRel) {
-              var ref1, relExps, relName;
-              ref1 = defs.rels;
-              for (relName in ref1) {
-                relExps = ref1[relName];
-                result[relName] = relExps.map(prettyRel);
+          console.log(
+            (function (defs, result) {
+              if (defs == null) {
+                return result;
               }
-              return result;
-            })(
-              prettyRel.bind(
-                null,
-                prettyCode.bind(null, defs.codes, defs.representatives)
-              )
-            );
-          })(run.defs, {})
+              return (function (prettyRel) {
+                var ref1, relExps, relName;
+                ref1 = defs.rels;
+                for (relName in ref1) {
+                  relExps = ref1[relName];
+                  result[relName] = relExps.map(prettyRel);
+                }
+                return result;
+              })(
+                prettyRel.bind(
+                  null,
+                  prettyCode.bind(null, defs.codes, defs.representatives)
+                )
+              );
+            })(run.defs, {}));
         } else if (line.match(/^[ \n\t]*(?:--c)?$/)) {
           console.log(
             (function (defs, result) {

package/run.mjs

@@ -164,6 +164,7 @@ function run(exp, value) {
         exp = exp.comp[exp.comp.length - 1];
         continue;
       case "union":
+        if (exp.union.length === 0) return;
         for (let i = 0, len = exp.union.length -1; i < len; i++) {
           const result = run(exp.union[i], value);
           if (result !== undefined) {