⬆️ UPDATE 语法分析

sunwu51 · Dec 25, 2024 · 564aabc · 564aabc
1 parent 7b8561a
commit 564aabc
Show file tree

Hide file tree

Showing 11 changed files with 1,198 additions and 322 deletions.
diff --git a/24.11/parser_test10.mjs b/24.11/parser_test10.mjs
diff --git a/24.11/parser_test11.mjs b/24.11/parser_test11.mjs
diff --git a/24.11/parser_test2.mjs b/24.11/parser_test2.mjs
@@ -16,7 +16,7 @@ class VarSentence extends Sentence {
     }
 
     toString() {
-        return `var ${this.name} = ${this.value.toString()}`;
+        return `var ${this.name} = ${this.value.toString()};`;
     }
 }
 
@@ -26,7 +26,7 @@ class ReturnSentence extends Sentence {
         this.value = value; // 这里的value也是表达式
     }
     toString() {
-        return `return ${this.value.toString()}`;
+        return `return ${this.value.toString()};`;
     }
 }
 
@@ -49,7 +49,7 @@ class ExpressionStatement extends Sentence {
     }
 
     toString() {
-        return this.expression.toString();
+        return this.expression.toString() + ";";
     }
 }
 

diff --git a/24.11/parser_test3.mjs b/24.11/parser_test3.mjs
@@ -17,7 +17,7 @@ class VarSentence extends Sentence {
     }
 
     toString() {
-        return `var ${this.name} = ${this.value.toString()}`;
+        return `var ${this.name} = ${this.value.toString()};`;
     }
 }
 
@@ -27,7 +27,7 @@ class ReturnSentence extends Sentence {
         this.value = value; // 这里的value也是表达式
     }
     toString() {
-        return `return ${this.value.toString()}`;
+        return `return ${this.value.toString()};`;
     }
 }
 
@@ -50,7 +50,7 @@ class ExpressionStatement extends Sentence {
     }
 
     toString() {
-        return this.expression.toString();
+        return this.expression.toString() + ";";
     }
 }
 ///////////////////// 注意 AstNode新增了full属性

diff --git a/24.11/parser_test4.mjs b/24.11/parser_test4.mjs
@@ -17,7 +17,7 @@ class VarSentence extends Sentence {
     }
 
     toString() {
-        return `var ${this.name} = ${this.value.toString()}`;
+        return `var ${this.name} = ${this.value.toString()};`;
     }
 }
 
@@ -27,7 +27,7 @@ class ReturnSentence extends Sentence {
         this.value = value; // 这里的value也是表达式
     }
     toString() {
-        return `return ${this.value.toString()}`;
+        return `return ${this.value.toString()};`;
     }
 }
 
@@ -50,7 +50,7 @@ class ExpressionStatement extends Sentence {
     }
 
     toString() {
-        return this.expression.toString();
+        return this.expression.toString() + ";";
     }
 }
 class AstNode {

diff --git a/24.11/parser_test5.mjs b/24.11/parser_test5.mjs
@@ -17,7 +17,7 @@ class VarSentence extends Sentence {
     }
 
     toString() {
-        return `var ${this.name} = ${this.value.toString()}`;
+        return `var ${this.name} = ${this.value.toString()};`;
     }
 }
 
@@ -27,7 +27,7 @@ class ReturnSentence extends Sentence {
         this.value = value; // 这里的value也是表达式
     }
     toString() {
-        return `return ${this.value.toString()}`;
+        return `return ${this.value.toString()};`;
     }
 }
 
@@ -50,7 +50,7 @@ class ExpressionStatement extends Sentence {
     }
 
     toString() {
-        return this.expression.toString();
+        return this.expression.toString() +";";
     }
 }
 class AstNode {

diff --git a/24.11/parser_test6.mjs b/24.11/parser_test6.mjs
@@ -16,7 +16,7 @@ class VarSentence extends Sentence {
     }
 
     toString() {
-        return `var ${this.name} = ${this.value.toString()}`;
+        return `var ${this.name} = ${this.value.toString()};`;
     }
 }
 
@@ -26,7 +26,7 @@ class ReturnSentence extends Sentence {
         this.value = value; // 这里的value也是表达式
     }
     toString() {
-        return `return ${this.value.toString()}`;
+        return `return ${this.value.toString()};`;
     }
 }
 
@@ -49,7 +49,7 @@ class ExpressionStatement extends Sentence {
     }
 
     toString() {
-        return this.expression.toString();
+        return this.expression.toString() + ";";
     }
 }
 // 基础类型
