ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-07 16:18:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify parse_binary_expr

Browse Source
This commit is contained in:
gingerBill
2022-02-22 22:53:13 +00:00
parent e6a7b85da4
commit cad753e398
1 changed files with 109 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/parser.cpp
+65 -4
View File
@@ -3013,13 +3013,75 @@ i32 token_precedence(AstFile *f, TokenKind t) {
return 0; return 0;
} }
// Ast *parse_binary_expr(AstFile *f, bool lhs, i32 prec_in) {
// Ast *expr = parse_unary_expr(f, lhs);
// for (i32 prec = token_precedence(f, f->curr_token.kind); prec >= prec_in; prec--) {
// for (;;) {
// Token op = f->curr_token;
// i32 op_prec = token_precedence(f, op.kind);
// if (op_prec != prec) {
// // NOTE(bill): This will also catch operators that are not valid "binary" operators
// break;
// }
// Token prev = f->prev_token;
// switch (op.kind) {
// case Token_if:
// case Token_when:
// if (prev.pos.line < op.pos.line) {
// // NOTE(bill): Check to see if the `if` or `when` is on the same line of the `lhs` condition
// goto loop_end;
// }
// break;
// }
// expect_operator(f); // NOTE(bill): error checks too
// if (op.kind == Token_Question) {
// Ast *cond = expr;
// // Token_Question
// Ast *x = parse_expr(f, lhs);
// Token token_c = expect_token(f, Token_Colon);
// Ast *y = parse_expr(f, lhs);
// expr = ast_ternary_if_expr(f, x, cond, y);
// } else if (op.kind == Token_if || op.kind == Token_when) {
// Ast *x = expr;
// Ast *cond = parse_expr(f, lhs);
// Token tok_else = expect_token(f, Token_else);
// Ast *y = parse_expr(f, lhs);
// switch (op.kind) {
// case Token_if:
// expr = ast_ternary_if_expr(f, x, cond, y);
// break;
// case Token_when:
// expr = ast_ternary_when_expr(f, x, cond, y);
// break;
// }
// } else {
// Ast *right = parse_binary_expr(f, false, prec+1);
// if (right == nullptr) {
// syntax_error(op, "Expected expression on the right-hand side of the binary operator '%.*s'", LIT(op.string));
// }
// if (op.kind == Token_or_else) {
// // NOTE(bill): easier to handle its logic different with its own AST kind
// expr = ast_or_else_expr(f, expr, op, right);
// } else {
// expr = ast_binary_expr(f, op, expr, right);
// }
// }
// lhs = false;
// }
// loop_end:;
// }
// return expr;
// }
Ast *parse_binary_expr(AstFile *f, bool lhs, i32 prec_in) { Ast *parse_binary_expr(AstFile *f, bool lhs, i32 prec_in) {
Ast *expr = parse_unary_expr(f, lhs); Ast *expr = parse_unary_expr(f, lhs);
for (i32 prec = token_precedence(f, f->curr_token.kind); prec >= prec_in; prec--) {
for (;;) { for (;;) {
Token op = f->curr_token; Token op = f->curr_token;
i32 op_prec = token_precedence(f, op.kind); i32 op_prec = token_precedence(f, op.kind);
if (op_prec != prec) { if (op_prec < prec_in) {
// NOTE(bill): This will also catch operators that are not valid "binary" operators // NOTE(bill): This will also catch operators that are not valid "binary" operators
break; break;
} }
@@ -3057,7 +3119,7 @@ Ast *parse_binary_expr(AstFile *f, bool lhs, i32 prec_in) {
break; break;
} }
} else { } else {
Ast *right = parse_binary_expr(f, false, prec+1); Ast *right = parse_binary_expr(f, false, op_prec+1);
if (right == nullptr) { if (right == nullptr) {
syntax_error(op, "Expected expression on the right-hand side of the binary operator '%.*s'", LIT(op.string)); syntax_error(op, "Expected expression on the right-hand side of the binary operator '%.*s'", LIT(op.string));
} }
@@ -3072,7 +3134,6 @@ Ast *parse_binary_expr(AstFile *f, bool lhs, i32 prec_in) {
lhs = false; lhs = false;
} }
loop_end:; loop_end:;
}
return expr; return expr;
} }