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

Convert std::uint to istrs. Issue #855

Browse source
This commit is contained in:
Brian Anderson 2011-08-23 20:25:23 -07:00
parent 69e6abf9ce
commit ee2a11eb4f
19 changed files with 99 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/comp/middle/trans.rs
View file

@ -14,6 +14,7 @@
// int) and rec(x=int, y=int, z=int) will have the same TypeRef.
import std::int;
import std::str;
import std::istr;
import std::uint;
import std::str::rustrt::sbuf;
import std::map;
@ -1048,10 +1049,10 @@ fn get_tydesc(cx: &@block_ctxt, orig_t: ty::t, escapes: bool,
} else {
bcx_tcx(cx).sess.span_bug(cx.sp,
"Unbound typaram in get_tydesc: " +
"orig_t = " +
ty_to_str(bcx_tcx(cx), orig_t) +
" ty_param = " +
std::uint::str(id));
"orig_t = " +
ty_to_str(bcx_tcx(cx), orig_t) +
" ty_param = " +
istr::to_estr(std::uint::str(id)));
}
}
none. {/* fall through */ }
@ -1871,8 +1872,8 @@ fn iter_structural_ty_full(cx: &@block_ctxt, av: ValueRef, t: ty::t,
for variant: ty::variant_info in variants {
let variant_cx =
new_sub_block_ctxt(bcx,
"tag-iter-variant-" +
uint::to_str(i, 10u));
istr::to_estr(~"tag-iter-variant-" +
uint::to_str(i, 10u)));
llvm::LLVMAddCase(llswitch, C_int(i as int), variant_cx.llbb);
variant_cx =
iter_variant(variant_cx, llunion_a_ptr, variant, tps, tid,
@ -5517,7 +5518,7 @@ fn trans_tag_variant(cx: @local_ctxt, tag_id: ast::node_id,
fn_args +=
[{mode: ast::alias(false),
ty: varg.ty,
ident: "arg" + uint::to_str(i, 10u),
ident: istr::to_estr(~"arg" + uint::to_str(i, 10u)),
id: varg.id}];
}
assert (cx.ccx.item_ids.contains_key(variant.node.id));

3
src/comp/middle/trans_common.rs
View file

@ -6,6 +6,7 @@
import std::int;
import std::vec;
import std::str;
import std::istr;
import std::uint;
import std::str::rustrt::sbuf;
import std::map;
@ -758,7 +759,7 @@ fn T_opaque_closure_ptr(cx: &crate_ctxt) -> TypeRef {
}
fn T_tag(tn: &type_names, size: uint) -> TypeRef {
let s = "tag_" + uint::to_str(size, 10u);
let s = "tag_" + istr::to_estr(uint::to_str(size, 10u));
if tn.name_has_type(s) { ret tn.get_type(s); }
let t = T_struct([T_int(), T_array(T_i8(), size)]);
tn.associate(s, t);

3
src/comp/middle/tstate/annotate.rs
View file

@ -4,6 +4,7 @@ import std::option::some;
import std::option::none;
import std::int;
import std::uint;
import std::istr;
import syntax::ast::*;
import syntax::ast_util::pat_binding_ids;
import syntax::visit;
@ -61,7 +62,7 @@ fn node_ids_in_fn(f: &_fn, tps: &[ty_param], sp: &span, i: &fn_ident,
fn init_vecs(ccx: &crate_ctxt, node_ids: &[node_id], len: uint) {
for i: node_id in node_ids {
log int::str(i) + " |-> " + uint::str(len);
log int::str(i) + " |-> " + istr::to_estr(uint::str(len));
add_node(ccx, i, empty_ann(len));
}
}

3
src/comp/middle/tstate/auxiliary.rs
View file

@ -1,6 +1,7 @@
import std::vec;
import std::int::str;
import std::str;
import std::istr;
import std::option;
import std::option::*;
import std::int;
@ -678,7 +679,7 @@ fn expr_to_constr(tcx: ty::ctxt, e: &@expr) -> sp_constr {
}
fn pred_args_to_str(p: &pred_args) -> str {
"<" + uint::str(p.node.bit_num) + ", " +
"<" + istr::to_estr(uint::str(p.node.bit_num)) + ", " +
constr_args_to_str(fn (i: &inst) -> str { ret i.ident; }, p.node.args)
+ ">"
}

9
src/comp/middle/tstate/collect_locals.rs
View file

@ -1,3 +1,4 @@
import std::istr;
import std::uint;
import std::int;
import std::vec;
@ -60,7 +61,8 @@ fn find_locals(tcx: &ty::ctxt, f: &_fn, tps: &[ty_param], sp: &span,
fn add_constraint(tcx: &ty::ctxt, c: sp_constr, next: uint, tbl: constr_map)
-> uint {
log constraint_to_str(tcx, c) + " |-> " + std::uint::str(next);
log constraint_to_str(tcx, c) + " |-> "
+ istr::to_estr(std::uint::str(next));
alt c.node {
ninit(id, i) { tbl.insert(local_def(id), cinit(next, c.span, i)); }
npred(p, d_id, args) {
@ -145,8 +147,9 @@ fn mk_fn_info(ccx: &crate_ctxt, f: &_fn, tp: &[ty_param], f_sp: &span,
i_diverge: ninit(diverges_id, diverges_name),
used_vars: v};
ccx.fm.insert(id, rslt);
log name + " has " + std::uint::str(num_constraints(rslt)) +
" constraints";
log name + istr::to_estr(~" has "
+ std::uint::str(num_constraints(rslt))
+ ~" constraints");
}

25
src/comp/middle/ty.rs
View file

@ -1,6 +1,7 @@
import std::int;
import std::vec;
import std::str;
import std::istr;
import std::uint;
import std::box;
import std::ufind;
@ -2605,14 +2606,18 @@ fn type_err_to_str(err: &ty::type_err) -> str {
terr_box_mutability. { ret "boxed values differ in mutability"; }
terr_vec_mutability. { ret "vectors differ in mutability"; }
terr_tuple_size(e_sz, a_sz) {
ret "expected a tuple with " + uint::to_str(e_sz, 10u) +
" elements but found one with " + uint::to_str(a_sz, 10u) +
" elements";
ret istr::to_estr(~"expected a tuple with " +
uint::to_str(e_sz, 10u) +
~" elements but found one with " +
uint::to_str(a_sz, 10u) +
~" elements");
}
terr_record_size(e_sz, a_sz) {
ret "expected a record with " + uint::to_str(e_sz, 10u) +
" fields but found one with " + uint::to_str(a_sz, 10u) +
" fields";
ret istr::to_estr(~"expected a record with " +
uint::to_str(e_sz, 10u) +
~" fields but found one with " +
uint::to_str(a_sz, 10u) +
~" fields");
}
terr_record_mutability. { ret "record elements differ in mutability"; }
terr_record_fields(e_fld, a_fld) {
@ -2630,10 +2635,10 @@ fn type_err_to_str(err: &ty::type_err) -> str {
mode_str_1(a_mode);
}
terr_constr_len(e_len, a_len) {
ret "Expected a type with " + uint::str(e_len) +
" constraints, \
but found one with " +
uint::str(a_len) + " constraints";
ret istr::to_estr(~"Expected a type with " +
uint::str(e_len) +
~" constraints, but found one with " +
uint::str(a_len) + ~" constraints");
}
terr_constr_mismatch(e_constr, a_constr) {
ret "Expected a type with constraint " + ty_constr_to_str(e_constr) +