From 2cb303eec6a65fbc8269a0eaedbf3f32d892972c Mon Sep 17 00:00:00 2001 From: WormHeamer Date: Tue, 21 Oct 2025 06:26:03 -0400 Subject: remove todo --- proc.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/proc.c b/proc.c index 5b8b467..ff9069a 100644 --- a/proc.c +++ b/proc.c @@ -154,17 +154,11 @@ void scope_changelist_pop(Scope *scope, Graph *g) { } } -#include -#include -/* TODO: implement merge, probably will need scratch arena to build up - * a Xar of something like struct { NameBinding *b; Node *y, *n; }. if - * no match for the given bind is found in the opposite change list, - * it gets the "from" value found in the other. - **/ typedef struct { NameBinding *b; Node *y, *n; } MergeChange; + void scope_changelist_merge(Scope *scope, Lexer *l, ScopeChangeList *y, ScopeChangeList *n, Node *region, Graph *graph, Arena *scratch) { MergeChange *m = new_arr(scratch, MergeChange, y->n + n->n); unsigned c = 0; -- cgit v1.2.3