rewrite parser

[clo] / src / index.js

diff --git a/src/index.js b/src/index.js
index fb887701725ab7261a7bda6b47b78fa15babc3a5..8fc8c3947bf805c304da93614435c5f90fd57147 100644 (file)
--- a/src/index.js
+++ b/src/index.js
@@ -23,39 +23,97 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.match1token = void 0;
+exports.tkTreeToSExp = void 0;
 var fs = require('fs');
-const tk = __importStar(require("./tokenize.js"));
-let b = tk.tokenize("2+2");
+const util = __importStar(require("util"));
+const p = __importStar(require("typescript-parsec"));
 /**
- * @description
- * it returns a function which test if the first char of the `remained` part of
- *  the argument of the function is `c`, if it's true, update the `MatchedPair` wrapped
- * in `Some`. Otherwise, it returns `None`.
- *  * @param t : the char to be test.
- * @returns the updated `MatchedPair` wrapped in `Some(x)` or `None`.
+ *
+ * # REPRESENTATION
  */
-function match1token(t) {
-    return (m) => {
-        if (m.remained.length == 0) {
-            return { _tag: "None" };
-        }
-        const tokenToBeMatched = m.remained[0];
-        if (tokenToBeMatched === t) {
-            m.matched.push(tokenToBeMatched);
-            return {
-                _tag: "Some", value: {
-                    matched: m.matched,
-                    remained: m.remained.slice(1)
-                }
-            };
+/**
+ * convert a `tkTree` AST to S-expr string
+ * @param t the `tkTree`
+ * @returns S-expr String
+ */
+function tkTreeToSExp(t) {
+    var str = "";
+    if (Array.isArray(t)) {
+        let strArray = t.map((x) => tkTreeToSExp(x));
+        str = "(" + strArray.join(" ") + ")";
+    }
+    else {
+        if (t === undefined) {
+            str = "%undefined";
         }
         else {
-            return { _tag: "None" };
+            str = t;
         }
-    };
+    }
+    return str;
+}
+exports.tkTreeToSExp = tkTreeToSExp;
+/**inspect the inner of the representation. */
+let repr = (x) => { return util.inspect(x, { depth: null }); };
+var TokenKind;
+(function (TokenKind) {
+    TokenKind[TokenKind["Seperator"] = 0] = "Seperator";
+    TokenKind[TokenKind["Semicolon"] = 1] = "Semicolon";
+    TokenKind[TokenKind["Number"] = 2] = "Number";
+    TokenKind[TokenKind["Op"] = 3] = "Op";
+    TokenKind[TokenKind["ExprMark"] = 4] = "ExprMark";
+    TokenKind[TokenKind["Paren"] = 5] = "Paren";
+    TokenKind[TokenKind["SpaceNL"] = 6] = "SpaceNL";
+    TokenKind[TokenKind["Id"] = 7] = "Id";
+    TokenKind[TokenKind["Str"] = 8] = "Str";
+})(TokenKind || (TokenKind = {}));
+/**
+ * Parsing
+ */
+const lexer = p.buildLexer([
+    [true, /^\d+(\.\d+)?/g, TokenKind.Number],
+    [true, /^\;/g, TokenKind.Semicolon],
+    [true, /^[-][-][-]/g, TokenKind.Seperator],
+    [true, /^[\+\-\*\/\&\|\!\^\<\>\~\=\?]+/g, TokenKind.Op],
+    [true, /^\@+/g, TokenKind.ExprMark],
+    [true, /^[()\[\]{}]/g, TokenKind.Paren],
+    [true, /^["]([\"]|[\\].)*["]/g, TokenKind.Str],
+    [true, /^[']([\']|[\\].)*[']/g, TokenKind.Str],
+    [true, /^[()\[\]{}]/g, TokenKind.Paren],
+    [true, /^[^\s\n\t\r;]+/g, TokenKind.Id],
+    [false, /^(\s|\n|\r|\t)+/g, TokenKind.SpaceNL]
+]);
+/**
+ *
+ * # TEST
+ */
+const inputTxt = `import ast;
+---
+122`;
+const PROG = p.rule();
+const UNIT = p.rule();
+const IMPORTS = p.rule();
+const SEMICOLON = p.rule();
+let doubleMinus = { type: 'Punctuator', value: '--' };
+let doubleMinus2 = p.str('--');
+const TERM = p.rule();
+function applyUnit(value) {
+    return value.text;
+}
+function applySemiColon(value) {
+    return value.text;
+}
+function applyParts(first, second) {
+    return ["%clo", first, second[1]];
+}
+PROG.setPattern(p.lrec_sc(IMPORTS, p.seq(p.str('---'), UNIT), applyParts));
+function applyImports(input) {
+    let importTail = input[1].map(x => x.text);
+    return ["import"].concat(importTail);
 }
-exports.match1token = match1token;
 ;
-let c = tk.toSome(b);
-console.log(thenDo(c, match1token(tk.tokenize("+")[0])));
+IMPORTS.setPattern(p.apply(p.seq(p.str('import'), p.rep_sc(p.tok(TokenKind.Id)), SEMICOLON), applyImports));
+SEMICOLON.setPattern(p.apply(p.tok(TokenKind.Semicolon), applySemiColon));
+UNIT.setPattern(p.apply(p.tok(TokenKind.Number), applyUnit));
+let tree = p.expectSingleResult(p.expectEOF(PROG.parse(lexer.parse(inputTxt))));
+console.log("RESULT=" + tkTreeToSExp(tree));