@fraczak/k 2.1.6 → 3.0.2

package/repl.mjs

@@ -15,12 +15,20 @@ const help = function () {
   console.log(" --a          print codes and relations");
   console.log(" --c          print codes");
   console.log(" --r          print rels");
-  return console.log(" --l file.k   load 'file.k'");
+  console.log(" --pp         pretty-print last value");
+  console.log(" --s reg      store the last value in register 'reg'");
+  console.log(" --g reg      get the value from register 'reg'");
+  console.log(" --regs       print registers names");
+  console.log(" --l file.k   load 'file.k'");
 };
 
 help();
 
-const re = /^[ \n\t]*(?:--l[ ]+)(.+[^ ])[ ]*?$/;
+const re__l = /^[ \n\t]*(?:--l[ ]+)(.+)[ ]*?$/;
+const re__s = /^[ \n\t]*(?:--s[ ]+)(.+)[ ]*?$/;
+const re__g = /^[ \n\t]*(?:--g[ ]+)(.+)[ ]*?$/;
+
+const registers = {};
 
 (function (val, buffer) {
   return process.stdin.on("data", function (data) {
@@ -38,18 +46,22 @@ const re = /^[ \n\t]*(?:--l[ ]+)(.+[^ ])[ ]*?$/;
           val = {};
         }
         if (line.match(/^[ \n\t]*(?:--h)?$/)) {
+          // --h
           help();
         } else if (line.match(/^[ \n\t]*\^$/)) {
           val = closeVector(val); 
           console.log(`=> ${JSON.stringify(val)}`);
-        } else if (line.match(re)) {
-          file = line.match(re)[1];
-          console.log(`-- loading file: ${file} ...`);
+        } else if (line.match(re__l)) {
+          // --l 
+          file = line.match(re__l)[1];
+          console.log(` -- loading file: ${file} ...`);
           kScript = fs.readFileSync(file).toString();
           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));
+          // --a
+          val = run.defs;
+          console.log(val);
         } else if (line.match(/^[ \n\t]*(?:--r)?$/)) {
           console.log(
             (function (defs, result) {
@@ -90,6 +102,23 @@ const re = /^[ \n\t]*(?:--l[ ]+)(.+[^ ])[ ]*?$/;
               return result;
             })(run.defs, {})
           );
+          // --p
+        } else if (line.match(/^[ \n\t]*(?:--pp)?$/)) {
+          console.log(val);
+          // --s
+        } else if (line.match(/^[ \n\t]*(?:--regs)?$/)) {
+          console.log(` -- registers: ${Object.keys(registers).join(", ")}`);
+        } else if (line.match(re__s)) {
+          let reg = line.match(re__s)[1];
+          registers[reg] = val;
+          console.log(` -- current value stored in register: '${reg}'`);
+          // --g
+        } else if (line.match(re__g)) {
+          console.log(" -- getting value from register...");
+          let reg = line.match(re__g)[1];
+          val = registers[reg];
+          console.log(val);
+          // ------ k code
         } else if (!line.match(/^[ \n\t]*(?:#.*)?$/)) {
           try {
             val = k.run(`${line} ()`, val);

package/run.mjs

@@ -59,7 +59,7 @@ const builtin = {
   null: () => null,
   toJSON: (x) => JSON.stringify(x),
   fromJSON: (x) => JSON.parse(x),
-  CONS: ([x, y]) => { try { return [x, ...y]; } catch (e) { return undefined; } },
+  CONS: (arg) => { try { return [arg[0], ...arg[1]]; } catch (e) { return undefined; } },
   SNOC: (x) => (x.length > 1 ? [x[0], x.slice(1)] : undefined),
   toDateMsec: (x) => new Date(x).getTime(),
   toDateStr: (x) => new Date(x).toISOString(),
@@ -254,6 +254,9 @@ function run(exp, value) {
         assert(isOpen(result), "CARET (^): Only an 'open' vector can be closed.");
         return [...result];
       }  
+      case "filter": {
+        return value;
+      }
       default:
         assert(false,`Unknown operation: '${exp.op}'`);
     

package/symbol-table.mjs

@@ -97,7 +97,7 @@ function union  (rels) {
     const new_rels = rel.op === "union" ? rel.union : [rel];
     for (const new_rel of new_rels) {
       list.push(new_rel);
-      if (is_full_rel(new_rel)) break label;
+      // if (is_full_rel(new_rel)) break label;
     }
   }
   if (list.length === 1) return list[0];

package/test-filters.mjs

@@ -0,0 +1,45 @@
+import {  unify_with_code } from './filters.mjs';
+import k from './index.mjs';
+// { compile, run, parse, annotate };
+
+const annotated = k.annotate(`
+  $nat = < {} _, nat s >;
+  $pair = { nat x, nat y };
+  $list = < {} empty, { nat x, list xs } list>;
+  z = {{} _} $nat;
+  s = { $nat s} $nat;
+  f1 = ? { n x, ...};
+  f2 = ? { <...> y, ...};
+  f3 = ? < x empty, { $MWqNxWxHMy xs, ...} list >;
+  {} 
+  `);
+
+
+
+// console.log(JSON.stringify(annotated, null, 2));
+
+
+
+const test1 = unify_with_code(
+  annotated.codes, 
+  annotated.representatives["pair"], 
+  annotated.rels['f1'][0].filter,
+  {}
+);
+console.log(JSON.stringify(test1, null, 2));
+
+const test2 = unify_with_code(
+  annotated.codes, 
+  annotated.representatives["pair"], 
+  annotated.rels['f2'][0].filter,
+  {}
+);
+console.log(JSON.stringify(test2, null, 2));
+
+const test3 = unify_with_code(
+  annotated.codes, 
+  annotated.representatives["list"], 
+  annotated.rels['f3'][0].filter,
+  {}
+);
+console.log(JSON.stringify(test3, null, 2));

package/test-fingerprint.mjs

@@ -0,0 +1,38 @@
+import k from './index.mjs';
+import { encodeCodeToString } from './codes.mjs';
+import hash from './hash.mjs';
+[
+    `
+    $nat = < {} zero, nat succ>;
+    $pair = {nat x, nat y};
+    $b = {int"x", bool y};
+    $vector = [int];
+    $tree = <{nat value, tree left, tree right} binary, {nat value} leaf, {nat value, tree tree} unary, [tree] list_of_trees>;
+  
+    succ = { $nat succ} $nat;
+    plus = $pair <
+      {.x.zero stop, .y result} .result,
+      {.x.succ x, .y succ y } plus
+    > $nat;
+  {{} zero} succ succ {() x, () y} plus
+    `     
+  ].map(function (script) {
+    console.log(`k_expression = '${script}';`);
+    const annotated = k.annotate(script);
+    for (const code in annotated.codes) {
+      console.log(`CODE: ${code}`);
+      const s = encodeCodeToString(code,annotated.codes);
+      console.log(` - DEFS: ${s}`);;
+      const annotated2 = k.annotate(s+" {}");;
+      const s2 = encodeCodeToString(annotated2.representatives["C0"],annotated2.codes);
+      console.log(` - reparsed FINGERPRINT: ${hash(s2)}`);
+      if ((s === s2) && (hash(s) === hash(s2))) {
+        console.log('--- OK');
+      } else {
+        console.log('--- ERROR');
+      }
+
+      console.log('-------------------');
+    }
+  });
+  

package/test.mjs

@@ -34,7 +34,7 @@ import k from "./index.mjs";
 });
 
 let k_expression =
-  '{.name nom, <[.age, 18] GT .0, [.age, 12] GT "ado", "enfant"> age}';
+  '{.name nom, <[.age, 18] GT "old", [.age, 12] GT "ado", "enfant"> age}';
 
 let k_fn = k.compile(k_expression);
 
@@ -61,48 +61,6 @@ console.log("");
   return console.log("");
 });
 
-k_expression = "$t = < i: int, t: [ t ] > ; <$t, $int>";
-
-k_fn = k.compile(k_expression);
-
-console.log(`var k_fn = k.compile('${k_expression}');`);
-
-console.log("");
-
-[
-  1,
-  {
-    i: 1,
-  },
-  [
-    {
-      i: 2,
-    },
-    {
-      i: 3,
-    },
-    {
-      t: [],
-    },
-  ],
-  {
-    t: [
-      {
-        i: 2,
-      },
-      {
-        i: 3,
-      },
-      {
-        t: [],
-      },
-    ],
-  },
-].map(function (data) {
-  console.log(`k_fn(${JSON.stringify(data)});`);
-  console.log(`// RETURNS: ${JSON.stringify(k_fn(data))}`);
-  return console.log("");
-});
 
 k_expression = "$ < < [ int ] ints, [ bool ] bools > list, string None>";