@@ -139,40 +139,7 @@ class PostfixOperatorAstNode extends AstNode {
         return `(${this.left.toString()} ${this.op.value})`;
     }
 }
-// 函数声明
-class FunctionDeclarationAstNode extends AstNode {
-    constructor(nameToken, params, body) {
-        super();
-        this.name = name == null ? null :new IdentifierAstNode(nameToken);
-        this.params = params;
-        this.body = body;
-    }
-    toString() {
-        return `function${this.name ? ' ' + this.name.toString() : ''}(${this.params.join(',')})${this.body.map(it=>it.toString()).join('\n')}`;
-    }
-}
-// 函数调用
-class FunctionCallAstNode extends AstNode {
-    constructor(nameToken, args) {
-        super();
-        this.name = new IdentifierAstNode(nameToken);
-        this.args = args; // args是ast数组
-    }
-    toString() {
-        return `${this.name.toString()}(${this.args.map(it=>it.toString()).join(',')})`
-    }
-}
-// 分组节点
-class GroupAstNode extends AstNode {
-    constructor(exp) {
-        super();
-        this.exp = exp;
-    }
-    toString() {
-        // 因为小括号已经在运算符的toString中使用了，这里为了更好的凸显使用中文中括号
-        return `【${this.exp.toString()}】`
-    }
-}
+
 // 语法解析，把tokens转换为sentences
 function parse(tokens) {
     // 从i开始转换成var语句，校验是不是var xx = xxx;格式，然后需要解析表达式parseExpression函数。

diff --git a/24.11/parser_test7.mjs b/24.11/parser_test7.mjs
@@ -16,7 +16,7 @@ class VarSentence extends Sentence {
     }
 
     toString() {
-        return `var ${this.name} = ${this.value.toString()}`;
+        return `var ${this.name} = ${this.value.toString()};`;
     }
 }
 
@@ -26,7 +26,7 @@ class ReturnSentence extends Sentence {
         this.value = value; // 这里的value也是表达式
     }
     toString() {
-        return `return ${this.value.toString()}`;
+        return `return ${this.value.toString()};`;
     }
 }
 
@@ -49,7 +49,7 @@ class ExpressionStatement extends Sentence {
     }
 
     toString() {
-        return this.expression.toString();
+        return this.expression.toString() + ";";
     }
 }
 // 基础类型
@@ -139,40 +139,6 @@ class PostfixOperatorAstNode extends AstNode {
         return `(${this.left.toString()} ${this.op.value})`;
     }
 }
-// 函数声明
-class FunctionDeclarationAstNode extends AstNode {
-    constructor(nameToken, params, body) {
-        super();
-        this.name = name == null ? null :new IdentifierAstNode(nameToken);
-        this.params = params;
-        this.body = body;
-    }
-    toString() {
-        return `function${this.name ? ' ' + this.name.toString() : ''}(${this.params.join(',')})${this.body.map(it=>it.toString()).join('\n')}`;
-    }
-}
-// 函数调用
-class FunctionCallAstNode extends AstNode {
-    constructor(nameToken, args) {
-        super();
-        this.name = new IdentifierAstNode(nameToken);
-        this.args = args; // args是ast数组
-    }
-    toString() {
-        return `${this.name.toString()}(${this.args.map(it=>it.toString()).join(',')})`
-    }
-}
-// 分组节点
-class GroupAstNode extends AstNode {
-    constructor(exp) {
-        super();
-        this.exp = exp;
-    }
-    toString() {
-        // 因为小括号已经在运算符的toString中使用了，这里为了更好的凸显使用中文中括号
-        return `【${this.exp.toString()}】`
-    }
-}
 
 
 
@@ -295,15 +261,10 @@ class Parser {
     // 转换为块语句，块语句中包含一个语句数组
     parseBlockSentence() {
         var tokens = this.tokens;
-        var braceCount = 0;
-        for (var j = this.cursor; j < tokens.length; j++) {
-            if (tokens[j].type == LEX.LBRACE) braceCount++;
-            if (tokens[j].type == LEX.RBRACE) braceCount--;
-            if (braceCount == 0) {
-                return new BlockSentence(parse(tokens.slice(this.cursor + 1, this.cursor = j)));
-            }
-        }
-        throw new Error("brace not close for block sentence")
+        assert(tokens[this.cursor++].type === LEX.LBRACE, "brace not open for block sentence")
+        var result = new BlockSentence(this.parse());
+        assert(tokens[this.cursor++].type === LEX.RBRACE, "brace not close for block sentence");
+        return result
     }
 
     // 表达式解析，解析下一个表达式，遇到无法识别的字符会结束