@fraczak/k 4.0.2 → 4.0.4

package/package.json

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

package/repl.mjs

@@ -15,11 +15,11 @@ console.log("Very! experimental repl shell for 'k-language'...");
 const help = function () {
   // console.log("  --debug      loads codes and relations as value");
   console.log("  --c            print aliased codes");
-  console.log("  --C code       print code definition");
-  console.log("  --r            print rels");
-  console.log("  --R rel        print out the type pattern of 'rel'");
+  console.log("  --C code       print 'code' definition");
+  console.log("  --r            print relations");
+  console.log("  --R rel        print 'rel' definition with type patterns");
   console.log("  --p (--pp)     pretty-print last value");
-  console.log("  --s (--g) reg  store (get) the last value in register 'reg'");
+  console.log("  --s (--g) reg  store (get) the current value in (from) register 'reg'");
   console.log("  --regs         print register names");
   console.log("  --l file.k     load 'file.k'");
 };
@@ -54,7 +54,7 @@ const printVal = function (v = val) {
   if (v === undefined)
     console.log("...",v);
   else
-    console.log(`=> ${JSON.stringify(v)}`);
+    console.log(`--> ${JSON.stringify(v)}`);
   rl.setPrompt('> ');
 }
 const registers = {};
@@ -100,10 +100,9 @@ function evaluate(line) {
             return result;
           }
           return (function (prettyRel) {
-            let ref1, relName;
-            ref1 = defs.rels;
-            for (relName in ref1) {
-              result[relName] = prettyRel(ref1[relName].def);
+            for (const relName in defs.rels) {
+              if (relName != "__main__")
+                result[relName] = prettyRel(defs.rels[relName].def);
             }
             return result;
           })(
@@ -172,7 +171,8 @@ function evaluate(line) {
       // for (const filter of filters) {
       const pcodef= prettyCode.bind(null, run.defs.representatives);
       const filtersStr = filters.map( x => prettyRel(pcodef, {op: "filter", filter: x}));
-      console.log(`  ${relName} :  ${filtersStr[0]}  -->  ${filtersStr[1]}`);
+      console.log(`  ${relName} : ${filtersStr[0]}  -->  ${filtersStr[1]}`);
+      console.log(`  ${relName} = ${prettyRel(pcodef,rel.def)};`);
       // }
       // ------ k code
     } else if (!line.match(/^[ \n\t]*(?:#.*)?$/)) {
@@ -180,12 +180,11 @@ function evaluate(line) {
         val = k.run(`+++\n${line}\n()`, val);
         printVal();
       } catch (error) {
-        e = error;
-        console.error("ERROR:");
-        console.error(e);
+        console.error(error.message);
       }
     }
   } catch (e) {
     console.error(e.message);
+    console.error(e);
   }
 }

package/run.mjs

@@ -248,7 +248,9 @@ function run(exp, value) {
       }
       case "caret": {
         const result = run(exp.caret, value);
-        assert(isOpen(result), "CARET (^): Only an 'open' vector can be closed.");
+        // assert(isOpen(result), "CARET (^): Only an 'open' vector can be closed.");
+        if (! isOpen(result))
+          throw new Error(`Type Error (line: ${exp.end?.line}:${exp.end?.column}): CARET (^): Only 'unboxed' values can be 'boxed'.`)
         return [...result];
       }  
       case "filter": {

package/TYPES.md

@@ -1,32 +0,0 @@
-# What if we concider partial functions as filter-to-filter mappings?
-
-## Examples
-
-```k
-.x :: ( X x, ... ) -> X
-{ f1 x1, f2 x2, ..., fn xn } :: X -> { f1(X) x1, f2(X) x2, ..., fn(X) xn }
-{ f x } :: X -> < f(X) x, ... >
-< f1, f2, ..., fn > :: X -> f1(X) // f1 == f2 == ... == fn
-[ f1, f2, ..., fn ] :: X -> [f1(X)] // f1 == f2 == ... == fn
-$code :: 
-```
-
-Let's consider the following example:
-
-```k
-$nat = < {} _, nat s >;
-z = {{} _};   -- X -> <{} _, ...>
-s = {() s};   -- X -> <X s, ...>
-
-add = 
-  <
-    {.x ._ if, .y then} .then,
-    {.x .s x, .y s y } add
-  >
-;
-
-double = {() x, () y} add;
-
-z s s $nat double;
-```
-