@fraczak/k 1.2.1 → 1.2.3

package/README.md

@@ -1,6 +1,6 @@
 # k-language
 
-    npm install @fraczak/k
+    npm install '@fraczak/k'
 
 From javascript:
 
@@ -84,8 +84,8 @@ Another example could be finding the biggest (max) value in a vector:
     max = < 
       SNOC         -- [x0, x1, x2, ...] -> [x0, [x1, x2, ...]]
       [.0, .1 max] -- [x0, [x1, x2, ...]] -> [x0, max(x1,x2,...)], i.e., recursive call 
-      <GT.0,.1>,   -- if x0 > max(x1,x2,...) then x0 else max(x1,x2,...)
-                   -- when SNOC is not defined, e.g. the argument is a singleton vector [x0]
+      <GT .0, .1>, -- if x0 > max(x1,x2,...) then x0 else max(x1,x2,...)
+      -- when SNOC is not defined, e.g. the argument is a singleton vector [x0]
       .0           -- [x0] -> x0, 
     >; 
     max
@@ -102,7 +102,7 @@ There are three predefined value encodings: `int`, `string`, and
 
 One can define recursive codes. E.g.:
 
-    tree = <string leaf, {tree left, tree right} tree>;
+    $tree = <string leaf, {tree left, tree right} tree>;
 
 Each _code_ definition starts with a `$`.
 The above example defines new code called _tree_.
@@ -143,8 +143,8 @@ run the language from command line.
         > ./node_modules/.bin/k '<["x=",.x," & y=",.y],["only x=",.x],["only y=",.y],["no x nor y"]>{CONCAT "x&y"}' 
         
          {"y": 123, "x": 432,"others": "..."}  --> {"x&y":"x=432 & y=123"} 
-         {"x":987}                             --> {"x&y":"only x=987"} 
-         {"z":123}                             --> {"x&y":"no x nor y"}
+         {"x": 987}                            --> {"x&y":"only x=987"} 
+         {"z": 123}                            --> {"x&y":"no x nor y"}
          ^D - to interrupt
 
 3. If the `k`-expression is long, it can be put in a file, e.g.:
@@ -172,7 +172,7 @@ run the language from command line.
 
         > ./node_modules/.bin/k -k test.k my-objects.json
          {"x&y":"x=432 & y=123"} 
-         {"x&y":"onlyx=987"} 
+         {"x&y":"only x=987"} 
          {"x&y":"no x nor y"}
 
     where:
@@ -181,8 +181,8 @@ run the language from command line.
          ####################################################
          # empty lines and lines starting with # are ignored
          {"y": 123, "x": 432,"others": "..."}
-         {"x":987}
-         {"z":123}
+         {"x": 987}
+         {"z": 123}
          ####################################################
 
 ### k-REPL (Read-Evaluate-Print Loop)
@@ -194,7 +194,7 @@ shell for the language. E.g.:
      {'a' a, 'b' b} toJSON
      => "{\"a\":\"a\",\"b\":\"b\"}"
      {"a" a} toJSON fromJSON
-     => {"a":"a"}
+     => {"a": "a"}
      inc = [(),1] PLUS; 1 inc inc
      => 3
      inc inc inc inc

package/codes.coffee

@@ -53,37 +53,6 @@ minimize = (codes) ->
             representatives[x] = new_rep
   {classes,representatives}
 
-compareAs = (fn) ->
-  (a,b) -> 
-    [a,b] = [a,b].map fn
-    return -1 if a < b
-    return 1 if a > b
-    0 
-
-pretty_labels = (label_ref_map, codes, representatives) ->
-  labels = Object.keys(label_ref_map)
-  .sort compareAs (x) -> x
-  .map (label) ->
-    "#{pretty {code:"ref",ref:label_ref_map[label]}, codes, representatives} #{label}"
-  .join ", "
-
-pretty = (codeExp, codes, representatives) ->
-  switch codeExp.code 
-    when "ref"
-      name = representatives[codeExp.ref] ? codeExp.ref
-      if name.startsWith ":"
-        pretty codes[name], codes, representatives
-      else
-        name
-    when "product"
-      "{#{pretty_labels codeExp.product, codes, representatives}}"
-    when "union"
-      "<#{pretty_labels codeExp.union, codes, representatives}>"
-    when "vector"
-      "[#{representatives[codeExp.ref] ? codeExp.ref}]"
-    else    
-      ":error"
-
 normalize = (label_ref_map, representatives) ->
   # console.log {label_ref_map, representatives}
   Object.keys(label_ref_map).reduce (result, label) ->
