summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--parse.y1
-rw-r--r--time.c2
3 files changed, 7 insertions, 0 deletions
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 <kosako@sofnec.co.jp>
+
+ * parse.y (str_extend): make up "#$;" handling.
+
Fri Dec 21 16:18:17 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
* 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);
}