@fraczak/k 4.0.1 → 4.0.2

package/codes.mjs

@@ -12,7 +12,7 @@ function isBuiltIn(code) {
   return code.match(/^(int|string|bool)$/);
 }
 
-function encodeCodeToString(code, codes) {
+function encodeCodeToString(code, codes = theRepository.codes) {
   if (isBuiltIn(code)) return code;
   var i = 0;
   const Q = [[code,i]];

package/package.json

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

package/parser.jison

@@ -3,6 +3,10 @@
 import { SymbolTable, comp, union, identity } from "./symbol-table.mjs";
 let s = new SymbolTable();
 
+function anError(pos,msg) {
+    throw new Error(`Parse Error (lines ${pos.first_line}:${pos.first_column}...${pos.last_line}:${pos.last_column}): ${msg}`);
+}
+
 function getToken(yytext,yy,lstack) {
     const yylloc = yy.lexer.yylloc;
     const loc = lstack[lstack.length - 1]; //  { first_line: 5, last_line: 5, first_column: 2, last_column: 3 };
@@ -38,7 +42,7 @@ function fromEscString(escString) {
 %lex
 
 %%
-[/][*]([*][^/]|[^*])*[*][/]                     /* c-comment */
+[/][*]([^*]*[*]+[^*/])*[^*]*[*]+[/]             /* c-comment */
 ("//"|"#"|"%"|"--")[^\n]*                       /* one line comment */
 \s+                                             /* blanks */
 "<"                                            return 'LA';
@@ -119,7 +123,10 @@ code
     ;
 
 codeDef
-    : lc labelled_codes rc              { $$ = { code: "product", product: $2, start: $1.start, end: $3.end }; }
+    : lc labelled_codes rc              { if (Object.keys($2).length == 1)
+                                            $$ = { code: "union", union: $2, start: $1.start, end: $3.end };
+                                          else
+                                            $$ = { code: "product", product: $2, start: $1.start, end: $3.end }; }
     | lb code rb                        { $$ = { code: "vector", vector: s.as_ref($2), start: $1.start, end: $3.end }; }
     | la labelled_codes ra              { $$ = { code: "union", union: $2, start: $1.start, end: $3.end }; }
     ;
@@ -127,9 +134,11 @@ codeDef
 labelled_codes 
     :                                   { $$ = {}; }
     | non_empty_labelled_codes          { $$ = $1.reduce((r, lc) => { 
-                                                  r[lc.label] = s.as_ref(lc.code);
-                                                  return r }
-                                                , {}); }
+                                            if (r[lc.label])
+                                                anError(@0,`Duplicate label '${lc.label}'.`);
+                                            r[lc.label] = s.as_ref(lc.code);
+                                            return r }
+                                        , {}); }
     ;
 
 non_empty_labelled_codes
@@ -149,9 +158,15 @@ code_label
 
 filter_
     : dollar code                 { $$ = { type: "code", code: s.as_ref($2), start: $1.start, end: $2.end}; }
-    | lp labelled_filters      rp { $$ = { type: null, open: $2.open, fields: $2.fields, start: $1.start, end: $3.end}; }
+    | lp labelled_filters      rp { if ( !$2.open && (Object.keys($2.fields).length == 1))
+                                      $$ = { type: "union", open: $2.open, fields: $2.fields, start: $1.start, end: $3.end};
+                                    else 
+                                      $$ = { type: null, open: $2.open, fields: $2.fields, start: $1.start, end: $3.end}; }
     | la labelled_filters      ra { $$ = { type: "union", open: $2.open, fields: $2.fields, start: $1.start, end: $3.end}; }
-    | lc labelled_filters      rc { $$ = { type: "product", open: $2.open, fields: $2.fields, start: $1.start, end: $3.end}; }
+    | lc labelled_filters      rc { if ( !$2.open && (Object.keys($2.fields).length == 1))
+                                      $$ = { type: "union", open: $2.open, fields: $2.fields, start: $1.start, end: $3.end};
+                                    else 
+                                      $$ = { type: "product", open: $2.open, fields: $2.fields, start: $1.start, end: $3.end}; }
     | lb filter rb                { $$ = { type: "vector", vector: $2, start: $1.start, end: $3.end }; }
     ;
 
@@ -166,6 +181,8 @@ labelled_filters
                                                   if (lc.dots) {
                                                     r.open = true;
                                                   } else {
+                                                    if (r.fields[lc.label])
+                                                      anError(@0,`Duplicate label '${lc.label}'.`);
                                                     r.fields[lc.label] = lc.filter;
                                                   }
                                                   return r }
