diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-23 08:08:32 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-23 08:08:32 +0000 |
commit | bda0b012a8ced5b7db0fa5225b5da2a2ebb86aee (patch) | |
tree | 276bb486f41ea76e663ca92b61aa76531174345e | |
parent | eb5692ab32a7c4dc41de16e6d37b2e69c44ef402 (diff) | |
download | ruby-bda0b012a8ced5b7db0fa5225b5da2a2ebb86aee.tar.gz |
* parse.y (assign_in_cond): also should warn assignment to dvar in
conditional. [ruby-dev:39363]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 1 | ||||
-rw-r--r-- | test/ruby/test_rubyoptions.rb | 24 |
3 files changed, 28 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Wed Sep 23 17:08:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (assign_in_cond): also should warn assignment to dvar in + conditional. [ruby-dev:39363] + Wed Sep 23 13:14:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (rb_str_upto): keep first width. [ruby-dev:39361] @@ -8463,6 +8463,7 @@ assign_in_cond(struct parser_params *parser, NODE *node) case NODE_LASGN: case NODE_DASGN: + case NODE_DASGN_CURR: case NODE_GASGN: case NODE_IASGN: break; diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index 14352052c9..87d2200ad2 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -281,13 +281,33 @@ class TestRubyOptions < Test::Unit::TestCase /invalid name for global variable - -# \(NameError\)/) end + def test_assignment_in_conditional + t = Tempfile.new(["test_ruby_test_rubyoption", ".rb"]) + t.puts "if a = 1" + t.puts "end" + t.puts "0.times do" + t.puts " if b = 2" + t.puts " end" + t.puts "end" + t.close + err = ["#{t.path}:1: warning: found = in conditional, should be ==", + "#{t.path}:4: warning: found = in conditional, should be =="] + err = /\A(#{Regexp.quote(t.path)}):1(: warning: found = in conditional, should be ==)\n\1:4\2\Z/ + bug2136 = '[ruby-dev:39363]' + assert_in_out_err(["-w", t.path], "", [], err, bug2136) + assert_in_out_err(["-wr", t.path, "-e", ""], "", [], err, bug2136) + ensure + t.close(true) if t + end + def test_indentation_check t = Tempfile.new(["test_ruby_test_rubyoption", ".rb"]) t.puts "begin" t.puts " end" t.close - assert_in_out_err(["-w", t.path], "", [], /:2: warning: mismatched indentations at 'end' with 'begin' at 1/) - assert_in_out_err(["-wr", t.path, "-e", ""], "", [], /:2: warning: mismatched indentations at 'end' with 'begin' at 1/) + err = ["#{t.path}:2: warning: mismatched indentations at 'end' with 'begin' at 1"] + assert_in_out_err(["-w", t.path], "", [], err) + assert_in_out_err(["-wr", t.path, "-e", ""], "", [], err) ensure t.close(true) if t end |