krzosa/corelang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ast modified, Ast_Expr is not a union instead it uses inheritence

Browse Source
This commit is contained in:
Krzosa Karol
2022-05-24 21:01:27 +02:00
parent 5176b40204
commit e032fefd07
4 changed files with 160 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
new_parse.cpp
View File

@@ -124,11 +124,11 @@ Compound literals
function Ast_Expr *parse_expr(S64 rbp = 0);
function Ast_Typespec *parse_typespec();
function Ast_Expr *
function Ast_Compound *
parse_expr_compound(){
Scratch scratch;
Token *pos = token_get();
Array<Ast_Expr *> exprs = {scratch};
Array<Ast_Compound_Item *> exprs = {scratch};
while(!token_is(TK_CloseBrace)){
Token *token = token_get();
Ast_Expr *index = 0;
@@ -145,7 +145,7 @@ parse_expr_compound(){
}
Ast_Expr *item = parse_expr();
Ast_Expr *item_comp = ast_expr_compound_item(token, index, name, item);
Ast_Compound_Item *item_comp = ast_expr_compound_item(token, index, name, item);
exprs.add(item_comp);
if(!token_match(TK_Comma)){
@@ -154,7 +154,7 @@ parse_expr_compound(){
}
token_expect(TK_CloseBrace);
Ast_Expr *result = ast_expr_compound(pos, 0, exprs);
Ast_Compound *result = ast_expr_compound(pos, 0, exprs);
return result;
}
@@ -179,7 +179,7 @@ parse_block(){
function Ast_Lambda *
parse_lambda(Token *token, B32 is_typespec = false){ // @Todo(Krzosa): is_typespec is not used currently
Scratch scratch;
Array<Ast_Expr *> params = {scratch};
Array<Ast_Lambda_Arg *> params = {scratch};
// @Note(Krzosa): No need to guard against "()"
// We needed to lookahead to verify it's a function
// and this routine only fires when we have situation
@@ -188,7 +188,7 @@ parse_lambda(Token *token, B32 is_typespec = false){ // @Todo(Krzosa): is_typesp
Token *name = token_expect(TK_Identifier);
token_expect(TK_Colon);
Ast_Typespec *typespec = parse_typespec();
Ast_Expr *param = ast_expr_lambda_param(name, name->intern_val, typespec);
Ast_Lambda_Arg *param = ast_expr_lambda_arg(name, name->intern_val, typespec);
params.add(param);
if(!token_match(TK_Comma)){
@@ -296,34 +296,6 @@ parse_expr(S64 rbp){
return left;
}
function S64
expr_eval(Ast_Expr *expr){
switch(expr->kind){
case AST_INT: return expr->int_val;
case AST_UNARY:{
S64 value = expr_eval(expr->unary.expr);
switch(expr->unary.op){
case TK_PostDecrement: return value - 1;
case TK_PostIncrement: return value + 1;
default: invalid_codepath;
}
}break;
case AST_BINARY : {
S64 left = expr_eval(expr->binary.left);
S64 right = expr_eval(expr->binary.right);
switch(expr->binary.op){
case TK_Add: return left + right;
case TK_Sub: return left - right;
case TK_Mul: return left * right;
case TK_Div: return left / right;
default: invalid_codepath;
}
}break;
default: invalid_codepath;
}
return 0;
}
#define TEST_PARSER() \
Scratch scratch(thread_ctx.scratch); \
Parse_Ctx ctx = {}; \
@@ -334,20 +306,20 @@ function void
test_parse_expr(){
TEST_PARSER();
struct Test{String str;S64 val;};
Array<Test> exprs = {scratch};
// Array<Test> exprs = {scratch};
//exprs.add({"thing[1][2][3]"_s, 0});
exprs.add({"4++++--"_s, 5});
exprs.add({"(4+5)*2"_s, (4+5)*2});
exprs.add({"4+5*2"_s, 4+5*2});
exprs.add({"4*5+5"_s, 4*5+5});
exprs.add({"4+5+5+3"_s, 4+5+5+3});
// exprs.add({"4++++--"_s, 5});
// exprs.add({"(4+5)*2"_s, (4+5)*2});
// exprs.add({"4+5*2"_s, 4+5*2});
// exprs.add({"4*5+5"_s, 4*5+5});
// exprs.add({"4+5+5+3"_s, 4+5+5+3});
For(exprs){
lex_restream(&ctx, it->str, "test_expr"_s);
Ast_Expr *result = parse_expr();
S64 val = expr_eval(result);
assert(val == it->val);
}
// For(exprs){
// lex_restream(&ctx, it->str, "test_expr"_s);
// Ast_Expr *result = parse_expr();
// S64 val = expr_eval(result);
// assert(val == it->val);
// }
}
//-----------------------------------------------------------------------------