ruby-changes:15342
From: naruse <ko1@a...>
Date: Tue, 6 Apr 2010 09:22:45 +0900 (JST)
Subject: [ruby-changes:15342] Ruby:r27231 (trunk): Fix previous commit.
naruse 2010-04-06 09:22:04 +0900 (Tue, 06 Apr 2010) New Revision: 27231 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27231 Log: Fix previous commit. Modified files: trunk/lib/rexml/parsers/baseparser.rb trunk/lib/rss/parser.rb Index: lib/rexml/parsers/baseparser.rb =================================================================== --- lib/rexml/parsers/baseparser.rb (revision 27230) +++ lib/rexml/parsers/baseparser.rb (revision 27231) @@ -32,10 +32,11 @@ EXTENDER = '' # TODO NCNAME_STR= "[#{LETTER}_:][-.\w:#{COMBININGCHAR}#{EXTENDER}]*" + NCNAME_STR= "[#{LETTER}_:][-[:alnum:]._:#{COMBININGCHAR}#{EXTENDER}]*" NAME_STR= "(?:(#{NCNAME_STR}):)?(#{NCNAME_STR})" UNAME_STR= "(?:#{NCNAME_STR}:)?#{NCNAME_STR}" - NAMECHAR = '[\-\w:]' + NAMECHAR = '[\-\w\.:]' NAME = "([\\w:]#{NAMECHAR}*)" NMTOKEN = "(?:#{NAMECHAR})+" NMTOKENS = "#{NMTOKEN}(\\s+#{NMTOKEN})*" Index: lib/rss/parser.rb =================================================================== --- lib/rss/parser.rb (revision 27230) +++ lib/rss/parser.rb (revision 27231) @@ -417,7 +417,7 @@ end end - NAMESPLIT = /^(?:([\w:][-\w\d.]*):)?([\w:][-\w\d.]*)/ + NAMESPLIT = /^(?:([\w:][-\w.]*):)?([\w:][-\w.]*)/ def split_name(name) name =~ NAMESPLIT [$1 || '', $2] -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/