From 0f11502a7db584ad65f9508cc6bc023d4a73c9fc Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Sun, 30 Mar 2025 23:48:02 -0400 Subject: [PATCH] Prepend `do_begin` statements to `do` statements, don't put them in a separate block --- src/parse.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/parse.c b/src/parse.c index 5190d92..6a1b151 100644 --- a/src/parse.c +++ b/src/parse.c @@ -1126,14 +1126,18 @@ PARSER(parse_do) { pos = tmp; ast_t *body = expect(ctx, start, &pos, parse_block, "I expected a body for this 'do'"); if (begin && end) { - return NewAST(ctx->file, start, pos, Block, - .statements=new(ast_list_t, .ast=begin, - .next=new(ast_list_t, .ast=WrapAST(end, Defer, .body=end), - .next=new(ast_list_t, .ast=body)))); + ast_list_t *statements = Match(begin, Block)->statements; + REVERSE_LIST(statements); + statements = new(ast_list_t, .ast=WrapAST(end, Defer, .body=end), .next=statements); + statements = new(ast_list_t, .ast=body, .next=statements); + REVERSE_LIST(statements); + return NewAST(ctx->file, start, pos, Block, .statements=statements); } else if (begin) { - return NewAST(ctx->file, start, pos, Block, - .statements=new(ast_list_t, .ast=begin, - .next=new(ast_list_t, .ast=body))); + ast_list_t *statements = Match(begin, Block)->statements; + REVERSE_LIST(statements); + statements = new(ast_list_t, .ast=body, .next=statements); + REVERSE_LIST(statements); + return NewAST(ctx->file, start, pos, Block, .statements=statements); } else if (end) { return NewAST(ctx->file, start, pos, Block, .statements=new(ast_list_t, .ast=WrapAST(end, Defer, .body=end),