ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-06-20 02:52:23 -07:00
Code Issues Packages Projects Releases Wiki Activity

eval identifier resolution: allow implicitly mapping leaf identifiers to member accesses of overridden irtree

Browse Source
This commit is contained in:
Ryan Fleury
2025-04-11 15:02:54 -07:00
parent 2e8bca21f6
commit e754380caa
3 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/eval/eval_ir.c
+29 -14
View File
@@ -1727,6 +1727,9 @@ e_irtree_and_type_from_expr(Arena *arena, E_Expr *root_expr)
E_TypeKey mapped_type_key = zero_struct;
E_Module *mapped_location_block_module = &e_module_nil;
RDI_LocationBlock *mapped_location_block = 0;
E_Mode mapped_bytecode_mode = E_Mode_Offset;
E_Space mapped_bytecode_space = zero_struct;
String8 mapped_bytecode = {0};
//- rjf: form namespaceified fallback versions of this lookup string
String8List namespaceified_strings = {0};
@@ -1754,6 +1757,32 @@ e_irtree_and_type_from_expr(Arena *arena, E_Expr *root_expr)
}
}
//- rjf: try to map name as overridden expression signifier ('$')
if(!string_mapped && str8_match(string, str8_lit("$"), 0) && e_ir_state->overridden_irtree != 0)
{
E_OpList oplist = e_oplist_from_irtree(arena, e_ir_state->overridden_irtree->root);
string_mapped = 1;
mapped_bytecode = e_bytecode_from_oplist(arena, &oplist);
mapped_bytecode_mode = e_ir_state->overridden_irtree->mode;
mapped_type_key = e_ir_state->overridden_irtree->type_key;
allow_autohooks = 0;
}
//- rjf: try to map name as implicit access of overridden expression ('$.member_name', where the $. prefix is omitted)
if(!string_mapped && e_ir_state->overridden_irtree != 0)
{
E_Expr *access = e_expr_irext_member_access(scratch.arena, &e_expr_nil, e_ir_state->overridden_irtree, string);
E_IRTreeAndType access_irtree = e_irtree_and_type_from_expr(scratch.arena, access);
if(access_irtree.root != &e_irnode_nil)
{
string_mapped = 1;
E_OpList oplist = e_oplist_from_irtree(scratch.arena, access_irtree.root);
mapped_type_key = access_irtree.type_key;
mapped_bytecode = e_bytecode_from_oplist(arena, &oplist);
mapped_bytecode_mode = access_irtree.mode;
}
}
//- rjf: try to map name as member - if found, string__redirected := "this", and turn
// on later implicit-member-lookup generation
B32 string_is_implicit_member_name = 0;
@@ -1806,9 +1835,6 @@ e_irtree_and_type_from_expr(Arena *arena, E_Expr *root_expr)
}
//- rjf: mapped to location block -> extract or produce bytecode for this mapping
E_Mode mapped_bytecode_mode = E_Mode_Offset;
E_Space mapped_bytecode_space = zero_struct;
String8 mapped_bytecode = {0};
if(mapped_location_block != 0)
{
E_Module *module = mapped_location_block_module;
@@ -1900,17 +1926,6 @@ e_irtree_and_type_from_expr(Arena *arena, E_Expr *root_expr)
}
}
//- rjf: try to map name as overridden expression signifier ('$')
if(!string_mapped && str8_match(string, str8_lit("$"), 0) && e_ir_state->overridden_irtree != 0)
{
E_OpList oplist = e_oplist_from_irtree(arena, e_ir_state->overridden_irtree->root);
string_mapped = 1;
mapped_bytecode = e_bytecode_from_oplist(arena, &oplist);
mapped_bytecode_mode = e_ir_state->overridden_irtree->mode;
mapped_type_key = e_ir_state->overridden_irtree->type_key;
allow_autohooks = 0;
}
//- rjf: try globals
if(!string_mapped && (qualifier.size == 0 || str8_match(qualifier, str8_lit("global"), 0)))
{