ruby-changes:1991
From: ko1@a...
Date: 22 Sep 2007 05:20:08 +0900
Subject: [ruby-changes:1991] nobu - Ruby:r13482 (trunk, ruby_1_8): * ext/stringio/stringio.c (strio_init): separate from strio_initialize
nobu 2007-09-22 05:19:51 +0900 (Sat, 22 Sep 2007)
New Revision: 13482
Modified files:
branches/ruby_1_8/ChangeLog
branches/ruby_1_8/ext/stringio/stringio.c
branches/ruby_1_8/version.h
trunk/ChangeLog
trunk/ext/stringio/stringio.c
trunk/version.h
Log:
* ext/stringio/stringio.c (strio_init): separate from strio_initialize
to share with strio_reopen properly. [ruby-Bugs-13919]
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=13482&r2=13481
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=13482&r2=13481
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13482&r2=13481
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/stringio/stringio.c?r1=13482&r2=13481
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/stringio/stringio.c?r1=13482&r2=13481
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=13482&r2=13481
Index: ChangeLog
===================================================================
--- ChangeLog (revision 13481)
+++ ChangeLog (revision 13482)
@@ -1,3 +1,8 @@
+Sat Sep 22 05:19:49 2007 Nobuyoshi Nakada <nobu@r...>
+
+ * ext/stringio/stringio.c (strio_init): separate from strio_initialize
+ to share with strio_reopen properly. [ruby-Bugs-13919]
+
Fri Sep 21 14:51:40 2007 Nobuyoshi Nakada <nobu@r...>
* gc.c (gc_mark_rest): copy just used part.
Index: ext/stringio/stringio.c
===================================================================
--- ext/stringio/stringio.c (revision 13481)
+++ ext/stringio/stringio.c (revision 13482)
@@ -30,6 +30,7 @@
static void strio_mark _((struct StringIO *));
static void strio_free _((struct StringIO *));
+static void strio_init(int, VALUE *, struct StringIO *);
#define IS_STRIO(obj) (RDATA(obj)->dmark == (RUBY_DATA_FUNC)strio_mark)
#define error_inval(msg) (errno = EINVAL, rb_sys_fail(msg))
@@ -146,13 +147,21 @@
strio_initialize(int argc, VALUE *argv, VALUE self)
{
struct StringIO *ptr = check_strio(self);
- VALUE string, mode;
- int trunc = Qfalse;
if (!ptr) {
DATA_PTR(self) = ptr = strio_alloc();
}
rb_call_super(0, 0);
+ strio_init(argc, argv, ptr);
+ return self;
+}
+
+static void
+strio_init(int argc, VALUE *argv, struct StringIO *ptr)
+{
+ VALUE string, mode;
+ int trunc = Qfalse;
+
switch (rb_scan_args(argc, argv, "02", &string, &mode)) {
case 2:
if (FIXNUM_P(mode)) {
@@ -184,7 +193,6 @@
break;
}
ptr->string = string;
- return self;
}
static VALUE
@@ -490,7 +498,8 @@
if (argc == 1 && TYPE(*argv) != T_STRING) {
return strio_copy(self, *argv);
}
- return strio_initialize(argc, argv, self);
+ strio_init(argc, argv, StringIO(self));
+ return self;
}
/*
Index: version.h
===================================================================
--- version.h (revision 13481)
+++ version.h (revision 13482)
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-09-21"
+#define RUBY_RELEASE_DATE "2007-09-22"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20070921
+#define RUBY_RELEASE_CODE 20070922
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 21
+#define RUBY_RELEASE_DAY 22
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/ext/stringio/stringio.c
===================================================================
--- ruby_1_8/ext/stringio/stringio.c (revision 13481)
+++ ruby_1_8/ext/stringio/stringio.c (revision 13482)
@@ -136,6 +136,7 @@
static VALUE strio_s_allocate _((VALUE));
static VALUE strio_s_open _((int, VALUE *, VALUE));
+static void strio_init _((int, VALUE *, struct StringIO *));
static VALUE strio_initialize _((int, VALUE *, VALUE));
static VALUE strio_finalize _((VALUE));
static VALUE strio_self _((VALUE));
@@ -217,13 +218,24 @@
VALUE self;
{
struct StringIO *ptr = check_strio(self);
- VALUE string, mode;
- int trunc = Qfalse;
if (!ptr) {
DATA_PTR(self) = ptr = strio_alloc();
}
rb_call_super(0, 0);
+ strio_init(argc, argv, ptr);
+ return self;
+}
+
+static void
+strio_init(argc, argv, ptr)
+ int argc;
+ VALUE *argv;
+ struct StringIO *ptr;
+{
+ VALUE string, mode;
+ int trunc = Qfalse;
+
switch (rb_scan_args(argc, argv, "02", &string, &mode)) {
case 2:
if (FIXNUM_P(mode)) {
@@ -255,7 +267,6 @@
break;
}
ptr->string = string;
- return self;
}
static VALUE
@@ -570,7 +581,8 @@
if (argc == 1 && TYPE(*argv) != T_STRING) {
return strio_copy(self, *argv);
}
- return strio_initialize(argc, argv, self);
+ strio_init(argc, argv, StringIO(self));
+ return self;
}
/*
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog (revision 13481)
+++ ruby_1_8/ChangeLog (revision 13482)
@@ -1,3 +1,8 @@
+Sat Sep 22 05:19:49 2007 Nobuyoshi Nakada <nobu@r...>
+
+ * ext/stringio/stringio.c (strio_init): separate from strio_initialize
+ to share with strio_reopen properly. [ruby-Bugs-13919]
+
Fri Sep 21 15:46:20 2007 Nobuyoshi Nakada <nobu@r...>
* process.c (struct rb_exec_arg): proc should be a VALUE.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h (revision 13481)
+++ ruby_1_8/version.h (revision 13482)
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-09-21"
+#define RUBY_RELEASE_DATE "2007-09-22"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20070921
+#define RUBY_RELEASE_CODE 20070922
#define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 21
+#define RUBY_RELEASE_DAY 22
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml