From 6166e9cf28bc470c818c461e6b9fb5fdb7b93c22 Mon Sep 17 00:00:00 2001 From: ayumin Date: Sat, 7 Jan 2012 13:47:25 +0000 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ lib/rexml/parsers/baseparser.rb | 5 +++-- version.h | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index be8d5d75d4..3c71f444ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jan 7 22:46:36 2012 Kouhei Sutou + + * 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 * lib/rexml/parsers/baseparser.rb: rexml BaseParser uses diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb index 44b7f1639c..612245fb73 100644 --- a/lib/rexml/parsers/baseparser.rb +++ b/lib/rexml/parsers/baseparser.rb @@ -180,14 +180,14 @@ module REXML # Returns the next event. This is a +PullEvent+ object. def pull - _pull_inner.tap do |event| + pull_event.tap do |event| @listeners.each do |listener| listener.receive event end end end - def _pull_inner + def pull_event if @closed x, @closed = @closed, nil return [ :end_element, x ] @@ -436,6 +436,7 @@ module REXML end return [ :dummy ] end + private :pull_event def entity( reference, entities ) value = nil diff --git a/version.h b/version.h index 162e57b1ff..67d74d1d15 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 20 +#define RUBY_PATCHLEVEL 21 #define RUBY_RELEASE_DATE "2012-01-07" #define RUBY_RELEASE_YEAR 2012