Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Expand ItemDecorator extensions in all contexts #12258

Closed
wants to merge 2 commits into from
Closed

Expand ItemDecorator extensions in all contexts #12258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c02749
Tweak ItemDecorator API
sfackler Feb 13, 2014
907daa2
Expand ItemDecorator extensions in all contexts
sfackler Feb 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libsyntax/ext/base.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ pub struct MacroDef {
}

pub type ItemDecorator =
fn(&mut ExtCtxt, Span, @ast::MetaItem, ~[@ast::Item]) -> ~[@ast::Item];
fn(&mut ExtCtxt, Span, @ast::MetaItem, @ast::Item, |@ast::Item|);

pub struct BasicMacroExpander {
expander: MacroExpanderFn,
Expand Down
12 changes: 6 additions & 6 deletions src/libsyntax/ext/deriving/clone.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ use ext::deriving::generic::*;
pub fn expand_deriving_clone(cx: &mut ExtCtxt,
span: Span,
mitem: @MetaItem,
in_items: ~[@Item])
-> ~[@Item] {
item: @Item,
push: |@Item|) {
let trait_def = TraitDef {
span: span,
path: Path::new(~["std", "clone", "Clone"]),
Expand All @@ -38,14 +38,14 @@ pub fn expand_deriving_clone(cx: &mut ExtCtxt,
]
};

trait_def.expand(cx, mitem, in_items)
trait_def.expand(cx, mitem, item, push)
}

pub fn expand_deriving_deep_clone(cx: &mut ExtCtxt,
span: Span,
mitem: @MetaItem,
in_items: ~[@Item])
-> ~[@Item] {
item: @Item,
push: |@Item|) {
let trait_def = TraitDef {
span: span,
path: Path::new(~["std", "clone", "DeepClone"]),
Expand All @@ -67,7 +67,7 @@ pub fn expand_deriving_deep_clone(cx: &mut ExtCtxt,
]
};

trait_def.expand(cx, mitem, in_items)
trait_def.expand(cx, mitem, item, push)
}

fn cs_clone(
Expand Down
5 changes: 3 additions & 2 deletions src/libsyntax/ext/deriving/cmp/eq.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ use ext::deriving::generic::*;
pub fn expand_deriving_eq(cx: &mut ExtCtxt,
span: Span,
mitem: @MetaItem,
in_items: ~[@Item]) -> ~[@Item] {
item: @Item,
push: |@Item|) {
// structures are equal if all fields are equal, and non equal, if
// any fields are not equal or if the enum variants are different
fn cs_eq(cx: &mut ExtCtxt, span: Span, substr: &Substructure) -> @Expr {
Expand Down Expand Up @@ -54,5 +55,5 @@ pub fn expand_deriving_eq(cx: &mut ExtCtxt,
md!("ne", cs_ne)
]
};
trait_def.expand(cx, mitem, in_items)
trait_def.expand(cx, mitem, item, push)
}
5 changes: 3 additions & 2 deletions src/libsyntax/ext/deriving/cmp/ord.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ use ext::deriving::generic::*;
pub fn expand_deriving_ord(cx: &mut ExtCtxt,
span: Span,
mitem: @MetaItem,
in_items: ~[@Item]) -> ~[@Item] {
item: @Item,
push: |@Item|) {
macro_rules! md (
($name:expr, $op:expr, $equal:expr) => {
MethodDef {
Expand Down Expand Up @@ -46,7 +47,7 @@ pub fn expand_deriving_ord(cx: &mut ExtCtxt,
md!("ge", false, true)
]
};
trait_def.expand(cx, mitem, in_items)
trait_def.expand(cx, mitem, item, push)
}

/// Strict inequality.
Expand Down
5 changes: 3 additions & 2 deletions src/libsyntax/ext/deriving/cmp/totaleq.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ use ext::deriving::generic::*;
pub fn expand_deriving_totaleq(cx: &mut ExtCtxt,
span: Span,
mitem: @MetaItem,
in_items: ~[@Item]) -> ~[@Item] {
item: @Item,
push: |@Item|) {
fn cs_equals(cx: &mut ExtCtxt, span: Span, substr: &Substructure) -> @Expr {
cs_and(|cx, span, _, _| cx.expr_bool(span, false),
cx, span, substr)
Expand All @@ -41,5 +42,5 @@ pub fn expand_deriving_totaleq(cx: &mut ExtCtxt,
}
]
};
trait_def.expand(cx, mitem, in_items)
trait_def.expand(cx, mitem, item, push)
}
5 changes: 3 additions & 2 deletions src/libsyntax/ext/deriving/cmp/totalord.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ use std::cmp::{Ordering, Equal, Less, Greater};
pub fn expand_deriving_totalord(cx: &mut ExtCtxt,
span: Span,
mitem: @MetaItem,
in_items: ~[@Item]) -> ~[@Item] {
item: @Item,
push: |@Item|) {
let trait_def = TraitDef {
span: span,
path: Path::new(~["std", "cmp", "TotalOrd"]),
Expand All @@ -39,7 +40,7 @@ pub fn expand_deriving_totalord(cx: &mut ExtCtxt,
]
};

trait_def.expand(cx, mitem, in_items)
trait_def.expand(cx, mitem, item, push)
}


Expand Down
5 changes: 3 additions & 2 deletions src/libsyntax/ext/deriving/decodable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ use parse::token;
pub fn expand_deriving_decodable(cx: &mut ExtCtxt,
span: Span,
mitem: @MetaItem,
in_items: ~[@Item]) -> ~[@Item] {
item: @Item,
push: |@Item|) {
let trait_def = TraitDef {
span: span,
path: Path::new_(~["serialize", "Decodable"], None,
Expand All @@ -49,7 +50,7 @@ pub fn expand_deriving_decodable(cx: &mut ExtCtxt,
]
};

trait_def.expand(cx, mitem, in_items)
trait_def.expand(cx, mitem, item, push)
}

fn decodable_substructure(cx: &mut ExtCtxt, trait_span: Span,
Expand Down
6 changes: 3 additions & 3 deletions src/libsyntax/ext/deriving/default.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ use ext::deriving::generic::*;
pub fn expand_deriving_default(cx: &mut ExtCtxt,
span: Span,
mitem: @MetaItem,
in_items: ~[@Item])
-> ~[@Item] {
item: @Item,
push: |@Item|) {
let trait_def = TraitDef {
span: span,
path: Path::new(~["std", "default", "Default"]),
Expand All @@ -37,7 +37,7 @@ pub fn expand_deriving_default(cx: &mut ExtCtxt,
},
]
};
trait_def.expand(cx, mitem, in_items)
trait_def.expand(cx, mitem, item, push)
}

fn default_substructure(cx: &mut ExtCtxt, trait_span: Span, substr: &Substructure) -> @Expr {
Expand Down
5 changes: 3 additions & 2 deletions src/libsyntax/ext/deriving/encodable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ use parse::token;
pub fn expand_deriving_encodable(cx: &mut ExtCtxt,
span: Span,
mitem: @MetaItem,
in_items: ~[@Item]) -> ~[@Item] {
item: @Item,
push: |@Item|) {
let trait_def = TraitDef {
span: span,
path: Path::new_(~["serialize", "Encodable"], None,
Expand All @@ -110,7 +111,7 @@ pub fn expand_deriving_encodable(cx: &mut ExtCtxt,
]
};

trait_def.expand(cx, mitem, in_items)
trait_def.expand(cx, mitem, item, push)
}

fn encodable_substructure(cx: &mut ExtCtxt, trait_span: Span,
Expand Down
34 changes: 15 additions & 19 deletions src/libsyntax/ext/deriving/generic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,27 +322,23 @@ impl<'a> TraitDef<'a> {
pub fn expand(&self,
cx: &mut ExtCtxt,
_mitem: @ast::MetaItem,
in_items: ~[@ast::Item]) -> ~[@ast::Item] {
let mut result = ~[];
for item in in_items.iter() {
result.push(*item);
match item.node {
ast::ItemStruct(struct_def, ref generics) => {
result.push(self.expand_struct_def(cx,
struct_def,
item.ident,
generics));
}
ast::ItemEnum(ref enum_def, ref generics) => {
result.push(self.expand_enum_def(cx,
enum_def,
item.ident,
generics));
}
_ => ()
item: @ast::Item,
push: |@ast::Item|) {
match item.node {
ast::ItemStruct(struct_def, ref generics) => {
push(self.expand_struct_def(cx,
struct_def,
item.ident,
generics));
}
ast::ItemEnum(ref enum_def, ref generics) => {
push(self.expand_enum_def(cx,
enum_def,
item.ident,
generics));
}
_ => ()
}
result
}

/**
Expand Down
5 changes: 3 additions & 2 deletions src/libsyntax/ext/deriving/iter_bytes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ use ext::deriving::generic::*;
pub fn expand_deriving_iter_bytes(cx: &mut ExtCtxt,
span: Span,
mitem: @MetaItem,
in_items: ~[@Item]) -> ~[@Item] {
item: @Item,
push: |@Item|) {
let trait_def = TraitDef {
span: span,
path: Path::new(~["std", "to_bytes", "IterBytes"]),
Expand All @@ -41,7 +42,7 @@ pub fn expand_deriving_iter_bytes(cx: &mut ExtCtxt,
]
};

trait_def.expand(cx, mitem, in_items)
trait_def.expand(cx, mitem, item, push)
}

fn iter_bytes_substructure(cx: &mut ExtCtxt, trait_span: Span, substr: &Substructure) -> @Expr {
Expand Down
16 changes: 7 additions & 9 deletions src/libsyntax/ext/deriving/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,25 +48,24 @@ pub mod generic;
pub fn expand_meta_deriving(cx: &mut ExtCtxt,
_span: Span,
mitem: @MetaItem,
in_items: ~[@Item])
-> ~[@Item] {
item: @Item,
push: |@Item|) {
match mitem.node {
MetaNameValue(_, ref l) => {
cx.span_err(l.span, "unexpected value in `deriving`");
in_items
}
MetaWord(_) | MetaList(_, []) => {
cx.span_warn(mitem.span, "empty trait list in `deriving`");
in_items
}
MetaList(_, ref titems) => {
titems.rev_iter().fold(in_items, |in_items, &titem| {
for &titem in titems.rev_iter() {
match titem.node {
MetaNameValue(ref tname, _) |
MetaList(ref tname, _) |
MetaWord(ref tname) => {
macro_rules! expand(($func:path) => ($func(cx, titem.span,
titem, in_items)));
titem, item,
|i| push(i))));
match tname.get() {
"Clone" => expand!(clone::expand_deriving_clone),
"DeepClone" => expand!(clone::expand_deriving_deep_clone),
Expand Down Expand Up @@ -94,12 +93,11 @@ pub fn expand_meta_deriving(cx: &mut ExtCtxt,
ref tname => {
cx.span_err(titem.span, format!("unknown \
`deriving` trait: `{}`", *tname));
in_items
}
}
};
}
}
})
}
}
}
}
5 changes: 3 additions & 2 deletions src/libsyntax/ext/deriving/primitive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ use parse::token::InternedString;
pub fn expand_deriving_from_primitive(cx: &mut ExtCtxt,
span: Span,
mitem: @MetaItem,
in_items: ~[@Item]) -> ~[@Item] {
item: @Item,
push: |@Item|) {
let trait_def = TraitDef {
span: span,
path: Path::new(~["std", "num", "FromPrimitive"]),
Expand Down Expand Up @@ -61,7 +62,7 @@ pub fn expand_deriving_from_primitive(cx: &mut ExtCtxt,
]
};

trait_def.expand(cx, mitem, in_items)
trait_def.expand(cx, mitem, item, push)
}

fn cs_from(name: &str, cx: &mut ExtCtxt, trait_span: Span, substr: &Substructure) -> @Expr {
Expand Down
6 changes: 3 additions & 3 deletions src/libsyntax/ext/deriving/rand.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ use opt_vec;
pub fn expand_deriving_rand(cx: &mut ExtCtxt,
span: Span,
mitem: @MetaItem,
in_items: ~[@Item])
-> ~[@Item] {
item: @Item,
push: |@Item|) {
let trait_def = TraitDef {
span: span,
path: Path::new(~["std", "rand", "Rand"]),
Expand All @@ -46,7 +46,7 @@ pub fn expand_deriving_rand(cx: &mut ExtCtxt,
}
]
};
trait_def.expand(cx, mitem, in_items)
trait_def.expand(cx, mitem, item, push)
}

fn rand_substructure(cx: &mut ExtCtxt, trait_span: Span, substr: &Substructure) -> @Expr {
Expand Down
6 changes: 3 additions & 3 deletions src/libsyntax/ext/deriving/show.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ use std::hashmap::HashMap;
pub fn expand_deriving_show(cx: &mut ExtCtxt,
span: Span,
mitem: @MetaItem,
in_items: ~[@Item])
-> ~[@Item] {
item: @Item,
push: |@Item|) {
// &mut ::std::fmt::Formatter
let fmtr = Ptr(~Literal(Path::new(~["std", "fmt", "Formatter"])),
Borrowed(None, ast::MutMutable));
Expand All @@ -47,7 +47,7 @@ pub fn expand_deriving_show(cx: &mut ExtCtxt,
}
]
};
trait_def.expand(cx, mitem, in_items)
trait_def.expand(cx, mitem, item, push)
}

// we construct a format string and then defer to std::fmt, since that
Expand Down
6 changes: 3 additions & 3 deletions src/libsyntax/ext/deriving/to_str.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ use parse::token;
pub fn expand_deriving_to_str(cx: &mut ExtCtxt,
span: Span,
mitem: @MetaItem,
in_items: ~[@Item])
-> ~[@Item] {
item: @Item,
push: |@Item|) {
let trait_def = TraitDef {
span: span,
path: Path::new(~["std", "to_str", "ToStr"]),
Expand All @@ -40,7 +40,7 @@ pub fn expand_deriving_to_str(cx: &mut ExtCtxt,
}
]
};
trait_def.expand(cx, mitem, in_items)
trait_def.expand(cx, mitem, item, push)
}

// It used to be the case that this deriving implementation invoked
Expand Down
6 changes: 3 additions & 3 deletions src/libsyntax/ext/deriving/zero.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ use ext::deriving::generic::*;
pub fn expand_deriving_zero(cx: &mut ExtCtxt,
span: Span,
mitem: @MetaItem,
in_items: ~[@Item])
-> ~[@Item] {
item: @Item,
push: |@Item|) {
let trait_def = TraitDef {
span: span,
path: Path::new(~["std", "num", "Zero"]),
Expand Down Expand Up @@ -53,7 +53,7 @@ pub fn expand_deriving_zero(cx: &mut ExtCtxt,
}
]
};
trait_def.expand(cx, mitem, in_items)
trait_def.expand(cx, mitem, item, push)
}

fn zero_substructure(cx: &mut ExtCtxt, trait_span: Span, substr: &Substructure) -> @Expr {
Expand Down
Loading