encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-11 22:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

validator: Migrate to using diagnostics

Browse Source 
Unlike error strings, diagnostics can:
* Describe more than one error
* Be printed with colors
* Highlight (`^^^`) the particular error on the line
* Can have separate severities

Change-Id: I4ead391ffbe190e55f79c5f23536a4524768478d
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/33820
Commit-Queue: David Neto <dneto@google.com>
Reviewed-by: David Neto <dneto@google.com>
This commit is contained in:
Ben Clayton
2020-11-26 16:50:02 +00:00
committed by Commit Bot service account
parent b7b6a3f3f4
commit ba06db6e00
6 changed files with 67 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/validator/validator_impl.h
View File

@@ -27,6 +27,8 @@
#include "src/ast/return_statement.h"
#include "src/ast/statement.h"
#include "src/ast/variable.h"
#include "src/diagnostic/diagnostic.h"
#include "src/diagnostic/formatter.h"
#include "src/scope_stack.h"
namespace tint {
@@ -43,16 +45,24 @@ class ValidatorImpl {
/// @returns true if the validation was successful
bool Validate(const ast::Module* module);
/// @returns the diagnostic messages
const diag::List& diagnostics() const { return diags_; }
/// @returns the diagnostic messages
diag::List& diagnostics() { return diags_; }
/// @returns error messages from the validator
const std::string& error() { return error_; }
std::string error() {
diag::Formatter formatter{{false, false, false}};
return formatter.format(diags_);
}
/// @returns true if an error was encountered
bool has_error() const { return error_.size() > 0; }
bool has_error() const { return diags_.contains_errors(); }
/// Sets the error string
/// Appends an error at @p src with the message @p msg
/// @param src the source causing the error
/// @param msg the error message
void set_error(const Source& src, const std::string& msg);
void add_error(const Source& src, const std::string& msg);
/// Validate global variables
/// @param global_vars list of global variables to check
/// @returns true if the validation was successful
@@ -126,7 +136,7 @@ class ValidatorImpl {
const std::vector<ast::type::Type*>& constructed_types);
private:
std::string error_;
diag::List diags_;
ScopeStack<ast::Variable*> variable_stack_;
ScopeStack<ast::Function*> function_stack_;
ast::Function* current_function_ = nullptr;