allang-compiler-base 0.0.1 → 0.0.2

package/dist/core/parser/grammar.d.ts

@@ -1,19 +1,29 @@
-import { token, token_type } from '../pre';
+import { token } from '../pre';
 import { log } from '../../base/log';
 interface tools {
     peek(): token;
     now(): token;
     next(): token;
-    match(data: token): boolean;
-    match(data: token_type): boolean;
     backup(): void;
     restore(): void;
+    flush(): void;
+    add(token: token): void;
+    remove(): void;
+    get(): token[];
 }
+declare function create_match(func: (tool: tools) => boolean, error: (log: log) => void): {
+    func: (tool: tools) => boolean;
+    error: (log: log) => void;
+};
+declare function root_match(tool: tools, log: log, parser: (token: token[][]) => Tree, ...match: {
+    func: ((tool: tools) => boolean);
+    error: (log: log) => void;
+}[]): Tree;
+declare function list_match(tool: tools, log: log, parser: (token: token[][]) => Tree, v?: (log: log, token: token[]) => void, ...match: {
+    func: ((tool: tools) => boolean);
+    error: (log: log) => void;
+}[]): Tree;
 declare class Tree {
 }
-interface grammar {
-    match(tool: tools, log: log): boolean;
-    tree(): Tree;
-}
-export { tools, grammar, Tree };
+export { tools, Tree, list_match, root_match, create_match };
 //# sourceMappingURL=grammar.d.ts.map

