X-Git-Url: https://git.kianting.info/?a=blobdiff_plain;f=src%2Findex.ts;h=26a690eb3b71659a119668c7e4c5f202faf04a39;hb=d4dfd2e99f564ca880d40172687986ea3ce757f0;hp=157b1607348020eac4b7e8648093eb77ff8059c6;hpb=8d03cc503c747bb974c75d39f8b9c0678a9cc91f;p=clo

diff --git a/src/index.ts b/src/index.ts
index 157b160..26a690e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -3,6 +3,7 @@ import jsTokens from "js-tokens";
 import * as util from 'util';
 import * as p from 'typescript-parsec';
 import { Token } from 'typescript-parsec';
+import { TokenType } from "./tokenize";
 /**
  * 
  * # REPRESENTATION
@@ -40,15 +41,17 @@ let repr = (x : any)=>{return util.inspect(x, {depth: null})};
 type tkTree = string | tkTree[];
 
 enum TokenKind {
-    Seperator,
-    Semicolon,
+    Seperator, // ---
+    Semicolon, // ;
     Number,
     Op,
-    ExprMark,
+    ExprMark, // @
+    ExcapeAt, // \@
     Paren,
-    SpaceNL,
+    SpaceNL, // \s\t\n\r
     Id,
     Str,
+    Comment, // /* ooo */
 }
 
 /**
@@ -56,16 +59,19 @@ enum TokenKind {
  */
 const lexer = p.buildLexer([
     [true, /^\d+(\.\d+)?/g, TokenKind.Number],
+    [true, /^\\\@/g, TokenKind.ExcapeAt],
+    [true, /^\/\*([^/]|\/[^*])*\*\//g, TokenKind.Comment],
     [true, /^\;/g, TokenKind.Semicolon],
     [true, /^[-][-][-]/g, TokenKind.Seperator],
     [true, /^[\+\-\*\/\&\|\!\^\<\>\~\=\?]+/g, TokenKind.Op],
-    [true, /^\@+/g, TokenKind.ExprMark],
+    [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]
+    [true, /^[^\/\\\@\s\n\t\r;]+/g, TokenKind.Id],
+    [true, /^(\s|\n|\r|\t)+/g, TokenKind.SpaceNL],
+
 ]);
 
 /**
@@ -73,23 +79,41 @@ const lexer = p.buildLexer([
  * # TEST
  */
 const inputTxt=
-`import ast;
+`import a as b; /*bacourt*/
+/* ba choir 
+ipsum lorem*/
+
+import you as john;
 ---
-122`;
+
+臺中市\\\@
+
+公園
+@1+2==3;
+
+console.log("122");@
+
+山頂
+`;
 
 
 const PROG = p.rule<TokenKind, tkTree>();
-const UNIT = p.rule<TokenKind, tkTree>();
+const SEGMENT = p.rule<TokenKind, tkTree>();
+const IMPORT = p.rule<TokenKind, tkTree>();
 const IMPORTS = p.rule<TokenKind, tkTree>();
 const SEMICOLON = p.rule<TokenKind, tkTree>();
-
+const EXCAPE_AT = p.rule<TokenKind, tkTree>();
+const NOT_AT_TEXT = p.rule<TokenKind, tkTree>();
+const CONTENT = p.rule<TokenKind, tkTree>();
 
 let doubleMinus = { type: 'Punctuator', value: '--' };
 let doubleMinus2 = p.str('--');
 const TERM = p.rule<TokenKind, tkTree>();
 
-function applyUnit(value: Token<TokenKind.Number>): tkTree{
-    return value.text;
+function applySegment(input: [Token<TokenKind>, Token<TokenKind>[],
+        Token<TokenKind>]): tkTree[]{
+    let unpackedInnerExprs = input[1].map((x)=>{return x.text});
+    return ["%exprs", unpackedInnerExprs];
 }
 
 function applySemiColon(value: Token<TokenKind.Semicolon>): tkTree{
@@ -102,26 +126,108 @@ function applyParts(first: tkTree,
 }
 
 
+function applyComment(value: Token<TokenKind.Comment>): tkTree[]{
+    return [value.text];
+}
 
 
-function applyImports(input: [Token<TokenKind>,Token<TokenKind>[], tkTree]):tkTree{
+function applyImport(input: [Token<TokenKind>,Token<TokenKind>[], tkTree]) : tkTree{
     let importTail = input[1].map(x=>x.text);
     return ["import"].concat(importTail);
 };
 
+
+/*
+function applyImportComment(input: [Token<TokenKind>,Token<TokenKind>[],
+    tkTree, Token<TokenKind.Comment>]) : tkTree{
+    let importTail = input[1].map(x=>x.text);
+    let comment = [input[3].text];
+    return ["import"].concat(importTail).concat(comment);
+};*/
+
+function applyImports(input : [tkTree, tkTree[]]): tkTree{
+    let resultBody = [input[0]].concat(input[1]);
+    let resultWrapper = ["%import", resultBody];
+    return resultWrapper;
+};
+
+
+
+
+function applyNotAtText(value : Token<TokenKind>): tkTree{
+    if (value.text == "\\\@"){
+        return '@';
+    }
+    else{return value.text;}
+};
+
+function applyText (input : tkTree): tkTree[]{
+    return ["%text", input];
+};
+
+function applyContent(input : tkTree[]): tkTree[]{
+    return ["%content", input];
+};
+
+function applySpaceNL(value : Token<TokenKind.SpaceNL>): tkTree{
+    return value.text;
+}
+
 /**
- * PROG : IMPORTS '---' UNIT;
+ * IMPORTEE:  Number, Op, Paren, Id, Str, Comment,
+ */
+let IMPORTEE = p.alt(p.tok(TokenKind.Number),
+    p.tok(TokenKind.Op),
+    p.tok(TokenKind.Paren),
+    p.tok(TokenKind.Id),
+    p.tok(TokenKind.Str),
+    p.tok(TokenKind.SpaceNL),
+    p.tok(TokenKind.Comment));
+
+let NOT_AT = p.alt(p.tok(TokenKind.Seperator),
+    p.tok(TokenKind.Semicolon),
+    p.tok(TokenKind.Number),
+    p.tok(TokenKind.ExcapeAt),
+    p.tok(TokenKind.Op),
+    p.tok(TokenKind.Paren),
+    p.tok(TokenKind.SpaceNL),
+    p.tok(TokenKind.Id),
+    p.tok(TokenKind.Str),
+    p.tok(TokenKind.Comment),
+    );
+
+/**
+ * PROG : IMPORTS '---' CONTENT;
  */
 PROG.setPattern(
-    p.lrec_sc(IMPORTS, p.seq(p.str('---'), UNIT), applyParts)
+    p.lrec_sc(IMPORTS, p.seq(p.str('---'), CONTENT), applyParts)
 
 )
 
 /**
- * PROG : 'import' Id* SEMICOLON;
+ * NOT_AT_TEXT : NOT_AT
  */
+NOT_AT_TEXT.setPattern(
+    p.apply(NOT_AT, applyNotAtText)
+);
+
 IMPORTS.setPattern(
-    p.apply(p.seq(p.str('import'), p.rep_sc(p.tok(TokenKind.Id)), SEMICOLON) , applyImports)
+    p.apply( p.seq(IMPORT, p.rep(IMPORT)), applyImports)
+);
+
+/**
+ * IMPORT :
+ * 'import' IMPORTEE* SEMICOLON |
+ * COMMENT |
+ */
+IMPORT.setPattern(
+    p.alt(
+        p.apply(p.seq(p.str('import'), p.rep_sc(IMPORTEE), SEMICOLON),
+            applyImport),
+        p.apply(p.tok(TokenKind.Comment), applyComment),
+        p.apply(p.tok(TokenKind.SpaceNL), applySpaceNL)
+
+    )
 );
 
 /**
@@ -131,13 +237,27 @@ SEMICOLON.setPattern(
     p.apply(p.tok(TokenKind.Semicolon), applySemiColon)
 );
 
+
+
 /**
- * UNIT : Number;
+ * SEGMENT : '@' NOT_AT* '@' |
+ * (NOT_AT_TEXT | EXCAPE_AT)*
  */
-UNIT.setPattern(
-    p.apply(p.tok(TokenKind.Number), applyUnit)
+SEGMENT.setPattern(
+    p.alt(
+        p.apply(p.rep_sc(NOT_AT_TEXT), applyText),
+        p.apply(p.seq(p.str('@'), p.rep(NOT_AT), p.str('@')), applySegment),
+    )
 );
 
+/**
+ * CONTENT : SEGMENT*
+ */
+CONTENT.setPattern(
+    p.apply(p.rep(SEGMENT), applyContent)
+);
+
+
 let tree = p.expectSingleResult(p.expectEOF(PROG.parse(lexer.parse(inputTxt))));