merge revision(s) 34204:

* lib/rexml/parsers/baseparser.rb: use private instead of _xxx
	  method name. This is Ruby code not Python code.
	  refs #5696


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34224 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ayumin 2012-01-07 13:47:25 +00:00
parent 68fff3881d
commit 6166e9cf28
3 changed files with 10 additions and 3 deletions

View file

@ -1,3 +1,9 @@
Sat Jan 7 22:46:36 2012 Kouhei Sutou <kou@cozmixng.org>
* lib/rexml/parsers/baseparser.rb: use private instead of _xxx
method name. This is Ruby code not Python code.
refs #5696
Tue Jan 03 23:57:37 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com> Tue Jan 03 23:57:37 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
* lib/rexml/parsers/baseparser.rb: rexml BaseParser uses * lib/rexml/parsers/baseparser.rb: rexml BaseParser uses

View file

@ -180,14 +180,14 @@ module REXML
# Returns the next event. This is a +PullEvent+ object. # Returns the next event. This is a +PullEvent+ object.
def pull def pull
_pull_inner.tap do |event| pull_event.tap do |event|
@listeners.each do |listener| @listeners.each do |listener|
listener.receive event listener.receive event
end end
end end
end end
def _pull_inner def pull_event
if @closed if @closed
x, @closed = @closed, nil x, @closed = @closed, nil
return [ :end_element, x ] return [ :end_element, x ]
@ -436,6 +436,7 @@ module REXML
end end
return [ :dummy ] return [ :dummy ]
end end
private :pull_event
def entity( reference, entities ) def entity( reference, entities )
value = nil value = nil

View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 20 #define RUBY_PATCHLEVEL 21
#define RUBY_RELEASE_DATE "2012-01-07" #define RUBY_RELEASE_DATE "2012-01-07"
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012