nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-23 15:23:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #77235 - petrochenkov:reparse, r=Aaron1011

Browse Source 
pretty-print-reparse hack: Rename some variables for clarity

This will also make it easier to make the comparisons asymmetric.

Also one impossible case is removed.

r? @Aaron1011
This commit is contained in:
Jonas Schievink 2020-09-27 01:53:29 +02:00 committed by GitHub
commit 7a1a87114e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
compiler/rustc_parse/src/lib.rs
View File

@ -7,7 +7,7 @@
#![feature(or_patterns)] #![feature(or_patterns)]
use rustc_ast as ast; use rustc_ast as ast;
use rustc_ast::token::{self, DelimToken, Nonterminal, Token, TokenKind}; use rustc_ast::token::{self, Nonterminal, Token, TokenKind};
use rustc_ast::tokenstream::{self, Spacing, TokenStream, TokenTree}; use rustc_ast::tokenstream::{self, Spacing, TokenStream, TokenTree};
use rustc_ast_pretty::pprust; use rustc_ast_pretty::pprust;
use rustc_data_structures::sync::Lrc; use rustc_data_structures::sync::Lrc;
@ -299,7 +299,7 @@ pub fn nt_to_tokenstream(nt: &Nonterminal, sess: &ParseSess, span: Span) -> Toke
// FIXME(#43081): Avoid this pretty-print + reparse hack // FIXME(#43081): Avoid this pretty-print + reparse hack
let source = pprust::nonterminal_to_string(nt); let source = pprust::nonterminal_to_string(nt);
let filename = FileName::macro_expansion_source_code(&source); let filename = FileName::macro_expansion_source_code(&source);
let tokens_for_real = parse_stream_from_source_str(filename, source, sess, Some(span)); let reparsed_tokens = parse_stream_from_source_str(filename, source, sess, Some(span));
// During early phases of the compiler the AST could get modified // During early phases of the compiler the AST could get modified
// directly (e.g., attributes added or removed) and the internal cache // directly (e.g., attributes added or removed) and the internal cache
@ -325,7 +325,7 @@ pub fn nt_to_tokenstream(nt: &Nonterminal, sess: &ParseSess, span: Span) -> Toke
// modifications, including adding/removing typically non-semantic // modifications, including adding/removing typically non-semantic
// tokens such as extra braces and commas, don't happen. // tokens such as extra braces and commas, don't happen.
if let Some(tokens) = tokens { if let Some(tokens) = tokens {
if tokenstream_probably_equal_for_proc_macro(&tokens, &tokens_for_real, sess) { if tokenstream_probably_equal_for_proc_macro(&tokens, &reparsed_tokens, sess) {
return tokens; return tokens;
} }
info!( info!(
@ -333,9 +333,9 @@ pub fn nt_to_tokenstream(nt: &Nonterminal, sess: &ParseSess, span: Span) -> Toke
going with stringified version" going with stringified version"
); );
info!("cached tokens: {:?}", tokens); info!("cached tokens: {:?}", tokens);
info!("reparsed tokens: {:?}", tokens_for_real); info!("reparsed tokens: {:?}", reparsed_tokens);
} }
tokens_for_real reparsed_tokens
} }
// See comments in `Nonterminal::to_tokenstream` for why we care about // See comments in `Nonterminal::to_tokenstream` for why we care about
@ -344,8 +344,8 @@ pub fn nt_to_tokenstream(nt: &Nonterminal, sess: &ParseSess, span: Span) -> Toke
// This is otherwise the same as `eq_unspanned`, only recursing with a // This is otherwise the same as `eq_unspanned`, only recursing with a
// different method. // different method.
pub fn tokenstream_probably_equal_for_proc_macro( pub fn tokenstream_probably_equal_for_proc_macro(
first: &TokenStream, tokens: &TokenStream,
other: &TokenStream, reparsed_tokens: &TokenStream,
sess: &ParseSess, sess: &ParseSess,
) -> bool { ) -> bool {
// When checking for `probably_eq`, we ignore certain tokens that aren't // When checking for `probably_eq`, we ignore certain tokens that aren't
@ -359,9 +359,6 @@ pub fn tokenstream_probably_equal_for_proc_macro(
// The pretty printer tends to add trailing commas to // The pretty printer tends to add trailing commas to
// everything, and in particular, after struct fields. // everything, and in particular, after struct fields.
| token::Comma | token::Comma
// The pretty printer emits `NoDelim` as whitespace.
| token::OpenDelim(DelimToken::NoDelim)
| token::CloseDelim(DelimToken::NoDelim)
// The pretty printer collapses many semicolons into one. // The pretty printer collapses many semicolons into one.
| token::Semi | token::Semi
// We don't preserve leading `|` tokens in patterns, so // We don't preserve leading `|` tokens in patterns, so
@ -460,10 +457,11 @@ pub fn tokenstream_probably_equal_for_proc_macro(
// Break tokens after we expand any nonterminals, so that we break tokens // Break tokens after we expand any nonterminals, so that we break tokens
// that are produced as a result of nonterminal expansion. // that are produced as a result of nonterminal expansion.
let t1 = first.trees().filter(semantic_tree).flat_map(expand_nt).flat_map(break_tokens); let tokens = tokens.trees().filter(semantic_tree).flat_map(expand_nt).flat_map(break_tokens);
let t2 = other.trees().filter(semantic_tree).flat_map(expand_nt).flat_map(break_tokens); let reparsed_tokens =
reparsed_tokens.trees().filter(semantic_tree).flat_map(expand_nt).flat_map(break_tokens);
t1.eq_by(t2, |t1, t2| tokentree_probably_equal_for_proc_macro(&t1, &t2, sess)) tokens.eq_by(reparsed_tokens, |t, rt| tokentree_probably_equal_for_proc_macro(&t, &rt, sess))
} }
// See comments in `Nonterminal::to_tokenstream` for why we care about // See comments in `Nonterminal::to_tokenstream` for why we care about
@ -472,16 +470,20 @@ pub fn tokenstream_probably_equal_for_proc_macro(
// This is otherwise the same as `eq_unspanned`, only recursing with a // This is otherwise the same as `eq_unspanned`, only recursing with a
// different method. // different method.
pub fn tokentree_probably_equal_for_proc_macro( pub fn tokentree_probably_equal_for_proc_macro(
first: &TokenTree, token: &TokenTree,
other: &TokenTree, reparsed_token: &TokenTree,
sess: &ParseSess, sess: &ParseSess,
) -> bool { ) -> bool {
match (first, other) { match (token, reparsed_token) {
(TokenTree::Token(token), TokenTree::Token(token2)) => { (TokenTree::Token(token), TokenTree::Token(reparsed_token)) => {
token_probably_equal_for_proc_macro(token, token2) token_probably_equal_for_proc_macro(token, reparsed_token)
} }
(TokenTree::Delimited(_, delim, tts), TokenTree::Delimited(_, delim2, tts2)) => { (
delim == delim2 && tokenstream_probably_equal_for_proc_macro(&tts, &tts2, sess) TokenTree::Delimited(_, delim, tokens),
TokenTree::Delimited(_, reparsed_delim, reparsed_tokens),
) => {
delim == reparsed_delim
&& tokenstream_probably_equal_for_proc_macro(tokens, reparsed_tokens, sess)
} }
_ => false, _ => false,
} }