wash/ivy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lang: ast: implement support for multiple expression terminator tokens

Browse Source
This commit is contained in:
max 🍓
2024-12-07 21:28:25 +00:00
parent 7e3322e2ad
commit e8c30b65b5
12 changed files with 68 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lang/ast/block.c
View File

@@ -68,7 +68,7 @@ static struct token_parse_result parse_expr_begin(
struct expr_parser_state *expr struct expr_parser_state *expr
= (struct expr_parser_state *)parser_push_state( = (struct expr_parser_state *)parser_push_state(
ctx, IVY_AST_EXPR, 0); ctx, IVY_AST_EXPR, 0);
expr->s_terminator = state->s_terminator;
return PARSE_RESULT(IVY_OK, PARSE_REPEAT_TOKEN); return PARSE_RESULT(IVY_OK, PARSE_REPEAT_TOKEN);
} }

24
lang/ast/expr/arith.c
View File

@@ -504,7 +504,7 @@ struct token_parse_result arith_parse_in(
struct expr_parser_state *state struct expr_parser_state *state
= parser_get_state(ctx, struct expr_parser_state); = parser_get_state(ctx, struct expr_parser_state);
if (state->s_terminator == IVY_KW_IN) { if (expr_terminates_at_token(state, IVY_KW_IN)) {
/* treat this as a statement terminator. */ /* treat this as a statement terminator. */
struct token_parse_result result = expr_finalise_and_return(ctx, state); struct token_parse_result result = expr_finalise_and_return(ctx, state);
result.r_flags |= PARSE_REPEAT_TOKEN; result.r_flags |= PARSE_REPEAT_TOKEN;
@@ -521,7 +521,7 @@ struct token_parse_result arith_parse_do(
= parser_get_state(ctx, struct expr_parser_state); = parser_get_state(ctx, struct expr_parser_state);
bool terminator = false; bool terminator = false;
if (state->s_terminator == IVY_KW_DO) { if (expr_terminates_at_token(state, IVY_KW_DO)) {
terminator = true; terminator = true;
} }
@@ -1132,7 +1132,7 @@ struct token_parse_result arith_parse_comma(
struct expr_parser_state *state struct expr_parser_state *state
= parser_get_state(ctx, struct expr_parser_state); = parser_get_state(ctx, struct expr_parser_state);
if (state->s_terminator == IVY_SYM_COMMA) { if (expr_terminates_at_token(state, IVY_SYM_COMMA)) {
struct token_parse_result result struct token_parse_result result
= expr_finalise_and_return(ctx, state); = expr_finalise_and_return(ctx, state);
result.r_flags = PARSE_REPEAT_TOKEN; result.r_flags = PARSE_REPEAT_TOKEN;
@@ -1177,21 +1177,23 @@ struct token_parse_result arith_parse_label(
return PARSE_RESULT(IVY_ERR_BAD_SYNTAX, 0); return PARSE_RESULT(IVY_ERR_BAD_SYNTAX, 0);
} }
if (state->s_terminator == IVY_TOK_LABEL) { if (expr_terminates_at_token(state, IVY_TOK_LABEL)) {
/* we are currently parsing a keyword or complex message /* we are currently parsing a keyword or complex message
* argument, and have just encountered the label denoting the * argument, and have just encountered the label denoting the
* next argument. terminate here and propagate this label to the * next argument. terminate here and propagate this label to the
* parent keyword-message parser context. */ * parent keyword-message parser context. */
struct ivy_ast_node *expr = NULL; struct ivy_ast_node *expr = NULL;
enum ivy_status status = expr_finalise_arith( struct token_parse_result result = expr_finalise(ctx,
state, &expr, IVY_PRECEDENCE_ASSIGN); state, IVY_PRECEDENCE_ASSIGN, &expr);
if (status != IVY_OK) { if (result.r_status != IVY_OK) {
return PARSE_RESULT(status, 0); return result;
} }
result.r_flags |= PARSE_REPEAT_TOKEN;
parser_replace_current_node(ctx, expr); parser_replace_current_node(ctx, expr);
parser_pop_state(ctx, STATE_ADD_NODE_TO_PARENT); parser_pop_state(ctx, STATE_ADD_NODE_TO_PARENT);
return PARSE_RESULT(IVY_ERR_BAD_SYNTAX, PARSE_REPEAT_TOKEN); return result;
} }
if (state->s_sub_type != EXPR_SUBTYPE_KEYWORD_MSG if (state->s_sub_type != EXPR_SUBTYPE_KEYWORD_MSG
@@ -1208,6 +1210,7 @@ struct token_parse_result arith_parse_label(
if (new_parser) { if (new_parser) {
msg_expr = (struct expr_parser_state *)parser_push_state( msg_expr = (struct expr_parser_state *)parser_push_state(
ctx, IVY_AST_EXPR, 0); ctx, IVY_AST_EXPR, 0);
expr_copy_terminators(state, msg_expr);
} else { } else {
msg_expr = state; msg_expr = state;
} }
@@ -1248,7 +1251,8 @@ struct token_parse_result arith_parse_label(
struct expr_parser_state *arg_expr struct expr_parser_state *arg_expr
= (struct expr_parser_state *)parser_push_state( = (struct expr_parser_state *)parser_push_state(
ctx, IVY_AST_EXPR, 0); ctx, IVY_AST_EXPR, 0);
arg_expr->s_terminator = IVY_TOK_LABEL; expr_copy_terminators(state, arg_expr);
expr_add_terminator(arg_expr, IVY_TOK_LABEL);
arg_expr->s_sub_type = EXPR_SUBTYPE_KEYWORD_ARG; arg_expr->s_sub_type = EXPR_SUBTYPE_KEYWORD_ARG;
arg_expr->s_subexpr_depth = state->s_subexpr_depth + 1; arg_expr->s_subexpr_depth = state->s_subexpr_depth + 1;
} }

27
lang/ast/expr/expr.c
View File

@@ -2,6 +2,33 @@
#include "../node.h" #include "../node.h"
void expr_add_terminator(struct expr_parser_state *state, unsigned short tok)
{
if (state->s_nr_terminators < EXPR_TERMINATOR_MAX) {
state->s_terminators[state->s_nr_terminators++] = tok;
}
}
void expr_copy_terminators(const struct expr_parser_state *src, struct expr_parser_state *dest)
{
dest->s_nr_terminators = src->s_nr_terminators;
for (unsigned int i = 0; i < src->s_nr_terminators; i++) {
dest->s_terminators[i] = src->s_terminators[i];
}
}
bool expr_terminates_at_token(struct expr_parser_state *state, unsigned short tok)
{
for (unsigned int i = 0; i < EXPR_TERMINATOR_MAX; i++) {
if (state->s_terminators[i] == tok) {
return true;
}
}
return false;
}
static enum ivy_status add_child( static enum ivy_status add_child(
struct parser_state *parent, struct ivy_ast_node *child) struct parser_state *parent, struct ivy_ast_node *child)
{ {

15
lang/ast/expr/expr.h
View File

@@ -6,6 +6,8 @@
#include <blue/core/queue.h> #include <blue/core/queue.h>
#define EXPR_TERMINATOR_MAX 8
struct ivy_ast_node; struct ivy_ast_node;
struct ivy_ast_msg_node; struct ivy_ast_msg_node;
@@ -65,10 +67,11 @@ struct expr_parser_state {
* the depth of the expression is recorded here. */ * the depth of the expression is recorded here. */
unsigned int s_subexpr_depth; unsigned int s_subexpr_depth;
/* when this is set, the expression will be terminated when the /* the expression will be terminated when any token in this list
* specified token is encountered. the token that terminated the * is encountered. the token that terminated the expression will
* expression will not be consumed. */ * not be consumed. */
unsigned int s_terminator; unsigned short s_terminators[EXPR_TERMINATOR_MAX];
unsigned short s_nr_terminators;
b_queue s_output_queue; b_queue s_output_queue;
b_queue s_operator_stack; b_queue s_operator_stack;
@@ -88,6 +91,10 @@ struct expr_parser_state {
/* general functions */ /* general functions */
extern void expr_add_terminator(struct expr_parser_state *state, unsigned short tok);
extern void expr_copy_terminators(const struct expr_parser_state *src, struct expr_parser_state *dest);
extern bool expr_terminates_at_token(struct expr_parser_state *state, unsigned short tok);
extern struct token_parse_result expr_finalise( extern struct token_parse_result expr_finalise(
struct ivy_parser *ctx, struct expr_parser_state *state, struct ivy_parser *ctx, struct expr_parser_state *state,
enum ivy_operator_precedence min_precedence, struct ivy_ast_node **expr); enum ivy_operator_precedence min_precedence, struct ivy_ast_node **expr);

4
lang/ast/expr/stmt.c
View File

@@ -12,7 +12,7 @@ struct token_parse_result stmt_parse_for(
struct expr_parser_state *state struct expr_parser_state *state
= parser_get_state(ctx, struct expr_parser_state); = parser_get_state(ctx, struct expr_parser_state);
if (state->s_terminator == IVY_KW_FOR) { if (expr_terminates_at_token(state, IVY_KW_FOR)) {
/* treat this as a statement terminator. */ /* treat this as a statement terminator. */
struct token_parse_result result = expr_finalise_and_return(ctx, state); struct token_parse_result result = expr_finalise_and_return(ctx, state);
result.r_flags |= PARSE_REPEAT_TOKEN; result.r_flags |= PARSE_REPEAT_TOKEN;
@@ -126,7 +126,7 @@ struct token_parse_result stmt_parse_if(
struct expr_parser_state *state struct expr_parser_state *state
= parser_get_state(ctx, struct expr_parser_state); = parser_get_state(ctx, struct expr_parser_state);
if (state->s_terminator == IVY_KW_IF) { if (expr_terminates_at_token(state, IVY_KW_IF)) {
/* treat this as a statement terminator. */ /* treat this as a statement terminator. */
struct token_parse_result result = expr_finalise_and_return(ctx, state); struct token_parse_result result = expr_finalise_and_return(ctx, state);
result.r_flags |= PARSE_REPEAT_TOKEN; result.r_flags |= PARSE_REPEAT_TOKEN;

4
lang/ast/for.c
View File

@@ -37,7 +37,7 @@ struct token_parse_result parse_for(struct ivy_parser *ctx, struct ivy_token *to
ctx, IVY_AST_EXPR, 0); ctx, IVY_AST_EXPR, 0);
state->s_prev_token = IVY_KW_FOR; state->s_prev_token = IVY_KW_FOR;
expr->s_terminator = IVY_KW_IN; expr_add_terminator(expr, IVY_KW_IN);
expr->s_subexpr_depth = 1; expr->s_subexpr_depth = 1;
return PARSE_RESULT(IVY_OK, 0); return PARSE_RESULT(IVY_OK, 0);
@@ -68,7 +68,7 @@ static struct token_parse_result parse_in(
/* set the sub-expression depth to be non-zero so the expression parser doesn't consume the expression separator. */ /* set the sub-expression depth to be non-zero so the expression parser doesn't consume the expression separator. */
expr->s_subexpr_depth = 1; expr->s_subexpr_depth = 1;
expr->s_terminator = IVY_KW_DO; expr_add_terminator(expr, IVY_KW_DO);
state->s_prev_token = IVY_KW_IN; state->s_prev_token = IVY_KW_IN;
return PARSE_RESULT(IVY_OK, 0); return PARSE_RESULT(IVY_OK, 0);

4
lang/ast/match.c
View File

@@ -41,7 +41,7 @@ struct token_parse_result parse_match(struct ivy_parser *ctx, struct ivy_token *
state->s_prev_token = IVY_KW_MATCH; state->s_prev_token = IVY_KW_MATCH;
expr->s_subexpr_depth = 1; expr->s_subexpr_depth = 1;
expr->s_terminator = IVY_KW_IN; expr_add_terminator(expr, IVY_KW_IN);
return PARSE_RESULT(IVY_OK, 0); return PARSE_RESULT(IVY_OK, 0);
} }
@@ -136,7 +136,7 @@ static struct token_parse_result parse_arrow(
= (struct expr_parser_state *)parser_push_state( = (struct expr_parser_state *)parser_push_state(
ctx, IVY_AST_EXPR, 0); ctx, IVY_AST_EXPR, 0);
expr->s_terminator = IVY_KW_END; expr_add_terminator(expr, IVY_KW_END);
expr->s_subexpr_depth = 1; expr->s_subexpr_depth = 1;
return PARSE_RESULT(IVY_OK, 0); return PARSE_RESULT(IVY_OK, 0);
} }

12
lang/ast/package.c
View File

@@ -124,7 +124,7 @@ static struct token_parse_result parse_equal_right_angle(
state->s_prev_node = NULL; state->s_prev_node = NULL;
struct expr_parser_state *expr = (struct expr_parser_state *)parser_push_state(ctx, IVY_AST_EXPR, 0); struct expr_parser_state *expr = (struct expr_parser_state *)parser_push_state(ctx, IVY_AST_EXPR, 0);
expr->s_terminator = IVY_SYM_COMMA; expr_add_terminator(expr, IVY_SYM_COMMA);
expr->s_subexpr_depth = 1; expr->s_subexpr_depth = 1;
return PARSE_RESULT(IVY_OK, 0); return PARSE_RESULT(IVY_OK, 0);
@@ -162,7 +162,7 @@ static struct token_parse_result parse_comma(
state->s_prev = IVY_SYM_COMMA; state->s_prev = IVY_SYM_COMMA;
struct expr_parser_state *expr = (struct expr_parser_state *)parser_push_state(ctx, IVY_AST_EXPR, 0); struct expr_parser_state *expr = (struct expr_parser_state *)parser_push_state(ctx, IVY_AST_EXPR, 0);
expr->s_terminator = IVY_SYM_EQUAL_RIGHT_ANGLE; expr_add_terminator(expr, IVY_SYM_EQUAL_RIGHT_ANGLE);
expr->s_subexpr_depth = 1; expr->s_subexpr_depth = 1;
return PARSE_RESULT(IVY_OK, 0); return PARSE_RESULT(IVY_OK, 0);
@@ -261,7 +261,7 @@ static struct token_parse_result parse_for(
state->s_prev_node = NULL; state->s_prev_node = NULL;
struct expr_parser_state *expr = (struct expr_parser_state *)parser_push_state(ctx, IVY_AST_EXPR, 0); struct expr_parser_state *expr = (struct expr_parser_state *)parser_push_state(ctx, IVY_AST_EXPR, 0);
expr->s_terminator = IVY_KW_IN; expr_add_terminator(expr, IVY_KW_IN);
expr->s_subexpr_depth = 1; expr->s_subexpr_depth = 1;
return PARSE_RESULT(IVY_OK, 0); return PARSE_RESULT(IVY_OK, 0);
@@ -292,7 +292,7 @@ static struct token_parse_result parse_in(
state->s_prev_node = NULL; state->s_prev_node = NULL;
struct expr_parser_state *expr = (struct expr_parser_state *)parser_push_state(ctx, IVY_AST_EXPR, 0); struct expr_parser_state *expr = (struct expr_parser_state *)parser_push_state(ctx, IVY_AST_EXPR, 0);
expr->s_terminator = IVY_KW_IF; expr_add_terminator(expr, IVY_KW_IF);
expr->s_subexpr_depth = 1; expr->s_subexpr_depth = 1;
return PARSE_RESULT(IVY_OK, 0); return PARSE_RESULT(IVY_OK, 0);
@@ -323,7 +323,7 @@ static struct token_parse_result parse_if(
state->s_prev_node = NULL; state->s_prev_node = NULL;
struct expr_parser_state *expr = (struct expr_parser_state *)parser_push_state(ctx, IVY_AST_EXPR, 0); struct expr_parser_state *expr = (struct expr_parser_state *)parser_push_state(ctx, IVY_AST_EXPR, 0);
expr->s_terminator = IVY_SYM_RIGHT_BRACE; expr_add_terminator(expr, IVY_SYM_RIGHT_BRACE);
expr->s_subexpr_depth = 1; expr->s_subexpr_depth = 1;
return PARSE_RESULT(IVY_OK, 0); return PARSE_RESULT(IVY_OK, 0);
@@ -411,7 +411,7 @@ static void init_state(struct ivy_parser *ctx, struct parser_state *sp, uintptr_
state->s_next_implicit_index = 0; state->s_next_implicit_index = 0;
struct expr_parser_state *expr = (struct expr_parser_state *)parser_push_state(ctx, IVY_AST_EXPR, 0); struct expr_parser_state *expr = (struct expr_parser_state *)parser_push_state(ctx, IVY_AST_EXPR, 0);
expr->s_terminator = IVY_KW_FOR; expr_add_terminator(expr, IVY_KW_FOR);
expr->s_subexpr_depth = 1; expr->s_subexpr_depth = 1;
} }

2
lang/ast/property.c
View File

@@ -175,7 +175,7 @@ static struct token_parse_result parse_equal_right_arrow(
struct expr_parser_state *expr struct expr_parser_state *expr
= (struct expr_parser_state *)parser_push_state( = (struct expr_parser_state *)parser_push_state(
ctx, IVY_AST_EXPR, 0); ctx, IVY_AST_EXPR, 0);
expr->s_terminator = IVY_SYM_COMMA; expr_add_terminator(expr, IVY_SYM_COMMA);
expr->s_subexpr_depth = 1; expr->s_subexpr_depth = 1;
return PARSE_RESULT(IVY_OK, 0); return PARSE_RESULT(IVY_OK, 0);

2
lang/ast/string.c
View File

@@ -36,7 +36,7 @@ struct token_parse_result parse_left_brace(
struct expr_parser_state *expr struct expr_parser_state *expr
= (struct expr_parser_state *)parser_push_state( = (struct expr_parser_state *)parser_push_state(
ctx, IVY_AST_EXPR, 0); ctx, IVY_AST_EXPR, 0);
expr->s_terminator = IVY_SYM_RIGHT_BRACE; expr_add_terminator(expr, IVY_SYM_RIGHT_BRACE);
return PARSE_RESULT(IVY_OK, 0); return PARSE_RESULT(IVY_OK, 0);
} }

0
lang/ast/tuple.c Normal file
View File

2
lang/ast/while.c
View File

@@ -38,7 +38,7 @@ struct token_parse_result parse_while(struct ivy_parser *ctx, struct ivy_token *
state->s_prev_token = IVY_KW_WHILE; state->s_prev_token = IVY_KW_WHILE;
expr->s_subexpr_depth = 1; expr->s_subexpr_depth = 1;
expr->s_terminator = IVY_KW_DO; expr_add_terminator(expr, IVY_KW_DO);
return PARSE_RESULT(IVY_OK, 0); return PARSE_RESULT(IVY_OK, 0);
} }