Skip to content

Commit 65beca4

Browse files
eholkeholk
committed
Use iteration protocol for ebml, use vec::view in more places (issue #2880)
1 parent dbbaa50 commit 65beca4

File tree

7 files changed

+51
-58
lines changed

7 files changed

+51
-58
lines changed

‎src/libstd/ebml.rs

+9-6
Original file line numberDiff line numberDiff line change
@@ -98,33 +98,36 @@ fn get_doc(d: doc, tg: uint) -> doc {
9898
}
9999
}
100100

101-
fn docs(d: doc, it: fn(uint, doc)) {
101+
fn docs(d: doc, it: fn(uint, doc) -> bool) {
102102
let mut pos = d.start;
103103
while pos < d.end {
104104
let elt_tag = vuint_at(*d.data, pos);
105105
let elt_size = vuint_at(*d.data, elt_tag.next);
106106
pos = elt_size.next + elt_size.val;
107-
it(elt_tag.val, {data: d.data, start: elt_size.next, end: pos});
107+
if !it(elt_tag.val, {data: d.data, start: elt_size.next, end: pos}) {
108+
break;
109+
}
108110
}
109111
}
110112

111-
fn tagged_docs(d: doc, tg: uint, it: fn(doc)) {
113+
fn tagged_docs(d: doc, tg: uint, it: fn(doc) -> bool) {
112114
let mut pos = d.start;
113115
while pos < d.end {
114116
let elt_tag = vuint_at(*d.data, pos);
115117
let elt_size = vuint_at(*d.data, elt_tag.next);
116118
pos = elt_size.next + elt_size.val;
117119
if elt_tag.val == tg {
118-
it({data: d.data, start: elt_size.next, end: pos});
120+
if !it({data: d.data, start: elt_size.next, end: pos}) {
121+
break;
122+
}
119123
}
120124
}
121125
}
122126

123127
fn doc_data(d: doc) -> ~[u8] { vec::slice::<u8>(*d.data, d.start, d.end) }
124128

125129
fn with_doc_data<T>(d: doc, f: fn(x: &[u8]) -> T) -> T {
126-
// FIXME (#2880): use vec::view once the region inferencer can handle it.
127-
ret f(vec::slice::<u8>(*d.data, d.start, d.end));
130+
ret f(vec::slice(*d.data, d.start, d.end));
128131
}
129132

130133
fn doc_as_str(d: doc) -> ~str { ret str::from_bytes(doc_data(d)); }

‎src/rustc/metadata/decoder.rs

+37-43
Original file line numberDiff line numberDiff line change
@@ -63,37 +63,32 @@ export translate_def_id;
6363
// what crate that's in and give us a def_id that makes sense for the current
6464
// build.
6565

66-
fn lookup_hash(d: ebml::doc, eq_fn: fn@(x:&[u8]) -> bool, hash: uint) ->
67-
~[ebml::doc] {
66+
fn lookup_hash(d: ebml::doc, eq_fn: fn(x:&[u8]) -> bool, hash: uint) ->
67+
option<ebml::doc> {
6868
let index = ebml::get_doc(d, tag_index);
6969
let table = ebml::get_doc(index, tag_index_table);
7070
let hash_pos = table.start + hash % 256u * 4u;
7171
let pos = io::u64_from_be_bytes(*d.data, hash_pos, 4u) as uint;
7272
let {tag:_, doc:bucket} = ebml::doc_at(d.data, pos);
73-
// Awkward logic because we can't ret from foreach yet
7473

75-
let mut result: ~[ebml::doc] = ~[];
7674
let belt = tag_index_buckets_bucket_elt;
77-
do ebml::tagged_docs(bucket, belt) |elt| {
75+
for ebml::tagged_docs(bucket, belt) |elt| {
7876
let pos = io::u64_from_be_bytes(*elt.data, elt.start, 4u) as uint;
79-
// FIXME (#2880): use view here.
80-
if eq_fn(vec::slice::<u8>(*elt.data, elt.start + 4u, elt.end)) {
81-
vec::push(result, ebml::doc_at(d.data, pos).doc);
77+
if eq_fn(vec::slice(*elt.data, elt.start + 4u, elt.end)) {
78+
ret some(ebml::doc_at(d.data, pos).doc);
8279
}
8380
};
84-
ret result;
81+
none
8582
}
8683

8784
fn maybe_find_item(item_id: int, items: ebml::doc) -> option<ebml::doc> {
8885
fn eq_item(bytes: &[u8], item_id: int) -> bool {
8986
ret io::u64_from_be_bytes(vec::slice(bytes, 0u, 4u), 0u, 4u) as int
9087
== item_id;
9188
}
92-
let eqer = |a| eq_item(a, item_id);
93-
let found = lookup_hash(items, eqer, hash_node_id(item_id));
94-
if vec::len(found) == 0u {
95-
ret option::none::<ebml::doc>;
96-
} else { ret option::some::<ebml::doc>(found[0]); }
89+
lookup_hash(items,
90+
|a| eq_item(a, item_id),
91+
hash_node_id(item_id))
9792
}
9893

9994
fn find_item(item_id: int, items: ebml::doc) -> ebml::doc {
@@ -121,11 +116,10 @@ fn item_symbol(item: ebml::doc) -> ~str {
121116
}
122117

123118
fn item_parent_item(d: ebml::doc) -> option<ast::def_id> {
124-
let mut found = none;
125-
do ebml::tagged_docs(d, tag_items_data_parent_item) |did| {
126-
found = some(ebml::with_doc_data(did, |d| parse_def_id(d)));
119+
for ebml::tagged_docs(d, tag_items_data_parent_item) |did| {
120+
ret some(ebml::with_doc_data(did, |d| parse_def_id(d)));
127121
}
128-
found
122+
none
129123
}
130124

131125
// XXX: This has nothing to do with classes.
@@ -171,7 +165,7 @@ fn item_type(item_id: ast::def_id, item: ebml::doc,
171165

172166
fn item_impl_traits(item: ebml::doc, tcx: ty::ctxt, cdata: cmd) -> ~[ty::t] {
173167
let mut results = ~[];
174-
do ebml::tagged_docs(item, tag_impl_trait) |ity| {
168+
for ebml::tagged_docs(item, tag_impl_trait) |ity| {
175169
vec::push(results, doc_type(ity, tcx, cdata));
176170
};
177171
results
@@ -180,7 +174,7 @@ fn item_impl_traits(item: ebml::doc, tcx: ty::ctxt, cdata: cmd) -> ~[ty::t] {
180174
fn item_ty_param_bounds(item: ebml::doc, tcx: ty::ctxt, cdata: cmd)
181175
-> @~[ty::param_bounds] {
182176
let mut bounds = ~[];
183-
do ebml::tagged_docs(item, tag_items_data_item_ty_param_bounds) |p| {
177+
for ebml::tagged_docs(item, tag_items_data_item_ty_param_bounds) |p| {
184178
let bd = parse_bounds_data(p.data, p.start, cdata.cnum, tcx, |did| {
185179
translate_def_id(cdata, did)
186180
});
@@ -199,14 +193,14 @@ fn item_ty_region_param(item: ebml::doc) -> bool {
199193
fn item_ty_param_count(item: ebml::doc) -> uint {
200194
let mut n = 0u;
201195
ebml::tagged_docs(item, tag_items_data_item_ty_param_bounds,
202-
|_p| n += 1u );
196+
|_p| { n += 1u; true } );
203197
n
204198
}
205199

206200
fn enum_variant_ids(item: ebml::doc, cdata: cmd) -> ~[ast::def_id] {
207201
let mut ids: ~[ast::def_id] = ~[];
208202
let v = tag_items_data_item_variant;
209-
do ebml::tagged_docs(item, v) |p| {
203+
for ebml::tagged_docs(item, v) |p| {
210204
let ext = ebml::with_doc_data(p, |d| parse_def_id(d));
211205
vec::push(ids, {crate: cdata.cnum, node: ext.node});
212206
};
@@ -254,7 +248,7 @@ fn item_path(item_doc: ebml::doc) -> ast_map::path {
254248
let mut result = ~[];
255249
vec::reserve(result, len);
256250

257-
do ebml::docs(path_doc) |tag, elt_doc| {
251+
for ebml::docs(path_doc) |tag, elt_doc| {
258252
if tag == tag_path_elt_mod {
259253
let str = ebml::doc_as_str(elt_doc);
260254
vec::push(result, ast_map::path_mod(@str));
@@ -342,7 +336,7 @@ fn get_impl_method(cdata: cmd, id: ast::node_id,
342336
name: ast::ident) -> ast::def_id {
343337
let items = ebml::get_doc(ebml::doc(cdata.data), tag_items);
344338
let mut found = none;
345-
do ebml::tagged_docs(find_item(id, items), tag_item_impl_method) |mid| {
339+
for ebml::tagged_docs(find_item(id, items), tag_item_impl_method) |mid| {
346340
let m_did = ebml::with_doc_data(mid, |d| parse_def_id(d));
347341
if item_name(find_item(m_did.node, items)) == name {
348342
found = some(translate_def_id(cdata, m_did));
@@ -359,7 +353,7 @@ fn get_class_method(cdata: cmd, id: ast::node_id,
359353
some(it) { it }
360354
none { fail (#fmt("get_class_method: class id not found \
361355
when looking up method %s", *name)) }};
362-
do ebml::tagged_docs(cls_items, tag_item_trait_method) |mid| {
356+
for ebml::tagged_docs(cls_items, tag_item_trait_method) |mid| {
363357
let m_did = class_member_id(mid, cdata);
364358
if item_name(mid) == name {
365359
found = some(m_did);
@@ -379,7 +373,7 @@ fn class_dtor(cdata: cmd, id: ast::node_id) -> option<ast::def_id> {
379373
none { fail (#fmt("class_dtor: class id not found \
380374
when looking up dtor for %d", id)); }
381375
};
382-
do ebml::tagged_docs(cls_items, tag_item_dtor) |doc| {
376+
for ebml::tagged_docs(cls_items, tag_item_dtor) |doc| {
383377
let doc1 = ebml::get_doc(doc, tag_def_id);
384378
let did = ebml::with_doc_data(doc1, |d| parse_def_id(d));
385379
found = some(translate_def_id(cdata, did));
@@ -428,7 +422,7 @@ fn each_path(cdata: cmd, f: fn(path_entry) -> bool) {
428422
let mut broken = false;
429423

430424
// First, go through all the explicit items.
431-
do ebml::tagged_docs(items_data, tag_items_data_item) |item_doc| {
425+
for ebml::tagged_docs(items_data, tag_items_data_item) |item_doc| {
432426
if !broken {
433427
let name = ast_map::path_to_str_with_sep(item_path(item_doc),
434428
~"::");
@@ -494,11 +488,11 @@ fn each_path(cdata: cmd, f: fn(path_entry) -> bool) {
494488
}
495489
}
496490

497-
do ebml::tagged_docs(inner_paths, tag_paths_data_item) |path_doc| {
491+
for ebml::tagged_docs(inner_paths, tag_paths_data_item) |path_doc| {
498492
g(cdata, items, path_doc, broken, f);
499493
}
500494

501-
do ebml::tagged_docs(inner_paths, tag_paths_foreign_path) |path_doc| {
495+
for ebml::tagged_docs(inner_paths, tag_paths_foreign_path) |path_doc| {
502496
g(cdata, items, path_doc, broken, f);
503497
}
504498
}
@@ -577,7 +571,7 @@ type _impl = {did: ast::def_id, ident: ast::ident, methods: ~[@method_info]};
577571
fn item_impl_methods(cdata: cmd, item: ebml::doc, base_tps: uint)
578572
-> ~[@method_info] {
579573
let mut rslt = ~[];
580-
do ebml::tagged_docs(item, tag_item_impl_method) |doc| {
574+
for ebml::tagged_docs(item, tag_item_impl_method) |doc| {
581575
let m_did = ebml::with_doc_data(doc, |d| parse_def_id(d));
582576
let mth_item = lookup_item(m_did.node, cdata.data);
583577
vec::push(rslt, @{did: translate_def_id(cdata, m_did),
@@ -597,7 +591,7 @@ fn get_impls_for_mod(cdata: cmd,
597591
let data = cdata.data;
598592
let mod_item = lookup_item(m_id, data);
599593
let mut result = ~[];
600-
do ebml::tagged_docs(mod_item, tag_mod_impl) |doc| {
594+
for ebml::tagged_docs(mod_item, tag_mod_impl) |doc| {
601595
let did = ebml::with_doc_data(doc, |d| parse_def_id(d));
602596
let local_did = translate_def_id(cdata, did);
603597
#debug("(get impls for mod) getting did %? for '%?'",
@@ -625,7 +619,7 @@ fn get_trait_methods(cdata: cmd, id: ast::node_id, tcx: ty::ctxt)
625619
let data = cdata.data;
626620
let item = lookup_item(id, data);
627621
let mut result = ~[];
628-
do ebml::tagged_docs(item, tag_item_trait_method) |mth| {
622+
for ebml::tagged_docs(item, tag_item_trait_method) |mth| {
629623
let bounds = item_ty_param_bounds(mth, tcx, cdata);
630624
let name = item_name(mth);
631625
let ty = doc_type(mth, tcx, cdata);
@@ -655,7 +649,7 @@ fn get_method_names_if_trait(cdata: cmd, node_id: ast::node_id)
655649
}
656650

657651
let resulting_method_names = @dvec();
658-
do ebml::tagged_docs(item, tag_item_trait_method) |method| {
652+
for ebml::tagged_docs(item, tag_item_trait_method) |method| {
659653
(*resulting_method_names).push(item_name(method));
660654
}
661655
ret some(resulting_method_names);
@@ -666,8 +660,8 @@ fn get_item_attrs(cdata: cmd,
666660
f: fn(~[@ast::meta_item])) {
667661

668662
let item = lookup_item(node_id, cdata.data);
669-
do ebml::tagged_docs(item, tag_attributes) |attributes| {
670-
do ebml::tagged_docs(attributes, tag_attribute) |attribute| {
663+
for ebml::tagged_docs(item, tag_attributes) |attributes| {
664+
for ebml::tagged_docs(attributes, tag_attribute) |attribute| {
671665
f(get_meta_items(attribute));
672666
}
673667
}
@@ -679,7 +673,7 @@ fn get_class_members(cdata: cmd, id: ast::node_id,
679673
let data = cdata.data;
680674
let item = lookup_item(id, data);
681675
let mut result = ~[];
682-
do ebml::tagged_docs(item, tag_item_field) |an_item| {
676+
for ebml::tagged_docs(item, tag_item_field) |an_item| {
683677
let f = item_family(an_item);
684678
if p(f) {
685679
let name = item_name(an_item);
@@ -760,12 +754,12 @@ fn item_family_to_str(fam: char) -> ~str {
760754

761755
fn get_meta_items(md: ebml::doc) -> ~[@ast::meta_item] {
762756
let mut items: ~[@ast::meta_item] = ~[];
763-
do ebml::tagged_docs(md, tag_meta_item_word) |meta_item_doc| {
757+
for ebml::tagged_docs(md, tag_meta_item_word) |meta_item_doc| {
764758
let nd = ebml::get_doc(meta_item_doc, tag_meta_item_name);
765759
let n = str::from_bytes(ebml::doc_data(nd));
766760
vec::push(items, attr::mk_word_item(@n));
767761
};
768-
do ebml::tagged_docs(md, tag_meta_item_name_value) |meta_item_doc| {
762+
for ebml::tagged_docs(md, tag_meta_item_name_value) |meta_item_doc| {
769763
let nd = ebml::get_doc(meta_item_doc, tag_meta_item_name);
770764
let vd = ebml::get_doc(meta_item_doc, tag_meta_item_value);
771765
let n = str::from_bytes(ebml::doc_data(nd));
@@ -774,7 +768,7 @@ fn get_meta_items(md: ebml::doc) -> ~[@ast::meta_item] {
774768
// but currently the encoder just drops them
775769
vec::push(items, attr::mk_name_value_item_str(@n, v));
776770
};
777-
do ebml::tagged_docs(md, tag_meta_item_list) |meta_item_doc| {
771+
for ebml::tagged_docs(md, tag_meta_item_list) |meta_item_doc| {
778772
let nd = ebml::get_doc(meta_item_doc, tag_meta_item_name);
779773
let n = str::from_bytes(ebml::doc_data(nd));
780774
let subitems = get_meta_items(meta_item_doc);
@@ -787,7 +781,7 @@ fn get_attributes(md: ebml::doc) -> ~[ast::attribute] {
787781
let mut attrs: ~[ast::attribute] = ~[];
788782
alt ebml::maybe_get_doc(md, tag_attributes) {
789783
option::some(attrs_d) {
790-
do ebml::tagged_docs(attrs_d, tag_attribute) |attr_doc| {
784+
for ebml::tagged_docs(attrs_d, tag_attribute) |attr_doc| {
791785
let meta_items = get_meta_items(attr_doc);
792786
// Currently it's only possible to have a single meta item on
793787
// an attribute
@@ -835,7 +829,7 @@ fn get_crate_deps(data: @~[u8]) -> ~[crate_dep] {
835829
fn docstr(doc: ebml::doc, tag_: uint) -> ~str {
836830
str::from_bytes(ebml::doc_data(ebml::get_doc(doc, tag_)))
837831
}
838-
do ebml::tagged_docs(depsdoc, tag_crate_dep) |depdoc| {
832+
for ebml::tagged_docs(depsdoc, tag_crate_dep) |depdoc| {
839833
vec::push(deps, {cnum: crate_num,
840834
name: @docstr(depdoc, tag_crate_dep_name),
841835
vers: @docstr(depdoc, tag_crate_dep_vers),
@@ -889,9 +883,9 @@ fn iter_crate_items(bytes: @~[u8], proc: fn(uint, ~str, ast::def_id)) {
889883
let paths = ebml::get_doc(md, tag_paths);
890884
let index = ebml::get_doc(paths, tag_index);
891885
let bs = ebml::get_doc(index, tag_index_buckets);
892-
do ebml::tagged_docs(bs, tag_index_buckets_bucket) |bucket| {
886+
for ebml::tagged_docs(bs, tag_index_buckets_bucket) |bucket| {
893887
let et = tag_index_buckets_bucket_elt;
894-
do ebml::tagged_docs(bucket, et) |elt| {
888+
for ebml::tagged_docs(bucket, et) |elt| {
895889
let data = read_path(elt);
896890
let {tag:t, doc:def} = ebml::doc_at(bytes, data.pos);
897891
let did_doc = ebml::get_doc(def, tag_def_id);

‎src/rustc/middle/astencode.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,7 @@ fn decode_side_tables(xcx: extended_decode_ctxt,
841841
ast_doc: ebml::doc) {
842842
let dcx = xcx.dcx;
843843
let tbl_doc = ast_doc[c::tag_table];
844-
do ebml::docs(tbl_doc) |tag, entry_doc| {
844+
for ebml::docs(tbl_doc) |tag, entry_doc| {
845845
let id0 = entry_doc[c::tag_table_id].as_int();
846846
let id = xcx.tr_id(id0);
847847

‎src/test/bench/core-std.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ fn main(argv: ~[~str]) {
1515
]
1616
];
1717

18-
// FIXME (#2880)
19-
let tests = vec::slice(argv, 1, argv.len());
18+
let tests = vec::view(argv, 1, argv.len());
2019

2120
#bench[shift_push];
2221
#bench[read_line];

‎src/test/bench/shootout-k-nucleotide-pipes.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ fn windows_with_carry(bb: ~[const u8], nn: uint,
8181

8282
let len = vec::len(bb);
8383
while ii < len - (nn - 1u) {
84-
// FIXME (#2880)
85-
it(vec::slice(bb, ii, ii+nn));
84+
it(vec::view(bb, ii, ii+nn));
8685
ii += 1u;
8786
}
8887

‎src/test/bench/shootout-k-nucleotide.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ fn windows_with_carry(bb: ~[const u8], nn: uint,
7979

8080
let len = vec::len(bb);
8181
while ii < len - (nn - 1u) {
82-
// FIXME (#2880)
83-
it(vec::slice(bb, ii, ii+nn));
82+
it(vec::view(bb, ii, ii+nn));
8483
ii += 1u;
8584
}
8685

‎src/test/bench/task-perf-word-count-generic.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,7 @@ fn main(argv: ~[~str]) {
308308
}
309309

310310
let readers: ~[fn~() -> word_reader] = if argv.len() >= 2 {
311-
// FIXME (#2880)
312-
vec::slice(argv, 1u, argv.len()).map(
311+
vec::view(argv, 1u, argv.len()).map(
313312
|f| fn~() -> word_reader { file_word_reader(f) } )
314313
}
315314
else {

0 commit comments

Comments
 (0)