fix issue #1, see https://kianting.info/pipermail/clo_kianting.info/2023-September...

[clo] / src / index.ts

diff --git a/src/index.ts b/src/index.ts
index 0d94c74c6fb2434f783f1451c0b86f3824973a80..3b2b3d15af9be13f1d207bdf90198eddd973959b 100644 (file)
--- a/src/index.ts
+++ b/src/index.ts
@@ -3,8 +3,9 @@ import { argv, resourceUsage } from 'node:process';
 import * as tk from './tokenize.js';
 import * as util from 'util';
 import { drawEllipsePath, reduceRotation } from 'pdf-lib';
-import { isTypedArray } from 'node:util/types';
+import { isAnyArrayBuffer, isTypedArray } from 'node:util/types';
 import { error } from 'node:console';
+import { isUndefined } from 'node:util';
 
 /**
  * debug reprensenting
@@ -42,8 +43,11 @@ function slice(x: tkTree, index?:number, end?:number): tkTree[] {
 
 /**
  * TokenMatcheePair for tokens' parser combinator
+ *  
  * matched: the matched (now and before) tokens
+ * 
  * remained: tokens to be matched
+ * 
  * ast: abstract syntax tree
  */
 export interface TokenMatcheePair {
@@ -52,6 +56,28 @@ export interface TokenMatcheePair {
     ast : tkTree[]
 }
 
+/**
+ * convert a `tkTree` AST to S-expr string
+ * @param t the `tkTree`
+ * @returns S-expr String
+ */
+export function tkTreeToSExp(t: tkTree): string{
+    var str = "";
+
+    if (Array.isArray(t)){
+        let strArray = t.map((x)=>tkTreeToSExp(x));
+        str = "(" + strArray.join(" ") + ")";
+    }else{
+        if (t=== undefined){
+            str = "%undefined"
+        }else{
+            str = t.text;
+        }
+    }
+
+    return str;
+}
+
 /**
  * @description
  * match one token type.
@@ -94,6 +120,9 @@ export function m1TType(typ: tk.TokenType):
  * type int
  */
 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);
@@ -143,8 +172,61 @@ function orDo(f1 : Function, f2 : Function){
             let res2 : tk.Maybe<TokenMatcheePair> = f2(x);
             return res2;
         }
+    } 
+}
+
+
+/**
+ * 
+ * @param m : the `MatcheePair` 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> {
+    if (m.remained.length >= 1) {
+        return {
+            _tag: "Some", value: {
+                matched: m.matched.concat(m.remained[0]),
+                remained: m.remained.slice(1),
+                ast :  [m.remained[0]],
+            }
+        };
+    } else {
+        return { _tag: "None" };
     }
-    
+}
+
+/**
+* @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"};
+        }
+        let ast = wrappedOldX.value.ast ;
+        wrappedOldX.value.ast =ast.slice(ast.length-counter);
+        console.log(repr(wrappedOldX.value.ast));
+
+        return wrappedOldX; };
 }
 
 /**
@@ -187,20 +269,51 @@ let single1 = circumfix((x : TokenMatcheePair) =>
 let single2= tInt;
 let single = orDo(single1, single2);
 
-/** fac1 = single "(" int ")"  | single */
+/** func = single | single "(" single ")" 
+ * i.e.
+ * 
+ * func = single |  func_aux ( int )
+ * 
+*/
+
+
+/** fac = single ["(" single ")"]?  | single */
 let fac1Appliee = circumfix((x  : TokenMatcheePair) => thenDo(thenDo(thenDo(tk.toSome(x), tLParen), tInt), tRParen), "fac1");
 let fac1 = (x : TokenMatcheePair) => 
     {
-        let n = thenDo(thenDo(toSome(x), single), fac1Appliee);
+        let raw = thenDo(thenDo(toSome(x), single), OnceOrMoreDo(fac1Appliee));
+        console.log("+"+"火鳥"+"+"+repr(raw));
+
+        
+        
+        if (raw._tag == "Some"){
+
+
+            var result : tkTree  = raw.value.ast[0];
+            let applyToken : tk.Token = {text: '%apply', ln:0, col:0};
+            for (var i=1; i<raw.value.ast.length; i++){
+                result = [applyToken, result, raw.value.ast[i]];
+            }
+
+            console.log("+"+"hitori"+"+"+repr(result));
+
+            if (!Array.isArray(result)){
+                raw.value.ast = [result];
+            }else{
+                raw.value.ast = result;
+            }
+        }
+
 
-        console.log("+"+"bocchitherock"+"+"+repr(n));
+        
     
-        return n
+        return raw;
     };
 let fac2 = single;
 let fac = orDo(fac1, fac2);
 
 
+
 /**
  * 
  * term1 = fac (MUL | DIV) fac
@@ -240,7 +353,8 @@ let expr = orDo(expr1, expr2);
 
 
 
-let tokens = tk.tokenize("12(13)(14)");
+let tokens = tk.tokenize("1");
+
 //let tokens = tk.tokenize("(4-(3/4))");
 //tk.tokenize(argv[2]);
 
@@ -259,6 +373,9 @@ let beta = expr({
         remained : tokensFiltered,
         ast : []});
 
+if (beta._tag == "Some"){
+    console.log(tkTreeToSExp(beta.value.ast));
+}
 
 console.log("RESULT="+repr(beta));