From dc151609ad0bce02639c67350c3ebf9ad49677bc Mon Sep 17 00:00:00 2001
From: Ryan Fleury <ryan.j.fleury@gmail.com>
Date: Fri, 18 Apr 2025 21:21:46 -0700
Subject: [PATCH] fix files/cmds fancy string list build

---
 src/raddbg/raddbg_core.c  | 14 +++-----------
 src/raddbg/raddbg_core.h  |  3 +--
 src/raddbg/raddbg_views.c | 15 ++++++---------
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/src/raddbg/raddbg_core.c b/src/raddbg/raddbg_core.c
index 4ec0d08d..7e0b511b 100644
--- a/src/raddbg/raddbg_core.c
+++ b/src/raddbg/raddbg_core.c
@@ -1505,24 +1505,16 @@ rd_eval_space_from_ctrl_entity(CTRL_Entity *entity, E_SpaceKind kind)
 //- rjf: command name <-> eval space
 
 internal String8
-rd_cmd_name_from_eval_space(E_Space space)
+rd_cmd_name_from_eval(E_Eval eval)
 {
   String8 result = {0};
-  if(space.kind == RD_EvalSpaceKind_MetaCmd)
+  if(eval.space.kind == RD_EvalSpaceKind_MetaCmd)
   {
-    result = e_string_from_id(space.u64s[0]);
+    result = e_string_from_id(eval.value.u64);
   }
   return result;
 }
 
-internal E_Space
-rd_eval_space_from_cmd_name(String8 cmd_name)
-{
-  E_Space space = e_space_make(RD_EvalSpaceKind_MetaCmd);
-  space.u64s[0] = e_id_from_string(cmd_name);
-  return space;
-}
-
 //- rjf: eval space reads/writes
 
 internal B32
diff --git a/src/raddbg/raddbg_core.h b/src/raddbg/raddbg_core.h
index 13dcd009..984c5673 100644
--- a/src/raddbg/raddbg_core.h
+++ b/src/raddbg/raddbg_core.h
@@ -900,8 +900,7 @@ internal CTRL_Entity *rd_ctrl_entity_from_eval_space(E_Space space);
 internal E_Space rd_eval_space_from_ctrl_entity(CTRL_Entity *entity, E_SpaceKind kind);
 
 //- rjf: command name <-> eval space
-internal String8 rd_cmd_name_from_eval_space(E_Space space);
-internal E_Space rd_eval_space_from_cmd_name(String8 cmd_name);
+internal String8 rd_cmd_name_from_eval(E_Eval eval);
 
 //- rjf: eval space reads/writes
 internal B32 rd_eval_space_read(void *u, E_Space space, void *out, Rng1U64 range);
diff --git a/src/raddbg/raddbg_views.c b/src/raddbg/raddbg_views.c
index 20a57007..a19cca41 100644
--- a/src/raddbg/raddbg_views.c
+++ b/src/raddbg/raddbg_views.c
@@ -1416,6 +1416,7 @@ rd_watch_row_info_from_row(Arena *arena, EV_Row *row)
 internal RD_WatchRowCellInfo
 rd_info_from_watch_row_cell(Arena *arena, EV_Row *row, EV_StringFlags string_flags, RD_WatchRowInfo *row_info, RD_WatchCell *cell, FNT_Tag font, F32 font_size, F32 max_size_px)
 {
+  Temp scratch = scratch_begin(&arena ,1);
   RD_WatchRowCellInfo result =
   {
     .flags        = cell->flags,
@@ -1436,11 +1437,8 @@ rd_info_from_watch_row_cell(Arena *arena, EV_Row *row, EV_StringFlags string_fla
   {
     result.entity = rd_ctrl_entity_from_eval_space(cell->eval.space);
   }
-  result.cmd_name = rd_cmd_name_from_eval_space(cell->eval.space);
-  if(cell->eval.space.kind == E_SpaceKind_FileSystem)
-  {
-    result.file_path = e_string_from_id(cell->eval.space.u64_0);
-  }
+  result.cmd_name = rd_cmd_name_from_eval(cell->eval);
+  result.file_path = rd_file_path_from_eval(arena, cell->eval);
   for(E_Type *type = cell_type;
       type->kind == E_TypeKind_Lens;
       type = e_type_from_key__cached(type->direct_type_key))
@@ -1478,16 +1476,14 @@ rd_info_from_watch_row_cell(Arena *arena, EV_Row *row, EV_StringFlags string_fla
       //- rjf: buttons -> button for command
       else if(result.cmd_name.size != 0)
       {
-        RD_CmdKindInfo *cmd_kind_info = rd_cmd_kind_info_from_string(result.cmd_name);
-        result.fstrs = rd_title_fstrs_from_code_name(arena, cmd_kind_info->string);
+        result.fstrs = rd_title_fstrs_from_code_name(arena, result.cmd_name);
         result.flags |= RD_WatchCellFlag_Button;
       }
       
       //- rjf: files -> button for file
       else if(result.file_path.size != 0)
       {
-        String8 file_path = e_string_from_id(cell->eval.value.u64);
-        result.fstrs = rd_title_fstrs_from_file_path(arena, file_path);
+        result.fstrs = rd_title_fstrs_from_file_path(arena, result.file_path);
         result.flags |= RD_WatchCellFlag_Button;
       }
       
@@ -1970,6 +1966,7 @@ rd_info_from_watch_row_cell(Arena *arena, EV_Row *row, EV_StringFlags string_fla
   }
 #endif
   
+  scratch_end(scratch);
   return result;
 }