X-Git-Url: https://git.kianting.info/?a=blobdiff_plain;f=src%2Findex.ts;h=60e74871dc96261bf3ddcb2eb4d3b332952f8f57;hb=fed01e9044149985b3df74a9225ce68805b8f478;hp=90cdad4698b3734aeda9cb9582e57e42daade80a;hpb=3441b825eb0f2be5ea74227fb1eaa90df236e563;p=clo

diff --git a/src/index.ts b/src/index.ts
index 90cdad4..60e7487 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,61 +1,11 @@
 var fs = require('fs');
-import { argv, resourceUsage } from 'node:process';
-import * as tk from './tokenize.js';
+import jsTokens from "js-tokens";
 import * as util from 'util';
-import { drawEllipsePath, reduceRotation } from 'pdf-lib';
-import { isAnyArrayBuffer, isTypedArray } from 'node:util/types';
-import { error } from 'node:console';
-import { isUndefined } from 'node:util';
 
 /**
- * debug reprensenting
- */
-let repr = (x : any)=>{return util.inspect(x, {depth: null})};
-
-/**
- * token tree type.
- */
-type tkTree = tkTree[] | tk.Token
-
-/**
- * concated 2 `tkTree`s
- * @param x the array to be concated
- * @param y the item or array to ve concated
- * @returns concated tkTree array, or thrown error if can't be concated.
- */
-function concat(x: tkTree, y:tkTree): tkTree[] {
-    if (Array.isArray(x)){
-            return x.concat(y);
-    }else{
-        throw new Error("the tkTree can't be concated, because it's not an array.");
-        
-    }
-}
-
-function slice(x: tkTree, index?:number, end?:number): tkTree[] {
-    if (Array.isArray(x)){
-            return x.slice(index,end);
-    }else{
-        throw new Error("the tkTree can't be concated, because it's not an array.");
-        
-    }
-}
-
-/**
- * TokenMatcheePair for tokens' parser combinator
- *  
- * matched: the matched (now and before) tokens
- * 
- * remained: tokens to be matched
  * 
- * ast: abstract syntax tree
+ * # REPRESENTATION
  */
-export interface TokenMatcheePair {
-    matched: tk.Token[]
-    remained: tk.Token[]
-    ast : tkTree[]
-}
-
 /**
  * convert a `tkTree` AST to S-expr string
  * @param t the `tkTree`
@@ -71,72 +21,48 @@ export function tkTreeToSExp(t: tkTree): string{
         if (t=== undefined){
             str = "%undefined"
         }else{
-            str = t.text;
+            str = t.value;
         }
     }
 
     return str;
 }
 
+/**inspect the inner of the representation. */
+let repr = (x : any)=>{return util.inspect(x, {depth: null})};
 /**
- * @description
- * match one token type.
  * 
- * it returns a function which test if the type of first token of the `remained` part of
- *  the argument of the function is `typ` , if it's true, update the `TokenMatcheePair` wrapped
- * in `Some`. Otherwise, it returns `None`.
- *  * @param typ : the type to be test.
- * @returns the updated `TokenMatcheePair` wrapped in `Some(x)` or `None`.
+ * # TYPES
  */
-export function m1TType(typ: tk.TokenType):
-    (m: TokenMatcheePair) => tk.Maybe<TokenMatcheePair> {
-    return (m: TokenMatcheePair) => {
-        if (m.remained.length == 0) {
-            return { _tag: "None" };
-        }
-        /**
-         * token to be matched
-         * */
-        const ttbm = m.remained[0];
-        
-        if (ttbm.type == typ) {
-            let new_matched = m.matched.concat(ttbm);
-            let result : tk.Some<TokenMatcheePair> = {
-                _tag: "Some", value: {
-                    matched: new_matched,
-                    remained: m.remained.slice(1),
-                    ast:  ([ttbm]),
-                }
-            };
-            return result;
-        }
-        else {
-            return { _tag: "None" };
-        }
-    }
-};
 
 /**
- * type int
+ * TokenPair for tokens' parser combinator
+ *
+ * matched: the matched (now and before) tokens
+ * 
+ * remained: tokens to be matched
+ * 
+ * ast: abstract syntax tree
  */
