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

correctly treat chains of lenses when looking up type hooks; allow type-evaluations when producing per-cell evaluations

Browse Source
This commit is contained in:
Ryan Fleury
2025-04-15 14:18:21 -07:00
parent 82ec25ad19
commit 923f55fb2b
3 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/eval/eval_ir.c
+27 -6
View File
@@ -946,6 +946,16 @@ e_irtree_and_type_from_expr(Arena *arena, E_Expr *root_expr)
// rjf: pick access hook based on type
E_Type *lhs_type = e_type_from_key__cached(lhs_irtree_try->type_key);
E_TypeAccessFunctionType *lhs_access = lhs_type->access;
for(E_Type *lens_type = lhs_type;
lens_type->kind == E_TypeKind_Lens || lens_type->kind == E_TypeKind_Set;
lens_type = e_type_from_key__cached(lens_type->direct_type_key))
{
if(lens_type->access != 0)
{
lhs_access = lens_type->access;
break;
}
}
if(lhs_access == 0)
{
lhs_access = E_TYPE_ACCESS_FUNCTION_NAME(default);
@@ -2302,15 +2312,26 @@ e_irtree_and_type_from_expr(Arena *arena, E_Expr *root_expr)
//- rjf: if the evaluated type has a hook for an extra layer of ir extension,
// call into it
E_Type *type = e_type_from_key__cached(result.type_key);
if(type->kind != E_TypeKind_LensSpec && type->irext != 0)
{
E_IRTreeAndType irtree_stripped = result;
if(type->kind == E_TypeKind_Lens)
E_TypeIRExtFunctionType *irext = type->irext;
for(E_Type *t = type; t->kind == E_TypeKind_Lens || t->kind == E_TypeKind_Set; t = e_type_from_key__cached(t->direct_type_key))
{
irtree_stripped.type_key = e_type_key_direct(irtree_stripped.type_key);
if(t->irext != 0)
{
irext = t->irext;
break;
}
}
if(irext != 0)
{
E_IRTreeAndType irtree_stripped = result;
if(type->kind == E_TypeKind_Lens)
{
irtree_stripped.type_key = e_type_key_direct(irtree_stripped.type_key);
}
E_IRExt ext = irext(arena, expr, &irtree_stripped);
result.user_data = ext.user_data;
}
E_IRExt ext = type->irext(arena, expr, &irtree_stripped);
result.user_data = ext.user_data;
}
//- rjf: equip previous task's irtree