encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reader/wgsl: Allow constants without initializers 

This is valid when they are overridable constants. The resolver will
validate whether or not this is the case.

Change-Id: Ic6659c58e5046117f64794efec3300b0245a5e91
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/50043
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: James Price <jrprice@google.com>
Auto-Submit: James Price <jrprice@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
This commit is contained in:
James Price 2021-05-06 13:42:03 +00:00 committed by Commit Bot service account
parent 08df57a75c
commit d2be7cea90
4 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -496,7 +496,9 @@ Maybe<ast::Variable*> ParserImpl::global_variable_decl(
} }
// global_constant_decl // global_constant_decl
// : variable_decoration_list* CONST variable_ident_decl EQUAL const_expr // : attribute_list* LET variable_ident_decl global_const_initializer?
// global_const_initializer
// : EQUAL const_expr
Maybe<ast::Variable*> ParserImpl::global_constant_decl( Maybe<ast::Variable*> ParserImpl::global_constant_decl(
ast::DecorationList& decos) { ast::DecorationList& decos) {
if (!match(Token::Type::kLet)) { if (!match(Token::Type::kLet)) {
@ -515,12 +517,13 @@ Maybe<ast::Variable*> ParserImpl::global_constant_decl(
if (decl.errored) if (decl.errored)
return Failure::kErrored; return Failure::kErrored;
if (!expect(use, Token::Type::kEqual)) ast::ConstructorExpression* initializer = nullptr;
return Failure::kErrored; if (match(Token::Type::kEqual)) {
auto init = expect_const_expr();
auto init = expect_const_expr(); if (init.errored)
if (init.errored) return Failure::kErrored;
return Failure::kErrored; initializer = std::move(init.value);
}
return create<ast::Variable>( return create<ast::Variable>(
decl->source, // source decl->source, // source
@ -528,7 +531,7 @@ Maybe<ast::Variable*> ParserImpl::global_constant_decl(
ast::StorageClass::kNone, // storage_class ast::StorageClass::kNone, // storage_class
decl->type, // type decl->type, // type
true, // is_const true, // is_const
init.value, // constructor initializer, // constructor
std::move(decos)); // decorations std::move(decos)); // decorations
} }

7
src/reader/wgsl/parser_impl_error_msg_test.cc
View File

@ -508,13 +508,6 @@ TEST_F(ParserImplErrorTest, GlobalDeclConstMissingRParen) {
" ^\n"); " ^\n");
} }
TEST_F(ParserImplErrorTest, GlobalDeclConstMissingAssignment) {
EXPECT("let i : vec2<i32>;",
"test.wgsl:1:18 error: expected '=' for let declaration\n"
"let i : vec2<i32>;\n"
" ^\n");
}
TEST_F(ParserImplErrorTest, GlobalDeclConstBadConstLiteral) { TEST_F(ParserImplErrorTest, GlobalDeclConstBadConstLiteral) {
EXPECT("let i : vec2<i32> = vec2<i32>(!);", EXPECT("let i : vec2<i32> = vec2<i32>(!);",
"test.wgsl:1:31 error: unable to parse constant literal\n" "test.wgsl:1:31 error: unable to parse constant literal\n"

13
src/reader/wgsl/parser_impl_global_constant_decl_test.cc
View File

@ -48,19 +48,6 @@ TEST_F(ParserImplTest, GlobalConstantDecl) {
ast::HasDecoration<ast::OverrideDecoration>(e.value->decorations())); ast::HasDecoration<ast::OverrideDecoration>(e.value->decorations()));
} }
TEST_F(ParserImplTest, GlobalConstantDecl_MissingEqual) {
auto p = parser("let a : f32 1.");
auto decos = p->decoration_list();
EXPECT_FALSE(decos.errored);
EXPECT_FALSE(decos.matched);
auto e = p->global_constant_decl(decos.value);
EXPECT_TRUE(p->has_error());
EXPECT_TRUE(e.errored);
EXPECT_FALSE(e.matched);
EXPECT_EQ(e.value, nullptr);
EXPECT_EQ(p->error(), "1:13: expected '=' for let declaration");
}
TEST_F(ParserImplTest, GlobalConstantDecl_InvalidVariable) { TEST_F(ParserImplTest, GlobalConstantDecl_InvalidVariable) {
auto p = parser("let a : invalid = 1."); auto p = parser("let a : invalid = 1.");
auto decos = p->decoration_list(); auto decos = p->decoration_list();

4
src/reader/wgsl/parser_impl_global_decl_test.cc
View File

@ -64,10 +64,10 @@ TEST_F(ParserImplTest, GlobalDecl_GlobalConstant) {
} }
TEST_F(ParserImplTest, GlobalDecl_GlobalConstant_Invalid) { TEST_F(ParserImplTest, GlobalDecl_GlobalConstant_Invalid) {
auto p = parser("let a : vec2<i32>;"); auto p = parser("let a : vec2<i32> 1.0;");
p->expect_global_decl(); p->expect_global_decl();
ASSERT_TRUE(p->has_error()); ASSERT_TRUE(p->has_error());
EXPECT_EQ(p->error(), "1:18: expected '=' for let declaration"); EXPECT_EQ(p->error(), "1:19: expected ';' for let declaration");
} }
TEST_F(ParserImplTest, GlobalDecl_GlobalConstant_MissingSemicolon) { TEST_F(ParserImplTest, GlobalDecl_GlobalConstant_MissingSemicolon) {