From 7493685b3b9d9dfc980e8639422bb64ff2530cd5 Mon Sep 17 00:00:00 2001 From: mame Date: Thu, 5 Jun 2008 11:22:32 +0000 Subject: [PATCH] * 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ lib/rexml/document.rb | 4 ++-- lib/rexml/text.rb | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c29c2de99..e19fc5c5d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Jun 5 20:17:29 2008 Yusuke Endoh + + * 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 * ext/iconv/iconv.c (iconv_create): find encoding without options. diff --git a/lib/rexml/document.rb b/lib/rexml/document.rb index 029c042295..42d70bb6da 100644 --- a/lib/rexml/document.rb +++ b/lib/rexml/document.rb @@ -168,7 +168,7 @@ module REXML # 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 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 # 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 @@ -184,7 +184,7 @@ module REXML output = Output.new( output, xml_decl.encoding ) end formatter = if indent > -1 - if trans + if transitive REXML::Formatters::Transitive.new( indent, ie_hack ) else REXML::Formatters::Pretty.new( indent, ie_hack ) diff --git a/lib/rexml/text.rb b/lib/rexml/text.rb index 281b87890b..fac5ac3e41 100644 --- a/lib/rexml/text.rb +++ b/lib/rexml/text.rb @@ -150,7 +150,7 @@ module REXML end # context sensitive - string.scan(pattern).each do + string.scan(pattern) do if $1[-1] != ?; raise "Illegal character '#{$1}' in raw string \"#{string}\"" elsif $1[0] == ?&