kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Pass keyword arguments to IOs properly [Bug #16639]

Browse source
This commit is contained in:
Nobuyoshi Nakada 2020-02-18 14:34:26 +09:00
parent 38070ccdeb
commit 041c2932e3
No known key found for this signature in database
GPG key ID: 4BC7D6DF58D8DF60
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
io.c
View file

@ -12430,10 +12430,14 @@ argf_block_call_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, argf))
return Qnil; 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 static void
argf_block_call(ID mid, int argc, VALUE *argv, VALUE argf) 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; if (ret != Qundef) ARGF.next_p = 1;
} }
@ -12449,7 +12453,7 @@ argf_block_call_line_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, argf))
static void static void
argf_block_call_line(ID mid, int argc, VALUE *argv, VALUE argf) 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; if (ret != Qundef) ARGF.next_p = 1;
} }

7
test/ruby/test_argf.rb
View file

@ -725,6 +725,13 @@ class TestArgf < Test::Unit::TestCase
["\"a\\n\\n\"", "\"b\\n\""], []) ["\"a\\n\\n\"", "\"b\\n\""], [])
end end
def test_each_line_chomp
assert_in_out_err(['-e', 'ARGF.each_line(chomp: false) {|para| p para}'], "a\nb\n",
["\"a\\n\"", "\"b\\n\""], [])
assert_in_out_err(['-e', 'ARGF.each_line(chomp: true) {|para| p para}'], "a\nb\n",
["\"a\"", "\"b\""], [])
end
def test_each_byte def test_each_byte
ruby('-e', "#{<<~"{#"}\n#{<<~'};'}", @t1.path, @t2.path, @t3.path) do |f| ruby('-e', "#{<<~"{#"}\n#{<<~'};'}", @t1.path, @t2.path, @t3.path) do |f|
{# {#