@effekt-lang/effekt 0.6.0 → 0.7.0

package/libraries/llvm/forward-declare-c.ll

@@ -8,29 +8,6 @@ declare void @c_io_println_Int(%Int)
 declare void @c_io_println_Double(%Double)
 declare void @c_io_println_String(%Pos)
 
-declare %Pos @c_buffer_construct(i64, ptr)
-declare %Pos @c_buffer_concatenate(%Pos, %Pos)
-declare ptr @c_buffer_as_null_terminated_string(%Pos)
-declare %Pos @c_buffer_construct_from_null_terminated_string(ptr)
-declare ptr @c_buffer_construct_uninitialized(i64)
-declare ptr @c_buffer_bytes(ptr)
-declare void @c_buffer_copy(%Pos, %Pos, i64, i64, i64)
-declare %Pos @c_buffer_clone(%Pos)
-
-declare %Pos @c_buffer_eq(%Pos, %Pos)
-declare %Pos @c_buffer_substring(%Pos, i64, i64)
-declare i64 @c_buffer_length(%Pos)
-declare i64 @c_buffer_toInt(%Pos)
-declare %Pos @c_buffer_show_Int(i64)
-declare %Pos @c_buffer_show_Char(i32)
-declare %Pos @c_buffer_show_Byte(i8)
-declare %Pos @c_buffer_show_Double(double)
-declare %Int @c_buffer_index(%Pos, i64)
-declare void @c_buffer_set(%Pos, i64, i8)
-declare %Int @c_buffer_character_at(%Pos, i64)
-
-declare %Pos @c_buffer_slice(%Pos, i64, i64)
-
 declare void @hole()
 
 declare %Pos @c_ref_fresh(%Pos)
@@ -41,3 +18,26 @@ declare %Pos @c_array_new(%Int)
 declare %Int @c_array_size(%Pos)
 declare %Pos @c_array_get(%Pos, %Int)
 declare %Pos @c_array_set(%Pos, %Int, %Pos)
+
+declare %Pos @c_bytearray_new(%Int)
+declare %Int @c_bytearray_size(%Pos)
+declare %Byte @c_bytearray_get(%Pos, %Int)
+declare %Pos @c_bytearray_set(%Pos, %Int, %Byte)
+
+declare ptr @c_bytearray_data(%Pos)
+declare %Pos @c_bytearray_construct(i64, ptr)
+
+declare %Pos @c_bytearray_from_nullterminated_string(ptr)
+declare ptr @c_bytearray_into_nullterminated_string(%Pos)
+
+declare %Pos @c_bytearray_show_Int(i64)
+declare %Pos @c_bytearray_show_Char(i32)
+declare %Pos @c_bytearray_show_Byte(i8)
+declare %Pos @c_bytearray_show_Double(double)
+
+declare %Pos @c_bytearray_concatenate(%Pos, %Pos)
+declare %Pos @c_bytearray_equal(%Pos, %Pos)
+
+declare %Pos @c_bytearray_substring(%Pos, i64, i64)
+declare %Int @c_bytearray_character_at(%Pos, i64)
+

package/libraries/llvm/io.c

@@ -20,8 +20,8 @@ void c_io_println_Double(const Double x) {
 }
 
 void c_io_println_String(String text) {
-    for (uint64_t j = 0; j < c_buffer_length(text); ++j)
-        putchar(c_buffer_bytes(text)[j]);
+    for (int64_t j = 0; j < c_bytearray_size(text); ++j)
+        putchar(c_bytearray_data(text)[j]);
     erasePositive(text);
     putchar('\n');
 }
@@ -34,7 +34,7 @@ void c_io_println_String(String text) {
 // Share memory between Effekt-buffers and libuv buffers
 // -----------------------------------------------------
 // A libuv buffer is a {ptr, i64} where i64 is the capacity
-// while our buffer (from buffer.c, which is ref-counted) is a %Pos with a
+// while our buffer (from bytearray.c, which is ref-counted) is a %Pos with a
 // pointer and a length. The data ptr is shared between the two such that
 // libuv (and underlying mechanisms) can directly write into our buffer without
 // copying. Since our buffer is ref-counted, this has the advantage that we
@@ -96,10 +96,10 @@ int modeFlags(struct Pos mode) {
     }
 }
 
