2014-02-04 22:31:33 -06:00
|
|
|
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
|
|
|
|
// file at the top-level directory of this distribution and at
|
|
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
|
|
// option. This file may not be copied, modified, or distributed
|
|
|
|
// except according to those terms.
|
|
|
|
|
2014-11-15 19:30:33 -06:00
|
|
|
use rustc::session::Session;
|
2014-02-04 22:31:33 -06:00
|
|
|
|
2014-11-15 19:30:33 -06:00
|
|
|
use save::generated_code;
|
2014-02-04 22:31:33 -06:00
|
|
|
|
|
|
|
use std::cell::Cell;
|
|
|
|
|
|
|
|
use syntax::ast;
|
|
|
|
use syntax::codemap::*;
|
|
|
|
use syntax::parse::lexer;
|
|
|
|
use syntax::parse::lexer::{Reader,StringReader};
|
|
|
|
use syntax::parse::token;
|
2014-10-27 07:33:30 -05:00
|
|
|
use syntax::parse::token::{keywords, Token};
|
2014-02-04 22:31:33 -06:00
|
|
|
|
librustc: Make `Copy` opt-in.
This change makes the compiler no longer infer whether types (structures
and enumerations) implement the `Copy` trait (and thus are implicitly
copyable). Rather, you must implement `Copy` yourself via `impl Copy for
MyType {}`.
A new warning has been added, `missing_copy_implementations`, to warn
you if a non-generic public type has been added that could have
implemented `Copy` but didn't.
For convenience, you may *temporarily* opt out of this behavior by using
`#![feature(opt_out_copy)]`. Note though that this feature gate will never be
accepted and will be removed by the time that 1.0 is released, so you should
transition your code away from using it.
This breaks code like:
#[deriving(Show)]
struct Point2D {
x: int,
y: int,
}
fn main() {
let mypoint = Point2D {
x: 1,
y: 1,
};
let otherpoint = mypoint;
println!("{}{}", mypoint, otherpoint);
}
Change this code to:
#[deriving(Show)]
struct Point2D {
x: int,
y: int,
}
impl Copy for Point2D {}
fn main() {
let mypoint = Point2D {
x: 1,
y: 1,
};
let otherpoint = mypoint;
println!("{}{}", mypoint, otherpoint);
}
This is the backwards-incompatible part of #13231.
Part of RFC #3.
[breaking-change]
2014-12-05 19:01:33 -06:00
|
|
|
#[deriving(Clone)]
|
2014-02-04 22:31:33 -06:00
|
|
|
pub struct SpanUtils<'a> {
|
|
|
|
pub sess: &'a Session,
|
|
|
|
pub err_count: Cell<int>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> SpanUtils<'a> {
|
|
|
|
// Standard string for extents/location.
|
|
|
|
pub fn extent_str(&self, span: Span) -> String {
|
|
|
|
let lo_loc = self.sess.codemap().lookup_char_pos(span.lo);
|
|
|
|
let hi_loc = self.sess.codemap().lookup_char_pos(span.hi);
|
2014-11-02 23:30:29 -06:00
|
|
|
let lo_pos = self.sess.codemap().bytepos_to_file_charpos(span.lo);
|
|
|
|
let hi_pos = self.sess.codemap().bytepos_to_file_charpos(span.hi);
|
|
|
|
let lo_pos_byte = self.sess.codemap().lookup_byte_offset(span.lo).pos;
|
|
|
|
let hi_pos_byte = self.sess.codemap().lookup_byte_offset(span.hi).pos;
|
|
|
|
|
|
|
|
format!("file_name,{},file_line,{},file_col,{},extent_start,{},extent_start_bytes,{},\
|
|
|
|
file_line_end,{},file_col_end,{},extent_end,{},extent_end_bytes,{}",
|
|
|
|
lo_loc.file.name,
|
|
|
|
lo_loc.line, lo_loc.col.to_uint(), lo_pos.to_uint(), lo_pos_byte.to_uint(),
|
|
|
|
hi_loc.line, hi_loc.col.to_uint(), hi_pos.to_uint(), hi_pos_byte.to_uint())
|
2014-02-04 22:31:33 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
// sub_span starts at span.lo, so we need to adjust the positions etc.
|
|
|
|
// If sub_span is None, we don't need to adjust.
|
|
|
|
pub fn make_sub_span(&self, span: Span, sub_span: Option<Span>) -> Option<Span> {
|
|
|
|
let loc = self.sess.codemap().lookup_char_pos(span.lo);
|
|
|
|
assert!(!generated_code(span),
|
|
|
|
"generated code; we should not be processing this `{}` in {}, line {}",
|
|
|
|
self.snippet(span), loc.file.name, loc.line);
|
|
|
|
|
|
|
|
match sub_span {
|
|
|
|
None => None,
|
|
|
|
Some(sub) => {
|
|
|
|
let FileMapAndBytePos {fm, pos} =
|
|
|
|
self.sess.codemap().lookup_byte_offset(span.lo);
|
|
|
|
let base = pos + fm.start_pos;
|
|
|
|
Some(Span {
|
|
|
|
lo: base + self.sess.codemap().lookup_byte_offset(sub.lo).pos,
|
|
|
|
hi: base + self.sess.codemap().lookup_byte_offset(sub.hi).pos,
|
2014-09-16 14:46:38 -05:00
|
|
|
expn_id: NO_EXPANSION,
|
2014-02-04 22:31:33 -06:00
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn snippet(&self, span: Span) -> String {
|
|
|
|
match self.sess.codemap().span_to_snippet(span) {
|
|
|
|
Some(s) => s,
|
|
|
|
None => String::new(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn retokenise_span(&self, span: Span) -> StringReader<'a> {
|
|
|
|
// sadness - we don't have spans for sub-expressions nor access to the tokens
|
|
|
|
// so in order to get extents for the function name itself (which dxr expects)
|
|
|
|
// we need to re-tokenise the fn definition
|
|
|
|
|
|
|
|
// Note: this is a bit awful - it adds the contents of span to the end of
|
|
|
|
// the codemap as a new filemap. This is mostly OK, but means we should
|
|
|
|
// not iterate over the codemap. Also, any spans over the new filemap
|
|
|
|
// are incompatible with spans over other filemaps.
|
|
|
|
let filemap = self.sess.codemap().new_filemap(String::from_str("<anon-dxr>"),
|
|
|
|
self.snippet(span));
|
|
|
|
let s = self.sess;
|
|
|
|
lexer::StringReader::new(s.diagnostic(), filemap)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Re-parses a path and returns the span for the last identifier in the path
|
|
|
|
pub fn span_for_last_ident(&self, span: Span) -> Option<Span> {
|
|
|
|
let mut result = None;
|
|
|
|
|
|
|
|
let mut toks = self.retokenise_span(span);
|
2014-06-27 14:30:25 -05:00
|
|
|
let mut bracket_count = 0u;
|
2014-02-04 22:31:33 -06:00
|
|
|
loop {
|
2014-11-02 22:52:00 -06:00
|
|
|
let ts = toks.real_token();
|
2014-10-27 03:22:52 -05:00
|
|
|
if ts.tok == token::Eof {
|
2014-02-04 22:31:33 -06:00
|
|
|
return self.make_sub_span(span, result)
|
|
|
|
}
|
|
|
|
if bracket_count == 0 &&
|
2014-10-27 07:33:30 -05:00
|
|
|
(ts.tok.is_ident() || ts.tok.is_keyword(keywords::Self)) {
|
2014-02-04 22:31:33 -06:00
|
|
|
result = Some(ts.sp);
|
|
|
|
}
|
|
|
|
|
|
|
|
bracket_count += match ts.tok {
|
2014-10-27 03:22:52 -05:00
|
|
|
token::Lt => 1,
|
|
|
|
token::Gt => -1,
|
|
|
|
token::BinOp(token::Shr) => -2,
|
2014-02-04 22:31:33 -06:00
|
|
|
_ => 0
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return the span for the first identifier in the path.
|
|
|
|
pub fn span_for_first_ident(&self, span: Span) -> Option<Span> {
|
|
|
|
let mut toks = self.retokenise_span(span);
|
2014-06-27 14:30:25 -05:00
|
|
|
let mut bracket_count = 0u;
|
2014-02-04 22:31:33 -06:00
|
|
|
loop {
|
2014-11-02 22:52:00 -06:00
|
|
|
let ts = toks.real_token();
|
2014-10-27 03:22:52 -05:00
|
|
|
if ts.tok == token::Eof {
|
2014-02-04 22:31:33 -06:00
|
|
|
return None;
|
|
|
|
}
|
|
|
|
if bracket_count == 0 &&
|
2014-10-27 07:33:30 -05:00
|
|
|
(ts.tok.is_ident() || ts.tok.is_keyword(keywords::Self)) {
|
2014-02-04 22:31:33 -06:00
|
|
|
return self.make_sub_span(span, Some(ts.sp));
|
|
|
|
}
|
|
|
|
|
|
|
|
bracket_count += match ts.tok {
|
2014-10-27 03:22:52 -05:00
|
|
|
token::Lt => 1,
|
|
|
|
token::Gt => -1,
|
|
|
|
token::BinOp(token::Shr) => -2,
|
2014-02-04 22:31:33 -06:00
|
|
|
_ => 0
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return the span for the last ident before a `(` or `<` or '::<' and outside any
|
|
|
|
// any brackets, or the last span.
|
|
|
|
pub fn sub_span_for_meth_name(&self, span: Span) -> Option<Span> {
|
|
|
|
let mut toks = self.retokenise_span(span);
|
2014-11-02 22:52:00 -06:00
|
|
|
let mut prev = toks.real_token();
|
2014-02-04 22:31:33 -06:00
|
|
|
let mut result = None;
|
2014-06-27 14:30:25 -05:00
|
|
|
let mut bracket_count = 0u;
|
2014-02-04 22:31:33 -06:00
|
|
|
let mut last_span = None;
|
2014-10-27 03:22:52 -05:00
|
|
|
while prev.tok != token::Eof {
|
2014-02-04 22:31:33 -06:00
|
|
|
last_span = None;
|
2014-11-02 22:52:00 -06:00
|
|
|
let mut next = toks.real_token();
|
2014-02-04 22:31:33 -06:00
|
|
|
|
2014-10-29 05:37:54 -05:00
|
|
|
if (next.tok == token::OpenDelim(token::Paren) ||
|
2014-10-27 03:22:52 -05:00
|
|
|
next.tok == token::Lt) &&
|
2014-02-04 22:31:33 -06:00
|
|
|
bracket_count == 0 &&
|
2014-10-27 07:33:30 -05:00
|
|
|
prev.tok.is_ident() {
|
2014-02-04 22:31:33 -06:00
|
|
|
result = Some(prev.sp);
|
|
|
|
}
|
|
|
|
|
|
|
|
if bracket_count == 0 &&
|
2014-10-27 03:22:52 -05:00
|
|
|
next.tok == token::ModSep {
|
2014-02-04 22:31:33 -06:00
|
|
|
let old = prev;
|
|
|
|
prev = next;
|
2014-11-02 22:52:00 -06:00
|
|
|
next = toks.real_token();
|
2014-10-27 03:22:52 -05:00
|
|
|
if next.tok == token::Lt &&
|
2014-10-27 07:33:30 -05:00
|
|
|
old.tok.is_ident() {
|
2014-02-04 22:31:33 -06:00
|
|
|
result = Some(old.sp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
bracket_count += match prev.tok {
|
2014-10-29 05:37:54 -05:00
|
|
|
token::OpenDelim(token::Paren) | token::Lt => 1,
|
|
|
|
token::CloseDelim(token::Paren) | token::Gt => -1,
|
2014-10-27 03:22:52 -05:00
|
|
|
token::BinOp(token::Shr) => -2,
|
2014-02-04 22:31:33 -06:00
|
|
|
_ => 0
|
|
|
|
};
|
|
|
|
|
2014-10-27 07:33:30 -05:00
|
|
|
if prev.tok.is_ident() && bracket_count == 0 {
|
2014-02-04 22:31:33 -06:00
|
|
|
last_span = Some(prev.sp);
|
|
|
|
}
|
|
|
|
prev = next;
|
|
|
|
}
|
|
|
|
if result.is_none() && last_span.is_some() {
|
|
|
|
return self.make_sub_span(span, last_span);
|
|
|
|
}
|
|
|
|
return self.make_sub_span(span, result);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return the span for the last ident before a `<` and outside any
|
|
|
|
// brackets, or the last span.
|
|
|
|
pub fn sub_span_for_type_name(&self, span: Span) -> Option<Span> {
|
|
|
|
let mut toks = self.retokenise_span(span);
|
2014-11-02 22:52:00 -06:00
|
|
|
let mut prev = toks.real_token();
|
2014-02-04 22:31:33 -06:00
|
|
|
let mut result = None;
|
2014-06-27 14:30:25 -05:00
|
|
|
let mut bracket_count = 0u;
|
2014-02-04 22:31:33 -06:00
|
|
|
loop {
|
2014-11-02 22:52:00 -06:00
|
|
|
let next = toks.real_token();
|
2014-02-04 22:31:33 -06:00
|
|
|
|
2014-10-27 03:22:52 -05:00
|
|
|
if (next.tok == token::Lt ||
|
|
|
|
next.tok == token::Colon) &&
|
2014-02-04 22:31:33 -06:00
|
|
|
bracket_count == 0 &&
|
2014-10-27 07:33:30 -05:00
|
|
|
prev.tok.is_ident() {
|
2014-02-04 22:31:33 -06:00
|
|
|
result = Some(prev.sp);
|
|
|
|
}
|
|
|
|
|
|
|
|
bracket_count += match prev.tok {
|
2014-10-27 03:22:52 -05:00
|
|
|
token::Lt => 1,
|
|
|
|
token::Gt => -1,
|
|
|
|
token::BinOp(token::Shr) => -2,
|
2014-02-04 22:31:33 -06:00
|
|
|
_ => 0
|
|
|
|
};
|
|
|
|
|
2014-10-27 03:22:52 -05:00
|
|
|
if next.tok == token::Eof {
|
2014-02-04 22:31:33 -06:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
prev = next;
|
|
|
|
}
|
|
|
|
if bracket_count != 0 {
|
|
|
|
let loc = self.sess.codemap().lookup_char_pos(span.lo);
|
|
|
|
self.sess.span_bug(span,
|
|
|
|
format!("Mis-counted brackets when breaking path? Parsing '{}' in {}, line {}",
|
2014-12-10 21:46:38 -06:00
|
|
|
self.snippet(span), loc.file.name, loc.line)[]);
|
2014-02-04 22:31:33 -06:00
|
|
|
}
|
2014-10-27 07:33:30 -05:00
|
|
|
if result.is_none() && prev.tok.is_ident() && bracket_count == 0 {
|
2014-02-04 22:31:33 -06:00
|
|
|
return self.make_sub_span(span, Some(prev.sp));
|
|
|
|
}
|
|
|
|
self.make_sub_span(span, result)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Reparse span and return an owned vector of sub spans of the first limit
|
|
|
|
// identifier tokens in the given nesting level.
|
|
|
|
// example with Foo<Bar<T,V>, Bar<T,V>>
|
|
|
|
// Nesting = 0: all idents outside of brackets: ~[Foo]
|
|
|
|
// Nesting = 1: idents within one level of brackets: ~[Bar, Bar]
|
|
|
|
pub fn spans_with_brackets(&self, span: Span, nesting: int, limit: int) -> Vec<Span> {
|
|
|
|
let mut result: Vec<Span> = vec!();
|
|
|
|
|
|
|
|
let mut toks = self.retokenise_span(span);
|
|
|
|
// We keep track of how many brackets we're nested in
|
2014-06-27 14:30:25 -05:00
|
|
|
let mut bracket_count = 0i;
|
2014-02-04 22:31:33 -06:00
|
|
|
loop {
|
2014-11-02 22:52:00 -06:00
|
|
|
let ts = toks.real_token();
|
2014-10-27 03:22:52 -05:00
|
|
|
if ts.tok == token::Eof {
|
2014-02-04 22:31:33 -06:00
|
|
|
if bracket_count != 0 {
|
|
|
|
let loc = self.sess.codemap().lookup_char_pos(span.lo);
|
|
|
|
self.sess.span_bug(span, format!(
|
|
|
|
"Mis-counted brackets when breaking path? Parsing '{}' in {}, line {}",
|
2014-12-10 21:46:38 -06:00
|
|
|
self.snippet(span), loc.file.name, loc.line)[]);
|
2014-02-04 22:31:33 -06:00
|
|
|
}
|
|
|
|
return result
|
|
|
|
}
|
|
|
|
if (result.len() as int) == limit {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
bracket_count += match ts.tok {
|
2014-10-27 03:22:52 -05:00
|
|
|
token::Lt => 1,
|
|
|
|
token::Gt => -1,
|
|
|
|
token::BinOp(token::Shl) => 2,
|
|
|
|
token::BinOp(token::Shr) => -2,
|
2014-02-04 22:31:33 -06:00
|
|
|
_ => 0
|
|
|
|
};
|
2014-10-27 07:33:30 -05:00
|
|
|
if ts.tok.is_ident() &&
|
2014-02-04 22:31:33 -06:00
|
|
|
bracket_count == nesting {
|
|
|
|
result.push(self.make_sub_span(span, Some(ts.sp)).unwrap());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn sub_span_before_token(&self, span: Span, tok: Token) -> Option<Span> {
|
|
|
|
let mut toks = self.retokenise_span(span);
|
2014-11-02 22:52:00 -06:00
|
|
|
let mut prev = toks.real_token();
|
2014-02-04 22:31:33 -06:00
|
|
|
loop {
|
2014-10-27 03:22:52 -05:00
|
|
|
if prev.tok == token::Eof {
|
2014-02-04 22:31:33 -06:00
|
|
|
return None;
|
|
|
|
}
|
2014-11-02 22:52:00 -06:00
|
|
|
let next = toks.real_token();
|
2014-02-04 22:31:33 -06:00
|
|
|
if next.tok == tok {
|
|
|
|
return self.make_sub_span(span, Some(prev.sp));
|
|
|
|
}
|
|
|
|
prev = next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn sub_span_after_keyword(&self,
|
|
|
|
span: Span,
|
|
|
|
keyword: keywords::Keyword) -> Option<Span> {
|
|
|
|
let mut toks = self.retokenise_span(span);
|
|
|
|
loop {
|
2014-11-02 22:52:00 -06:00
|
|
|
let ts = toks.real_token();
|
2014-10-27 03:22:52 -05:00
|
|
|
if ts.tok == token::Eof {
|
2014-02-04 22:31:33 -06:00
|
|
|
return None;
|
|
|
|
}
|
2014-10-27 07:33:30 -05:00
|
|
|
if ts.tok.is_keyword(keyword) {
|
2014-11-02 22:52:00 -06:00
|
|
|
let ts = toks.real_token();
|
2014-10-27 03:22:52 -05:00
|
|
|
if ts.tok == token::Eof {
|
2014-02-04 22:31:33 -06:00
|
|
|
return None
|
|
|
|
} else {
|
|
|
|
return self.make_sub_span(span, Some(ts.sp));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Returns a list of the spans of idents in a patch.
|
|
|
|
// E.g., For foo::bar<x,t>::baz, we return [foo, bar, baz] (well, their spans)
|
|
|
|
pub fn spans_for_path_segments(&self, path: &ast::Path) -> Vec<Span> {
|
|
|
|
if generated_code(path.span) {
|
|
|
|
return vec!();
|
|
|
|
}
|
|
|
|
|
|
|
|
self.spans_with_brackets(path.span, 0, -1)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return an owned vector of the subspans of the param identifier
|
|
|
|
// tokens found in span.
|
|
|
|
pub fn spans_for_ty_params(&self, span: Span, number: int) -> Vec<Span> {
|
|
|
|
if generated_code(span) {
|
|
|
|
return vec!();
|
|
|
|
}
|
|
|
|
// Type params are nested within one level of brackets:
|
|
|
|
// i.e. we want ~[A, B] from Foo<A, B<T,U>>
|
|
|
|
self.spans_with_brackets(span, 1, number)
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn report_span_err(&self, kind: &str, span: Span) {
|
|
|
|
let loc = self.sess.codemap().lookup_char_pos(span.lo);
|
|
|
|
info!("({}) Could not find sub_span in `{}` in {}, line {}",
|
|
|
|
kind, self.snippet(span), loc.file.name, loc.line);
|
|
|
|
self.err_count.set(self.err_count.get()+1);
|
|
|
|
if self.err_count.get() > 1000 {
|
|
|
|
self.sess.bug("span errors reached 1000, giving up");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|