diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-05 21:08:12 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-05 21:08:12 +0000 |
| commit | 40bc864003879046de3439fd08af43567a0c574c (patch) | |
| tree | 3fa5917bcb5c371f24d1e3de1ca507659181070f /lib/rexml/parsers/baseparser.rb | |
| parent | 34fb9453488d00c6542a48e78294aceaee72c90b (diff) | |
* lib/rexml/parsers/baseparser.rb (LETTER, DIGIT):
always use POSIX charclass.
* lib/rexml/parsers/baseparser.rb (NAMECHAR):
remove duplicated range.
* lib/rexml/xmltokens.rb (NCNAME_STR, NAMECHAR): ditto.
* lib/rexml/parsers/xpathparser.rb (PathExpr): ditto.
* lib/rexml/text.rb (REXML::Text#initialize):
initialize @parent.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rexml/parsers/baseparser.rb')
| -rw-r--r-- | lib/rexml/parsers/baseparser.rb | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb index 3c80231c35..09312abdde 100644 --- a/lib/rexml/parsers/baseparser.rb +++ b/lib/rexml/parsers/baseparser.rb @@ -25,15 +25,8 @@ module REXML # # Nat Price gave me some good ideas for the API. class BaseParser - if String.method_defined? :encode - # Oniguruma / POSIX [understands unicode] - LETTER = '[[:alpha:]]' - DIGIT = '[[:digit:]]' - else - # Ruby < 1.9 [doesn't understand unicode] - LETTER = 'a-zA-Z' - DIGIT = '\d' - end + LETTER = '[:alpha:]' + DIGIT = '[:digit:]' COMBININGCHAR = '' # TODO EXTENDER = '' # TODO @@ -42,7 +35,7 @@ module REXML NAME_STR= "(?:(#{NCNAME_STR}):)?(#{NCNAME_STR})" UNAME_STR= "(?:#{NCNAME_STR}:)?#{NCNAME_STR}" - NAMECHAR = '[\-\w\d\.:]' + NAMECHAR = '[\-\w:]' NAME = "([\\w:]#{NAMECHAR}*)" NMTOKEN = "(?:#{NAMECHAR})+" NMTOKENS = "#{NMTOKEN}(\\s+#{NMTOKEN})*" |