summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-16 12:34:53 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-16 12:34:53 +0000
commitd97f1d3b3734f1d5b33d38b72b51a73062749cba (patch)
tree64afcda2040f8ebb5a2ea7bd34680a8a9410f644 /ext
parente94bc257290a94607cfe1ca98cfbd46d39056908 (diff)
merges r30475 from trunk into ruby_1_9_2.
-- * ext/psych/lib/psych/json/tree_builder.rb (start_mapping): tags should not be included in JSON mapping git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/psych/lib/psych/json/tree_builder.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/psych/lib/psych/json/tree_builder.rb b/ext/psych/lib/psych/json/tree_builder.rb
index 91d7e6cad6..722f2a6bf1 100644
--- a/ext/psych/lib/psych/json/tree_builder.rb
+++ b/ext/psych/lib/psych/json/tree_builder.rb
@@ -13,7 +13,7 @@ module Psych
end
def start_mapping anchor, tag, implicit, style
- super(anchor, tag, implicit, Nodes::Mapping::FLOW)
+ super(anchor, nil, implicit, Nodes::Mapping::FLOW)
end
def start_sequence anchor, tag, implicit, style