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

fix busted chained dot-access-style views

Browse Source
This commit is contained in:
Ryan Fleury
2025-04-28 16:02:48 -07:00
parent f72c956c9f
commit dc15a4fdc5
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/eval/eval_ir.c
+4 -7
View File
@@ -1273,7 +1273,7 @@ e_push_irtree_and_type_from_expr(Arena *arena, E_IRTreeAndType *root_parent, B32
E_Type *lhs_type = e_type_from_key__cached(lhs_type_key); E_Type *lhs_type = e_type_from_key__cached(lhs_type_key);
// rjf: calling a type? -> treat as a cast of that type // rjf: calling a type? -> treat as a cast of that type
if(lhs_irtree.mode == E_Mode_Null && lhs_type != &e_type_nil) if(lhs_irtree.mode == E_Mode_Null && lhs_type != &e_type_nil && lhs_type->kind != E_TypeKind_Lens && lhs_type->kind != E_TypeKind_LensSpec)
{ {
E_IRTreeAndType casted_tree = e_push_irtree_and_type_from_expr(arena, parent, disallow_autohooks, 1, disallow_chained_casts, expr->first->next); E_IRTreeAndType casted_tree = e_push_irtree_and_type_from_expr(arena, parent, disallow_autohooks, 1, disallow_chained_casts, expr->first->next);
e_msg_list_concat_in_place(&result.msgs, &casted_tree.msgs); e_msg_list_concat_in_place(&result.msgs, &casted_tree.msgs);
@@ -1331,8 +1331,7 @@ e_push_irtree_and_type_from_expr(Arena *arena, E_IRTreeAndType *root_parent, B32
// left-hand-side of the dot operator as the first argument. this is a fast path // left-hand-side of the dot operator as the first argument. this is a fast path
// which prevents paren nesting in simple cases, to easily chain multiple // which prevents paren nesting in simple cases, to easily chain multiple
// calls - for example, bin(2).digits(4) // calls - for example, bin(2).digits(4)
else if(lhs_type == &e_type_nil && else if(lhs->kind == E_ExprKind_MemberAccess)
lhs->kind == E_ExprKind_MemberAccess)
{ {
E_Expr *callee = lhs->first->next; E_Expr *callee = lhs->first->next;
E_Expr *first_arg = e_expr_ref(arena, lhs->first); E_Expr *first_arg = e_expr_ref(arena, lhs->first);
@@ -1349,10 +1348,8 @@ e_push_irtree_and_type_from_expr(Arena *arena, E_IRTreeAndType *root_parent, B32
disallow_autohooks = 1; disallow_autohooks = 1;
} }
result = e_push_irtree_and_type_from_expr(arena, parent, disallow_autohooks, disallow_chained_fastpaths, disallow_chained_casts, call); result = e_push_irtree_and_type_from_expr(arena, parent, disallow_autohooks, disallow_chained_fastpaths, disallow_chained_casts, call);
E_MsgList new_msgs = {0}; // NOTE(rjf): we do not want to accumulate messages from the original left-hand-side evaluation in this case, because
e_msg_list_concat_in_place(&new_msgs, &lhs_irtree.msgs); // this path only occurs if the member access fails specifically.
e_msg_list_concat_in_place(&new_msgs, &result.msgs);
result.msgs = new_msgs;
} }
// rjf: calling a lens? -> generate IR for the first argument; if enabled, wrap // rjf: calling a lens? -> generate IR for the first argument; if enabled, wrap