diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-11-02 00:21:28 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-11-02 00:21:28 +0000 |
commit | 84e2f5268a4844d7999a9424c7f6a94fd4a68cb7 (patch) | |
tree | 9bfd2df5a5e574ddae6685e70d720dcae09fcbb6 /lib/xsd | |
parent | 92ca42cb3e2fcfcee94a1f9718fcf94a9b31d947 (diff) | |
download | ruby-84e2f5268a4844d7999a9424c7f6a94fd4a68cb7.tar.gz |
* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@11259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/xsd')
-rw-r--r-- | lib/xsd/codegen/gensupport.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/xsd/codegen/gensupport.rb b/lib/xsd/codegen/gensupport.rb index 1e85d3668f..8c2bb0d901 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 |