From 0a45dee5a529461b0e6eb69f14ef4e32eb2ccc9b Mon Sep 17 00:00:00 2001 From: matz Date: Sat, 22 Dec 2001 02:51:00 +0000 Subject: [PATCH] * parse.y (str_extend): make up "#$;" handling. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ parse.y | 1 + time.c | 2 ++ 3 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index ea0421fe62..e7a57c2644 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Dec 21 20:33:34 2001 K.Kosako + + * parse.y (str_extend): make up "#$;" handling. + Fri Dec 21 16:18:17 2001 Nobuyoshi Nakada * dln.h, ruby.h, util.h: enable prototypes in C++. diff --git a/parse.y b/parse.y index 067775edfb..4428386e52 100644 --- a/parse.y +++ b/parse.y @@ -3931,6 +3931,7 @@ str_extend(list, term, paren) case '!': case '@': case ',': case '.': case '=': case ':': case '<': case '>': case '\\': + case ';': refetch: tokadd(c); goto fetch_id; diff --git a/time.c b/time.c index 36db68fa88..9323dca820 100644 --- a/time.c +++ b/time.c @@ -952,6 +952,7 @@ time_plus(time1, time2) } v = NUM2DBL(time2); d = modf(v, &f); + sec = (time_t)f; if (f != (double)sec || d >= 1.0 || d <= -1.0) { rb_raise(rb_eRangeError, "time + %f out of Time range", v); } @@ -998,6 +999,7 @@ time_minus(time1, time2) } v = NUM2DBL(time2); d = modf(v, &f); + sec = (time_t)f; if (f != (double)sec || d >= 1.0 || d <= -1.0) { rb_raise(rb_eRangeError, "time - %f out of Time range", v); }