Skip to content

Commit 061faa7

Browse files
jseyfriedjseyfried
committed
Refactor how spans are combined in the parser.
1 parent 6b17cf3 commit 061faa7

File tree

19 files changed

+356
-430
lines changed

19 files changed

+356
-430
lines changed

‎src/librustc_metadata/cstore_impl.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ use syntax::ast;
3636
use syntax::attr;
3737
use syntax::parse::filemap_to_stream;
3838
use syntax::symbol::Symbol;
39-
use syntax_pos::{mk_sp, Span};
39+
use syntax_pos::{Span, NO_EXPANSION};
4040
use rustc::hir::svh::Svh;
4141
use rustc_back::target::Target;
4242
use rustc::hir;
@@ -400,7 +400,7 @@ impl CrateStore for cstore::CStore {
400400
let source_name = format!("<{} macros>", name);
401401

402402
let filemap = sess.parse_sess.codemap().new_filemap(source_name, None, def.body);
403-
let local_span = mk_sp(filemap.start_pos, filemap.end_pos);
403+
let local_span = Span { lo: filemap.start_pos, hi: filemap.end_pos, ctxt: NO_EXPANSION };
404404
let body = filemap_to_stream(&sess.parse_sess, filemap);
405405

406406
// Mark the attrs as used

‎src/librustc_metadata/decoder.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ use syntax::attr;
3939
use syntax::ast;
4040
use syntax::codemap;
4141
use syntax::ext::base::MacroKind;
42-
use syntax_pos::{self, Span, BytePos, Pos, DUMMY_SP};
42+
use syntax_pos::{self, Span, BytePos, Pos, DUMMY_SP, NO_EXPANSION};
4343

4444
pub struct DecodeContext<'a, 'tcx: 'a> {
4545
opaque: opaque::Decoder<'a>,
@@ -243,7 +243,7 @@ impl<'a, 'tcx> SpecializedDecoder<Span> for DecodeContext<'a, 'tcx> {
243243
let sess = if let Some(sess) = self.sess {
244244
sess
245245
} else {
246-
return Ok(syntax_pos::mk_sp(lo, hi));
246+
return Ok(Span { lo: lo, hi: hi, ctxt: NO_EXPANSION });
247247
};
248248

249249
let (lo, hi) = if lo > hi {
@@ -290,7 +290,7 @@ impl<'a, 'tcx> SpecializedDecoder<Span> for DecodeContext<'a, 'tcx> {
290290
let lo = (lo - filemap.original_start_pos) + filemap.translated_filemap.start_pos;
291291
let hi = (hi - filemap.original_start_pos) + filemap.translated_filemap.start_pos;
292292

293-
Ok(syntax_pos::mk_sp(lo, hi))
293+
Ok(Span { lo: lo, hi: hi, ctxt: NO_EXPANSION })
294294
}
295295
}
296296

‎src/librustc_save_analysis/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ impl<'l, 'tcx: 'l> SaveContext<'l, 'tcx> {
741741
let ident_start = text.find(&name).expect("Name not in signature?");
742742
let ident_end = ident_start + name.len();
743743
Signature {
744-
span: mk_sp(item.span.lo, item.span.lo + BytePos(text.len() as u32)),
744+
span: Span { hi: item.span.lo + BytePos(text.len() as u32), ..item.span },
745745
text: text,
746746
ident_start: ident_start,
747747
ident_end: ident_end,

‎src/librustc_save_analysis/span_utils.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -305,10 +305,10 @@ impl<'a> SpanUtils<'a> {
305305
continue;
306306
}
307307
if let TokenTree::Token(_, token::Semi) = tok {
308-
return self.snippet(mk_sp(first_span.lo, prev.span().hi));
308+
return self.snippet(first_span.to(prev.span()));
309309
} else if let TokenTree::Delimited(_, ref d) = tok {
310310
if d.delim == token::Brace {
311-
return self.snippet(mk_sp(first_span.lo, prev.span().hi));
311+
return self.snippet(first_span.to(prev.span()));
312312
}
313313
}
314314
prev = tok;

‎src/libsyntax/ast.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub use self::PathParameters::*;
1717
pub use symbol::{Ident, Symbol as Name};
1818
pub use util::ThinVec;
1919

20-
use syntax_pos::{mk_sp, Span, DUMMY_SP};
20+
use syntax_pos::{Span, DUMMY_SP};
2121
use codemap::{respan, Spanned};
2222
use abi::Abi;
2323
use ext::hygiene::{Mark, SyntaxContext};
@@ -1422,7 +1422,7 @@ impl Arg {
14221422
TyKind::Rptr(lt, MutTy{ref ty, mutbl}) if ty.node == TyKind::ImplicitSelf => {
14231423
Some(respan(self.pat.span, SelfKind::Region(lt, mutbl)))
14241424
}
1425-
_ => Some(respan(mk_sp(self.pat.span.lo, self.ty.span.hi),
1425+
_ => Some(respan(self.pat.span.to(self.ty.span),
14261426
SelfKind::Explicit(self.ty.clone(), mutbl))),
14271427
}
14281428
}
@@ -1439,7 +1439,7 @@ impl Arg {
14391439
}
14401440

14411441
pub fn from_self(eself: ExplicitSelf, eself_ident: SpannedIdent) -> Arg {
1442-
let span = mk_sp(eself.span.lo, eself_ident.span.hi);
1442+
let span = eself.span.to(eself_ident.span);
14431443
let infer_ty = P(Ty {
14441444
id: DUMMY_NODE_ID,
14451445
node: TyKind::ImplicitSelf,

‎src/libsyntax/attr.rs

+7-8
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ use ast;
1818
use ast::{AttrId, Attribute, Name, Ident};
1919
use ast::{MetaItem, MetaItemKind, NestedMetaItem, NestedMetaItemKind};
2020
use ast::{Lit, LitKind, Expr, ExprKind, Item, Local, Stmt, StmtKind};
21-
use codemap::{Spanned, spanned, dummy_spanned, mk_sp};
22-
use syntax_pos::{Span, BytePos, DUMMY_SP};
21+
use codemap::{Spanned, respan, dummy_spanned};
22+
use syntax_pos::{Span, DUMMY_SP};
2323
use errors::Handler;
2424
use feature_gate::{Features, GatedCfg};
2525
use parse::lexer::comments::{doc_comment_style, strip_doc_comment_decoration};
@@ -447,17 +447,16 @@ pub fn mk_spanned_attr_outer(sp: Span, id: AttrId, item: MetaItem) -> Attribute
447447
}
448448
}
449449

450-
pub fn mk_sugared_doc_attr(id: AttrId, text: Symbol, lo: BytePos, hi: BytePos)
451-
-> Attribute {
450+
pub fn mk_sugared_doc_attr(id: AttrId, text: Symbol, span: Span) -> Attribute {
452451
let style = doc_comment_style(&text.as_str());
453-
let lit = spanned(lo, hi, LitKind::Str(text, ast::StrStyle::Cooked));
452+
let lit = respan(span, LitKind::Str(text, ast::StrStyle::Cooked));
454453
Attribute {
455454
id: id,
456455
style: style,
457-
path: ast::Path::from_ident(mk_sp(lo, hi), ast::Ident::from_str("doc")),
458-
tokens: MetaItemKind::NameValue(lit).tokens(mk_sp(lo, hi)),
456+
path: ast::Path::from_ident(span, ast::Ident::from_str("doc")),
457+
tokens: MetaItemKind::NameValue(lit).tokens(span),
459458
is_sugared_doc: true,
460-
span: mk_sp(lo, hi),
459+
span: span,
461460
}
462461
}
463462

‎src/libsyntax/codemap.rs

-4
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ pub struct Spanned<T> {
4949
pub span: Span,
5050
}
5151

52-
pub fn spanned<T>(lo: BytePos, hi: BytePos, t: T) -> Spanned<T> {
53-
respan(mk_sp(lo, hi), t)
54-
}
55-
5652
pub fn respan<T>(sp: Span, t: T) -> Spanned<T> {
5753
Spanned {node: t, span: sp}
5854
}

‎src/libsyntax/ext/tt/macro_parser.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ pub use self::ParseResult::*;
7979
use self::TokenTreeOrTokenTreeVec::*;
8080

8181
use ast::Ident;
82-
use syntax_pos::{self, BytePos, mk_sp, Span};
82+
use syntax_pos::{self, BytePos, Span};
8383
use codemap::Spanned;
8484
use errors::FatalError;
8585
use ext::tt::quoted::{self, TokenTree};
@@ -285,7 +285,7 @@ fn inner_parse_loop(sess: &ParseSess,
285285
eof_eis: &mut SmallVector<Box<MatcherPos>>,
286286
bb_eis: &mut SmallVector<Box<MatcherPos>>,
287287
token: &Token,
288-
span: &syntax_pos::Span)
288+
span: syntax_pos::Span)
289289
-> ParseResult<()> {
290290
while let Some(mut ei) = cur_eis.pop() {
291291
// When unzipped trees end, remove them
@@ -323,8 +323,7 @@ fn inner_parse_loop(sess: &ParseSess,
323323
for idx in ei.match_lo..ei.match_hi {
324324
let sub = ei.matches[idx].clone();
325325
new_pos.matches[idx]
326-
.push(Rc::new(MatchedSeq(sub, mk_sp(ei.sp_lo,
327-
span.hi))));
326+
.push(Rc::new(MatchedSeq(sub, Span { lo: ei.sp_lo, ..span })));
328327
}
329328

330329
new_pos.match_cur = ei.match_hi;
@@ -426,7 +425,7 @@ pub fn parse(sess: &ParseSess, tts: TokenStream, ms: &[TokenTree], directory: Op
426425
assert!(next_eis.is_empty());
427426

428427
match inner_parse_loop(sess, &mut cur_eis, &mut next_eis, &mut eof_eis, &mut bb_eis,
429-
&parser.token, &parser.span) {
428+
&parser.token, parser.span) {
430429
Success(_) => {},
431430
Failure(sp, tok) => return Failure(sp, tok),
432431
Error(sp, msg) => return Error(sp, msg),

‎src/libsyntax/parse/attr.rs

+12-17
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010

1111
use attr;
1212
use ast;
13-
use syntax_pos::{mk_sp, Span};
14-
use codemap::spanned;
13+
use codemap::respan;
1514
use parse::common::SeqSep;
1615
use parse::PResult;
1716
use parse::token::{self, Nonterminal};
@@ -49,8 +48,7 @@ impl<'a> Parser<'a> {
4948
just_parsed_doc_comment = false;
5049
}
5150
token::DocComment(s) => {
52-
let Span { lo, hi, .. } = self.span;
53-
let attr = attr::mk_sugared_doc_attr(attr::mk_attr_id(), s, lo, hi);
51+
let attr = attr::mk_sugared_doc_attr(attr::mk_attr_id(), s, self.span);
5452
if attr.style != ast::AttrStyle::Outer {
5553
let mut err = self.fatal("expected outer doc comment");
5654
err.note("inner doc comments like this (starting with \
@@ -94,7 +92,7 @@ impl<'a> Parser<'a> {
9492
self.token);
9593
let (span, path, tokens, mut style) = match self.token {
9694
token::Pound => {
97-
let lo = self.span.lo;
95+
let lo = self.span;
9896
self.bump();
9997

10098
if inner_parse_policy == InnerAttributeParsePolicy::Permitted {
@@ -122,9 +120,9 @@ impl<'a> Parser<'a> {
122120
self.expect(&token::OpenDelim(token::Bracket))?;
123121
let (path, tokens) = self.parse_path_and_tokens()?;
124122
self.expect(&token::CloseDelim(token::Bracket))?;
125-
let hi = self.prev_span.hi;
123+
let hi = self.prev_span;
126124

127-
(mk_sp(lo, hi), path, tokens, style)
125+
(lo.to(hi), path, tokens, style)
128126
}
129127
_ => {
130128
let token_str = self.this_token_to_string();
@@ -189,8 +187,7 @@ impl<'a> Parser<'a> {
189187
}
190188
token::DocComment(s) => {
191189
// we need to get the position of this token before we bump.
192-
let Span { lo, hi, .. } = self.span;
193-
let attr = attr::mk_sugared_doc_attr(attr::mk_attr_id(), s, lo, hi);
190+
let attr = attr::mk_sugared_doc_attr(attr::mk_attr_id(), s, self.span);
194191
if attr.style == ast::AttrStyle::Inner {
195192
attrs.push(attr);
196193
self.bump();
@@ -238,11 +235,10 @@ impl<'a> Parser<'a> {
238235
return Ok(meta);
239236
}
240237

241-
let lo = self.span.lo;
238+
let lo = self.span;
242239
let ident = self.parse_ident()?;
243240
let node = self.parse_meta_item_kind()?;
244-
let hi = self.prev_span.hi;
245-
Ok(ast::MetaItem { name: ident.name, node: node, span: mk_sp(lo, hi) })
241+
Ok(ast::MetaItem { name: ident.name, node: node, span: lo.to(self.prev_span) })
246242
}
247243

248244
pub fn parse_meta_item_kind(&mut self) -> PResult<'a, ast::MetaItemKind> {
@@ -258,26 +254,25 @@ impl<'a> Parser<'a> {
258254

259255
/// matches meta_item_inner : (meta_item | UNSUFFIXED_LIT) ;
260256
fn parse_meta_item_inner(&mut self) -> PResult<'a, ast::NestedMetaItem> {
261-
let sp = self.span;
262-
let lo = self.span.lo;
257+
let lo = self.span;
263258

264259
match self.parse_unsuffixed_lit() {
265260
Ok(lit) => {
266-
return Ok(spanned(lo, self.prev_span.hi, ast::NestedMetaItemKind::Literal(lit)))
261+
return Ok(respan(lo.to(self.prev_span), ast::NestedMetaItemKind::Literal(lit)))
267262
}
268263
Err(ref mut err) => self.diagnostic().cancel(err)
269264
}
270265

271266
match self.parse_meta_item() {
272267
Ok(mi) => {
273-
return Ok(spanned(lo, self.prev_span.hi, ast::NestedMetaItemKind::MetaItem(mi)))
268+
return Ok(respan(lo.to(self.prev_span), ast::NestedMetaItemKind::MetaItem(mi)))
274269
}
275270
Err(ref mut err) => self.diagnostic().cancel(err)
276271
}
277272

278273
let found = self.this_token_to_string();
279274
let msg = format!("expected unsuffixed literal or identifier, found {}", found);
280-
Err(self.diagnostic().struct_span_err(sp, &msg))
275+
Err(self.diagnostic().struct_span_err(lo, &msg))
281276
}
282277

283278
/// matches meta_seq = ( COMMASEP(meta_item_inner) )

0 commit comments

Comments
 (0)