---

yaml
---
r: 14070
b: refs/heads/try
c: 6be25c8
h: refs/heads/master
v: v3

Author: killerswan

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: d3dfe8758d674d41c3aae116385bcc2b992413ed
+refs/heads/try: 6be25c8a0cfe28f032ce2b65f8cb07dd1a1ae148
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libcore/str.rs

@@ -97,6 +97,7 @@ export
    as_buf,
    //buf,
    sbuf,
+   reserve,
 
    unsafe;
 
@@ -105,6 +106,7 @@ export
 #[abi = "cdecl"]
 native mod rustrt {
     fn rust_str_push(&s: str, ch: u8);
+    fn str_reserve_shared(&ss: str, nn: ctypes::size_t);
 }
 
 // FIXME: add pure to a lot of functions
@@ -755,6 +757,7 @@ Apply a function to each character
 */
 fn map(ss: str, ff: fn(char) -> char) -> str {
     let result = "";
+    reserve(result, byte_len(ss));
 
     chars_iter(ss, {|cc|
         str::push_char(result, ff(cc));
@@ -1302,6 +1305,13 @@ An unsafe buffer of bytes. Corresponds to a C char pointer.
 */
 type sbuf = *u8;
 
+// Function: reserve
+//
+// Allocate more memory for a string, up to `nn` + 1 bytes
+fn reserve(&ss: str, nn: uint) {
+    rustrt::str_reserve_shared(ss, nn);
+}
+
 // Module: unsafe
 //
 // These functions may create invalid UTF-8 strings and eat your baby.

branches/try/src/rt/rust_builtin.cpp

@@ -105,6 +105,13 @@ vec_reserve_shared(type_desc* ty, rust_vec** vp,
     reserve_vec_exact(task, vp, n_elts * ty->size);
 }
 
+extern "C" CDECL void
+str_reserve_shared(rust_vec** sp,
+                   size_t n_elts) {
+    rust_task *task = rust_task_thread::get_task();
+    reserve_vec_exact(task, sp, n_elts + 1);
+}
+
 /**
  * Copies elements in an unsafe buffer to the given interior vector. The
  * vector must have size zero.

branches/try/src/rt/rustrt.def.in

@@ -50,6 +50,7 @@ shape_log_str
 squareroot
 start_task
 vec_reserve_shared
+str_reserve_shared
 vec_from_buf_shared
 unsupervise
 upcall_cmp_type