Add else statement AST tests This CL adds tests for the else statement AST node. Bug: tint:11 Change-Id: I30c024775d188223d5a3875ee973ffc8ac78c645 Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/16466 Reviewed-by: Sarah Mashayekhi <sarahmashay@google.com> Commit-Queue: Sarah Mashayekhi <sarahmashay@google.com>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e5f97e9..efb9798 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt
@@ -206,6 +206,7 @@ ast/const_initializer_expression_test.cc ast/continue_statement_test.cc ast/decorated_variable_test.cc + ast/else_statement_test.cc ast/entry_point_test.cc ast/import_test.cc ast/int_literal_test.cc
diff --git a/src/ast/else_statement.cc b/src/ast/else_statement.cc index e41f61b..09f39e2 100644 --- a/src/ast/else_statement.cc +++ b/src/ast/else_statement.cc
@@ -40,6 +40,15 @@ ElseStatement::~ElseStatement() = default; bool ElseStatement::IsValid() const { + for (const auto& stmt : body_) { + if (stmt == nullptr) + return false; + if (!stmt->IsValid()) + return false; + } + if (condition_) + return condition_->IsValid(); + return true; } @@ -57,6 +66,9 @@ make_indent(out, indent + 2); out << "}" << std::endl; + + make_indent(out, indent); + out << "}" << std::endl; } } // namespace ast
diff --git a/src/ast/else_statement_test.cc b/src/ast/else_statement_test.cc new file mode 100644 index 0000000..4f20122 --- /dev/null +++ b/src/ast/else_statement_test.cc
@@ -0,0 +1,137 @@ +// Copyright 2020 The Tint Authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#include "src/ast/else_statement.h" + +#include "gtest/gtest.h" +#include "src/ast/bool_literal.h" +#include "src/ast/const_initializer_expression.h" +#include "src/ast/if_statement.h" +#include "src/ast/nop_statement.h" + +namespace tint { +namespace ast { + +using ElseStatementTest = testing::Test; + +TEST_F(ElseStatementTest, Creation) { + auto cond = std::make_unique<ConstInitializerExpression>( + std::make_unique<BoolLiteral>(true)); + std::vector<std::unique_ptr<Statement>> body; + body.push_back(std::make_unique<NopStatement>()); + + auto cond_ptr = cond.get(); + auto nop_ptr = body[0].get(); + + ElseStatement e(std::move(cond), std::move(body)); + EXPECT_EQ(e.condition(), cond_ptr); + ASSERT_EQ(e.body().size(), 1); + EXPECT_EQ(e.body()[0].get(), nop_ptr); +} + +TEST_F(ElseStatementTest, Creation_WithSource) { + ElseStatement e(Source{20, 2}, {}); + auto src = e.source(); + EXPECT_EQ(src.line, 20); + EXPECT_EQ(src.column, 2); +} + +TEST_F(ElseStatementTest, IsElse) { + ElseStatement e; + EXPECT_TRUE(e.IsElse()); +} + +TEST_F(ElseStatementTest, HasCondition) { + auto cond = std::make_unique<ConstInitializerExpression>( + std::make_unique<BoolLiteral>(true)); + ElseStatement e(std::move(cond), {}); + EXPECT_TRUE(e.HasCondition()); +} + +TEST_F(ElseStatementTest, HasContition_NullCondition) { + ElseStatement e; + EXPECT_FALSE(e.HasCondition()); +} + +TEST_F(ElseStatementTest, IsValid) { + ElseStatement e; + EXPECT_TRUE(e.IsValid()); +} + +TEST_F(ElseStatementTest, IsValid_WithBody) { + std::vector<std::unique_ptr<Statement>> body; + body.push_back(std::make_unique<NopStatement>()); + + ElseStatement e(std::move(body)); + EXPECT_TRUE(e.IsValid()); +} + +TEST_F(ElseStatementTest, IsValid_WithNullBodyStatement) { + std::vector<std::unique_ptr<Statement>> body; + body.push_back(std::make_unique<NopStatement>()); + body.push_back(nullptr); + + ElseStatement e(std::move(body)); + EXPECT_FALSE(e.IsValid()); +} + +TEST_F(ElseStatementTest, IsValid_InvalidCondition) { + auto cond = std::make_unique<ConstInitializerExpression>(); + ElseStatement e(std::move(cond), {}); + EXPECT_FALSE(e.IsValid()); +} + +TEST_F(ElseStatementTest, IsValid_InvalidBodyStatement) { + std::vector<std::unique_ptr<Statement>> body; + body.push_back(std::make_unique<IfStatement>()); + + ElseStatement e(std::move(body)); + EXPECT_FALSE(e.IsValid()); +} + +TEST_F(ElseStatementTest, ToStr) { + auto cond = std::make_unique<ConstInitializerExpression>( + std::make_unique<BoolLiteral>(true)); + std::vector<std::unique_ptr<Statement>> body; + body.push_back(std::make_unique<NopStatement>()); + + ElseStatement e(std::move(cond), std::move(body)); + std::ostringstream out; + e.to_str(out, 2); + EXPECT_EQ(out.str(), R"( Else{ + ConstInitializer{true} + { + Nop{} + } + } +)"); +} + +TEST_F(ElseStatementTest, ToStr_NoCondition) { + std::vector<std::unique_ptr<Statement>> body; + body.push_back(std::make_unique<NopStatement>()); + + ElseStatement e(std::move(body)); + std::ostringstream out; + e.to_str(out, 2); + EXPECT_EQ(out.str(), R"( Else{ + { + Nop{} + } + } +)"); +} + +} // namespace ast +} // namespace tint