@@ -213,7 +230,12 @@ exp
 
 labelled
     :                                   { $$ = {op: "product", product: []}; }
-    | non_empty_labelled                { $$ = $1; }
+    | non_empty_labelled                { $1.product.reduce( (labels, {label}) =>
+                                            { if (labels[label]) 
+                                                anError(@0,`Duplicate label '${label}'.`)
+                                              labels[label] = true;
+                                              return labels; }, {});
+                                          $$ = $1; }
     ;
 
 non_empty_labelled

package/parser.mjs

@@ -78,6 +78,10 @@
 import { SymbolTable, comp, union, identity } from "./symbol-table.mjs";
 let s = new SymbolTable();
 
+function anError(pos,msg) {
+    throw new Error(`Parse Error (lines ${pos.first_line}:${pos.first_column}...${pos.last_line}:${pos.last_column}): ${msg}`);
+}
+
 function getToken(yytext,yy,lstack) {
     const yylloc = yy.lexer.yylloc;
     const loc = lstack[lstack.length - 1]; //  { first_line: 5, last_line: 5, first_column: 2, last_column: 3 };
@@ -154,11 +158,14 @@ break;
 case 27:
  this.$ = { code: "ref", ref: $$[$0].value, start: $$[$0].start, end: $$[$0].end}; 
 break;
-case 28: case 47: case 61: case 79: case 89:
+case 28: case 47: case 61: case 89:
  this.$ = $$[$0]; 
 break;
 case 29:
- this.$ = { code: "product", product: $$[$0-1], start: $$[$0-2].start, end: $$[$0].end }; 
+ if (Object.keys($$[$0-1]).length == 1)
+                                            this.$ = { code: "union", union: $$[$0-1], start: $$[$0-2].start, end: $$[$0].end };
+                                          else
+                                            this.$ = { code: "product", product: $$[$0-1], start: $$[$0-2].start, end: $$[$0].end }; 
 break;
 case 30:
  this.$ = { code: "vector", vector: s.as_ref($$[$0-1]), start: $$[$0-2].start, end: $$[$0].end }; 
@@ -171,9 +178,11 @@ case 32:
 break;
 case 33:
  this.$ = $$[$0].reduce((r, lc) => { 
-                                                  r[lc.label] = s.as_ref(lc.code);
-                                                  return r }
-                                                , {}); 
+                                            if (r[lc.label])
+                                                anError(this._$,`Duplicate label '${lc.label}'.`);
+                                            r[lc.label] = s.as_ref(lc.code);
+                                            return r }
+                                        , {}); 
 break;
 case 34: case 52: case 90:
  this.$ = [$$[$0]]; 
@@ -191,13 +200,19 @@ case 42:
  this.$ = { type: "code", code: s.as_ref($$[$0]), start: $$[$0-1].start, end: $$[$0].end}; 
 break;
 case 43:
- this.$ = { type: null, open: $$[$0-1].open, fields: $$[$0-1].fields, start: $$[$0-2].start, end: $$[$0].end}; 
+ if ( !$$[$0-1].open && (Object.keys($$[$0-1].fields).length == 1))
+                                      this.$ = { type: "union", open: $$[$0-1].open, fields: $$[$0-1].fields, start: $$[$0-2].start, end: $$[$0].end};
+                                    else 
+                                      this.$ = { type: null, open: $$[$0-1].open, fields: $$[$0-1].fields, start: $$[$0-2].start, end: $$[$0].end}; 
 break;
 case 44:
  this.$ = { type: "union", open: $$[$0-1].open, fields: $$[$0-1].fields, start: $$[$0-2].start, end: $$[$0].end}; 
 break;
 case 45:
