summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-04-04 15:42:16 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-04-04 15:42:16 +0000
commitf1796fdb2c0473f2362a79402e1d9417cf2b6f96 (patch)
tree5e7befe525fdb14e5f2896b0eaa43e61e7292167
parent8259e4aa9a140b9584dec2be4e542dfbd71a40ad (diff)
* error.c (rb_notimplement), io.c (pipe_open): removed definite
articles and UNIX manual section from messages. [ruby-dev:30690] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12147 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--error.c32
-rw-r--r--io.c2
-rw-r--r--version.h6
4 files changed, 25 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d891f6..75a9377 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 5 00:42:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * error.c (rb_notimplement), io.c (pipe_open): removed definite
+ articles and UNIX manual section from messages. [ruby-dev:30690]
+
Wed Apr 4 17:09:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (pipe_open): refined the message of NotImplementedError.
diff --git a/error.c b/error.c
index 2d4bafd..b80afa8 100644
--- a/error.c
+++ b/error.c
@@ -1027,8 +1027,8 @@ rb_loaderror(const char *fmt, ...)
void
rb_notimplement(void)
{
- rb_raise(rb_eNotImpError,
- "The %s() function is unimplemented on this machine",
+ rb_raise(rb_eNotImpError,
+ "%s() function is unimplemented on this machine",
rb_id2name(rb_frame_this_func()));
}
@@ -1473,21 +1473,21 @@ Init_syserr(void)
static void
err_append(const char *s)
{
- rb_thread_t *th = GET_THREAD();
- if (th->parse_in_eval) {
- if (NIL_P(th->errinfo)) {
- th->errinfo = rb_exc_new2(rb_eSyntaxError, s);
+ rb_thread_t *th = GET_THREAD();
+ if (th->parse_in_eval) {
+ if (NIL_P(th->errinfo)) {
+ th->errinfo = rb_exc_new2(rb_eSyntaxError, s);
+ }
+ else {
+ VALUE str = rb_obj_as_string(GET_THREAD()->errinfo);
+
+ rb_str_cat2(str, "\n");
+ rb_str_cat2(str, s);
+ th->errinfo = rb_exc_new3(rb_eSyntaxError, str);
+ }
}
else {
- VALUE str = rb_obj_as_string(GET_THREAD()->errinfo);
-
- rb_str_cat2(str, "\n");
- rb_str_cat2(str, s);
- th->errinfo = rb_exc_new3(rb_eSyntaxError, str);
+ rb_write_error(s);
+ rb_write_error("\n");
}
- }
- else {
- rb_write_error(s);
- rb_write_error("\n");
- }
}
diff --git a/io.c b/io.c
index 37c96b9..c1f6b09 100644
--- a/io.c
+++ b/io.c
@@ -3080,7 +3080,7 @@ pipe_open(int argc, VALUE *argv, const char *mode)
#if !defined(HAVE_FORK)
if (!doexec) {
rb_raise(rb_eNotImpError,
- "The fork(2) function is unimplemented on this machine");
+ "fork() function is unimplemented on this machine");
}
#endif
diff --git a/version.h b/version.h
index 9999671..312bab7 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-04-04"
+#define RUBY_RELEASE_DATE "2007-04-05"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20070404
+#define RUBY_RELEASE_CODE 20070405
#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 4
-#define RUBY_RELEASE_DAY 4
+#define RUBY_RELEASE_DAY 5
RUBY_EXTERN const char ruby_version[];
RUBY_EXTERN const char ruby_release_date[];