From 0c511b6eca6684edf4bc519548876d48db46e92e Mon Sep 17 00:00:00 2001 From: Zhelyapov Aleksey Date: Mon, 28 Apr 2025 19:08:00 +0300 Subject: [PATCH] Fixed ast_builder tests Signed-off-by: Zhelyapov Aleksey --- .../test/unit/public/ast_builder_test.cpp | 50 +++++++++---------- .../util/ast-builders/numberLiteralBuilder.h | 4 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/ets2panda/test/unit/public/ast_builder_test.cpp b/ets2panda/test/unit/public/ast_builder_test.cpp index 9ef6b9654..7bc7a7df8 100644 --- a/ets2panda/test/unit/public/ast_builder_test.cpp +++ b/ets2panda/test/unit/public/ast_builder_test.cpp @@ -102,8 +102,8 @@ using ark::es2panda::ir::WhileStatementBuilder; namespace { TEST_F(ASTVerifierTest, arrowFunctionExpressionBuild) { - auto left = NumberLiteralBuilder(Allocator()).SetValue("10").Build(); - auto right = NumberLiteralBuilder(Allocator()).SetValue("5").Build(); + auto left = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(10)).Build(); + auto right = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(5)).Build(); auto binaryExpr = BinaryExpressionBuilder(Allocator()) .SetLeft(left) .SetRight(right) @@ -115,8 +115,8 @@ TEST_F(ASTVerifierTest, arrowFunctionExpressionBuild) TEST_F(ASTVerifierTest, awaitExpressionBuild) { - auto left = NumberLiteralBuilder(Allocator()).SetValue("10").Build(); - auto right = NumberLiteralBuilder(Allocator()).SetValue("5").Build(); + auto left = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(10)).Build(); + auto right = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(5)).Build(); auto binaryExpr = BinaryExpressionBuilder(Allocator()) .SetLeft(left) .SetRight(right) @@ -134,8 +134,8 @@ TEST_F(ASTVerifierTest, bigintLiteralBuild) TEST_F(ASTVerifierTest, binaryExpressionBuild) { - auto left = NumberLiteralBuilder(Allocator()).SetValue("10").Build(); - auto right = NumberLiteralBuilder(Allocator()).SetValue("5").Build(); + auto left = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(10)).Build(); + auto right = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(5)).Build(); auto binaryExpr = BinaryExpressionBuilder(Allocator()) .SetLeft(left) .SetRight(right) @@ -146,8 +146,8 @@ TEST_F(ASTVerifierTest, binaryExpressionBuild) TEST_F(ASTVerifierTest, blockExpressionBuild) { - auto left = NumberLiteralBuilder(Allocator()).SetValue("10").Build(); - auto right = NumberLiteralBuilder(Allocator()).SetValue("5").Build(); + auto left = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(10)).Build(); + auto right = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(5)).Build(); auto binaryExpr = BinaryExpressionBuilder(Allocator()) .SetLeft(left) .SetRight(right) @@ -160,8 +160,8 @@ TEST_F(ASTVerifierTest, blockExpressionBuild) TEST_F(ASTVerifierTest, blockStatementBuild) { - auto left = NumberLiteralBuilder(Allocator()).SetValue("10").Build(); - auto right = NumberLiteralBuilder(Allocator()).SetValue("5").Build(); + auto left = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(10)).Build(); + auto right = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(5)).Build(); auto binaryExpr = BinaryExpressionBuilder(Allocator()) .SetLeft(left) .SetRight(right) @@ -201,7 +201,7 @@ TEST_F(ASTVerifierTest, charLiteralBuild) TEST_F(ASTVerifierTest, classDeclarationBuild) { auto id = IdentifierBuilder(Allocator()).SetName("a").Build(); - auto number = NumberLiteralBuilder(Allocator()).SetValue("10").Build(); + auto number = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(10)).Build(); auto classProperty = ClassPropertyBuilder(Allocator()) .SetKey(id) .SetValue(number) @@ -227,7 +227,7 @@ TEST_F(ASTVerifierTest, exportDefaultDeclarationBuild) { auto idParent = IdentifierBuilder(Allocator()).SetName("parent").Build(); auto id = IdentifierBuilder(Allocator()).SetName("a").SetParent(idParent).Build(); - auto number = NumberLiteralBuilder(Allocator()).SetValue("10").Build(); + auto number = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(10)).Build(); auto classProperty = ClassPropertyBuilder(Allocator()) .SetKey(id) .SetValue(number) @@ -244,8 +244,8 @@ TEST_F(ASTVerifierTest, exportDefaultDeclarationBuild) TEST_F(ASTVerifierTest, expressionStatementBuild) { - auto left = NumberLiteralBuilder(Allocator()).SetValue("10").Build(); - auto right = NumberLiteralBuilder(Allocator()).SetValue("5").Build(); + auto left = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(10)).Build(); + auto right = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(5)).Build(); auto binaryExpr = BinaryExpressionBuilder(Allocator()) .SetLeft(left) .SetRight(right) @@ -257,8 +257,8 @@ TEST_F(ASTVerifierTest, expressionStatementBuild) TEST_F(ASTVerifierTest, ifStatementBuild) { - auto left = NumberLiteralBuilder(Allocator()).SetValue("10").Build(); - auto right = NumberLiteralBuilder(Allocator()).SetValue("5").Build(); + auto left = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(10)).Build(); + auto right = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(5)).Build(); auto binaryExpr = BinaryExpressionBuilder(Allocator()) .SetLeft(left) .SetRight(right) @@ -273,7 +273,7 @@ TEST_F(ASTVerifierTest, ifStatementBuild) TEST_F(ASTVerifierTest, memberExpressionBuild) { - auto member = NumberLiteralBuilder(Allocator()).SetValue("10").Build(); + auto member = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(10)).Build(); auto thisExpr = ThisExpressionBuilder(Allocator()).Build(); auto memberExpression = MemberExpressionBuilder(Allocator()) .SetObject(thisExpr) @@ -307,8 +307,8 @@ TEST_F(ASTVerifierTest, stringLiteralBuild) TEST_F(ASTVerifierTest, tsClassImplementsBuild) { - auto left = NumberLiteralBuilder(Allocator()).SetValue("10").Build(); - auto right = NumberLiteralBuilder(Allocator()).SetValue("5").Build(); + auto left = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(10)).Build(); + auto right = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(5)).Build(); auto binaryExpr = BinaryExpressionBuilder(Allocator()) .SetLeft(left) .SetRight(right) @@ -323,8 +323,8 @@ TEST_F(ASTVerifierTest, tsClassImplementsBuild) TEST_F(ASTVerifierTest, switchStatementBuild) { - auto left = NumberLiteralBuilder(Allocator()).SetValue("10").Build(); - auto right = NumberLiteralBuilder(Allocator()).SetValue("5").Build(); + auto left = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(10)).Build(); + auto right = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(5)).Build(); auto binaryExpr = BinaryExpressionBuilder(Allocator()) .SetLeft(left) .SetRight(right) @@ -346,7 +346,7 @@ TEST_F(ASTVerifierTest, enumBuild) { auto id = IdentifierBuilder(Allocator()).SetName("a").Build(); auto idMember = IdentifierBuilder(Allocator()).SetName("s").Build(); - auto init = NumberLiteralBuilder(Allocator()).SetValue("10").Build(); + auto init = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(10)).Build(); auto enumMember = TSEnumMemberBuilder(Allocator()).SetKey(idMember).SetInit(init).Build(); auto enumDecl = TSEnumDeclarationBuilder(Allocator()) .SetKey(id) @@ -388,7 +388,7 @@ TEST_F(ASTVerifierTest, updateExpressionBuild) TEST_F(ASTVerifierTest, VariableDeclarationBuild) { auto idDeclarator = IdentifierBuilder(Allocator()).SetName("a").Build(); - auto init = NumberLiteralBuilder(Allocator()).SetValue("10").Build(); + auto init = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(10)).Build(); auto varDeclarator = VariableDeclaratorBuilder(Allocator()).SetId(idDeclarator).SetInit(init).Build(); ark::ArenaVector declarators(Allocator()->Adapter()); declarators.push_back(varDeclarator); @@ -401,8 +401,8 @@ TEST_F(ASTVerifierTest, VariableDeclarationBuild) TEST_F(ASTVerifierTest, whileStatementBuild) { - auto left = NumberLiteralBuilder(Allocator()).SetValue("10").Build(); - auto right = NumberLiteralBuilder(Allocator()).SetValue("5").Build(); + auto left = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(10)).Build(); + auto right = NumberLiteralBuilder(Allocator()).SetValue(ark::es2panda::lexer::Number(5)).Build(); auto binaryExpr = BinaryExpressionBuilder(Allocator()) .SetLeft(left) .SetRight(right) diff --git a/ets2panda/util/ast-builders/numberLiteralBuilder.h b/ets2panda/util/ast-builders/numberLiteralBuilder.h index 0047d5e0e..5d1f73a10 100644 --- a/ets2panda/util/ast-builders/numberLiteralBuilder.h +++ b/ets2panda/util/ast-builders/numberLiteralBuilder.h @@ -26,7 +26,7 @@ class NumberLiteralBuilder : public AstBuilder { public: explicit NumberLiteralBuilder(ark::ArenaAllocator *allocator) : AstBuilder(allocator) {} - NumberLiteralBuilder &SetValue(util::StringView value) + NumberLiteralBuilder &SetValue(lexer::Number const value) { value_ = value; return *this; @@ -39,7 +39,7 @@ public: } private: - util::StringView value_ {}; + lexer::Number value_; }; } // namespace ark::es2panda::ir -- Gitee