encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-16 08:27:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ast: Remove StructMember constructor that doesn't take a Source

Browse Source 
Parsers need fixing up.

Bug: tint:396
Bug: tint:390
Change-Id: Ie9f8f7428d2308c3b1a9a8d2137e2e3c6d1d13e2
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/35162
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: dan sinclair <dsinclair@chromium.org>
This commit is contained in:
Ben Clayton
2020-12-12 12:18:04 +00:00
committed by Commit Bot service account
parent bbefff63a3
commit 4543d1a232
33 changed files with 275 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ast/struct_member.cc
View File

@@ -23,11 +23,6 @@ TINT_INSTANTIATE_CLASS_ID(tint::ast::StructMember);
namespace tint {
namespace ast {
StructMember::StructMember(const std::string& name,
type::Type* type,
StructMemberDecorationList decorations)
: Base(), name_(name), type_(type), decorations_(std::move(decorations)) {}
StructMember::StructMember(const Source& source,
const std::string& name,
type::Type* type,

7
src/ast/struct_member.h
View File

@@ -32,13 +32,6 @@ namespace ast {
class StructMember : public Castable<StructMember, Node> {
public:
/// Create a new struct member statement
/// @param name The struct member name
/// @param type The struct member type
/// @param decorations The struct member decorations
StructMember(const std::string& name,
type::Type* type,
StructMemberDecorationList decorations);
/// Create a new struct member statement
/// @param source The input source for the struct member statement
/// @param name The struct member name
/// @param type The struct member type

14
src/ast/struct_member_test.cc
View File

@@ -32,7 +32,7 @@ TEST_F(StructMemberTest, Creation) {
StructMemberDecorationList decorations;
decorations.emplace_back(create<StructMemberOffsetDecoration>(4, Source{}));
StructMember st{"a", &i32, decorations};
StructMember st{Source{}, "a", &i32, decorations};
EXPECT_EQ(st.name(), "a");
EXPECT_EQ(st.type(), &i32);
EXPECT_EQ(st.decorations().size(), 1u);
@@ -59,18 +59,18 @@ TEST_F(StructMemberTest, CreationWithSource) {
TEST_F(StructMemberTest, IsValid) {
type::I32 i32;
StructMember st{"a", &i32, {}};
StructMember st{Source{}, "a", &i32, {}};
EXPECT_TRUE(st.IsValid());
}
TEST_F(StructMemberTest, IsValid_EmptyName) {
type::I32 i32;
StructMember st{"", &i32, {}};
StructMember st{Source{}, "", &i32, {}};
EXPECT_FALSE(st.IsValid());
}
TEST_F(StructMemberTest, IsValid_NullType) {
StructMember st{"a", nullptr, {}};
StructMember st{Source{}, "a", nullptr, {}};
EXPECT_FALSE(st.IsValid());
}
@@ -80,7 +80,7 @@ TEST_F(StructMemberTest, IsValid_Null_Decoration) {
decorations.emplace_back(create<StructMemberOffsetDecoration>(4, Source{}));
decorations.push_back(nullptr);
StructMember st{"a", &i32, decorations};
StructMember st{Source{}, "a", &i32, decorations};
EXPECT_FALSE(st.IsValid());
}
@@ -89,7 +89,7 @@ TEST_F(StructMemberTest, ToStr) {
StructMemberDecorationList decorations;
decorations.emplace_back(create<StructMemberOffsetDecoration>(4, Source{}));
StructMember st{"a", &i32, decorations};
StructMember st{Source{}, "a", &i32, decorations};
std::ostringstream out;
st.to_str(out, 2);
EXPECT_EQ(out.str(), " StructMember{[[ offset 4 ]] a: __i32}\n");
@@ -97,7 +97,7 @@ TEST_F(StructMemberTest, ToStr) {
TEST_F(StructMemberTest, ToStrNoDecorations) {
type::I32 i32;
StructMember st{"a", &i32, {}};
StructMember st{Source{}, "a", &i32, {}};
std::ostringstream out;
st.to_str(out, 2);
EXPECT_EQ(out.str(), " StructMember{a: __i32}\n");

12
src/ast/struct_test.cc
View File

@@ -33,7 +33,7 @@ TEST_F(StructTest, Creation) {
type::I32 i32;
StructMemberList members;
members.push_back(
create<StructMember>("a", &i32, StructMemberDecorationList()));
create<StructMember>(Source{}, "a", &i32, StructMemberDecorationList()));
Struct s{members};
EXPECT_EQ(s.members().size(), 1u);
@@ -49,7 +49,7 @@ TEST_F(StructTest, Creation_WithDecorations) {
StructMemberList members;
members.push_back(
create<StructMember>("a", &i32, StructMemberDecorationList()));
create<StructMember>(Source{}, "a", &i32, StructMemberDecorationList()));
StructDecorationList decos;
decos.push_back(create<StructBlockDecoration>(Source{}));
@@ -69,7 +69,7 @@ TEST_F(StructTest, CreationWithSourceAndDecorations) {
StructMemberList members;
members.emplace_back(
create<StructMember>("a", &i32, StructMemberDecorationList()));
create<StructMember>(Source{}, "a", &i32, StructMemberDecorationList()));
StructDecorationList decos;
decos.push_back(create<StructBlockDecoration>(Source{}));
@@ -96,7 +96,7 @@ TEST_F(StructTest, IsValid_Null_StructMember) {
StructMemberList members;
members.push_back(
create<StructMember>("a", &i32, StructMemberDecorationList()));
create<StructMember>(Source{}, "a", &i32, StructMemberDecorationList()));
members.push_back(nullptr);
Struct s{members};
@@ -108,7 +108,7 @@ TEST_F(StructTest, IsValid_Invalid_StructMember) {
StructMemberList members;
members.push_back(
create<StructMember>("", &i32, StructMemberDecorationList()));
create<StructMember>(Source{}, "", &i32, StructMemberDecorationList()));
Struct s{members};
EXPECT_FALSE(s.IsValid());
@@ -119,7 +119,7 @@ TEST_F(StructTest, ToStr) {
StructMemberList members;
members.emplace_back(
create<StructMember>("a", &i32, StructMemberDecorationList()));
create<StructMember>(Source{}, "a", &i32, StructMemberDecorationList()));
StructDecorationList decos;
decos.push_back(create<StructBlockDecoration>(Source{}));

8
src/ast/type/access_control_type_test.cc
View File

@@ -126,11 +126,11 @@ TEST_F(AccessControlTest, MinBufferBindingSizeStruct) {
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(0, Source{}));
members.push_back(create<StructMember>("foo", &u32, deco));
members.push_back(create<StructMember>(Source{}, "foo", &u32, deco));
deco = StructMemberDecorationList();
deco.push_back(create<StructMemberOffsetDecoration>(4, Source{}));
members.push_back(create<StructMember>("bar", &u32, deco));
members.push_back(create<StructMember>(Source{}, "bar", &u32, deco));
StructDecorationList decos;
@@ -170,12 +170,12 @@ TEST_F(AccessControlTest, BaseAlignmentStruct) {
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(0, Source{}));
members.push_back(create<StructMember>("foo", &u32, deco));
members.push_back(create<StructMember>(Source{}, "foo", &u32, deco));
}
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(4, Source{}));
members.push_back(create<StructMember>("bar", &u32, deco));
members.push_back(create<StructMember>(Source{}, "bar", &u32, deco));
}
StructDecorationList decos;

8
src/ast/type/alias_type_test.cc
View File

@@ -198,12 +198,12 @@ TEST_F(AliasTest, MinBufferBindingSizeStruct) {
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(0, Source{}));
members.push_back(create<StructMember>("foo", &u32, deco));
members.push_back(create<StructMember>(Source{}, "foo", &u32, deco));
}
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(4, Source{}));
members.push_back(create<StructMember>("bar", &u32, deco));
members.push_back(create<StructMember>(Source{}, "bar", &u32, deco));
}
StructDecorationList decos;
@@ -247,12 +247,12 @@ TEST_F(AliasTest, BaseAlignmentStruct) {
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(0, Source{}));
members.push_back(create<StructMember>("foo", &u32, deco));
members.push_back(create<StructMember>(Source{}, "foo", &u32, deco));
}
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(4, Source{}));
members.push_back(create<StructMember>("bar", &u32, deco));
members.push_back(create<StructMember>(Source{}, "bar", &u32, deco));
}
StructDecorationList decos;

44
src/ast/type/struct_type_test.cc
View File

@@ -81,12 +81,12 @@ TEST_F(StructTest, MinBufferBindingSize) {
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(0, Source{}));
members.push_back(create<StructMember>("foo", &u32, deco));
members.push_back(create<StructMember>(Source{}, "foo", &u32, deco));
}
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(4, Source{}));
members.push_back(create<StructMember>("bar", &u32, deco));
members.push_back(create<StructMember>(Source{}, "bar", &u32, deco));
}
StructDecorationList decos;
@@ -106,17 +106,17 @@ TEST_F(StructTest, MinBufferBindingSizeArray) {
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(0, Source{}));
members.push_back(create<StructMember>("foo", &u32, deco));
members.push_back(create<StructMember>(Source{}, "foo", &u32, deco));
}
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(4, Source{}));
members.push_back(create<StructMember>("bar", &u32, deco));
members.push_back(create<StructMember>(Source{}, "bar", &u32, deco));
}
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(8, Source{}));
members.push_back(create<StructMember>("bar", &arr, deco));
members.push_back(create<StructMember>(Source{}, "bar", &arr, deco));
}
StructDecorationList decos;
@@ -137,17 +137,17 @@ TEST_F(StructTest, MinBufferBindingSizeRuntimeArray) {
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(0, Source{}));
members.push_back(create<StructMember>("foo", &u32, deco));
members.push_back(create<StructMember>(Source{}, "foo", &u32, deco));
}
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(4, Source{}));
members.push_back(create<StructMember>("bar", &u32, deco));
members.push_back(create<StructMember>(Source{}, "bar", &u32, deco));
}
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(8, Source{}));
members.push_back(create<StructMember>("bar", &u32, deco));
members.push_back(create<StructMember>(Source{}, "bar", &u32, deco));
}
StructDecorationList decos;
@@ -165,7 +165,7 @@ TEST_F(StructTest, MinBufferBindingSizeVec2) {
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(0, Source{}));
members.push_back(create<StructMember>("foo", &vec2, deco));
members.push_back(create<StructMember>(Source{}, "foo", &vec2, deco));
}
StructDecorationList decos;
@@ -184,7 +184,7 @@ TEST_F(StructTest, MinBufferBindingSizeVec3) {
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(0, Source{}));
members.push_back(create<StructMember>("foo", &vec3, deco));
members.push_back(create<StructMember>(Source{}, "foo", &vec3, deco));
}
StructDecorationList decos;
@@ -204,7 +204,7 @@ TEST_F(StructTest, MinBufferBindingSizeVec4) {
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(0, Source{}));
members.push_back(create<StructMember>("foo", &vec4, deco));
members.push_back(create<StructMember>(Source{}, "foo", &vec4, deco));
}
StructDecorationList decos;
@@ -223,12 +223,12 @@ TEST_F(StructTest, BaseAlignment) {
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(0, Source{}));
members.push_back(create<StructMember>("foo", &u32, deco));
members.push_back(create<StructMember>(Source{}, "foo", &u32, deco));
}
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(4, Source{}));
members.push_back(create<StructMember>("bar", &u32, deco));
members.push_back(create<StructMember>(Source{}, "bar", &u32, deco));
}
StructDecorationList decos;
@@ -247,17 +247,17 @@ TEST_F(StructTest, BaseAlignmentArray) {
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(0, Source{}));
members.push_back(create<StructMember>("foo", &u32, deco));
members.push_back(create<StructMember>(Source{}, "foo", &u32, deco));
}
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(4, Source{}));
members.push_back(create<StructMember>("bar", &u32, deco));
members.push_back(create<StructMember>(Source{}, "bar", &u32, deco));
}
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(8, Source{}));
members.push_back(create<StructMember>("bar", &arr, deco));
members.push_back(create<StructMember>(Source{}, "bar", &arr, deco));
}
StructDecorationList decos;
@@ -276,17 +276,17 @@ TEST_F(StructTest, BaseAlignmentRuntimeArray) {
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(0, Source{}));
members.push_back(create<StructMember>("foo", &u32, deco));
members.push_back(create<StructMember>(Source{}, "foo", &u32, deco));
}
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(4, Source{}));
members.push_back(create<StructMember>("bar", &u32, deco));
members.push_back(create<StructMember>(Source{}, "bar", &u32, deco));
}
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(8, Source{}));
members.push_back(create<StructMember>("bar", &u32, deco));
members.push_back(create<StructMember>(Source{}, "bar", &u32, deco));
}
StructDecorationList decos;
@@ -303,7 +303,7 @@ TEST_F(StructTest, BaseAlignmentVec2) {
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(0, Source{}));
members.push_back(create<StructMember>("foo", &vec2, deco));
members.push_back(create<StructMember>(Source{}, "foo", &vec2, deco));
}
StructDecorationList decos;
@@ -321,7 +321,7 @@ TEST_F(StructTest, BaseAlignmentVec3) {
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(0, Source{}));
members.push_back(create<StructMember>("foo", &vec3, deco));
members.push_back(create<StructMember>(Source{}, "foo", &vec3, deco));
}
StructDecorationList decos;
@@ -339,7 +339,7 @@ TEST_F(StructTest, BaseAlignmentVec4) {
{
StructMemberDecorationList deco;
deco.push_back(create<StructMemberOffsetDecoration>(0, Source{}));
members.push_back(create<StructMember>("foo", &vec4, deco));
members.push_back(create<StructMember>(Source{}, "foo", &vec4, deco));
}
StructDecorationList decos;