@@ -107,6 +76,6 @@ normalizeAll = (codes,representatives) ->
     normalized    
   , {}
 
-module.exports = {minimize,pretty,normalize,normalizeAll}
+module.exports = {minimize,normalize,normalizeAll}
 
 

package/codes.js

@@ -1,6 +1,6 @@
 // Generated by CoffeeScript 2.7.0
 (function() {
-  var are_different, compareAs, minimize, normalize, normalizeAll, pretty, pretty_labels;
+  var are_different, minimize, normalize, normalizeAll;
 
   are_different = function(classes, representatives, name1, name2, codes) {
     var arg1, arg2, code1, code2, field, fields1, fields2, rep;
@@ -92,53 +92,6 @@
     return {classes, representatives};
   };
 
-  compareAs = function(fn) {
-    return function(a, b) {
-      [a, b] = [a, b].map(fn);
-      if (a < b) {
-        return -1;
-      }
-      if (a > b) {
-        return 1;
-      }
-      return 0;
-    };
-  };
-
-  pretty_labels = function(label_ref_map, codes, representatives) {
-    var labels;
-    return labels = Object.keys(label_ref_map).sort(compareAs(function(x) {
-      return x;
-    })).map(function(label) {
-      return `${pretty({
-        code: "ref",
-        ref: label_ref_map[label]
-      }, codes, representatives)} ${label}`;
-    }).join(", ");
-  };
-
-  pretty = function(codeExp, codes, representatives) {
-    var name, ref, ref1;
-    switch (codeExp.code) {
-      case "ref":
-        name = (ref = representatives[codeExp.ref]) != null ? ref : codeExp.ref;
-        if (name.startsWith(":")) {
-          return pretty(codes[name], codes, representatives);
-        } else {
-          return name;
-        }
-        break;
-      case "product":
-        return `{${pretty_labels(codeExp.product, codes, representatives)}}`;
-      case "union":
-        return `<${pretty_labels(codeExp.union, codes, representatives)}>`;
-      case "vector":
-        return `[${(ref1 = representatives[codeExp.ref]) != null ? ref1 : codeExp.ref}]`;
-      default:
-        return ":error";
-    }
-  };
-
   normalize = function(label_ref_map, representatives) {
     // console.log {label_ref_map, representatives}
     return Object.keys(label_ref_map).reduce(function(result, label) {
@@ -176,6 +129,6 @@
     }, {});
   };
 
-  module.exports = {minimize, pretty, normalize, normalizeAll};
+  module.exports = {minimize, normalize, normalizeAll};
 
 }).call(this);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fraczak/k",
-    "version": "1.2.1",
+    "version": "1.2.3",
     "description": "k-language for JSON-like data transformation",
     "main": "index.js",
     "scripts": {
@@ -9,6 +9,10 @@
         "all": "coffee -c *.coffee; npm run prepare; npm run prepublishOnly",
         "test": "coffee -c symbol-table.coffee; jison parser.jison; coffee test.coffee"
     },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/fraczak/k.git"
