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

wsgl parser: Add optional Source* out params 

... to match() and expect_ident().

The uses of these two functions frequently want to know the souce of the matched token.

Bug: tint:282
Change-Id: I5279fc2e0834f48d419c6d8c9888189f6212c44a
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/31732
Commit-Queue: dan sinclair <dsinclair@chromium.org>
Reviewed-by: dan sinclair <dsinclair@chromium.org>
This commit is contained in:
Ben Clayton 2020-11-04 18:39:41 +00:00 committed by Commit Bot service account
parent 0371cc4a8d
commit 4ce7a93202
2 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -457,10 +457,8 @@ std::unique_ptr<ast::VariableDecoration> ParserImpl::variable_decoration() {
if (!expect("builtin decoration", Token::Type::kParenLeft)) if (!expect("builtin decoration", Token::Type::kParenLeft))
return nullptr; return nullptr;
source = peek().source();
std::string ident; std::string ident;
if (!expect_ident("builtin", &ident)) if (!expect_ident("builtin", &ident, &source))
return nullptr; return nullptr;
ast::Builtin builtin = ident_to_builtin(ident); ast::Builtin builtin = ident_to_builtin(ident);
@ -1280,9 +1278,8 @@ bool ParserImpl::array_decoration_list(ast::ArrayDecorationList& decos) {
next(); // consume the peek of [[ next(); // consume the peek of [[
for (;;) { for (;;) {
auto source = peek().source(); Source source;
if (!match(Token::Type::kStride, &source)) {
if (!match(Token::Type::kStride)) {
add_error(source, "unknown array decoration"); add_error(source, "unknown array decoration");
return false; return false;
} }
@ -1596,9 +1593,8 @@ bool ParserImpl::struct_member_decoration_decl(
// : OFFSET PAREN_LEFT INT_LITERAL PAREN_RIGHT // : OFFSET PAREN_LEFT INT_LITERAL PAREN_RIGHT
std::unique_ptr<ast::StructMemberDecoration> std::unique_ptr<ast::StructMemberDecoration>
ParserImpl::struct_member_decoration() { ParserImpl::struct_member_decoration() {
auto source = peek().source(); Source source;
if (!match(Token::Type::kOffset, &source))
if (!match(Token::Type::kOffset))
return nullptr; return nullptr;
const char* use = "offset decoration"; const char* use = "offset decoration";
@ -1779,9 +1775,8 @@ ast::type::Type* ParserImpl::function_type_decl() {
// function_header // function_header
// : FN IDENT PAREN_LEFT param_list PAREN_RIGHT ARROW function_type_decl // : FN IDENT PAREN_LEFT param_list PAREN_RIGHT ARROW function_type_decl
std::unique_ptr<ast::Function> ParserImpl::function_header() { std::unique_ptr<ast::Function> ParserImpl::function_header() {
auto source = peek().source(); Source source;
if (!match(Token::Type::kFn, &source))
if (!match(Token::Type::kFn))
return nullptr; return nullptr;
const char* use = "function declaration"; const char* use = "function declaration";
@ -2071,9 +2066,8 @@ std::unique_ptr<ast::Statement> ParserImpl::statement() {
// return_stmt // return_stmt
// : RETURN logical_or_expression? // : RETURN logical_or_expression?
std::unique_ptr<ast::ReturnStatement> ParserImpl::return_stmt() { std::unique_ptr<ast::ReturnStatement> ParserImpl::return_stmt() {
auto source = peek().source(); Source source;
if (!match(Token::Type::kReturn, &source))
if (!match(Token::Type::kReturn))
return nullptr; return nullptr;
std::unique_ptr<ast::Expression> expr = nullptr; std::unique_ptr<ast::Expression> expr = nullptr;
@ -2149,9 +2143,8 @@ std::unique_ptr<ast::VariableDeclStatement> ParserImpl::variable_stmt() {
// if_stmt // if_stmt
// : IF paren_rhs_stmt body_stmt elseif_stmt? else_stmt? // : IF paren_rhs_stmt body_stmt elseif_stmt? else_stmt?
std::unique_ptr<ast::IfStatement> ParserImpl::if_stmt() { std::unique_ptr<ast::IfStatement> ParserImpl::if_stmt() {
auto source = peek().source(); Source source;
if (!match(Token::Type::kIf, &source))
if (!match(Token::Type::kIf))
return nullptr; return nullptr;
auto condition = paren_rhs_stmt(); auto condition = paren_rhs_stmt();
@ -2239,9 +2232,8 @@ std::unique_ptr<ast::ElseStatement> ParserImpl::else_stmt() {
// switch_stmt // switch_stmt
// : SWITCH paren_rhs_stmt BRACKET_LEFT switch_body+ BRACKET_RIGHT // : SWITCH paren_rhs_stmt BRACKET_LEFT switch_body+ BRACKET_RIGHT
std::unique_ptr<ast::SwitchStatement> ParserImpl::switch_stmt() { std::unique_ptr<ast::SwitchStatement> ParserImpl::switch_stmt() {
auto source = peek().source(); Source source;
if (!match(Token::Type::kSwitch, &source))
if (!match(Token::Type::kSwitch))
return nullptr; return nullptr;
auto condition = paren_rhs_stmt(); auto condition = paren_rhs_stmt();
@ -2387,9 +2379,8 @@ std::unique_ptr<ast::BlockStatement> ParserImpl::case_body() {
// loop_stmt // loop_stmt
// : LOOP BRACKET_LEFT statements continuing_stmt? BRACKET_RIGHT // : LOOP BRACKET_LEFT statements continuing_stmt? BRACKET_RIGHT
std::unique_ptr<ast::LoopStatement> ParserImpl::loop_stmt() { std::unique_ptr<ast::LoopStatement> ParserImpl::loop_stmt() {
auto source = peek().source(); Source source;
if (!match(Token::Type::kLoop, &source))
if (!match(Token::Type::kLoop))
return nullptr; return nullptr;
auto t = next(); auto t = next();
@ -2483,9 +2474,8 @@ std::unique_ptr<ForHeader> ParserImpl::for_header() {
// for_statement // for_statement
// : FOR PAREN_LEFT for_header PAREN_RIGHT BRACE_LEFT statements BRACE_RIGHT // : FOR PAREN_LEFT for_header PAREN_RIGHT BRACE_LEFT statements BRACE_RIGHT
std::unique_ptr<ast::Statement> ParserImpl::for_stmt() { std::unique_ptr<ast::Statement> ParserImpl::for_stmt() {
auto source = peek().source(); Source source;
if (!match(Token::Type::kFor, &source))
if (!match(Token::Type::kFor))
return nullptr; return nullptr;
if (!expect("for loop", Token::Type::kParenLeft)) if (!expect("for loop", Token::Type::kParenLeft))
@ -2591,9 +2581,8 @@ std::unique_ptr<ast::CallStatement> ParserImpl::func_call_stmt() {
// break_stmt // break_stmt
// : BREAK // : BREAK
std::unique_ptr<ast::BreakStatement> ParserImpl::break_stmt() { std::unique_ptr<ast::BreakStatement> ParserImpl::break_stmt() {
auto source = peek().source(); Source source;
if (!match(Token::Type::kBreak, &source))
if (!match(Token::Type::kBreak))
return nullptr; return nullptr;
return std::make_unique<ast::BreakStatement>(source); return std::make_unique<ast::BreakStatement>(source);
@ -2602,9 +2591,8 @@ std::unique_ptr<ast::BreakStatement> ParserImpl::break_stmt() {
// continue_stmt // continue_stmt
// : CONTINUE // : CONTINUE
std::unique_ptr<ast::ContinueStatement> ParserImpl::continue_stmt() { std::unique_ptr<ast::ContinueStatement> ParserImpl::continue_stmt() {
auto source = peek().source(); Source source;
if (!match(Token::Type::kContinue, &source))
if (!match(Token::Type::kContinue))
return nullptr; return nullptr;
return std::make_unique<ast::ContinueStatement>(source); return std::make_unique<ast::ContinueStatement>(source);
@ -2760,10 +2748,8 @@ std::unique_ptr<ast::Expression> ParserImpl::postfix_expr(
} else if (t.IsPeriod()) { } else if (t.IsPeriod()) {
next(); // Consume the peek next(); // Consume the peek
source = peek().source();
std::string ident; std::string ident;
if (!expect_ident("member accessor", &ident)) if (!expect_ident("member accessor", &ident, &source))
return nullptr; return nullptr;
expr = std::make_unique<ast::MemberAccessorExpression>( expr = std::make_unique<ast::MemberAccessorExpression>(
@ -3402,8 +3388,12 @@ std::unique_ptr<ast::ConstructorExpression> ParserImpl::const_expr_internal(
std::move(lit)); std::move(lit));
} }
bool ParserImpl::match(Token::Type tok) { bool ParserImpl::match(Token::Type tok, Source* source /*= nullptr*/) {
auto t = peek(); auto t = peek();
if (source != nullptr)
*source = t.source();
if (t.Is(tok)) { if (t.Is(tok)) {
next(); next();
return true; return true;
@ -3464,12 +3454,19 @@ bool ParserImpl::expect_nonzero_positive_sint(const std::string& use,
return true; return true;
} }
bool ParserImpl::expect_ident(const std::string& use, std::string* out) { bool ParserImpl::expect_ident(const std::string& use,
std::string* out,
Source* source /* = nullptr */) {
auto t = next(); auto t = next();
if (source != nullptr)
*source = t.source();
if (!t.IsIdentifier()) { if (!t.IsIdentifier()) {
add_error(t, "expected identifier", use); add_error(t, "expected identifier", use);
return false; return false;
} }
*out = t.to_str(); *out = t.to_str();
return true; return true;
} }

10
src/reader/wgsl/parser_impl.h
View File

@ -429,7 +429,9 @@ class ParserImpl {
private: private:
/// @returns true and consumes the next token if it equals |tok|. /// @returns true and consumes the next token if it equals |tok|.
bool match(Token::Type tok); /// @param source if not nullptr, the next token's source is written to this
/// pointer, regardless of success or error
bool match(Token::Type tok, Source* source = nullptr);
/// Errors if the next token is not equal to |tok|. /// Errors if the next token is not equal to |tok|.
/// Always consumes the next token. /// Always consumes the next token.
/// @param use a description of what was being parsed if an error was raised. /// @param use a description of what was being parsed if an error was raised.
@ -461,8 +463,12 @@ class ParserImpl {
/// Always consumes the next token. /// Always consumes the next token.
/// @param use a description of what was being parsed if an error was raised /// @param use a description of what was being parsed if an error was raised
/// @param out the pointer to write the parsed identifier to /// @param out the pointer to write the parsed identifier to
/// @param source if not nullptr, the next token's source is written to this
/// pointer, regardless of success or error
/// @returns true if the identifier was parsed without error /// @returns true if the identifier was parsed without error
bool expect_ident(const std::string& use, std::string* out); bool expect_ident(const std::string& use,
std::string* out,
Source* source = nullptr);
ast::type::Type* type_decl_pointer(Token t); ast::type::Type* type_decl_pointer(Token t);
ast::type::Type* type_decl_vector(Token t); ast::type::Type* type_decl_vector(Token t);