bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename sp_lo to sp_open

Browse source
This commit is contained in:
David Tolnay 2018-09-08 23:47:42 -07:00
parent a1dd39e724
commit 57d6ada91d
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/libsyntax/ext/tt/macro_parser.rs
View file

@ -151,10 +151,10 @@ struct MatcherPos<'a> {
top_elts: TokenTreeOrTokenTreeSlice<'a>, top_elts: TokenTreeOrTokenTreeSlice<'a>,
/// The position of the "dot" in this matcher /// The position of the "dot" in this matcher
idx: usize, idx: usize,
/// The beginning position in the source that the beginning of this matcher corresponds to. In /// The first span of source source that the beginning of this matcher corresponds to. In other
/// other words, the token in the source at `sp_lo` is matched against the first token of the /// words, the token in the source whose span is `sp_open` is matched against the first token of
/// matcher. /// the matcher.
sp_lo: Span, sp_open: Span,
/// For each named metavar in the matcher, we keep track of token trees matched against the /// For each named metavar in the matcher, we keep track of token trees matched against the
/// metavar by the black box parser. In particular, there may be more than one match per /// metavar by the black box parser. In particular, there may be more than one match per
@ -284,8 +284,8 @@ fn create_matches(len: usize) -> Vec<Rc<Vec<NamedMatch>>> {
} }
/// Generate the top-level matcher position in which the "dot" is before the first token of the /// Generate the top-level matcher position in which the "dot" is before the first token of the
/// matcher `ms` and we are going to start matching at position `lo` in the source. /// matcher `ms` and we are going to start matching at the span `open` in the source.
fn initial_matcher_pos(ms: &[TokenTree], lo: Span) -> MatcherPos { fn initial_matcher_pos(ms: &[TokenTree], open: Span) -> MatcherPos {
let match_idx_hi = count_names(ms); let match_idx_hi = count_names(ms);
let matches = create_matches(match_idx_hi); let matches = create_matches(match_idx_hi);
MatcherPos { MatcherPos {
@ -293,8 +293,8 @@ fn initial_matcher_pos(ms: &[TokenTree], lo: Span) -> MatcherPos {
top_elts: TtSeq(ms), // "elts" is an abbr. for "elements" top_elts: TtSeq(ms), // "elts" is an abbr. for "elements"
// The "dot" is before the first token of the matcher // The "dot" is before the first token of the matcher
idx: 0, idx: 0,
// We start matching with byte `lo` in the source code // We start matching at the span `open` in the source code
sp_lo: lo, sp_open: open,
// Initialize `matches` to a bunch of empty `Vec`s -- one for each metavar in `top_elts`. // Initialize `matches` to a bunch of empty `Vec`s -- one for each metavar in `top_elts`.
// `match_lo` for `top_elts` is 0 and `match_hi` is `matches.len()`. `match_cur` is 0 since // `match_lo` for `top_elts` is 0 and `match_hi` is `matches.len()`. `match_cur` is 0 since
@ -488,7 +488,7 @@ fn inner_parse_loop<'a>(
// Add matches from this repetition to the `matches` of `up` // Add matches from this repetition to the `matches` of `up`
for idx in item.match_lo..item.match_hi { for idx in item.match_lo..item.match_hi {
let sub = item.matches[idx].clone(); let sub = item.matches[idx].clone();
let span = DelimSpan::from_pair(item.sp_lo, span); let span = DelimSpan::from_pair(item.sp_open, span);
new_pos.push_match(idx, MatchedSeq(sub, span)); new_pos.push_match(idx, MatchedSeq(sub, span));
} }
@ -556,7 +556,7 @@ fn inner_parse_loop<'a>(
match_cur: item.match_cur, match_cur: item.match_cur,
match_hi: item.match_cur + seq.num_captures, match_hi: item.match_cur + seq.num_captures,
up: Some(item), up: Some(item),
sp_lo: sp.open, sp_open: sp.open,
top_elts: Tt(TokenTree::Sequence(sp, seq)), top_elts: Tt(TokenTree::Sequence(sp, seq)),
}))); })));
} }