reader/wgsl: Remove ParserImpl::diagnostics()
Put all errors straight into the ProgramBuilder::Diagnostics()
Fixes a TODO. Kills an assert().
Bug: chromium:1185569
Change-Id: I4e6f3b06106c3cfe75cf2bcdfc56b14ad73e81d9
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/44046
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: James Price <jrprice@google.com>
diff --git a/src/reader/wgsl/parser.cc b/src/reader/wgsl/parser.cc
index 04728ed..fee6e1d 100644
--- a/src/reader/wgsl/parser.cc
+++ b/src/reader/wgsl/parser.cc
@@ -25,11 +25,7 @@
Program Parse(Source::File const* file) {
ParserImpl parser(file);
parser.Parse();
- ProgramBuilder builder = std::move(parser.builder());
- // TODO(bclayton): Remove ParserImpl::diagnostics() and put all diagnostic
- // into the builder.
- builder.Diagnostics().add(parser.diagnostics());
- return Program(std::move(builder));
+ return Program(std::move(parser.builder()));
}
} // namespace wgsl
diff --git a/src/reader/wgsl/parser_impl.cc b/src/reader/wgsl/parser_impl.cc
index 80d4770..fee71da 100644
--- a/src/reader/wgsl/parser_impl.cc
+++ b/src/reader/wgsl/parser_impl.cc
@@ -241,7 +241,7 @@
ParserImpl::Failure::Errored ParserImpl::add_error(const Source& source,
const std::string& err) {
if (silence_errors_ == 0) {
- diags_.add_error(err, source);
+ builder_.Diagnostics().add_error(err, source);
}
return Failure::kErrored;
}
@@ -293,14 +293,12 @@
break;
}
expect_global_decl();
- if (diags_.error_count() >= max_errors_) {
+ if (builder_.Diagnostics().error_count() >= max_errors_) {
add_error(Source{{}, p.source().file_path},
"stopping after " + std::to_string(max_errors_) + " errors");
break;
}
}
-
- assert(builder_.IsValid());
}
// global_decl
diff --git a/src/reader/wgsl/parser_impl.h b/src/reader/wgsl/parser_impl.h
index 2573a0c..e6008a1 100644
--- a/src/reader/wgsl/parser_impl.h
+++ b/src/reader/wgsl/parser_impl.h
@@ -293,20 +293,14 @@
size_t get_max_errors() const { return max_errors_; }
/// @returns true if an error was encountered.
- bool has_error() const { return diags_.contains_errors(); }
+ bool has_error() const { return builder_.Diagnostics().contains_errors(); }
/// @returns the parser error string
std::string error() const {
diag::Formatter formatter{{false, false, false, false}};
- return formatter.format(diags_);
+ return formatter.format(builder_.Diagnostics());
}
- /// @returns the diagnostic messages
- const diag::List& diagnostics() const { return diags_; }
-
- /// @returns the diagnostic messages
- diag::List& diagnostics() { return diags_; }
-
/// @returns the Program. The program builder in the parser will be reset
/// after this.
Program program() { return Program(std::move(builder_)); }
@@ -827,7 +821,6 @@
return builder_.create<T>(std::forward<ARGS>(args)...);
}
- diag::List diags_;
std::unique_ptr<Lexer> lexer_;
std::deque<Token> token_queue_;
bool synchronized_ = true;
diff --git a/src/reader/wgsl/parser_impl_error_msg_test.cc b/src/reader/wgsl/parser_impl_error_msg_test.cc
index 1497c8c..e5ffb30 100644
--- a/src/reader/wgsl/parser_impl_error_msg_test.cc
+++ b/src/reader/wgsl/parser_impl_error_msg_test.cc
@@ -27,16 +27,16 @@
class ParserImplErrorTest : public ParserImplTest {};
-#define EXPECT(SOURCE, EXPECTED) \
- do { \
- std::string source = SOURCE; \
- std::string expected = EXPECTED; \
- auto p = parser(source); \
- p->set_max_errors(5); \
- EXPECT_EQ(false, p->Parse()); \
- EXPECT_EQ(true, p->diagnostics().contains_errors()); \
- EXPECT_EQ(expected, \
- diag::Formatter(formatter_style).format(p->diagnostics())); \
+#define EXPECT(SOURCE, EXPECTED) \
+ do { \
+ std::string source = SOURCE; \
+ std::string expected = EXPECTED; \
+ auto p = parser(source); \
+ p->set_max_errors(5); \
+ EXPECT_EQ(false, p->Parse()); \
+ auto diagnostics = p->builder().Diagnostics(); \
+ EXPECT_EQ(true, diagnostics.contains_errors()); \
+ EXPECT_EQ(expected, diag::Formatter(formatter_style).format(diagnostics)); \
} while (false)
TEST_F(ParserImplErrorTest, AdditiveInvalidExpr) {
diff --git a/src/reader/wgsl/parser_impl_error_resync_test.cc b/src/reader/wgsl/parser_impl_error_resync_test.cc
index be671af..010b545 100644
--- a/src/reader/wgsl/parser_impl_error_resync_test.cc
+++ b/src/reader/wgsl/parser_impl_error_resync_test.cc
@@ -27,15 +27,15 @@
class ParserImplErrorResyncTest : public ParserImplTest {};
-#define EXPECT(SOURCE, EXPECTED) \
- do { \
- std::string source = SOURCE; \
- std::string expected = EXPECTED; \
- auto p = parser(source); \
- EXPECT_EQ(false, p->Parse()); \
- EXPECT_EQ(true, p->diagnostics().contains_errors()); \
- EXPECT_EQ(expected, \
- diag::Formatter(formatter_style).format(p->diagnostics())); \
+#define EXPECT(SOURCE, EXPECTED) \
+ do { \
+ std::string source = SOURCE; \
+ std::string expected = EXPECTED; \
+ auto p = parser(source); \
+ EXPECT_EQ(false, p->Parse()); \
+ auto diagnostics = p->builder().Diagnostics(); \
+ EXPECT_EQ(true, diagnostics.contains_errors()); \
+ EXPECT_EQ(expected, diag::Formatter(formatter_style).format(diagnostics)); \
} while (false)
TEST_F(ParserImplErrorResyncTest, BadFunctionDecls) {
