From fc7e1771907e4ca28ca4a9eb7a349b3f47eea5d9 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Fri, 26 Sep 2025 04:44:52 +0900 Subject: [PATCH] mruby-compiler: fix indentation and remove duplicate code in dump_args Reduce indentation levels by 1 throughout dump_args() for better formatting consistency and remove duplicated post_mandatory_args section that was incorrectly placed after keyword_args processing. Co-authored-by: Claude --- mrbgems/mruby-compiler/core/parse.y | 29 +++++++++++++---------------- mrbgems/mruby-compiler/core/y.tab.c | 29 +++++++++++++---------------- 2 files changed, 26 insertions(+), 32 deletions(-) diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y index 24253af7c..4e10bdbcb 100644 --- a/mrbgems/mruby-compiler/core/parse.y +++ b/mrbgems/mruby-compiler/core/parse.y @@ -7560,19 +7560,19 @@ static void dump_args(mrb_state *mrb, struct mrb_ast_args *args, int offset, uint16_t lineno) { if (args->mandatory_args) { - dump_prefix(offset+1, lineno); + dump_prefix(offset, lineno); printf("mandatory args:\n"); - dump_recur(mrb, args->mandatory_args, offset+2); + dump_recur(mrb, args->mandatory_args, offset+1); } if (args->optional_args) { - dump_prefix(offset+1, lineno); + dump_prefix(offset, lineno); printf("optional args:\n"); { node *n = args->optional_args; while (n) { - dump_prefix(offset+2, lineno); + dump_prefix(offset+1, lineno); printf("%s=\n", mrb_sym_name(mrb, node_to_sym(n->car->car))); - mrb_parser_dump(mrb, n->car->cdr, offset+3); + mrb_parser_dump(mrb, n->car->cdr, offset+2); n = n->cdr; } } @@ -7580,37 +7580,34 @@ dump_args(mrb_state *mrb, struct mrb_ast_args *args, int offset, uint16_t lineno if (args->rest_arg) { mrb_sym rest = args->rest_arg; - dump_prefix(offset+1, lineno); + dump_prefix(offset, lineno); if (rest == MRB_OPSYM(mul)) printf("rest=*\n"); else printf("rest=*%s\n", mrb_sym_name(mrb, rest)); } if (args->post_mandatory_args) { - dump_prefix(offset+1, lineno); + dump_prefix(offset, lineno); printf("post mandatory args:\n"); - dump_recur(mrb, args->post_mandatory_args, offset+2); + dump_recur(mrb, args->post_mandatory_args, offset+1); } if (args->keyword_args) { - dump_prefix(offset+1, lineno); + dump_prefix(offset, lineno); printf("keyword args:\n"); { node *n = args->keyword_args; while (n) { - dump_prefix(offset+2, lineno); + dump_prefix(offset+1, lineno); printf("%s:\n", mrb_sym_name(mrb, node_to_sym(n->car->car))); - mrb_parser_dump(mrb, n->car->cdr, offset+3); + mrb_parser_dump(mrb, n->car->cdr, offset+2); n = n->cdr; } } - dump_prefix(offset+1, lineno); - printf("post mandatory args:\n"); - dump_recur(mrb, args->post_mandatory_args, offset+2); } if (args->kwrest_arg) { mrb_sym rest = args->kwrest_arg; - dump_prefix(offset+1, lineno); + dump_prefix(offset, lineno); if (rest == MRB_OPSYM(pow)) printf("kwrest=**\n"); else @@ -7619,7 +7616,7 @@ dump_args(mrb_state *mrb, struct mrb_ast_args *args, int offset, uint16_t lineno if (args->block_arg) { mrb_sym blk = args->block_arg; - dump_prefix(offset+1, lineno); + dump_prefix(offset, lineno); if (blk == MRB_OPSYM(and)) printf("blk=&\n"); else diff --git a/mrbgems/mruby-compiler/core/y.tab.c b/mrbgems/mruby-compiler/core/y.tab.c index ee0378880..bd0f0f418 100644 --- a/mrbgems/mruby-compiler/core/y.tab.c +++ b/mrbgems/mruby-compiler/core/y.tab.c @@ -14389,19 +14389,19 @@ static void dump_args(mrb_state *mrb, struct mrb_ast_args *args, int offset, uint16_t lineno) { if (args->mandatory_args) { - dump_prefix(offset+1, lineno); + dump_prefix(offset, lineno); printf("mandatory args:\n"); - dump_recur(mrb, args->mandatory_args, offset+2); + dump_recur(mrb, args->mandatory_args, offset+1); } if (args->optional_args) { - dump_prefix(offset+1, lineno); + dump_prefix(offset, lineno); printf("optional args:\n"); { node *n = args->optional_args; while (n) { - dump_prefix(offset+2, lineno); + dump_prefix(offset+1, lineno); printf("%s=\n", mrb_sym_name(mrb, node_to_sym(n->car->car))); - mrb_parser_dump(mrb, n->car->cdr, offset+3); + mrb_parser_dump(mrb, n->car->cdr, offset+2); n = n->cdr; } } @@ -14409,37 +14409,34 @@ dump_args(mrb_state *mrb, struct mrb_ast_args *args, int offset, uint16_t lineno if (args->rest_arg) { mrb_sym rest = args->rest_arg; - dump_prefix(offset+1, lineno); + dump_prefix(offset, lineno); if (rest == MRB_OPSYM(mul)) printf("rest=*\n"); else printf("rest=*%s\n", mrb_sym_name(mrb, rest)); } if (args->post_mandatory_args) { - dump_prefix(offset+1, lineno); + dump_prefix(offset, lineno); printf("post mandatory args:\n"); - dump_recur(mrb, args->post_mandatory_args, offset+2); + dump_recur(mrb, args->post_mandatory_args, offset+1); } if (args->keyword_args) { - dump_prefix(offset+1, lineno); + dump_prefix(offset, lineno); printf("keyword args:\n"); { node *n = args->keyword_args; while (n) { - dump_prefix(offset+2, lineno); + dump_prefix(offset+1, lineno); printf("%s:\n", mrb_sym_name(mrb, node_to_sym(n->car->car))); - mrb_parser_dump(mrb, n->car->cdr, offset+3); + mrb_parser_dump(mrb, n->car->cdr, offset+2); n = n->cdr; } } - dump_prefix(offset+1, lineno); - printf("post mandatory args:\n"); - dump_recur(mrb, args->post_mandatory_args, offset+2); } if (args->kwrest_arg) { mrb_sym rest = args->kwrest_arg; - dump_prefix(offset+1, lineno); + dump_prefix(offset, lineno); if (rest == MRB_OPSYM(pow)) printf("kwrest=**\n"); else @@ -14448,7 +14445,7 @@ dump_args(mrb_state *mrb, struct mrb_ast_args *args, int offset, uint16_t lineno if (args->block_arg) { mrb_sym blk = args->block_arg; - dump_prefix(offset+1, lineno); + dump_prefix(offset, lineno); if (blk == MRB_OPSYM(and)) printf("blk=&\n"); else