- this.$ = { type: "product", open: $$[$0-1].open, fields: $$[$0-1].fields, start: $$[$0-2].start, end: $$[$0].end}; 
+ if ( !$$[$0-1].open && (Object.keys($$[$0-1].fields).length == 1))
+                                      this.$ = { type: "union", open: $$[$0-1].open, fields: $$[$0-1].fields, start: $$[$0-2].start, end: $$[$0].end};
+                                    else 
+                                      this.$ = { type: "product", open: $$[$0-1].open, fields: $$[$0-1].fields, start: $$[$0-2].start, end: $$[$0].end}; 
 break;
 case 46:
  this.$ = { type: "vector", vector: $$[$0-1], start: $$[$0-2].start, end: $$[$0].end }; 
@@ -216,6 +231,8 @@ case 51:
                                                   if (lc.dots) {
                                                     r.open = true;
                                                   } else {
+                                                    if (r.fields[lc.label])
+                                                      anError(this._$,`Duplicate label '${lc.label}'.`);
                                                     r.fields[lc.label] = lc.filter;
                                                   }
                                                   return r }
@@ -275,6 +292,14 @@ break;
 case 78:
  this.$ = {op: "product", product: []}; 
 break;
+case 79:
+ $$[$0].product.reduce( (labels, {label}) =>
+                                            { if (labels[label]) 
+                                                anError(this._$,`Duplicate label '${label}'.`)
+                                              labels[label] = true;
+                                              return labels; }, {});
+                                          this.$ = $$[$0]; 
+break;
 case 80:
  this.$ = {op: "product", product: [$$[$0]]}; 
 break;
@@ -821,7 +846,7 @@ case 25:return 47;
 break;
 }
 },
-rules: [/^(?:[/][*]([*][^/]|[^*])*[*][/])/,/^(?:(\/\/|#|%|--)[^\n]*)/,/^(?:\s+)/,/^(?:<)/,/^(?:\{)/,/^(?:\[)/,/^(?:\()/,/^(?:>)/,/^(?:\})/,/^(?:\])/,/^(?:\))/,/^(?:=)/,/^(?:\.\.\.)/,/^(?:\.)/,/^(?:,)/,/^(?:;)/,/^(?::)/,/^(?:\$)/,/^(?:\?)/,/^(?:\|)/,/^(?:\^)/,/^(?:"([^"\\]|\\(.|\n))*"|'([^'\\]|\\(.|\n))*')/,/^(?:[a-zA-Z_][a-zA-Z0-9_?!]*)/,/^(?:0|[-]?[1-9][0-9]*)/,/^(?:\+\+\+)/,/^(?:$)/],
+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,21,22,23,24,25],"inclusive":true}}
 });
 return lexer;

package/patterns.mjs

