@fraczak/k 4.0.4 → 5.0.0

package/repl.mjs

@@ -6,14 +6,17 @@ import k from "./index.mjs";
 import {run, closeVector } from "./run.mjs";
 import { prettyCode, prettyRel, patterns2filters } from "./pretty.mjs";
 import { find } from "./codes.mjs";
+import { exportRelation } from "./export.mjs";
 
 
-const splice = [].splice;
+let DEBUG_FLAG = false;
 
 console.log("Very! experimental repl shell for 'k-language'...");
 
 const help = function () {
-  // console.log("  --debug      loads codes and relations as value");
+  console.log(`  --debug        toggle debug flag: [${DEBUG_FLAG?'ON':'OFF'}]`);
+  if (DEBUG_FLAG)
+    console.log("  --load         loads codes and relations as value");
   console.log("  --c            print aliased codes");
   console.log("  --C code       print 'code' definition");
   console.log("  --r            print relations");
@@ -88,40 +91,42 @@ function evaluate(line) {
       // console.log(kScript);
       val = k.compile("+++\n" + kScript + "\n()")(val);
       printVal();
-    } else if (line.match(/^[ \n\t]*--debug$/)) {
       // --debug
+    } else if (line.match(/^[ \n\t]*--debug$/)) {
+      DEBUG_FLAG = ! DEBUG_FLAG;
+      // --load
+    } else if (line.match(/^[ \n\t]*--load$/)) {
       val = run.defs;
       console.log(val);
       // --r
     } else if (line.match(/^[ \n\t]*(?:--r)?$/)) {
-      console.log(
+      console.log("BUILT-IN:", run.builtin);
+      console.log("USER-DEFINED:",
         (function (defs, result) {
           if (defs == null) {
             return result;
           }
-          return (function (prettyRel) {
-            for (const relName in defs.rels) {
-              if (relName != "__main__")
-                result[relName] = prettyRel(defs.rels[relName].def);
-            }
-            return result;
-          })(
-            prettyRel.bind(
-              null,
-              prettyCode.bind(null, defs.representatives)
-            )
-          );
+          
+          for (const relName in defs.rels) {
+            if (relName != "__main__")
+              result[relName] = prettyRel(defs.rels[relName].def);
+          }
+          return result;
         })(run.defs, {}));
         // --c
     } else if (line.match(/^[ \n\t]*(?:--c)?$/)) {
       console.log(
         (function (defs, result) {
           for (const codeName of Object.keys(defs.representatives || {})) {
-            const codeExp = find(defs.representatives[codeName] || codeName);
-            result[codeName] = prettyCode(
-              defs.representatives,
-              codeExp
-            );
+            const codeRep = defs.representatives[codeName] || codeName;
+            if (codeName == codeRep) {
+              result[codeName] = prettyCode(
+                defs.representatives,
+                find(codeRep)
+              );
+            } else if (! codeName.startsWith(":")) {
+              result[codeName] = codeRep;
+            }
           }
           return result;
         })(run.defs || {}, {})
@@ -161,18 +166,33 @@ function evaluate(line) {
       const relName = line.match(re__R)[1];
       const rel = run.defs?.rels[relName];
       if (!rel) {
+        if (relName in run.builtin) {
+          console.log(` -- builtin relation: ${relName}\n    ${relName} = ${run.builtin[relName]}`);
+          return;
+        }
         console.log(` -- relation '${relName}' not found`);
         return;
       }
+      const canonicalRelName = run.defs.relAlias[relName];
       const filters = patterns2filters(rel.typePatternGraph, ...rel.def.patterns);
       // console.log(filters);
       // console.log(" variables:", JSON.stringify(variables));
       // console.log(JSON.stringify({filters, variables}, null, 2));
       // 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} = ${prettyRel(pcodef,rel.def)};`);
+      const filtersStr = filters.map( x => prettyRel( {op: "filter", filter: x}));
+      // console.log(` -- canonical relation name: ${canonicalRelName} --`);
+      // console.log(`  ${relName} : ${filtersStr[0]}  -->  ${filtersStr[1]}`);
+      // console.log(`  ${relName} = ${prettyRel(rel.def)};`);
+      // console.log(`  ${relName} = ${prettyRel(rel.simplified)};`);
+      console.log({
+        name: canonicalRelName,
+        type: `${filtersStr[0]}  -->  ${filtersStr[1]}`,
+        def: prettyRel(rel.simplified)
+      });
+      if (DEBUG_FLAG) {
+        val = exportRelation(run.defs.rels, run.defs.relAlias, relName);
+        console.log(val);
+      }
       // }
       // ------ k code
     } else if (!line.match(/^[ \n\t]*(?:#.*)?$/)) {

package/run.mjs

@@ -263,5 +263,7 @@ function run(exp, value) {
   };
 }
 
+run.builtin = builtin;
+
 export default run;
 export { run , closeVector };