David Tolnay | 5553501 | 2018-01-05 16:39:23 -0800 | [diff] [blame] | 1 | // Copyright 2018 Syn Developers |
| 2 | // |
| 3 | // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or |
| 4 | // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license |
| 5 | // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your |
| 6 | // option. This file may not be copied, modified, or distributed |
| 7 | // except according to those terms. |
| 8 | |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 9 | #![cfg(all(feature = "full", feature = "fold"))] |
David Tolnay | ecd024d | 2018-07-21 09:07:56 -0700 | [diff] [blame] | 10 | #![recursion_limit = "1024"] |
Nika Layzell | a2a1a4a | 2017-11-19 11:33:17 -0500 | [diff] [blame] | 11 | #![feature(rustc_private)] |
| 12 | |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 13 | //! The tests in this module do the following: |
| 14 | //! |
David Tolnay | cfa5cc0 | 2017-11-13 01:05:11 -0800 | [diff] [blame] | 15 | //! 1. Parse a given expression in both `syn` and `libsyntax`. |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 16 | //! 2. Fold over the expression adding brackets around each subexpression (with |
David Tolnay | cfa5cc0 | 2017-11-13 01:05:11 -0800 | [diff] [blame] | 17 | //! some complications - see the `syn_brackets` and `libsyntax_brackets` |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 18 | //! methods). |
| 19 | //! 3. Serialize the `syn` expression back into a string, and re-parse it with |
David Tolnay | cfa5cc0 | 2017-11-13 01:05:11 -0800 | [diff] [blame] | 20 | //! `libsyntax`. |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 21 | //! 4. Respan all of the expressions, replacing the spans with the default spans. |
| 22 | //! 5. Compare the expressions with one another, if they are not equal fail. |
| 23 | |
| 24 | #[macro_use] |
| 25 | extern crate quote; |
David Tolnay | ee97dbf | 2017-11-19 14:24:38 -0800 | [diff] [blame] | 26 | extern crate rayon; |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 27 | extern crate syn; |
David Tolnay | cfa5cc0 | 2017-11-13 01:05:11 -0800 | [diff] [blame] | 28 | extern crate syntax; |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 29 | extern crate walkdir; |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 30 | |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 31 | use rayon::iter::{IntoParallelIterator, ParallelIterator}; |
David Tolnay | cfa5cc0 | 2017-11-13 01:05:11 -0800 | [diff] [blame] | 32 | use syntax::ast; |
| 33 | use syntax::ptr::P; |
Igor Gnatenko | 951a52b | 2018-03-12 10:33:33 +0100 | [diff] [blame] | 34 | use walkdir::{DirEntry, WalkDir}; |
David Tolnay | ee97dbf | 2017-11-19 14:24:38 -0800 | [diff] [blame] | 35 | |
| 36 | use std::fs::File; |
| 37 | use std::io::Read; |
David Tolnay | 3eaf7d8 | 2017-12-17 23:14:52 -0800 | [diff] [blame] | 38 | use std::process; |
David Tolnay | ee97dbf | 2017-11-19 14:24:38 -0800 | [diff] [blame] | 39 | use std::sync::atomic::{AtomicUsize, Ordering}; |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 40 | |
David Tolnay | ecd024d | 2018-07-21 09:07:56 -0700 | [diff] [blame] | 41 | use common::eq::SpanlessEq; |
| 42 | use common::parse; |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 43 | |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 44 | #[macro_use] |
David Tolnay | dd12556 | 2017-12-31 02:16:22 -0500 | [diff] [blame] | 45 | mod macros; |
| 46 | |
| 47 | #[allow(dead_code)] |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 48 | mod common; |
| 49 | |
| 50 | /// Test some pre-set expressions chosen by us. |
| 51 | #[test] |
| 52 | fn test_simple_precedence() { |
| 53 | const EXPRS: &[&str] = &[ |
| 54 | "1 + 2 * 3 + 4", |
| 55 | "1 + 2 * ( 3 + 4 )", |
| 56 | "{ for i in r { } *some_ptr += 1; }", |
| 57 | "{ loop { break 5; } }", |
| 58 | "{ if true { () }.mthd() }", |
Nika Layzell | 3aa0dc7 | 2017-12-04 13:41:28 -0500 | [diff] [blame] | 59 | "{ for i in unsafe { 20 } { } }", |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 60 | ]; |
| 61 | |
| 62 | let mut failed = 0; |
| 63 | |
| 64 | for input in EXPRS { |
| 65 | let expr = if let Some(expr) = parse::syn_expr(input) { |
| 66 | expr |
| 67 | } else { |
| 68 | failed += 1; |
| 69 | continue; |
| 70 | }; |
| 71 | |
| 72 | let pf = match test_expressions(vec![expr]) { |
| 73 | (1, 0) => "passed", |
| 74 | (0, 1) => { |
| 75 | failed += 1; |
| 76 | "failed" |
| 77 | } |
| 78 | _ => unreachable!(), |
| 79 | }; |
| 80 | errorf!("=== {}: {}\n", input, pf); |
| 81 | } |
| 82 | |
| 83 | if failed > 0 { |
| 84 | panic!("Failed {} tests", failed); |
| 85 | } |
| 86 | } |
| 87 | |
| 88 | /// Test expressions from rustc, like in `test_round_trip`. |
| 89 | #[test] |
| 90 | fn test_rustc_precedence() { |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 91 | common::check_min_stack(); |
Alex Crichton | 8637477 | 2017-07-07 20:39:28 -0700 | [diff] [blame] | 92 | common::clone_rust(); |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 93 | let abort_after = common::abort_after(); |
| 94 | if abort_after == 0 { |
| 95 | panic!("Skipping all precedence tests"); |
| 96 | } |
| 97 | |
David Tolnay | ee97dbf | 2017-11-19 14:24:38 -0800 | [diff] [blame] | 98 | let passed = AtomicUsize::new(0); |
| 99 | let failed = AtomicUsize::new(0); |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 100 | |
David Tolnay | ee97dbf | 2017-11-19 14:24:38 -0800 | [diff] [blame] | 101 | WalkDir::new("tests/rust") |
Igor Gnatenko | 951a52b | 2018-03-12 10:33:33 +0100 | [diff] [blame] | 102 | .sort_by(|a, b| a.file_name().cmp(b.file_name())) |
David Tolnay | ee97dbf | 2017-11-19 14:24:38 -0800 | [diff] [blame] | 103 | .into_iter() |
| 104 | .filter_entry(common::base_dir_filter) |
| 105 | .collect::<Result<Vec<DirEntry>, walkdir::Error>>() |
| 106 | .unwrap() |
| 107 | .into_par_iter() |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 108 | .for_each(|entry| { |
| 109 | let path = entry.path(); |
| 110 | if path.is_dir() { |
| 111 | return; |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 112 | } |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 113 | |
| 114 | // Our version of `libsyntax` can't parse this tests |
David Tolnay | 65fb566 | 2018-05-20 20:02:28 -0700 | [diff] [blame] | 115 | if path |
| 116 | .to_str() |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 117 | .unwrap() |
| 118 | .ends_with("optional_comma_in_match_arm.rs") |
| 119 | { |
| 120 | return; |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 121 | } |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 122 | |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 123 | let mut file = File::open(path).unwrap(); |
| 124 | let mut content = String::new(); |
| 125 | file.read_to_string(&mut content).unwrap(); |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 126 | |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 127 | let (l_passed, l_failed) = match syn::parse_file(&content) { |
| 128 | Ok(file) => { |
| 129 | let exprs = collect_exprs(file); |
| 130 | test_expressions(exprs) |
| 131 | } |
| 132 | Err(msg) => { |
| 133 | errorf!("syn failed to parse\n{:?}\n", msg); |
| 134 | (0, 1) |
| 135 | } |
| 136 | }; |
David Tolnay | ee97dbf | 2017-11-19 14:24:38 -0800 | [diff] [blame] | 137 | |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 138 | errorf!( |
| 139 | "=== {}: {} passed | {} failed\n", |
| 140 | path.display(), |
| 141 | l_passed, |
| 142 | l_failed |
| 143 | ); |
| 144 | |
| 145 | passed.fetch_add(l_passed, Ordering::SeqCst); |
| 146 | let prev_failed = failed.fetch_add(l_failed, Ordering::SeqCst); |
| 147 | |
| 148 | if prev_failed + l_failed >= abort_after { |
| 149 | process::exit(1); |
| 150 | } |
| 151 | }); |
David Tolnay | ee97dbf | 2017-11-19 14:24:38 -0800 | [diff] [blame] | 152 | |
| 153 | let passed = passed.load(Ordering::SeqCst); |
| 154 | let failed = failed.load(Ordering::SeqCst); |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 155 | |
| 156 | errorf!("\n===== Precedence Test Results =====\n"); |
| 157 | errorf!("{} passed | {} failed\n", passed, failed); |
| 158 | |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 159 | if failed > 0 { |
| 160 | panic!("{} failures", failed); |
| 161 | } |
| 162 | } |
| 163 | |
David Tolnay | ee97dbf | 2017-11-19 14:24:38 -0800 | [diff] [blame] | 164 | fn test_expressions(exprs: Vec<syn::Expr>) -> (usize, usize) { |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 165 | let mut passed = 0; |
| 166 | let mut failed = 0; |
| 167 | |
David Tolnay | eb7d79b | 2018-03-31 22:52:17 +0200 | [diff] [blame] | 168 | syntax::with_globals(|| { |
| 169 | for expr in exprs { |
| 170 | let raw = quote!(#expr).to_string(); |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 171 | |
David Tolnay | eb7d79b | 2018-03-31 22:52:17 +0200 | [diff] [blame] | 172 | let libsyntax_ast = if let Some(e) = libsyntax_parse_and_rewrite(&raw) { |
| 173 | e |
| 174 | } else { |
| 175 | failed += 1; |
| 176 | errorf!("\nFAIL - libsyntax failed to parse raw\n"); |
| 177 | continue; |
| 178 | }; |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 179 | |
David Tolnay | eb7d79b | 2018-03-31 22:52:17 +0200 | [diff] [blame] | 180 | let syn_expr = syn_brackets(expr); |
| 181 | let syn_ast = if let Some(e) = parse::libsyntax_expr("e!(#syn_expr).to_string()) { |
| 182 | e |
| 183 | } else { |
| 184 | failed += 1; |
| 185 | errorf!("\nFAIL - libsyntax failed to parse bracketed\n"); |
| 186 | continue; |
| 187 | }; |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 188 | |
David Tolnay | ecd024d | 2018-07-21 09:07:56 -0700 | [diff] [blame] | 189 | if SpanlessEq::eq(&syn_ast, &libsyntax_ast) { |
David Tolnay | eb7d79b | 2018-03-31 22:52:17 +0200 | [diff] [blame] | 190 | passed += 1; |
| 191 | } else { |
| 192 | failed += 1; |
| 193 | errorf!("\nFAIL\n{:?}\n!=\n{:?}\n", syn_ast, libsyntax_ast); |
| 194 | } |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 195 | } |
David Tolnay | 5d1a3ee | 2018-03-17 19:41:36 -0700 | [diff] [blame] | 196 | }); |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 197 | |
| 198 | (passed, failed) |
| 199 | } |
| 200 | |
David Tolnay | cfa5cc0 | 2017-11-13 01:05:11 -0800 | [diff] [blame] | 201 | fn libsyntax_parse_and_rewrite(input: &str) -> Option<P<ast::Expr>> { |
David Tolnay | 3cede94 | 2017-12-26 12:29:24 -0500 | [diff] [blame] | 202 | parse::libsyntax_expr(input).and_then(libsyntax_brackets) |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 203 | } |
| 204 | |
| 205 | /// Wrap every expression which is not already wrapped in parens with parens, to |
| 206 | /// reveal the precidence of the parsed expressions, and produce a stringified form |
| 207 | /// of the resulting expression. |
| 208 | /// |
David Tolnay | cfa5cc0 | 2017-11-13 01:05:11 -0800 | [diff] [blame] | 209 | /// This method operates on libsyntax objects. |
| 210 | fn libsyntax_brackets(libsyntax_expr: P<ast::Expr>) -> Option<P<ast::Expr>> { |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 211 | use syntax::ast::{Expr, ExprKind, Field, Mac, Pat, Stmt, StmtKind, Ty}; |
David Tolnay | eb7d79b | 2018-03-31 22:52:17 +0200 | [diff] [blame] | 212 | use syntax::ext::quote::rt::DUMMY_SP; |
David Tolnay | cfa5cc0 | 2017-11-13 01:05:11 -0800 | [diff] [blame] | 213 | use syntax::fold::{self, Folder}; |
David Tolnay | cfa5cc0 | 2017-11-13 01:05:11 -0800 | [diff] [blame] | 214 | use syntax::util::small_vector::SmallVector; |
David Tolnay | 94d2b79 | 2018-04-29 12:26:10 -0700 | [diff] [blame] | 215 | use syntax::util::ThinVec; |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 216 | |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 217 | struct BracketsFolder { |
| 218 | failed: bool, |
| 219 | }; |
| 220 | impl Folder for BracketsFolder { |
| 221 | fn fold_expr(&mut self, e: P<Expr>) -> P<Expr> { |
David Tolnay | 5d314dc | 2018-07-21 16:40:01 -0700 | [diff] [blame] | 222 | e.map(|e| match e.node { |
David Tolnay | 61e15e5 | 2018-08-01 00:28:36 -0700 | [diff] [blame] | 223 | ExprKind::Block(_, label) if label.is_some() => Expr { |
| 224 | id: ast::DUMMY_NODE_ID, |
| 225 | node: ExprKind::Paren(P(e)), |
| 226 | span: DUMMY_SP, |
| 227 | attrs: ThinVec::new(), |
| 228 | }, |
David Tolnay | 5d314dc | 2018-07-21 16:40:01 -0700 | [diff] [blame] | 229 | ExprKind::If(..) | ExprKind::Block(..) | ExprKind::IfLet(..) => { |
| 230 | fold::noop_fold_expr(e, self) |
| 231 | } |
| 232 | _ => Expr { |
| 233 | id: ast::DUMMY_NODE_ID, |
| 234 | node: ExprKind::Paren(P(fold::noop_fold_expr(e, self))), |
| 235 | span: DUMMY_SP, |
| 236 | attrs: ThinVec::new(), |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 237 | }, |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 238 | }) |
| 239 | } |
| 240 | |
| 241 | fn fold_field(&mut self, f: Field) -> Field { |
| 242 | Field { |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 243 | expr: if f.is_shorthand { |
| 244 | f.expr.map(|e| fold::noop_fold_expr(e, self)) |
| 245 | } else { |
| 246 | self.fold_expr(f.expr) |
| 247 | }, |
David Tolnay | a317499 | 2018-04-06 22:41:59 -0700 | [diff] [blame] | 248 | ..f |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 249 | } |
| 250 | } |
| 251 | |
| 252 | // We don't want to look at expressions that might appear in patterns or |
| 253 | // types yet. We'll look into comparing those in the future. For now |
| 254 | // focus on expressions appearing in other places. |
| 255 | fn fold_pat(&mut self, pat: P<Pat>) -> P<Pat> { |
| 256 | pat |
| 257 | } |
| 258 | |
| 259 | fn fold_ty(&mut self, ty: P<Ty>) -> P<Ty> { |
| 260 | ty |
| 261 | } |
| 262 | |
| 263 | fn fold_stmt(&mut self, stmt: Stmt) -> SmallVector<Stmt> { |
| 264 | let node = match stmt.node { |
| 265 | // Don't wrap toplevel expressions in statements. |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 266 | StmtKind::Expr(e) => StmtKind::Expr(e.map(|e| fold::noop_fold_expr(e, self))), |
| 267 | StmtKind::Semi(e) => StmtKind::Semi(e.map(|e| fold::noop_fold_expr(e, self))), |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 268 | s => s, |
| 269 | }; |
| 270 | |
David Tolnay | 54bdb4f | 2018-03-17 13:00:42 -0700 | [diff] [blame] | 271 | SmallVector::one(Stmt { node, ..stmt }) |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 272 | } |
| 273 | |
| 274 | fn fold_mac(&mut self, mac: Mac) -> Mac { |
David Tolnay | cfa5cc0 | 2017-11-13 01:05:11 -0800 | [diff] [blame] | 275 | // By default when folding over macros, libsyntax panics. This is |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 276 | // because it's usually not what you want, you want to run after |
| 277 | // macro expansion. We do want to do that (syn doesn't do macro |
| 278 | // expansion), so we implement fold_mac to just return the macro |
| 279 | // unchanged. |
| 280 | mac |
| 281 | } |
| 282 | } |
| 283 | |
David Tolnay | 5138205 | 2017-12-27 13:46:21 -0500 | [diff] [blame] | 284 | let mut folder = BracketsFolder { failed: false }; |
David Tolnay | cfa5cc0 | 2017-11-13 01:05:11 -0800 | [diff] [blame] | 285 | let e = folder.fold_expr(libsyntax_expr); |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 286 | if folder.failed { |
| 287 | None |
| 288 | } else { |
| 289 | Some(e) |
| 290 | } |
| 291 | } |
| 292 | |
| 293 | /// Wrap every expression which is not already wrapped in parens with parens, to |
David Tolnay | eb75206 | 2018-01-06 13:51:42 -0800 | [diff] [blame] | 294 | /// reveal the precedence of the parsed expressions, and produce a stringified form |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 295 | /// of the resulting expression. |
| 296 | fn syn_brackets(syn_expr: syn::Expr) -> syn::Expr { |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 297 | use syn::fold::*; |
David Tolnay | eb7d79b | 2018-03-31 22:52:17 +0200 | [diff] [blame] | 298 | use syn::*; |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 299 | |
David Tolnay | eb75206 | 2018-01-06 13:51:42 -0800 | [diff] [blame] | 300 | struct ParenthesizeEveryExpr; |
| 301 | impl Fold for ParenthesizeEveryExpr { |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 302 | fn fold_expr(&mut self, expr: Expr) -> Expr { |
David Tolnay | 8c91b88 | 2017-12-28 23:04:32 -0500 | [diff] [blame] | 303 | match expr { |
| 304 | Expr::Group(_) => unreachable!(), |
David Tolnay | 61037c6 | 2018-01-05 16:21:03 -0800 | [diff] [blame] | 305 | Expr::If(..) | Expr::Unsafe(..) | Expr::Block(..) | Expr::IfLet(..) => { |
David Tolnay | 3bc597f | 2017-12-31 02:31:11 -0500 | [diff] [blame] | 306 | fold_expr(self, expr) |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 307 | } |
David Tolnay | 5d314dc | 2018-07-21 16:40:01 -0700 | [diff] [blame] | 308 | node => Expr::Paren(ExprParen { |
| 309 | attrs: Vec::new(), |
| 310 | expr: Box::new(fold_expr(self, node)), |
| 311 | paren_token: token::Paren::default(), |
| 312 | }), |
David Tolnay | 8c91b88 | 2017-12-28 23:04:32 -0500 | [diff] [blame] | 313 | } |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 314 | } |
| 315 | |
| 316 | fn fold_stmt(&mut self, stmt: Stmt) -> Stmt { |
| 317 | match stmt { |
| 318 | // Don't wrap toplevel expressions in statements. |
David Tolnay | 1f0b7b8 | 2018-01-06 16:07:14 -0800 | [diff] [blame] | 319 | Stmt::Expr(e) => Stmt::Expr(fold_expr(self, e)), |
| 320 | Stmt::Semi(e, semi) => Stmt::Semi(fold_expr(self, e), semi), |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 321 | s => s, |
| 322 | } |
| 323 | } |
| 324 | |
| 325 | // We don't want to look at expressions that might appear in patterns or |
| 326 | // types yet. We'll look into comparing those in the future. For now |
| 327 | // focus on expressions appearing in other places. |
| 328 | fn fold_pat(&mut self, pat: Pat) -> Pat { |
| 329 | pat |
| 330 | } |
| 331 | |
David Tolnay | fd6bf5c | 2017-11-12 09:41:14 -0800 | [diff] [blame] | 332 | fn fold_type(&mut self, ty: Type) -> Type { |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 333 | ty |
| 334 | } |
| 335 | } |
| 336 | |
David Tolnay | eb75206 | 2018-01-06 13:51:42 -0800 | [diff] [blame] | 337 | let mut folder = ParenthesizeEveryExpr; |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 338 | folder.fold_expr(syn_expr) |
| 339 | } |
| 340 | |
| 341 | /// Walk through a crate collecting all expressions we can find in it. |
David Tolnay | c7a5d3d | 2017-06-04 12:11:05 -0700 | [diff] [blame] | 342 | fn collect_exprs(file: syn::File) -> Vec<syn::Expr> { |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 343 | use syn::fold::*; |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 344 | use syn::punctuated::Punctuated; |
David Tolnay | eb7d79b | 2018-03-31 22:52:17 +0200 | [diff] [blame] | 345 | use syn::*; |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 346 | |
David Tolnay | eb75206 | 2018-01-06 13:51:42 -0800 | [diff] [blame] | 347 | struct CollectExprs(Vec<Expr>); |
| 348 | impl Fold for CollectExprs { |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 349 | fn fold_expr(&mut self, expr: Expr) -> Expr { |
| 350 | self.0.push(expr); |
| 351 | |
David Tolnay | 8c91b88 | 2017-12-28 23:04:32 -0500 | [diff] [blame] | 352 | Expr::Tuple(ExprTuple { |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 353 | attrs: vec![], |
David Tolnay | f2cfd72 | 2017-12-31 18:02:51 -0500 | [diff] [blame] | 354 | elems: Punctuated::new(), |
David Tolnay | 8c91b88 | 2017-12-28 23:04:32 -0500 | [diff] [blame] | 355 | paren_token: token::Paren::default(), |
| 356 | }) |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 357 | } |
| 358 | } |
| 359 | |
David Tolnay | eb75206 | 2018-01-06 13:51:42 -0800 | [diff] [blame] | 360 | let mut folder = CollectExprs(vec![]); |
David Tolnay | c7a5d3d | 2017-06-04 12:11:05 -0700 | [diff] [blame] | 361 | folder.fold_file(file); |
Michael Layzell | 53fc31a | 2017-06-07 09:21:53 -0400 | [diff] [blame] | 362 | folder.0 |
| 363 | } |