core: Don't use upcall_vec_grow from str::push_char
This commit is contained in:
Brian Anderson
parent
7a87258155
commit
0d5d2e5e14
1 changed files with 61 additions and 60 deletions
|
|
@ -101,8 +101,6 @@ export
|
||||||
native mod rustrt {
|
native mod rustrt {
|
||||||
fn rust_str_push(&s: str, ch: u8);
|
fn rust_str_push(&s: str, ch: u8);
|
||||||
fn str_reserve_shared(&ss: str, nn: libc::size_t);
|
fn str_reserve_shared(&ss: str, nn: libc::size_t);
|
||||||
#[rust_stack]
|
|
||||||
fn upcall_vec_grow(&s: str, new_sz: libc::size_t);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -145,66 +143,69 @@ fn push_char(&s: str, ch: char) unsafe {
|
||||||
else if code < max_four_b { 4u }
|
else if code < max_four_b { 4u }
|
||||||
else if code < max_five_b { 5u }
|
else if code < max_five_b { 5u }
|
||||||
else { 6u };
|
else { 6u };
|
||||||
let mut repr: *vec::unsafe::vec_repr = ::unsafe::reinterpret_cast(s);
|
let len = len(s);
|
||||||
let fill = (*repr).fill;
|
let new_len = len + nb;
|
||||||
if fill + nb <= (*repr).alloc {
|
reserve_at_least(s, new_len);
|
||||||
(*repr).fill = fill + nb;
|
let off = len;
|
||||||
} else {
|
as_buf(s) {|buf|
|
||||||
rustrt::upcall_vec_grow(s, fill + nb);
|
let buf: *mut u8 = ::unsafe::reinterpret_cast(buf);
|
||||||
// possibly realloc'd
|
if nb == 1u {
|
||||||
repr = ::unsafe::reinterpret_cast(s);
|
*ptr::mut_offset(buf, off) =
|
||||||
|
code as u8;
|
||||||
|
} else if nb == 2u {
|
||||||
|
*ptr::mut_offset(buf, off) =
|
||||||
|
(code >> 6u & 31u | tag_two_b) as u8;
|
||||||
|
*ptr::mut_offset(buf, off + 1u) =
|
||||||
|
(code & 63u | tag_cont) as u8;
|
||||||
|
} else if nb == 3u {
|
||||||
|
*ptr::mut_offset(buf, off) =
|
||||||
|
(code >> 12u & 15u | tag_three_b) as u8;
|
||||||
|
*ptr::mut_offset(buf, off + 1u) =
|
||||||
|
(code >> 6u & 63u | tag_cont) as u8;
|
||||||
|
*ptr::mut_offset(buf, off + 2u) =
|
||||||
|
(code & 63u | tag_cont) as u8;
|
||||||
|
} else if nb == 4u {
|
||||||
|
*ptr::mut_offset(buf, off) =
|
||||||
|
(code >> 18u & 7u | tag_four_b) as u8;
|
||||||
|
*ptr::mut_offset(buf, off + 1u) =
|
||||||
|
(code >> 12u & 63u | tag_cont) as u8;
|
||||||
|
*ptr::mut_offset(buf, off + 2u) =
|
||||||
|
(code >> 6u & 63u | tag_cont) as u8;
|
||||||
|
*ptr::mut_offset(buf, off + 3u) =
|
||||||
|
(code & 63u | tag_cont) as u8;
|
||||||
|
} else if nb == 5u {
|
||||||
|
*ptr::mut_offset(buf, off) =
|
||||||
|
(code >> 24u & 3u | tag_five_b) as u8;
|
||||||
|
*ptr::mut_offset(buf, off + 1u) =
|
||||||
|
(code >> 18u & 63u | tag_cont) as u8;
|
||||||
|
*ptr::mut_offset(buf, off + 2u) =
|
||||||
|
(code >> 12u & 63u | tag_cont) as u8;
|
||||||
|
*ptr::mut_offset(buf, off + 3u) =
|
||||||
|
(code >> 6u & 63u | tag_cont) as u8;
|
||||||
|
*ptr::mut_offset(buf, off + 4u) =
|
||||||
|
(code & 63u | tag_cont) as u8;
|
||||||
|
} else if nb == 6u {
|
||||||
|
*ptr::mut_offset(buf, off) =
|
||||||
|
(code >> 30u & 1u | tag_six_b) as u8;
|
||||||
|
*ptr::mut_offset(buf, off + 1u) =
|
||||||
|
(code >> 24u & 63u | tag_cont) as u8;
|
||||||
|
*ptr::mut_offset(buf, off + 2u) =
|
||||||
|
(code >> 18u & 63u | tag_cont) as u8;
|
||||||
|
*ptr::mut_offset(buf, off + 3u) =
|
||||||
|
(code >> 12u & 63u | tag_cont) as u8;
|
||||||
|
*ptr::mut_offset(buf, off + 4u) =
|
||||||
|
(code >> 6u & 63u | tag_cont) as u8;
|
||||||
|
*ptr::mut_offset(buf, off + 5u) =
|
||||||
|
(code & 63u | tag_cont) as u8;
|
||||||
|
}
|
||||||
|
*ptr::mut_offset(buf, off + nb) = 0u8;
|
||||||
}
|
}
|
||||||
let off = fill - 1u;
|
|
||||||
if nb == 1u {
|
as_bytes(s) {|bytes|
|
||||||
*ptr::mut_offset(ptr::mut_addr_of((*repr).data), off) =
|
let mut mut_bytes: [u8] = ::unsafe::reinterpret_cast(bytes);
|
||||||
code as u8;
|
vec::unsafe::set_len(mut_bytes, new_len + 1u);
|
||||||
} else if nb == 2u {
|
::unsafe::forget(mut_bytes);
|
||||||
*ptr::mut_offset(ptr::mut_addr_of((*repr).data), off) =
|
|
||||||
(code >> 6u & 31u | tag_two_b) as u8;
|
|
||||||
*ptr::mut_offset(ptr::mut_addr_of((*repr).data), off + 1u) =
|
|
||||||
(code & 63u | tag_cont) as u8;
|
|
||||||
} else if nb == 3u {
|
|
||||||
*ptr::mut_offset(ptr::mut_addr_of((*repr).data), off) =
|
|
||||||
(code >> 12u & 15u | tag_three_b) as u8;
|
|
||||||
*ptr::mut_offset(ptr::mut_addr_of((*repr).data), off + 1u) =
|
|
||||||
(code >> 6u & 63u | tag_cont) as u8;
|
|
||||||
*ptr::mut_offset(ptr::mut_addr_of((*repr).data), off + 2u) =
|
|
||||||
(code & 63u | tag_cont) as u8;
|
|
||||||
} else if nb == 4u {
|
|
||||||
*ptr::mut_offset(ptr::mut_addr_of((*repr).data), off) =
|
|
||||||
(code >> 18u & 7u | tag_four_b) as u8;
|
|
||||||
*ptr::mut_offset(ptr::mut_addr_of((*repr).data), off + 1u) =
|
|
||||||
(code >> 12u & 63u | tag_cont) as u8;
|
|
||||||
*ptr::mut_offset(ptr::mut_addr_of((*repr).data), off + 2u) =
|
|
||||||
(code >> 6u & 63u | tag_cont) as u8;
|
|
||||||
*ptr::mut_offset(ptr::mut_addr_of((*repr).data), off + 3u) =
|
|
||||||
(code & 63u | tag_cont) as u8;
|
|
||||||
} else if nb == 5u {
|
|
||||||
*ptr::mut_offset(ptr::mut_addr_of((*repr).data), off) =
|
|
||||||
(code >> 24u & 3u | tag_five_b) as u8;
|
|
||||||
*ptr::mut_offset(ptr::mut_addr_of((*repr).data), off + 1u) =
|
|
||||||
(code >> 18u & 63u | tag_cont) as u8;
|
|
||||||
*ptr::mut_offset(ptr::mut_addr_of((*repr).data), off + 2u) =
|
|
||||||
(code >> 12u & 63u | tag_cont) as u8;
|
|
||||||
*ptr::mut_offset(ptr::mut_addr_of((*repr).data), off + 3u) =
|
|
||||||
(code >> 6u & 63u | tag_cont) as u8;
|
|
||||||
*ptr::mut_offset(ptr::mut_addr_of((*repr).data), off + 4u) =
|
|
||||||
(code & 63u | tag_cont) as u8;
|
|
||||||
} else if nb == 6u {
|
|
||||||
*ptr::mut_offset(ptr::mut_addr_of((*repr).data), off) =
|
|
||||||
(code >> 30u & 1u | tag_six_b) as u8;
|
|
||||||
*ptr::mut_offset(ptr::mut_addr_of((*repr).data), off + 1u) =
|
|
||||||
(code >> 24u & 63u | tag_cont) as u8;
|
|
||||||
*ptr::mut_offset(ptr::mut_addr_of((*repr).data), off + 2u) =
|
|
||||||
(code >> 18u & 63u | tag_cont) as u8;
|
|
||||||
*ptr::mut_offset(ptr::mut_addr_of((*repr).data), off + 3u) =
|
|
||||||
(code >> 12u & 63u | tag_cont) as u8;
|
|
||||||
*ptr::mut_offset(ptr::mut_addr_of((*repr).data), off + 4u) =
|
|
||||||
(code >> 6u & 63u | tag_cont) as u8;
|
|
||||||
*ptr::mut_offset(ptr::mut_addr_of((*repr).data), off + 5u) =
|
|
||||||
(code & 63u | tag_cont) as u8;
|
|
||||||
}
|
}
|
||||||
*ptr::mut_offset(ptr::mut_addr_of((*repr).data), off + nb) = 0u8;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[doc = "Convert a char to a string"]
|
#[doc = "Convert a char to a string"]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue