diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb index 63c5003..2420900 100644 --- a/lib/cgi/session.rb +++ b/lib/cgi/session.rb @@ -156,7 +156,7 @@ class CGI attr_reader :session_id, :new_session def Session::callback(dbman) #:nodoc: - Proc.new{ + proc { dbman[0].close unless dbman.empty? } end diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb index ac4afa2..849420c 100644 --- a/lib/irb/ruby-lex.rb +++ b/lib/irb/ruby-lex.rb @@ -82,7 +82,7 @@ class RubyLex elsif block_given? @input = block else - @input = Proc.new{@io.gets} + @input = proc { @io.gets } end end @@ -197,7 +197,7 @@ class RubyLex if p.respond_to?(:call) @prompt = p else - @prompt = Proc.new{print p} + @prompt = proc { print p } end end @@ -352,7 +352,7 @@ class RubyLex end @OP.def_rule("=begin", - proc{|op, io| @prev_char_no == 0 && peek(0) =~ /\s/}) do + proc { |op, io| @prev_char_no == 0 && peek(0) =~ /\s/ }) do |op, io| @ltype = "=" until getc == "\n"; end @@ -471,13 +471,13 @@ class RubyLex Token(TkOPASGN, $1) end - @OP.def_rule("+@", proc{|op, io| @lex_state == EXPR_FNAME}) do + @OP.def_rule("+@", proc { |op, io| @lex_state == EXPR_FNAME }) do |op, io| @lex_state = EXPR_ARG Token(op) end - @OP.def_rule("-@", proc{|op, io| @lex_state == EXPR_FNAME}) do + @OP.def_rule("-@", proc { |op, io| @lex_state == EXPR_FNAME }) do |op, io| @lex_state = EXPR_ARG Token(op) @@ -599,7 +599,7 @@ class RubyLex Token("~") end - @OP.def_rule("~@", proc{|op, io| @lex_state == EXPR_FNAME}) do + @OP.def_rule("~@", proc { |op, io| @lex_state == EXPR_FNAME }) do |op, io| @lex_state = EXPR_BEG Token("~") @@ -619,13 +619,13 @@ class RubyLex Token(tk_c) end - @OP.def_rule("[]", proc{|op, io| @lex_state == EXPR_FNAME}) do + @OP.def_rule("[]", proc { |op, io| @lex_state == EXPR_FNAME }) do |op, io| @lex_state = EXPR_ARG Token("[]") end - @OP.def_rule("[]=", proc{|op, io| @lex_state == EXPR_FNAME}) do + @OP.def_rule("[]=", proc { |op, io| @lex_state == EXPR_FNAME }) do |op, io| @lex_state = EXPR_ARG Token("[]=") diff --git a/lib/matrix.rb b/lib/matrix.rb index 76bec92..81655ad 100644 --- a/lib/matrix.rb +++ b/lib/matrix.rb @@ -1109,7 +1109,7 @@ class Matrix size = row_count last = size - 1 a = to_a - no_pivot = Proc.new{ return 0 } + no_pivot = proc { return 0 } sign = +1 pivot = 1 size.times do |k| diff --git a/lib/rdoc/ruby_lex.rb b/lib/rdoc/ruby_lex.rb index a51e4a9..8ada908 100644 --- a/lib/rdoc/ruby_lex.rb +++ b/lib/rdoc/ruby_lex.rb @@ -148,7 +148,7 @@ class RDoc::RubyLex elsif block_given? @input = block else - @input = Proc.new{@io.gets} + @input = proc { @io.gets } end end @@ -265,7 +265,7 @@ class RDoc::RubyLex if p.respond_to?(:call) @prompt = p else - @prompt = Proc.new{print p} + @prompt = proc { print p } end end @@ -430,7 +430,7 @@ class RDoc::RubyLex end @OP.def_rule("=begin", - proc{|op, io| @prev_char_no == 0 && peek(0) =~ /\s/}) do + proc { |op, io| @prev_char_no == 0 && peek(0) =~ /\s/ }) do |op, io| @ltype = "=" res = '' @@ -556,13 +556,13 @@ class RDoc::RubyLex Token(TkOPASGN, $1) end - @OP.def_rule("+@", proc{|op, io| @lex_state == :EXPR_FNAME}) do + @OP.def_rule("+@", proc { |op, io| @lex_state == :EXPR_FNAME }) do |op, io| @lex_state = :EXPR_ARG Token(op) end - @OP.def_rule("-@", proc{|op, io| @lex_state == :EXPR_FNAME}) do + @OP.def_rule("-@", proc { |op, io| @lex_state == :EXPR_FNAME }) do |op, io| @lex_state = :EXPR_ARG Token(op) @@ -690,7 +690,7 @@ class RDoc::RubyLex Token("~") end - @OP.def_rule("~@", proc{|op, io| @lex_state == :EXPR_FNAME}) do + @OP.def_rule("~@", proc { |op, io| @lex_state == :EXPR_FNAME }) do |op, io| @lex_state = :EXPR_BEG Token("~") @@ -710,13 +710,13 @@ class RDoc::RubyLex Token tk_c end - @OP.def_rule("[]", proc{|op, io| @lex_state == :EXPR_FNAME}) do + @OP.def_rule("[]", proc { |op, io| @lex_state == :EXPR_FNAME }) do |op, io| @lex_state = :EXPR_ARG Token("[]") end - @OP.def_rule("[]=", proc{|op, io| @lex_state == :EXPR_FNAME}) do + @OP.def_rule("[]=", proc { |op, io| @lex_state == :EXPR_FNAME }) do |op, io| @lex_state = :EXPR_ARG Token("[]=") @@ -796,7 +796,7 @@ class RDoc::RubyLex end end - # @OP.def_rule("def", proc{|op, io| /\s/ =~ io.peek(0)}) do + # @OP.def_rule("def", proc { |op, io| /\s/ =~ io.peek(0) }) do # |op, io| # @indent += 1 # @lex_state = :EXPR_FNAME diff --git a/lib/rss/0.9.rb b/lib/rss/0.9.rb index 77b2de1..fa4252a 100644 --- a/lib/rss/0.9.rb +++ b/lib/rss/0.9.rb @@ -450,7 +450,7 @@ module RSS @rss.do_validate = @do_validate @rss.xml_stylesheets = @xml_stylesheets @last_element = @rss - pr = Proc.new do |text, tags| + pr = proc do |text, tags| @rss.validate_for_stream(tags, @ignore_unknown_element) if @do_validate end @proc_stack.push(pr) diff --git a/lib/rss/1.0.rb b/lib/rss/1.0.rb index a2d88d4..744061c 100644 --- a/lib/rss/1.0.rb +++ b/lib/rss/1.0.rb @@ -474,7 +474,7 @@ module RSS @rss.do_validate = @do_validate @rss.xml_stylesheets = @xml_stylesheets @last_element = @rss - pr = Proc.new do |text, tags| + pr = proc do |text, tags| @rss.validate_for_stream(tags, @ignore_unknown_element) if @do_validate end @proc_stack.push(pr) diff --git a/lib/rss/atom.rb b/lib/rss/atom.rb index d352423..8133f72 100644 --- a/lib/rss/atom.rb +++ b/lib/rss/atom.rb @@ -815,7 +815,7 @@ module RSS @rss.lang = attrs["xml:lang"] @rss.base = attrs["xml:base"] @last_element = @rss - pr = Proc.new do |text, tags| + pr = proc do |text, tags| @rss.validate_for_stream(tags) if @do_validate end @proc_stack.push(pr) @@ -830,7 +830,7 @@ module RSS @rss.lang = attrs["xml:lang"] @rss.base = attrs["xml:base"] @last_element = @rss - pr = Proc.new do |text, tags| + pr = proc do |text, tags| @rss.validate_for_stream(tags) if @do_validate end @proc_stack.push(pr) diff --git a/lib/rss/maker/base.rb b/lib/rss/maker/base.rb index d1586fb..6f939d9 100644 --- a/lib/rss/maker/base.rb +++ b/lib/rss/maker/base.rb @@ -501,7 +501,7 @@ module RSS end [ - ["link", "href", Proc.new {|target,| "#{target}.href = 'self'"}], + ["link", "href", proc { |target| "#{target}.href = 'self'" }], ["author", "name"], ["contributor", "name"], ].each do |name, attribute, additional_setup_maker| @@ -715,7 +715,7 @@ module RSS [ ["author", "name"], - ["link", "href", Proc.new {|target,| "#{target}.href = 'alternate'"}], + ["link", "href", proc { |target| "#{target}.href = 'alternate'" }], ["contributor", "name"], ].each do |name, attribute| def_classed_elements(name, attribute) diff --git a/lib/rss/parser.rb b/lib/rss/parser.rb index 1b6e4e9..86e383c 100644 --- a/lib/rss/parser.rb +++ b/lib/rss/parser.rb @@ -327,7 +327,7 @@ module RSS element_attrs) previous << next_element if previous @last_xml_element = next_element - pr = Proc.new do |text, tags| + pr = proc do |text, tags| if previous @last_xml_element = previous else @@ -444,7 +444,7 @@ module RSS end def start_get_text_element(tag_name, prefix, ns, required_uri) - pr = Proc.new do |text, tags| + pr = proc do |text, tags| setter = self.class.setter(required_uri, tag_name) if setter and @last_element.respond_to?(setter) if @do_validate @@ -515,7 +515,7 @@ module RSS @last_element.parent = previous if klass.need_parent? @xml_child_mode = @last_element.have_xml_content? - Proc.new do |text, tags| + proc do |text, tags| p(@last_element.class) if DEBUG if @xml_child_mode @last_element.content = @xml_element.to_s @@ -540,7 +540,7 @@ module RSS def setup_next_element_in_unknown_element current_element, @last_element = @last_element, nil - Proc.new {@last_element = current_element} + proc { @last_element = current_element } end end diff --git a/lib/webrick/httprequest.rb b/lib/webrick/httprequest.rb index 21933ac..f54f731 100644 --- a/lib/webrick/httprequest.rb +++ b/lib/webrick/httprequest.rb @@ -251,7 +251,7 @@ module WEBrick # Returns the request body. def body(&block) # :yields: body_chunk - block ||= Proc.new{|chunk| @body << chunk } + block ||= proc { |chunk| @body << chunk } read_body(@socket, block) @body.empty? ? nil : @body end