@fraczak/k 3.0.2 → 3.1.0

package/repl.mjs

@@ -15,7 +15,8 @@ const help = function () {
   console.log(" --a          print codes and relations");
   console.log(" --c          print codes");
   console.log(" --r          print rels");
-  console.log(" --pp         pretty-print last value");
+  console.log(" --p          pretty-print last value");
+  console.log(" --pp         pretty-print last value (abrevaited)");
   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");
@@ -56,7 +57,9 @@ const registers = {};
           file = line.match(re__l)[1];
           console.log(` -- loading file: ${file} ...`);
           kScript = fs.readFileSync(file).toString();
-          val = k.compile(kScript + "\n()")(val);
+          console.log(` ----------------------------- compiling file: ${file} ...`);
+          // console.log(kScript);
+          val = k.compile("+++" + kScript + "\n()")(val);
           console.log(`=> ${JSON.stringify(val)}`);
         } else if (line.match(/^[ \n\t]*(?:--a)?$/)) {
           // --a
@@ -69,11 +72,10 @@ const registers = {};
                 return result;
               }
               return (function (prettyRel) {
-                var ref1, relExps, relName;
+                var ref1, relName;
                 ref1 = defs.rels;
                 for (relName in ref1) {
-                  relExps = ref1[relName];
-                  result[relName] = relExps.map(prettyRel);
+                  result[relName] = prettyRel(ref1[relName].def);
                 }
                 return result;
               })(
@@ -102,10 +104,14 @@ const registers = {};
               return result;
             })(run.defs, {})
           );
