ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-08-06 13:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

do not bake path normalization into eval string <-> file path; this incorrectly assumes the normalization base directory, which is not correct when serializing/deserializing/etc. instead, just normalize on find-code-location.

Browse Source
This commit is contained in:
Ryan Fleury
2024-10-21 09:56:32 -07:00
parent d0915ec9a7
commit 4a211de2b3
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/raddbg/raddbg_core.c
+6 -4
View File
@@ -1683,6 +1683,10 @@ rd_mapped_from_file_path(Arena *arena, String8 file_path)
StringJoin join = {.sep = str8_lit("/")}; StringJoin join = {.sep = str8_lit("/")};
result = str8_list_join(arena, &best_map_dst_parts, &join); result = str8_list_join(arena, &best_map_dst_parts, &join);
} }
else
{
result = path_normalized_from_string(arena, result);
}
} }
scratch_end(scratch); scratch_end(scratch);
return result; return result;
@@ -2956,8 +2960,7 @@ rd_file_path_from_eval_string(Arena *arena, String8 string)
E_Eval eval = e_eval_from_string(scratch.arena, string); E_Eval eval = e_eval_from_string(scratch.arena, string);
if(eval.expr->kind == E_ExprKind_LeafFilePath) if(eval.expr->kind == E_ExprKind_LeafFilePath)
{ {
result = raw_from_escaped_str8(scratch.arena, eval.expr->string); result = raw_from_escaped_str8(arena, eval.expr->string);
result = path_normalized_from_string(arena, result);
} }
scratch_end(scratch); scratch_end(scratch);
} }
@@ -2968,8 +2971,7 @@ internal String8
rd_eval_string_from_file_path(Arena *arena, String8 string) rd_eval_string_from_file_path(Arena *arena, String8 string)
{ {
Temp scratch = scratch_begin(&arena, 1); Temp scratch = scratch_begin(&arena, 1);
String8 string_normalized = path_normalized_from_string(scratch.arena, string); String8 string_escaped = escaped_from_raw_str8(scratch.arena, string);
String8 string_escaped = escaped_from_raw_str8(scratch.arena, string_normalized);
String8 result = push_str8f(arena, "file:\"%S\"", string_escaped); String8 result = push_str8f(arena, "file:\"%S\"", string_escaped);
scratch_end(scratch); scratch_end(scratch);
return result; return result;