diff options
| -rw-r--r-- | parse.y | 6 | ||||
| -rw-r--r-- | test/ruby/test_rubyoptions.rb | 3 |
2 files changed, 5 insertions, 4 deletions
@@ -10728,7 +10728,7 @@ rb_parser_append_print(VALUE vparser, 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 *scope = node; @@ -10750,9 +10750,9 @@ rb_parser_while_loop(VALUE vparser, NODE *node, int chop, int split) rb_intern("split"), 0)), node); } - if (chop) { + if (chomp) { node = block_append(NEW_CALL(NEW_GVAR(idLASTLINE), - rb_intern("chop!"), 0), node); + rb_intern("chomp!"), 0), node); } node = NEW_OPT_N(node); diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index 5296768be8..7f22df6479 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -48,7 +48,7 @@ class TestRubyOptions < Test::Unit::TestCase end 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( [ '[true, true, true]', 'foo', '[true, true, true]', 'bar', @@ -57,6 +57,7 @@ class TestRubyOptions < Test::Unit::TestCase end end + def test_warning save_rubyopt = ENV['RUBYOPT'] ENV['RUBYOPT'] = nil |