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

parse.y: chomp by -l

Browse source 
* parse.y (rb_parser_while_loop): should chomp but not chop by -l
  option.  [ruby-core:78099] [Bug #12926]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57373 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-01-19 07:18:23 +00:00
parent 18a315df43
commit af9a151f0b
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
parse.y
View file

@ -10728,7 +10728,7 @@ rb_parser_append_print(VALUE vparser, NODE *node)
} }
NODE * NODE *
rb_parser_while_loop(VALUE vparser, NODE *node, int chop, int split) rb_parser_while_loop(VALUE vparser, NODE *node, int chomp, int split)
{ {
NODE *prelude = 0; NODE *prelude = 0;
NODE *scope = node; NODE *scope = node;
@ -10750,9 +10750,9 @@ rb_parser_while_loop(VALUE vparser, NODE *node, int chop, int split)
rb_intern("split"), 0)), rb_intern("split"), 0)),
node); node);
} }
if (chop) { if (chomp) {
node = block_append(NEW_CALL(NEW_GVAR(idLASTLINE), node = block_append(NEW_CALL(NEW_GVAR(idLASTLINE),
rb_intern("chop!"), 0), node); rb_intern("chomp!"), 0), node);
} }
node = NEW_OPT_N(node); node = NEW_OPT_N(node);

3
test/ruby/test_rubyoptions.rb
View file

@ -48,7 +48,7 @@ class TestRubyOptions < Test::Unit::TestCase
end end
assert_in_out_err(%w(-p -l -a -e) + ['p [$-p, $-l, $-a]'], assert_in_out_err(%w(-p -l -a -e) + ['p [$-p, $-l, $-a]'],
"foo\nbar\nbaz\n") do |r, e| "foo\nbar\nbaz") do |r, e|
assert_equal( assert_equal(
[ '[true, true, true]', 'foo', [ '[true, true, true]', 'foo',
'[true, true, true]', 'bar', '[true, true, true]', 'bar',
@ -57,6 +57,7 @@ class TestRubyOptions < Test::Unit::TestCase
end end
end end
def test_warning def test_warning
save_rubyopt = ENV['RUBYOPT'] save_rubyopt = ENV['RUBYOPT']
ENV['RUBYOPT'] = nil ENV['RUBYOPT'] = nil