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

* lib/rexml/document.rb (REXML::Document:write): leaky modification

Browse Source 
trans -> transitive.  [ruby-dev:32040], r13686

* lib/rexml/text.rb (Text.check): fix check for illigal characher.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2008-06-05 11:22:32 +00:00
parent 7e9e152526
commit 7493685b3b
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Thu Jun 5 20:17:29 2008 Yusuke Endoh <mame@tsg.ne.jp>
* lib/rexml/document.rb (REXML::Document:write): leaky modification
trans -> transitive. [ruby-dev:32040], r13686
* lib/rexml/text.rb (Text.check): fix check for illigal characher.
Thu Jun 5 14:03:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Jun 5 14:03:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/iconv.c (iconv_create): find encoding without options. * ext/iconv/iconv.c (iconv_create): find encoding without options.

4
lib/rexml/document.rb
View File

@ -168,7 +168,7 @@ module REXML
# indentation will be twice this number of spaces, and children will be # indentation will be twice this number of spaces, and children will be
# indented an additional amount. For a value of 3, every item will be # indented an additional amount. For a value of 3, every item will be
# indented 3 more levels, or 6 more spaces (2 * 3). Defaults to -1 # indented 3 more levels, or 6 more spaces (2 * 3). Defaults to -1
# trans:: # transitive::
# If transitive is true and indent is >= 0, then the output will be # If transitive is true and indent is >= 0, then the output will be
# pretty-printed in such a way that the added whitespace does not affect # pretty-printed in such a way that the added whitespace does not affect
# the absolute *value* of the document -- that is, it leaves the value # the absolute *value* of the document -- that is, it leaves the value
@ -184,7 +184,7 @@ module REXML
output = Output.new( output, xml_decl.encoding ) output = Output.new( output, xml_decl.encoding )
end end
formatter = if indent > -1 formatter = if indent > -1
if trans if transitive
REXML::Formatters::Transitive.new( indent, ie_hack ) REXML::Formatters::Transitive.new( indent, ie_hack )
else else
REXML::Formatters::Pretty.new( indent, ie_hack ) REXML::Formatters::Pretty.new( indent, ie_hack )

2
lib/rexml/text.rb
View File

@ -150,7 +150,7 @@ module REXML
end end
# context sensitive # context sensitive
string.scan(pattern).each do string.scan(pattern) do
if $1[-1] != ?; if $1[-1] != ?;
raise "Illegal character '#{$1}' in raw string \"#{string}\"" raise "Illegal character '#{$1}' in raw string \"#{string}\""
elsif $1[0] == ?& elsif $1[0] == ?&