@fraczak/k 1.0.0 → 1.1.0

package/README.md

@@ -1,6 +1,6 @@
 # k-language 
 
-Another JSON-to-JSON transformation notation.  A `k`-expression
+Another JSON transformation notation.  A `k`-expression
 (script) defines a __partial function__, i.e., a function which, in
 general, is not defined for every input. `k`-expressions can be
 combined to build other `k`-expressions in three ways:
@@ -11,14 +11,15 @@ combined to build other `k`-expressions in three ways:
 	
 	Apart from empty composition, `()`, which defines _identity_, the paranthesis can be omitted.
 
-2. product, e.g., vector:
+2. product, e.g., vector or structure:
 
         [ E1, E2, E3, ... ]
-   
-    or structure:
-  
         { E1 "e1", E2 "e2", E3 "e3", ... }
 
+  Now, structure can also be written similarly to JSON, ie., 
+  
+		{ e1: E1, e2: E2, e3: E3, ... }
+
 3. union (merge), e.g.:
 
         < E1, E2, E3, ... >
@@ -42,11 +43,10 @@ Elementary partial functions are:
 		'another "String"'
 		123
 		false
-
-	Those functions are always defined, i.e., they ignore their argument.
+		null
 	
 3.  There is a number of built-in functions: `GT`, `EQ`, `PLUS`,
-	`TIMES`, `MINUS`, `DIV`, `CONCAT`, `toJSON`, `fromJSON`. For example
+	`TIMES`, `MINUS`, `DIV`, `CONCAT`, `toJSON`, `fromJSON`, `CONS`, `SNOC`. For example
 	
 		[1, 2, 3] PLUS       --> integer constant 6
 		[4, 4] TIMES toJSON  --> string constant "16"
@@ -61,6 +61,43 @@ Elementary partial functions are:
 	
 		[3,8] < [.0, .1] GT, [.1, .0] GT > .0    --> 8
 
+## User defined functions
+
+`k`-expression can be prefixed by function definitions. E.g.: 
+
+	dec = [(),1] MINUS;
+	factorial = <
+	  [1,()] GT 1,
+	  [dec factorial, ()] TIMES
+	>;
+	{ x: (), "x!": factorial }
+
+## Value encodings (also called _types_ or _codes_)
+
+There are three predefined value encodings: `int`, `string`, and `bool`. The language
+supports `code`-expressions:
+
+* product, e.g., `{x: int, y: int, flag: bool}`
+* disjoint union, e.g., `<x: string, y: bool>`
+* vector, e.g., `[ int ]` (all elements of the vector use the same encoding)
+
+One can define recursive codes. E.g.,
+
+	$ tree = <leaf: string, tree: {left: tree, right: tree}>;
+
+Each _code_ definition starts with a `$`.
+The above example defines new code called _tree_.
+
+The code can be then used in a `k`-expression as a filter. A `code`-expression
+within `k`-expression is again prefixed by `$`.
+
+	$tree = <leaf: string, tree: {left: tree, right: tree}>;
+	inc = [(),1] PLUS;
+	height = $ tree <
+		.leaf 0,
+		.tree [.left height, .right height] <GT .0, .1> inc
+	> $ int;
+	height
 
 
 ## Command line script
@@ -113,7 +150,7 @@ run the language from command line.
 	
 	If we want to read `json` objects from a file, e.g., `my-objects.json`, we do
 	
-		$ ./k.coffee -k test.k -j my-objects.json
+		$ ./k.coffee -k test.k my-objects.json
 		{"x&y":"x=432 & y=123"} 
 		{"x&y":"onlyx=987"} 
 		{"x&y":"no x nor y"}
@@ -178,4 +215,3 @@ run the language from command line.
 
     k_fn({"age":2,"name":"Mark"})
     // RETURNS: {"nom":"Mark","age":"enfant"}
-

package/bnat.k

@@ -0,0 +1,121 @@
+-- Standard binary encoding of natural
+-- numbers with addition (+).
+
+_ = {{} _};
+_1 = {() "1"};
+_0 = {() "0"};
+
+n0 = _ ;
+n1 = _ _1;
+
+from_digit = <
+    [0, ()] EQ _,               -- {_: {}}
+    [1, ()] EQ n1,              -- {"1": {_: {}}}
+    [2, ()] EQ _ _0 _1,         -- {"1": {"0": {_: {}}}}
+    [3, ()] EQ _ _1 _1,         -- {"1": {"1": {_: {}}}}
+    [4, ()] EQ _ _0 _0 _1,      -- {"1": {"0": {"0": {_: {}}}}}
+    [5, ()] EQ _ _1 _0 _1,
+    [6, ()] EQ _ _0 _1 _1,
+    [7, ()] EQ _ _1 _1 _1,
+    [8, ()] EQ _ _0 _0 _0 _1,
+    [9, ()] EQ _ _1 _0 _0 _1,
+    [10, ()] EQ _ _0 _1 _0 _1
+>;
+
+to_digit = <
+                  ._  0,
+              ."1"._  1,
+          ."1"."0"._  2,
+          ."1"."1"._  3,
+      ."1"."0"."0"._  4,
+      ."1"."0"."1"._  5,
+      ."1"."1"."0"._  6,
+      ."1"."1"."1"._  7,
+  ."1"."0"."0"."0"._  8,
+  ."1"."0"."0"."1"._  9,
+  ."1"."0"."1"."0"._ 10,
+  ."1"."0"."1"."1"._ 11,
+  ."1"."1"."0"."0"._ 12,
+  ."1"."1"."0"."1"._ 13,
+  ."1"."1"."1"."0"._ 14,
+  ."1"."1"."1"."1"._ 15
+> ;
+
+remove_leading_zeros =
+      < ."0" remove_leading_zeros, () >;
+
+_append_zero =
+     < ._ _ _0,          -- ( _ ->  0 _)
+       ."1" _append_zero _1,  -- ('1 ... -> '1 [$.1 | _append_zero]),
+       ."0" _append_zero _0   -- ('0 ... -> '0 [$.0 | _append_zero]),
+     >
+;
+
+_append_one =
+     <
+        ._ _ _1,
+        ."1" _append_one _1,
+        ."0" _append_one _0
+     >
+;
+
+reverse_bnat = {() x, _ y} _reverse_bnat;
+
+_reverse_bnat =
+<
+  {.x._ x, .y y} .y,
+  {.x."0" x, .y _0 y} _reverse_bnat,
+  {.x."1" x, .y _1 y} _reverse_bnat
+>;
+
+_add2wc =
+-- least significant bit first addition with carry
+--- :{ :bnat x, :bnat y, :[0,1] c}
+    -- _log_
+    <
+      {.x."0" x, .y."0" y, .c."0" c} {.x x, .y y, _ _0 c} _add2wc _0,
+      {.x."0" x, .y."0" y, .c."1" c} {.x x, .y y, _ _0 c} _add2wc _1,
+
+      {.x."0" x, .y."1" y, .c."0" c} {.x x, .y y, _ _0 c} _add2wc _1,
+      {.x."0" x, .y."1" y, .c."1" c} {.x x, .y y, _ _1 c} _add2wc _0,
+      
+      {.x."1" x, .y."0" y, .c."0" c} {.x x, .y y, _ _0 c} _add2wc _1,
+      {.x."1" x, .y."0" y, .c."1" c} {.x x, .y y, _ _1 c} _add2wc _0,
+      
+      {.x."1" x, .y."1" y, .c."0" c} {.x x, .y y, _ _1 c} _add2wc _0,
+      {.x."1" x, .y."1" y, .c."1" c} {.x x, .y y, _ _1 c} _add2wc _1,
+      {.x._ x, .c."0" c, .y y} .y,
+      {.y._ y, .c."0" c, .x x} .x,
+      {.x._ x, .c."1" c, .y._ y} n1,
+      {.x._ x, .y."0" y, .c."1" c} .y _1,
+      {.x."0" x, .y._ y, .c."1" c} .x _1,
+      {.x._ x, .y."1" y, .c."1" c} {_ x, .y y, {} _1 c} _add2wc _0,
+      {.x."1" x, .y._ y, .c."1" c} {.x x, _ y, {} _1 c} _add2wc _0      
+>;
+
+plus = <
+  SNOC { 
+    x: .0 from_digit remove_leading_zeros reverse_bnat,
+    y: .1 plus remove_leading_zeros reverse_bnat,
+    c: {} _0 } _add2wc reverse_bnat,
+  .0 from_digit
+>;
+
+to_string = <
+  ._ "0",
+  toString
+>;
+
+toString = <
+  ._ "",
+  ["0", ."0" toString] CONCAT,
+  ["1", ."1" toString] CONCAT
+>;
+
+[(), plus] 
+{
+  input: .0,
+  sum: {raw: .1, digits: .1 <to_digit,"...too big...">, binary: .1 to_string}
+} 
+
+-- example: > echo '[9,9,9,8]' | ./k.sh -k ./bnat.k  

