ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-07 08:08:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add #caller_location to strings.clone; remove deprecated procedures in package strings

Browse Source
This commit is contained in:
gingerBill
2020-06-08 11:42:38 +01:00
parent 87a6d695d6
commit a7dd686859
1 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/strings/strings.odin
+4 -25
View File
@@ -4,41 +4,20 @@ import "core:mem"
import "core:unicode" import "core:unicode"
import "core:unicode/utf8" import "core:unicode/utf8"
clone :: proc(s: string, allocator := context.allocator) -> string { clone :: proc(s: string, allocator := context.allocator, loc := #caller_location) -> string {
c := make([]byte, len(s)+1, allocator); c := make([]byte, len(s)+1, allocator, loc);
copy(c, s); copy(c, s);
c[len(s)] = 0; c[len(s)] = 0;
return string(c[:len(s)]); return string(c[:len(s)]);
} }
clone_to_cstring :: proc(s: string, allocator := context.allocator) -> cstring { clone_to_cstring :: proc(s: string, allocator := context.allocator, loc := #caller_location) -> cstring {
c := make([]byte, len(s)+1, allocator); c := make([]byte, len(s)+1, allocator, loc);
copy(c, s); copy(c, s);
c[len(s)] = 0; c[len(s)] = 0;
return cstring(&c[0]); return cstring(&c[0]);
} }
@(deprecated="Please use 'strings.clone'")
new_string :: proc(s: string, allocator := context.allocator) -> string {
c := make([]byte, len(s)+1, allocator);
copy(c, s);
c[len(s)] = 0;
return string(c[:len(s)]);
}
@(deprecated="Please use 'strings.clone_to_cstring'")
new_cstring :: proc(s: string, allocator := context.allocator) -> cstring {
c := make([]byte, len(s)+1, allocator);
copy(c, s);
c[len(s)] = 0;
return cstring(&c[0]);
}
@(deprecated="Please use a standard cast for cstring to string")
to_odin_string :: proc(str: cstring) -> string {
return string(str);
}
string_from_ptr :: proc(ptr: ^byte, len: int) -> string { string_from_ptr :: proc(ptr: ^byte, len: int) -> string {
return transmute(string)mem.Raw_String{ptr, len}; return transmute(string)mem.Raw_String{ptr, len};
} }