From 4c7886de8008b07e892ea741be08291dae38f7bd Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Wed, 27 Apr 2011 13:06:19 -0700 Subject: Fix _str.bytes to trivial version. --- src/rt/rust_builtin.cpp | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'src/rt') diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp index 30e2eb3d..5566835d 100644 --- a/src/rt/rust_builtin.cpp +++ b/src/rt/rust_builtin.cpp @@ -219,6 +219,32 @@ str_buf(rust_task *task, rust_str *s) return (char const *)&s->data[0]; } +extern "C" CDECL rust_vec* +str_vec(rust_task *task, rust_str *s) +{ + // FIXME: this should just upref s and return it, but we + // accidentally made too much of the language and runtime know + // and care about the difference between str and vec (trailing null); + // eliminate these differences and then rewrite this back to just + // the following: + // + // if (s->ref_count != CONST_REFCOUNT) + // s->ref(); + // return s; + + rust_str *v = + vec_alloc_with_data(task, + s->fill - 1, + s->fill - 1, + 1, + (s->fill - 1) ? (void*)s->data : NULL); + if (!v) { + task->fail(2); + return NULL; + } + return v; +} + extern "C" CDECL size_t str_byte_len(rust_task *task, rust_str *s) { -- cgit v1.2.3