ruby-changes:21589
From: ktsj <ko1@a...>
Date: Sat, 5 Nov 2011 16:38:03 +0900 (JST)
Subject: [ruby-changes:21589] ktsj:r33638 (trunk): * ext/pathname/lib/pathname.rb, ext/tk/lib/multi-tk.rb,
ktsj 2011-11-05 16:37:47 +0900 (Sat, 05 Nov 2011) New Revision: 33638 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33638 Log: * ext/pathname/lib/pathname.rb, ext/tk/lib/multi-tk.rb, ext/tk/sample/demos-en/widget, lib/benchmark.rb, lib/irb/cmd/fork.rb, lib/mkmf.rb, lib/net/ftp.rb, lib/net/smtp.rb, lib/open3.rb, lib/pstore.rb, lib/rexml/element.rb, lib/rexml/light/node.rb, lib/rinda/tuplespace.rb, lib/rss/maker/base.rb, lib/rss/maker/entry.rb, lib/scanf.rb, lib/set.rb, lib/shell.rb, lib/shell/command-processor.rb, lib/shell/process-controller.rb, lib/shell/system-command.rb, lib/uri/common.rb: remove unused block arguments to avoid creating Proc objects. Modified files: trunk/ChangeLog trunk/ext/pathname/lib/pathname.rb trunk/ext/tk/lib/multi-tk.rb trunk/ext/tk/sample/demos-en/widget trunk/lib/benchmark.rb trunk/lib/irb/cmd/fork.rb trunk/lib/mkmf.rb trunk/lib/net/ftp.rb trunk/lib/net/smtp.rb trunk/lib/open3.rb trunk/lib/pstore.rb trunk/lib/rexml/element.rb trunk/lib/rexml/light/node.rb trunk/lib/rinda/tuplespace.rb trunk/lib/rss/maker/base.rb trunk/lib/rss/maker/entry.rb trunk/lib/scanf.rb trunk/lib/set.rb trunk/lib/shell/command-processor.rb trunk/lib/shell/process-controller.rb trunk/lib/shell/system-command.rb trunk/lib/shell.rb trunk/lib/uri/common.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 33637) +++ ChangeLog (revision 33638) @@ -1,3 +1,15 @@ +Sat Nov 5 16:27:52 2011 Kazuki Tsujimoto <kazuki@c...> + + * ext/pathname/lib/pathname.rb, ext/tk/lib/multi-tk.rb, + ext/tk/sample/demos-en/widget, lib/benchmark.rb, lib/irb/cmd/fork.rb, + lib/mkmf.rb, lib/net/ftp.rb, lib/net/smtp.rb, lib/open3.rb, + lib/pstore.rb, lib/rexml/element.rb, lib/rexml/light/node.rb, + lib/rinda/tuplespace.rb, lib/rss/maker/base.rb, + lib/rss/maker/entry.rb, lib/scanf.rb, lib/set.rb, lib/shell.rb, + lib/shell/command-processor.rb, lib/shell/process-controller.rb, + lib/shell/system-command.rb, lib/uri/common.rb: remove unused block + arguments to avoid creating Proc objects. + Sat Nov 5 15:45:04 2011 Tanaka Akira <akr@f...> * ext/socket/init.c (rsock_socket0): extract single socket() call with Index: lib/open3.rb =================================================================== --- lib/open3.rb (revision 33637) +++ lib/open3.rb (revision 33638) @@ -266,7 +266,7 @@ # STDOUT.binmode; print thumnail # end # - def capture3(*cmd, &block) + def capture3(*cmd) if Hash === cmd.last opts = cmd.pop.dup else @@ -320,7 +320,7 @@ # End # image, s = Open3.capture2("gnuplot", :stdin_data=>gnuplot_commands, :binmode=>true) # - def capture2(*cmd, &block) + def capture2(*cmd) if Hash === cmd.last opts = cmd.pop.dup else @@ -359,7 +359,7 @@ # # capture make log # make_log, s = Open3.capture2e("make") # - def capture2e(*cmd, &block) + def capture2e(*cmd) if Hash === cmd.last opts = cmd.pop.dup else @@ -662,7 +662,7 @@ end module_function :pipeline - def pipeline_run(cmds, pipeline_opts, child_io, parent_io, &block) # :nodoc: + def pipeline_run(cmds, pipeline_opts, child_io, parent_io) # :nodoc: if cmds.empty? raise ArgumentError, "no commands" end Index: lib/scanf.rb =================================================================== --- lib/scanf.rb (revision 33637) +++ lib/scanf.rb (revision 33638) @@ -745,7 +745,7 @@ # See Scanf for details on creating a format string. # # You will need to require 'scanf' to use String#block_scanf - def block_scanf(fstr,&b) #:yield: current_match + def block_scanf(fstr) #:yield: current_match fs = Scanf::FormatString.new(fstr) str = self.dup final = [] Index: lib/shell.rb =================================================================== --- lib/shell.rb (revision 33637) +++ lib/shell.rb (revision 33638) @@ -286,7 +286,7 @@ end end - def self.notify(*opts, &block) + def self.notify(*opts) Shell::debug_output_synchronize do if opts[-1].kind_of?(String) yorn = verbose? Index: lib/rexml/element.rb =================================================================== --- lib/rexml/element.rb (revision 33637) +++ lib/rexml/element.rb (revision 33638) @@ -901,11 +901,11 @@ # #-> Yields <b/>, <c/>, <d/>, <b/>, <c/>, <d/> # XPath.each(doc.root, 'child::node()', &block) # #-> Yields <b/>, <c/>, <d/>, sean, <b/>, <c/>, <d/> - def each( xpath=nil, &block) + def each( xpath=nil ) XPath::each( @element, xpath ) {|e| yield e if e.kind_of? Element } end - def collect( xpath=nil, &block ) + def collect( xpath=nil ) collection = [] XPath::each( @element, xpath ) {|e| collection << yield(e) if e.kind_of?(Element) @@ -913,7 +913,7 @@ collection end - def inject( xpath=nil, initial=nil, &block ) + def inject( xpath=nil, initial=nil ) first = true XPath::each( @element, xpath ) {|e| if (e.kind_of? Element) Index: lib/rexml/light/node.rb =================================================================== --- lib/rexml/light/node.rb (revision 33637) +++ lib/rexml/light/node.rb (revision 33638) @@ -40,7 +40,7 @@ end end - def each( &block ) + def each size.times { |x| yield( at(x+4) ) } end Index: lib/benchmark.rb =================================================================== --- lib/benchmark.rb (revision 33637) +++ lib/benchmark.rb (revision 33638) @@ -243,7 +243,7 @@ # #bmbm yields a Benchmark::Job object and returns an array of # Benchmark::Tms objects. # - def bmbm(width = 0, &blk) # :yield: job + def bmbm(width = 0) # :yield: job job = Job.new(width) yield(job) width = job.width + 1 Index: lib/rss/maker/entry.rb =================================================================== --- lib/rss/maker/entry.rb (revision 33637) +++ lib/rss/maker/entry.rb (revision 33638) @@ -99,7 +99,7 @@ end end - def _set_default_values(&block) + def _set_default_values keep = { :authors => authors.to_a.dup, :contributors => contributors.to_a.dup, @@ -126,7 +126,7 @@ @maker.channel.title {|t| @title = t} end self.updated ||= @maker.channel.updated - super(&block) + super ensure authors.replace(keep[:authors]) contributors.replace(keep[:contributors]) Index: lib/rss/maker/base.rb =================================================================== --- lib/rss/maker/base.rb (revision 33637) +++ lib/rss/maker/base.rb (revision 33638) @@ -353,7 +353,7 @@ module SetupDefaultDate private - def _set_default_values(&block) + def _set_default_values keep = { :date => date, :dc_dates => dc_dates.to_a.dup, @@ -365,7 +365,7 @@ dc_dates.unshift(dc_date) end self.date ||= self.dc_date - super(&block) + super ensure date = keep[:date] dc_dates.replace(keep[:dc_dates]) @@ -379,7 +379,7 @@ module SetupDefaultLanguage private - def _set_default_values(&block) + def _set_default_values keep = { :dc_languages => dc_languages.to_a.dup, } @@ -390,7 +390,7 @@ dc_language.value = _language.dup dc_languages.unshift(dc_language) end - super(&block) + super ensure dc_languages.replace(keep[:dc_languages]) end Index: lib/irb/cmd/fork.rb =================================================================== --- lib/irb/cmd/fork.rb (revision 33637) +++ lib/irb/cmd/fork.rb (revision 33638) @@ -15,7 +15,7 @@ module IRB module ExtendCommand class Fork<Nop - def execute(&block) + def execute pid = send ExtendCommand.irb_original_method_name("fork") unless pid class << self Index: lib/pstore.rb =================================================================== --- lib/pstore.rb (revision 33637) +++ lib/pstore.rb (revision 33638) @@ -310,7 +310,7 @@ # # Note that PStore does not support nested transactions. # - def transaction(read_only = false, &block) # :yields: pstore + def transaction(read_only = false) # :yields: pstore value = nil raise PStore::Error, "nested transaction" if !@thread_safe && @lock.locked? @lock.synchronize do Index: lib/mkmf.rb =================================================================== --- lib/mkmf.rb (revision 33637) +++ lib/mkmf.rb (revision 33638) @@ -1125,7 +1125,7 @@ return "rbcv_typedef_", member, prelude end -def try_signedness(type, member, headers = nil, opts = nil, &b) +def try_signedness(type, member, headers = nil, opts = nil) raise ArgumentError, "don't know how to tell signedness of members" if member if try_static_assert("(#{type})-1 < 0", headers, opts) return -1 Index: lib/uri/common.rb =================================================================== --- lib/uri/common.rb (revision 33637) +++ lib/uri/common.rb (revision 33638) @@ -258,7 +258,7 @@ # # see also URI::Parser.make_regexp # - def extract(str, schemes = nil, &block) + def extract(str, schemes = nil) if block_given? str.scan(make_regexp(schemes)) { yield $& } nil Index: lib/shell/process-controller.rb =================================================================== --- lib/shell/process-controller.rb (revision 33637) +++ lib/shell/process-controller.rb (revision 33638) @@ -234,7 +234,7 @@ end # simple fork - def sfork(command, &block) + def sfork(command) pipe_me_in, pipe_peer_out = IO.pipe pipe_peer_in, pipe_me_out = IO.pipe Index: lib/shell/system-command.rb =================================================================== --- lib/shell/system-command.rb (revision 33637) +++ lib/shell/system-command.rb (revision 33638) @@ -145,7 +145,7 @@ # then # mes: "job(%id) close pipe-out." # yorn: Boolean(@shell.debug? or @shell.verbose?) - def notify(*opts, &block) + def notify(*opts) @shell.notify(*opts) do |mes| yield mes if iterator? Index: lib/shell/command-processor.rb =================================================================== --- lib/shell/command-processor.rb (revision 33637) +++ lib/shell/command-processor.rb (revision 33638) @@ -335,7 +335,7 @@ end # %pwd, %cwd -> @pwd - def notify(*opts, &block) + def notify(*opts) Shell.notify(*opts) {|mes| yield mes if iterator? @@ -407,7 +407,7 @@ def self.alias_map @alias_map end - def self.alias_command(ali, command, *opts, &block) + def self.alias_command(ali, command, *opts) ali = ali.id2name if ali.kind_of?(Symbol) command = command.id2name if command.kind_of?(Symbol) begin Index: lib/net/smtp.rb =================================================================== --- lib/net/smtp.rb (revision 33637) +++ lib/net/smtp.rb (revision 33638) @@ -933,7 +933,7 @@ Response.parse(buf) end - def critical(&block) + def critical return '200 dummy reply code' if @error_occured begin return yield() Index: lib/net/ftp.rb =================================================================== --- lib/net/ftp.rb (revision 33637) +++ lib/net/ftp.rb (revision 33638) @@ -493,7 +493,7 @@ # +file+ to the server. If the optional block is given, it also passes it # the data, in chunks of +blocksize+ characters. # - def storbinary(cmd, file, blocksize, rest_offset = nil, &block) # :yield: data + def storbinary(cmd, file, blocksize, rest_offset = nil) # :yield: data if rest_offset file.seek(rest_offset, IO::SEEK_SET) end @@ -504,7 +504,7 @@ buf = file.read(blocksize) break if buf == nil conn.write(buf) - yield(buf) if block + yield(buf) if block_given? end conn.close voidresp @@ -525,7 +525,7 @@ # named +file+ to the server, one line at a time. If the optional block is # given, it also passes it the lines. # - def storlines(cmd, file, &block) # :yield: line + def storlines(cmd, file) # :yield: line synchronize do with_binary(false) do conn = transfercmd(cmd) @@ -536,7 +536,7 @@ buf = buf.chomp + CRLF end conn.write(buf) - yield(buf) if block + yield(buf) if block_given? end conn.close voidresp Index: lib/set.rb =================================================================== --- lib/set.rb (revision 33637) +++ lib/set.rb (revision 33638) @@ -531,7 +531,7 @@ require 'rbtree' module_eval %{ - def initialize(*args, &block) + def initialize(*args) @hash = RBTree.new super end @@ -544,7 +544,7 @@ } rescue LoadError module_eval %{ - def initialize(*args, &block) + def initialize(*args) @keys = nil super end Index: lib/rinda/tuplespace.rb =================================================================== --- lib/rinda/tuplespace.rb (revision 33637) +++ lib/rinda/tuplespace.rb (revision 33638) @@ -305,7 +305,7 @@ @bin.delete_at(idx) if idx end - def find(&blk) + def find @bin.reverse_each do |x| return x if yield(x) end Index: ext/tk/sample/demos-en/widget =================================================================== --- ext/tk/sample/demos-en/widget (revision 33637) +++ ext/tk/sample/demos-en/widget (revision 33638) @@ -627,7 +627,7 @@ end class Proc - def initialize(*args, &b) + def initialize(*args) super @__pseudo_toplevel__ = Thread.current[:TOPLEVEL] end Index: ext/tk/lib/multi-tk.rb =================================================================== --- ext/tk/lib/multi-tk.rb (revision 33637) +++ ext/tk/lib/multi-tk.rb (revision 33638) @@ -2103,7 +2103,7 @@ # evaluate a procedure on the proper interpreter class MultiTkIp # instance & class method - def _proc_on_safelevel(cmd=nil, &blk) # require a block for eval + def _proc_on_safelevel(cmd=nil) # require a block for eval if cmd if cmd.kind_of?(Method) _proc_on_safelevel{|*args| cmd.call(*args)} Index: ext/pathname/lib/pathname.rb =================================================================== --- ext/pathname/lib/pathname.rb (revision 33637) +++ ext/pathname/lib/pathname.rb (revision 33638) @@ -495,7 +495,7 @@ # If +self+ is <tt>.</tt>, yielded pathnames begin with a filename in the # current directory, not <tt>./</tt>. # - def find(&block) # :yield: pathname + def find # :yield: pathname require 'find' if @path == '.' Find.find(@path) {|f| yield self.class.new(f.sub(%r{\A\./}, '')) } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/