ed/Odin
1
0 Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-10-15 21:39:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix join and concatenate to use the supplied allocator

Browse Source
This commit is contained in:
gingerBill committed 2018-12-26 19:38:05 +00:00
1 parent 8662df2b7f
commit b2d40680c8
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
core/strings/strings.odin
+2 -2
View File
@@ -103,7 +103,7 @@ join :: proc(a: []string, sep: string, allocator := context.allocator) -> string
n += len(s); n += len(s);
} }
b := make([]byte, n); b := make([]byte, n, allocator);
i := copy(b, cast([]byte)a[0]); i := copy(b, cast([]byte)a[0]);
for s in a[1:] { for s in a[1:] {
i += copy(b[i:], cast([]byte)sep); i += copy(b[i:], cast([]byte)sep);
@@ -121,7 +121,7 @@ concatenate :: proc(a: []string, allocator := context.allocator) -> string {
for s in a { for s in a {
n += len(s); n += len(s);
} }
b := make([]byte, n); b := make([]byte, n, allocator);
i := 0; i := 0;
for s in a { for s in a {
i += copy(b[i:], cast([]byte)s); i += copy(b[i:], cast([]byte)s);