encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-06-26 08:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgsl-reader: Add support for nested array accessors

Browse Source 
Bug: tint:501
Change-Id: I23f4e73696f48d29b3f9d63997fa1c5004cf4d34
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/41622
Reviewed-by: dan sinclair <dsinclair@chromium.org>
Commit-Queue: dan sinclair <dsinclair@chromium.org>
This commit is contained in:
Vasyl Teliman 2021-02-16 14:53:49 +00:00 committed by Commit Bot service account
parent 909c166034
commit 652d40a3d1
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/reader/wgsl/parser_impl.cc
View File

@ -3055,6 +3055,17 @@ bool ParserImpl::expect(const std::string& use, Token::Type tok) {
return true; return true;
} }
// Handle the case when `]` is expected but the actual token is `]]`.
// For example, in `arr1[arr2[0]]`.
if (tok == Token::Type::kBracketRight && t.IsAttrRight()) {
next();
auto source = t.source();
source.range.begin.column++;
token_queue_.push_front({Token::Type::kBracketRight, source});
synchronized_ = true;
return true;
}
std::stringstream err; std::stringstream err;
err << "expected '" << Token::TypeToName(tok) << "'"; err << "expected '" << Token::TypeToName(tok) << "'";
if (!use.empty()) { if (!use.empty()) {

31
src/reader/wgsl/parser_impl_postfix_expression_test.cc
View File

@ -217,6 +217,37 @@ TEST_F(ParserImplTest, PostfixExpression_NonMatch_returnLHS) {
ASSERT_TRUE(e->Is<ast::IdentifierExpression>()); ASSERT_TRUE(e->Is<ast::IdentifierExpression>());
} }
TEST_F(ParserImplTest, PostfixExpression_Array_NestedArrayAccessor) {
auto p = parser("a[b[c]]");
auto e = p->postfix_expression();
EXPECT_TRUE(e.matched);
EXPECT_FALSE(e.errored);
EXPECT_FALSE(p->has_error()) << p->error();
ASSERT_NE(e.value, nullptr);
const auto* outer_accessor = e->As<ast::ArrayAccessorExpression>();
ASSERT_TRUE(outer_accessor);
const auto* outer_array =
outer_accessor->array()->As<ast::IdentifierExpression>();
ASSERT_TRUE(outer_array);
EXPECT_EQ(outer_array->symbol(), p->builder().Symbols().Get("a"));
const auto* inner_accessor =
outer_accessor->idx_expr()->As<ast::ArrayAccessorExpression>();
ASSERT_TRUE(inner_accessor);
const auto* inner_array =
inner_accessor->array()->As<ast::IdentifierExpression>();
ASSERT_TRUE(inner_array);
EXPECT_EQ(inner_array->symbol(), p->builder().Symbols().Get("b"));
const auto* index_expr =
inner_accessor->idx_expr()->As<ast::IdentifierExpression>();
ASSERT_TRUE(index_expr);
EXPECT_EQ(index_expr->symbol(), p->builder().Symbols().Get("c"));
}
} // namespace } // namespace
} // namespace wgsl } // namespace wgsl
} // namespace reader } // namespace reader