summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-02 21:25:27 +0000
committertenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-02 21:25:27 +0000
commit3d2e701396d014fa1aff49e3441ab1cf0ab63fd7 (patch)
tree4564b1551398c8d0d6e9d420d987640834862d01
parentd5b2de3af1dd52ae9104fbd00cd352c6248e4a82 (diff)
* ext/psych/lib/psych/visitors/visitor.rb (initialize): push accessor
methods to subclass that actually uses them. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29672 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/psych/lib/psych/visitors/visitor.rb9
-rw-r--r--ext/psych/lib/psych/visitors/yaml_tree.rb6
3 files changed, 11 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index f3848f2c8a..f958addaa9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 2 22:50:25 2010 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/psych/lib/psych/visitors/visitor.rb (initialize): push accessor
+ methods to subclass that actually uses them.
+
Tue Nov 2 22:47:08 2010 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/visitor.rb (accept): switch to
diff --git a/ext/psych/lib/psych/visitors/visitor.rb b/ext/psych/lib/psych/visitors/visitor.rb
index 0e33128f01..4d7772f428 100644
--- a/ext/psych/lib/psych/visitors/visitor.rb
+++ b/ext/psych/lib/psych/visitors/visitor.rb
@@ -1,15 +1,6 @@
module Psych
module Visitors
class Visitor
- attr_reader :started, :finished
- alias :finished? :finished
- alias :started? :started
-
- def initialize
- @started = false
- @finished = false
- end
-
def accept target
visit target
end
diff --git a/ext/psych/lib/psych/visitors/yaml_tree.rb b/ext/psych/lib/psych/visitors/yaml_tree.rb
index 6df1151ad7..38a42fcaff 100644
--- a/ext/psych/lib/psych/visitors/yaml_tree.rb
+++ b/ext/psych/lib/psych/visitors/yaml_tree.rb
@@ -8,8 +8,14 @@ module Psych
# builder.tree # => #<Psych::Nodes::Stream .. }
#
class YAMLTree < Psych::Visitors::Visitor
+ attr_reader :started, :finished
+ alias :finished? :finished
+ alias :started? :started
+
def initialize options = {}, emitter = Psych::TreeBuilder.new
super()
+ @started = false
+ @finished = false
@emitter = emitter
@st = {}
@ss = ScalarScanner.new