@fraczak/k 1.2.2 → 1.3.0

package/repl.coffee

@@ -1,6 +1,7 @@
 #!/usr/bin/env coffee
 k = require "./"
 run = require "./run"
+{prettyCode, prettyRel} = require "./pretty"
 
 console.log "Very! experimental repl shell for 'k-language'..."
 
@@ -8,6 +9,7 @@ help = ->
   console.log " --h          print help"
   console.log " --a          print codes and relations"
   console.log " --c          print codes"
+  console.log " --r          print rels"
   console.log " --l file.k   load 'file.k'"
 
 help()
@@ -35,8 +37,19 @@ do (val = {}, buffer = []) ->
           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)?$/
+          console.log do (defs = run.defs, result = {}) ->
+            return result unless defs?
+            do (prettyRel = prettyRel.bind null, prettyCode.bind null, defs.codes, defs.representatives) ->
+              for relName, relExps of defs.rels
+                result[relName] = relExps.map prettyRel
+              result
         else if line.match /^[ \n\t]*(?:--c)?$/
-          console.log JSON.stringify {codes: run.defs?.codes, reps: run.defs?.representatives}, " ", 2
+          console.log do (defs = run.defs, result = {}) ->
+            return result unless defs?
+            for codeName, codeExp of defs.codes
+              result[codeName] = prettyCode defs.codes, defs.representatives, codeExp
+            result 
         else if not line.match /^[ \n\t]*(?:#.*)?$/
           try
             val = k.run "#{line} ()", val 

package/repl.js

@@ -1,19 +1,22 @@
 // Generated by CoffeeScript 2.7.0
 (function() {
   //!/usr/bin/env coffee
-  var help, k, re, run,
+  var help, k, prettyCode, prettyRel, re, run,
     splice = [].splice;
 
   k = require("./");
 
   run = require("./run");
 
+  ({prettyCode, prettyRel} = require("./pretty"));
+
   console.log("Very! experimental repl shell for 'k-language'...");
 
   help = function() {
     console.log(" --h          print help");
     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'");
   };
 
@@ -23,7 +26,7 @@
 
   (function(val, buffer) {
     return process.stdin.on('data', function(data) {
-      var e, file, first, i, last, len, line, ref, ref1, ref2, rest, results, todo;
+      var e, file, first, i, last, len, line, ref, rest, results, todo;
       [first, ...rest] = data.toString("utf8").split("\n");
       buffer.push(first);
       if (rest.length > 0) {
@@ -46,11 +49,34 @@
             results.push(console.log(`=> ${JSON.stringify(val)}`));
           } else if (line.match(/^[ \n\t]*(?:--a)?$/)) {
             results.push(console.log(JSON.stringify(run.defs, " ", 2)));
+          } else if (line.match(/^[ \n\t]*(?:--r)?$/)) {
+            results.push(console.log((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);
+                }
+                return result;
+              })(prettyRel.bind(null, prettyCode.bind(null, defs.codes, defs.representatives)));
+            })(run.defs, {})));
           } else if (line.match(/^[ \n\t]*(?:--c)?$/)) {
-            results.push(console.log(JSON.stringify({
-              codes: (ref1 = run.defs) != null ? ref1.codes : void 0,
-              reps: (ref2 = run.defs) != null ? ref2.representatives : void 0
-            }, " ", 2)));
+            results.push(console.log((function(defs, result) {
+              var codeExp, codeName, ref1;
+              if (defs == null) {
+                return result;
+              }
+              ref1 = defs.codes;
+              for (codeName in ref1) {
+                codeExp = ref1[codeName];
+                result[codeName] = prettyCode(defs.codes, defs.representatives, codeExp);
+              }
+              return result;
+            })(run.defs, {})));
           } else if (!line.match(/^[ \n\t]*(?:#.*)?$/)) {
             try {
               val = k.run(`${line} ()`, val);

package/repl.sh

@@ -2,19 +2,22 @@
 // Generated by CoffeeScript 2.7.0
 (function() {
   //!/usr/bin/env coffee
-  var help, k, re, run,
+  var help, k, prettyCode, prettyRel, re, run,
     splice = [].splice;
 
   k = require("./");
 
   run = require("./run");
 
+  ({prettyCode, prettyRel} = require("./pretty"));
+
   console.log("Very! experimental repl shell for 'k-language'...");
 
   help = function() {
     console.log(" --h          print help");
     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'");
   };
 
@@ -24,7 +27,7 @@
 
   (function(val, buffer) {
     return process.stdin.on('data', function(data) {
-      var e, file, first, i, last, len, line, ref, ref1, ref2, rest, results, todo;
+      var e, file, first, i, last, len, line, ref, rest, results, todo;
       [first, ...rest] = data.toString("utf8").split("\n");
       buffer.push(first);
       if (rest.length > 0) {
@@ -47,11 +50,34 @@
             results.push(console.log(`=> ${JSON.stringify(val)}`));
           } else if (line.match(/^[ \n\t]*(?:--a)?$/)) {
             results.push(console.log(JSON.stringify(run.defs, " ", 2)));
+          } else if (line.match(/^[ \n\t]*(?:--r)?$/)) {
+            results.push(console.log((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);
+                }
+                return result;
+              })(prettyRel.bind(null, prettyCode.bind(null, defs.codes, defs.representatives)));
+            })(run.defs, {})));
           } else if (line.match(/^[ \n\t]*(?:--c)?$/)) {
-            results.push(console.log(JSON.stringify({
-              codes: (ref1 = run.defs) != null ? ref1.codes : void 0,
-              reps: (ref2 = run.defs) != null ? ref2.representatives : void 0
-            }, " ", 2)));
+            results.push(console.log((function(defs, result) {
+              var codeExp, codeName, ref1;
+              if (defs == null) {
+                return result;
+              }
+              ref1 = defs.codes;
+              for (codeName in ref1) {
+                codeExp = ref1[codeName];
+                result[codeName] = prettyCode(defs.codes, defs.representatives, codeExp);
+              }
+              return result;
+            })(run.defs, {})));
           } else if (!line.match(/^[ \n\t]*(?:#.*)?$/)) {
             try {
               val = k.run(`${line} ()`, val);

package/run.coffee

@@ -8,11 +8,6 @@ builtin =
   "_log!": (arg) ->
     console.error "_log!: #{JSON.stringify arg}"
     arg
-  "fromFILE": (fileName) ->
-    fs.readFileSync(fileName).toString() 
-  "toFILE": ([x,fileName]) ->
-    fs.writeFileSync fileName, x
-    return x 
   "GT": (args) ->
     [ok,_] = do ([last,args...] = args) ->
       args.reduce ([ok,last], x) ->
@@ -36,6 +31,7 @@ builtin =
     div = x // y
     rem = x %% y
     return {div,rem} if x is div * y + rem
+  "FDIV": ([x,y]) -> x / y
   "CONCAT": (strs) -> strs.join('')
   "true": -> true
   "false": -> false
@@ -44,7 +40,9 @@ builtin =
   "fromJSON": (x) -> JSON.parse x
   "CONS": ([x,y]) -> [x,y...]
   "SNOC": (x) ->
-    return [x[0],x.slice 1] if x.length > 1 
+    return [x[0],x.slice 1] if x.length > 1
+  "toDateMsec": (x) -> new Date(x).getTime() 
+  "toDateStr": (x) -> new Date(x).toISOString() 
 
 codes =
   "int": (x) -> 
@@ -92,8 +90,8 @@ run = (exp, value) ->
     when "str", "int"
       return exp[exp.op]
     when "ref"
-      defn = run.defs.rels[exp.ref]?[0]
-      return run defn, value if defn?
+      defn = run.defs.rels[exp.ref]
+      return run defn[defn.length - 1], value if defn?
       return builtin[exp.ref] value 
     when "dot"
       return value[exp.dot]

package/run.js

@@ -19,13 +19,6 @@
       console.error(`_log!: ${JSON.stringify(arg)}`);
       return arg;
     },
-    "fromFILE": function(fileName) {
-      return fs.readFileSync(fileName).toString();
-    },
-    "toFILE": function([x, fileName]) {
-      fs.writeFileSync(fileName, x);
-      return x;
-    },
     "GT": function(args) {
       var _, ok;
       [ok, _] = (function([last, ...args]) {
@@ -79,6 +72,9 @@
         return {div, rem};
       }
     },
+    "FDIV": function([x, y]) {
+      return x / y;
+    },
     "CONCAT": function(strs) {
       return strs.join('');
     },
@@ -104,6 +100,12 @@
       if (x.length > 1) {
         return [x[0], x.slice(1)];
       }
+    },
+    "toDateMsec": function(x) {
+      return new Date(x).getTime();
+    },
+    "toDateStr": function(x) {
+      return new Date(x).toISOString();
     }
   };
 
@@ -168,7 +170,7 @@
 
   run = function(exp, value) {
     "use strict";
-    var defn, e, i, j, k, label, len, len1, len2, r, ref, ref1, ref2, ref3, result;
+    var defn, e, i, j, k, label, len, len1, len2, r, ref, ref1, ref2, result;
     if (value === void 0) {
       // console.log {exp,value}
       return void 0;
@@ -185,9 +187,9 @@
       case "int":
         return exp[exp.op];
       case "ref":
-        defn = (ref = run.defs.rels[exp.ref]) != null ? ref[0] : void 0;
+        defn = run.defs.rels[exp.ref];
         if (defn != null) {
-          return run(defn, value);
+          return run(defn[defn.length - 1], value);
         }
         return builtin[exp.ref](value);
       case "dot":
@@ -199,9 +201,9 @@
           }
         }, value);
       case "union":
-        ref1 = exp.union;
-        for (i = 0, len = ref1.length; i < len; i++) {
-          e = ref1[i];
+        ref = exp.union;
+        for (i = 0, len = ref.length; i < len; i++) {
+          e = ref[i];
           result = run(e, value);
           if (result !== void 0) {
             return result;
@@ -210,9 +212,9 @@
         return void 0;
       case "vector":
         result = [];
-        ref2 = exp.vector;
-        for (j = 0, len1 = ref2.length; j < len1; j++) {
-          e = ref2[j];
+        ref1 = exp.vector;
+        for (j = 0, len1 = ref1.length; j < len1; j++) {
+          e = ref1[j];
           r = run(e, value);
           if (r === void 0) {
             return;
@@ -222,9 +224,9 @@
         return result;
       case "product":
         result = {};
-        ref3 = exp.product;
-        for (k = 0, len2 = ref3.length; k < len2; k++) {
-          ({label, exp} = ref3[k]);
+        ref2 = exp.product;
+        for (k = 0, len2 = ref2.length; k < len2; k++) {
+          ({label, exp} = ref2[k]);
           r = run(exp, value);
           if (r === void 0) {
             return;

package/test.coffee

@@ -58,6 +58,8 @@ console.log ""
   {None: "None"}
   {list: {ints: []}}
   {list: {ints: [1,2,3]}}
+  {list: {bools: [true, false]}}
+  {list: {bools: [true, 0]}}
 ].map (data) -> 
   console.log "k_fn(#{JSON.stringify(data)});"
   console.log "// RETURNS: #{JSON.stringify k_fn data}"

package/test.js

@@ -139,6 +139,18 @@
     2,
     3]
       }
+    },
+    {
+      list: {
+        bools: [true,
+    false]
+      }
+    },
+    {
+      list: {
+        bools: [true,
+    0]
+      }
     }
   ].map(function(data) {
     console.log(`k_fn(${JSON.stringify(data)});`);