Add AST pretty-printer tests involving attr precedence

This test currently fails (as expected).

    --- stderr -------------------------------
    Pretty-printer lost necessary parentheses
      BEFORE: (#[attr] loop {}).field
       AFTER: #[attr] loop {}.field
    ------------------------------------------
This commit is contained in:
David Tolnay 2025-06-13 13:55:28 -07:00
parent 8da623945f
commit d75b0ae7ce
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
2 changed files with 43 additions and 4 deletions

View file

@ -7,15 +7,17 @@ extern crate rustc_parse;
extern crate rustc_session;
extern crate rustc_span;
use rustc_ast::ast::{DUMMY_NODE_ID, Expr};
use rustc_ast::mut_visit::MutVisitor;
use rustc_ast::ast::{AttrKind, Attribute, DUMMY_NODE_ID, Expr};
use rustc_ast::mut_visit::{self, MutVisitor};
use rustc_ast::node_id::NodeId;
use rustc_ast::ptr::P;
use rustc_ast::token;
use rustc_ast::token::{self, Token};
use rustc_ast::tokenstream::{AttrTokenStream, AttrTokenTree, LazyAttrTokenStream};
use rustc_errors::Diag;
use rustc_parse::parser::Recovery;
use rustc_session::parse::ParseSess;
use rustc_span::{DUMMY_SP, FileName, Span};
use rustc_span::{AttrId, DUMMY_SP, FileName, Span};
use std::sync::Arc;
pub fn parse_expr(psess: &ParseSess, source_code: &str) -> Option<P<Expr>> {
let parser = rustc_parse::unwrap_or_emit_fatal(rustc_parse::new_parser_from_source_str(
@ -46,4 +48,36 @@ impl MutVisitor for Normalize {
fn visit_span(&mut self, span: &mut Span) {
*span = DUMMY_SP;
}
fn visit_attribute(&mut self, attr: &mut Attribute) {
attr.id = AttrId::from_u32(0);
if let AttrKind::Normal(normal_attr) = &mut attr.kind {
if let Some(tokens) = &mut normal_attr.tokens {
let mut stream = tokens.to_attr_token_stream();
normalize_attr_token_stream(&mut stream);
*tokens = LazyAttrTokenStream::new_direct(stream);
}
}
mut_visit::walk_attribute(self, attr);
}
}
fn normalize_attr_token_stream(stream: &mut AttrTokenStream) {
Arc::make_mut(&mut stream.0)
.iter_mut()
.for_each(normalize_attr_token_tree);
}
fn normalize_attr_token_tree(token: &mut AttrTokenTree) {
match token {
AttrTokenTree::Token(token, _spacing) => {
Normalize.visit_span(&mut token.span);
}
AttrTokenTree::Delimited(dspan, _spacing, _delim, stream) => {
normalize_attr_token_stream(stream);
Normalize.visit_span(&mut dspan.open);
Normalize.visit_span(&mut dspan.close);
}
AttrTokenTree::AttrsTarget(_) => unimplemented!("AttrTokenTree::AttrsTarget"),
}
}

View file

@ -88,6 +88,11 @@ static EXPRS: &[&str] = &[
// expressions.
"match 2 { _ => 1 - 1 }",
"match 2 { _ => ({ 1 }) - 1 }",
// Expressions with an outer attr have lower precedence than expressions
// with an inner attr.
"#[attr] loop {}.field",
"(#[attr] loop {}).field",
"loop { #![attr] }.field",
// Grammar restriction: break value starting with a labeled loop is not
// allowed, except if the break is also labeled.
"break 'outer 'inner: loop {} + 2",