990917

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@529 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 21 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 211bbc049..a2ddb6508 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,22 @@
+Fri Sep 17 01:04:25 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* stable version 1.4.2 released.
+
+Fri Sep 17 00:52:27 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (arg): assignable() may return 0.
+
+Thu Sep 16 20:46:23 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* eval.c (rb_eval): was doubly evaluating the return expression.
+
 Thu Sep 16 18:40:08 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
 	* stable version 1.4.1 released.
 
 Thu Sep 16 11:33:22 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
 
-	* string.c (rb_str_match): should return false.
+	* string.c (rb_str_match): should return nil.
 
 Wed Sep 15 22:46:37 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
diff --git a/MANIFEST b/MANIFEST
index 2cf27f250..5d7538217 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -202,6 +202,7 @@ sample/from.rb
 sample/fullpath.rb
 sample/getopts.test
 sample/goodfriday.rb
+sample/irb.rb
 sample/less.rb
 sample/list.rb
 sample/list2.rb
@@ -217,7 +218,6 @@ sample/occur2.rb
 sample/philos.rb
 sample/pi.rb
 sample/rename.rb
-sample/rbc.rb
 sample/rcs.awk
 sample/rcs.dat
 sample/rcs.rb
diff --git a/eval.c b/eval.c
index 98ae96c68..e207b3713 100644
--- a/eval.c
+++ b/eval.c
@@ -2181,7 +2181,6 @@ rb_eval(self, node)
 	else {
 	    return_value(Qnil);
 	}
-	return_value(rb_eval(self, node->nd_stts));
 	return_check();
 	JUMP_TAG(TAG_RETURN);
 	break;
diff --git a/parse.y b/parse.y
index b6ad7b596..1603a0b6d 100644
--- a/parse.y
+++ b/parse.y
@@ -626,7 +626,9 @@ arg		: lhs '=' arg
 			}
 			else {
 			    $$ = $<node>3;
-			    $$->nd_value = call_op(gettable($1), $2, 1, $4);
+			    if ($$) {
+				$$->nd_value = call_op(gettable($1),$2,1,$4);
+			    }
 			}
 			fixpos($$, $4);
 		    }
diff --git a/version.h b/version.h
index 72ef4efd8..3cf94bf47 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
-#define RUBY_VERSION "1.4.1"
-#define RUBY_RELEASE_DATE "1999-09-16"
-#define RUBY_VERSION_CODE 141
-#define RUBY_RELEASE_CODE 19990916
+#define RUBY_VERSION "1.4.2"
+#define RUBY_RELEASE_DATE "1999-09-17"
+#define RUBY_VERSION_CODE 142
+#define RUBY_RELEASE_CODE 19990917