naruse	2010-06-23 14:32:46 +0900 (Wed, 23 Jun 2010)

  New Revision: 28398

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28398

  Log:
    Clean warnings: unused variables.

  Modified files:
    trunk/ext/socket/lib/socket.rb
    trunk/lib/forwardable.rb
    trunk/lib/matrix.rb
    trunk/lib/mkmf.rb
    trunk/test/ripper/test_parser_events.rb
    trunk/test/ruby/test_objectspace.rb
    trunk/test/ruby/test_rubyoptions.rb
    trunk/test/ruby/test_thread.rb
    trunk/test/test_mathn.rb

Index: lib/forwardable.rb
===================================================================
--- lib/forwardable.rb	(revision 28397)
+++ lib/forwardable.rb	(revision 28398)
@@ -246,7 +246,7 @@
   # provided, it is used as the name for the delegate method.
   #
   def def_single_delegator(accessor, method, ali = method)
-    line_no = __LINE__; str = %{
+    str = %{
       def #{ali}(*args, &block)
 	begin
 	  #{accessor}.__send__(:#{method}, *args, &block)
@@ -264,7 +264,3 @@
   alias def_delegators def_single_delegators
   alias def_delegator def_single_delegator
 end
-
-
-
-
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 28397)
+++ lib/mkmf.rb	(revision 28398)
@@ -153,8 +153,7 @@
   map.inject(dir) {|d, (orig, new)| d.gsub(orig, new)}
 end
 
-topdir = File.dirname(libdir = File.dirname(__FILE__))
-extdir = File.expand_path("ext", topdir)
+topdir = File.dirname(File.dirname(__FILE__))
 path = File.expand_path($0)
 $extmk = path[0, topdir.size+1] == topdir+"/"
 $extmk &&= %r"\A(?:ext|enc|tool|test(?:/.+))\z" =~ File.dirname(path[topdir.size+1..-1])
Index: lib/matrix.rb
===================================================================
--- lib/matrix.rb	(revision 28397)
+++ lib/matrix.rb	(revision 28398)
@@ -834,7 +834,6 @@
     a = to_a
     last_column = column_size - 1
     last_row = row_size - 1
-    rank = 0
     pivot_row = 0
     previous_pivot = 1
     0.upto(last_column) do |k|
@@ -1237,7 +1236,7 @@
   #   Vector[7, 4, ...]
   #
   def Vector.[](*array)
-    new convert_to_array(array, copy = false)
+    new convert_to_array(array, false)
   end
 
   #
@@ -1532,6 +1531,6 @@
   # Overrides Object#inspect
   #
   def inspect
-    str = "Vector"+@e...
+    "Vector" + @elements.inspect
   end
 end
Index: ext/socket/lib/socket.rb
===================================================================
--- ext/socket/lib/socket.rb	(revision 28397)
+++ ext/socket/lib/socket.rb	(revision 28398)
@@ -577,7 +577,7 @@
   def self.udp_server_recv(sockets)
     sockets.each {|r|
       begin
-        msg, sender_addrinfo, rflags, *controls = r.recvmsg_nonblock
+        msg, sender_addrinfo, _, *controls = r.recvmsg_nonblock
       rescue IO::WaitReadable
         next
       end
Index: test/ruby/test_objectspace.rb
===================================================================
--- test/ruby/test_objectspace.rb	(revision 28397)
+++ test/ruby/test_objectspace.rb	(revision 28398)
@@ -61,6 +61,7 @@
       ObjectSpace.define_finalizer(a) { p :ok }
       b = a.dup
       ObjectSpace.define_finalizer(a) { p :ok }
+      !b
     END
     assert_raise(ArgumentError) { ObjectSpace.define_finalizer([], Object.new) }
   end
Index: test/ruby/test_rubyoptions.rb
===================================================================
--- test/ruby/test_rubyoptions.rb	(revision 28397)
+++ test/ruby/test_rubyoptions.rb	(revision 28398)
@@ -182,7 +182,7 @@
   end
 
   def test_syntax_check
-    assert_in_out_err(%w(-c -e a=1+1), "", ["Syntax OK"], [])
+    assert_in_out_err(%w(-c -e a=1+1 -e !a), "", ["Syntax OK"], [])
   end
 
   def test_invalid_option
Index: test/ruby/test_thread.rb
===================================================================
--- test/ruby/test_thread.rb	(revision 28397)
+++ test/ruby/test_thread.rb	(revision 28398)
@@ -231,7 +231,7 @@
       t1 = Thread.new { sleep }
       Thread.pass
       t2 = Thread.new { loop { } }
-      t3 = Thread.new { }.join
+      Thread.new { }.join
       p [Thread.current, t1, t2].map{|t| t.object_id }.sort
       p Thread.list.map{|t| t.object_id }.sort
     INPUT
Index: test/ripper/test_parser_events.rb
===================================================================
--- test/ripper/test_parser_events.rb	(revision 28397)
+++ test/ripper/test_parser_events.rb	(revision 28398)
@@ -1097,8 +1097,8 @@
     assert_equal("[fcall(proc,[],&block([],[void()]))]", parse("proc{|;y|}"))
     if defined?(Process::RLIMIT_AS)
       assert_in_out_err(["-I#{File.dirname(__FILE__)}", "-rdummyparser"],
-                        'Process.setrlimit(Process::RLIMIT_AS,102400); puts DummyParser.new("proc{|;y|}").parse',
-                        ["[fcall(proc,[],&block([],[void()]))]"], [], '[ruby-dev:39423]')
+                        'Process.setrlimit(Process::RLIMIT_AS,102400); puts DummyParser.new("proc{|;y|!y}").parse',
+                        ["[fcall(proc,[],&block([],[unary(!,ref(y))]))]"], [], '[ruby-dev:39423]')
     end
   end
 
Index: test/test_mathn.rb
===================================================================
--- test/test_mathn.rb	(revision 28397)
+++ test/test_mathn.rb	(revision 28398)
@@ -4,7 +4,7 @@
 # mathn redefines too much. It must be isolated to child processes.
 class TestMathn < Test::Unit::TestCase
   def test_power
-    assert_in_out_err ['-r', 'mathn', '-e', 'a=1**2'], "", [], [], '[ruby-core:25740]'
-    assert_in_out_err ['-r', 'mathn', '-e', 'a=(1<<126)**2'], "", [], [], '[ruby-core:25740]'
+    assert_in_out_err ['-r', 'mathn', '-e', 'a=1**2;!a'], "", [], [], '[ruby-core:25740]'
+    assert_in_out_err ['-r', 'mathn', '-e', 'a=(1<<126)**2;!a'], "", [], [], '[ruby-core:25740]'
   end
 end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/