summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1998-03-16 06:00:12 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1998-03-16 06:00:12 +0000
commit62fda90d7adf5436d15f9407bed294bd5a4885be (patch)
treed1cca06d43b56fdeec621edc6436dffcc3b23017
parentf0a314fa33d703d67543704e24146e3157a11360 (diff)
1.1b9_03 pre
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog19
-rw-r--r--io.c8
-rw-r--r--version.h4
3 files changed, 25 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 8543292541..6443744aee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,29 @@
+Mon Mar 16 13:23:53 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
+
+ * io.c (io_check_closed): check for `fptr->f2 == NULL'.
+
+ * io.c (io_fptr_close): ditto.
+
+Mon Mar 16 14:11:06 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
+
+ * class.c (ins_methods_i): needed to consider NOEX_UNDEF.
+
Fri Mar 13 13:49:24 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
+ * experimental release 1.1b9_02.
+
* object.c (mod_clone): need to dups constants and instance
variables.
* eval.c (rb_eval): forgot to initialize body for NODE_DEFS.
+ * eval.c (rb_eval): retrieve self from calling frame, since self
+ changes sometimes.
+
+ * env.h (FRAME): need to save self in the calling frame.
+
+ * io.c (f_gets_method): rs should be initialized by RS.
+
Thu Mar 12 15:33:57 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
* experimental release 1.1b9_01.
diff --git a/io.c b/io.c
index 4e3f60c982..7c086970f4 100644
--- a/io.c
+++ b/io.c
@@ -111,7 +111,7 @@ void
io_check_closed(fptr)
OpenFile *fptr;
{
- if (fptr->f == NULL)
+ if (fptr->f == NULL && fptr->f2 == NULL)
Raise(eIOError, "closed stream");
}
@@ -691,7 +691,7 @@ static void
io_fptr_close(fptr)
OpenFile *fptr;
{
- if (fptr->f == NULL) return;
+ if (fptr->f == NULL && fptr->f2 == NULL) return;
if (fptr->finalize) {
(*fptr->finalize)(fptr);
@@ -886,7 +886,7 @@ rb_fdopen(fd, mode)
return f;
}
-#if defined (NT) || defined(DJGPP) || defined(__CYGWIN32__) || defined(__human68k__)
+#if defined (NT) || defined(DJGPP) || defined(__CYGWIN32__) || defined(__human68k__) || 1
static struct pipe_list {
OpenFile *fptr;
struct pipe_list *next;
@@ -2500,7 +2500,7 @@ Init_IO()
rb_define_virtual_variable("$-i", opt_i_get, opt_i_set);
-#if defined (NT) || defined(DJGPP) || defined(__CYGWIN32__) || defined(__human68k__)
+#if defined (NT) || defined(DJGPP) || defined(__CYGWIN32__) || defined(__human68k__) || 1
atexit(pipe_atexit);
#endif
diff --git a/version.h b/version.h
index d6736b64de..0ae9139917 100644
--- a/version.h
+++ b/version.h
@@ -1,2 +1,2 @@
-#define RUBY_VERSION "1.1b9_01"
-#define VERSION_DATE "98/03/06"
+#define RUBY_VERSION "1.1b9_02"
+#define VERSION_DATE "98/03/13"