-          // --p
+          // --pp
         } else if (line.match(/^[ \n\t]*(?:--pp)?$/)) {
           console.log(val);
           // --s
+         // --p
+        } else if (line.match(/^[ \n\t]*(?:--p)?$/)) {
+          console.log(JSON.stringify(val, null, 2));
+          // --s
         } else if (line.match(/^[ \n\t]*(?:--regs)?$/)) {
           console.log(` -- registers: ${Object.keys(registers).join(", ")}`);
         } else if (line.match(re__s)) {
@@ -121,7 +127,7 @@ const registers = {};
           // ------ k code
         } else if (!line.match(/^[ \n\t]*(?:#.*)?$/)) {
           try {
-            val = k.run(`${line} ()`, val);
+            val = k.run(`+++ ${line} ()`, val);
             console.log(`=> ${JSON.stringify(val)}`);
           } catch (error) {
             e = error;

package/run.mjs

@@ -54,13 +54,14 @@ const builtin = {
   },
   FDIV: ([x, y]) => x / y,
   CONCAT: (strs) => strs.join(""),
+  toVEC: (str) => [...str],
   true: () => true,
   false: () => false,
   null: () => null,
   toJSON: (x) => JSON.stringify(x),
   fromJSON: (x) => JSON.parse(x),
-  CONS: (arg) => { try { return [arg[0], ...arg[1]]; } catch (e) { return undefined; } },
-  SNOC: (x) => (x.length > 1 ? [x[0], x.slice(1)] : undefined),
+  CONS: ({car, cdr}) => { try { return [car, ...cdr]; } catch (e) { return undefined; } },
+  SNOC: (x) => (x.length > 1 ? {car: x[0], cdr: x.slice(1)} : undefined),
   toDateMsec: (x) => new Date(x).getTime(),
   toDateStr: (x) => new Date(x).toISOString(),
 };
@@ -131,10 +132,10 @@ function run(exp, value) {
       case "str":
       case "int":
         return exp[exp.op];
-      case "ref":
+      case "ref": {
         const defn = run.defs.rels[exp.ref];
-        if (defn != null) {
-          exp = defn[defn.length - 1];
+        if (defn != undefined) {
+          exp = defn.def;
           continue;
         }
         const builtin_func = builtin[exp.ref];
@@ -142,6 +143,7 @@ function run(exp, value) {
           return builtin_func(value);
         }
         throw(`Unknown ref: '${exp.ref}'`);
+      }
       case "dot":
         // a hack to allow something like 'null . null' or '0 . 0' to work by returning unit
         if (value === null || typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {

package/symbol-table.mjs

@@ -1,14 +1,8 @@
-const rels = {};
-const codes = {
-  "{}": {
-    code: "product",
-    product: {},
-  },
-};
-
-const identity = {
-  op: "identity",
-};
+import hash from "./hash.mjs";
+
+const unitCode = hash('$C0={};'); 
+
+const identity = {op: "identity"}
 
 function is_identity_rel(rel) {
   return rel.op === "identity";
@@ -46,7 +40,9 @@ function is_full_rel(rel) {
     case "vector":
       return Object.values(rel[rel.op]).every(is_full_rel);
     case "product":
-      return Object.values(rel[rel.op]).every(({ exp }) => is_full_rel(exp));
+      return Object.values(rel[rel.op]).every(({ exp }) =>
+        is_full_rel(exp)
+      );
     default:
       return false;
   }
@@ -81,7 +77,7 @@ function comp_first(e1, e2) {
   };
 }
 
-function comp (e1, e2)  {
+function comp(e1, e2) {
   const result = comp_first(e1, e2);
   if (result.op !== "comp") return result;
   result.comp = result.comp.reduceRight(
@@ -91,7 +87,8 @@ function comp (e1, e2)  {
   return result;
 }
 
-function union  (rels) {
+
+function union(rels) {
   const list = [];
   label: for (const rel of rels) {
     const new_rels = rel.op === "union" ? rel.union : [rel];
@@ -105,32 +102,38 @@ function union  (rels) {
     op: "union",
     union: list,
   };
-};
-
-function as_ref (codeExp) {
-  if (codeExp.code === "ref") return codeExp.ref;
-  const newName = `:${Object.keys(codes).length}`;
-  codes[newName] = codeExp;
-  return newName;
-};
-
-function add_rel (name, rel) {
-  if (rels[name] == null) rels[name] = [];
-  rels[name].push(rel);
-};
-
-function add_code (name, code) {
-  codes[name] = code;
 }
 
-export default {
-  identity,
-  comp,
-  union,
-  rels,
-  codes,
-  add_rel,
-  add_code,
-  as_ref,
-};
-export { identity, comp, union, rels, codes, add_rel, add_code, as_ref };
+class SymbolTable {
+  constructor() {
+    this.rels = {}; // name -> {def: rel_exp}
+    this.codes = {
+      [unitCode]: {
+        code: "product",
+        product: {},
+      },
+    };
+  }
+
+  as_ref(codeExp) {
+    if (codeExp.code === "ref") return codeExp.ref;
+    const newName = `:${Object.keys(this.codes).length}`;
+    this.codes[newName] = codeExp;
+    return newName;
+  }
+
+  add_rel(name, rel) {
+    if (this.rels[name] != undefined)
+      console.error(`SymbolTable: rel ${name} already defined (lines ${rel.start?.line}:${rel.start?.column}...${rel.end?.line}:${rel.end?.column})`);
+
+    this.rels[name] = {def: rel};
+  }
+
+  add_code(name, code) {
+    this.codes[name] = code;
+  }
+}
+
+export default { SymbolTable, comp, union, identity };
+export { SymbolTable, comp, union, identity };
+

package/test-filters.mjs

@@ -23,7 +23,7 @@ const annotated = k.annotate(`
 const test1 = unify_with_code(
   annotated.codes, 
   annotated.representatives["pair"], 
-  annotated.rels['f1'][0].filter,
+  annotated.rels['f1'].def.filter,
   {}
 );
 console.log(JSON.stringify(test1, null, 2));
@@ -31,7 +31,7 @@ console.log(JSON.stringify(test1, null, 2));
 const test2 = unify_with_code(
   annotated.codes, 
   annotated.representatives["pair"], 
-  annotated.rels['f2'][0].filter,
+  annotated.rels['f2'].def.filter,
   {}
 );
 console.log(JSON.stringify(test2, null, 2));
@@ -39,7 +39,7 @@ console.log(JSON.stringify(test2, null, 2));
 const test3 = unify_with_code(
   annotated.codes, 
   annotated.representatives["list"], 
-  annotated.rels['f3'][0].filter,
+  annotated.rels['f3'].def.filter,
   {}
 );
 console.log(JSON.stringify(test3, null, 2));

package/typing-test.mjs

@@ -0,0 +1,40 @@
+import t from './typing.mjs';
+// const t = await import('./typing.mjs');
+const g = new t.typePatternGraph();
+
+const pu = {pattern: '(...)', fields: []};
+
+// x = .x;     {   {   5   x }     x  i,  {   true   x }      x   b }
+//    0   1   2  3   4   5    6  7  8    9  10    11    12  13  14  15
+
+for (var i = 0; i < 16; i++) { g.addNewNode(pu); }
+
+g.addNewNode({pattern: '(...)'}, {x: [1]}); // 16
+g.unify("y:input", 0,16); // 17
+
+// 
+g.unify('main:input',2,3,4,9,10); // 18
+
+g.addNewNode({pattern: '{}'}, {i: [8], b: [14]}); // 19
+g.unify("main:output", 15,19); // 20
+
+g.unify('comp:chain',6,7); // 21
+g.unify('comp:chain',12,13); // 22
+
+
+// {5 x}
+g.addNewNode({pattern: '<...>'}, {x: [5]}); // 23
+g.unify('variant:output',6,23); // 24
+
+// {true x}
+g.addNewNode({pattern: '<...>'}, {x: [11]}); // 25
+g.unify('variant:output',12,25); // 26
+
+
+// 5
+g.addNewNode({pattern: 'type', type: 'int'}); // 27
+g.unify('5:outout',5,27); // 28
+
+// true
+g.addNewNode({pattern: 'type', type: 'bool'}); // 29
+g.unify('true:output',11,29); // 30