package/dist/core/parser/grammar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grammar.d.ts","sourceRoot":"","sources":["../../../src/core/parser/grammar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAE,UAAU,EAAC,MAAM,QAAQ,CAAA;AACxC,OAAO,EAAC,GAAG,EAAC,MAAM,gBAAgB,CAAA;AAElC,UAAU,KAAK;IACX,IAAI,IAAG,KAAK,CAAA;IACZ,GAAG,IAAG,KAAK,CAAA;IACX,IAAI,IAAG,KAAK,CAAA;IACZ,KAAK,CAAC,IAAI,EAAC,KAAK,GAAE,OAAO,CAAA;IACzB,KAAK,CAAC,IAAI,EAAC,UAAU,GAAE,OAAO,CAAA;IAC9B,MAAM,IAAG,IAAI,CAAA;IACb,OAAO,IAAG,IAAI,CAAA;CACjB;AACD,cAAM,IAAI;CACT;AACD,UAAU,OAAO;IACb,KAAK,CAAC,IAAI,EAAC,KAAK,EAAC,GAAG,EAAC,GAAG,GAAE,OAAO,CAAA;IACjC,IAAI,IAAG,IAAI,CAAA;CACd;AACD,OAAO,EAAC,KAAK,EAAC,OAAO,EAAC,IAAI,EAAC,CAAA"}
+{"version":3,"file":"grammar.d.ts","sourceRoot":"","sources":["../../../src/core/parser/grammar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,QAAQ,CAAA;AAC5B,OAAO,EAAC,GAAG,EAAC,MAAM,gBAAgB,CAAA;AAElC,UAAU,KAAK;IACX,IAAI,IAAG,KAAK,CAAA;IACZ,GAAG,IAAG,KAAK,CAAA;IACX,IAAI,IAAG,KAAK,CAAA;IACZ,MAAM,IAAG,IAAI,CAAA;IACb,OAAO,IAAG,IAAI,CAAA;IACd,KAAK,IAAG,IAAI,CAAA;IACZ,GAAG,CAAC,KAAK,EAAC,KAAK,GAAE,IAAI,CAAA;IACrB,MAAM,IAAG,IAAI,CAAA;IACb,GAAG,IAAG,KAAK,EAAE,CAAA;CAChB;AACD,iBAAS,YAAY,CAAC,IAAI,EAAC,CAAC,IAAI,EAAC,KAAK,KAAG,OAAO,EAAC,KAAK,EAAC,CAAC,GAAG,EAAC,GAAG,KAAG,IAAI,GAAE;IAAC,IAAI,EAAC,CAAC,IAAI,EAAC,KAAK,KAAG,OAAO,CAAC;IAChG,KAAK,EAAC,CAAC,GAAG,EAAC,GAAG,KAAG,IAAI,CAAA;CAAC,CAKzB;AACD,iBAAS,UAAU,CAAC,IAAI,EAAC,KAAK,EAAC,GAAG,EAAC,GAAG,EAAC,MAAM,EAAC,CAAC,KAAK,EAAC,KAAK,EAAE,EAAE,KAAG,IAAI,EAAC,GAAG,KAAK,EAAC;IAAC,IAAI,EAAC,CAAC,CAAC,IAAI,EAAC,KAAK,KAAG,OAAO,CAAC,CACvG;IAAA,KAAK,EAAC,CAAC,GAAG,EAAC,GAAG,KAAG,IAAI,CAAA;CAAC,EAAE,GAAE,IAAI,CAUlC;AACD,iBAAS,UAAU,CAAC,IAAI,EAAC,KAAK,EAAC,GAAG,EAAC,GAAG,EAAC,MAAM,EAAC,CAAC,KAAK,EAAC,KAAK,EAAE,EAAE,KAAG,IAAI,EAAC,CAAC,CAAC,EAAC,CAAC,GAAG,EAAC,GAAG,EAAC,KAAK,EAAC,KAAK,EAAE,KAAG,IAAI,EAClF,GAAG,KAAK,EAAC;IAAC,IAAI,EAAC,CAAC,CAAC,IAAI,EAAC,KAAK,KAAG,OAAO,CAAC,CAAC;IAAA,KAAK,EAAC,CAAC,GAAG,EAAC,GAAG,KAAG,IAAI,CAAA;CAAC,EAAE,GAAE,IAAI,CAWxF;AACD,cAAM,IAAI;CACT;AACD,OAAO,EAAC,KAAK,EAAC,IAAI,EAAC,UAAU,EAAC,UAAU,EAAC,YAAY,EAAC,CAAA"}

package/dist/core/parser/grammar.js

@@ -1,4 +1,36 @@
+function create_match(func, error) {
+    return {
+        func: func,
+        error: error
+    };
+}
+function root_match(tool, log, parser, ...match) {
+    let matches = [];
+    for (let i = 0; i < match.length; i++) {
+        if (!match[i].func(tool))
+            match[i].error(log);
+        else {
+            matches.push(tool.get());
+            tool.flush();
+        }
+    }
+    return parser(matches);
+}
+function list_match(tool, log, parser, v, ...match) {
+    let matches = [];
+    for (let i = 0; i < match.length; i++) {
+        if (!match[i].func(tool))
+            match[i].error(log);
+        else {
+            matches.push(tool.get());
+            tool.flush();
+        }
+    }
+    if (v)
+        v(log, tool.get());
+    return parser(matches);
+}
 class Tree {
 }
-export { Tree };
+export { Tree, list_match, root_match, create_match };
 //# sourceMappingURL=grammar.js.map

package/dist/core/parser/grammar.js.map

@@ -1 +1 @@
-{"version":3,"file":"grammar.js","sourceRoot":"","sources":["../../../src/core/parser/grammar.ts"],"names":[],"mappings":"AAYA,MAAM,IAAI;CACT;AAKD,OAAO,EAAe,IAAI,EAAC,CAAA"}
+{"version":3,"file":"grammar.js","sourceRoot":"","sources":["../../../src/core/parser/grammar.ts"],"names":[],"mappings":"AAcA,SAAS,YAAY,CAAC,IAA0B,EAAC,KAAqB;IAElE,OAAO;QACH,IAAI,EAAC,IAAI;QACT,KAAK,EAAC,KAAK;KACd,CAAA;AACL,CAAC;AACD,SAAS,UAAU,CAAC,IAAU,EAAC,GAAO,EAAC,MAA8B,EAAC,GAAG,KAC5C;IACzB,IAAI,OAAO,GAAa,EAAE,CAAA;IAC1B,KAAI,IAAI,CAAC,GAAC,CAAC,EAAC,CAAC,GAAC,KAAK,CAAC,MAAM,EAAC,CAAC,EAAE,EAAC,CAAC;QAC5B,IAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;YAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;aACvC,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;YACxB,IAAI,CAAC,KAAK,EAAE,CAAA;QAChB,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC,OAAO,CAAC,CAAA;AAC1B,CAAC;AACD,SAAS,UAAU,CAAC,IAAU,EAAC,GAAO,EAAC,MAA8B,EAAC,CAAgC,EAClF,GAAG,KAA4D;IAC/E,IAAI,OAAO,GAAa,EAAE,CAAA;IAC1B,KAAI,IAAI,CAAC,GAAC,CAAC,EAAC,CAAC,GAAC,KAAK,CAAC,MAAM,EAAC,CAAC,EAAE,EAAC,CAAC;QAC5B,IAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;YAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;aACvC,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;YACxB,IAAI,CAAC,KAAK,EAAE,CAAA;QAChB,CAAC;IACL,CAAC;IACD,IAAG,CAAC;QAAC,CAAC,CAAC,GAAG,EAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;IACtB,OAAO,MAAM,CAAC,OAAO,CAAC,CAAA;AAC1B,CAAC;AACD,MAAM,IAAI;CACT;AACD,OAAO,EAAO,IAAI,EAAC,UAAU,EAAC,UAAU,EAAC,YAAY,EAAC,CAAA"}

package/dist/core/pre/index.d.ts

@@ -1,4 +1,4 @@
-import { token, token_type, word, match_type } from './model';
+import { match_type, token, token_type, word } from './model';
 import { match } from './match';
 import segment from './segment';
 declare const _default: {

package/dist/core/pre/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/pre/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,UAAU,EAAE,IAAI,EAAE,UAAU,EAAC,MAAM,SAAS,CAAA;AAC1D,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAA;AAC7B,OAAO,OAAO,MAAM,WAAW,CAAA;;;;;;;;AAC/B,wBAMC;AACD,OAAO,EAAC,OAAO,EAAC,KAAK,EAAC,UAAU,EAAC,IAAI,EAAC,UAAU,EAAE,KAAK,EAAC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/pre/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAC,MAAM,SAAS,CAAA;AAC3D,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAA;AAC7B,OAAO,OAAO,MAAM,WAAW,CAAA;;;;;;;;AAE/B,wBAMC;AACD,OAAO,EAAC,OAAO,EAAC,KAAK,EAAC,UAAU,EAAC,IAAI,EAAC,UAAU,EAAE,KAAK,EAAC,CAAA"}

package/dist/core/pre/index.js

@@ -1,4 +1,4 @@
-import { token, token_type, word, match_type } from './model';
+import { match_type, token, token_type, word } from './model';
 import { match } from './match';
 import segment from './segment';
 export default {

package/dist/core/pre/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/pre/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,UAAU,EAAE,IAAI,EAAE,UAAU,EAAC,MAAM,SAAS,CAAA;AAC1D,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAA;AAC7B,OAAO,OAAO,MAAM,WAAW,CAAA;AAC/B,eAAe;IACX,OAAO,EAAC,OAAO;IACf,KAAK,EAAC,KAAK;IACX,UAAU,EAAC,UAAU;IACrB,IAAI,EAAC,IAAI;IACT,UAAU,EAAC,UAAU;CACxB,CAAA;AACD,OAAO,EAAC,OAAO,EAAC,KAAK,EAAC,UAAU,EAAC,IAAI,EAAC,UAAU,EAAE,KAAK,EAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/pre/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAC,MAAM,SAAS,CAAA;AAC3D,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAA;AAC7B,OAAO,OAAO,MAAM,WAAW,CAAA;AAE/B,eAAe;IACX,OAAO,EAAC,OAAO;IACf,KAAK,EAAC,KAAK;IACX,UAAU,EAAC,UAAU;IACrB,IAAI,EAAC,IAAI;IACT,UAAU,EAAC,UAAU;CACxB,CAAA;AACD,OAAO,EAAC,OAAO,EAAC,KAAK,EAAC,UAAU,EAAC,IAAI,EAAC,UAAU,EAAE,KAAK,EAAC,CAAA"}

package/dist/core/pre/segment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"segment.d.ts","sourceRoot":"","sources":["../../../src/core/pre/segment.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAa,KAAK,EAAE,IAAI,EAAa,MAAM,SAAS,CAAA;AAG3D,cAAM,OAAO;IACF,IAAI,EAAC,MAAM,EAAE,CAAA;IACb,KAAK,EAAC,IAAI,EAAE,CAAA;IACZ,KAAK,EAAC,MAAM,CAAA;IACZ,IAAI,EAAC,MAAM,CAAA;IACX,GAAG,EAAC,KAAK,EAAE,CAAA;IAClB,OAAO,CAAC,SAAS,CAAS;gBACd,IAAI,EAAC,MAAM,EAAC,KAAK,EAAC,IAAI,EAAE;IAWpC,KAAK,IAAG,MAAM;IAGd,OAAO,IAAG,KAAK,EAAE;IAoDjB,EAAE,CAAC,CAAC,EAAC,MAAM;IAGX,aAAa,IAAG,OAAO;IA2BvB,WAAW,IAAG,OAAO;IAcrB,KAAK,CAAC,CAAC,EAAC,IAAI,GAAE,OAAO;CASxB;AACD,eAAe,OAAO,CAAA"}
+{"version":3,"file":"segment.d.ts","sourceRoot":"","sources":["../../../src/core/pre/segment.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAa,KAAK,EAAc,IAAI,EAAC,MAAM,SAAS,CAAA;AAG3D,cAAM,OAAO;IACF,IAAI,EAAC,MAAM,EAAE,CAAA;IACb,KAAK,EAAC,IAAI,EAAE,CAAA;IACZ,KAAK,EAAC,MAAM,CAAA;IACZ,IAAI,EAAC,MAAM,CAAA;IACX,GAAG,EAAC,KAAK,EAAE,CAAA;IAClB,OAAO,CAAC,SAAS,CAAS;gBACd,IAAI,EAAC,MAAM,EAAC,KAAK,EAAC,IAAI,EAAE;IAWpC,KAAK,IAAG,MAAM;IAGd,OAAO,IAAG,KAAK,EAAE;IAyDjB,EAAE,CAAC,CAAC,EAAC,MAAM;IAGX,aAAa,IAAG,OAAO;IA2BvB,WAAW,IAAG,OAAO;IAcrB,KAAK,CAAC,CAAC,EAAC,IAAI,GAAE,OAAO;CASxB;AACD,eAAe,OAAO,CAAA"}

package/dist/core/pre/segment.js

@@ -2,7 +2,7 @@
  * 进行预分词
  * 之后会被进一步加工成可用token
  */
-import { token_type, token, match_type } from './model';
+import { match_type, token, token_type } from './model';
 import { match } from './match';
 class segment {
     constructor(code, words) {
@@ -29,10 +29,15 @@ class segment {
                 this.line++;
                 continue;
             }
-            if (this.code[this.index] == ' ') {
+            if (this.code[this.index] == ' ' || this.code[this.index] == '\t') {
                 this.ret.push(new token(' ', token_type.space, this.lines()));
                 while (this.is(this.index)) {
-                    if (!(this.code[this.index] == ' '))
+                    if (this.code[this.index] == '\n') {
+                        this.index++;
+                        this.line++;
+                        continue;
+                    }
+                    if (!((this.code[this.index] == ' ' || this.code[this.index] == '\t')))
                         break;
                     this.index++;
                 }
@@ -73,7 +78,7 @@ class segment {
                 }
             }
         }
-        return this.ret;
+        return this.ret.filter((v) => v.type != token_type.space);
     }
     is(i) {
         return i >= 0 && i < this.code.length;

package/dist/core/pre/segment.js.map

@@ -1 +1 @@
-{"version":3,"file":"segment.js","sourceRoot":"","sources":["../../../src/core/pre/segment.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"segment.js","sourceRoot":"","sources":["../../../src/core/pre/segment.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAC,UAAU,EAAE,KAAK,EAAE,UAAU,EAAO,MAAM,SAAS,CAAA;AAC3D,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAA;AAE7B,MAAM,OAAO;IAOT,YAAY,IAAW,EAAC,KAAY;QAChC,IAAI,GAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAC,IAAI,CAAC,CAAA;QAC/B,YAAY;QACZ,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAC,CAAC,EAAC,EAAE;YACd,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,GAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAA;QACtC,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,IAAI,GAAC,CAAC,GAAG,IAAI,CAAC,CAAA;QACnB,IAAI,CAAC,KAAK,GAAC,KAAK,CAAA;QAChB,IAAI,CAAC,IAAI,GAAC,CAAC,CAAA;QACX,IAAI,CAAC,SAAS,GAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACzD,CAAC;IACD,KAAK;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,GAAC,CAAC,CAAC,GAAC,SAAS,GAAC,CAAC,IAAI,CAAC,IAAI,GAAC,CAAC,CAAC,CAAA;IAC9D,CAAC;IACD,OAAO;QACH,IAAI,CAAC,GAAG,GAAC,EAAE,CAAA;QACX,IAAI,CAAC,KAAK,GAAC,CAAC,CAAA;QACZ,IAAI,CAAC,IAAI,GAAC,CAAC,CAAA;QACX,OAAM,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAC,CAAC;YACvB,IAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAE,IAAI,EAAC,CAAC;gBAC5B,IAAI,CAAC,KAAK,EAAE,CAAA;gBACZ,IAAI,CAAC,IAAI,EAAE,CAAA;gBACX,SAAQ;YACZ,CAAC;YACD,IAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAE,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAE,IAAI,EAAC,CAAC;gBAC1D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,GAAG,EAAC,UAAU,CAAC,KAAK,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;gBAC3D,OAAM,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAC,CAAC;oBACvB,IAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAE,IAAI,EAAC,CAAC;wBAC5B,IAAI,CAAC,KAAK,EAAE,CAAA;wBACZ,IAAI,CAAC,IAAI,EAAE,CAAA;wBACX,SAAQ;oBACZ,CAAC;oBACD,IAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAE,GAAG,IAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAE,IAAI,CAAC,CAAC;wBAC1D,MAAK;oBACV,IAAI,CAAC,KAAK,EAAE,CAAA;gBAChB,CAAC;gBACD,SAAQ;YACZ,CAAC;YACD,IAAI;YACJ,IAAG,IAAI,CAAC,aAAa,EAAE;gBAAE,SAAQ;YACjC,OAAO;YACP,IAAG,IAAI,CAAC,WAAW,EAAE;gBAAE,SAAQ;YAC/B,IAAI,UAAU,GAAC,KAAK,CAAA;YACpB,KAAI,IAAI,CAAC,GAAC,CAAC,EAAC,CAAC,GAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAC,CAAC,EAAE,EAAC,CAAC;gBACjC,IAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBAAC,SAAQ;gBACtC,IAAI,CAAC,GAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAC,IAAI,CAAC,KAAK,EAAC,UAAU,CAAC,UAAU,CAAC,CAAA;gBACvD,IAAG,CAAC,CAAC,CAAC,IAAE,CAAC,CAAC,CAAC,IAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAC,CAAC;oBAC7B,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;oBACd,IAAI,CAAC,KAAK,GAAC,CAAC,CAAC,CAAC,CAAA;oBACd,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,EAAC,UAAU,CAAC,UAAU,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;oBAChE,MAAK;gBACT,CAAC;gBACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAC,UAAU,CAAC,OAAO,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;gBAC5E,IAAI,CAAC,KAAK,IAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAA;gBACrC,UAAU,GAAC,IAAI,CAAA;gBACf,MAAK;YACT,CAAC;YACD,KAAK;YACL,IAAG,CAAC,UAAU,EAAC,CAAC;gBACZ,IAAG,KAAK,CAAC,IAAI,CAAC,IAAI,EAAC,IAAI,CAAC,KAAK,EAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,EAAC,CAAC;oBACpD,IAAI,CAAC,GAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAC,IAAI,CAAC,KAAK,EAAC,UAAU,CAAC,UAAU,CAAC,CAAA;oBACvD,IAAI,CAAC,KAAK,GAAC,CAAC,CAAC,CAAC,GAAC,CAAC,CAAA;oBAChB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,EAAC,UAAU,CAAC,UAAU,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;gBACpE,CAAC;qBAAI,CAAC;oBACF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAC,UAAU,CAAC,MAAM,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;oBAC9E,IAAI,CAAC,KAAK,EAAE,CAAA;gBAChB,CAAC;YACL,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAC,EAAE,CAAA,CAAC,CAAC,IAAI,IAAE,UAAU,CAAC,KAAK,CAAC,CAAA;IACzD,CAAC;IACD,EAAE,CAAC,CAAQ;QACP,OAAO,CAAC,IAAE,CAAC,IAAE,CAAC,GAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAA;IACnC,CAAC;IACD,aAAa;QACT,IAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAE,GAAG,EAAC,CAAC;YAC3B,IAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,GAAC,CAAC,CAAC,IAAE,GAAG,EAAC,CAAC;gBAC7B,IAAI,CAAC,KAAK,IAAE,CAAC,CAAA;gBACb,OAAM,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAC,CAAC;oBACvB,IAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAE,IAAI,EAAC,CAAC;wBAC5B,IAAI,CAAC,KAAK,EAAE,CAAA;wBACZ,IAAI,CAAC,IAAI,EAAE,CAAA;wBACX,MAAK;oBACT,CAAC;oBACD,IAAI,CAAC,KAAK,EAAE,CAAA;gBAChB,CAAC;gBACD,OAAO,IAAI,CAAA;YACf,CAAC;iBAAK,IAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,GAAC,CAAC,CAAC,IAAE,GAAG,EAAC,CAAC;gBACnC,IAAI,CAAC,KAAK,IAAE,CAAC,CAAA;gBACb,OAAM,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAC,CAAC;oBACvB,IAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAE,GAAG,IAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,GAAC,CAAC,CAAC,IAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,GAAC,CAAC,CAAC,IAAE,GAAG,EAAC,CAAC;wBAChF,IAAI,CAAC,KAAK,IAAE,CAAC,CAAA;wBACb,MAAK;oBACT,CAAC;oBACD,IAAI,CAAC,KAAK,EAAE,CAAA;gBAChB,CAAC;gBACD,OAAO,IAAI,CAAA;YACf,CAAC;QACL,CAAC;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IACD,WAAW;QACP,IAAI,CAAC,GAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAC,IAAI,CAAC,KAAK,EAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QACnD,IAAG,KAAK,CAAC,IAAI,CAAC,IAAI,EAAC,IAAI,CAAC,KAAK,EAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAC,CAAC;YAChD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,EAAC,UAAU,CAAC,MAAM,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;YAC5D,IAAI,CAAC,KAAK,GAAC,CAAC,CAAC,CAAC,CAAA;YACd,OAAO,IAAI,CAAA;QACf,CAAC;aAAK,IAAG,KAAK,CAAC,IAAI,CAAC,IAAI,EAAC,IAAI,CAAC,KAAK,EAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAC,CAAC;YACtD,CAAC,GAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAC,IAAI,CAAC,KAAK,EAAC,UAAU,CAAC,MAAM,CAAC,CAAA;YAC/C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,EAAC,UAAU,CAAC,MAAM,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;YAC5D,IAAI,CAAC,KAAK,GAAC,CAAC,CAAC,CAAC,CAAA;YACd,OAAO,IAAI,CAAA;QACf,CAAC;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IACD,KAAK,CAAC,CAAM;QACR,IAAG,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,GAAC,CAAC,CAAC,IAAI,CAAC,MAAM,GAAC,CAAC,CAAC,EAAC,CAAC;YACpC,KAAI,IAAI,CAAC,GAAC,CAAC,EAAC,CAAC,GAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAC,CAAC,EAAE,EAAC,CAAC;gBAC7B,IAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,GAAC,CAAC,CAAC,IAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;oBAAE,OAAO,KAAK,CAAA;YACvD,CAAC;YACD,OAAO,IAAI,CAAA;QACf,CAAC;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;CACJ;AACD,eAAe,OAAO,CAAA"}

package/dist/core/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../src/core/test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAO,IAAI,EAAC,MAAM,OAAO,CAAA;AACnD;;GAEG;AACH,IAAI,CAAC,GAAQ;IACT,IAAI,IAAI,CAAC,GAAG,CAAC;IACb,IAAI,IAAI,CAAC,IAAI,CAAC;IACd,IAAI,IAAI,CAAC,SAAS,CAAC;CACtB,CAAA;AACD,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,kBAAkB,EAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../src/core/test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,IAAI,EAAC,MAAM,OAAO,CAAA;AAEnC;;GAEG;AACH,IAAI,CAAC,GAAQ;IACT,IAAI,IAAI,CAAC,GAAG,CAAC;IACb,IAAI,IAAI,CAAC,IAAI,CAAC;IACd,IAAI,IAAI,CAAC,SAAS,CAAC;CACtB,CAAA;AACD,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,kBAAkB,EAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA"}

package/index.js

@@ -1,9 +1,12 @@
-import {Tree, grammar, tools} from './dist/core/parser/grammar'
-import {token, token_type, word, segment} from './dist/core/pre'
+import {list_match,create_match,root_match, tools, Tree} from './dist/core/parser/grammar'
+import {segment, token, token_type, word} from './dist/core/pre'
 import {log} from './dist/base/log'
+
 export {
     Tree,
-    grammar,
+    list_match,
+    create_match,
+    root_match,
     tools,
     token,
     token_type,

package/index.ts

@@ -1,9 +1,12 @@
-import {Tree, grammar, tools} from './src/core/parser/grammar'
-import {token, token_type, word, segment} from './src/core/pre'
+import {list_match,create_match,root_match, tools, Tree} from './src/core/parser/grammar'
+import {segment, token, token_type, word} from './src/core/pre'
 import {log} from './src/base/log'
+
 export {
     Tree,
-    grammar,
+    list_match,
+    create_match,
+    root_match,
     tools,
     token,
     token_type,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "allang-compiler-base",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/core/parser/grammar.ts

@@ -1,20 +1,49 @@
-import {token, token_type} from '../pre'
+import {token} from '../pre'
 import {log} from '../../base/log'
 
 interface tools{
     peek():token
     now():token
     next():token
-    match(data:token):boolean
-    match(data:token_type):boolean
     backup():void
     restore():void
+    flush():void
+    add(token:token):void
+    remove():void
+    get():token[]
 }
-class Tree{
+function create_match(func:(tool:tools)=>boolean,error:(log:log)=>void):{func:(tool:tools)=>boolean,
+    error:(log:log)=>void}{
+    return {
+        func:func,
+        error:error
+    }
+}
+function root_match(tool:tools,log:log,parser:(token:token[][])=>Tree,...match:{func:((tool:tools)=>boolean)
+    ,error:(log:log)=>void}[]):Tree{
+    let matches:(token[])[]=[]
+    for(let i=0;i<match.length;i++){
+        if(!match[i].func(tool))match[i].error(log)
+        else{
+            matches.push(tool.get())
+            tool.flush()
+        }
+    }
+    return parser(matches)
 }
-interface grammar{
-    match(tool:tools,log:log):boolean
-    tree():Tree
-    no_match(log:log):void
+function list_match(tool:tools,log:log,parser:(token:token[][])=>Tree,v?:(log:log,token:token[])=>void,
+                    ...match:{func:((tool:tools)=>boolean),error:(log:log)=>void}[]):Tree{
+    let matches:(token[])[]=[]
+    for(let i=0;i<match.length;i++){
+        if(!match[i].func(tool))match[i].error(log)
+        else{
+            matches.push(tool.get())
+            tool.flush()
+        }
+    }
+    if(v)v(log,tool.get())
+    return parser(matches)
+}
+class Tree{
 }
-export {tools,grammar,Tree}
+export {tools,Tree,list_match,root_match,create_match}

package/src/core/pre/index.ts

@@ -1,6 +1,7 @@
-import {token,token_type, word, match_type} from './model'
+import {match_type, token, token_type, word} from './model'
 import {match} from './match'
 import segment from './segment'
+
 export default {
     segment:segment,
     token:token,

package/src/core/pre/segment.ts

@@ -2,7 +2,7 @@
  * 进行预分词
  * 之后会被进一步加工成可用token
  */
-import {token_type, token, word, match_type} from './model'
+import {match_type, token, token_type, word} from './model'
 import {match} from './match'
 
 class segment{
@@ -36,10 +36,15 @@ class segment{
                 this.line++
                 continue
             }
-            if(this.code[this.index]==' '){
+            if(this.code[this.index]==' ' || this.code[this.index]=='\t'){
                 this.ret.push(new token(' ',token_type.space,this.lines()))
                 while(this.is(this.index)){
-                    if(!(this.code[this.index]==' '))
+                    if(this.code[this.index]=='\n'){
+                        this.index++
+                        this.line++
+                        continue
+                    }
+                    if(!((this.code[this.index]==' '||this.code[this.index]=='\t')))
                          break
                     this.index++
                 }
@@ -76,7 +81,7 @@ class segment{
                 }
             }
         }
-        return this.ret
+        return this.ret.filter((v)=>v.type!=token_type.space)
     }
     is(i:number){
         return i>=0&&i<this.code.length

package/src/core/test.ts

@@ -1,4 +1,5 @@
-import {token_type,segment,token,word} from './pre'
+import {segment, word} from './pre'
+
 /**
  * 测试用
  */