@fraczak/k 1.3.1 → 1.3.3

package/INTRO.md

@@ -1,10 +1,10 @@
 # k - the way of building and manipulating JSON-like data
 
-Technically: notation for defining __first-order partial functions__.
+Technically, `k` is a notation for defining __first-order partial functions__.
 
-An example of a _partial function_ is "`.toto`", which maps an object
-to its property named `toto`, or it is not defined if the property
-doesn't exist. E.g.,
+An example of a _partial function_ is the _projection_, e.g., "`.toto`", 
+which maps an object to its property named `toto`, or it is not defined if 
+the property doesn't exist. E.g.,
 
     .toto :
         {"toto": 5, "titi": 10}  --> 5
@@ -51,6 +51,14 @@ __QUIZ__: What is:
 
 ---
 
+#### Syntactic sugar: 
+
+ - parenthesis can be omitted, except for the empty composition `()`,
+ - dot (`.`) in "projection" acts as a separator so the space around it can be omitted.
+
+For example, `[(.toto .titi (.0 .1))]` can be written as `[.toto.titi.0.1]`.
+
+
 ## Basic extensions
 
 ### Constants, i.e., literals for `strings`, `integers`, `booleans`, and `null`
@@ -77,19 +85,25 @@ names are integers starting from zero. E.g., `{.toto "0", .titi "1",
 
 ## Pragmatic extensions, aka "standard library"
 
-- `GT` :
+- `GT` : -- identity for lists of decreasing elements; undefined otherwise  
 
+        [4,3]     --> [4,3]
+        [3,4]     ... undefined
+        []        --> []
         [4,3,0]   --> [4,3,0]
-        [5,8]     -   undefined
 
-- `EQ` :
+- `EQ` : -- identity for lists of equal elements; undefined otherwise
 
+        [4,4]     --> [4,4]
+        [4,5]     ... undefined
         [4,4,4]   --> [4,4,4]
-        [5,8]     -   undefined
+        []        --> []
 
-- `[PLUS, TIMES, MINUS]` :
+- `{PLUS plus, TIMES times}` : 
 
-        [2,2,2] --> [6,8,-2]
+        [1,2]     --> {"plus":3,"times":2}
+        [2,2,2]   --> {"plus":6,"times":8}
+        []        --> {"plus":0,"times":1}
 
 - `CONCAT` :
 
@@ -97,24 +111,25 @@ names are integers starting from zero. E.g., `{.toto "0", .titi "1",
 
 - `toJSON` :
 
-        {a: 12} --> "{\"a\":12}"
+        {"a": 12} --> "{\"a\":12}"
 
 - `fromJSON` : 
  
-        "{\"a\":12}" --> {a: 12}
+        "{\"a\":12}" --> {"a":12}
 
-- `DIV`, `FDIV`, `CONS`, `SNOC`, `_log!`
+- other predefined parial functions are: `DIV`, `FDIV`, `CONS`, `SNOC`, `toDateMsec`,
+  `toDateStr`, and `_log!`.
 
 ---
 
 ## Recursive definitions
 
       -- factorial.k
-      dec = ([(),-1] PLUS);
-      zero? = ([(),0] EQ 0);
+      dec = [(),-1] PLUS;
+      zero? = [(),0] EQ 0;
       factorial = <
-        (zero? 1), 
-        ([(dec factorial), ()] TIMES)
+        zero? 1, 
+        [(dec factorial), ()] TIMES
       >;
       { () x, factorial "x!" }
 
@@ -122,10 +137,10 @@ names are integers starting from zero. E.g., `{.toto "0", .titi "1",
 
 _Codes_ (prefixed by `$`) can be defined by taged union and product. E.g.:
 
-      $nat = <nat s, {} z>;     -- e.g., {{{{} z} s} s}
-      $pair = {nat x, nat y};   -- e.g., {{{} z} x, {{{{} z} s} s} y}
+      $nat = <nat 1, {} 0>;     -- e.g., {{{{} 0} 1} 1}
+      $pair = {nat x, nat y};   -- e.g., {{{} 0} x, {{{{} 0} 1} 1} y}
       
-      s = ($nat {() s} $nat);
-      add = ($pair <{(.x .s) x, (.y s) y} add, .y> $nat);
+      suc = $nat {() 1} $nat;
+      add = $pair <{.x.1 x, .y suc y} add, .y> $nat;
 
 

package/README.md

@@ -51,14 +51,14 @@ the field (or a vector with the index).
         false
         null
 
-6. There is a number of built-in functions: `GT`, `EQ`, `PLUS`,
-    `TIMES`, `MINUS`, `DIV`, `CONCAT`, `toJSON`, `fromJSON`, `CONS`,
-    `SNOC`, `_log!`, ... For example:
+6. The other "built-in" functions: `GT`, `EQ`, `PLUS`,
+    `TIMES`, `DIV`, `CONCAT`, `toJSON`, `fromJSON`, `CONS`,
+    `SNOC`, `toDateMsec`, `toDateStr`, and `_log!`. For example:
 
         [1, 2, 3] PLUS       --> integer constant function 6
         [4, 4] TIMES toJSON  --> string constant function "16"
         [3, 2] GT            --> vector constant function [3, 2]
-        [3, 4] GT            --> is not defined!
+        [3, 4] GT            ... is not defined!
 
     A more interesting example could be:
 

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "@fraczak/k",
-    "version": "1.3.1",
+    "version": "1.3.3",
     "description": "k-language for JSON-like data transformation",
     "main": "index.js",
     "scripts": {
-        "prepare": "coffee -c symbol-table.coffee; jison parser.jison",
+        "prepare": "coffee -c symbol-table.coffee; jiwson parser.jison",
         "prepublishOnly": "coffee -c *.coffee; echo '#!/usr/bin/env node' | cat - k.js > k.sh; echo '#!/usr/bin/env node' | cat - repl.js > repl.sh;",
         "all": "coffee -c *.coffee; npm run prepare; npm run prepublishOnly",
-        "test": "coffee -c symbol-table.coffee; jison parser.jison; coffee test.coffee"
+        "test": "coffee -c symbol-table.coffee; jiwson parser.jison; coffee test.coffee"
     },
     "repository": {
         "type": "git",
@@ -21,6 +21,6 @@
     },
     "devDependencies": {
         "coffeescript": "^2.7.0",
-        "jison": "^0.4.18"
+        "jiwson": "^0.1.1"
     }
 }

package/parser.js

@@ -1,4 +1,4 @@
-/* parser generated by jison 0.4.18 */
+/* parser generated by jison 0.1.1 */
 /*
   Returns a Parser object of the following structure:
 
@@ -71,6 +71,13 @@
     recoverable: (boolean: TRUE when the parser has a error recovery rule available for this particular error)
   }
 */
+
+
+
+var s = require("./symbol-table");
+
+
+
 var parser = (function(){
 var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[4,6,8,15,18,21,23,32,34],$V1=[1,7],$V2=[1,15],$V3=[1,16],$V4=[1,8],$V5=[1,9],$V6=[1,10],$V7=[1,11],$V8=[1,14],$V9=[1,20],$Va=[4,6,8,12,15,18,21,23,32,34],$Vb=[2,28],$Vc=[1,25],$Vd=[1,26],$Ve=[1,27],$Vf=[4,6,8,12,14,15,18,20,21,22,23,24,27,32,33,34],$Vg=[2,47],$Vh=[2,31],$Vi=[2,32],$Vj=[4,6,8,12,14,15,18,20,21,22,23,24,27,28,32,33,34],$Vk=[2,8],$Vl=[2,13],$Vm=[20,27],$Vn=[22,24,27],$Vo=[20,24,27],$Vp=[2,41],$Vq=[2,42],$Vr=[2,43];
 var parser = {trace: function trace () { },
@@ -344,13 +351,7 @@ parse: function parse(input) {
         }
     }
     return true;
-}};
-
-
-var s = require("./symbol-table");
-
-
-/* generated by jison-lex 0.3.4 */
+}};/* generated by jison-lex  */
 var lexer = (function(){
 var lexer = ({
 

package/repl.coffee

@@ -2,6 +2,7 @@
 k = require "./"
 run = require "./run"
 {prettyCode, prettyRel} = require "./pretty"
+fs = require "fs"
 
 console.log "Very! experimental repl shell for 'k-language'..."
 
@@ -33,7 +34,8 @@ do (val = {}, buffer = []) ->
         else if line.match re
           file = line.match(re)[1]
           console.log "-- loading file: #{file} ..."
-          val = k.compile_file(file) val
+          kScript = fs.readFileSync(file).toString();
+          val = k.compile(kScript) val
           console.log "=> #{JSON.stringify val}"
         else if line.match /^[ \n\t]*(?:--a)?$/
           console.log JSON.stringify run.defs, " ", 2

package/repl.js

@@ -1,7 +1,7 @@
 // Generated by CoffeeScript 2.7.0
 (function() {
   //!/usr/bin/env coffee
-  var help, k, prettyCode, prettyRel, re, run,
+  var fs, help, k, prettyCode, prettyRel, re, run,
     splice = [].splice;
 
   k = require("./");
@@ -10,6 +10,8 @@
 
   ({prettyCode, prettyRel} = require("./pretty"));
 
+  fs = require("fs");
+
   console.log("Very! experimental repl shell for 'k-language'...");
 
   help = function() {
@@ -26,7 +28,7 @@
 
   (function(val, buffer) {
     return process.stdin.on('data', function(data) {
-      var e, file, first, i, last, len, line, ref, rest, results, todo;
+      var e, file, first, i, kScript, last, len, line, ref, rest, results, todo;
       [first, ...rest] = data.toString("utf8").split("\n");
       buffer.push(first);
       if (rest.length > 0) {
@@ -45,7 +47,8 @@
           } else if (line.match(re)) {
             file = line.match(re)[1];
             console.log(`-- loading file: ${file} ...`);
-            val = k.compile_file(file)(val);
+            kScript = fs.readFileSync(file).toString();
+            val = k.compile(kScript)(val);
             results.push(console.log(`=> ${JSON.stringify(val)}`));
           } else if (line.match(/^[ \n\t]*(?:--a)?$/)) {
             results.push(console.log(JSON.stringify(run.defs, " ", 2)));

package/repl.sh

@@ -2,7 +2,7 @@
 // Generated by CoffeeScript 2.7.0
 (function() {
   //!/usr/bin/env coffee
-  var help, k, prettyCode, prettyRel, re, run,
+  var fs, help, k, prettyCode, prettyRel, re, run,
     splice = [].splice;
 
   k = require("./");
@@ -11,6 +11,8 @@
 
   ({prettyCode, prettyRel} = require("./pretty"));
 
+  fs = require("fs");
+
   console.log("Very! experimental repl shell for 'k-language'...");
 
   help = function() {
@@ -27,7 +29,7 @@
 
   (function(val, buffer) {
     return process.stdin.on('data', function(data) {
-      var e, file, first, i, last, len, line, ref, rest, results, todo;
+      var e, file, first, i, kScript, last, len, line, ref, rest, results, todo;
       [first, ...rest] = data.toString("utf8").split("\n");
       buffer.push(first);
       if (rest.length > 0) {
@@ -46,7 +48,8 @@
           } else if (line.match(re)) {
             file = line.match(re)[1];
             console.log(`-- loading file: ${file} ...`);
-            val = k.compile_file(file)(val);
+            kScript = fs.readFileSync(file).toString();
+            val = k.compile(kScript)(val);
             results.push(console.log(`=> ${JSON.stringify(val)}`));
           } else if (line.match(/^[ \n\t]*(?:--a)?$/)) {
             results.push(console.log(JSON.stringify(run.defs, " ", 2)));

package/run.coffee

@@ -20,11 +20,6 @@ builtin =
     return args if ok
   "PLUS": (args) -> valid args.reduce ((res, x) -> res + x), 0
   "TIMES": (args) -> valid args.reduce ((res, x) -> res * x), 1
-  "MINUS": (args) -> 
-    return valid(- args) if 'number' is typeof args 
-    do ([res,args...] = args) ->
-      return valid (- res) if args.length is 0
-      valid args.reduce ((res, x) -> res - x), res
   "DIV": ([x,y]) -> 
     div = x // y
     rem = x %% y

package/run.js

@@ -49,19 +49,6 @@
         return res * x;
       }), 1));
     },
-    "MINUS": function(args) {
-      if ('number' === typeof args) {
-        return valid(-args);
-      }
-      return (function([res, ...args]) {
-        if (args.length === 0) {
-          return valid(-res);
-        }
-        return valid(args.reduce((function(res, x) {
-          return res - x;
-        }), res));
-      })(args);
-    },
     "DIV": function([x, y]) {
       var div, rem;
       div = Math.floor(x / y);

package/symbol-table.coffee

@@ -7,21 +7,37 @@ identity = op: "identity"
 is_identity_rel = (rel) ->
   rel.op is "identity"
 
+is_constant_rel = (rel) ->
+  switch rel?.op
+    when "int", "str"
+      true
+    when "vector"
+      Object.values(rel[rel.op]).every is_constant_rel
+    when "product"
+      Object.values(rel[rel.op]).every ({exp}) -> 
+        is_constant_rel exp
+    else 
+      false
+
 is_empty_rel = (rel) ->
   rel.op is "union" and rel.union.length is 0
   
 is_full_rel = (rel) ->
+  return true if is_constant_rel rel
   switch rel.op
     when "int", "str", "identity"
       true
     when "comp"
       rel.comp.every is_full_rel
-    when "product", "vector"
+    when "vector"
       Object.values(rel[rel.op]).every is_full_rel
+    when "product"
+      Object.values(rel[rel.op]).every ({exp}) -> 
+        is_full_rel exp
     else  
       false
 
-comp = (e1, e2) ->
+comp_first = (e1, e2) ->
     return e2 if is_identity_rel e1
     return e1 if is_identity_rel e2
     return e1 if is_empty_rel e1
@@ -34,6 +50,16 @@ comp = (e1, e2) ->
       return {op: "comp", comp: [].concat([e1],e2.comp)}
     {op: "comp", comp: [e1,e2]}
 
+comp = (e1, e2) ->
+  result = comp_first e1, e2
+  return result unless result.op is "comp"
+  result.comp = result.comp.reduceRight (c, e) ->
+    if is_constant_rel(c[0]) and is_full_rel e
+      return c
+    return [e, c...]
+  , []
+  result
+
 union = (rels) ->
   list = []
   do ->

package/symbol-table.js

@@ -1,6 +1,6 @@
 // Generated by CoffeeScript 2.7.0
 (function() {
-  var add_code, add_rel, as_ref, codes, comp, identity, is_empty_rel, is_full_rel, is_identity_rel, rels, union;
+  var add_code, add_rel, as_ref, codes, comp, comp_first, identity, is_constant_rel, is_empty_rel, is_full_rel, is_identity_rel, rels, union;
 
   rels = Object.create(null);
 
@@ -19,11 +19,30 @@
     return rel.op === "identity";
   };
 
+  is_constant_rel = function(rel) {
+    switch (rel != null ? rel.op : void 0) {
+      case "int":
+      case "str":
+        return true;
+      case "vector":
+        return Object.values(rel[rel.op]).every(is_constant_rel);
+      case "product":
+        return Object.values(rel[rel.op]).every(function({exp}) {
+          return is_constant_rel(exp);
+        });
+      default:
+        return false;
+    }
+  };
+
   is_empty_rel = function(rel) {
     return rel.op === "union" && rel.union.length === 0;
   };
 
   is_full_rel = function(rel) {
+    if (is_constant_rel(rel)) {
+      return true;
+    }
     switch (rel.op) {
       case "int":
       case "str":
@@ -31,15 +50,18 @@
         return true;
       case "comp":
         return rel.comp.every(is_full_rel);
-      case "product":
       case "vector":
         return Object.values(rel[rel.op]).every(is_full_rel);
+      case "product":
+        return Object.values(rel[rel.op]).every(function({exp}) {
+          return is_full_rel(exp);
+        });
       default:
         return false;
     }
   };
 
-  comp = function(e1, e2) {
+  comp_first = function(e1, e2) {
     if (is_identity_rel(e1)) {
       return e2;
     }
@@ -76,6 +98,21 @@
     };
   };
 
+  comp = function(e1, e2) {
+    var result;
+    result = comp_first(e1, e2);
+    if (result.op !== "comp") {
+      return result;
+    }
+    result.comp = result.comp.reduceRight(function(c, e) {
+      if (is_constant_rel(c[0]) && is_full_rel(e)) {
+        return c;
+      }
+      return [e, ...c];
+    }, []);
+    return result;
+  };
+
   union = function(rels) {
     var list;
     list = [];