package/code.k

@@ -0,0 +1,18 @@
+inc = [(),1] PLUS;
+$tree = <leaf: string, tree: {left: tree, right: tree}>;
+height =  $tree <
+    .leaf 0,
+    .tree [.left height, .right height] <GT .0, .1> inc
+> $int;
+
+<$tree, 
+  {tree:
+    { left: { leaf: "a"},
+      right: { tree:
+              {   left: {leaf: "b"},
+                  right: {leaf: "c"}
+              }
+          }
+    }
+  }
+> _log_ height

package/factorial.k

@@ -0,0 +1,11 @@
+-- factorial.k
+-- E.g.:
+--    > echo "5" | ./k.sh -k factorial.k
+--    {"x":5,"x!":120}
+
+dec = [(),1] MINUS;
+factorial = <
+  [1,()] GT 1,
+  [dec factorial, ()] TIMES
+>;
+{ x: (), "x!": factorial }

package/fib.k

@@ -0,0 +1,15 @@
+fib_aux =
+  <
+    { [.n, 1] GT [.0,-1] PLUS n,
+      ."[fib(n),fib(n-1)" [[.0,.1] PLUS, .0] "[fib(n),fib(n-1)"
+    } fib_aux,
+    ."[fib(n),fib(n-1)"
+  >
+;
+
+fib = {() n, [1,1] "[fib(n),fib(n-1)"}
+  fib_aux .0;
+
+----------------------
+
+fib

package/index.coffee

@@ -3,7 +3,8 @@ fs = require "fs"
 run = require "./run"
 
 compile = (script) ->
-  do (exp = parse script) ->
+  do ({defs,exp} = parse script) ->
+    run.defs = defs 
     (data) -> run exp, data
 compile.doc = "Transforms k-script (string) into a function"
 

package/index.js

