encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-08 13:14:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add File & Range information to tint::Source

Browse Source 
This is the first step in improving the error messages produced while parsing.

The `line` and `column` information of `Source` has been moved to `Source::Location`.

`Source::Range` has been added that contains a `Location` interval - allowing error messages to highlight the full region of the error.

The `File` information provides an optional file path, and pre-splits the content into lines. These lines can be used to print the full line containing an error.

This CL contains a few temporary changes that help split up this work, and to ease integration with Tint.

Bug: tint:282
Change-Id: I7aa501b0a9631f286e8e93fd7396bdbe38175727
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/31420
Reviewed-by: dan sinclair <dsinclair@chromium.org>
Reviewed-by: David Neto <dneto@google.com>
Commit-Queue: David Neto <dneto@google.com>
This commit is contained in:
Ben Clayton
2020-10-30 20:44:53 +00:00
committed by Commit Bot service account
parent 17e0deaeba
commit 5bee67fced
47 changed files with 372 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
samples/main.cc
View File

@@ -421,6 +421,7 @@ int main(int argc, const char** argv) {
tint::Context ctx;
std::unique_ptr<tint::reader::Reader> reader;
std::unique_ptr<tint::Source::File> source_file;
#if TINT_BUILD_WGSL_READER
if (options.input_filename.size() > 5 &&
options.input_filename.substr(options.input_filename.size() - 5) ==
@@ -429,8 +430,10 @@ int main(int argc, const char** argv) {
if (!ReadFile<uint8_t>(options.input_filename, &data)) {
return 1;
}
reader = std::make_unique<tint::reader::wgsl::Parser>(
&ctx, std::string(data.begin(), data.end()));
source_file = std::make_unique<tint::Source::File>(
options.input_filename, std::string(data.begin(), data.end()));
reader =
std::make_unique<tint::reader::wgsl::Parser>(&ctx, source_file.get());
}
#endif // TINT_BUILD_WGSL_READER