-void c_fs_open(struct Pos path, struct Pos mode, Stack stack) {
+void c_fs_open(String path, struct Pos mode, Stack stack) {
 
     // Convert the Effekt String to a 0-terminated string
-    char* path_str = c_buffer_as_null_terminated_string(path);
+    char* path_str = c_bytearray_into_nullterminated_string(path);
     erasePositive((struct Pos) path);
 
     // Convert the Effekt String representing the opening mode to libuv flags
@@ -123,17 +123,16 @@ void c_fs_open(struct Pos path, struct Pos mode, Stack stack) {
     return;
 }
 
-void c_fs_read(Int fd, struct Pos buffer, Int offset, Stack stack) {
+void c_fs_read(Int file, struct Pos buffer, Int offset, Int size, Int position, Stack stack) {
 
-    char* bytes = (char*)c_buffer_bytes(buffer); // libuv expects signed integers
-    uv_buf_t buf = uv_buf_init(bytes, c_buffer_length(buffer));
+    uv_buf_t buf = uv_buf_init((char*)(c_bytearray_data(buffer) + offset), size);
     // erasePositive(buffer);
     // TODO we should erase the buffer but abort if this was the last reference
 
     uv_fs_t* request = malloc(sizeof(uv_fs_t));
     request->data = stack;
 
-    int result = uv_fs_read(uv_default_loop(), request, fd, &buf, 1, offset, c_resume_int_fs);
+    int result = uv_fs_read(uv_default_loop(), request, file, &buf, 1, position, c_resume_int_fs);
 
     if (result < 0) {
         uv_fs_req_cleanup(request);
@@ -142,17 +141,16 @@ void c_fs_read(Int fd, struct Pos buffer, Int offset, Stack stack) {
     }
 }
 
-void c_fs_write(Int fd, struct Pos buffer, Int offset, Stack stack) {
+void c_fs_write(Int file, struct Pos buffer, Int offset, Int size, Int position, Stack stack) {
 
-    char* bytes = (char*)c_buffer_bytes(buffer); // libuv expects signed integers
-    uv_buf_t buf = uv_buf_init(bytes, c_buffer_length(buffer));
+    uv_buf_t buf = uv_buf_init((char*)(c_bytearray_data(buffer) + offset), size);
     // erasePositive(buffer);
     // TODO we should erase the buffer but abort if this was the last reference
 
     uv_fs_t* request = malloc(sizeof(uv_fs_t));
     request->data = stack;
 
-    int result = uv_fs_write(uv_default_loop(), request, fd, &buf, 1, offset, c_resume_int_fs);
+    int result = uv_fs_write(uv_default_loop(), request, file, &buf, 1, position, c_resume_int_fs);
 
     if (result < 0) {
         uv_fs_req_cleanup(request);
@@ -161,12 +159,12 @@ void c_fs_write(Int fd, struct Pos buffer, Int offset, Stack stack) {
     }
 }
 
-void c_fs_close(Int fd, Stack stack) {
+void c_fs_close(Int file, Stack stack) {
 
     uv_fs_t* request = malloc(sizeof(uv_fs_t));
     request->data = stack;
 
-    int result = uv_fs_close(uv_default_loop(), request, fd, c_resume_int_fs);
+    int result = uv_fs_close(uv_default_loop(), request, file, c_resume_int_fs);
 
     if (result < 0) {
         uv_fs_req_cleanup(request);

package/libraries/llvm/main.c

@@ -11,7 +11,7 @@
 
 #include "sanity.c"
 #include "types.c"
-#include "buffer.c"
+#include "bytearray.c"
 #include "io.c"
 #include "hole.c"
 #include "ref.c"
@@ -25,9 +25,9 @@ char** program_argv;
 
 struct Pos c_get_arg(uint64_t idx) {
     if(idx < (uint64_t)program_argc) {
-        return c_buffer_construct_from_null_terminated_string(program_argv[idx]);
+        return c_bytearray_from_nullterminated_string(program_argv[idx]);
     } else {
-        return c_buffer_construct_zeroed(1);
+        return c_bytearray_new(0);
     }
 }
 uint64_t c_get_argc() {