@fraczak/k 1.1.2 → 1.1.4

package/codes.coffee

@@ -1,5 +1,6 @@
 
 are_different = (classes, representatives, name1, name2, codes) ->
+  # console.log {classes, representatives, name1, name2, codes}
   return false if name1 is name2
   code1 = codes[name1]
   code2 = codes[name2]
@@ -11,9 +12,11 @@ are_different = (classes, representatives, name1, name2, codes) ->
         do (arg = code[code.code]) ->
           Object.keys(arg).reduce (fields, label) ->
             fields[label] = representatives[arg[label]] ? arg[label]
+            fields
           , {}
       return true unless Object.keys(fields1).length is Object.keys(fields2).length
       for field,rep of fields1 
+        # console.log {field,rep1:rep,rep2:fields2[field]}
         return true unless fields2[field] is rep 
     when "vector"
       [arg1,arg2] = [code1, code2]. map ({vector}) ->
@@ -99,7 +102,7 @@ normalizeAll = (codes,representatives) ->
             normalized[name] = { code: code.code } 
             normalized[name][code.code] = normalize code[code.code], representatives
           when "vector"
-            normalized[name] = {code:"vector", vector: representatives[code.vector]}
+            normalized[name] = {code:"vector", vector: representatives[code.vector] ? code.vector}
   
     normalized    
   , {}

package/codes.js

@@ -5,6 +5,7 @@
   are_different = function(classes, representatives, name1, name2, codes) {
     var arg1, arg2, code1, code2, field, fields1, fields2, rep;
     if (name1 === name2) {
+      // console.log {classes, representatives, name1, name2, codes}
       return false;
     }
     code1 = codes[name1];
@@ -20,7 +21,8 @@
           return (function(arg) {
             return Object.keys(arg).reduce(function(fields, label) {
               var ref;
-              return fields[label] = (ref = representatives[arg[label]]) != null ? ref : arg[label];
+              fields[label] = (ref = representatives[arg[label]]) != null ? ref : arg[label];
+              return fields;
             }, {});
           })(code[code.code]);
         });
@@ -30,6 +32,8 @@
         for (field in fields1) {
           rep = fields1[field];
           if (fields2[field] !== rep) {
+            
+            // console.log {field,rep1:rep,rep2:fields2[field]}
             return true;
           }
         }
@@ -152,6 +156,7 @@
     return normalized = names.reduce(function(normalized, name) {
       if (name === representatives[name]) {
         (function(code) {
+          var ref;
           switch (code.code) {
             case "union":
             case "product":
@@ -162,7 +167,7 @@
             case "vector":
               return normalized[name] = {
                 code: "vector",
-                vector: representatives[code.vector]
+                vector: (ref = representatives[code.vector]) != null ? ref : code.vector
               };
           }
         })(codes[name]);

package/error.k

@@ -0,0 +1,8 @@
+
+$ var = < int int, bool bool >;
+
+ < 
+  $var "VAR",
+  _log! 
+  $ < int i, bool j> " < int i, bool j>"
+> 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fraczak/k",
-    "version": "1.1.2",
+    "version": "1.1.4",
     "description": "k-language for JSON-like data transformation",
     "main": "index.js",
     "scripts": {

package/run.coffee

@@ -48,7 +48,9 @@ codes =
     x is true or x is false
 
 verify = (code, value) ->
-  # console.log {code,value}
+  # representatives = run.defs.representatives
+  # defCodes = JSON.stringify run.defs.codes
+  # console.log {code,value, representatives, defCodes}
   switch code.code
     when "vector"
       value.every (x) ->

package/run.js

@@ -111,7 +111,9 @@
   };
 
   verify = function(code, value) {
-    // console.log {code,value}
+    // representatives = run.defs.representatives
+    // defCodes = JSON.stringify run.defs.codes
+    // console.log {code,value, representatives, defCodes}
     switch (code.code) {
       case "vector":
         return value.every(function(x) {

package/test.coffee

@@ -48,3 +48,17 @@ console.log ""
   console.log "k_fn(#{JSON.stringify(data)});"
   console.log "// RETURNS: #{JSON.stringify k_fn data}"
   console.log ""
+
+k_expression = "$ < < [ int ] ints, [ bool ] bools > list, string None>"
+k_fn  = k.compile k_expression
+console.log "var k_fn = k.compile('#{k_expression}');"
+console.log ""
+
+[ 
+  {None: "None"}
+  {list: {ints: []}}
+  {list: {ints: [1,2,3]}}
+].map (data) -> 
+  console.log "k_fn(#{JSON.stringify(data)});"
+  console.log "// RETURNS: #{JSON.stringify k_fn data}"
+  console.log ""

package/test.js

@@ -116,4 +116,34 @@
     return console.log("");
   });
 
+  k_expression = "$ < < [ int ] ints, [ bool ] bools > list, string None>";
+
+  k_fn = k.compile(k_expression);
+
+  console.log(`var k_fn = k.compile('${k_expression}');`);
+
+  console.log("");
+
+  [
+    {
+      None: "None"
+    },
+    {
+      list: {
+        ints: []
+      }
+    },
+    {
+      list: {
+        ints: [1,
+    2,
+    3]
+      }
+    }
+  ].map(function(data) {
+    console.log(`k_fn(${JSON.stringify(data)});`);
+    console.log(`// RETURNS: ${JSON.stringify(k_fn(data))}`);
+    return console.log("");
+  });
+
 }).call(this);

package/typed-fib.k

@@ -3,14 +3,14 @@ fib2 =
 $ { int target, int x, int "fib(x)", int "fib(x-1)" }
   _log!
   <
-    {[.target,.x] GT guard, () input}
-    .input
-    {.target target,
-     .x inc x,
-     [."fib(x)", ."fib(x-1)"] PLUS "fib(x)",
+    {[.target,.x]GT.0 target ,
+     .x inc x ,
+     [."fib(x)",."fib(x-1)"]PLUS "fib(x)" ,
      ."fib(x)" "fib(x-1)" }
     fib2,
-    ."fib(x)"
+    
+    {[.target,.x] EQ, ."fib(x)" result}
+    .result
   >
 $ int;