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

lang: codegen: redesign variable definition/resolution system to support capturing

Browse Source 
the codegen scope system has been removed. instead, each generator state in the stack,
from the current state backwards, is informed when a variable is defined, resolved, or
captured.

when a variable is defined, the state stack is traversed back-to-front (current generator
first). each state has a chance to record the variable definition. once one state has
signalled that it has recorded the variable definition, the traversal ends.

when a variable is resolved, the state stack is traversed back-to-front (current generator
first). each state is asked whether or not it recognises the variable identifier being resolved.
if a state has the variable in question defined, it returns information about the variable
definition, and the traversal stops.

once a variable has been resolved, the state stack is traversed front-to-back (current generator
last), starting from the generator /after/ the one that provided the variable definition. each
generator in the iteration is given the chance to adjust the variable information, or generate
IR in response to the variable being accessed. this is used to implement variable capture,
where the state of a variable in the enclosing context is captured for later use.
This commit is contained in:
max 🍓
2025-04-22 15:23:42 +01:00
parent dc000ae8ef
commit 7483b32c25
8 changed files with 289 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
lang/codegen/codegen.h
View File

@@ -1,6 +1,8 @@
#ifndef _LANG_CODEGEN_H_
#define _LANG_CODEGEN_H_
#include "var-map.h"
#include <blue/core/queue.h>
#include <ivy/lang/ast.h>
#include <ivy/lang/lex.h>
@@ -13,6 +15,8 @@ struct ivy_ast_node;
struct mie_value;
struct mie_func;
struct codegen_var;
#define CODEGEN_RESULT_OK(flags) \
(struct code_generator_result) \
{ \
@@ -27,18 +31,6 @@ struct mie_func;
#define __AST_INDEX(type) IVY_AST_##type
#define NODE_CODEGEN(type, func) [__AST_INDEX(type)] = func
struct codegen_value {
b_queue_entry v_entry;
struct ivy_ast_node *v_node;
struct mie_value *v_value;
};
struct codegen_var {
b_queue_entry v_entry;
struct ivy_ast_ident_node *v_ident;
struct mie_value *v_ptr;
};
enum code_generator_flags {
CODEGEN_F_IGNORE_RESULT = 0x01u,
};
@@ -70,6 +62,12 @@ struct code_generator_result {
} r_flags;
};
struct codegen_value {
b_queue_entry v_entry;
struct ivy_ast_node *v_node;
struct mie_value *v_value;
};
struct code_generator_state;
typedef enum ivy_status (*code_generator_state_init_callback)(
@@ -83,6 +81,15 @@ typedef struct code_generator_result (*code_generator_node_callback)(
struct ivy_ast_node *, size_t);
typedef struct code_generator_result (*code_generator_value_received_callback)(
struct ivy_codegen *, struct code_generator_state *, struct mie_value *);
typedef enum ivy_status (*code_generator_define_variable_callback)(
struct ivy_codegen *, struct code_generator_state *, const char *,
const struct codegen_var *);
typedef enum ivy_status (*code_generator_resolve_variable_callback)(
struct ivy_codegen *, struct code_generator_state *, const char *,
struct codegen_var *);
typedef enum ivy_status (*code_generator_capture_variable_callback)(
struct ivy_codegen *, struct code_generator_state *, const char *,
struct codegen_var *);
struct code_generator {
enum code_generator_type g_type;
@@ -93,6 +100,9 @@ struct code_generator {
code_generator_node_callback g_node_generators[IVY_AST_TYPE_COUNT];
code_generator_node_callback g_expr_generator;
code_generator_value_received_callback g_value_received;
code_generator_define_variable_callback g_define_var;
code_generator_resolve_variable_callback g_resolve_var;
code_generator_capture_variable_callback g_capture_var;
};
struct code_generator_state {
@@ -104,13 +114,6 @@ struct code_generator_state {
size_t s_depth;
};
struct code_generator_scope {
enum code_generator_scope_type s_type;
b_queue_entry s_entry;
/* TODO turn this into a bst */
b_queue s_vars;
};
struct ivy_codegen {
b_queue c_values;
b_queue c_state;
@@ -131,11 +134,6 @@ extern enum ivy_status codegen_push_generator(
extern enum ivy_status codegen_pop_generator(
struct ivy_codegen *gen, struct mie_value **result);
extern struct code_generator_scope *codegen_push_scope(struct ivy_codegen *gen);
extern void codegen_pop_scope(struct ivy_codegen *gen);
extern struct code_generator_scope *codegen_get_current_scope(
struct ivy_codegen *gen);
extern struct codegen_value *codegen_value_create(
struct ivy_ast_node *node, struct mie_value *val);
extern void codegen_value_destroy(struct codegen_value *val);
@@ -143,11 +141,11 @@ extern void codegen_value_destroy(struct codegen_value *val);
extern void codegen_push_value(struct ivy_codegen *gen, struct codegen_value *val);
extern struct codegen_value *codegen_pop_value(struct ivy_codegen *gen);
extern struct codegen_var *codegen_resolve_variable(
struct ivy_codegen *gen, const char *ident);
extern enum ivy_status code_generator_scope_put_variable(
struct code_generator_scope *scope, struct ivy_ast_ident_node *ident,
struct mie_value *ptr);
extern enum ivy_status codegen_define_variable(
struct ivy_codegen *gen, const char *ident, const struct codegen_var *var);
extern enum ivy_status codegen_resolve_variable(
struct ivy_codegen *gen, const char *ident, struct codegen_var *out);
extern struct mie_value *codegen_load_variable(
struct ivy_codegen *gen, struct codegen_var *var);
#endif