diff options
| author | Kevin Yeh <kevinyeah@utexas.edu> | 2015-11-26 13:14:10 -0600 |
|---|---|---|
| committer | Kevin Yeh <kevinyeah@utexas.edu> | 2015-11-26 14:38:45 -0600 |
| commit | b4295b9fb0789b9c354d17457dc60a7ca13119a6 (patch) | |
| tree | 529c1d03904930623c8a66b39fe9c070633ba60c | |
| parent | 2ba44607fe09c4fb98a52ca2149b0c9869a87b4c (diff) | |
| download | rust-b4295b9fb0789b9c354d17457dc60a7ca13119a6.tar.gz rust-b4295b9fb0789b9c354d17457dc60a7ca13119a6.zip | |
Fix spans for macros
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 56a06f70ed4..74b8fdea538 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -3253,7 +3253,7 @@ impl<'a> Parser<'a> { let tts = try!(self.parse_seq_to_end(&token::CloseDelim(delim), seq_sep_none(), |p| p.parse_token_tree())); let mac = Mac_ { path: path, tts: tts, ctxt: EMPTY_CTXT }; - pat = PatMac(codemap::Spanned {node: mac, span: self.span}); + pat = PatMac(codemap::Spanned {node: mac, span: mk_sp(lo, self.span.hi)}); } else { // Parse ident @ pat // This can give false positives and parse nullary enums, @@ -4475,6 +4475,7 @@ impl<'a> Parser<'a> { let last_span = self.last_span; self.complain_if_pub_macro(vis, last_span); + let lo = self.span.lo; let pth = try!(self.parse_path(NoTypesAllowed)); try!(self.expect(&token::Not)); @@ -4485,7 +4486,7 @@ impl<'a> Parser<'a> { |p| p.parse_token_tree())); let m_ = Mac_ { path: pth, tts: tts, ctxt: EMPTY_CTXT }; let m: ast::Mac = codemap::Spanned { node: m_, - span: mk_sp(self.span.lo, + span: mk_sp(lo, self.span.hi) }; if delim != token::Brace { try!(self.expect(&token::Semi)) @@ -5513,6 +5514,8 @@ impl<'a> Parser<'a> { let last_span = self.last_span; self.complain_if_pub_macro(visibility, last_span); + let mac_lo = self.span.lo; + // item macro. let pth = try!(self.parse_path(NoTypesAllowed)); try!(self.expect(&token::Not)); @@ -5533,7 +5536,7 @@ impl<'a> Parser<'a> { // single-variant-enum... : let m = Mac_ { path: pth, tts: tts, ctxt: EMPTY_CTXT }; let m: ast::Mac = codemap::Spanned { node: m, - span: mk_sp(self.span.lo, + span: mk_sp(mac_lo, self.span.hi) }; if delim != token::Brace { |