+    },
     "author": "Wojciech Fraczak",
     "license": "ISC",
     "bin": {

package/pretty.coffee

@@ -0,0 +1,74 @@
+
+compareAs = (fn) ->
+  (a,b) -> 
+    [a,b] = [a,b].map fn
+    return -1 if a < b
+    return 1 if a > b
+    0 
+
+nameRE = /^[a-zA-Z_][a-zA-Z0-9_?!]*$/
+prettyCode_labels = ( codes, representatives, label_ref_map) ->
+  labels = Object.keys(label_ref_map)
+  .sort compareAs (x) -> x
+  .map (label) ->
+    plabel = if /^[a-zA-Z_][a-zA-Z0-9_?!]*$/.test label
+      label
+    else    
+      "'#{label}'" 
+    "#{prettyCode codes, representatives, {code:"ref",ref:label_ref_map[label]}} #{plabel}"
+  .join ", "
+
+prettyCode = (codes, representatives, codeExp) ->
+  switch codeExp.code 
+    when "ref"
+      name = representatives[codeExp.ref] ? codeExp.ref
+      if name.startsWith ":"
+        prettyCode codes, representatives, codes[name]
+      else
+        name
+    when "product"
+      "{#{prettyCode_labels codes, representatives, codeExp.product}}"
+    when "union"
+      "<#{prettyCode_labels codes, representatives, codeExp.union}>"
+    when "vector"
+      "[#{representatives[codeExp.vector] ? codeExp.vector}]"
+    else    
+      ":error"
+
+prettyRel = (prettyCode, exp) ->
+  "use strict"
+  pretty = (exp) ->
+    switch exp.op 
+      when 'vector' 
+        "[#{exp.vector.map(pretty).join(", ")}]"
+      when 'union'
+        "<#{exp.union.map(pretty).join(", ")}>"
+      when 'ref'
+        exp.ref
+      when 'identity'
+        "()"
+      when 'comp'
+        exp.comp.map(pretty).join(" ")
+      when 'str'
+        "'#{exp.str}'"
+      when 'int'
+        exp.int
+      when 'dot'
+        if 'number' is typeof exp.dot
+          ".#{exp.dot}"
+        else if nameRE.test exp.dot
+          ".#{exp.dot}"
+        else    
+          "'#{exp.dot}'"
+      when 'code'
+        "$#{prettyCode {code:"ref",ref:exp.code}}"
+      when 'product'
+        do (labelled = exp.product.map ({label,exp}) ->
+              if /^[a-zA-Z_][a-zA-Z0-9_?!]*$/.test label
+                  "#{pretty exp} #{label}"
+              else    
+                  "#{pretty exp} '#{label}'") ->
+          "{#{labelled.join(", ")}}"
+  pretty exp
+        
+module.exports = { prettyCode, prettyRel }

package/pretty.js

@@ -0,0 +1,106 @@
+// Generated by CoffeeScript 2.7.0
+(function() {
+  var compareAs, nameRE, prettyCode, prettyCode_labels, prettyRel;
+
+  compareAs = function(fn) {
+    return function(a, b) {
+      [a, b] = [a, b].map(fn);
+      if (a < b) {
+        return -1;
+      }
+      if (a > b) {
+        return 1;
+      }
+      return 0;
+    };
+  };
+
+  nameRE = /^[a-zA-Z_][a-zA-Z0-9_?!]*$/;
+
+  prettyCode_labels = function(codes, representatives, label_ref_map) {
+    var labels;
+    return labels = Object.keys(label_ref_map).sort(compareAs(function(x) {
+      return x;
+    })).map(function(label) {
+      var plabel;
+      plabel = /^[a-zA-Z_][a-zA-Z0-9_?!]*$/.test(label) ? label : `'${label}'`;
+      return `${prettyCode(codes, representatives, {
+        code: "ref",
+        ref: label_ref_map[label]
+      })} ${plabel}`;
+    }).join(", ");
+  };
+
+  prettyCode = function(codes, representatives, codeExp) {
+    var name, ref, ref1;
+    switch (codeExp.code) {
+      case "ref":
+        name = (ref = representatives[codeExp.ref]) != null ? ref : codeExp.ref;
+        if (name.startsWith(":")) {
+          return prettyCode(codes, representatives, codes[name]);
+        } else {
+          return name;
+        }
+        break;
+      case "product":
+        return `{${prettyCode_labels(codes, representatives, codeExp.product)}}`;
+      case "union":
+        return `<${prettyCode_labels(codes, representatives, codeExp.union)}>`;
+      case "vector":
+        return `[${(ref1 = representatives[codeExp.vector]) != null ? ref1 : codeExp.vector}]`;
+      default:
+        return ":error";
+    }
+  };
+
+  prettyRel = function(prettyCode, exp) {
+    "use strict";
+    var pretty;
+    pretty = function(exp) {
+      switch (exp.op) {
+        case 'vector':
+          return `[${exp.vector.map(pretty).join(", ")}]`;
+        case 'union':
+          return `<${exp.union.map(pretty).join(", ")}>`;
+        case 'ref':
+          return exp.ref;
+        case 'identity':
+          return "()";
+        case 'comp':
+          return exp.comp.map(pretty).join(" ");
+        case 'str':
+          return `'${exp.str}'`;
+        case 'int':
+          return exp.int;
+        case 'dot':
+          if ('number' === typeof exp.dot) {
+            return `.${exp.dot}`;
+          } else if (nameRE.test(exp.dot)) {
+            return `.${exp.dot}`;
+          } else {
+            return `'${exp.dot}'`;
+          }
+          break;
+        case 'code':
+          return `$${prettyCode({
+            code: "ref",
+            ref: exp.code
+          })}`;
+        case 'product':
+          return (function(labelled) {
+            return `{${labelled.join(", ")}}`;
+          })(exp.product.map(function({label, exp}) {
+            if (/^[a-zA-Z_][a-zA-Z0-9_?!]*$/.test(label)) {
+              return `${pretty(exp)} ${label}`;
+            } else {
+              return `${pretty(exp)} '${label}'`;
+            }
+          }));
+      }
+    };
+    return pretty(exp);
+  };
+
+  module.exports = {prettyCode, prettyRel};
+
+}).call(this);

package/repl.coffee

@@ -1,5 +1,20 @@
 #!/usr/bin/env coffee
 k = require "./"
+run = require "./run"
+{prettyCode, prettyRel} = require "./pretty"
+
+console.log "Very! experimental repl shell for 'k-language'..."
+
+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()
+
+re = /^[ \n\t]*(?:--l[ ]+)(.+[^ ])[ ]*?$/
 
 do (val = {}, buffer = []) ->
   process.stdin.on 'data', (data) ->
@@ -13,7 +28,29 @@ do (val = {}, buffer = []) ->
       for line in todo
         if val is undefined
           val = {}
-        if not line.match /^[ \n\t]*(?:#.*)?$/
+        if line.match /^[ \n\t]*(?:--h)?$/
+          help()
+        else if line.match re
+          file = line.match(re)[1]
+          console.log "-- loading file: #{file} ..."
+          val = k.compile_file(file) val
+          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 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 
             console.log "=> #{JSON.stringify val}"

package/repl.js

@@ -1,14 +1,32 @@
 // Generated by CoffeeScript 2.7.0
 (function() {
   //!/usr/bin/env coffee
-  var k,
+  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'");
+  };
+
+  help();
+
+  re = /^[ \n\t]*(?:--l[ ]+)(.+[^ ])[ ]*?$/;
+
   (function(val, buffer) {
     return process.stdin.on('data', function(data) {
-      var e, first, i, last, len, line, ref, 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) {
@@ -22,7 +40,44 @@
           if (val === void 0) {
             val = {};
           }
-          if (!line.match(/^[ \n\t]*(?:#.*)?$/)) {
+          if (line.match(/^[ \n\t]*(?:--h)?$/)) {
+            results.push(help());
+          } else if (line.match(re)) {
+            file = line.match(re)[1];
+            console.log(`-- loading file: ${file} ...`);
+            val = k.compile_file(file)(val);
+            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((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);
               results.push(console.log(`=> ${JSON.stringify(val)}`));

package/repl.sh

@@ -2,14 +2,32 @@
 // Generated by CoffeeScript 2.7.0
 (function() {
   //!/usr/bin/env coffee
-  var k,
+  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'");
+  };
+
+  help();
+
+  re = /^[ \n\t]*(?:--l[ ]+)(.+[^ ])[ ]*?$/;
+
   (function(val, buffer) {
     return process.stdin.on('data', function(data) {
-      var e, first, i, last, len, line, ref, 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) {
@@ -23,7 +41,44 @@
           if (val === void 0) {
             val = {};
           }
-          if (!line.match(/^[ \n\t]*(?:#.*)?$/)) {
+          if (line.match(/^[ \n\t]*(?:--h)?$/)) {
+            results.push(help());
+          } else if (line.match(re)) {
+            file = line.match(re)[1];
+            console.log(`-- loading file: ${file} ...`);
+            val = k.compile_file(file)(val);
+            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((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);
               results.push(console.log(`=> ${JSON.stringify(val)}`));

package/run.coffee

@@ -6,7 +6,7 @@ valid = (x) ->
 
 builtin =
   "_log!": (arg) ->
-    console.log "_log!: #{JSON.stringify arg}"
+    console.error "_log!: #{JSON.stringify arg}"
     arg
   "fromFILE": (fileName) ->
     fs.readFileSync(fileName).toString() 
@@ -92,8 +92,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

@@ -16,7 +16,7 @@
 
   builtin = {
     "_log!": function(arg) {
-      console.log(`_log!: ${JSON.stringify(arg)}`);
+      console.error(`_log!: ${JSON.stringify(arg)}`);
       return arg;
     },
     "fromFILE": function(fileName) {
@@ -168,7 +168,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 +185,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 +199,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 +210,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 +222,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;