5 files changed, 33 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index c20d2d6b5f..bc8e794d03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Tue Feb 27 16:38:15 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_timeval): negative time interval shoule not be
+	  allowed.
+
+	* eval.c (proc_call): ignore block to `call' always, despite of
+	  being orphan or not.
+
+Mon Feb 26 16:20:27 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (proc_options): call ruby_show_version() just once.
+
+	* dir.c (dir_s_open): returns the value from a block (if given).
+
 Mon Feb 26 00:04:52 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (proc_call): should not modify ruby_block->frame.iter
diff --git a/dir.c b/dir.c
index dd28537217..617dad7796 100644
--- a/dir.c
+++ b/dir.c
@@ -280,8 +280,7 @@ dir_s_open(klass, dirname)
 
     dir_initialize(dir, dirname);
     if (rb_block_given_p()) {
-	rb_ensure(rb_yield, dir, dir_close, dir);
-	return Qnil;
+	return rb_ensure(rb_yield, dir, dir_close, dir);
     }
 
     return dir;
diff --git a/eval.c b/eval.c
index 0008961154..3501bc66f5 100644
--- a/eval.c
+++ b/eval.c
@@ -198,7 +198,6 @@ print_undef(klass, id)
 	     rb_class2name(klass));
 }
 
-
 #define CACHE_SIZE 0x800
 #define CACHE_MASK 0x7ff
 #define EXPR1(c,m) ((((c)>>3)^(m))&CACHE_MASK)
@@ -6261,19 +6260,11 @@ proc_call(proc, args)
     Data_Get_Struct(proc, struct BLOCK, data);
     orphan = blk_orphan(data);
 
-    if (orphan) {/* orphan procedure */
-	if (rb_block_given_p()) {
-	    ruby_block->frame.iter = ITER_CUR;
-	}
-	else {
-	    ruby_block->frame.iter = ITER_NOT;
-	}
-    }
-
     /* PUSH BLOCK from data */
     old_block = ruby_block;
     _block = *data;
     ruby_block = &_block;
+    ruby_block->frame.iter = ITER_NOT;
 
     PUSH_ITER(ITER_CUR);
     ruby_frame->iter = ITER_CUR;
diff --git a/ruby.c b/ruby.c
index 5d92800d3a..6c8bd8eba9 100644
--- a/ruby.c
+++ b/ruby.c
@@ -430,6 +430,10 @@ proc_options(argc, argv)
 	    goto reswitch;
 
 	  case 'v':
+	    if (verbose) {
+		s++;
+		goto reswitch;
+	    }
 	    ruby_show_version();
 	    verbose = 1;
 	  case 'w':
diff --git a/time.c b/time.c
index 8da0daff53..1b18859bcc 100644
--- a/time.c
+++ b/time.c
@@ -106,39 +106,37 @@ time_timeval(time, interval)
     int interval;
 {
     struct timeval t;
+    char *tstr = interval ? "time interval" : "time";
+
+#ifndef NEGATIVE_TIME_T
+    interval = 1;
+#endif
 
     switch (TYPE(time)) {
       case T_FIXNUM:
 	t.tv_sec = FIX2LONG(time);
-#ifndef NEGATIVE_TIME_T
-	if (t.tv_sec < 0)
-	    rb_raise(rb_eArgError, "time must be positive");
-#endif
+	if (interval && t.tv_sec < 0)
+	    rb_raise(rb_eArgError, "%s must be positive", tstr);
 	t.tv_usec = 0;
 	break;
 
       case T_FLOAT:
-#ifndef NEGATIVE_TIME_T
-	if (RFLOAT(time)->value < 0.0)
-	    rb_raise(rb_eArgError, "time must be positive");
-#endif
+	if (interval && RFLOAT(time)->value < 0.0)
+	    rb_raise(rb_eArgError, "%s must be positive", tstr);
 	t.tv_sec = (time_t)RFLOAT(time)->value;
 	t.tv_usec = (time_t)((RFLOAT(time)->value - (double)t.tv_sec)*1e6);
 	break;
 
       case T_BIGNUM:
 	t.tv_sec = NUM2LONG(time);
-#ifndef NEGATIVE_TIME_T
-	if (t.tv_sec < 0)
-	    rb_raise(rb_eArgError, "time must be positive");
-#endif
+	if (interval && t.tv_sec < 0)
+	    rb_raise(rb_eArgError, "%s must be positive", tstr);
 	t.tv_usec = 0;
 	break;
 
       default:
-	rb_raise(rb_eTypeError, "can't convert %s into Time%s",
-		 rb_class2name(CLASS_OF(time)),
-		 interval ? " interval" : "");
+	rb_raise(rb_eTypeError, "can't convert %s into %s",
+		 rb_class2name(CLASS_OF(time)), tstr);
 	break;
     }
     return t;