summaryrefslogtreecommitdiff
path: root/ext/psych/lib/psych/json
diff options
context:
space:
mode:
authortenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-21 18:09:38 +0000
committertenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-21 18:09:38 +0000
commit4ed82ae5cb15646272947a33de7714bd852f80a3 (patch)
tree07cf52518e539d4d04ea697aac5d0adbad19ba61 /ext/psych/lib/psych/json
parent10ec858f40e75facef5b7344efee55e77c13e291 (diff)
* ext/psych/lib/psych/streaming.rb: refactor streaming methods to a
module. * ext/psych/lib/psych/stream.rb: extracted streaming specific methods to a module. * ext/psych/lib/psych/json/stream.rb: JSON stream inherits from JSONTree and includes streaming methods. * ext/psych/lib/psych/visitors/json_tree.rb: JSON does not support object references, so remove object reference testing when building JSON trees. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/psych/lib/psych/json')
-rw-r--r--ext/psych/lib/psych/json/stream.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/psych/lib/psych/json/stream.rb b/ext/psych/lib/psych/json/stream.rb
index e568719dc8..be1a0a8a82 100644
--- a/ext/psych/lib/psych/json/stream.rb
+++ b/ext/psych/lib/psych/json/stream.rb
@@ -3,8 +3,9 @@ require 'psych/json/yaml_events'
module Psych
module JSON
- class Stream < Psych::Stream
+ class Stream < Psych::Visitors::JSONTree
include Psych::JSON::RubyEvents
+ include Psych::Streaming
class Emitter < Psych::Stream::Emitter # :nodoc:
include Psych::JSON::YAMLEvents