diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-02-18 14:34:26 +0900 |
---|---|---|
committer | NARUSE, Yui <naruse@airemix.jp> | 2020-03-13 23:27:19 +0900 |
commit | 3e7e1b965b06f3c843972d7e2f6e3d040374d67f (patch) | |
tree | 340ac3e1dac18164c97209024b6768f9a045852c /io.c | |
parent | 2339be74e737b4c5f5330f845af2e7db0c7450e1 (diff) |
Pass keyword arguments to IOs properly [Bug #16639]
(cherry picked from commit 041c2932e336b509b0ddc1fdbd9f160bce8d4893)
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -12399,10 +12399,14 @@ argf_block_call_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, argf)) return Qnil; } +#define ARGF_block_call(mid, argc, argv, func, argf) \ + rb_block_call_kw(ARGF.current_file, mid, argc, argv, \ + func, argf, rb_keyword_given_p()) + static void argf_block_call(ID mid, int argc, VALUE *argv, VALUE argf) { - VALUE ret = rb_block_call(ARGF.current_file, mid, argc, argv, argf_block_call_i, argf); + VALUE ret = ARGF_block_call(mid, argc, argv, argf_block_call_i, argf); if (ret != Qundef) ARGF.next_p = 1; } @@ -12418,7 +12422,7 @@ argf_block_call_line_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, argf)) static void argf_block_call_line(ID mid, int argc, VALUE *argv, VALUE argf) { - VALUE ret = rb_block_call(ARGF.current_file, mid, argc, argv, argf_block_call_line_i, argf); + VALUE ret = ARGF_block_call(mid, argc, argv, argf_block_call_line_i, argf); if (ret != Qundef) ARGF.next_p = 1; } |