From df437eebcc50b7c7bd3d68c6d954ba44681b79a3 Mon Sep 17 00:00:00 2001 From: KOBAYASHI Shuji Date: Fri, 29 Nov 2019 19:02:04 +0900 Subject: Fix `mruby --verbose` (regression by #4827) #### Before this patch: ``` $ bin/mruby --verbose -e 'p 1' bin/mruby: Cannot open program file: --verbose ``` #### After this patch: ``` $ bin/mruby --verbose -e 'p 1' 00001 NODE_SCOPE: (snip) irep 0x7fe97041df30 nregs=4 nlocals=1 pools=0 syms=1 reps=0 iseq=11 file: -e 1 000 OP_LOADSELF R1 (snip) 1 ``` --- mrbgems/mruby-bin-mruby/bintest/mruby.rb | 4 ++++ mrbgems/mruby-bin-mruby/tools/mruby/mruby.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mrbgems/mruby-bin-mruby/bintest/mruby.rb b/mrbgems/mruby-bin-mruby/bintest/mruby.rb index b234b6c6f..f63ac9a30 100644 --- a/mrbgems/mruby-bin-mruby/bintest/mruby.rb +++ b/mrbgems/mruby-bin-mruby/bintest/mruby.rb @@ -128,6 +128,10 @@ assert('mruby -r option (file not found)') do assert_mruby("", /\A.*: Cannot open library file: .*\n\z/, false, %w[-r _no_exists_]) end +assert('mruby --verbose option') do + assert_mruby(/\A[^\n]*NODE.*\n:end\n\z/m, "", true, %w[--verbose -e p(:end)]) +end + assert('mruby --') do assert_mruby(%{["-x", "1"]\n}, "", true, %w[-e p(ARGV) -- -x 1]) end diff --git a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c index aa1ea9b80..facfe335e 100644 --- a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c +++ b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c @@ -189,7 +189,6 @@ parse_args(mrb_state *mrb, int argc, char **argv, struct _args *args) } else if (strcmp(opt, "verbose") == 0) { args->verbose = TRUE; - break; } else if (strcmp(opt, "copyright") == 0) { mrb_show_copyright(mrb); -- cgit v1.2.3