From af34959f5414a4abdd4a85b911b2041bc09a7c8e Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 2 Nov 2006 00:21:28 +0000 Subject: * lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): Symbol should come earlier than String. * lib/soap/mapping/rubytypeFactory.rb (RubytypeFactory::obj2soap): ditto. * lib/set.rb (TC_Set::test_s_new): strings are no longer Enumerable * lib/soap/property.rb (Property::load): ditto. * lib/webrick/httputils.rb (WEBrick::HTTPUtils::parse_header): ditto. * lib/soap/mimemessage.rb (MIMEMessage::Headers::parse): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/xsd/codegen/gensupport.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/xsd/codegen') diff --git a/lib/xsd/codegen/gensupport.rb b/lib/xsd/codegen/gensupport.rb index 1e85d3668..8c2bb0d90 100644 --- a/lib/xsd/codegen/gensupport.rb +++ b/lib/xsd/codegen/gensupport.rb @@ -129,22 +129,22 @@ module GenSupport private def trim_eol(str) - str.collect { |line| + str.lines.collect { |line| line.sub(/\r?\n\z/, "") + "\n" }.join end def trim_indent(str) indent = nil - str = str.collect { |line| untab(line) }.join - str.each do |line| + str = str.lines.collect { |line| untab(line) }.join + str.each_line do |line| head = line.index(/\S/) if !head.nil? and (indent.nil? or head < indent) indent = head end end return str unless indent - str.collect { |line| + str.lines.collect { |line| line.sub(/^ {0,#{indent}}/, "") }.join end -- cgit