* lib/optparse/version.rb: remove variable shadowing to stop

  warning.   [ruby-core:20612]

* lib/irb/completion.rb, lib/net/imap.rb, lib/prime.rb,
  lib/rinda/ring.rb, lib/racc/parser.rb,
  lib/shell/command-processor.rb, lib/yaml/yamlnode.rb: ditto.

* lib/racc/parser.rb: remove space before parentheses.

* lib/shell/command-processor.rb, lib/shell/process-controller.rb:
  use parentheses around arguments.

* lib/irb/ext/change-ws.rb, lib/rexml/validation/relaxng.rb,
  lib/yaml/baseemitter.rb: indentation fix.

* lib/matrix.rb: small cosmetic change.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20859 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/shell/command-processor.rb b/lib/shell/command-processor.rb
index b7b58bb61..900b31a22 100644
--- a/lib/shell/command-processor.rb
+++ b/lib/shell/command-processor.rb
@@ -26,7 +26,7 @@ class Shell
     #
     m = [:initialize, :expand_path]
     if Object.methods.first.kind_of?(String)
-      NoDelegateMethods = m.collect{|m| m.id2name}
+      NoDelegateMethods = m.collect{|x| x.id2name}
     else
       NoDelegateMethods = m
     end
@@ -124,7 +124,7 @@ class Shell
 	  f = File.open(path, mode, perm)
 	  File.chmod(perm & ~@shell.umask, path)
 	  if block_given?
-	    f.each &b
+	    f.each(&b)
 	  end
 	  f
 	else
diff --git a/lib/shell/process-controller.rb b/lib/shell/process-controller.rb
index 4f28e018a..f2bf1d44c 100644
--- a/lib/shell/process-controller.rb
+++ b/lib/shell/process-controller.rb
@@ -62,7 +62,7 @@ class Shell
       end
 
       def block_output_synchronize(&b)
-	@BlockOutputMonitor.synchronize &b
+	@BlockOutputMonitor.synchronize(&b)
       end
 
       def wait_to_finish_all_process_controllers