Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
merge revision(s) 17833:17837:
	* gc.c (Init_GC): fix syntax error.
	* error.c (rb_exc_new3): keeps the given string itself.
	* eval.c (Init_Proc), gc.c (Init_GC): freeze messages of preallocated
	  special exceptions also.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@18325 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
shyouhei committed Aug 4, 2008
1 parent 91db031 commit 3056186
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 9 deletions.
11 changes: 11 additions & 0 deletions ChangeLog
@@ -1,3 +1,14 @@
Mon Aug 4 12:11:29 2008 Tanaka Akira <akr@fsij.org>

* gc.c (Init_GC): fix syntax error.

Mon Aug 4 12:11:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>

* error.c (rb_exc_new3): keeps the given string itself.

* eval.c (Init_Proc), gc.c (Init_GC): freeze messages of preallocated
special exceptions also.

Thu Jul 17 21:37:39 2008 URABE Shyouhei <shyouhei@ruby-lang.org>

* lib/net/smtp.rb (Net::SMTP::start): revert to avoid RFC2821
Expand Down
2 changes: 1 addition & 1 deletion error.c
Expand Up @@ -334,7 +334,7 @@ rb_exc_new3(etype, str)
VALUE etype, str;
{
StringValue(str);
return rb_exc_new(etype, RSTRING(str)->ptr, RSTRING(str)->len);
return rb_funcall(etype, rb_intern("new"), 1, str);
}

/*
Expand Down
6 changes: 4 additions & 2 deletions eval.c
Expand Up @@ -9715,13 +9715,15 @@ Init_Proc()
rb_define_method(rb_eLocalJumpError, "reason", localjump_reason, 0);

rb_global_variable(&exception_error);
exception_error = rb_exc_new2(rb_eFatal, "exception reentered");
exception_error = rb_exc_new3(rb_eFatal,
rb_obj_freeze(rb_str_new2("exception reentered")));
OBJ_TAINT(exception_error);
OBJ_FREEZE(exception_error);

rb_eSysStackError = rb_define_class("SystemStackError", rb_eStandardError);
rb_global_variable(&sysstack_error);
sysstack_error = rb_exc_new2(rb_eSysStackError, "stack level too deep");
sysstack_error = rb_exc_new3(rb_eSysStackError,
rb_obj_freeze(rb_str_new2("stack level too deep")));
OBJ_TAINT(sysstack_error);
OBJ_FREEZE(sysstack_error);

Expand Down
3 changes: 2 additions & 1 deletion gc.c
Expand Up @@ -2069,7 +2069,8 @@ Init_GC()
source_filenames = st_init_strtable();

rb_global_variable(&nomem_error);
nomem_error = rb_exc_new2(rb_eNoMemError, "failed to allocate memory");
nomem_error = rb_exc_new3(rb_eNoMemError,
rb_obj_freeze(rb_str_new2("failed to allocate memory")));
OBJ_TAINT(nomem_error);
OBJ_FREEZE(nomem_error);

Expand Down
11 changes: 6 additions & 5 deletions version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.6"
#define RUBY_RELEASE_DATE "2008-07-17"
#define RUBY_RELEASE_DATE "2008-08-04"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20080717
#define RUBY_PATCHLEVEL 279
#define RUBY_RELEASE_CODE 20080804
#define RUBY_PATCHLEVEL 280

#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 7
#define RUBY_RELEASE_DAY 17
#define RUBY_RELEASE_MONTH 8
#define RUBY_RELEASE_DAY 4

#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
Expand All @@ -18,3 +18,4 @@ RUBY_EXTERN const char ruby_platform[];
RUBY_EXTERN const int ruby_patchlevel;
#endif


0 comments on commit 3056186

Please sign in to comment.