@@ -210,7 +210,7 @@ function patterns(representatives, rels) {
         newPatternId = context[filter.name];
         break;
       case "code":
-        newPatternId = rootDef.typePatternGraph.getTypeId(filter.code);
+        newPatternId = rootDef.typePatternGraph.getTypeId(representatives[filter.code] || filter.code);
         break;
       case "union":
         newPatternId = rootDef.typePatternGraph.addNewNode(
@@ -384,19 +384,24 @@ function patterns(representatives, rels) {
         rel.patterns[1] = rootDef.typePatternGraph.addNewNode();
         break;
       case "CONS": {
-          let member = rootDef.typePatternGraph.addNewNode();
+          const member = rootDef.typePatternGraph.addNewNode();
           rel.patterns[1] = rootDef.typePatternGraph.addNewNode({pattern: '[]'}, {"vector-member": [member]});
           rel.patterns[0] = rootDef.typePatternGraph.addNewNode({pattern: '{}'}, {"car": [member], "cdr": [rel.patterns[1]]});
         }; break;
       case "SNOC": {
-          let member = rootDef.typePatternGraph.addNewNode();
+          const member = rootDef.typePatternGraph.addNewNode();
           rel.patterns[0] = rootDef.typePatternGraph.addNewNode({pattern: '[]'}, {"vector-member": [member]});
           rel.patterns[1] = rootDef.typePatternGraph.addNewNode({pattern: '{}'}, {"car": [member], "cdr": [rel.patterns[0]]});
         }; break;
+      case "DIV": {
+          const intId = rootDef.typePatternGraph.getTypeId('int');
+          rel.patterns[0] = rootDef.typePatternGraph.addNewNode({pattern: '[]'}, {"vector-member": [intId]});
+          rel.patterns[1] = rootDef.typePatternGraph.addNewNode({pattern: '{}'}, {"div": [intId], "rem": [intId]});
+        }; break;
+      break;
       // TO DO
-      case "null":
-      case "DIV":
       case "FDIV":
+      case "null":
         rel.patterns = [rootDef.typePatternGraph.addNewNode(), rootDef.typePatternGraph.addNewNode()];
         break;
       default:

package/repl.mjs

@@ -13,18 +13,15 @@ const splice = [].splice;
 console.log("Very! experimental repl shell for 'k-language'...");
 
 const help = function () {
-  console.log(" --h          print help");
-  console.log(" --a          print codes and relations");
-  console.log(" --c          print aliased codes");
-  console.log(" --C code     print code definition");
-  console.log(" --r          print rels");
-  console.log(" --p          pretty-print last value");
-  console.log(" --pp         print last value via node.js 'console.log'");
-  console.log(" --s reg      store the last value in register 'reg'");
-  console.log(" --g reg      get the value from register 'reg'");
-  console.log(" --regs       print registers names");
-  console.log(" --l file.k   load 'file.k'");
-  console.log(" --x rel      print out the type pattern of 'rel'");
+  // console.log("  --debug      loads codes and relations as value");
+  console.log("  --c            print aliased codes");
+  console.log("  --C code       print code definition");
+  console.log("  --r            print rels");
+  console.log("  --R rel        print out the type pattern of 'rel'");
+  console.log("  --p (--pp)     pretty-print last value");
+  console.log("  --s (--g) reg  store (get) the last value in register 'reg'");
+  console.log("  --regs         print register names");
+  console.log("  --l file.k     load 'file.k'");
 };
 
 help();
@@ -32,19 +29,18 @@ help();
 const re__l = /^[ \n\t]*(?:--l[ ]+)(.+)[ ]*?$/;
 const re__s = /^[ \n\t]*(?:--s[ ]+)(.+)[ ]*?$/;
 const re__g = /^[ \n\t]*(?:--g[ ]+)(.+)[ ]*?$/;
-const re__x = /^[ \n\t]*(?:--x[ ]+)(.+)[ ]*?$/;
+const re__R = /^[ \n\t]*(?:--R[ ]+)(.+)[ ]*?$/;
 const re__C = /^[ \n\t]*(?:--C[ ]+)(.+)[ ]*?$/;
 
 const rl = readline.createInterface({
   input: process.stdin,
   output: process.stdout,
-  prompt: ''
+  prompt: '> '
 });
 
 rl.prompt();
 
 rl.on('line', (line) => {
-  // console.log(`Received: ${line}`);
   evaluate(line);
   rl.prompt();
 }).on('close', () => {
@@ -52,37 +48,48 @@ rl.on('line', (line) => {
   process.exit(0);
 });
 
+let old_val = {};
 let val = {};
+const printVal = function (v = val) {
+  if (v === undefined)
+    console.log("...",v);
+  else
+    console.log(`=> ${JSON.stringify(v)}`);
+  rl.setPrompt('> ');
+}
 const registers = {};
 const buffer = [];
 function evaluate(line) {
   if (line.trim().endsWith('\\')) {
     buffer.push(line.slice(0, -1));
+    rl.setPrompt('  ');
     return;
   }
   line = [...buffer, line].join('\n');
   buffer.length = 0;
   try {
-    if (val === void 0) {
-      val = {};
-    }
+    if (val === undefined) 
+      val = old_val;
+    else
+      old_val = val;
     if (line.match(/^[ \n\t]*(?:--h)?$/)) {
       // --h
       help();
     } else if (line.match(/^[ \n\t]*\^$/)) {
       val = closeVector(val); 
-      console.log(`=> ${JSON.stringify(val)}`);
+      printVal();
+      
     } else if (line.match(re__l)) {
       // --l 
       const file = line.match(re__l)[1];
-      console.log(` -- loading file: ${file} ...`);
+      console.log(`  ... loading file: ${file} ...`);
       const kScript = fs.readFileSync(file).toString();
-      console.log(` ----------------------------- compiling file: ${file} ...`);
+      console.log(`  Done!`);
       // console.log(kScript);
       val = k.compile("+++\n" + kScript + "\n()")(val);
-      console.log(`=> ${JSON.stringify(val)}`);
-    } else if (line.match(/^[ \n\t]*(?:--a)?$/)) {
-      // --a
+      printVal();
+    } else if (line.match(/^[ \n\t]*--debug$/)) {
+      // --debug
       val = run.defs;
       console.log(val);
       // --r
@@ -150,9 +157,9 @@ function evaluate(line) {
       let reg = line.match(re__g)[1];
       val = registers[reg];
       console.log(val);
-        // --x
-    } else if (line.match(re__x)) {
-      const relName = line.match(re__x)[1];
+        // --R rel
+    } else if (line.match(re__R)) {
+      const relName = line.match(re__R)[1];
       const rel = run.defs?.rels[relName];
       if (!rel) {
         console.log(` -- relation '${relName}' not found`);
@@ -171,7 +178,7 @@ function evaluate(line) {
     } else if (!line.match(/^[ \n\t]*(?:#.*)?$/)) {
       try {
         val = k.run(`+++\n${line}\n()`, val);
-        console.log(`=> ${JSON.stringify(val)}`);
+        printVal();
       } catch (error) {
         e = error;
         console.error("ERROR:");

package/run.mjs

@@ -62,7 +62,7 @@ const builtin = {
   toJSON: (x) => JSON.stringify(x),
   fromJSON: (x) => JSON.parse(x),
   CONS: ({car, cdr}) => { try { return [car, ...cdr]; } catch (e) { return undefined; } },
-  SNOC: (x) => (x.length > 1 ? {car: x[0], cdr: x.slice(1)} : undefined),
+  SNOC: (x) => (x.length > 0 ? {car: x[0], cdr: x.slice(1)} : undefined),
   toDateMsec: (x) => new Date(x).getTime(),
   toDateStr: (x) => new Date(x).toISOString(),
 };

package/test-fingerprint.mjs

@@ -1,5 +1,5 @@
 import k from './index.mjs';
-import { encodeCodeToString } from './codes.mjs';
+import { encodeCodeToString, find } from './codes.mjs';
 import hash from './hash.mjs';
 [
     `
@@ -7,7 +7,7 @@ import hash from './hash.mjs';
     $pair = {nat x, nat y};
     $b = {int"x", bool y};
     $vector = [int];
-    $tree = <{nat value, tree left, tree right} binary, {nat value} leaf, {nat value, tree tree} unary, [tree] list_of_trees>;
+    $tree = <{nat value, tree left, tree right} binary, nat leaf, {nat value, tree tree} unary, [tree] list_of_trees>;
   
     succ = { $nat succ} $nat;
     plus = $pair <
@@ -17,22 +17,27 @@ import hash from './hash.mjs';
   {{} zero} succ succ {() x, () y} plus
     `     
   ].map(function (script) {
-    console.log(`k_expression = '${script}';`);
+    console.log("test-fingerprint:");
+    // console.log(`k_expression = '${script}';`);
     const annotated = k.annotate(script);
-    for (const code in annotated.codes) {
-      console.log(`CODE: ${code}`);
-      const s = encodeCodeToString(code,annotated.codes);
-      console.log(` - DEFS: ${s}`);;
+    // console.log(annotated);
+    let ERRORS = 0;
+    for (const code in annotated.representatives) {
+      // console.log(`CODE: ${code}`);
+      const s = encodeCodeToString(annotated.representatives[code]);
+      // console.log(` - DEFS: ${s}`);;
       const annotated2 = k.annotate(s+" {}");;
-      const s2 = encodeCodeToString(annotated2.representatives["C0"],annotated2.codes);
-      console.log(` - reparsed FINGERPRINT: ${hash(s2)}`);
-      if ((s === s2) && (hash(s) === hash(s2))) {
-        console.log('--- OK');
-      } else {
-        console.log('--- ERROR');
-      }
-
-      console.log('-------------------');
+      const s2 = encodeCodeToString(annotated2.representatives["C0"]);
+      // console.log(` - reparsed FINGERPRINT: ${hash(s2)}`);
+      if (!((s === s2) && (hash(s) === hash(s2)))) {
+        ERRORS++;
+        console.log(` ERROR - reparsed FINGERPRINT for ${code} is different`);
+      } 
+    }
+    if (ERRORS === 0) {
+      console.log("OK");
+    } else {
+      console.log(" ----- ERRORS");
     }
   });