ruby-changes:21171
From: naruse <ko1@a...>
Date: Thu, 8 Sep 2011 07:37:43 +0900 (JST)
Subject: [ruby-changes:21171] naruse:r33220 (trunk): * ext/syck/lib/syck/types.rb: use toplevel Syck.
naruse 2011-09-08 07:37:34 +0900 (Thu, 08 Sep 2011) New Revision: 33220 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33220 Log: * ext/syck/lib/syck/types.rb: use toplevel Syck. for the case someone define Syck::Syck (or YAML::Syck). Modified files: trunk/ChangeLog trunk/ext/syck/lib/syck/types.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 33219) +++ ChangeLog (revision 33220) @@ -1,3 +1,8 @@ +Thu Sep 8 07:36:36 2011 NARUSE, Yui <naruse@r...> + + * ext/syck/lib/syck/types.rb: use toplevel Syck. + for the case someone define Syck::Syck (or YAML::Syck). + Thu Sep 8 07:33:12 2011 Nobuyoshi Nakada <nobu@r...> * gc.c (id2ref): unmarked object is already dead while lazy Index: ext/syck/lib/syck/types.rb =================================================================== --- ext/syck/lib/syck/types.rb (revision 33219) +++ ext/syck/lib/syck/types.rb (revision 33220) @@ -45,7 +45,7 @@ class Object def self.tag_subclasses?; false; end def to_yaml( opts = {} ) - Syck.quick_emit( self, opts ) do |out| + ::Syck.quick_emit( self, opts ) do |out| out.map( "tag:ruby.yaml.org,2002:object:#{ @class }", to_yaml_style ) do |map| @ivars.each do |k,v| map.add( k, v ) @@ -67,7 +67,7 @@ self.default.to_s end def update( h ) - if Syck::SpecialHash === h + if ::Syck::SpecialHash === h @default = h.default if h.default end super( h ) @@ -89,11 +89,11 @@ if Hash === v concat( v.to_a ) # Convert the map to a sequence else - raise Syck::Error, "Invalid !omap entry: " + val.inspect + raise ::Syck::Error, "Invalid !omap entry: " + val.inspect end end else - raise Syck::Error, "Invalid !omap: " + val.inspect + raise ::Syck::Error, "Invalid !omap: " + val.inspect end self end @@ -123,7 +123,7 @@ true end def to_yaml( opts = {} ) - Syck.quick_emit( self, opts ) do |out| + ::Syck.quick_emit( self, opts ) do |out| out.seq( taguri, to_yaml_style ) do |seq| self.each do |v| seq.add( Hash[ *v ] ) @@ -144,11 +144,11 @@ if Hash === v concat( v.to_a ) # Convert the map to a sequence else - raise Syck::Error, "Invalid !pairs entry: " + val.inspect + raise ::Syck::Error, "Invalid !pairs entry: " + val.inspect end end else - raise Syck::Error, "Invalid !pairs: " + val.inspect + raise ::Syck::Error, "Invalid !pairs: " + val.inspect end self end @@ -173,7 +173,7 @@ true end def to_yaml( opts = {} ) - Syck.quick_emit( self, opts ) do |out| + ::Syck.quick_emit( self, opts ) do |out| out.seq( taguri, to_yaml_style ) do |seq| self.each do |v| seq.add( Hash[ *v ] ) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/