user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Temp commit on the way to making meta_item into an interior vector

Browse source
This commit is contained in:
Patrick Walton 2011-07-05 17:57:34 -07:00
parent 3f6c9f8d84
commit ec890fff23
6 changed files with 53 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/comp/front/attr.rs
View file

@ -29,13 +29,11 @@ export mk_attr;
// From a list of crate attributes get only the meta_items that impact crate
// linkage
fn find_linkage_metas(&ast::attribute[] attrs) -> vec[@ast::meta_item] {
let vec[@ast::meta_item] metas = [];
fn find_linkage_metas(&ast::attribute[] attrs) -> (@ast::meta_item)[] {
let (@ast::meta_item)[] metas = ~[];
for (ast::attribute attr in find_attrs_by_name(attrs, "link")) {
alt (attr.node.value.node) {
case (ast::meta_list(_, ?items)) {
metas += items;
}
case (ast::meta_list(_, ?items)) { metas += items; }
case (_) {
log "ignoring link attribute that has incorrect type";
}
@ -133,7 +131,7 @@ fn eq(@ast::meta_item a, @ast::meta_item b) -> bool {
}
}
fn contains(&vec[@ast::meta_item] haystack, @ast::meta_item needle) -> bool {
fn contains(&(@ast::meta_item)[] haystack, @ast::meta_item needle) -> bool {
log #fmt("looking for %s",
syntax::print::pprust::meta_item_to_str(*needle));
for (@ast::meta_item item in haystack) {
@ -222,8 +220,8 @@ fn mk_name_value_item(ast::ident name, ast::lit value) -> @ast::meta_item {
ret @span(ast::meta_name_value(name, value));
}
fn mk_list_item(ast::ident name,
&vec[@ast::meta_item] items) -> @ast::meta_item {
fn mk_list_item(ast::ident name, &(@ast::meta_item)[] items)
-> @ast::meta_item {
ret @span(ast::meta_list(name, items));
}

10
src/comp/front/config.rs
View file

@ -109,9 +109,9 @@ fn in_cfg(&ast::crate_cfg cfg, &ast::attribute[] attrs) -> bool {
// so we can match against them. This is the list of configurations for
// which the item is valid
auto item_cfg_metas = {
fn extract_metas(&vec[@ast::meta_item] inner_items,
fn extract_metas(&(@ast::meta_item)[] inner_items,
&@ast::meta_item cfg_item)
-> vec[@ast::meta_item] {
-> (@ast::meta_item)[] {
alt (cfg_item.node) {
case (ast::meta_list(?name, ?items)) {
@ -122,13 +122,11 @@ fn in_cfg(&ast::crate_cfg cfg, &ast::attribute[] attrs) -> bool {
}
}
auto cfg_metas = attr::attr_metas(item_cfg_attrs);
vec::foldl(extract_metas, [], cfg_metas)
ivec::foldl(extract_metas, ~[], cfg_metas)
};
for (@ast::meta_item cfg_mi in item_cfg_metas) {
if (attr::contains(cfg, cfg_mi)) {
ret true;
}
if (attr::contains(cfg, cfg_mi)) { ret true; }
}
ret false;