-let tInt  = m1TType(tk.TokenType.INT);
-let tId  = m1TType(tk.TokenType.ID);
-
-
-let tAdd  = m1TType(tk.TokenType.I_ADD);
-let tSub = m1TType(tk.TokenType.I_SUB);
-let tMul  = m1TType(tk.TokenType.I_MUL);
-let tDiv = m1TType(tk.TokenType.I_DIV);
-let tLParen = m1TType(tk.TokenType.L_PAREN);
-let tRParen = m1TType(tk.TokenType.R_PAREN);
-
-let toSome = tk.toSome;
-
+export interface TokenPair {
+    matched: jsTokens.Token[]
+    remained: jsTokens.Token[]
+    ast : tkTree[]
+}
+export type Some<T> = { _tag: "Some"; value: T };
+export type None = { _tag: "None" };
+export type Maybe<T> = Some<T> | None;
 
-argv.forEach((val, index) => {
-    console.log(`${index}=${val}`);
-});
+type Token = jsTokens.Token;
+type tkTree = Token | tkTree[];
 
+/**
+ * 
+ * # PARSER UNITS
+ */
+function toSome<T>(x:T): Maybe<T>{
+    return {_tag: "Some", value: x};
+}
 
 /**
  * like `m ==> f` in ocaml
@@ -144,46 +70,26 @@ argv.forEach((val, index) => {
  * @param f matching function
  * @returns wrapped result
  */
