diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-02-17 09:22:03 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-17 09:22:03 +0000 |
commit | 6a6c21709314e72f2edb5539913a4b7ce7a1cb66 (patch) | |
tree | af8bdb51ac35038c8d6804e5ce0921981a80de94 /gcc/rust/parse/rust-parse-impl.h | |
parent | d81ba63f4829c12b89e87564c398e95879c89db1 (diff) | |
parent | c1e72db48a0fa36966f2517cbf45fa2b758af268 (diff) | |
download | gcc-6a6c21709314e72f2edb5539913a4b7ce7a1cb66.zip gcc-6a6c21709314e72f2edb5539913a4b7ce7a1cb66.tar.gz gcc-6a6c21709314e72f2edb5539913a4b7ce7a1cb66.tar.bz2 |
Merge #932
932: Add location information to MacroRule r=CohenArthur a=CohenArthur
Closes #930
This PR adds location information to the `MacroRule` structure.
The location is from the beginning of the invokation pattern, so that errors look like so:
```rust
test.rs:2:5: error: ...
2 | ($a:expr, $b:expr) => { a + b }
| ^
```
Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>
Diffstat (limited to 'gcc/rust/parse/rust-parse-impl.h')
-rw-r--r-- | gcc/rust/parse/rust-parse-impl.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h index ef0ad40..7483818 100644 --- a/gcc/rust/parse/rust-parse-impl.h +++ b/gcc/rust/parse/rust-parse-impl.h @@ -1678,23 +1678,25 @@ template <typename ManagedTokenSource> AST::MacroRule Parser<ManagedTokenSource>::parse_macro_rule () { + Location locus = lexer.peek_token ()->get_locus (); + // parse macro matcher AST::MacroMatcher matcher = parse_macro_matcher (); if (matcher.is_error ()) - return AST::MacroRule::create_error (); + return AST::MacroRule::create_error (locus); if (!skip_token (MATCH_ARROW)) { // skip after somewhere? - return AST::MacroRule::create_error (); + return AST::MacroRule::create_error (locus); } // parse transcriber (this is just a delim token tree) Location token_tree_loc = lexer.peek_token ()->get_locus (); AST::MacroTranscriber transcriber (parse_delim_token_tree (), token_tree_loc); - return AST::MacroRule (std::move (matcher), std::move (transcriber)); + return AST::MacroRule (std::move (matcher), std::move (transcriber), locus); } // Parses a macro matcher (part of a macro rule definition). |