@@ -9,7 +9,8 @@
   run = require("./run");
 
   compile = function(script) {
-    return (function(exp) {
+    return (function({defs, exp}) {
+      run.defs = defs;
       return function(data) {
         return run(exp, data);
       };

package/k.coffee

@@ -4,7 +4,8 @@ k = require "./"
 
 prog = process.argv[1]
 
-{kScript,jsonStream} = do (args = process.argv.slice(2)) ->
+{kScript,jsonStream,oneJson} =
+do (oneJson = false, args = process.argv.slice(2)) ->
   try 
     kScript = do (arg = args.shift()) ->
       throw new Error() unless arg?
@@ -16,30 +17,43 @@ prog = process.argv[1]
     kScript = k.compile kScript
     
     jsonStream = do (arg = args.shift()) ->
+      if arg is "-1"
+        oneJson = true
+        arg = args.shift()      
       return process.stdin unless arg?
-      fs.createReadStream args.shift()
+      fs.createReadStream arg
 
-    {kScript, jsonStream}
+    {kScript, jsonStream, oneJson}
   catch e
     console.error e
-    console.error "Usage: #{prog} ( k-expr | -k k-file ) [ json-file ]"
+    console.error "Usage: #{prog} ( k-expr | -k k-file ) [ -1 ] [ json-file ]"
     console.error "       E.g.,  echo '{\"a\": 12}' | #{prog} '[(),()]'"
     process.exit -1 
 
-do (buffer = [], line = 0) ->
-  jsonStream.on 'data', (data) ->
-    [first, rest...] = data.toString("utf8").split "\n"
-    buffer.push first
-    if rest.length > 0
-      todo = buffer.join ""
-      [rest..., last] = rest
-      buffer = [last]
-      todo = [todo, rest...]
-      for json in todo
-        if not json.match /^[ \n\t]*(?:#.*)?$/
-          try
-            console.log JSON.stringify kScript JSON.parse json
-          catch e 
-            console.error "Problem [line #{line}]: '#{json}'"
-            console.error e
-        line = line + 1
+if oneJson
+  do (buffer = []) ->
+    jsonStream.on 'data', (data) ->
+      buffer.push data
+    jsonStream.on 'end', ->
+      try
+        console.log JSON.stringify kScript JSON.parse buffer.join('')
+      catch e
+        console.error e
+else
+  do (buffer = [], line = 0) ->
+    jsonStream.on 'data', (data) ->
+      [first, rest...] = data.toString("utf8").split "\n"
+      buffer.push first
+      if rest.length > 0
+        todo = buffer.join ""
+        [rest..., last] = rest
+        buffer = [last]
+        todo = [todo, rest...]
+        for json in todo
+          if not json.match /^[ \n\t]*(?:#.*)?$/
+            try
+              console.log JSON.stringify kScript JSON.parse json
+            catch e 
+              console.error "Problem [line #{line}]: '#{json}'"
+              console.error e
+          line = line + 1

package/k.js

@@ -1,7 +1,7 @@
 // Generated by CoffeeScript 2.7.0
 (function() {
   //!/usr/bin/env coffee
-  var fs, jsonStream, k, kScript, prog,
+  var fs, jsonStream, k, kScript, oneJson, prog,
     splice = [].splice;
 
   fs = require("fs");
@@ -10,7 +10,7 @@
 
   prog = process.argv[1];
 
-  ({kScript, jsonStream} = (function(args) {
+  ({kScript, jsonStream, oneJson} = (function(oneJson, args) {
     var e;
     try {
       kScript = (function(arg) {
@@ -25,48 +25,69 @@
       })(args.shift());
       kScript = k.compile(kScript);
       jsonStream = (function(arg) {
+        if (arg === "-1") {
+          oneJson = true;
+          arg = args.shift();
+        }
         if (arg == null) {
           return process.stdin;
         }
-        return fs.createReadStream(args.shift());
+        return fs.createReadStream(arg);
       })(args.shift());
-      return {kScript, jsonStream};
+      return {kScript, jsonStream, oneJson};
     } catch (error) {
       e = error;
       console.error(e);
-      console.error(`Usage: ${prog} ( k-expr | -k k-file ) [ json-file ]`);
+      console.error(`Usage: ${prog} ( k-expr | -k k-file ) [ -1 ] [ json-file ]`);
       console.error(`       E.g.,  echo '{\"a\": 12}' | ${prog} '[(),()]'`);
       return process.exit(-1);
     }
-  })(process.argv.slice(2)));
+  })(false, process.argv.slice(2)));
 
-  (function(buffer, line) {
-    return jsonStream.on('data', function(data) {
-      var e, first, i, json, last, len, ref, rest, results, todo;
-      [first, ...rest] = data.toString("utf8").split("\n");
-      buffer.push(first);
-      if (rest.length > 0) {
-        todo = buffer.join("");
-        ref = rest, [...rest] = ref, [last] = splice.call(rest, -1);
-        buffer = [last];
-        todo = [todo, ...rest];
-        results = [];
-        for (i = 0, len = todo.length; i < len; i++) {
-          json = todo[i];
-          if (!json.match(/^[ \n\t]*(?:#.*)?$/)) {
-            try {
-              console.log(JSON.stringify(kScript(JSON.parse(json))));
-            } catch (error) {
-              e = error;
-              console.error(`Problem [line ${line}]: '${json}'`);
-              console.error(e);
+  if (oneJson) {
+    (function(buffer) {
+      jsonStream.on('data', function(data) {
+        return buffer.push(data);
+      });
+      return jsonStream.on('end', function() {
+        var e;
+        try {
+          return console.log(JSON.stringify(kScript(JSON.parse(buffer.join('')))));
+        } catch (error) {
+          e = error;
+          return console.error(e);
+        }
+      });
+    })([]);
+  } else {
+    (function(buffer, line) {
+      return jsonStream.on('data', function(data) {
+        var e, first, i, json, last, len, ref, rest, results, todo;
+        [first, ...rest] = data.toString("utf8").split("\n");
+        buffer.push(first);
+        if (rest.length > 0) {
+          todo = buffer.join("");
+          ref = rest, [...rest] = ref, [last] = splice.call(rest, -1);
+          buffer = [last];
+          todo = [todo, ...rest];
+          results = [];
+          for (i = 0, len = todo.length; i < len; i++) {
+            json = todo[i];
+            if (!json.match(/^[ \n\t]*(?:#.*)?$/)) {
+              try {
+                console.log(JSON.stringify(kScript(JSON.parse(json))));
+              } catch (error) {
+                e = error;
+                console.error(`Problem [line ${line}]: '${json}'`);
+                console.error(e);
+              }
             }
+            results.push(line = line + 1);
           }
-          results.push(line = line + 1);
+          return results;
         }
-        return results;
-      }
-    });
-  })([], 0);
+      });
+    })([], 0);
+  }
 
 }).call(this);

package/k.sh

@@ -2,7 +2,7 @@
 // Generated by CoffeeScript 2.7.0
 (function() {
   //!/usr/bin/env coffee
-  var fs, jsonStream, k, kScript, prog,
+  var fs, jsonStream, k, kScript, oneJson, prog,
     splice = [].splice;
 
   fs = require("fs");
@@ -11,7 +11,7 @@
 
   prog = process.argv[1];
 
-  ({kScript, jsonStream} = (function(args) {
+  ({kScript, jsonStream, oneJson} = (function(oneJson, args) {
     var e;
     try {
       kScript = (function(arg) {
@@ -26,48 +26,69 @@
       })(args.shift());
       kScript = k.compile(kScript);
       jsonStream = (function(arg) {
+        if (arg === "-1") {
+          oneJson = true;
+          arg = args.shift();
+        }
         if (arg == null) {
           return process.stdin;
         }
-        return fs.createReadStream(args.shift());
+        return fs.createReadStream(arg);
       })(args.shift());
-      return {kScript, jsonStream};
+      return {kScript, jsonStream, oneJson};
     } catch (error) {
       e = error;
       console.error(e);
-      console.error(`Usage: ${prog} ( k-expr | -k k-file ) [ json-file ]`);
+      console.error(`Usage: ${prog} ( k-expr | -k k-file ) [ -1 ] [ json-file ]`);
       console.error(`       E.g.,  echo '{\"a\": 12}' | ${prog} '[(),()]'`);
       return process.exit(-1);
     }
-  })(process.argv.slice(2)));
+  })(false, process.argv.slice(2)));
 
-  (function(buffer, line) {
-    return jsonStream.on('data', function(data) {
-      var e, first, i, json, last, len, ref, rest, results, todo;
-      [first, ...rest] = data.toString("utf8").split("\n");
-      buffer.push(first);
-      if (rest.length > 0) {
-        todo = buffer.join("");
-        ref = rest, [...rest] = ref, [last] = splice.call(rest, -1);
-        buffer = [last];
-        todo = [todo, ...rest];
-        results = [];
-        for (i = 0, len = todo.length; i < len; i++) {
-          json = todo[i];
-          if (!json.match(/^[ \n\t]*(?:#.*)?$/)) {
-            try {
-              console.log(JSON.stringify(kScript(JSON.parse(json))));
-            } catch (error) {
-              e = error;
-              console.error(`Problem [line ${line}]: '${json}'`);
-              console.error(e);
+  if (oneJson) {
+    (function(buffer) {
+      jsonStream.on('data', function(data) {
+        return buffer.push(data);
+      });
+      return jsonStream.on('end', function() {
+        var e;
+        try {
+          return console.log(JSON.stringify(kScript(JSON.parse(buffer.join('')))));
+        } catch (error) {
+          e = error;
+          return console.error(e);
+        }
+      });
+    })([]);
+  } else {
+    (function(buffer, line) {
+      return jsonStream.on('data', function(data) {
+        var e, first, i, json, last, len, ref, rest, results, todo;
+        [first, ...rest] = data.toString("utf8").split("\n");
+        buffer.push(first);
+        if (rest.length > 0) {
+          todo = buffer.join("");
+          ref = rest, [...rest] = ref, [last] = splice.call(rest, -1);
+          buffer = [last];
+          todo = [todo, ...rest];
+          results = [];
+          for (i = 0, len = todo.length; i < len; i++) {
+            json = todo[i];
+            if (!json.match(/^[ \n\t]*(?:#.*)?$/)) {
+              try {
+                console.log(JSON.stringify(kScript(JSON.parse(json))));
+              } catch (error) {
+                e = error;
+                console.error(`Problem [line ${line}]: '${json}'`);
+                console.error(e);
+              }
             }
+            results.push(line = line + 1);
           }
-          results.push(line = line + 1);
+          return results;
         }
-        return results;
-      }
-    });
-  })([], 0);
+      });
+    })([], 0);
+  }
 
 }).call(this);

package/package.json

@@ -1,12 +1,12 @@
 {
     "name": "@fraczak/k",
-    "version": "1.0.0",
-    "description": "k-language for untyped JSON like data transformation",
+    "version": "1.1.0",
+    "description": "k-language for JSON-like data transformation",
     "main": "index.js",
     "scripts": {
         "prepare": "coffee -c symbol-table.coffee; jison parser.jison",
         "prepublishOnly": "coffee -c *.coffee; echo '#!/usr/bin/env node' | cat - k.js > k.sh",
-        "test": "coffee -c symbol-table.coffee; jison parser.jison; coffee test.coffee;"
+        "test": "coffee -c symbol-table.coffee; jison parser.jison; coffee test.coffee"
     },
     "author": "Wojciech Fraczak",
     "license": "ISC",

package/parser.jison

@@ -18,17 +18,21 @@ var s = require("./symbol-table");
 "}"                                            return 'RC';
 "]"                                            return 'RB';
 ")"                                            return 'RP';
+"="                                            return 'EQ'; 
 "."                                            return 'DOT';
 ","                                            return 'COMMA';
+";"                                            return 'SC';
+":"                                            return 'COL';
+"$"                                            return 'DOLLAR'; 
 \"[^\"\n]*\"|\'[^\'\n]*\'                      return 'STRING'
-[a-zA-Z_][a-zA-Z0-9_]*                         return 'NAME';
+[a-zA-Z_][a-zA-Z0-9_?!]*                       return 'NAME';
 0|[-]?[1-9][0-9]*                              return 'INT';
 <<EOF>>                                        return 'EOF';
 
 /lex
 
 %token NAME STRING INT
-%token LA LC LB LP RA RP RB RC COMMA
+%token LA LC LB LP RA RP RB RC EQ DOT COMMA SC COL DOLLAR
 %token EOF
 
 %start input_with_eof
@@ -39,14 +43,53 @@ name: NAME                              { $$ = String(yytext); };
 str: STRING                             { $$ = String(yytext).slice(1,-1); };
 int: INT                                { $$ = parseInt(String(yytext)); };
 
-input_with_eof: comp EOF               {
-    // console.log(JSON.stringify($1, "", 2));
-    return $1;
+input_with_eof: defs comp EOF               {
+    result = {defs: $1, exp: $2};
+    // console.log(JSON.stringify(result, "", 2));
+    return result;
 };
 
+defs:                                   { $$ = {codes: {}, rels: {}}; }
+    | defs name EQ comp SC              { $1.rels[$2] = $4; $$ = $1; }
+    | defs DOLLAR name EQ code SC       { $1.codes[$3] = $5; $$ = $1; }
+    ;
+
+code
+    : name                              { $$ = {code: "ref", ref: $1}; }
+    | LC labelled_codes RC              { $$ = {code: "product", 
+                                                product: $2.reduce((r, lc) => { 
+                                                  r[lc.label] = lc.code;
+                                                  return r }
+                                                , {})}; }
+    | LB code RB                        { $$ = {code: "vector", vector: $2}; }
+    | LA labelled_codes RA              { $$ = {code: "union", 
+                                                union: $2.reduce((r, lc) => { 
+                                                  r[lc.label] = lc.code;
+                                                  return r }
+                                                , {})}; }
+    ;
+
+labelled_codes 
+    :                                   { $$ = [] }
+    | non_empty_labelled_codes          { $$ = $1; }
+    ;
+
+non_empty_labelled_codes
+    : code_label                        { $$ = [$1]; }
+    | non_empty_labelled_codes COMMA code_label
+                                        { $$ = [].concat($1,$3); }
+    ;
+
+code_label 
+    : code name                         { $$ = {label: $2, code: $1}; }
+    | code str                          { $$ = {label: $2, code: $1}; }
+    | name COL code                     { $$ = {label: $1, code: $3}; }
+    | str COL code                      { $$ = {label: $1, code: $3}; }
+    ;
+
 comp 
-    : exp          { $$ = $1; }
-    | comp exp     { $$ = s.comp($1, $2); }
+    : exp                               { $$ = $1; }
+    | comp exp                          { $$ = s.comp($1, $2); }
     ;
 
 exp
@@ -61,6 +104,7 @@ exp
     | DOT int                           { $$ = {op: "dot", dot: $2}; }
     | DOT str                           { $$ = {op: "dot", dot: $2}; }
     | DOT name                          { $$ = {op: "dot", dot: $2}; }
+    | DOLLAR code                       { $$ = {op: "code", code: $2}; }
     ;
 
 labelled
@@ -78,6 +122,8 @@ non_empty_labelled
 comp_label
     : comp name  { $$ = {label: $2, exp: $1}; }
     | comp str   { $$ = {label: $2, exp: $1}; }
+    | name COL comp { $$ = {label: $1, exp: $3}; }
+    | str COL comp { $$ = {label: $1, exp: $3}; }
     ;
 
 list

package/parser.js

@@ -72,12 +72,12 @@
   }
 */
 var parser = (function(){
-var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[1,12],$V1=[1,13],$V2=[1,14],$V3=[1,4],$V4=[1,5],$V5=[1,6],$V6=[1,8],$V7=[1,11],$V8=[4,6,8,11,13,16,18,19,20,21,22,23,26],$V9=[2,24],$Va=[2,10],$Vb=[2,13],$Vc=[4,6,8,11,13,15,16,18,19,20,21,22,23,26],$Vd=[15,26],$Ve=[18,20,26],$Vf=[4,6,8,13,16,19,21,23],$Vg=[2,22],$Vh=[2,23];
+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,17,20,22,31,33],$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,17,20,22,31,33],$Vb=[2,25],$Vc=[1,24],$Vd=[1,25],$Ve=[1,26],$Vf=[4,6,8,12,14,15,17,19,20,21,22,23,26,31,32,33],$Vg=[2,42],$Vh=[2,28],$Vi=[2,8],$Vj=[2,12],$Vk=[19,26],$Vl=[21,23,26],$Vm=[19,23,26],$Vn=[2,38],$Vo=[2,39];
 var parser = {trace: function trace () { },
 yy: {},
-symbols_: {"error":2,"name":3,"NAME":4,"str":5,"STRING":6,"int":7,"INT":8,"input_with_eof":9,"comp":10,"EOF":11,"exp":12,"LC":13,"labelled":14,"RC":15,"LB":16,"list":17,"RB":18,"LA":19,"RA":20,"LP":21,"RP":22,"DOT":23,"non_empty_labelled":24,"comp_label":25,"COMMA":26,"non_empty_list":27,"$accept":0,"$end":1},
-terminals_: {2:"error",4:"NAME",6:"STRING",8:"INT",11:"EOF",13:"LC",15:"RC",16:"LB",18:"RB",19:"LA",20:"RA",21:"LP",22:"RP",23:"DOT",26:"COMMA"},
-productions_: [0,[3,1],[5,1],[7,1],[9,2],[10,1],[10,2],[12,3],[12,3],[12,3],[12,1],[12,2],[12,3],[12,1],[12,1],[12,2],[12,2],[12,2],[14,0],[14,1],[24,1],[24,3],[25,2],[25,2],[17,0],[17,1],[27,1],[27,3]],
+symbols_: {"error":2,"name":3,"NAME":4,"str":5,"STRING":6,"int":7,"INT":8,"input_with_eof":9,"defs":10,"comp":11,"EOF":12,"EQ":13,"SC":14,"DOLLAR":15,"code":16,"LC":17,"labelled_codes":18,"RC":19,"LB":20,"RB":21,"LA":22,"RA":23,"non_empty_labelled_codes":24,"code_label":25,"COMMA":26,"COL":27,"exp":28,"labelled":29,"list":30,"LP":31,"RP":32,"DOT":33,"non_empty_labelled":34,"comp_label":35,"non_empty_list":36,"$accept":0,"$end":1},
+terminals_: {2:"error",4:"NAME",6:"STRING",8:"INT",12:"EOF",13:"EQ",14:"SC",15:"DOLLAR",17:"LC",19:"RC",20:"LB",21:"RB",22:"LA",23:"RA",26:"COMMA",27:"COL",31:"LP",32:"RP",33:"DOT"},
+productions_: [0,[3,1],[5,1],[7,1],[9,3],[10,0],[10,5],[10,6],[16,1],[16,3],[16,3],[16,3],[18,0],[18,1],[24,1],[24,3],[25,2],[25,2],[25,3],[25,3],[11,1],[11,2],[28,3],[28,3],[28,3],[28,1],[28,2],[28,3],[28,1],[28,1],[28,2],[28,2],[28,2],[28,2],[29,0],[29,1],[34,1],[34,3],[35,2],[35,2],[35,3],[35,3],[30,0],[30,1],[36,1],[36,3]],
 performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
 /* this == yyval */
 
@@ -94,68 +94,113 @@ case 3:
 break;
 case 4:
 
-    // console.log(JSON.stringify($$[$0-1], "", 2));
-    return $$[$0-1];
+    result = {defs: $$[$0-2], exp: $$[$0-1]};
+    // console.log(JSON.stringify(result, "", 2));
+    return result;
 
 break;
-case 5: case 19: case 25:
- this.$ = $$[$0]; 
+case 5:
+ this.$ = {codes: {}, rels: {}}; 
 break;
 case 6:
- this.$ = s.comp($$[$0-1], $$[$0]); 
+ $$[$0-4].rels[$$[$0-3]] = $$[$0-1]; this.$ = $$[$0-4]; 
 break;
 case 7:
- this.$ = $$[$0-1]; 
+ $$[$0-5].codes[$$[$0-3]] = $$[$0-1]; this.$ = $$[$0-5]; 
 break;
 case 8:
- this.$ = {op: "vector", vector: $$[$0-1]}; 
+ this.$ = {code: "ref", ref: $$[$0]}; 
 break;
 case 9:
- this.$ = {op: "union", union: $$[$0-1]}; 
+ this.$ = {code: "product", 
+                                                product: $$[$0-1].reduce((r, lc) => { 
+                                                  r[lc.label] = lc.code;
+                                                  return r }
+                                                , {})}; 
 break;
 case 10:
- this.$ = {op: "ref", ref: $$[$0]}; 
+ this.$ = {code: "vector", vector: $$[$0-1]}; 
 break;
 case 11:
- this.$ = s.identity;  
+ this.$ = {code: "union", 
+                                                union: $$[$0-1].reduce((r, lc) => { 
+                                                  r[lc.label] = lc.code;
+                                                  return r }
+                                                , {})}; 
 break;
 case 12:
+ this.$ = [] 
+break;
+case 13: case 20: case 35: case 43:
+ this.$ = $$[$0]; 
+break;
+case 14: case 44:
+ this.$ = [$$[$0]]; 
+break;
+case 15: case 45:
+ this.$ = [].concat($$[$0-2],$$[$0]); 
+break;
+case 16: case 17:
+ this.$ = {label: $$[$0], code: $$[$0-1]}; 
+break;
+case 18: case 19:
+ this.$ = {label: $$[$0-2], code: $$[$0]}; 
+break;
+case 21:
+ this.$ = s.comp($$[$0-1], $$[$0]); 
+break;
+case 22:
+ this.$ = $$[$0-1]; 
+break;
+case 23:
+ this.$ = {op: "vector", vector: $$[$0-1]}; 
+break;
+case 24:
+ this.$ = {op: "union", union: $$[$0-1]}; 
+break;
+case 25:
+ this.$ = {op: "ref", ref: $$[$0]}; 
+break;
+case 26:
+ this.$ = s.identity;  
+break;
+case 27:
  this.$ = $$[$0-1];  
 break;
-case 13:
+case 28:
  this.$ = {op: "str", str: $$[$0]}; 
 break;
-case 14:
+case 29:
  this.$ = {op: "int", int: $$[$0]}; 
 break;
-case 15: case 16: case 17:
+case 30: case 31: case 32:
  this.$ = {op: "dot", dot: $$[$0]}; 
 break;
-case 18:
+case 33:
+ this.$ = {op: "code", code: $$[$0]}; 
+break;
+case 34:
  this.$ = {op: "product", product: []}; 
 break;
-case 20:
+case 36:
  this.$ = {op: "product", product: [$$[$0]]}; 
 break;
-case 21:
+case 37:
  $$[$0-2].product = [].concat($$[$0-2].product,$$[$0]); this.$ = $$[$0-2]; 
 break;
-case 22: case 23:
+case 38: case 39:
  this.$ = {label: $$[$0], exp: $$[$0-1]}; 
 break;
-case 24:
- this.$ = []; 
-break;
-case 26:
- this.$ = [$$[$0]]; 
+case 40: case 41:
+ this.$ = {label: $$[$0-2], exp: $$[$0]}; 
 break;
-case 27:
- this.$ = [].concat($$[$0-2],$$[$0]); 
+case 42:
+ this.$ = []; 
 break;
 }
 },
-table: [{3:7,4:$V0,5:9,6:$V1,7:10,8:$V2,9:1,10:2,12:3,13:$V3,16:$V4,19:$V5,21:$V6,23:$V7},{1:[3]},{3:7,4:$V0,5:9,6:$V1,7:10,8:$V2,11:[1,15],12:16,13:$V3,16:$V4,19:$V5,21:$V6,23:$V7},o($V8,[2,5]),{3:7,4:$V0,5:9,6:$V1,7:10,8:$V2,10:20,12:3,13:$V3,14:17,15:[2,18],16:$V4,19:$V5,21:$V6,23:$V7,24:18,25:19},{3:7,4:$V0,5:9,6:$V1,7:10,8:$V2,10:23,12:3,13:$V3,16:$V4,17:21,18:$V9,19:$V5,21:$V6,23:$V7,27:22},{3:7,4:$V0,5:9,6:$V1,7:10,8:$V2,10:23,12:3,13:$V3,16:$V4,17:24,19:$V5,20:$V9,21:$V6,23:$V7,27:22},o($V8,$Va),{3:7,4:$V0,5:9,6:$V1,7:10,8:$V2,10:26,12:3,13:$V3,16:$V4,19:$V5,21:$V6,22:[1,25],23:$V7},o($V8,$Vb),o($V8,[2,14]),{3:29,4:$V0,5:28,6:$V1,7:27,8:$V2},o($Vc,[2,1]),o($Vc,[2,2]),o($V8,[2,3]),{1:[2,4]},o($V8,[2,6]),{15:[1,30]},{15:[2,19],26:[1,31]},o($Vd,[2,20]),{3:32,4:$V0,5:33,6:$V1,7:10,8:$V2,12:16,13:$V3,16:$V4,19:$V5,21:$V6,23:$V7},{18:[1,34]},o([18,20],[2,25],{26:[1,35]}),o($Ve,[2,26],{3:7,5:9,7:10,12:16,4:$V0,6:$V1,8:$V2,13:$V3,16:$V4,19:$V5,21:$V6,23:$V7}),{20:[1,36]},o($V8,[2,11]),{3:7,4:$V0,5:9,6:$V1,7:10,8:$V2,12:16,13:$V3,16:$V4,19:$V5,21:$V6,22:[1,37],23:$V7},o($V8,[2,15]),o($V8,[2,16]),o($V8,[2,17]),o($V8,[2,7]),{3:7,4:$V0,5:9,6:$V1,7:10,8:$V2,10:20,12:3,13:$V3,16:$V4,19:$V5,21:$V6,23:$V7,25:38},o($Vf,$Va,{15:$Vg,26:$Vg}),o($Vf,$Vb,{15:$Vh,26:$Vh}),o($V8,[2,8]),{3:7,4:$V0,5:9,6:$V1,7:10,8:$V2,10:39,12:3,13:$V3,16:$V4,19:$V5,21:$V6,23:$V7},o($V8,[2,9]),o($V8,[2,12]),o($Vd,[2,21]),o($Ve,[2,27],{3:7,5:9,7:10,12:16,4:$V0,6:$V1,8:$V2,13:$V3,16:$V4,19:$V5,21:$V6,23:$V7})],
-defaultActions: {15:[2,4]},
+table: [o($V0,[2,5],{9:1,10:2}),{1:[3]},{3:4,4:$V1,5:12,6:$V2,7:13,8:$V3,11:3,15:[1,5],17:$V4,20:$V5,22:$V6,28:6,31:$V7,33:$V8},{3:19,4:$V1,5:12,6:$V2,7:13,8:$V3,12:[1,17],15:$V9,17:$V4,20:$V5,22:$V6,28:18,31:$V7,33:$V8},o($Va,$Vb,{13:[1,21]}),{3:22,4:$V1,16:23,17:$Vc,20:$Vd,22:$Ve},o($Vf,[2,20]),o([4,6,8,12,13,14,15,17,19,20,21,22,23,26,27,31,32,33],[2,1]),{3:31,4:$V1,5:32,6:$V2,7:13,8:$V3,11:30,15:$V9,17:$V4,19:[2,34],20:$V5,22:$V6,28:6,29:27,31:$V7,33:$V8,34:28,35:29},{3:19,4:$V1,5:12,6:$V2,7:13,8:$V3,11:35,15:$V9,17:$V4,20:$V5,21:$Vg,22:$V6,28:6,30:33,31:$V7,33:$V8,36:34},{3:19,4:$V1,5:12,6:$V2,7:13,8:$V3,11:35,15:$V9,17:$V4,20:$V5,22:$V6,23:$Vg,28:6,30:36,31:$V7,33:$V8,36:34},{3:19,4:$V1,5:12,6:$V2,7:13,8:$V3,11:38,15:$V9,17:$V4,20:$V5,22:$V6,28:6,31:$V7,32:[1,37],33:$V8},o($Vf,$Vh),o($Vf,[2,29]),{3:41,4:$V1,5:40,6:$V2,7:39,8:$V3},o([4,6,8,12,14,15,17,19,20,21,22,23,26,27,31,32,33],[2,2]),o($Vf,[2,3]),{1:[2,4]},o($Vf,[2,21]),o($Vf,$Vb),{3:42,4:$V1,16:23,17:$Vc,20:$Vd,22:$Ve},{3:19,4:$V1,5:12,6:$V2,7:13,8:$V3,11:43,15:$V9,17:$V4,20:$V5,22:$V6,28:6,31:$V7,33:$V8},o($Va,$Vi,{13:[1,44]}),o($Vf,[2,33]),{3:49,4:$V1,5:50,6:$V2,16:48,17:$Vc,18:45,19:$Vj,20:$Vd,22:$Ve,24:46,25:47},{3:42,4:$V1,16:51,17:$Vc,20:$Vd,22:$Ve},{3:49,4:$V1,5:50,6:$V2,16:48,17:$Vc,18:52,20:$Vd,22:$Ve,23:$Vj,24:46,25:47},{19:[1,53]},{19:[2,35],26:[1,54]},o($Vk,[2,36]),{3:55,4:$V1,5:56,6:$V2,7:13,8:$V3,15:$V9,17:$V4,20:$V5,22:$V6,28:18,31:$V7,33:$V8},o($V0,$Vb,{27:[1,57]}),o($V0,$Vh,{27:[1,58]}),{21:[1,59]},o([21,23],[2,43],{26:[1,60]}),o($Vl,[2,44],{5:12,7:13,28:18,3:19,4:$V1,6:$V2,8:$V3,15:$V9,17:$V4,20:$V5,22:$V6,31:$V7,33:$V8}),{23:[1,61]},o($Vf,[2,26]),{3:19,4:$V1,5:12,6:$V2,7:13,8:$V3,15:$V9,17:$V4,20:$V5,22:$V6,28:18,31:$V7,32:[1,62],33:$V8},o($Vf,[2,30]),o($Vf,[2,31]),o($Vf,[2,32]),o($Vf,$Vi),{3:19,4:$V1,5:12,6:$V2,7:13,8:$V3,14:[1,63],15:$V9,17:$V4,20:$V5,22:$V6,28:18,31:$V7,33:$V8},{3:42,4:$V1,16:64,17:$Vc,20:$Vd,22:$Ve},{19:[1,65]},o([19,23],[2,13],{26:[1,66]}),o($Vm,[2,14]),{3:67,4:$V1,5:68,6:$V2},o([4,6],$Vi,{27:[1,69]}),{27:[1,70]},{21:[1,71]},{23:[1,72]},o($Vf,[2,22]),{3:31,4:$V1,5:32,6:$V2,7:13,8:$V3,11:30,15:$V9,17:$V4,20:$V5,22:$V6,28:6,31:$V7,33:$V8,35:73},o($V0,$Vb,{19:$Vn,26:$Vn}),o($V0,$Vh,{19:$Vo,26:$Vo}),{3:19,4:$V1,5:12,6:$V2,7:13,8:$V3,11:74,15:$V9,17:$V4,20:$V5,22:$V6,28:6,31:$V7,33:$V8},{3:19,4:$V1,5:12,6:$V2,7:13,8:$V3,11:75,15:$V9,17:$V4,20:$V5,22:$V6,28:6,31:$V7,33:$V8},o($Vf,[2,23]),{3:19,4:$V1,5:12,6:$V2,7:13,8:$V3,11:76,15:$V9,17:$V4,20:$V5,22:$V6,28:6,31:$V7,33:$V8},o($Vf,[2,24]),o($Vf,[2,27]),o($V0,[2,6]),{14:[1,77]},o($Vf,[2,9]),{3:49,4:$V1,5:50,6:$V2,16:48,17:$Vc,20:$Vd,22:$Ve,25:78},o($Vm,[2,16]),o($Vm,[2,17]),{3:42,4:$V1,16:79,17:$Vc,20:$Vd,22:$Ve},{3:42,4:$V1,16:80,17:$Vc,20:$Vd,22:$Ve},o($Vf,[2,10]),o($Vf,[2,11]),o($Vk,[2,37]),o($Vk,[2,40],{5:12,7:13,28:18,3:19,4:$V1,6:$V2,8:$V3,15:$V9,17:$V4,20:$V5,22:$V6,31:$V7,33:$V8}),o($Vk,[2,41],{5:12,7:13,28:18,3:19,4:$V1,6:$V2,8:$V3,15:$V9,17:$V4,20:$V5,22:$V6,31:$V7,33:$V8}),o($Vl,[2,45],{5:12,7:13,28:18,3:19,4:$V1,6:$V2,8:$V3,15:$V9,17:$V4,20:$V5,22:$V6,31:$V7,33:$V8}),o($V0,[2,7]),o($Vm,[2,15]),o($Vm,[2,18]),o($Vm,[2,19])],
+defaultActions: {17:[2,4]},
 parseError: function parseError (str, hash) {
     if (hash.recoverable) {
         this.trace(str);
@@ -641,38 +686,46 @@ case 1:/* one line comment */
 break;
 case 2:/* blanks */
 break;
-case 3:return 19;
+case 3:return 22;
+break;
+case 4:return 17;
+break;
+case 5:return 20;
+break;
+case 6:return 31;
+break;
+case 7:return 23;
 break;
-case 4:return 13;
+case 8:return 19;
 break;
-case 5:return 16;
+case 9:return 21;
 break;
-case 6:return 21;
+case 10:return 32;
 break;
-case 7:return 20;
+case 11:return 13; 
 break;
-case 8:return 15;
+case 12:return 33;
 break;
-case 9:return 18;
+case 13:return 26;
 break;
-case 10:return 22;
+case 14:return 14;
 break;
-case 11:return 23;
+case 15:return 27;
 break;
-case 12:return 26;
+case 16:return 15; 
 break;
-case 13:return 6
+case 17:return 6
 break;
-case 14:return 4;
+case 18:return 4;
 break;
-case 15:return 8;
+case 19:return 8;
 break;
-case 16:return 11;
+case 20:return 12;
 break;
 }
 },
-rules: [/^(?:[/][*]([*][^/]|[^*])*[*][/])/,/^(?:(\/\/|#|%|--)[^\n]*)/,/^(?:\s+)/,/^(?:<)/,/^(?:\{)/,/^(?:\[)/,/^(?:\()/,/^(?:>)/,/^(?:\})/,/^(?:\])/,/^(?:\))/,/^(?:\.)/,/^(?:,)/,/^(?:"[^\"\n]*"|'[^\'\n]*')/,/^(?:[a-zA-Z_][a-zA-Z0-9_]*)/,/^(?:0|[-]?[1-9][0-9]*)/,/^(?:$)/],
-conditions: {"INITIAL":{"rules":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16],"inclusive":true}}
+rules: [/^(?:[/][*]([*][^/]|[^*])*[*][/])/,/^(?:(\/\/|#|%|--)[^\n]*)/,/^(?:\s+)/,/^(?:<)/,/^(?:\{)/,/^(?:\[)/,/^(?:\()/,/^(?:>)/,/^(?:\})/,/^(?:\])/,/^(?:\))/,/^(?:=)/,/^(?:\.)/,/^(?:,)/,/^(?:;)/,/^(?::)/,/^(?:\$)/,/^(?:"[^\"\n]*"|'[^\'\n]*')/,/^(?:[a-zA-Z_][a-zA-Z0-9_?!]*)/,/^(?:0|[-]?[1-9][0-9]*)/,/^(?:$)/],
+conditions: {"INITIAL":{"rules":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20],"inclusive":true}}
 });
 return lexer;
 })();

package/pow.k

@@ -0,0 +1,7 @@
+
+pow = 
+  < [(), 0] EQ 1,
+    [[(), -1] PLUS pow, ()] TIMES
+  >;
+
+pow

package/run.coffee

@@ -2,7 +2,10 @@ valid = (x) ->
   return undefined if isNaN x
   return x if x?
 
-builtin = 
+builtin =
+  "_log_": (arg) ->
+    console.log "_log_: #{JSON.stringify arg}"
+    arg
   "GT": (args) ->
     [ok,_] = do ([last,args...] = args) ->
       args.reduce ([ok,last], x) ->
@@ -32,45 +35,82 @@ builtin =
   "null": -> null
   "toJSON": (x) -> JSON.stringify x
   "fromJSON": (x) -> JSON.parse x
+  "CONS": ([x,y]) -> [x,y...]
+  "SNOC": (x) ->
+    return [x[0],x.slice 1] if x.length > 1 
 
+codes =
+  "int": (x) -> 
+    Number.isInteger x
+  "string": (x) ->
+    (x instanceof String) or ('string' is typeof x) 
+  "bool": (x) ->
+    x is true or x is false
+
+verify = (code, value) ->
+  switch code.code
+    when "ref"
+      do (c = run.defs.codes[code.ref]) ->
+        return verify c, value if c?  
+        codes[code.ref] value
+    when "vector"
+      value.every (x) ->
+        verify code.vector, x
+    when "product"
+      do (fields = Object.keys(value)) ->
+        return false unless fields.length is Object.keys(code.product).length
+        fields.every (label) ->
+          verify code.product[label], value[label]
+    when "union"
+      do (fields = Object.keys(value)) ->
+        return false unless fields.length is 1
+        verify code.union[fields[0]], value[fields[0]]
 
 run = (exp, value) ->
-  return undefined unless value?
+  return undefined if value is undefined
   try 
     switch exp.op
+      when "code"
+        return value if verify exp.code, value
       when "identity"
         return value
       when "str", "int"
         return exp[exp.op]
       when "ref"
-        return do (value = builtin[exp.ref] value) ->
-          throw new Error "Undefined" if value is undefined
-          value          
+        do (defn = run.defs.rels[exp.ref]) ->
+          if defn?
+            run defn, value
+          else  
+            do ( value = builtin[exp.ref] value ) -> 
+              throw new Error "Undefined" if value is undefined
+              value          
       when "dot"
         return value[exp.dot]
       when "comp"
         return exp.comp.reduce (value, exp) ->
           value = run exp, value
-          throw new Error "Undefined" unless value?
+          throw new Error "Undefined" if value is undefined
           value
         , value
       when "vector"
         return exp.vector.map (exp) -> 
           result = run exp, value
-          throw new Error "Undefined" unless result?
+          throw new Error "Undefined" if result is undefined
           result
       when "union"
         for e in exp.union
           result = try run e, value
-          return result if result?
+          return result unless result is undefined
         return undefined
       when "product"
         return exp.product.reduce (result, {label, exp}) ->
           do (value = run exp, value) ->
-            throw new Error "Undefined" unless value?
+            throw new Error "Undefined" if value is undefined
             result[label] = value
             result
         , {}
+      else  
+        console.log exp.op
 
 
-module.exports = run
+module.exports = run

package/run.js

@@ -1,6 +1,6 @@
 // Generated by CoffeeScript 2.7.0
 (function() {
-  var builtin, run, valid,
+  var builtin, codes, run, valid, verify,
     modulo = function(a, b) { return (+a % (b = +b) + b) % b; };
 
   valid = function(x) {
@@ -13,6 +13,10 @@
   };
 
   builtin = {
+    "_log_": function(arg) {
+      console.log(`_log_: ${JSON.stringify(arg)}`);
+      return arg;
+    },
     "GT": function(args) {
       var _, ok;
       [ok, _] = (function([last, ...args]) {
@@ -83,34 +87,97 @@
     },
     "fromJSON": function(x) {
       return JSON.parse(x);
+    },
+    "CONS": function([x, y]) {
+      return [x, ...y];
+    },
+    "SNOC": function(x) {
+      if (x.length > 1) {
+        return [x[0], x.slice(1)];
+      }
+    }
+  };
+
+  codes = {
+    "int": function(x) {
+      return Number.isInteger(x);
+    },
+    "string": function(x) {
+      return (x instanceof String) || ('string' === typeof x);
+    },
+    "bool": function(x) {
+      return x === true || x === false;
+    }
+  };
+
+  verify = function(code, value) {
+    switch (code.code) {
+      case "ref":
+        return (function(c) {
+          if (c != null) {
+            return verify(c, value);
+          }
+          return codes[code.ref](value);
+        })(run.defs.codes[code.ref]);
+      case "vector":
+        return value.every(function(x) {
+          return verify(code.vector, x);
+        });
+      case "product":
+        return (function(fields) {
+          if (fields.length !== Object.keys(code.product).length) {
+            return false;
+          }
+          return fields.every(function(label) {
+            return verify(code.product[label], value[label]);
+          });
+        })(Object.keys(value));
+      case "union":
+        return (function(fields) {
+          if (fields.length !== 1) {
+            return false;
+          }
+          return verify(code.union[fields[0]], value[fields[0]]);
+        })(Object.keys(value));
     }
   };
 
   run = function(exp, value) {
     var e, i, len, ref, result;
-    if (value == null) {
+    if (value === void 0) {
       return void 0;
     }
     try {
       switch (exp.op) {
+        case "code":
+          if (verify(exp.code, value)) {
+            return value;
+          }
+          break;
         case "identity":
           return value;
         case "str":
         case "int":
           return exp[exp.op];
         case "ref":
-          return (function(value) {
-            if (value === void 0) {
-              throw new Error("Undefined");
+          return (function(defn) {
+            if (defn != null) {
+              return run(defn, value);
+            } else {
+              return (function(value) {
+                if (value === void 0) {
+                  throw new Error("Undefined");
+                }
+                return value;
+              })(builtin[exp.ref](value));
             }
-            return value;
-          })(builtin[exp.ref](value));
+          })(run.defs.rels[exp.ref]);
         case "dot":
           return value[exp.dot];
         case "comp":
           return exp.comp.reduce(function(value, exp) {
             value = run(exp, value);
-            if (value == null) {
+            if (value === void 0) {
               throw new Error("Undefined");
             }
             return value;
@@ -119,7 +186,7 @@
           return exp.vector.map(function(exp) {
             var result;
             result = run(exp, value);
-            if (result == null) {
+            if (result === void 0) {
               throw new Error("Undefined");
             }
             return result;
@@ -133,7 +200,7 @@
                 return run(e, value);
               } catch (error) {}
             })();
-            if (result != null) {
+            if (result !== void 0) {
               return result;
             }
           }
@@ -141,13 +208,15 @@
         case "product":
           return exp.product.reduce(function(result, {label, exp}) {
             return (function(value) {
-              if (value == null) {
+              if (value === void 0) {
                 throw new Error("Undefined");
               }
               result[label] = value;
               return result;
             })(run(exp, value));
           }, {});
+        default:
+          return console.log(exp.op);
       }
     } catch (error) {}
   };

package/test.coffee

@@ -32,3 +32,19 @@ console.log ""
   console.log "k_fn(#{JSON.stringify(data)});"
   console.log "// RETURNS: #{JSON.stringify k_fn data}"
   console.log ""
+
+k_expression = "$t = < i: int, t: [ t ] > ; <$t, $int>"
+k_fn  = k.compile k_expression
+
+console.log "var k_fn = k.compile('#{k_expression}');"
+console.log ""
+
+[ 
+  1
+  {i:1}
+  [{i:2},{i:3},{t:[]}]
+  {"t":[{"i":2},{"i":3},{"t":[]}]}
+].map (data) -> 
+  console.log "k_fn(#{JSON.stringify(data)});"
+  console.log "// RETURNS: #{JSON.stringify k_fn data}"
+  console.log ""

package/test.js

@@ -73,4 +73,47 @@
     return console.log("");
   });
 
+  k_expression = "$t = < i: int, t: [ t ] > ; <$t, $int>";
+
+  k_fn = k.compile(k_expression);
+
+  console.log(`var k_fn = k.compile('${k_expression}');`);
+
+  console.log("");
+
+  [
+    1,
+    {
+      i: 1
+    },
+    [
+      {
+        i: 2
+      },
+      {
+        i: 3
+      },
+      {
+        t: []
+      }
+    ],
+    {
+      "t": [
+        {
+          "i": 2
+        },
+        {
+          "i": 3
+        },
+        {
+          "t": []
+        }
+      ]
+    }
+  ].map(function(data) {
+    console.log(`k_fn(${JSON.stringify(data)});`);
+    console.log(`// RETURNS: ${JSON.stringify(k_fn(data))}`);
+    return console.log("");
+  });
+
 }).call(this);

package/{test.t → test.k}

@@ -2,7 +2,7 @@
 <                          -- merge of 4 partial functions...
   ["x=", .x, " & y=", .y], -- produces a vector of 4 values, if fields 'x' and 'y' are present
   ["only x=", .x],         -- produces a pair '["only x=", "value-of-x"]', for input like {"x":"value-of-x"}
-							-- it is defined only if field 'x' is present
+							             -- it is defined only if field 'x' is present
   ["only y=", .y],
   ["no x nor y"]           -- defined for all input, returns always the same one element vector
 >