* array.c: replace rb_protect_inspect() and rb_inspecting_p() by

  rb_exec_recursive() in eval.c.

* eval.c (rb_exec_recursive): new function.

* array.c (rb_ary_join): use rb_exec_recursive().

* array.c (rb_ary_inspect, rb_ary_hash): ditto.

* file.c (rb_file_join): ditto.

* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.

* io.c (rb_io_puts): ditto.

* object.c (rb_obj_inspect): ditto

* struct.c (rb_struct_inspect): ditto.

* lib/set.rb (SortedSet::setup): a hack to shut up warning.
  [ruby-talk:132866]

* lib/time.rb (Time::strptime): add new function.  inspired by
  [ruby-talk:132815].

* lib/parsedate.rb (ParseDate::strptime): ditto.

* regparse.c: move st_*_strend() functions from st.c.  fixed some
  potential memory leaks.

* exception error messages updated.  [ruby-core:04497]

* ext/socket/socket.c (Init_socket): add bunch of Socket
  constants.  Patch from Sam Roberts <sroberts@uniserve.com>.
  [ruby-core:04409]

* array.c (rb_ary_s_create): no need for negative argc check.
  [ruby-core:04463]

* array.c (rb_ary_unshift_m): ditto.

* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
  of StandardError class, not Exception class.  [ruby-core:04429]

* parse.y (fcall_gen): lvar(arg) will be evaluated as
  lvar.call(arg) when lvar is a defined local variable. [new]

* object.c (rb_class_initialize): call inherited method before
  calling initializing block.

* eval.c (rb_thread_start_1): initialize newly pushed frame.

* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
  fixed: [ruby-core:04444]

* eval.c (is_defined): NODE_IASGN is an assignment.

* ext/readline/readline.c (Readline.readline): use rl_outstream
  and rl_instream.  [ruby-dev:25699]

* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
  [ruby-dev:25675]

* misc/ruby-mode.el: [ruby-core:04415]

* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]

* lib/rdoc/generators/ri_generator.rb: ditto.

* struct.c (make_struct): fixed: [ruby-core:04402]

* ext/curses/curses.c (window_color_set): [ruby-core:04393]

* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
  [ruby-talk:130092]

* object.c: [ruby-doc:818]

* parse.y (open_args): fix too verbose warnings for the space
  before argument parentheses.  [ruby-dev:25492]

* parse.y (parser_yylex): ditto.

* parse.y (parser_yylex): the first expression in the parentheses
  should not be a command.  [ruby-dev:25492]

* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]

* object.c (Init_Object): remove Object#type.  [ruby-core:04335]

* st.c (st_foreach): report success/failure by return value.
  [ruby-Bugs-1396]

* parse.y: forgot to initialize parser struct.  [ruby-dev:25492]

* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
  [ruby-talk:127711]

* document updates - [ruby-core:04296], [ruby-core:04301],
  [ruby-core:04302], [ruby-core:04307]

* dir.c (rb_push_glob): should work for NUL delimited patterns.

* dir.c (rb_glob2): should aware of offset in the pattern.

* string.c (rb_str_new4): should propagate taintedness.

* env.h: rename member names in struct FRAME; last_func -> callee,
  orig_func -> this_func, last_class -> this_class.

* struct.c (rb_struct_set): use original method name, not callee
  name, to retrieve member slot.  [ruby-core:04268]

* time.c (time_strftime): protect from format modification from GC
  finalizers.

* object.c (Init_Object): remove rb_obj_id_obsolete()

* eval.c (rb_mod_define_method): incomplete subclass check.
  [ruby-dev:25464]

* gc.c (rb_data_object_alloc): klass may be NULL.
  [ruby-list:40498]

* bignum.c (rb_big_rand): should return positive random number.
  [ruby-dev:25401]

* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
  random bignums.  [ruby-dev:25396]

* variable.c (rb_autoload): [ruby-dev:25373]

* eval.c (svalue_to_avalue): [ruby-dev:25366]

* string.c (rb_str_justify): [ruby-dev:25367]

* io.c (rb_f_select): [ruby-dev:25312]

* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]

* struct.c (make_struct): [ruby-dev:25249]

* dir.c (dir_open_dir): new function.  [ruby-dev:25242]

* io.c (rb_f_open): add type check for return value from to_open.

