Bugfix(Parser): If expr position error (#480)

bugfix: If stmt position error
kcl-lang · Apr 3, 2023 · fca0342 · fca0342
1 parent b39d27f
commit fca0342
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/kclvm/parser/src/parser/expr.rs b/kclvm/parser/src/parser/expr.rs
@@ -49,11 +49,12 @@ impl<'a> Parser<'a> {
     /// Syntax:
     /// test: if_expr | simple_expr
     pub(crate) fn parse_expr(&mut self) -> NodeRef<Expr> {
+        let token = self.token;
         let operand = self.parse_simple_expr();
 
         // try if expr
         if self.token.is_keyword(kw::If) {
-            return self.parse_if_expr(operand);
+            return self.parse_if_expr(operand, token);
         }
 
         operand
@@ -199,8 +200,11 @@ impl<'a> Parser<'a> {
     /// Syntax:
     /// if_expr: simple_expr IF simple_expr ELSE test
     /// test: if_expr | simple_expr
-    fn parse_if_expr(&mut self, body: NodeRef<Expr>) -> NodeRef<Expr> {
-        let token = self.token;
+    fn parse_if_expr(
+        &mut self,
+        body: NodeRef<Expr>,
+        token: kclvm_ast::token::Token,
+    ) -> NodeRef<Expr> {
         if self.token.is_keyword(kw::If) {
             self.bump();
             let cond = self.parse_simple_expr();

diff --git a/kclvm/parser/src/parser/tests.rs b/kclvm/parser/src/parser/tests.rs
@@ -330,7 +330,7 @@ fn if_expr() {
     check_parsing_expr(
         r####"1 if true else 2"####,
         expect![[r#"
-        Node { node: If(IfExpr { body: Node { node: NumberLit(NumberLit { binary_suffix: None, value: Int(1) }), filename: "", line: 1, column: 0, end_line: 1, end_column: 1 }, cond: Node { node: Identifier(Identifier { names: ["true"], pkgpath: "", ctx: Load }), filename: "", line: 1, column: 5, end_line: 1, end_column: 9 }, orelse: Node { node: NumberLit(NumberLit { binary_suffix: None, value: Int(2) }), filename: "", line: 1, column: 15, end_line: 1, end_column: 16 } }), filename: "", line: 1, column: 2, end_line: 1, end_column: 16 }
+        Node { node: If(IfExpr { body: Node { node: NumberLit(NumberLit { binary_suffix: None, value: Int(1) }), filename: "", line: 1, column: 0, end_line: 1, end_column: 1 }, cond: Node { node: Identifier(Identifier { names: ["true"], pkgpath: "", ctx: Load }), filename: "", line: 1, column: 5, end_line: 1, end_column: 9 }, orelse: Node { node: NumberLit(NumberLit { binary_suffix: None, value: Int(2) }), filename: "", line: 1, column: 15, end_line: 1, end_column: 16 } }), filename: "", line: 1, column: 0, end_line: 1, end_column: 16 }
         "#]],
     );
 }

diff --git a/kclvm/parser/src/tests/snapshots/kclvm_parser__tests__error_recovery__if_recovery_0.snap b/kclvm/parser/src/tests/snapshots/kclvm_parser__tests__error_recovery__if_recovery_0.snap
@@ -1,6 +1,5 @@
 ---
 source: parser/src/tests/error_recovery.rs
-assertion_line: 79
 expression: "crate::tests::parsing_expr_string(r#\"1 if\"#)"
 ---
 Node {
@@ -45,7 +44,7 @@ Node {
     ),
     filename: "",
     line: 1,
-    column: 2,
+    column: 0,
     end_line: 1,
     end_column: 4,
 }

diff --git a/kclvm/parser/src/tests/snapshots/kclvm_parser__tests__error_recovery__if_recovery_1.snap b/kclvm/parser/src/tests/snapshots/kclvm_parser__tests__error_recovery__if_recovery_1.snap
@@ -1,6 +1,5 @@
 ---
 source: parser/src/tests/error_recovery.rs
-assertion_line: 80
 expression: "crate::tests::parsing_expr_string(r#\"1 if\"#)"
 ---
 Node {
@@ -45,7 +44,7 @@ Node {
     ),
     filename: "",
     line: 1,
-    column: 2,
+    column: 0,
     end_line: 1,
     end_column: 4,
 }

diff --git a/kclvm/parser/src/tests/snapshots/kclvm_parser__tests__error_recovery__if_recovery_2.snap b/kclvm/parser/src/tests/snapshots/kclvm_parser__tests__error_recovery__if_recovery_2.snap
@@ -1,6 +1,5 @@
 ---
 source: parser/src/tests/error_recovery.rs
-assertion_line: 81
 expression: "crate::tests::parsing_expr_string(r#\"1 if True\"#)"
 ---
 Node {
@@ -47,7 +46,7 @@ Node {
     ),
     filename: "",
     line: 1,
-    column: 2,
+    column: 0,
     end_line: 1,
     end_column: 9,
 }

diff --git a/kclvm/parser/src/tests/snapshots/kclvm_parser__tests__error_recovery__if_recovery_3.snap b/kclvm/parser/src/tests/snapshots/kclvm_parser__tests__error_recovery__if_recovery_3.snap
@@ -1,6 +1,5 @@
 ---
 source: parser/src/tests/error_recovery.rs
-assertion_line: 82
 expression: "crate::tests::parsing_expr_string(r#\"1 if True else\"#)"
 ---
 Node {
@@ -47,7 +46,7 @@ Node {
     ),
     filename: "",
     line: 1,
-    column: 2,
+    column: 0,
     end_line: 1,
     end_column: 14,
 }