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

fix ternary operators in eval; fix incorrect oplist concatentation path

Browse Source
This commit is contained in:
Ryan Fleury
2024-08-07 13:10:41 -07:00
parent 607442b92a
commit 6a886e096e
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/eval/eval_ir.c
+5 -5
View File
@@ -149,12 +149,12 @@ e_oplist_concat_in_place(E_OpList *dst, E_OpList *to_push)
{ {
if(to_push->first && dst->first) if(to_push->first && dst->first)
{ {
to_push->last->next = dst->first; dst->last->next = to_push->first;
to_push->last = dst->last; dst->last = to_push->last;
to_push->op_count += to_push->op_count; dst->op_count += to_push->op_count;
to_push->encoded_size += to_push->encoded_size; dst->encoded_size += to_push->encoded_size;
} }
else if(dst->first) else if(!dst->first)
{ {
MemoryCopyStruct(dst, to_push); MemoryCopyStruct(dst, to_push);
} }
src/eval/eval_parse.c
+5
View File
@@ -1800,6 +1800,8 @@ e_parse_expr_from_text_tokens__prec(Arena *arena, String8 text, E_TokenArray *to
{ {
if(token.kind == E_TokenKind_Symbol && str8_match(token_string, str8_lit("?"), 0) && 13 <= max_precedence) if(token.kind == E_TokenKind_Symbol && str8_match(token_string, str8_lit("?"), 0) && 13 <= max_precedence)
{ {
it += 1;
// rjf: parse middle expression // rjf: parse middle expression
E_TokenArray middle_expr_tokens = e_token_array_make_first_opl(it, it_opl); E_TokenArray middle_expr_tokens = e_token_array_make_first_opl(it, it_opl);
E_Parse middle_expr_parse = e_parse_expr_from_text_tokens__prec(arena, text, &middle_expr_tokens, e_max_precedence); E_Parse middle_expr_parse = e_parse_expr_from_text_tokens__prec(arena, text, &middle_expr_tokens, e_max_precedence);
@@ -1845,6 +1847,9 @@ e_parse_expr_from_text_tokens__prec(Arena *arena, String8 text, E_TokenArray *to
} }
// rjf: build ternary // rjf: build ternary
if(atom != &e_expr_nil &&
middle_expr_parse.expr != &e_expr_nil &&
rhs_expr_parse.expr != &e_expr_nil)
{ {
E_Expr *lhs = atom; E_Expr *lhs = atom;
E_Expr *mhs = middle_expr_parse.expr; E_Expr *mhs = middle_expr_parse.expr;