* lib/pstore.rb (PStore#transaction): Use the empty content when a
  file is not found.  [ruby-dev:24561]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 33 insertions, 29 deletions

diff --git a/io.c b/io.c
index 0f8da47751..c8de07f1e2 100644
--- a/io.c
+++ b/io.c
@@ -15,7 +15,6 @@
 #include "ruby.h"
 #include "rubyio.h"
 #include "rubysig.h"
-#include "env.h"
 #include <ctype.h>
 #include <errno.h>
 
@@ -174,7 +173,7 @@ is_socket(fd, path)
 void
 rb_eof_error()
 {
-    rb_raise(rb_eEOFError, "End of file reached");
+    rb_raise(rb_eEOFError, "end of file reached");
 }
 
 VALUE
@@ -801,8 +800,7 @@ static int
 io_getc(OpenFile *fptr)
 {
     int r;
-    if (fptr->fd == 0 && (fptr->mode & FMODE_TTY) &&
-        TYPE(rb_stdout) == T_FILE) {
+    if (fptr->fd == 0 && (fptr->mode & FMODE_TTY) && TYPE(rb_stdout) == T_FILE) {
         OpenFile *ofp;
         GetOpenFile(rb_stdout, ofp);
         if (ofp->mode & FMODE_TTY) {
@@ -2415,7 +2413,7 @@ rb_io_flags_mode(flags)
 	}
 	return MODE_BINMODE("r+", "rb+");
     }
-    rb_raise(rb_eArgError, "illegal access mode %o", flags);
+    rb_raise(rb_eArgError, "illegal access modenum %o", flags);
     return NULL;		/* not reached */
 }
 
@@ -3278,6 +3276,10 @@ rb_f_open(argc, argv)
 
 	if (rb_respond_to(argv[0], to_open)) {
 	    VALUE io = rb_funcall2(argv[0], to_open, argc-1, argv+1);
+
+	    if (TYPE(io) != T_FILE) {
+		rb_raise(rb_eTypeError, "to_open should return IO value");
+	    }
 	    if (rb_block_given_p()) {
 		return rb_ensure(rb_yield, io, io_close, io);
 	    }
@@ -3331,7 +3333,7 @@ io_reopen(io, nfile)
     if (IS_PREP_STDIO(fptr)) {
 	if ((fptr->mode & FMODE_READWRITE) != (orig->mode & FMODE_READWRITE)) {
 	    rb_raise(rb_eArgError,
-		     "%s cannot change access mode from \"%s\" to \"%s\"",
+		     "%s can't change access mode from \"%s\" to \"%s\"",
 		     PREP_STDIO_NAME(fptr), rb_io_flags_mode(fptr->mode),
 		     rb_io_flags_mode(orig->mode));
 	}
@@ -3445,7 +3447,7 @@ rb_io_reopen(argc, argv, file)
 	if (IS_PREP_STDIO(fptr) &&
 	    (fptr->mode & FMODE_READWRITE) != (flags & FMODE_READWRITE)) {
 	    rb_raise(rb_eArgError,
-		     "%s cannot change access mode from \"%s\" to \"%s\"",
+		     "%s can't change access mode from \"%s\" to \"%s\"",
 		     PREP_STDIO_NAME(fptr), rb_io_flags_mode(fptr->mode),
 		     rb_io_flags_mode(flags));
 	}
@@ -3698,7 +3700,7 @@ rb_f_putc(recv, ch)
 }
 
 static VALUE
-io_puts_ary(ary, out)
+io_puts_ary(ary, out, recur)
     VALUE ary, out;
 {
     VALUE tmp;
@@ -3706,7 +3708,7 @@ io_puts_ary(ary, out)
 
     for (i=0; i<RARRAY(ary)->len; i++) {
 	tmp = RARRAY(ary)->ptr[i];
-	if (rb_inspecting_p(tmp)) {
+	if (recur) {
 	    tmp = rb_str_new2("[...]");
 	}
 	rb_io_puts(1, &tmp, out);
@@ -3755,7 +3757,7 @@ rb_io_puts(argc, argv, out)
 	else {
 	    line = rb_check_array_type(argv[i]);
 	    if (!NIL_P(line)) {
-		rb_protect_inspect(io_puts_ary, line, out);
+		rb_exec_recursive(io_puts_ary, line, out);
 		continue;
 	    }
 	    line = rb_obj_as_string(argv[i]);
@@ -4161,18 +4163,20 @@ rb_io_s_for_fd(argc, argv, klass)
 static int binmode = 0;
 
 static VALUE
-argf_forward(VALUE *argv)
+argf_forward(argc, argv)
+    int argc;
+    VALUE *argv;
 {
-    return rb_funcall3(current_file, ruby_frame->last_func, ruby_frame->argc, argv);
+    return rb_funcall3(current_file, rb_frame_this_func(), argc, argv);
 }
 
-#define ARGF_FORWARD(argv) do {\
+#define ARGF_FORWARD(argc, argv) do {\
   if (TYPE(current_file) != T_FILE)\
-     return argf_forward(argv);\
+     return argf_forward(argc, argv);\
 } while (0)
-#define NEXT_ARGF_FORWARD(argv) do {\
+#define NEXT_ARGF_FORWARD(argc, argv) do {\
      if (!next_argv()) return Qnil;\
-     ARGF_FORWARD(argv);\
+     ARGF_FORWARD(argc, argv);\
 } while (0)
 
 static void
@@ -4428,7 +4432,7 @@ rb_f_readline(argc, argv)
     VALUE line;
 
     if (!next_argv()) rb_eof_error();
-    ARGF_FORWARD(argv);
+    ARGF_FORWARD(argc, argv);
     line = rb_f_gets(argc, argv);
     if (NIL_P(line)) {
 	rb_eof_error();
@@ -4465,7 +4469,7 @@ rb_f_readlines(argc, argv)
 {
     VALUE line, ary;
 
-    NEXT_ARGF_FORWARD(argv);
+    NEXT_ARGF_FORWARD(argc, argv);
     ary = rb_ary_new();
     while (!NIL_P(line = argf_getline(argc, argv))) {
 	rb_ary_push(ary, line);
@@ -5138,7 +5142,7 @@ argf_tell()
     if (!next_argv()) {
 	rb_raise(rb_eArgError, "no stream to tell");
     }
-    ARGF_FORWARD(0);
+    ARGF_FORWARD(0, 0);
     return rb_io_tell(current_file);
 }
 
@@ -5151,7 +5155,7 @@ argf_seek_m(argc, argv, self)
     if (!next_argv()) {
 	rb_raise(rb_eArgError, "no stream to seek");
     }
-    ARGF_FORWARD(argv);
+    ARGF_FORWARD(argc, argv);
     return rb_io_seek_m(argc, argv, current_file);
 }
 
@@ -5162,7 +5166,7 @@ argf_set_pos(self, offset)
     if (!next_argv()) {
 	rb_raise(rb_eArgError, "no stream to set position");
     }
-    ARGF_FORWARD(&offset);
+    ARGF_FORWARD(1, &offset);
     return rb_io_set_pos(current_file, offset);
 }
 
@@ -5172,7 +5176,7 @@ argf_rewind()
     if (!next_argv()) {
 	rb_raise(rb_eArgError, "no stream to rewind");
     }
-    ARGF_FORWARD(0);
+    ARGF_FORWARD(0, 0);
     return rb_io_rewind(current_file);
 }
 
@@ -5182,7 +5186,7 @@ argf_fileno()
     if (!next_argv()) {
 	rb_raise(rb_eArgError, "no stream");
     }
-    ARGF_FORWARD(0);
+    ARGF_FORWARD(0, 0);
     return rb_io_fileno(current_file);
 }
 
@@ -5190,7 +5194,7 @@ static VALUE
 argf_to_io()
 {
     next_argv();
-    ARGF_FORWARD(0);
+    ARGF_FORWARD(0, 0);
     return current_file;
 }
 
@@ -5199,7 +5203,7 @@ argf_eof()
 {
     if (current_file) {
 	if (init_p == 0) return Qtrue;
-	ARGF_FORWARD(0);
+	ARGF_FORWARD(0, 0);
 	if (rb_io_eof(current_file)) {
 	    return Qtrue;
 	}
@@ -5230,7 +5234,7 @@ argf_read(argc, argv)
 	return str;
     }
     if (TYPE(current_file) != T_FILE) {
-	tmp = argf_forward(argv);
+	tmp = argf_forward(argc, argv);
     }
     else {
 	tmp = io_read(argc, argv, current_file);
@@ -5325,7 +5329,7 @@ argf_readchar()
 {
     VALUE c;
 
-    NEXT_ARGF_FORWARD(0);
+    NEXT_ARGF_FORWARD(0, 0);
     c = argf_getc();
     if (NIL_P(c)) {
 	rb_eof_error();
@@ -5384,7 +5388,7 @@ argf_binmode()
 {
     binmode = 1;
     next_argv();
-    ARGF_FORWARD(0);
+    ARGF_FORWARD(0, 0);
     rb_io_binmode(current_file);
     return argf;
 }
@@ -5415,7 +5419,7 @@ static VALUE
 argf_closed()
 {
     next_argv();
-    ARGF_FORWARD(0);
+    ARGF_FORWARD(0, 0);
     return rb_io_closed(current_file);
 }