From ed6a2bd29f649369beb1b7935cf2625c60581c04 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 21 May 2001 04:22:54 +0000
Subject: * bignum.c (rb_big2str): t should be protected from GC.

* process.c (rb_proc_times): need not to check retrun value from
  times(2).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1438 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 13 +++++++++++++
 bignum.c  |  4 ++--
 parse.y   | 32 ++++++++++++++++----------------
 process.c |  2 +-
 version.h |  4 ++--
 5 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6b58655106..e45ab1b4b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon May 21 13:15:25 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big2str): t should be protected from GC.
+
+Sat May 19 09:29:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (rb_proc_times): need not to check retrun value from
+	  times(2).
+
 Fri May 18 05:36:08 2001  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/extmk.rb.in (xsystem): backout the previous fix which was
@@ -15,6 +24,10 @@ Fri May 18 03:45:55 2001  Brian F. Feldman  <green@FreeBSD.org>
 	* lib/mkmf.rb: unbreak "make install".  lib/* must be installed
 	  under $rubylibdir, not under $libdir.
 
+Fri May 18 01:28:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (expr): break, next, redo, retry are moved from primary.
+
 Fri May 18 01:11:02 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
 
 	* ext/sha1/sha1-ruby.c (sha1_new): get rid of an unneeded
diff --git a/bignum.c b/bignum.c
index c58de5d5bb..4100d409c4 100644
--- a/bignum.c
+++ b/bignum.c
@@ -365,7 +365,7 @@ rb_big2str(x, base)
     VALUE x;
     int base;
 {
-    VALUE t;
+    volatile VALUE t;
     BDIGIT *ds;
     long i, j, hbase;
     VALUE ss;
@@ -395,7 +395,7 @@ rb_big2str(x, base)
     else {
 	j = 0;
 	hbase = 0;
-	rb_raise(rb_eArgError, "bignum cannot treat base %d", base);
+	rb_raise(rb_eArgError, "Bignum cannot treat base %d", base);
     }
 
     t = rb_big_clone(x);
diff --git a/parse.y b/parse.y
index 3021565888..7e8d8b42a3 100644
--- a/parse.y
+++ b/parse.y
@@ -426,6 +426,22 @@ expr		: kRETURN ret_args
 			    yyerror("return appeared outside of method");
 			$$ = NEW_RETURN($2);
 		    }
+		| kBREAK
+		    {
+			$$ = NEW_BREAK();
+		    }
+		| kNEXT
+		    {
+			$$ = NEW_NEXT();
+		    }
+		| kREDO
+		    {
+			$$ = NEW_REDO();
+		    }
+		| kRETRY
+		    {
+			$$ = NEW_RETRY();
+		    }
 		| command_call
 		| expr kAND expr
 		    {
@@ -1343,22 +1359,6 @@ primary		: literal
 		        local_pop();
 			in_single--;
 		    }
-		| kBREAK
-		    {
-			$$ = NEW_BREAK();
-		    }
-		| kNEXT
-		    {
-			$$ = NEW_NEXT();
-		    }
-		| kREDO
-		    {
-			$$ = NEW_REDO();
-		    }
-		| kRETRY
-		    {
-			$$ = NEW_RETRY();
-		    }
 
 then		: term
 		| kTHEN
diff --git a/process.c b/process.c
index 0051d358b1..e4b7c8f03b 100644
--- a/process.c
+++ b/process.c
@@ -1285,7 +1285,7 @@ rb_proc_times(obj)
 #endif /* HZ */
     struct tms buf;
 
-    if (times(&buf) == -1) rb_sys_fail(0);
+    times(&buf);
     return rb_struct_new(S_Tms,
 			 rb_float_new((double)buf.tms_utime / HZ),
 			 rb_float_new((double)buf.tms_stime / HZ),
diff --git a/version.h b/version.h
index 0560caaf5f..57dfb4663a 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 #define RUBY_VERSION "1.7.0"
-#define RUBY_RELEASE_DATE "2001-05-17"
+#define RUBY_RELEASE_DATE "2001-05-21"
 #define RUBY_VERSION_CODE 170
-#define RUBY_RELEASE_CODE 20010517
+#define RUBY_RELEASE_CODE 20010521
-- 
cgit v1.2.3