-function thenDo(m : tk.Maybe<TokenMatcheePair>, f : Function){
+function thenDo(m : Maybe<TokenPair>, f : Function){
     if (m._tag == "None"){
         return m;
     }else{
-        var a : tk.Maybe<TokenMatcheePair> = f(m.value);
+        var a : Maybe<TokenPair> = f(m.value);
         if (a._tag == "Some"){
-            a.value.ast = concat(m.value.ast, a.value.ast);
+            a.value.ast = m.value.ast.concat(a.value.ast);
         }
 
         return a;
     }
 }
-
-/**
- * like `f1 | f2` in regex
- * @param f1 the first tried function
- * @param f2 the second tried function
- * @returns wrapped result
- */
-function orDo(f1 : Function, f2 : Function){
-    return (x : TokenMatcheePair) =>{
-        let res1 : tk.Maybe<TokenMatcheePair> = f1(x);
-        if (res1._tag == "Some"){
-            return res1;
-        }else{
-            let res2 : tk.Maybe<TokenMatcheePair> = f2(x);
-            return res2;
-        }
-    } 
-}
-
-
 /**
  * 
- * @param m : the `MatcheePair` to be consumed.
+ * @param m : the `TokenPair` to be consumed.
  * @returns if the length of `m.remained` >= 1; consumes the matchee by 1 token
  *  and wraps it in `Some`,
  * otherwise, returns `None`.
  */
-export function matchAny(m: TokenMatcheePair): tk.Maybe<TokenMatcheePair> {
+export function matchAny(m: TokenPair): Maybe<TokenPair> {
     if (m.remained.length >= 1) {
         return {
             _tag: "Some", value: {
@@ -198,258 +104,87 @@ export function matchAny(m: TokenMatcheePair): tk.Maybe<TokenMatcheePair> {
 }
 
 /**
- * Danger : Maybe it's not enough to work.
-* @description repeating matching function `f` 
-* zero or more times, like the asterisk `*` in regex `f*` . 
-* @param f : the function to be repeated 0+ times.
-* @returns:the combined function
-*/
-export function OnceOrMoreDo(f: Function): (x: TokenMatcheePair) =>
-    tk.Maybe<TokenMatcheePair> {
-    return (x) => {
-        var wrappedOldX: tk.Maybe<TokenMatcheePair> = { _tag: "Some", value: x };
-        var wrappedNewX: tk.Maybe<TokenMatcheePair> = wrappedOldX;
-
-        var counter = -1;
-
-        while (wrappedNewX._tag != "None") {
-            wrappedOldX = wrappedNewX;
-            wrappedNewX = thenDo(wrappedOldX, f);
-            counter += 1;
-
-        };
-
-
-        if (counter <= 0){
-            return { _tag: "None"};
+ * like `f1 | f2` in regex
+ * @param f1 the first tried function
+ * @param f2 the second tried function
+ * @returns wrapped result
+ */
+function orDo(f1 : Function, f2 : Function){
+    return (x : TokenPair) =>{
+        let res1 : Maybe<TokenPair> = f1(x);
+        if (res1._tag == "Some"){
+            return res1;
+        }else{
+            let res2 : Maybe<TokenPair> = f2(x);
+            return res2;
         }
-        let ast = wrappedOldX.value.ast ;
-        wrappedOldX.value.ast =ast.slice(ast.length-counter);
-        console.log(repr(wrappedOldX.value.ast));
-
-        return wrappedOldX; };
+    } 
 }
 
 /**
- * aux function for midfix operator
- * @param f function
- * @param signal the rule name
- * @returns 
+ * like regex [^c]
+ * @param f input token function. one token only.
+ * @returns combined finction
  */
-let midfix = (f : Function, signal? : string) => (x : TokenMatcheePair)=>{
-    var a = f(x);
-    if (a._tag == "Some"){
-        let ast_tail : tkTree[] = slice(a.value.ast,a.value.ast.length-3);
-        let new_ast = [ast_tail];
-        a.value.ast = new_ast;
-
-        // console.log("+"+signal+"+"+repr(a));
-
-        
-    }
-    return a;
-}
-
-let circumfix = (f : Function, signal? : string) => (x : TokenMatcheePair)=>{
-    var a = f(x);
-    if (a._tag == "Some"){
-        let inner = a.value.ast[a.value.ast.length-2];
-        let ast_middle : tkTree[] = [inner];
-        let new_ast = [ast_middle];
-        a.value.ast = new_ast;
-    }
-    return a;
-}
-
-/** single1 = tInt | "(" expr ")"*/
-let single1 = circumfix((x : TokenMatcheePair) =>
-    thenDo(thenDo(thenDo(tk.toSome(x), tLParen), expr), tRParen), "fac1");
-let single2= tInt;
-let single = orDo(single1, single2);
-
-/** func = single | single "(" single ")" 
- * i.e.
- * 
- * func = single |  func_aux ( int )
- * 
-*/
-
-/** callees = "(" args ")" | "(" ")" */
-
-
-let callees1 = circumfix((x : TokenMatcheePair) =>
-    thenDo(thenDo(thenDo(tk.toSome(x), tLParen), tInt), tRParen), "callees1");
-let callees2 = (x: TokenMatcheePair)=>{
-    let ret = thenDo(thenDo(tk.toSome(x), tLParen), tRParen);
-    if (ret._tag == "Some"){
-        let new_ast : tkTree[] = [[]];
-        ret.value.ast = new_ast;
-    }
-    
-    return ret};
-
-let callees = orDo(callees1, callees2);
-
-
-
-/** %apply R combinating token */
-let applyToken = {
-    text: "%apply",
-    type: tk.TokenType.ID,
-    col: 0,
-    ln: 0,
+function notDo(f : Function){
+    return (x : TokenPair) =>{
+        let res1 : Maybe<TokenPair> = f(x);
+        if (res1._tag == "Some"){
+            return {_tag:"None"};
+        }else{
+            let res2 = matchAny(x);
+            return res2;
+        }
+    } 
 }
 
-/** facAux = callees facAux |  callees */
-let facAux1 = (x: TokenMatcheePair)=>{
-    var ret = thenDo(thenDo(tk.toSome(x), callees), facAux);
-    if (ret._tag == "Some"){
-        console.log("1232345"+repr(tkTreeToSExp(ret.value.ast[ret.value.ast.length-1])));
-    let last1  = ret.value.ast[ret.value.ast.length-1];
-    let last2  = ret.value.ast[ret.value.ast.length-2];
-
-    
-    let b : tkTree[] = [applyToken];
-    ret.value.ast = [b.concat([last2, last1])];
-    console.log("11111"+repr(tkTreeToSExp(ret.value.ast)));
-
-    };
-
-return ret;}
-let facAux2 = callees;
-let facAux =  orDo(facAux1, facAux2);
-
-
-
-/** fac = single facAux | single
- * Issue1 to be fixed.
- */
-let fac1 = (x: TokenMatcheePair)=>{
-    var ret = thenDo(thenDo(tk.toSome(x), single),facAux);
-    if(ret._tag == "Some"){
-        console.log("777"+repr(tkTreeToSExp(ret.value.ast)));
-        ret.value.ast = [applyToken, ret.value.ast[ret.value.ast.length-2],
-                        ret.value.ast[ret.value.ast.length-1]];
-        ret.value.ast;
-        rearrangeTree(ret.value.ast);
-        console.log("888"+repr(tkTreeToSExp(ret.value.ast)));
-
-    }
-
-    return ret;};
-let fac2 = single;
-let fac = orDo(fac1, fac2);
-
-
-/**
- * rearrangeTree : for applyToken subtree from right-combination to 
- * left-combination
- * @input x a ast
- * @return another ast
- */
-function rearrangeTree(x: any) : any {
-    
-        if (x !== undefined){
-            for (var i=1;i<x.length;i++){
-                rearrangeTree(x[i]);
-            }
-            console.log("@@"+repr(x[0]));
-
-            if (x[0] == applyToken){
-                if (Array.isArray(x[2]) && x[2][0] == applyToken){
-                    let rl = rearrangeTree(x[2][1]);
-                    let rr = rearrangeTree(x[2][2]);
-                    let l = rearrangeTree(x[1]);
-                    x[0] = applyToken;
-                    x[1] = [applyToken, l, rl];
-                    x[2] = rr;
-                    console.log("@@=="+repr(x));
-
-                    return x;
-                }
-                else{
-                    x[0] = applyToken;
-                    x[1] = rearrangeTree(x[1]);
-                    x[2] = rearrangeTree(x[2]);
-                    console.log("@@=="+repr(x));
-
-
-                    return x;
-                }
+function matchToken(typeName : string, value? : string):
+ (t : TokenPair) => Maybe<TokenPair>{
+    return (t)=>{
+        let headToken = t.remained[0];
+        if (headToken.type != typeName){
+            return {_tag:"None"};
+        }else{
+            if (value === undefined || value == headToken.value){
+                let newTokenPair = {
+                    matched: t.matched.concat(headToken),
+                    remained: t.remained.slice(1),
+                    ast : [headToken]
+                };
+                return {_tag : "Some", value : newTokenPair};
+            }else{
+                return {_tag:"None"};
             }
-
-            return x;
-        }
+        };
     }
-        
-
-
-
-/**
- * 
- * term1 = fac (MUL | DIV) fac
- */
+};
 
-let term1 = midfix((x : TokenMatcheePair)=>
-            thenDo(thenDo(thenDo(tk.toSome(x), fac), orDo(tMul,tDiv)), fac), "term1");
 
-            
 /**
  * 
- * term2 = int MUL int
+ * # TEST
  */
-let term2 = fac;
+const tokens = Array.from(jsTokens(
+`import foo from\t 'bar';
+import * as util  from 'util';
 
-/**
- * term = term1 | term2
- */
-let term = orDo(term1, term2);
- 
 
-/**
- * 
- * expr1 = term ADD term
- */
-let expr1 = midfix((x : TokenMatcheePair)=>
-                thenDo(thenDo(thenDo(tk.toSome(x), term), orDo(tAdd,tSub)), term), "expr1");
-/**
- * expr2 = term
- */
-let expr2 = term;
+花非花，霧\\{非霧 。{{foo();}}下
+一句`));
 
-/**
- * expr = expr1 | expr2
- */
-let expr = orDo(expr1, expr2);
+console.log("RESULT="+repr(tokens));
 
 
+var mainTokenPair : TokenPair = {
+    matched : [] ,
+    remained : tokens,
+    ast : []};
 
-let tokens = tk.tokenize("1");
-let tokens2 = tk.tokenize("1(2)");
-let tokens3 = tk.tokenize("1(2)(3)");
-let tokens4 = tk.tokenize("2()");
+let a = thenDo(thenDo(toSome(mainTokenPair), matchToken('IdentifierName')),
+        notDo(matchToken('Punctuator', ';')));
 
-//let tokens = tk.tokenize("(4-(3/4))");
-//tk.tokenize(argv[2]);
-
-let tokensFiltered = tokens4.filter(
-    (x)=>{return (x.type != tk.TokenType.NL
-            && x.type != tk.TokenType.SP)});
-
-
-
-let beta = expr({
-        matched : [] ,
-        remained : tokensFiltered,
-        ast : []});
-
-
-
-if (beta._tag == "Some"){
-    beta.value.ast = rearrangeTree(beta.value.ast);
-    console.log(tkTreeToSExp(beta.value.ast));
 
+console.log("RESULT="+repr(a));
+if (a._tag == "Some"){
+    console.log("SEXP="+tkTreeToSExp(a.value.ast));
 }
-
-console.log("RESULT="+repr(beta));
-