summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1998-06-09 07:23:50 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1998-06-09 07:23:50 +0000
commit3f5b1ec9cb657375a0c467ac70fdd6fbdc97f018 (patch)
treee864c9c3d3f08515ca0cf7eab182be3221bf6a75
parent7acc47fe82fd49cc5ac5d63ec67a2be92ad56d3c (diff)
parsedate
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog17
-rw-r--r--lib/parsedate.rb4
2 files changed, 19 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3cf5ccf6ae..c95b406342 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Tue Jun 9 02:54:51 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
+
+ * lib/parsedate.rb: wday moved to the last in the return values.
+
+Sat Jun 6 22:50:52 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
+
+ * regex.c (calculate_must_string): wrong condition for
+ {start,stop}_nowidth.
+
+ * regex.c (re_match): various features imported from GNU regex.c
+ 0.12, such as nested grouping, avoiding infinite loop with empty
+ match, etc.
+
+ * regex.c (register_info_type): now use union.
+
+ * regex.c (re_search): more precise anchor(^) check.
+
Wed Jun 3 18:07:54 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
* re.c (reg_raise): check rb_in_compile, not rb_in_eval.
diff --git a/lib/parsedate.rb b/lib/parsedate.rb
index 4ae8fc1550..68550c6505 100644
--- a/lib/parsedate.rb
+++ b/lib/parsedate.rb
@@ -17,10 +17,10 @@ module ParseDate
return $1.to_i,
if $2 then $2.to_i else 1 end,
if $3 then $3.to_i else 1 end,
- nil,
if $4 then $4.to_i end,
if $5 then $5.to_i end,
if $6 then $6.to_i end,
+ nil,
nil
end
date = date.dup
@@ -59,7 +59,7 @@ module ParseDate
year = $3.to_i
end
end
- return year, mon, mday, wday, hour, min, sec, zone
+ return year, mon, mday, hour, min, sec, zone, wday
end
module_function :parsedate