* lib/date/format.rb: reverted.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 11 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 6c7e30de9..c0dbb83b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Aug 16 22:20:16 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb: reverted.
+
 Sun Aug 16 21:31:21 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/date/format.rb: suppressed a warning.
diff --git a/lib/date/format.rb b/lib/date/format.rb
index d6e3a3b85..a83b29802 100644
--- a/lib/date/format.rb
+++ b/lib/date/format.rb
@@ -544,8 +544,8 @@ class Date
 	  e._cent ||= if val >= 69 then 19 else 20 end
 	when 'Z', /\A:{0,3}z/
 	  return unless str.sub!(/\A((?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
-				    |[a-z.\s]+(?:standard|daylight)\s+time\b
-				    |[a-z]+(?:\s+dst)?\b
+				    |[[:alpha:].\s]+(?:standard|daylight)\s+time\b
+				    |[[:alpha:]]+(?:\s+dst)?\b
 				    )/ix, '')
 	  val = $1
 	  e.zone = val
@@ -560,8 +560,8 @@ class Date
 	end
       else
 	case c
-	when /\A\s/
-	  str.sub!(/\A\s+/, '')
+	when /\A[\s\v]/
+	  str.sub!(/\A[\s\v]+/, '')
 	else
 	  return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
 	end
@@ -703,9 +703,9 @@ class Date
 		   (
 		     (?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
 		   |
-		     [a-z.\s]+(?:standard|daylight)\stime\b
+		     [[:alpha:].\s]+(?:standard|daylight)\stime\b
 		   |
-		     [a-z]+(?:\sdst)?\b
+		     [[:alpha:]]+(?:\sdst)?\b
 		   )
 		 )?
 		/ix,
@@ -1034,7 +1034,7 @@ class Date
 
     e._comp = comp
 
-    str.gsub!(/[^-+',.\/:@0-9a-zA-Z\[\]]+/, ' ')
+    str.gsub!(/[^-+',.\/:@[:alnum:]\[\]]+/, ' ')
 
     _parse_time(str, e) # || _parse_beat(str, e)
     _parse_day(str, e)