mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-02-13 23:03:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into compiler-improvements-2023-01

Browse Source
This commit is contained in:
gingerBill
2023-01-10 16:25:38 +00:00
committed by GitHub
parent 8ef406324b 86511d44e4
commit 15469758de
27 changed files with 322 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/path.cpp
View File

@@ -107,7 +107,9 @@ gb_internal String path_to_string(gbAllocator a, Path path) {
isize i = 0;
gb_memmove(str+i, path.basename.text, path.basename.len); i += path.basename.len;
gb_memmove(str+i, "/", 1); i += 1;
gb_memmove(str+i, path.name.text, path.name.len); i += path.name.len;
if (path.ext.len > 0) {
gb_memmove(str+i, ".", 1); i += 1;
@@ -150,6 +152,7 @@ gb_internal Path path_from_string(gbAllocator a, String const &path) {
return res;
}
// Note(Dragos): Is the copy_string required if it's a substring?
isize name_start = (res.basename.len > 0) ? res.basename.len + 1 : res.basename.len;
res.name = substring(fullpath, name_start, fullpath.len);
res.name = remove_extension_from_path(res.name);