eliminate text cache scope; fold into base layer's 'access' construct

This commit is contained in:
Ryan Fleury
2025-09-18 15:25:11 -07:00
parent 1b93dbd4bd
commit 2131e792a1
5 changed files with 12 additions and 142 deletions
+1 -3
View File
@@ -16092,13 +16092,12 @@ rd_frame(void)
case RD_CmdKind_ToggleWatchExpressionAtCursor:
{
Access *access = access_open();
TXT_Scope *txt_scope = txt_scope_open();
RD_Regs *regs = rd_regs();
C_Key text_key = regs->text_key;
TXT_LangKind lang_kind = regs->lang_kind;
TxtRng range = txt_rng(regs->cursor, regs->mark);
U128 hash = {0};
TXT_TextInfo info = txt_text_info_from_key_lang(txt_scope, text_key, lang_kind, &hash);
TXT_TextInfo info = txt_text_info_from_key_lang(access, text_key, lang_kind, &hash);
String8 data = c_data_from_hash(access, hash);
Rng1U64 expr_off_range = {0};
if(range.min.column != range.max.column)
@@ -16114,7 +16113,6 @@ rd_frame(void)
kind == RD_CmdKind_ToggleWatchExpressionAtCursor ? RD_CmdKind_ToggleWatchExpression :
RD_CmdKind_GoToName),
.string = expr);
txt_scope_close(txt_scope);
access_close(access);
}break;
case RD_CmdKind_SetNextStatement:
+2 -6
View File
@@ -2026,7 +2026,6 @@ RD_VIEW_UI_FUNCTION_DEF(text)
rd_code_view_init(cv);
Temp scratch = scratch_begin(0, 0);
Access *access = access_open();
TXT_Scope *txt_scope = txt_scope_open();
//////////////////////////////
//- rjf: set up invariants
@@ -2090,7 +2089,7 @@ RD_VIEW_UI_FUNCTION_DEF(text)
rd_regs()->lang_kind = txt_lang_kind_from_extension(lang);
}
U128 hash = {0};
TXT_TextInfo info = txt_text_info_from_key_lang(txt_scope, rd_regs()->text_key, rd_regs()->lang_kind, &hash);
TXT_TextInfo info = txt_text_info_from_key_lang(access, rd_regs()->text_key, rd_regs()->lang_kind, &hash);
String8 data = c_data_from_hash(access, hash);
B32 file_is_missing = (rd_regs()->file_path.size != 0 && os_properties_from_file_path(rd_regs()->file_path).modified == 0);
B32 key_has_data = !u128_match(hash, u128_zero()) && info.lines_count;
@@ -2250,7 +2249,6 @@ RD_VIEW_UI_FUNCTION_DEF(text)
rd_store_view_param_s64(str8_lit("mark_line"), rd_regs()->mark.line);
rd_store_view_param_s64(str8_lit("mark_column"), rd_regs()->mark.column);
txt_scope_close(txt_scope);
access_close(access);
scratch_end(scratch);
}
@@ -2292,7 +2290,6 @@ RD_VIEW_UI_FUNCTION_DEF(disasm)
RD_CodeViewState *cv = &dv->cv;
Temp scratch = scratch_begin(0, 0);
Access *access = access_open();
TXT_Scope *txt_scope = txt_scope_open();
//////////////////////////////
//- rjf: if disassembly views are not parameterized by anything, they
@@ -2413,7 +2410,7 @@ RD_VIEW_UI_FUNCTION_DEF(disasm)
rd_regs()->text_key = dasm_info.text_key;
rd_regs()->lang_kind = txt_lang_kind_from_arch(arch);
U128 dasm_text_hash = {0};
TXT_TextInfo dasm_text_info = txt_text_info_from_key_lang(txt_scope, rd_regs()->text_key, rd_regs()->lang_kind, &dasm_text_hash);
TXT_TextInfo dasm_text_info = txt_text_info_from_key_lang(access, rd_regs()->text_key, rd_regs()->lang_kind, &dasm_text_hash);
String8 dasm_text_data = c_data_from_hash(access, dasm_text_hash);
B32 has_disasm = (dasm_info.lines.count != 0 && dasm_text_info.lines_count != 0);
B32 is_loading = (!has_disasm && dim_1u64(range) != 0 && eval.msgs.max_kind == E_MsgKind_Null && (space.kind != RD_EvalSpaceKind_CtrlEntity || space_entity != &ctrl_entity_nil));
@@ -2494,7 +2491,6 @@ RD_VIEW_UI_FUNCTION_DEF(disasm)
dv->cursor = rd_regs()->cursor;
dv->mark = rd_regs()->mark;
txt_scope_close(txt_scope);
access_close(access);
scratch_end(scratch);
}