summaryrefslogtreecommitdiff
path: root/ext/psych/lib/psych/json
diff options
context:
space:
mode:
authortenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-21 02:00:43 +0000
committertenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-21 02:00:43 +0000
commit8b5a3b7d39a8768cb0e7cc082c0c84c7ead92155 (patch)
tree7ea561f1cfcb06ebbb74f11813de80d1c8915e72 /ext/psych/lib/psych/json
parent6f37c467d47483aac7bf5336a72446452e7ae251 (diff)
* ext/psych/lib/psych/json/yaml_events.rb: refactoring JSON event
handling methods to a module for reuse. * ext/psych/lib/psych/json/tree_builder.rb: AST builder uses JSON event methods. * ext/psych/lib/psych/json/stream.rb: stream emitter uses JSON event methods. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/psych/lib/psych/json')
-rw-r--r--ext/psych/lib/psych/json/stream.rb21
-rw-r--r--ext/psych/lib/psych/json/tree_builder.rb26
-rw-r--r--ext/psych/lib/psych/json/yaml_events.rb29
3 files changed, 34 insertions, 42 deletions
diff --git a/ext/psych/lib/psych/json/stream.rb b/ext/psych/lib/psych/json/stream.rb
index 5f0233515d..e568719dc8 100644
--- a/ext/psych/lib/psych/json/stream.rb
+++ b/ext/psych/lib/psych/json/stream.rb
@@ -1,4 +1,5 @@
require 'psych/json/ruby_events'
+require 'psych/json/yaml_events'
module Psych
module JSON
@@ -6,25 +7,7 @@ module Psych
include Psych::JSON::RubyEvents
class Emitter < Psych::Stream::Emitter # :nodoc:
- def start_document version, tag_directives, implicit
- super(version, tag_directives, !streaming?)
- end
-
- def start_mapping anchor, tag, implicit, style
- super(anchor, nil, implicit, Nodes::Mapping::FLOW)
- end
-
- def start_sequence anchor, tag, implicit, style
- super(anchor, nil, implicit, Nodes::Sequence::FLOW)
- end
-
- def scalar value, anchor, tag, plain, quoted, style
- if "tag:yaml.org,2002:null" == tag
- super('null', nil, nil, true, false, Nodes::Scalar::PLAIN)
- else
- super
- end
- end
+ include Psych::JSON::YAMLEvents
end
end
end
diff --git a/ext/psych/lib/psych/json/tree_builder.rb b/ext/psych/lib/psych/json/tree_builder.rb
index e4ab423dbb..b799c93f58 100644
--- a/ext/psych/lib/psych/json/tree_builder.rb
+++ b/ext/psych/lib/psych/json/tree_builder.rb
@@ -1,32 +1,12 @@
+require 'psych/json/yaml_events'
+
module Psych
module JSON
###
# Psych::JSON::TreeBuilder is an event based AST builder. Events are sent
# to an instance of Psych::JSON::TreeBuilder and a JSON AST is constructed.
class TreeBuilder < Psych::TreeBuilder
- def start_document version, tag_directives, implicit
- super(version, tag_directives, !streaming?)
- end
-
- def end_document implicit_end = !streaming?
- super(implicit_end)
- end
-
- def start_mapping anchor, tag, implicit, style
- super(anchor, nil, implicit, Nodes::Mapping::FLOW)
- end
-
- def start_sequence anchor, tag, implicit, style
- super(anchor, nil, implicit, Nodes::Sequence::FLOW)
- end
-
- def scalar value, anchor, tag, plain, quoted, style
- if "tag:yaml.org,2002:null" == tag
- super('null', nil, nil, true, false, Nodes::Scalar::PLAIN)
- else
- super
- end
- end
+ include Psych::JSON::YAMLEvents
end
end
end
diff --git a/ext/psych/lib/psych/json/yaml_events.rb b/ext/psych/lib/psych/json/yaml_events.rb
new file mode 100644
index 0000000000..01d4660f85
--- /dev/null
+++ b/ext/psych/lib/psych/json/yaml_events.rb
@@ -0,0 +1,29 @@
+module Psych
+ module JSON
+ module YAMLEvents # :nodoc:
+ def start_document version, tag_directives, implicit
+ super(version, tag_directives, !streaming?)
+ end
+
+ def end_document implicit_end = !streaming?
+ super(implicit_end)
+ end
+
+ def start_mapping anchor, tag, implicit, style
+ super(anchor, nil, implicit, Nodes::Mapping::FLOW)
+ end
+
+ def start_sequence anchor, tag, implicit, style
+ super(anchor, nil, implicit, Nodes::Sequence::FLOW)
+ end
+
+ def scalar value, anchor, tag, plain, quoted, style
+ if "tag:yaml.org,2002:null" == tag
+ super('null', nil, nil, true, false, Nodes::Scalar::PLAIN)
+ else
+ super
+ end
+ end
+ end
+ end
+end