nobu	2012-04-10 19:07:07 +0900 (Tue, 10 Apr 2012)

  New Revision: 35283

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

  Log:
    * error.c (rb_enc_raise): new function to raise an exception with
      the message in the given encoding.  patched by now (Nikolai
      Weibull) at [ruby-core:41160].  [Feature #5650]

  Added directories:
    trunk/ext/-test-/exception/
    trunk/test/-ext-/exception/
  Added files:
    trunk/ext/-test-/exception/enc_raise.c
    trunk/ext/-test-/exception/extconf.rb
    trunk/ext/-test-/exception/init.c
    trunk/test/-ext-/exception/test_enc_raise.rb
  Modified files:
    trunk/ChangeLog
    trunk/error.c
    trunk/include/ruby/encoding.h

Index: include/ruby/encoding.h
===================================================================
--- include/ruby/encoding.h	(revision 35282)
+++ include/ruby/encoding.h	(revision 35283)
@@ -112,6 +112,8 @@
 VALUE rb_str_conv_enc(VALUE str, rb_encoding *from, rb_encoding *to);
 VALUE rb_str_conv_enc_opts(VALUE str, rb_encoding *from, rb_encoding *to, int ecflags, VALUE ecopts);
 
+PRINTF_ARGS(NORETURN(void rb_enc_raise(rb_encoding *, VALUE, const char*, ...)), 3, 4);
+
 /* index -> rb_encoding */
 rb_encoding* rb_enc_from_index(int idx);
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35282)
+++ ChangeLog	(revision 35283)
@@ -1,3 +1,9 @@
+Tue Apr 10 19:07:04 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* error.c (rb_enc_raise): new function to raise an exception with
+	  the message in the given encoding.  patched by now (Nikolai
+	  Weibull) at [ruby-core:41160].  [Feature #5650]
+
 Tue Apr 10 18:19:32 2012  NARUSE, Yui  <naruse@r...>
 
 	* lib/net/http.rb (Net::HTTP#send_request_with_body_stream):
Index: ext/-test-/exception/init.c
===================================================================
--- ext/-test-/exception/init.c	(revision 0)
+++ ext/-test-/exception/init.c	(revision 35283)
@@ -0,0 +1,11 @@
+#include "ruby.h"
+
+#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
+
+void
+Init_exception(void)
+{
+    VALUE mBug = rb_define_module("Bug");
+    VALUE klass = rb_define_class_under(mBug, "Exception", rb_eStandardError);
+    TEST_INIT_FUNCS(init);
+}

Property changes on: ext/-test-/exception/init.c
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: ext/-test-/exception/extconf.rb
===================================================================
--- ext/-test-/exception/extconf.rb	(revision 0)
+++ ext/-test-/exception/extconf.rb	(revision 35283)
@@ -0,0 +1,6 @@
+$srcs = Dir[File.join($srcdir, "*.{#{SRC_EXT.join(%q{,})}}")]
+inits = $srcs.map {|s| File.basename(s, ".*")}
+inits.delete("init")
+inits.map! {|s|"X(#{s})"}
+$defs << "-DTEST_INIT_FUNCS(X)=\"#{inits.join(' ')}\""
+create_makefile("-test-/exception")

Property changes on: ext/-test-/exception/extconf.rb
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: ext/-test-/exception/enc_raise.c
===================================================================
--- ext/-test-/exception/enc_raise.c	(revision 0)
+++ ext/-test-/exception/enc_raise.c	(revision 35283)
@@ -0,0 +1,14 @@
+#include <ruby.h>
+#include <ruby/encoding.h>
+
+static VALUE
+enc_raise(VALUE exc, VALUE encoding, VALUE mesg)
+{
+    rb_enc_raise(rb_to_encoding(encoding), exc, "%s", StringValueCStr(mesg));
+}
+
+void
+Init_enc_raise(VALUE klass)
+{
+    rb_define_module_function(klass, "enc_raise", enc_raise, 2);
+}

Property changes on: ext/-test-/exception/enc_raise.c
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: error.c
===================================================================
--- error.c	(revision 35282)
+++ error.c	(revision 35283)
@@ -1729,6 +1729,19 @@
 }
 
 void
+rb_enc_raise(rb_encoding *enc, VALUE exc, const char *fmt, ...)
+{
+    va_list args;
+    VALUE mesg;
+
+    va_start(args, fmt);
+    mesg = rb_enc_vsprintf(enc, fmt, args);
+    va_end(args);
+
+    rb_exc_raise(rb_exc_new3(exc, mesg));
+}
+
+void
 rb_raise(VALUE exc, const char *fmt, ...)
 {
     va_list args;
Index: test/-ext-/exception/test_enc_raise.rb
===================================================================
--- test/-ext-/exception/test_enc_raise.rb	(revision 0)
+++ test/-ext-/exception/test_enc_raise.rb	(revision 35283)
@@ -0,0 +1,15 @@
+require 'test/unit'
+require '-test-/exception'
+
+module Bug
+  class TestException < Test::Unit::TestCase
+    def test_enc_raise
+      feature5650 = '[ruby-core:41160]'
+      Encoding.list.each do |enc|
+        next unless enc.ascii_compatible?
+        e = assert_raise(Bug::Exception) {Bug::Exception.enc_raise(enc, "[Feature #5650]")}
+        assert_equal(enc, e.message.encoding, feature5650)
+      end
+    end
+  end
+end

Property changes on: test/-ext-/exception/test_enc_raise.rb
___________________________________________________________________
Added: svn:eol-style
   + LF


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