1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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
This commit is contained in:
nobu 2007-04-04 15:42:16 +00:00
parent 8259e4aa9a
commit f1796fdb2c
4 changed files with 25 additions and 20 deletions

View file

@ -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> Wed Apr 4 17:09:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (pipe_open): refined the message of NotImplementedError. * io.c (pipe_open): refined the message of NotImplementedError.

32
error.c
View file

@ -1027,8 +1027,8 @@ rb_loaderror(const char *fmt, ...)
void void
rb_notimplement(void) rb_notimplement(void)
{ {
rb_raise(rb_eNotImpError, rb_raise(rb_eNotImpError,
"The %s() function is unimplemented on this machine", "%s() function is unimplemented on this machine",
rb_id2name(rb_frame_this_func())); rb_id2name(rb_frame_this_func()));
} }
@ -1473,21 +1473,21 @@ Init_syserr(void)
static void static void
err_append(const char *s) err_append(const char *s)
{ {
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();
if (th->parse_in_eval) { if (th->parse_in_eval) {
if (NIL_P(th->errinfo)) { if (NIL_P(th->errinfo)) {
th->errinfo = rb_exc_new2(rb_eSyntaxError, s); 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 { else {
VALUE str = rb_obj_as_string(GET_THREAD()->errinfo); rb_write_error(s);
rb_write_error("\n");
rb_str_cat2(str, "\n");
rb_str_cat2(str, s);
th->errinfo = rb_exc_new3(rb_eSyntaxError, str);
} }
}
else {
rb_write_error(s);
rb_write_error("\n");
}
} }

2
io.c
View file

@ -3080,7 +3080,7 @@ pipe_open(int argc, VALUE *argv, const char *mode)
#if !defined(HAVE_FORK) #if !defined(HAVE_FORK)
if (!doexec) { if (!doexec) {
rb_raise(rb_eNotImpError, rb_raise(rb_eNotImpError,
"The fork(2) function is unimplemented on this machine"); "fork() function is unimplemented on this machine");
} }
#endif #endif

View file

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0" #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_VERSION_CODE 190
#define RUBY_RELEASE_CODE 20070404 #define RUBY_RELEASE_CODE 20070405
#define RUBY_PATCHLEVEL 0 #define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0 #define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 4 #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_version[];
RUBY_EXTERN const char ruby_release_date[]; RUBY_EXTERN const char ruby_release_date[];