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

lang: ast: add ast node size to ast_node_type

Browse Source
This commit is contained in:
max 🍓
2024-11-24 11:46:42 +00:00
parent d43e387158
commit 70aab9998b
5 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lang/ast/ctx.c
View File

@@ -18,7 +18,7 @@ enum ivy_status ivy_parser_create(struct ivy_parser **parser)
memset(out, 0x0, sizeof *out);
parser_push_state( out, IVY_AST_UNIT, struct ivy_ast_unit_node);
parser_push_state(out, IVY_AST_UNIT);
*parser = out;
return IVY_OK;
@@ -64,9 +64,8 @@ struct parser_state *parser_get_state_generic(struct ivy_parser *parser)
return state;
}
struct parser_state *parser_push_state_generic(
struct ivy_parser *parser, enum ivy_ast_node_type type,
size_t node_size)
struct parser_state *parser_push_state(
struct ivy_parser *parser, enum ivy_ast_node_type type)
{
const struct ast_node_type *node_type = get_ast_node_type(type);
if (!node_type) {
@@ -87,7 +86,7 @@ struct parser_state *parser_push_state_generic(
state->s_parent = current_state->s_node;
}
state->s_node = ast_node_create_with_size(type, node_size);
state->s_node = ast_node_create_with_size(type, node_type->n_node_size);
if (node_type->n_init_state) {
node_type->n_init_state(state);

8
lang/ast/ctx.h
View File

@@ -5,9 +5,6 @@
#include <ivy/lang/ast.h>
#include <ivy/status.h>
#define parser_push_state(parser, node_id, node_type) \
(parser_push_state_generic( \
parser, node_id, sizeof(node_type)))
#define parser_get_state(parser, state_type) \
((state_type *)parser_get_state_generic(parser))
@@ -28,9 +25,8 @@ enum pop_state_flags {
STATE_ADD_NODE_TO_PARENT = 0x01u,
};
extern struct parser_state *parser_push_state_generic(
struct ivy_parser *parser, enum ivy_ast_node_type node_type,
size_t node_size);
extern struct parser_state *parser_push_state(
struct ivy_parser *parser, enum ivy_ast_node_type node_type);
extern void parser_pop_state(struct ivy_parser *parser, enum pop_state_flags flags);
extern struct parser_state *parser_get_state_generic(struct ivy_parser *parser);

1
lang/ast/node.h
View File

@@ -18,6 +18,7 @@ struct ast_node_type {
void (*n_print)(struct ivy_ast_node *);
void (*n_init_state)(struct parser_state *);
size_t n_state_size;
size_t n_node_size;
token_parse_function n_token_parsers[IVY_TOK_TYPE_COUNT];
token_parse_function n_keyword_parsers[IVY_KW_TYPE_COUNT];

1
lang/ast/unit-package.c
View File

@@ -63,6 +63,7 @@ struct ast_node_type unit_package_node_ops = {
.n_print = print,
.n_init_state = init_state,
.n_state_size = sizeof(struct unit_package_parser_state),
.n_node_size = sizeof(struct ivy_ast_unit_package_node),
.n_symbol_parsers = {
[IVY_SYM_DOT] = parse_dot,
},

5
lang/ast/unit.c
View File

@@ -1,3 +1,4 @@
#include <ivy/lang/ast.h>
#include "ctx.h"
#include "node.h"
#include "unit-package.h"
@@ -5,8 +6,7 @@
static enum ivy_status parse_package_keyword(
struct ivy_parser *ctx, struct ivy_token *tok)
{
parser_push_state(
ctx, IVY_AST_UNIT_PACKAGE, struct ivy_ast_unit_package_node);
parser_push_state(ctx, IVY_AST_UNIT_PACKAGE);
return IVY_OK;
}
@@ -24,6 +24,7 @@ struct ast_node_type unit_node_ops = {
.n_add_child = add_child,
.n_print = print,
.n_state_size = sizeof(struct parser_state),
.n_node_size = sizeof(struct ivy_ast_unit_node),
.n_keyword_parsers = {
[IVY_KW_PACKAGE] = parse_package_keyword,
},