a couple i/o performance tweaks

JuliaLang · Apr 12, 2012 · 3dff874 · StefanKarpinski · Apr 12, 2012 · JeffBezanson
1 parent afc21f7
commit 3dff874
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/base/io.jl b/base/io.jl
@@ -355,8 +355,7 @@ function done(itr::LineIterator, line)
 end
 
 function next(itr::LineIterator, this_line)
-    next_line = readline(itr.stream)
-    this_line, next_line
+    this_line, readline(itr.stream)
 end
 
 each_line(stream::IOStream) = LineIterator(stream)

diff --git a/src/array.c b/src/array.c
@@ -162,7 +162,10 @@ jl_value_t *jl_array_to_string(jl_array_t *a)
     // TODO: check type of array?
     jl_struct_type_t* string_type = u8_isvalid(a->data, a->length) == 1 ? // ASCII
         jl_ascii_string_type : jl_utf8_string_type;
-    return jl_apply((jl_function_t*)string_type, (jl_value_t**)&a, 1);
+    jl_value_t *s = alloc_2w();
+    s->type = (jl_type_t*)string_type;
+    jl_fieldref(s,0) = (jl_value_t*)a;
+    return s;
 }
 
 jl_value_t *jl_pchar_to_string(char *str, size_t len)