rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rename istr-stuff to str in the runtime. Issue #855

Browse Source
This commit is contained in:
Brian Anderson
2011-09-02 16:56:07 -07:00
parent a1d71995ec
commit 01b254b411
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/str.rs
View File

@@ -7,7 +7,7 @@ export eq, lteq, hash, is_empty, is_not_empty, is_whitespace, byte_len, index,
str_from_cstr, sbuf, as_buf, push_byte, utf8_char_width, safe_slice; str_from_cstr, sbuf, as_buf, push_byte, utf8_char_width, safe_slice;
native "rust" mod rustrt { native "rust" mod rustrt {
fn rust_istr_push(s: &mutable str, ch: u8); fn rust_str_push(s: &mutable str, ch: u8);
} }
fn eq(a: &str, b: &str) -> bool { a == b } fn eq(a: &str, b: &str) -> bool { a == b }
@@ -315,10 +315,10 @@ fn pop_byte(s: &mutable str) -> u8 {
ret b; ret b;
} }
fn push_byte(s: &mutable str, b: u8) { rustrt::rust_istr_push(s, b); } fn push_byte(s: &mutable str, b: u8) { rustrt::rust_str_push(s, b); }
fn push_bytes(s: &mutable str, bytes: &[u8]) { fn push_bytes(s: &mutable str, bytes: &[u8]) {
for byte in bytes { rustrt::rust_istr_push(s, byte); } for byte in bytes { rustrt::rust_str_push(s, byte); }
} }
fn split(s: &str, sep: u8) -> [str] { fn split(s: &str, sep: u8) -> [str] {

6
src/rt/rust.cpp
View File

@@ -43,9 +43,9 @@ command_line_args : public kernel_owned<command_line_args>
"command line arg interior"); "command line arg interior");
args->fill = args->alloc = sizeof(rust_vec*) * argc; args->fill = args->alloc = sizeof(rust_vec*) * argc;
for (int i = 0; i < argc; ++i) { for (int i = 0; i < argc; ++i) {
rust_vec *str = make_istr(kernel, argv[i], rust_vec *str = make_str(kernel, argv[i],
strlen(argv[i]), strlen(argv[i]),
"command line arg"); "command line arg");
((rust_vec**)&args->data)[i] = str; ((rust_vec**)&args->data)[i] = str;
} }
} }

10
src/rt/rust_builtin.cpp
View File

@@ -40,7 +40,7 @@ last_os_error(rust_task *task) {
} }
#endif #endif
rust_vec * st = make_istr(task->kernel, buf, strlen(buf), rust_vec * st = make_str(task->kernel, buf, strlen(buf),
"last_os_error"); "last_os_error");
#ifdef __WIN32__ #ifdef __WIN32__
LocalFree((HLOCAL)buf); LocalFree((HLOCAL)buf);
@@ -63,7 +63,7 @@ rust_getcwd(rust_task *task) {
return NULL; return NULL;
} }
return make_istr(task->kernel, cbuf, strlen(cbuf), "rust_str(getcwd"); return make_str(task->kernel, cbuf, strlen(cbuf), "rust_str(getcwd");
} }
extern "C" CDECL extern "C" CDECL
@@ -127,7 +127,7 @@ vec_from_buf_shared(rust_task *task, type_desc *ty,
} }
extern "C" CDECL void extern "C" CDECL void
rust_istr_push(rust_task* task, rust_vec** sp, uint8_t byte) { rust_str_push(rust_task* task, rust_vec** sp, uint8_t byte) {
size_t fill = (*sp)->fill; size_t fill = (*sp)->fill;
reserve_vec(task, sp, fill + 1); reserve_vec(task, sp, fill + 1);
(*sp)->data[fill-1] = byte; (*sp)->data[fill-1] = byte;
@@ -329,7 +329,7 @@ rust_list_files(rust_task *task, rust_vec **path) {
HANDLE hFind = FindFirstFile((char*)(*path)->data, &FindFileData); HANDLE hFind = FindFirstFile((char*)(*path)->data, &FindFileData);
if (hFind != INVALID_HANDLE_VALUE) { if (hFind != INVALID_HANDLE_VALUE) {
do { do {
rust_vec *str = make_istr(task->kernel, FindFileData.cFileName, rust_vec *str = make_str(task->kernel, FindFileData.cFileName,
strlen(FindFileData.cFileName), strlen(FindFileData.cFileName),
"list_files_str"); "list_files_str");
strings.push(str); strings.push(str);
@@ -341,7 +341,7 @@ rust_list_files(rust_task *task, rust_vec **path) {
if (dirp) { if (dirp) {
struct dirent *dp; struct dirent *dp;
while ((dp = readdir(dirp))) { while ((dp = readdir(dirp))) {
rust_vec *str = make_istr(task->kernel, dp->d_name, rust_vec *str = make_str(task->kernel, dp->d_name,
strlen(dp->d_name), strlen(dp->d_name),
"list_files_str"); "list_files_str");
strings.push(str); strings.push(str);

2
src/rt/rust_util.h
View File

@@ -189,7 +189,7 @@ inline void reserve_vec(rust_task* task, rust_vec** vpp, size_t size) {
} }
inline rust_vec * inline rust_vec *
make_istr(rust_kernel* kernel, char* c, size_t strlen, const char* name) { make_str(rust_kernel* kernel, char* c, size_t strlen, const char* name) {
size_t str_fill = strlen + 1; size_t str_fill = strlen + 1;
size_t str_alloc = str_fill; size_t str_alloc = str_fill;
rust_vec *str = (rust_vec *) rust_vec *str = (rust_vec *)

2
src/rt/rustrt.def.in
View File

@@ -47,7 +47,7 @@ rust_file_is_dir
rust_get_stdin rust_get_stdin
rust_get_stdout rust_get_stdout
rust_get_stderr rust_get_stderr
rust_istr_push rust_str_push
rust_list_files rust_list_files
rust_process_wait rust_process_wait
rust_ptr_eq rust_ptr_eq