[前][次][番号順一覧][スレッド一覧]

ruby-changes:6317

From: nobu <ko1@a...>
Date: Thu, 3 Jul 2008 07:03:55 +0900 (JST)
Subject: [ruby-changes:6317] Ruby:r17834 (ruby_1_8): * error.c (rb_exc_new3): keeps the given string itself.

nobu	2008-07-03 07:03:24 +0900 (Thu, 03 Jul 2008)

  New Revision: 17834

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/error.c
    branches/ruby_1_8/eval.c
    branches/ruby_1_8/gc.c

  Log:
    * 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.



  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=17834

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/error.c?r1=17834&r2=17833&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=17834&r2=17833&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/gc.c?r1=17834&r2=17833&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/eval.c?r1=17834&r2=17833&diff_format=u

Index: ruby_1_8/error.c
===================================================================
--- ruby_1_8/error.c	(revision 17833)
+++ ruby_1_8/error.c	(revision 17834)
@@ -333,7 +333,7 @@
     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);
 }
 
 /*
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 17833)
+++ ruby_1_8/ChangeLog	(revision 17834)
@@ -1,3 +1,10 @@
+Thu Jul  3 07:03:22 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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  3 06:17:23 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (rb_longjmp): duplicate the thrown exception to set backtrace
Index: ruby_1_8/eval.c
===================================================================
--- ruby_1_8/eval.c	(revision 17833)
+++ ruby_1_8/eval.c	(revision 17834)
@@ -9992,13 +9992,15 @@
     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);
 
Index: ruby_1_8/gc.c
===================================================================
--- ruby_1_8/gc.c	(revision 17833)
+++ ruby_1_8/gc.c	(revision 17834)
@@ -2125,7 +2125,8 @@
     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);
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]