begin work on nodelists

1 files changed, 4 insertions, 4 deletions

diff --git a/main.c b/main.c
index 3306dc9..e1db66d 100644
--- a/main.c
+++ b/main.c
@@ -263,8 +263,8 @@ void parse_if(Lexer *l, Proc *p) {
 	node_remove(g, if_true, g->keepalive);
 	node_remove(g, if_false, g->keepalive);
 	assert(g->ctrl->in.len > 0);
-	assert(region->in.data[0]);
-	assert(region->in.data[1]);
+	assert(IN(region, 0));
+	assert(IN(region, 1));
 
 	scope_changelist_merge(&p->scope, l, &chg_if, &chg_else, region, g, &p->scratch);
 	scope_changelist_discard(&chg_if, g);
@@ -379,8 +379,8 @@ void proc_opt_fwd(Proc *p, Lexer *l, Node *n) {
 				&& IN(n,1)->op == N_PROJ
 				&& CTRL(IN(n,0)) == CTRL(IN(n,1))
 				&& CTRL(IN(n,0))->op == N_IF_ELSE) {
-			assert(n->out.data[0]->op != N_PHI);
-			assert(n->out.data[0]->in.data[0] == n);
+			assert(OUT(n, 0)->op != N_PHI);
+			assert(IN(OUT(n, 0), 0) == n);
 			Node *new_ctrl = CTRL(CTRL(CTRL(n)));
 			Node *out = n->out.data[0];
 			node_set_in(g, out, 0, new_ctrl);