@fraczak/k 1.3.3 → 1.3.4

package/INTRO.md

@@ -129,7 +129,7 @@ names are integers starting from zero. E.g., `{.toto "0", .titi "1",
       zero? = [(),0] EQ 0;
       factorial = <
         zero? 1, 
-        [(dec factorial), ()] TIMES
+        [dec factorial, ()] TIMES
       >;
       { () x, factorial "x!" }
 
@@ -137,10 +137,24 @@ 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 1, {} 0>;     -- e.g., {{{{} 0} 1} 1}
-      $pair = {nat x, nat y};   -- e.g., {{{} 0} x, {{{{} 0} 1} 1} y}
+      $nat = <nat 1, {} 0>;
+      $pair = {nat x, nat y};
       
-      suc = $nat {() 1} $nat;
-      add = $pair <{.x.1 x, .y suc y} add, .y> $nat;
+      suc = {$nat 1};
+      add = $pair <{.x.1 x, .y suc y} add, .y>;
+
+### Basic extension codes
+
+Since _basic extension_ introduces integers, booleans, and strings, there are three 
+predefined types: `int`, `bool`, and `string`. A vector product code can also be defined 
+by `[ codeExp ]`.  All members of the vector are the same code. E.g.,
+
+     $intVector = [ int ];
+     $boolVector = [ bool ];
+     $tree = [ tree ];
+
+     emptyList? = $intVector $[ string ]; -- as only an empty vector can be a vector 
+                                          -- of integers and a vector of strings
+
 
 

package/package.json

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

package/parser.jison

@@ -2,6 +2,26 @@
 
 var s = require("./symbol-table");
 
+function fromEscString(escString) {
+  const isSingleQuoted = escString.startsWith("'");
+  let str = escString.substring(1, escString.length - 1);
+  if (isSingleQuoted) {
+    str = str.replace(/\\'/g, "'");
+  } else {
+    str = str.replace(/\\"/g, '"');
+  }
+  str = str.replace(/\\\\/g, '\\');
+  str = str.replace(/\\\//g, '/');
+  str = str.replace(/\\b/g, '\b');
+  str = str.replace(/\\f/g, '\f');
+  str = str.replace(/\\n/g, '\n');
+  str = str.replace(/\\r/g, '\r');
+  str = str.replace(/\\t/g, '\t');
+  str = str.replace(/\\u([\dA-F]{4})/gi, (match, p1) => String.fromCharCode(parseInt(p1, 16)));
+
+  return str;
+}
+
 %}
 
 %lex
@@ -24,7 +44,7 @@ var s = require("./symbol-table");
 ";"                                            return 'SC';
 ":"                                            return 'COL';
 "$"                                            return 'DOLLAR'; 
-\"[^\"\n]*\"|\'[^\'\n]*\'                      return 'STRING'
+\"([^"\\]|\\(.|\n))*\"|\'([^'\\]|\\(.|\n))*\'  return 'STRING';
 [a-zA-Z_][a-zA-Z0-9_?!]*                       return 'NAME';
 0|[-]?[1-9][0-9]*                              return 'INT';
 <<EOF>>                                        return 'EOF';
@@ -40,11 +60,11 @@ var s = require("./symbol-table");
 %%
 
 name: NAME                              { $$ = String(yytext); };
-str: STRING                             { $$ = String(yytext).slice(1,-1); };
+str: STRING                             { $$ = fromEscString(String(yytext)); };
 int: INT                                { $$ = parseInt(String(yytext)); };
 
 input_with_eof: defs comp EOF               {
-    result = {defs: {rels: s.rels, codes: s.codes}, exp: $2};
+    const result = {defs: {rels: s.rels, codes: s.codes}, exp: $2};
     // console.log(JSON.stringify(result, "", 2));
     return result;
 };

package/parser.js

@@ -76,6 +76,26 @@
 
 var s = require("./symbol-table");
 
+function fromEscString(escString) {
+  const isSingleQuoted = escString.startsWith("'");
+  let str = escString.substring(1, escString.length - 1);
+  if (isSingleQuoted) {
+    str = str.replace(/\\'/g, "'");
+  } else {
+    str = str.replace(/\\"/g, '"');
+  }
+  str = str.replace(/\\\\/g, '\\');
+  str = str.replace(/\\\//g, '/');
+  str = str.replace(/\\b/g, '\b');
+  str = str.replace(/\\f/g, '\f');
+  str = str.replace(/\\n/g, '\n');
+  str = str.replace(/\\r/g, '\r');
+  str = str.replace(/\\t/g, '\t');
+  str = str.replace(/\\u([\dA-F]{4})/gi, (match, p1) => String.fromCharCode(parseInt(p1, 16)));
+
+  return str;
+}
+
 
 
 var parser = (function(){
@@ -94,14 +114,14 @@ case 1:
  this.$ = String(yytext); 
 break;
 case 2:
- this.$ = String(yytext).slice(1,-1); 
+ this.$ = fromEscString(String(yytext)); 
 break;
 case 3:
  this.$ = parseInt(String(yytext)); 
 break;
 case 4:
 
-    result = {defs: {rels: s.rels, codes: s.codes}, exp: $$[$0-1]};
+    const result = {defs: {rels: s.rels, codes: s.codes}, exp: $$[$0-1]};
     // console.log(JSON.stringify(result, "", 2));
     return result;
 
@@ -713,7 +733,7 @@ case 15:return 28;
 break;
 case 16:return 15; 
 break;
-case 17:return 6
+case 17:return 6;
 break;
 case 18:return 4;
 break;
@@ -723,7 +743,7 @@ case 20:return 12;
 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],"inclusive":true}}
 });
 return lexer;