1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/syck/lib/syck.rb: fixing unused variable warnings

Browse Source 
* ext/syck/lib/syck/basenode.rb: ditto
* ext/syck/lib/syck/rubytypes.rb: ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28681 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tenderlove 2010-07-19 04:54:06 +00:00
parent 87d8a3b9ce
commit 8ef7bb8c21
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ext/syck/lib/syck.rb
View File

@ -132,7 +132,7 @@ module Syck
# #=> :locked # #=> :locked
# #
def self.load( io ) def self.load( io )
yp = parser.load( io ) parser.load( io )
end end
# #
@ -175,7 +175,7 @@ module Syck
# @value=":locked", @kind=:scalar> # @value=":locked", @kind=:scalar>
# #
def self.parse( io ) def self.parse( io )
yp = generic_parser.load( io ) generic_parser.load( io )
end end
# #
@ -217,7 +217,7 @@ module Syck
# #
def self.each_document( io, &block ) def self.each_document( io, &block )
warn "#{caller[0]}: YAML.each_document is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__)) warn "#{caller[0]}: YAML.each_document is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
yp = parser.load_documents( io, &block ) parser.load_documents( io, &block )
end end
# #
@ -232,7 +232,7 @@ module Syck
# end # end
# #
def self.load_documents( io, &doc_proc ) def self.load_documents( io, &doc_proc )
yp = parser.load_documents( io, &doc_proc ) parser.load_documents( io, &doc_proc )
end end
# #
@ -248,7 +248,7 @@ module Syck
# #
def self.each_node( io, &doc_proc ) def self.each_node( io, &doc_proc )
warn "#{caller[0]}: YAML.each_node is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__)) warn "#{caller[0]}: YAML.each_node is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
yp = generic_parser.load_documents( io, &doc_proc ) generic_parser.load_documents( io, &doc_proc )
end end
# #
@ -366,7 +366,7 @@ module Syck
# #
def self.read_type_class( type, obj_class ) def self.read_type_class( type, obj_class )
warn "#{caller[0]}: YAML.read_type_class is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__)) warn "#{caller[0]}: YAML.read_type_class is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
scheme, domain, type, tclass = type.split( ':', 4 ) type, tclass = type.split( ':', 4 ).last(2)
tclass.split( "::" ).each { |c| obj_class = obj_class.const_get( c ) } if tclass tclass.split( "::" ).each { |c| obj_class = obj_class.const_get( c ) } if tclass
return [ type, obj_class ] return [ type, obj_class ]
end end

1
ext/syck/lib/syck/basenode.rb
View File

@ -83,7 +83,6 @@ module Syck
def match_path( ypath_str ) def match_path( ypath_str )
warn "#{caller[0]}: match_path is deprecated" if $VERBOSE warn "#{caller[0]}: match_path is deprecated" if $VERBOSE
require 'syck/ypath' require 'syck/ypath'
depth = 0
matches = [] matches = []
YPath.each_path( ypath_str ) do |ypath| YPath.each_path( ypath_str ) do |ypath|
seg = match_segment( ypath, 0 ) seg = match_segment( ypath, 0 )

2
ext/syck/lib/syck/rubytypes.rb
View File

@ -61,7 +61,7 @@ class Struct
props = {} props = {}
val.delete_if { |k,v| props[k] = v if k =~ /^@/ } val.delete_if { |k,v| props[k] = v if k =~ /^@/ }
begin begin
struct_name, struct_type = YAML.read_type_class( tag, Struct ) struct_type = YAML.read_type_class( tag, Struct ).last
rescue NameError rescue NameError
end end
if not struct_type if not struct_type