tint: Replace all remaining AST types with ast::Type
This CL removes the following AST nodes:
* ast::Array
* ast::Atomic
* ast::Matrix
* ast::MultisampledTexture
* ast::Pointer
* ast::SampledTexture
* ast::Texture
* ast::TypeName
* ast::Vector
ast::Type, which used to be the base class for all AST types, is now a
thin wrapper around ast::IdentifierExpression. All types are now
referred to using their type name.
The resolver now handles type resolution and validation of the types
listed above based on the TemplateIdentifier arguments.
Other changes:
* ProgramBuilder has undergone substantial refactoring.
* ProgramBuilder helpers for type inferencing is now more explicit.
Instead of passing 'nullptr', a new 'Infer' template argument is
passed.
* ast::CheckIdentifier() is used for more tests that check identifiers,
including types.
Bug: tint:1810
Change-Id: I8e739ef49435dc1c20a462f3ec5ba265661a7edb
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/118723
Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: James Price <jrprice@google.com>
diff --git a/src/tint/ast/call_expression_test.cc b/src/tint/ast/call_expression_test.cc
index 12b446a..6a6ee29 100644
--- a/src/tint/ast/call_expression_test.cc
+++ b/src/tint/ast/call_expression_test.cc
@@ -21,15 +21,14 @@
using CallExpressionTest = TestHelper;
TEST_F(CallExpressionTest, CreationIdentifier) {
- auto* func = Ident("func");
+ auto* func = Expr("func");
utils::Vector params{
Expr("param1"),
Expr("param2"),
};
auto* stmt = Call(func, params);
- EXPECT_EQ(stmt->target.name, func);
- EXPECT_EQ(stmt->target.type, nullptr);
+ EXPECT_EQ(stmt->target, func);
const auto& vec = stmt->args;
ASSERT_EQ(vec.Length(), 2u);
@@ -38,10 +37,9 @@
}
TEST_F(CallExpressionTest, CreationIdentifier_WithSource) {
- auto* func = Ident("func");
+ auto* func = Expr("func");
auto* stmt = Call(Source{{20, 2}}, func);
- EXPECT_EQ(stmt->target.name, func);
- EXPECT_EQ(stmt->target.type, nullptr);
+ EXPECT_EQ(stmt->target, func);
auto src = stmt->source;
EXPECT_EQ(src.range.begin.line, 20u);
@@ -49,15 +47,14 @@
}
TEST_F(CallExpressionTest, CreationType) {
- auto* type = ty.f32();
+ auto* type = Expr(ty.f32());
utils::Vector params{
Expr("param1"),
Expr("param2"),
};
auto* stmt = Call(type, params);
- EXPECT_EQ(stmt->target.name, nullptr);
- EXPECT_EQ(stmt->target.type, type);
+ EXPECT_EQ(stmt->target, type);
const auto& vec = stmt->args;
ASSERT_EQ(vec.Length(), 2u);
@@ -66,10 +63,9 @@
}
TEST_F(CallExpressionTest, CreationType_WithSource) {
- auto* type = ty.f32();
+ auto* type = Expr(ty.f32());
auto* stmt = Call(Source{{20, 2}}, type);
- EXPECT_EQ(stmt->target.name, nullptr);
- EXPECT_EQ(stmt->target.type, type);
+ EXPECT_EQ(stmt->target, type);
auto src = stmt->source;
EXPECT_EQ(src.range.begin.line, 20u);
@@ -77,7 +73,7 @@
}
TEST_F(CallExpressionTest, IsCall) {
- auto* func = Ident("func");
+ auto* func = Expr("func");
auto* stmt = Call(func);
EXPECT_TRUE(stmt->Is<CallExpression>());
}
@@ -91,15 +87,6 @@
"internal compiler error");
}
-TEST_F(CallExpressionTest, Assert_Null_Type) {
- EXPECT_FATAL_FAILURE(
- {
- ProgramBuilder b;
- b.Call(static_cast<Type*>(nullptr));
- },
- "internal compiler error");
-}
-
TEST_F(CallExpressionTest, Assert_Null_Param) {
EXPECT_FATAL_FAILURE(
{
