rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fold all spans in the AST.

Browse Source
This commit is contained in:
Jeffrey Seyfried
2017-01-03 01:33:40 +00:00
parent d3a2efa14b
commit a2fc566d41
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libsyntax/fold.rs
View File

@@ -542,19 +542,19 @@ pub fn noop_fold_arg<T: Folder>(Arg {id, pat, ty}: Arg, fld: &mut T) -> Arg {
pub fn noop_fold_tt<T: Folder>(tt: &TokenTree, fld: &mut T) -> TokenTree { pub fn noop_fold_tt<T: Folder>(tt: &TokenTree, fld: &mut T) -> TokenTree {
match *tt { match *tt {
TokenTree::Token(span, ref tok) => TokenTree::Token(span, ref tok) =>
TokenTree::Token(span, fld.fold_token(tok.clone())), TokenTree::Token(fld.new_span(span), fld.fold_token(tok.clone())),
TokenTree::Delimited(span, ref delimed) => { TokenTree::Delimited(span, ref delimed) => {
TokenTree::Delimited(span, Rc::new( TokenTree::Delimited(fld.new_span(span), Rc::new(
Delimited { Delimited {
delim: delimed.delim, delim: delimed.delim,
open_span: delimed.open_span, open_span: fld.new_span(delimed.open_span),
tts: fld.fold_tts(&delimed.tts), tts: fld.fold_tts(&delimed.tts),
close_span: delimed.close_span, close_span: fld.new_span(delimed.close_span),
} }
)) ))
}, },
TokenTree::Sequence(span, ref seq) => TokenTree::Sequence(span, ref seq) =>
TokenTree::Sequence(span, TokenTree::Sequence(fld.new_span(span),
Rc::new(SequenceRepetition { Rc::new(SequenceRepetition {
tts: fld.fold_tts(&seq.tts), tts: fld.fold_tts(&seq.tts),
separator: seq.separator.clone().map(|tok| fld.fold_token(tok)), separator: seq.separator.clone().map(|tok| fld.fold_token(tok)),
@@ -647,7 +647,7 @@ pub fn noop_fold_fn_decl<T: Folder>(decl: P<FnDecl>, fld: &mut T) -> P<FnDecl> {
inputs: inputs.move_map(|x| fld.fold_arg(x)), inputs: inputs.move_map(|x| fld.fold_arg(x)),
output: match output { output: match output {
FunctionRetTy::Ty(ty) => FunctionRetTy::Ty(fld.fold_ty(ty)), FunctionRetTy::Ty(ty) => FunctionRetTy::Ty(fld.fold_ty(ty)),
FunctionRetTy::Default(span) => FunctionRetTy::Default(span), FunctionRetTy::Default(span) => FunctionRetTy::Default(fld.new_span(span)),
}, },
variadic: variadic variadic: variadic
}) })
@@ -674,7 +674,7 @@ pub fn noop_fold_ty_param<T: Folder>(tp: TyParam, fld: &mut T) -> TyParam {
ident: fld.fold_ident(ident), ident: fld.fold_ident(ident),
bounds: fld.fold_bounds(bounds), bounds: fld.fold_bounds(bounds),
default: default.map(|x| fld.fold_ty(x)), default: default.map(|x| fld.fold_ty(x)),
span: span span: fld.new_span(span),
} }
} }